diff -up ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/playback_static.cpp~ ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/playback_static.cpp
--- ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/playback_static.cpp~	2008-01-04 22:10:49.000000000 +0100
+++ ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/playback_static.cpp	2008-01-04 22:10:49.000000000 +0100
@@ -18,6 +18,7 @@
 
 #ifdef USE_CLANSOUND
 
+#include <string.h>
 #include <Sound/Sound/ClanSound/soundbuffer_static_clan.h>
 #include <Sound/Sound/ClanSound/cardplayback_clan.h>
 #include <Sound/Sound/ClanSound/playback_static.h>
diff -up ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/soundbuffer_static_clan.cpp~ ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/soundbuffer_static_clan.cpp
--- ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/soundbuffer_static_clan.cpp~	2008-01-04 22:10:28.000000000 +0100
+++ ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/soundbuffer_static_clan.cpp	2008-01-04 22:10:28.000000000 +0100
@@ -22,6 +22,7 @@
 
 #ifdef USE_CLANSOUND
 
+#include <string.h>
 #include <API/Sound/static_soundprovider.h>
 #include "API/Core/System/cl_assert.h"
 #include <Sound/Sound/Generic/cardsoundbuffer_playback.h>
diff -up ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/playback_stream.cpp~ ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/playback_stream.cpp
--- ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/playback_stream.cpp~	2008-01-04 22:17:25.000000000 +0100
+++ ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/playback_stream.cpp	2008-01-04 22:17:25.000000000 +0100
@@ -22,6 +22,7 @@
 
 #ifdef USE_CLANSOUND
 
+#include <string.h>
 #include <API/Core/System/mutex.h>
 #include <API/Sound/stream_soundprovider.h>
 #include "API/Core/System/cl_assert.h"
diff -up ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/mixer.cpp~ ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/mixer.cpp
--- ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/mixer.cpp~	2008-01-04 22:24:13.000000000 +0100
+++ ClanLib-0.6.5/Sources/Sound/Sound/ClanSound/mixer.cpp	2008-01-04 22:24:13.000000000 +0100
@@ -14,6 +14,8 @@
 #include <Sound/Sound/ClanSound/mixer.h>
 #include <Sound/Sound/ClanSound/cardplayback_clan.h>
 
+#include <string.h>
+
 #ifdef USE_I386_ASSEMBLER
 #if defined(__BORLANDC__) && !defined(USE_TASM)
   #undef USE_I386_ASSEMBLER
diff -up ClanLib-0.6.5/Sources/Sound/SoundProviders/static_provider_wave.cpp~ ClanLib-0.6.5/Sources/Sound/SoundProviders/static_provider_wave.cpp
--- ClanLib-0.6.5/Sources/Sound/SoundProviders/static_provider_wave.cpp~	2008-01-04 22:07:45.000000000 +0100
+++ ClanLib-0.6.5/Sources/Sound/SoundProviders/static_provider_wave.cpp	2008-01-04 22:07:45.000000000 +0100
@@ -20,6 +20,7 @@
 #pragma warning (disable:4786)
 #endif
 
+#include <string.h>
 #include "API/Core/IOData/cl_endian.h"
 #include "API/Core/IOData/inputsource_provider.h"
 #include "API/Core/IOData/inputsource.h"
diff -up ClanLib-0.6.5/Sources/Sound/SoundProviders/stream_provider_wave.cpp~ ClanLib-0.6.5/Sources/Sound/SoundProviders/stream_provider_wave.cpp
--- ClanLib-0.6.5/Sources/Sound/SoundProviders/stream_provider_wave.cpp~	2008-01-04 22:08:27.000000000 +0100
+++ ClanLib-0.6.5/Sources/Sound/SoundProviders/stream_provider_wave.cpp	2008-01-04 22:08:27.000000000 +0100
@@ -20,6 +20,7 @@
 #pragma warning (disable:4786)
 #endif
 
+#include <string.h>
 #include "API/Core/System/cl_assert.h"
 #include "API/Core/System/error.h"
 #include "API/Core/IOData/cl_endian.h"
diff -up ClanLib-0.6.5/Sources/Sound/SoundFilters/inverse_echofilter_generic.cpp~ ClanLib-0.6.5/Sources/Sound/SoundFilters/inverse_echofilter_generic.cpp
--- ClanLib-0.6.5/Sources/Sound/SoundFilters/inverse_echofilter_generic.cpp~	2008-01-04 22:08:58.000000000 +0100
+++ ClanLib-0.6.5/Sources/Sound/SoundFilters/inverse_echofilter_generic.cpp	2008-01-04 22:08:58.000000000 +0100
@@ -21,6 +21,7 @@
 #ifdef BORLAND
 #include <memory.h>
 #endif
