diff -urp oprofile-0.9.3-orig/gui/oprof_start_util.cpp oprofile-0.9.3/gui/oprof_start_util.cpp
--- oprofile-0.9.3-orig/gui/oprof_start_util.cpp	2007-07-16 20:22:17.000000000 +0200
+++ oprofile-0.9.3/gui/oprof_start_util.cpp	2008-05-04 18:52:58.000000000 +0200
@@ -19,6 +19,7 @@
 #include <sstream>
 #include <iostream>
 #include <fstream>
+#include <cstdlib>
 
 #include <qfiledialog.h>
 #include <qmessagebox.h>
diff -urp oprofile-0.9.3-orig/libabi/opimport.cpp oprofile-0.9.3/libabi/opimport.cpp
--- oprofile-0.9.3-orig/libabi/opimport.cpp	2007-07-16 20:22:17.000000000 +0200
+++ oprofile-0.9.3/libabi/opimport.cpp	2008-05-04 18:52:58.000000000 +0200
@@ -17,6 +17,8 @@
 #include <iostream>
 #include <vector>
 #include <cassert>
+#include <cstring>
+#include <cstdlib>
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff -urp oprofile-0.9.3-orig/libpp/op_header.cpp oprofile-0.9.3/libpp/op_header.cpp
--- oprofile-0.9.3-orig/libpp/op_header.cpp	2007-07-16 20:22:17.000000000 +0200
+++ oprofile-0.9.3/libpp/op_header.cpp	2008-05-04 18:52:58.000000000 +0200
@@ -14,6 +14,7 @@
 #include <iomanip>
 #include <set>
 #include <sstream>
+#include <cstring>
 
 #include "op_exception.h"
 #include "odb.h"
Only in oprofile-0.9.3/libpp: op_header.cpp.orig
diff -urp oprofile-0.9.3-orig/libpp/profile.cpp oprofile-0.9.3/libpp/profile.cpp
--- oprofile-0.9.3-orig/libpp/profile.cpp	2007-07-16 20:22:17.000000000 +0200
+++ oprofile-0.9.3/libpp/profile.cpp	2008-05-04 18:52:58.000000000 +0200
@@ -15,6 +15,7 @@
 #include <iostream>
 #include <string>
 #include <sstream>
+#include <cstring>
 
 #include <cerrno>
 
diff -urp oprofile-0.9.3-orig/libpp/sample_container.cpp oprofile-0.9.3/libpp/sample_container.cpp
--- oprofile-0.9.3-orig/libpp/sample_container.cpp	2007-07-16 20:22:17.000000000 +0200
+++ oprofile-0.9.3/libpp/sample_container.cpp	2008-05-04 18:52:58.000000000 +0200
@@ -9,6 +9,7 @@
  * @author John Levon
  */
 
+#include <climits>
 #include <set>
 #include <numeric>
 #include <algorithm>
diff -urp oprofile-0.9.3-orig/libregex/demangle_symbol.cpp oprofile-0.9.3/libregex/demangle_symbol.cpp
--- oprofile-0.9.3-orig/libregex/demangle_symbol.cpp	2007-07-16 20:22:17.000000000 +0200
+++ oprofile-0.9.3/libregex/demangle_symbol.cpp	2008-05-04 18:52:58.000000000 +0200
@@ -8,6 +8,8 @@
  * @author John Levon
  */
 
+#include <cstdlib>
+
 #include "config.h"
 
 #include "demangle_symbol.h"
diff -urp oprofile-0.9.3-orig/libutil++/bfd_spu_support.cpp oprofile-0.9.3/libutil++/bfd_spu_support.cpp
--- oprofile-0.9.3-orig/libutil++/bfd_spu_support.cpp	2007-07-16 20:22:17.000000000 +0200
+++ oprofile-0.9.3/libutil++/bfd_spu_support.cpp	2008-05-04 18:52:58.000000000 +0200
@@ -19,6 +19,7 @@
 #include <fstream>
 #include <sstream>
 #include <string>
