diff -ruN hugin-0.7_beta4.orig/src/foreign/vigra/imageinfo.hxx hugin-0.7_beta4.neu/src/foreign/vigra/imageinfo.hxx
--- hugin-0.7_beta4.orig/src/foreign/vigra/imageinfo.hxx	2008-08-16 07:29:12.000000000 +0200
+++ hugin-0.7_beta4.neu/src/foreign/vigra/imageinfo.hxx	2008-08-16 09:06:11.000000000 +0200
@@ -54,6 +54,9 @@
 #include <string>
 #include "vigra/utilities.hxx"
 #include "vigra/codec.hxx"
+#include <cstring>
+#include <cstdlib>
+using namespace std;
 
 namespace vigra
 {
diff -ruN hugin-0.7_beta4.orig/src/include/common/utils.h hugin-0.7_beta4.neu/src/include/common/utils.h
--- hugin-0.7_beta4.orig/src/include/common/utils.h	2008-08-16 07:29:12.000000000 +0200
+++ hugin-0.7_beta4.neu/src/include/common/utils.h	2008-08-16 09:01:24.000000000 +0200
@@ -29,6 +29,9 @@
 #include <iostream>
 #include <sstream>
 #include <cassert>
+#include <cstring>
+#include <cstdlib>
+using namespace std;
 
 #include "platform.h"
 
diff -ruN hugin-0.7_beta4.orig/src/tools/color_correct_tiff.cpp hugin-0.7_beta4.neu/src/tools/color_correct_tiff.cpp
--- hugin-0.7_beta4.orig/src/tools/color_correct_tiff.cpp	2008-08-16 07:29:12.000000000 +0200
+++ hugin-0.7_beta4.neu/src/tools/color_correct_tiff.cpp	2008-08-16 09:28:34.000000000 +0200
@@ -16,13 +16,14 @@
 #include <iostream>
 #include <sstream>
 #include <exception>
-#include <string>
+#include <cstring>
 #include <vector>
 #include <map>
 #include <utility>
 #include <cctype>
 #include <cmath>
 #include <tiffio.h>
+#include <cstdlib>
 
 /**
  * Makes a string from an int.