--- gw6c-messaging/src/clientmsgsender.cc.orig	2008-06-16 15:28:00.000000000 +0000
+++ gw6c-messaging/src/clientmsgsender.cc	2008-06-16 15:28:11.000000000 +0000
@@ -19,6 +19,8 @@
 // **************************************************************************
 #include <gw6cmessaging/clientmsgsender.h>
 #include <assert.h>
+#include <cstring>
+
 
 
 namespace gw6cmessaging

--- gw6c-messaging/src/servermsgsender.cc.orig	2008-06-16 15:31:47.000000000 +0000
+++ gw6c-messaging/src/servermsgsender.cc	2008-06-16 15:31:56.000000000 +0000
@@ -19,6 +19,8 @@
 // **************************************************************************
 #include <gw6cmessaging/servermsgsender.h>
 #include <assert.h>
+#include <cstring>
+
 
 
 #ifdef WIN32

--- gw6c-config/src/namevalueparser.cc.orig	2008-06-16 15:32:41.000000000 +0000
+++ gw6c-config/src/namevalueparser.cc	2008-06-16 15:32:51.000000000 +0000
@@ -25,6 +25,8 @@
 #include <fstream>
 #include <time.h>
 #include <assert.h>
+#include <cstring>
+
 
 
 #define NV_SEPARATOR          "="                   // Name=value separator

--- gw6c-config/src/gw6cconfig.cc.orig	2008-06-16 15:33:33.000000000 +0000
+++ gw6c-config/src/gw6cconfig.cc	2008-06-16 15:33:43.000000000 +0000
@@ -25,6 +25,8 @@
 #include <gw6cconfig/gw6cuistrings.h>
 #include <assert.h>
 #include <string>
+#include <cstring>
+#include <cstdlib>
 
 // Configuration data variable NAMES

--- gw6c-config/src/gw6cvalidation.cc.orig	2008-06-16 15:34:19.000000000 +0000
+++ gw6c-config/src/gw6cvalidation.cc	2008-06-16 15:34:29.000000000 +0000
@@ -18,6 +18,8 @@
 // __________________________________________________________________________
 // **************************************************************************
 #include <gw6cconfig/gw6cvalidation.h>
+#include <cstring>
+#include <cstdlib> 
 
 #ifdef WIN32

--- gw6c-config/src/gw6c_c_wrapper.cc.orig	2008-06-16 15:38:18.000000000 +0000
+++ gw6c-config/src/gw6c_c_wrapper.cc	2008-06-16 15:38:30.000000000 +0000
@@ -22,6 +22,9 @@
 #include <gw6cconfig/gw6cuistrings.h>
 using namespace gw6cconfig;
 #include <assert.h>
+#include <cstring>
+#include <cstdlib>
+
 
 #ifdef WIN32
 #define strcasecmp      _stricmp

--- gw6c-messaging/src/gw6c_c_wrapper.cc.orig	2008-06-16 15:39:04.000000000 +0000
+++ gw6c-messaging/src/gw6c_c_wrapper.cc	2008-06-16 15:39:20.000000000 +0000
@@ -17,6 +17,8 @@
 // Creation Date: December 2006
 // __________________________________________________________________________
 // **************************************************************************
+
+#include <cstring>
 #include <gw6cmessaging/gw6c_c_wrapper.h>
 #include <gw6cmessaging/clientmsgdataretriever.h>
 #include <gw6cmessaging/clientmessengerimpl.h>

--- gw6c-config/src/hap6devicemappingconfig.cc.orig	2008-06-16 15:40:58.000000000 +0000
+++ gw6c-config/src/hap6devicemappingconfig.cc	2008-06-16 15:41:09.000000000 +0000
@@ -22,6 +22,8 @@
 #include <gw6cconfig/hap6devicemappingconfig.h>
 #include <gw6cconfig/gw6cuistrings.h>
 #include <assert.h>
+#include <cstring>
+
 
 
 #ifdef WIN32

--- gw6c-config/src/hap6_devmap_c_wrap.cc.orig	2008-06-16 15:41:44.000000000 +0000
+++ gw6c-config/src/hap6_devmap_c_wrap.cc	2008-06-16 15:41:54.000000000 +0000
@@ -22,6 +22,8 @@
 #include <gw6cconfig/gw6cuistrings.h>
 using namespace gw6cconfig;
 #include <assert.h>
+#include <cstdlib>
+#include <cstring>
 
 #ifdef WIN32
 #define strcasecmp      _stricmp