diff --git a/conf/Makefile.am b/conf/Makefile.am
index 48894f9f..3d4bec06 100644
--- a/conf/Makefile.am
+++ b/conf/Makefile.am
@@ -3,6 +3,7 @@
 AUTOMAKE_OPTIONS = foreign
 
 EXTRA_DIST = icecast.xml.in
+DISTCLEANFILES = icecast.xml.dist
 
 docdir = $(datadir)/$(PACKAGE)/doc
 doc_DATA = icecast.xml.dist
diff --git a/src/cfgfile.h b/src/cfgfile.h
index c7eeea74..94f2f4c3 100644
--- a/src/cfgfile.h
+++ b/src/cfgfile.h
@@ -1,5 +1,5 @@
-#ifndef __CONFIG_H__
-#define __CONFIG_H__
+#ifndef __CFGFILE_H__
+#define __CFGFILE_H__
 
 #define CONFIG_EINSANE -1
 #define CONFIG_ENOROOT -2
@@ -138,7 +138,7 @@ void config_release_config(void);
 /* To be used ONLY in one-time startup code */
 ice_config_t *config_get_config_unlocked(void);
 
-#endif  /* __CONFIG_H__ */
+#endif  /* __CFGFILE_H__ */
 
 
 
diff --git a/src/connection.c b/src/connection.c
index b74631c7..ad5034ff 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -673,8 +673,8 @@ static void _handle_get_request(connection_t *con,
     char *host;
     int port;
     int i;
-    char *serverhost;
-    int serverport;
+    char *serverhost = NULL;
+    int serverport = 0;
     aliases *alias;
     ice_config_t *config;
     int client_limit;
diff --git a/src/format.c b/src/format.c
index 61c91309..566d4649 100644
--- a/src/format.c
+++ b/src/format.c
@@ -11,6 +11,9 @@
 
 #include <stdlib.h>
 #include <string.h>
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
 #include <time.h>
 
 #include "connection.h"
diff --git a/src/format_mp3.c b/src/format_mp3.c
index c1750f05..f46e6dc2 100644
--- a/src/format_mp3.c
+++ b/src/format_mp3.c
@@ -12,6 +12,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
 
 #include "refbuf.h"
 #include "source.h"