diff -Naur synergy-1.3.1.orig/cmd/synergyc/synergyc.cpp synergy-1.3.1/cmd/synergyc/synergyc.cpp
--- synergy-1.3.1.orig/cmd/synergyc/synergyc.cpp	2006-03-22 06:40:27.000000000 +0100
+++ synergy-1.3.1/cmd/synergyc/synergyc.cpp	2009-06-09 14:10:13.994702715 +0200
@@ -31,6 +31,8 @@
 #include "LogOutputters.h"
 #include "CArch.h"
 #include "XArch.h"
+#include <stdlib.h>
+#include <string.h>
 #include <cstring>
 
 #define DAEMON_RUNNING(running_)
diff -Naur synergy-1.3.1.orig/cmd/synergys/synergys.cpp synergy-1.3.1/cmd/synergys/synergys.cpp
--- synergy-1.3.1.orig/cmd/synergys/synergys.cpp	2006-03-22 06:40:27.000000000 +0100
+++ synergy-1.3.1/cmd/synergys/synergys.cpp	2009-06-09 14:23:34.924174721 +0200
@@ -34,6 +34,8 @@
 #include "CArch.h"
 #include "XArch.h"
 #include "stdfstream.h"
+#include <stdlib.h>
+#include <string.h>
 #include <cstring>
 
 #define DAEMON_RUNNING(running_)
diff -Naur synergy-1.3.1.orig/lib/arch/CArchConsoleUnix.cpp synergy-1.3.1/lib/arch/CArchConsoleUnix.cpp
--- synergy-1.3.1.orig/lib/arch/CArchConsoleUnix.cpp	2006-03-13 05:24:50.000000000 +0100
+++ synergy-1.3.1/lib/arch/CArchConsoleUnix.cpp	2009-06-09 14:02:19.184100326 +0200
@@ -13,6 +13,7 @@
  */
 
 #include "CArchConsoleUnix.h"
+#include <stdio.h>
 #include <cstdio>
 
 //
diff -Naur synergy-1.3.1.orig/lib/arch/CArchDaemonUnix.cpp synergy-1.3.1/lib/arch/CArchDaemonUnix.cpp
--- synergy-1.3.1.orig/lib/arch/CArchDaemonUnix.cpp	2005-04-24 05:02:12.000000000 +0200
+++ synergy-1.3.1/lib/arch/CArchDaemonUnix.cpp	2009-06-09 14:14:09.599798911 +0200
@@ -14,6 +14,7 @@
 
 #include "CArchDaemonUnix.h"
 #include "XArchUnix.h"
+#include <stdlib.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff -Naur synergy-1.3.1.orig/lib/arch/CArchFileUnix.cpp synergy-1.3.1/lib/arch/CArchFileUnix.cpp
--- synergy-1.3.1.orig/lib/arch/CArchFileUnix.cpp	2005-04-24 05:02:12.000000000 +0200
+++ synergy-1.3.1/lib/arch/CArchFileUnix.cpp	2009-06-09 14:15:49.153779841 +0200
@@ -17,6 +17,7 @@
 #include <unistd.h>
 #include <pwd.h>
 #include <sys/types.h>
+#include <string.h>
 #include <cstring>
 
 //
diff -Naur synergy-1.3.1.orig/lib/arch/CMultibyte.cpp synergy-1.3.1/lib/arch/CMultibyte.cpp
--- synergy-1.3.1.orig/lib/arch/CMultibyte.cpp	2005-11-30 05:33:24.000000000 +0100
+++ synergy-1.3.1/lib/arch/CMultibyte.cpp	2009-06-09 14:16:46.786771988 +0200
@@ -17,6 +17,7 @@
 
 #include "common.h"
 #include "CArch.h"
+#include <stdlib.h>
 #include <limits.h>
 #include <string.h>
 #if HAVE_LOCALE_H
diff -Naur synergy-1.3.1.orig/lib/base/CEvent.cpp synergy-1.3.1/lib/base/CEvent.cpp
--- synergy-1.3.1.orig/lib/base/CEvent.cpp	2005-12-05 05:40:19.000000000 +0100
+++ synergy-1.3.1/lib/base/CEvent.cpp	2009-06-09 14:17:38.708035356 +0200
@@ -14,6 +14,7 @@
 
 #include "CEvent.h"
 #include "CEventQueue.h"
+#include <stdlib.h>
 
 //
 // CEvent