+#include <string.h>
 
 CL_InverseEchoFilter::CL_InverseEchoFilter(int buffer_size)
 {
diff -up ClanLib-0.6.5/Sources/Core/precomp.h~ ClanLib-0.6.5/Sources/Core/precomp.h
--- ClanLib-0.6.5/Sources/Core/precomp.h~	2008-01-04 22:00:37.000000000 +0100
+++ ClanLib-0.6.5/Sources/Core/precomp.h	2008-01-04 22:00:37.000000000 +0100
@@ -33,6 +33,8 @@
 #include "API/signals.h"
 #include "API/Core/System/error.h"
 
+#include <string.h>
+
 #ifdef __BORLANDC__
 #define BAD_MATH
 #endif
diff -up ClanLib-0.6.5/Sources/Network/Generic/netvariables_generic.h~ ClanLib-0.6.5/Sources/Network/Generic/netvariables_generic.h
--- ClanLib-0.6.5/Sources/Network/Generic/netvariables_generic.h~	2008-01-04 22:55:25.000000000 +0100
+++ ClanLib-0.6.5/Sources/Network/Generic/netvariables_generic.h	2008-01-04 22:55:25.000000000 +0100
@@ -16,6 +16,7 @@
 #define header_netvariables_generic
 
 #include <list>
+#include <cstring>
 #include "API/Core/IOData/inputsource.h"
 #include "API/Core/IOData/outputsource.h"
 
diff -up ClanLib-0.6.5/Sources/Network/Generic/ip_address.cpp~ ClanLib-0.6.5/Sources/Network/Generic/ip_address.cpp
--- ClanLib-0.6.5/Sources/Network/Generic/ip_address.cpp~	2008-01-04 22:56:42.000000000 +0100
+++ ClanLib-0.6.5/Sources/Network/Generic/ip_address.cpp	2008-01-04 22:56:42.000000000 +0100
@@ -11,6 +11,7 @@
 
 	------------------------------------------------------------------------
 */
+#include <string.h>
 #include "API/Network/ip_address.h"
 #include "API/Core/System/error.h"
 
diff -up ClanLib-0.6.5/Sources/Network/Generic/socket_generic.cpp~ ClanLib-0.6.5/Sources/Network/Generic/socket_generic.cpp
--- ClanLib-0.6.5/Sources/Network/Generic/socket_generic.cpp~	2008-01-04 22:56:19.000000000 +0100
+++ ClanLib-0.6.5/Sources/Network/Generic/socket_generic.cpp	2008-01-04 22:56:19.000000000 +0100
@@ -16,6 +16,7 @@
 #pragma warning (disable:4786)
 #endif
 
+#include <string.h>
 #include "socket_generic.h"
 
 /////////////////////////////////////////////////////////////////////////////
diff -up ClanLib-0.6.5/Sources/Network/Generic/socket.cpp~ ClanLib-0.6.5/Sources/Network/Generic/socket.cpp
--- ClanLib-0.6.5/Sources/Network/Generic/socket.cpp~	2008-01-04 22:56:00.000000000 +0100
+++ ClanLib-0.6.5/Sources/Network/Generic/socket.cpp	2008-01-04 22:56:00.000000000 +0100
@@ -25,6 +25,7 @@
 #define INVALID_SOCKET -1
 #endif
 
+#include <string.h>
 #include "socket_generic.h"
 #include "API/Core/System/error.h"
 
diff -up ClanLib-0.6.5/Sources/Display/Display/X11/display_xwindow.h~ ClanLib-0.6.5/Sources/Display/Display/X11/display_xwindow.h
--- ClanLib-0.6.5/Sources/Display/Display/X11/display_xwindow.h~	2008-01-04 22:06:31.000000000 +0100
+++ ClanLib-0.6.5/Sources/Display/Display/X11/display_xwindow.h	2008-01-04 22:06:31.000000000 +0100
@@ -25,6 +25,7 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/cursorfont.h>
+#include <string.h>
 
 #include "target_ximage_std.h"
 #include "target_ximage_shm.h"
diff -up ClanLib-0.6.5/Sources/GUI/precomp.h~ ClanLib-0.6.5/Sources/GUI/precomp.h
--- ClanLib-0.6.5/Sources/GUI/precomp.h~	2008-01-04 22:17:09.000000000 +0100
+++ ClanLib-0.6.5/Sources/GUI/precomp.h	2008-01-04 22:17:09.000000000 +0100
@@ -4,6 +4,8 @@
 #ifdef WIN32
 #pragma warning (disable:4786)
 
+#include <string.h>
+
 // Framework
 #include "API/GUI/component.h"
 #include "API/GUI/component_manager.h"