--- ./artsc/artscbackend.cc.orig	2008-06-11 00:49:37.000000000 +0200
+++ ./artsc/artscbackend.cc	2008-06-11 00:49:44.000000000 +0200
@@ -31,6 +31,7 @@
 #include <queue>
 
 #include <stdio.h>
+#include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <math.h>
--- ./flow/audioio.cc.orig	2008-06-11 00:30:59.000000000 +0200
+++ ./flow/audioio.cc	2008-06-11 00:31:05.000000000 +0200
@@ -24,6 +24,7 @@
 #include <map>
 #include <list>
 #include <assert.h>
+#include <string.h>
 
 using namespace Arts;
 using namespace std;
--- ./flow/audioionull.cc.orig	2008-06-11 00:32:06.000000000 +0200
+++ ./flow/audioionull.cc	2008-06-11 00:32:12.000000000 +0200
@@ -34,6 +34,7 @@
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 #include <iostream>
 #include <algorithm>
--- ./flow/audioiooss.cc.orig	2008-06-11 00:31:27.000000000 +0200
+++ ./flow/audioiooss.cc	2008-06-11 00:31:37.000000000 +0200
@@ -51,6 +51,7 @@
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 #include <iostream>
 #include <algorithm>
--- ./flow/audioioossthreaded.cc.orig	2008-06-11 00:41:40.000000000 +0200
+++ ./flow/audioioossthreaded.cc	2008-06-11 00:41:48.000000000 +0200
@@ -52,6 +52,7 @@
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 #include <iostream>
 #include <algorithm>
--- ./flow/audiosubsys.cc.orig	2008-06-11 00:24:30.000000000 +0200
+++ ./flow/audiosubsys.cc	2008-06-11 00:24:39.000000000 +0200
@@ -41,6 +41,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
+#include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <iostream>
--- ./flow/bytestreamtoaudio_impl.cc.orig	2008-06-11 00:28:31.000000000 +0200
+++ ./flow/bytestreamtoaudio_impl.cc	2008-06-11 00:28:39.000000000 +0200
@@ -24,6 +24,8 @@
 #include "stdsynthmodule.h"
 #include "resample.h"
 
+#include <string.h>
+
 using namespace std;
 using namespace Arts;
 
--- ./flow/datahandle_impl.cc.orig	2008-06-11 00:42:09.000000000 +0200
+++ ./flow/datahandle_impl.cc	2008-06-11 00:42:19.000000000 +0200
@@ -29,6 +29,8 @@
 #include <algorithm>
 #include <gslpp/datahandle.h>
 