diff -Naur synergy-1.3.1.orig/lib/base/CLog.cpp synergy-1.3.1/lib/base/CLog.cpp
--- synergy-1.3.1.orig/lib/base/CLog.cpp	2006-03-13 05:24:50.000000000 +0100
+++ synergy-1.3.1/lib/base/CLog.cpp	2009-06-09 14:18:45.989760533 +0200
@@ -18,7 +18,9 @@
 #include "LogOutputters.h"
 #include "CArch.h"
 #include "Version.h"
+#include <stdio.h>
 #include <cstdio>
+#include <string.h>
 #include <cstring>
 
 // names of priorities
diff -Naur synergy-1.3.1.orig/lib/base/CStringUtil.cpp synergy-1.3.1/lib/base/CStringUtil.cpp
--- synergy-1.3.1.orig/lib/base/CStringUtil.cpp	2005-12-14 18:25:20.000000000 +0100
+++ synergy-1.3.1/lib/base/CStringUtil.cpp	2009-06-09 14:20:10.071923430 +0200
@@ -18,8 +18,10 @@
 #include "stdvector.h"
 #include <cctype>
 #include <cstdio>
+#include <stdlib.h>
 #include <cstdlib>
 #include <algorithm>
+#include <string.h>
 
 //
 // CStringUtil
diff -Naur synergy-1.3.1.orig/lib/client/CClient.cpp synergy-1.3.1/lib/client/CClient.cpp
--- synergy-1.3.1.orig/lib/client/CClient.cpp	2006-03-09 05:07:17.000000000 +0100
+++ synergy-1.3.1/lib/client/CClient.cpp	2009-06-09 14:05:58.549027874 +0200
@@ -26,6 +26,8 @@
 #include "CLog.h"
 #include "IEventQueue.h"
 #include "TMethodEventJob.h"
+#include <stdlib.h>
+#include <string.h>
 
 //
 // CClient
diff -Naur synergy-1.3.1.orig/lib/client/CServerProxy.cpp synergy-1.3.1/lib/client/CServerProxy.cpp
--- synergy-1.3.1.orig/lib/client/CServerProxy.cpp	2006-04-02 03:47:03.000000000 +0200
+++ synergy-1.3.1/lib/client/CServerProxy.cpp	2009-06-09 14:06:55.366262107 +0200
@@ -24,6 +24,7 @@
 #include "TMethodEventJob.h"
 #include "XBase.h"
 #include <memory>
+#include <string.h>
 
 //
 // CServerProxy
diff -Naur synergy-1.3.1.orig/lib/net/CNetworkAddress.cpp synergy-1.3.1/lib/net/CNetworkAddress.cpp
--- synergy-1.3.1.orig/lib/net/CNetworkAddress.cpp	2005-04-24 05:02:15.000000000 +0200
+++ synergy-1.3.1/lib/net/CNetworkAddress.cpp	2009-06-09 14:21:03.640895097 +0200
@@ -16,6 +16,7 @@
 #include "XSocket.h"
 #include "CArch.h"
 #include "XArch.h"
+#include <stdlib.h>
 #include <cstdlib>
 
 //
diff -Naur synergy-1.3.1.orig/lib/net/CTCPSocket.cpp synergy-1.3.1/lib/net/CTCPSocket.cpp
--- synergy-1.3.1.orig/lib/net/CTCPSocket.cpp	2006-04-02 03:47:03.000000000 +0200
+++ synergy-1.3.1/lib/net/CTCPSocket.cpp	2009-06-09 14:21:50.506118918 +0200
@@ -23,6 +23,7 @@
 #include "IEventJob.h"
 #include "CArch.h"
 #include "XArch.h"
+#include <stdlib.h>
 #include <string.h>
 
 //
diff -Naur synergy-1.3.1.orig/lib/platform/CXWindowsClipboard.cpp synergy-1.3.1/lib/platform/CXWindowsClipboard.cpp
--- synergy-1.3.1.orig/lib/platform/CXWindowsClipboard.cpp	2006-04-02 03:47:03.000000000 +0200
+++ synergy-1.3.1/lib/platform/CXWindowsClipboard.cpp	2009-06-09 14:03:34.802358483 +0200
@@ -24,6 +24,7 @@
 #include "CStopwatch.h"
 #include "CArch.h"
 #include "stdvector.h"
+#include <stdio.h>
 #include <cstdio>
 #include <X11/Xatom.h>
 
diff -Naur synergy-1.3.1.orig/lib/platform/CXWindowsScreen.cpp synergy-1.3.1/lib/platform/CXWindowsScreen.cpp
--- synergy-1.3.1.orig/lib/platform/CXWindowsScreen.cpp	2006-04-02 21:16:39.000000000 +0200
+++ synergy-1.3.1/lib/platform/CXWindowsScreen.cpp	2009-06-09 14:04:54.516279950 +0200
@@ -26,6 +26,8 @@
 #include "CStringUtil.h"
 #include "IEventQueue.h"
 #include "TMethodEventJob.h"
