diff --git a/src/cfgfile.c b/src/cfgfile.c
index 7198a2be425891694ebdaebd6dcb541294a7e12f..dcb265bfa41b5b3a3d1583b6a09679d300b4c5b9 100644
--- a/src/cfgfile.c
+++ b/src/cfgfile.c
@@ -232,7 +232,9 @@ void config_clear(ice_config_t *c)
     relay_server *relay, *nextrelay;
     mount_proxy *mount, *nextmount;
     aliases *alias, *nextalias;
+#ifdef USE_YP
     int i;
+#endif
 
     free(c->config_filename);
 
diff --git a/src/format_opus.c b/src/format_opus.c
index 99fbba0876cb93631571d32d72b1bda8b4e2e849..26eea8b647a0f310344104f0a4c303626cf24a84 100644
--- a/src/format_opus.c
+++ b/src/format_opus.c
@@ -17,6 +17,7 @@
 #endif
 
 #include <stdlib.h>
+#include <string.h>
 #include <ogg/ogg.h>
 
 typedef struct source_tag source_t;
diff --git a/src/util.c b/src/util.c
index 947aa8a7661c59a527510ad2f1bb8801da4dc7a1..4e58e9ddbeb86fcb338e0a6b81783bcd314dbdc7 100644
--- a/src/util.c
+++ b/src/util.c
@@ -505,12 +505,17 @@ static inline void   _build_headers_loop(char **ret, size_t *len, ice_config_htt
         name = header->name;
 
         /* handle type of the header */
+        value = NULL;
         switch (header->type) {
             case HTTP_HEADER_TYPE_STATIC:
                 value = header->value;
                 break;
         }
 
+        /* check data */
+        if (!name || !value)
+            continue;
+
         /* append the header to the buffer */
         headerlen = strlen(name) + strlen(value) + 4;
         *len += headerlen;