+#include <string.h>
+
 using namespace std;
 
 namespace Arts {
--- ./flow/pipebuffer.cc.orig	2008-06-11 00:25:10.000000000 +0200
+++ ./flow/pipebuffer.cc	2008-06-11 00:25:16.000000000 +0200
@@ -22,6 +22,7 @@
 
 #include "pipebuffer.h"
 #include <assert.h>
+#include <string.h>
 
 using namespace std;
 using namespace Arts;
--- ./flow/stereovolumecontrol_impl.cc.orig	2008-06-11 00:29:16.000000000 +0200
+++ ./flow/stereovolumecontrol_impl.cc	2008-06-11 00:29:23.000000000 +0200
@@ -25,6 +25,7 @@
 #include "stdsynthmodule.h"
 #include "flowsystem.h"
 #include <debug.h>
+#include <string.h>
 
 using namespace Arts;
 
--- ./flow/synth_play_wav_impl.cc.orig	2008-06-11 00:26:51.000000000 +0200
+++ ./flow/synth_play_wav_impl.cc	2008-06-11 00:27:08.000000000 +0200
@@ -29,6 +29,9 @@
 #include "convert.h"
 #include <stdio.h>
 #include <iostream>
+#include <stdlib.h>
+#include <string.h>
+#include <limits.h>
 
 extern "C" {
 /* Some versions of libaudiofile seem to lack the extern "C" declaration,
--- ./flow/synth_record_impl.cc.orig	2008-06-11 00:30:18.000000000 +0200
+++ ./flow/synth_record_impl.cc	2008-06-11 00:30:25.000000000 +0200
@@ -31,6 +31,7 @@
 #include "stdsynthmodule.h"
 #include <stdio.h>
 #include <iostream>
+#include <string.h>
 
 #undef DEBUG_WAVEFORM
 #ifdef DEBUG_WAVEFORM
--- ./mcop/dispatcher.cc.orig	2008-06-11 00:04:03.000000000 +0200
+++ ./mcop/dispatcher.cc	2008-06-11 00:04:14.000000000 +0200
@@ -38,6 +38,8 @@
 #include <sys/stat.h>
 #include <stdio.h>
 #include <signal.h>
+#include <string.h>
+#include <stdlib.h>
 #include <errno.h>
 #include <iostream>
 
--- ./mcop/mcoputils.cc.orig	2008-06-11 00:12:29.000000000 +0200
+++ ./mcop/mcoputils.cc	2008-06-11 00:12:41.000000000 +0200
@@ -32,6 +32,8 @@
 #include <errno.h>
 #include <config.h>
 #include <ctype.h>
+#include <string.h>
+#include <stdlib.h>
 #include <stdio.h>
 #include <map>
 	
--- ./mcop/object.cc.orig	2008-06-11 00:05:11.000000000 +0200
+++ ./mcop/object.cc	2008-06-11 00:05:19.000000000 +0200
@@ -28,6 +28,7 @@
 #include "debug.h"
 #include "anyref.h"
 #include <stdio.h>
+#include <stdlib.h>
 #include <iostream>
 
 using namespace std;
--- ./mcop/tcpconnection.cc.orig	2008-06-11 00:06:13.000000000 +0200
+++ ./mcop/tcpconnection.cc	2008-06-11 00:06:20.000000000 +0200
@@ -25,6 +25,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <stdio.h>
+#include <stdlib.h>
 #define queue cqueue
 #include <netdb.h>
 #undef queue
--- ./mcop/trader_impl.cc.orig	2008-06-11 00:17:28.000000000 +0200
+++ ./mcop/trader_impl.cc	2008-06-11 00:17:36.000000000 +0200
@@ -29,6 +29,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <dirent.h>
+#include <string.h>
 
 using namespace Arts;
 using namespace std;
--- ./mcop/unixconnection.cc.orig	2008-06-11 00:06:51.000000000 +0200
+++ ./mcop/unixconnection.cc	2008-06-11 00:06:57.000000000 +0200
@@ -26,6 +26,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <sys/un.h>
 #include <errno.h>
 
--- ./soundserver/artscat.cc.orig	2008-06-11 00:47:13.000000000 +0200
+++ ./soundserver/artscat.cc	2008-06-11 00:47:19.000000000 +0200
@@ -28,6 +28,7 @@
 #include "artsversion.h"
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <iostream>
--- ./soundserver/artsd.cc.orig	2008-06-11 00:45:29.000000000 +0200
+++ ./soundserver/artsd.cc	2008-06-11 00:45:36.000000000 +0200
@@ -29,6 +29,7 @@
 #include <math.h>
 #include <iostream>
 #include <stdio.h>
+#include <stdlib.h>
 #include "soundserver.h"
 #include "audiosubsys.h"
 #include "audioio.h"
--- ./soundserver/artsplay.cc.orig	2008-06-11 00:46:40.000000000 +0200
+++ ./soundserver/artsplay.cc	2008-06-11 00:46:46.000000000 +0200
@@ -31,6 +31,7 @@
 #include <unistd.h>
 #include <vector>
 #include <string>
+#include <string.h>
 #include <iostream>
 
 using namespace std;
--- ./soundserver/artsrec.cc.orig	2008-06-11 00:48:59.000000000 +0200
+++ ./soundserver/artsrec.cc	2008-06-11 00:49:05.000000000 +0200
@@ -31,6 +31,7 @@
 #include "debug.h"
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <iostream>
--- ./soundserver/artsshell.cc.orig	2008-06-11 00:48:13.000000000 +0200
+++ ./soundserver/artsshell.cc	2008-06-11 00:48:25.000000000 +0200
@@ -121,6 +121,8 @@
 #include "artsversion.h"
 #include "tradercheck.h"
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <math.h>
 
 bool quiet = false;
--- ./soundserver/crashhandler.h.orig	2008-06-11 00:45:13.000000000 +0200
+++ ./soundserver/crashhandler.h	2008-06-11 00:45:19.000000000 +0200
@@ -25,6 +25,7 @@
 #define __ARTS_CRASHHANDLER_H
 
 #include <string>
+#include <string.h>
 
 namespace Arts {
 
--- ./soundserver/fileinputstream_impl.cc.orig	2008-06-11 00:43:42.000000000 +0200
+++ ./soundserver/fileinputstream_impl.cc	2008-06-11 00:43:48.000000000 +0200
@@ -27,6 +27,7 @@
 #include <unistd.h>
 #include <sys/mman.h>
 #include <stdio.h>
+#include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <iostream>
--- ./soundserver/soundserverstartup_impl.cc.orig	2008-06-11 00:45:59.000000000 +0200
+++ ./soundserver/soundserverstartup_impl.cc	2008-06-11 00:46:06.000000000 +0200
@@ -23,6 +23,7 @@
 #include "debug.h"
 #include "soundserverstartup_impl.h"
 #include <sys/time.h>
+#include <stdlib.h>
 #include <time.h>
 
 using namespace Arts;
--- ./soundserver/soundserverv2_impl.cc.orig	2008-06-11 00:44:26.000000000 +0200
+++ ./soundserver/soundserverv2_impl.cc	2008-06-11 00:44:37.000000000 +0200
@@ -33,6 +33,8 @@
 #include "soundserverv2_impl.h"
 #include "artsversion.h"
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>