+#include <stdlib.h>
+#include <string.h>
 #include <cstring>
 #if X_DISPLAY_MISSING
 #	error X11 is required to build synergy
diff -Naur synergy-1.3.1.orig/lib/server/CClientProxy1_0.cpp synergy-1.3.1/lib/server/CClientProxy1_0.cpp
--- synergy-1.3.1.orig/lib/server/CClientProxy1_0.cpp	2006-04-02 03:47:03.000000000 +0200
+++ synergy-1.3.1/lib/server/CClientProxy1_0.cpp	2009-06-09 14:07:38.631343065 +0200
@@ -19,6 +19,7 @@
 #include "CLog.h"
 #include "IEventQueue.h"
 #include "TMethodEventJob.h"
+#include <string.h>
 #include <cstring>
 
 //
diff -Naur synergy-1.3.1.orig/lib/server/CClientProxy1_3.cpp synergy-1.3.1/lib/server/CClientProxy1_3.cpp
--- synergy-1.3.1.orig/lib/server/CClientProxy1_3.cpp	2006-02-12 20:53:43.000000000 +0100
+++ synergy-1.3.1/lib/server/CClientProxy1_3.cpp	2009-06-09 14:08:11.431368486 +0200
@@ -17,6 +17,7 @@
 #include "CLog.h"
 #include "IEventQueue.h"
 #include "TMethodEventJob.h"
+#include <string.h>
 
 //
 // CClientProxy1_3
diff -Naur synergy-1.3.1.orig/lib/server/CServer.cpp synergy-1.3.1/lib/server/CServer.cpp
--- synergy-1.3.1.orig/lib/server/CServer.cpp	2006-04-02 03:47:04.000000000 +0200
+++ synergy-1.3.1/lib/server/CServer.cpp	2009-06-09 14:09:08.746076954 +0200
@@ -28,6 +28,7 @@
 #include "CLog.h"
 #include "TMethodEventJob.h"
 #include "CArch.h"
+#include <stdlib.h>
 #include <string.h>
 
 //
diff -Naur synergy-1.3.1.orig/lib/synergy/CPacketStreamFilter.cpp synergy-1.3.1/lib/synergy/CPacketStreamFilter.cpp
--- synergy-1.3.1.orig/lib/synergy/CPacketStreamFilter.cpp	2005-04-24 05:02:16.000000000 +0200
+++ synergy-1.3.1/lib/synergy/CPacketStreamFilter.cpp	2009-06-09 13:59:42.668551304 +0200
@@ -16,6 +16,7 @@
 #include "IEventQueue.h"
 #include "CLock.h"
 #include "TMethodEventJob.h"
+#include <string.h>
 
 //
 // CPacketStreamFilter
diff -Naur synergy-1.3.1.orig/lib/synergy/CProtocolUtil.cpp synergy-1.3.1/lib/synergy/CProtocolUtil.cpp
--- synergy-1.3.1.orig/lib/synergy/CProtocolUtil.cpp	2005-04-24 05:02:16.000000000 +0200
+++ synergy-1.3.1/lib/synergy/CProtocolUtil.cpp	2009-06-09 14:02:40.432696723 +0200
@@ -17,6 +17,7 @@
 #include "CLog.h"
 #include "stdvector.h"
 #include <cctype>
+#include <string.h>
 #include <cstring>
 
 //
diff -Naur synergy-1.3.1.orig/lib/synergy/IKeyState.cpp synergy-1.3.1/lib/synergy/IKeyState.cpp
--- synergy-1.3.1.orig/lib/synergy/IKeyState.cpp	2006-03-22 06:40:27.000000000 +0100
+++ synergy-1.3.1/lib/synergy/IKeyState.cpp	2009-06-09 14:01:20.479022572 +0200
@@ -13,6 +13,7 @@
  */
 
 #include "IKeyState.h"
+#include <stdlib.h>
 #include <string.h>
 
 //
diff -Naur synergy-1.3.1.orig/lib/synergy/IPrimaryScreen.cpp synergy-1.3.1/lib/synergy/IPrimaryScreen.cpp
--- synergy-1.3.1.orig/lib/synergy/IPrimaryScreen.cpp	2006-03-22 06:40:27.000000000 +0100
+++ synergy-1.3.1/lib/synergy/IPrimaryScreen.cpp	2009-06-09 14:01:59.743897283 +0200
@@ -13,6 +13,7 @@
  */
 
 #include "IPrimaryScreen.h"
+#include <stdlib.h>
 
 //
 // IPrimaryScreen