diff -aur osalp-0.7.3.old/aflib/aflibAudioEdit.cc osalp-0.7.3/aflib/aflibAudioEdit.cc
--- osalp-0.7.3.old/aflib/aflibAudioEdit.cc	2008-12-16 19:07:17.000000000 +0100
+++ osalp-0.7.3/aflib/aflibAudioEdit.cc	2008-12-16 19:15:12.000000000 +0100
@@ -27,6 +27,7 @@
 
 #include <stdio.h>
 #include <iostream>
+#include <cstdlib>
 
 using std::cerr;
 using std::cout;
diff -aur osalp-0.7.3.old/aflib/aflibAudioMixer.cc osalp-0.7.3/aflib/aflibAudioMixer.cc
--- osalp-0.7.3.old/aflib/aflibAudioMixer.cc	2008-12-16 19:07:17.000000000 +0100
+++ osalp-0.7.3/aflib/aflibAudioMixer.cc	2008-12-16 19:08:59.000000000 +0100
@@ -24,6 +24,7 @@
 #include <config.h>
 #endif
 
+#include <cstring>
 #include "aflibAudioMixer.h"
 #include "aflibData.h"
 
diff -aur osalp-0.7.3.old/aflib/aflibChain.cc osalp-0.7.3/aflib/aflibChain.cc
--- osalp-0.7.3.old/aflib/aflibChain.cc	2008-12-16 19:07:17.000000000 +0100
+++ osalp-0.7.3/aflib/aflibChain.cc	2008-12-16 19:14:43.000000000 +0100
@@ -25,6 +25,7 @@
 #endif
 
 #include <iostream>
+#include <cstdlib>
 #include "aflibChain.h"
 #include "aflibChainNode.h"
 
diff -aur osalp-0.7.3.old/aflib/aflibData.cc osalp-0.7.3/aflib/aflibData.cc
--- osalp-0.7.3.old/aflib/aflibData.cc	2008-12-16 19:07:17.000000000 +0100
+++ osalp-0.7.3/aflib/aflibData.cc	2008-12-16 19:11:38.000000000 +0100
@@ -27,6 +27,7 @@
 #include <stdio.h>
 #include <iostream>
 #include <string>
+#include <cstring>
 using std::cerr;
 using std::endl;
 
diff -aur osalp-0.7.3.old/aflib/aflibDateTime.cc osalp-0.7.3/aflib/aflibDateTime.cc
--- osalp-0.7.3.old/aflib/aflibDateTime.cc	2008-12-16 19:07:17.000000000 +0100
+++ osalp-0.7.3/aflib/aflibDateTime.cc	2008-12-16 19:11:13.000000000 +0100
@@ -27,6 +27,7 @@
 
 #include <stdio.h>
 #include <time.h>
+#include <cstdlib>
 
 #include "aflib.h"
 #include "aflibDateTime.h"
diff -aur osalp-0.7.3.old/aflib/aflibEnvFile.cc osalp-0.7.3/aflib/aflibEnvFile.cc
--- osalp-0.7.3.old/aflib/aflibEnvFile.cc	2008-12-16 19:07:17.000000000 +0100
+++ osalp-0.7.3/aflib/aflibEnvFile.cc	2008-12-16 19:09:57.000000000 +0100
@@ -29,6 +29,7 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <iostream>
+#include <cstring>
 using std::cerr;
 using std::endl;
 
diff -aur osalp-0.7.3.old/aflib/aflibFile.cc osalp-0.7.3/aflib/aflibFile.cc
--- osalp-0.7.3.old/aflib/aflibFile.cc	2008-12-16 19:07:17.000000000 +0100
+++ osalp-0.7.3/aflib/aflibFile.cc	2008-12-16 19:12:02.000000000 +0100
@@ -36,6 +36,7 @@
 #include <dlfcn.h>
 #include <unistd.h> // for setenv and unsetenv
 #include <iostream>
+#include <cstring>
 using std::cerr;
 using std::endl;
 
diff -aur osalp-0.7.3.old/aflib/aflibMemCache.cc osalp-0.7.3/aflib/aflibMemCache.cc
--- osalp-0.7.3.old/aflib/aflibMemCache.cc	2008-12-16 19:07:17.000000000 +0100
+++ osalp-0.7.3/aflib/aflibMemCache.cc	2008-12-16 19:09:25.000000000 +0100
@@ -24,7 +24,7 @@
 #include <config.h>
 #endif
 
-
+#include <cstdlib>
 #include "aflibMemCache.h"
 #include "aflibMemNode.h"
 #include "aflib.h"
diff -aur osalp-0.7.3.old/aflib/aflibRecorderItem.cc osalp-0.7.3/aflib/aflibRecorderItem.cc
--- osalp-0.7.3.old/aflib/aflibRecorderItem.cc	2008-12-16 19:07:17.000000000 +0100
+++ osalp-0.7.3/aflib/aflibRecorderItem.cc	2008-12-16 19:10:38.000000000 +0100
@@ -25,6 +25,7 @@
 #endif
 
 #include <stdio.h>
+#include <cstring>
 
 #include "aflib.h"
 #include "aflibRecorderItem.h"
diff -aur osalp-0.7.3.old/formatlib/aifc/aflibAifcFile.cc osalp-0.7.3/formatlib/aifc/aflibAifcFile.cc
--- osalp-0.7.3.old/formatlib/aifc/aflibAifcFile.cc	2008-12-16 19:07:17.000000000 +0100
+++ osalp-0.7.3/formatlib/aifc/aflibAifcFile.cc	2008-12-16 19:17:37.000000000 +0100
@@ -30,7 +30,10 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <iostream.h>
+#include <iostream>
+
+using std::cerr;
+using std::endl;
 
 #include "aflibAifcFile.h"
 #include "aflibData.h"
diff -aur osalp-0.7.3.old/formatlib/oss/aflibDevFile.cc osalp-0.7.3/formatlib/oss/aflibDevFile.cc
--- osalp-0.7.3.old/formatlib/oss/aflibDevFile.cc	2008-12-16 19:07:17.000000000 +0100
+++ osalp-0.7.3/formatlib/oss/aflibDevFile.cc	2008-12-16 19:16:32.000000000 +0100
@@ -28,13 +28,17 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <iostream.h>
+#include <iostream>
 #include <sys/ioctl.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/soundcard.h>
 #include <string.h>
 
+using std::cout;
+using std::endl;
+using std::cerr;
+
 #include "aflibDevFile.h"
 #include "aflibData.h"
 #include "aflibFileItem.h"