diff -up freenet6/gw6c-config/src/gw6cconfig.cc.headers freenet6/gw6c-config/src/gw6cconfig.cc
--- freenet6/gw6c-config/src/gw6cconfig.cc.headers	2007-11-12 10:29:32.000000000 -0700
+++ freenet6/gw6c-config/src/gw6cconfig.cc	2008-06-17 05:49:41.000000000 -0700
@@ -24,7 +24,8 @@
 #include <gw6cconfig/gw6cvalidation.h>
 #include <gw6cconfig/gw6cuistrings.h>
 #include <assert.h>
-#include <string>
+#include <string.h>
+#include <stdlib.h>
 
 
 // Configuration data variable NAMES
diff -up freenet6/gw6c-config/src/gw6c_c_wrapper.cc.headers freenet6/gw6c-config/src/gw6c_c_wrapper.cc
--- freenet6/gw6c-config/src/gw6c_c_wrapper.cc.headers	2007-11-12 10:29:31.000000000 -0700
+++ freenet6/gw6c-config/src/gw6c_c_wrapper.cc	2008-06-17 05:49:41.000000000 -0700
@@ -22,6 +22,8 @@
 #include <gw6cconfig/gw6cuistrings.h>
 using namespace gw6cconfig;
 #include <assert.h>
+#include <string.h>
+#include <stdlib.h>
 
 #ifdef WIN32
 #define strcasecmp      _stricmp
diff -up freenet6/gw6c-config/src/gw6cvalidation.cc.headers freenet6/gw6c-config/src/gw6cvalidation.cc
--- freenet6/gw6c-config/src/gw6cvalidation.cc.headers	2007-11-12 13:50:25.000000000 -0700
+++ freenet6/gw6c-config/src/gw6cvalidation.cc	2008-06-17 05:49:41.000000000 -0700
@@ -34,6 +34,8 @@
 #include <arpa/inet.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
+#include <string.h>
+#include <stdlib.h>
 #define INET_PTON(A, B, C)                inet_pton(A,B,C)
 #endif
 
diff -up freenet6/gw6c-config/src/hap6devicemappingconfig.cc.headers freenet6/gw6c-config/src/hap6devicemappingconfig.cc
--- freenet6/gw6c-config/src/hap6devicemappingconfig.cc.headers	2007-03-06 14:29:56.000000000 -0700
+++ freenet6/gw6c-config/src/hap6devicemappingconfig.cc	2008-06-17 05:49:41.000000000 -0700
@@ -35,6 +35,7 @@
 #include <arpa/inet.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
+#include <string.h>
 #define INET_PTON(A, B, C)                inet_pton(A,B,C)
 #endif
 
diff -up freenet6/gw6c-config/src/hap6_devmap_c_wrap.cc.headers freenet6/gw6c-config/src/hap6_devmap_c_wrap.cc
--- freenet6/gw6c-config/src/hap6_devmap_c_wrap.cc.headers	2007-03-06 14:29:56.000000000 -0700
+++ freenet6/gw6c-config/src/hap6_devmap_c_wrap.cc	2008-06-17 05:49:41.000000000 -0700
@@ -22,6 +22,8 @@
 #include <gw6cconfig/gw6cuistrings.h>
 using namespace gw6cconfig;
 #include <assert.h>
+#include <string.h>
+#include <stdlib.h>
 
 #ifdef WIN32
 #define strcasecmp      _stricmp
diff -up freenet6/gw6c-config/src/namevalueparser.cc.headers freenet6/gw6c-config/src/namevalueparser.cc
--- freenet6/gw6c-config/src/namevalueparser.cc.headers	2007-10-11 12:41:00.000000000 -0700
+++ freenet6/gw6c-config/src/namevalueparser.cc	2008-06-17 05:49:41.000000000 -0700
@@ -25,6 +25,7 @@
 #include <fstream>
 #include <time.h>
 #include <assert.h>
+#include <string.h>
 
 
 #define NV_SEPARATOR          "="                   // Name=value separator
diff -up freenet6/gw6c-messaging/src/clientmsgsender.cc.headers freenet6/gw6c-messaging/src/clientmsgsender.cc
--- freenet6/gw6c-messaging/src/clientmsgsender.cc.headers	2007-04-02 13:12:03.000000000 -0700
+++ freenet6/gw6c-messaging/src/clientmsgsender.cc	2008-06-17 05:49:41.000000000 -0700
@@ -19,6 +19,7 @@
 // **************************************************************************
 #include <gw6cmessaging/clientmsgsender.h>
 #include <assert.h>
+#include <string.h>
 
 
 namespace gw6cmessaging
diff -up freenet6/gw6c-messaging/src/servermsgsender.cc.headers freenet6/gw6c-messaging/src/servermsgsender.cc
--- freenet6/gw6c-messaging/src/servermsgsender.cc.headers	2007-06-22 11:34:43.000000000 -0700
+++ freenet6/gw6c-messaging/src/servermsgsender.cc	2008-06-17 10:20:00.000000000 -0700
@@ -19,6 +19,8 @@
 // **************************************************************************
 #include <gw6cmessaging/servermsgsender.h>
 #include <assert.h>
+#include <string.h>
+#include <stdlib.h>
 
 
 #ifdef WIN32