+#include <cstring>
 #include <sys/types.h>
 
 struct spu_elf {
Only in oprofile-0.9.3/libutil++: bfd_spu_support.cpp.orig
diff -urp oprofile-0.9.3-orig/libutil++/bfd_support.cpp oprofile-0.9.3/libutil++/bfd_support.cpp
--- oprofile-0.9.3-orig/libutil++/bfd_support.cpp	2007-07-16 20:22:17.000000000 +0200
+++ oprofile-0.9.3/libutil++/bfd_support.cpp	2008-05-04 18:52:58.000000000 +0200
@@ -19,6 +19,8 @@
 #include <fstream>
 #include <sstream>
 #include <string>
+#include <cstring>
+#include <cstdlib>
 
 using namespace std;
 
diff -urp oprofile-0.9.3-orig/libutil++/child_reader.cpp oprofile-0.9.3/libutil++/child_reader.cpp
--- oprofile-0.9.3-orig/libutil++/child_reader.cpp	2007-07-16 20:22:17.000000000 +0200
+++ oprofile-0.9.3/libutil++/child_reader.cpp	2008-05-04 18:52:58.000000000 +0200
@@ -11,10 +11,13 @@
 
 #include <unistd.h>
 #include <sys/wait.h>
+#include <limits.h>
 
 #include <cerrno>
 #include <sstream>
 #include <iostream>
+#include <cstring>
+#include <cstdlib>
 
 #include "op_libiberty.h"
 #include "child_reader.h"
diff -urp oprofile-0.9.3-orig/libutil++/cverb.cpp oprofile-0.9.3/libutil++/cverb.cpp
--- oprofile-0.9.3-orig/libutil++/cverb.cpp	2007-07-16 20:22:17.000000000 +0200
+++ oprofile-0.9.3/libutil++/cverb.cpp	2008-05-04 18:52:58.000000000 +0200
@@ -13,6 +13,7 @@
 #include <iostream>
 #include <map>
 #include <string>
+#include <cstring>
 
 #include "cverb.h"
 
diff -urp oprofile-0.9.3-orig/libutil++/file_manip.cpp oprofile-0.9.3/libutil++/file_manip.cpp
--- oprofile-0.9.3-orig/libutil++/file_manip.cpp	2007-07-16 20:22:17.000000000 +0200
+++ oprofile-0.9.3/libutil++/file_manip.cpp	2008-05-04 18:52:58.000000000 +0200
@@ -15,6 +15,8 @@
 #include <dirent.h>
 #include <fnmatch.h>
 #include <utime.h>
+#include <limits.h>
+#include <stdlib.h>
 
 #include <cstdio>
 #include <cerrno>
diff -urp oprofile-0.9.3-orig/libutil++/op_spu_bfd.cpp oprofile-0.9.3/libutil++/op_spu_bfd.cpp
--- oprofile-0.9.3-orig/libutil++/op_spu_bfd.cpp	2007-07-16 20:22:17.000000000 +0200
+++ oprofile-0.9.3/libutil++/op_spu_bfd.cpp	2008-05-04 18:52:58.000000000 +0200
@@ -14,6 +14,8 @@
 #include <sys/stat.h>
 
 #include <iostream>
+#include <cstring>
+#include <cstdlib>
 
 #include "op_bfd.h"
 #include "op_libiberty.h"
Only in oprofile-0.9.3/libutil++: op_spu_bfd.cpp.orig
diff -urp oprofile-0.9.3-orig/pp/common_option.cpp oprofile-0.9.3/pp/common_option.cpp
--- oprofile-0.9.3-orig/pp/common_option.cpp	2007-07-16 20:22:17.000000000 +0200
+++ oprofile-0.9.3/pp/common_option.cpp	2008-05-04 18:52:58.000000000 +0200
@@ -12,6 +12,7 @@
 #include <iostream>
 #include <sstream>
 #include <iterator>
+#include <cstdlib>
 
 #include "op_config.h"
 #include "locate_images.h"
diff -urp oprofile-0.9.3-orig/pp/opannotate_options.cpp oprofile-0.9.3/pp/opannotate_options.cpp
--- oprofile-0.9.3-orig/pp/opannotate_options.cpp	2007-07-16 20:22:17.000000000 +0200
+++ oprofile-0.9.3/pp/opannotate_options.cpp	2008-05-04 18:52:58.000000000 +0200
@@ -13,6 +13,7 @@
 #include <list>
 #include <iterator>
 #include <iostream>
+#include <cstdlib>
 
 #include "profile_spec.h"
 #include "arrange_profiles.h"
diff -urp oprofile-0.9.3-orig/pp/oparchive.cpp oprofile-0.9.3/pp/oparchive.cpp
--- oprofile-0.9.3-orig/pp/oparchive.cpp	2007-07-16 20:22:17.000000000 +0200
+++ oprofile-0.9.3/pp/oparchive.cpp	2008-05-04 18:52:58.000000000 +0200
@@ -12,6 +12,7 @@
 
 #include <iostream>
 #include <fstream>
+#include <cstdlib>
 
 #include <errno.h>
 #include <string.h>
diff -urp oprofile-0.9.3-orig/pp/opgprof_options.cpp oprofile-0.9.3/pp/opgprof_options.cpp
--- oprofile-0.9.3-orig/pp/opgprof_options.cpp	2007-07-16 20:22:17.000000000 +0200
+++ oprofile-0.9.3/pp/opgprof_options.cpp	2008-05-04 18:52:58.000000000 +0200
@@ -13,6 +13,7 @@
 #include <list>
 #include <iterator>
 #include <iostream>
+#include <cstdlib>
 
 #include "opgprof_options.h"
 #include "popt_options.h"
diff -urp oprofile-0.9.3-orig/libabi/tests/abi_test.cpp oprofile-0.9.3/libabi/tests/abi_test.cpp
--- oprofile-0.9.3-orig/libabi/tests/abi_test.cpp	2007-07-16 20:22:17.000000000 +0200
+++ oprofile-0.9.3/libabi/tests/abi_test.cpp	2008-05-23 14:31:44.000000000 +0200
@@ -17,6 +17,8 @@
 
 #include <fstream>
 #include <iostream>
+#include <cstdlib>
+#include <cstring>
 
 using namespace std;
 
diff -urp oprofile-0.9.3-orig/libregex/tests/regex_test.cpp oprofile-0.9.3/libregex/tests/regex_test.cpp
--- oprofile-0.9.3-orig/libregex/tests/regex_test.cpp	2007-07-16 20:22:17.000000000 +0200
+++ oprofile-0.9.3/libregex/tests/regex_test.cpp	2008-05-23 14:32:25.000000000 +0200
@@ -20,6 +20,7 @@
 
 #include <iostream>
 #include <fstream>
+#include <cstdlib>
 
 using namespace std;