diff --git a/CHANGELOG b/CHANGELOG
index cf2d2a25..97de2ff5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -67,6 +67,10 @@ HISTORY
 
   ++ Bug fixes:
   
+  2007-03-21 Kieran Mansley
+  * sockets.c, igmp.c, igmp.h, memp.h: Fix C++ style comments and
+    comment out missing header include in icmp.c
+
   2007-03-20 Frédéric Bernon
   * memp.h, stats.c: Fix stats_display function where memp_names table wasn't
     synchronized with memp.h.
diff --git a/src/api/sockets.c b/src/api/sockets.c
index 5043b767..222eb446 100644
--- a/src/api/sockets.c
+++ b/src/api/sockets.c
@@ -1239,9 +1239,10 @@ int lwip_setsockopt (int s, int level, int optname, const void *optval, socklen_
         break;
     #if LWIP_IGMP
     case IP_MULTICAST_TTL:
-     { if(( optlen != sizeof(char) ) && ( optlen != sizeof(int) )) //NOTE, some BSD implementation use "int", some others "char"
-        { err = EINVAL;
-        }
+     { 
+       /* NOTE, some BSD implementation use "int", some others "char" */
+       if(( optlen != sizeof(char) ) && ( optlen != sizeof(int) )) 
+         err = EINVAL;
        break;
      }
     case IP_ADD_MEMBERSHIP:
diff --git a/src/core/ipv4/igmp.c b/src/core/ipv4/igmp.c
index 3b300eaa..78b86027 100644
--- a/src/core/ipv4/igmp.c
+++ b/src/core/ipv4/igmp.c
@@ -77,7 +77,7 @@ Steve Reynolds
 #include "lwip/igmp.h"
 
 #include "arch/perf.h"
-#include "arch/PNX_if.h"
+/*#include "arch/PNX_if.h"*/
 
 #include "string.h"
 
diff --git a/src/include/ipv4/lwip/igmp.h b/src/include/ipv4/lwip/igmp.h
index 4c0fdc45..32ac90e0 100644
--- a/src/include/ipv4/lwip/igmp.h
+++ b/src/include/ipv4/lwip/igmp.h
@@ -38,7 +38,7 @@
 /* IGMP support available? */
 #if defined(LWIP_IGMP) && (LWIP_IGMP > 0)
 
-// Some routers are not happy with ROUTER ALERT make it defineable, 1 to enable
+/* Some routers are not happy with ROUTER ALERT make it defineable, 1 to enable */
 #define USE_ROUTER_ALERT 0
 
 /*
diff --git a/src/include/lwip/memp.h b/src/include/lwip/memp.h
index a9eeb0c2..71fd49fb 100644
--- a/src/include/lwip/memp.h
+++ b/src/include/lwip/memp.h
@@ -35,7 +35,7 @@
 
 #include "lwip/opt.h"
 
-// If you change this enum, think to update memp_names in stats_display (stats.c)
+/* If you change this enum, think to update memp_names in stats_display (stats.c) */
 typedef enum {
   MEMP_PBUF,
   MEMP_RAW_PCB,