diff --git a/overlay_abbreviations.c b/overlay_abbreviations.c
index 40ea870c..9b902d4d 100644
--- a/overlay_abbreviations.c
+++ b/overlay_abbreviations.c
@@ -173,7 +173,7 @@ int overlay_abbreviate_cache_address(unsigned char *sid)
   int index=((sid[0]<<16)|(sid[0]<<8)|sid[2])>>cache->shift;
 
   /* Does the stored address match the one we have been passed? */
-  if (!bcmp(sid,&cache->sids[index].b[0],SID_SIZE))
+  if (!memcmp(sid,&cache->sids[index].b[0],SID_SIZE))
     /* Address is already in cache, so return and let the caller know. */
     return 1;
 
@@ -191,7 +191,7 @@ int overlay_abbreviate_cache_address(unsigned char *sid)
 
 int overlay_abbreviate_try_byindex(unsigned char *in,unsigned char *out,int *ofs,int index)
 {
-  if(!bcmp(in,abbrs->sids[index],SID_SIZE))
+  if(!memcmp(in,abbrs->sids[index],SID_SIZE))
     {
       /* We can encode this address with one byte */      
       out[(*ofs)++]=0x01;
@@ -370,7 +370,7 @@ int overlay_abbreviate_cache_lookup(unsigned char *in,unsigned char *out,int *of
   fprintf(stderr,"*\n");
 
   /* So is it there? */
-  if (bcmp(in,&cache->sids[index].b[0],prefix_bytes))
+  if (memcmp(in,&cache->sids[index].b[0],prefix_bytes))
     {
       /* No, it isn't in the cache. */
       return OA_PLEASEEXPLAIN;
diff --git a/overlay_interface.c b/overlay_interface.c
index 3cae8e76..bd3a40aa 100644
--- a/overlay_interface.c
+++ b/overlay_interface.c
@@ -190,7 +190,7 @@ int overlay_interface_init_socket(int interface,struct sockaddr_in src_addr,stru
   }
  
   return 0;
-#undef I(X)
+#undef I
 }
 
 int overlay_interface_init(char *name,struct sockaddr_in src_addr,struct sockaddr_in broadcast,
@@ -235,7 +235,7 @@ int overlay_interface_init(char *name,struct sockaddr_in src_addr,struct sockadd
   }
 
   overlay_interface_count++;
-#undef I(X)
+#undef I
   return 0;
 }
 
@@ -467,8 +467,8 @@ int overlay_interface_discover()
       }
     }
   }
-#endif
   freeifaddrs(ifaddr);
+#endif
 
   return 0;
 }
diff --git a/overlay_route.c b/overlay_route.c
index f6bb1c97..0c54d1fe 100644
--- a/overlay_route.c
+++ b/overlay_route.c
@@ -394,7 +394,7 @@ overlay_node *overlay_route_find_node(unsigned char *sid,int createP)
   if (bin_number<0) { WHY("negative bin number"); return NULL; }
 
   for(slot=0;slot<overlay_bin_size;slot++)
-    if (!bcmp(sid,overlay_nodes[bin_number][slot].sid,SID_SIZE))
+    if (!memcmp(sid,overlay_nodes[bin_number][slot].sid,SID_SIZE))
       {
 	/* Found it */
 	return &overlay_nodes[bin_number][slot];