diff -NrU5 hugin-0.6.1.orig/src/common/utils.cpp hugin-0.6.1/src/common/utils.cpp
--- hugin-0.6.1.orig/src/common/utils.cpp	2006-07-25 23:13:27.000000000 +0200
+++ hugin-0.6.1/src/common/utils.cpp	2008-04-30 00:40:03.000000000 +0200
@@ -27,10 +27,11 @@
 #else
     #include <sys/time.h>
 #endif
 #include <time.h>
 #include <stdio.h>
+#include <cstring>
 #include "common/utils.h"
 
 #ifdef unix
 std::string utils::CurrentTime()
 {
diff -NrU5 hugin-0.6.1.orig/src/foreign/vigra/imageinfo.hxx hugin-0.6.1/src/foreign/vigra/imageinfo.hxx
--- hugin-0.6.1.orig/src/foreign/vigra/imageinfo.hxx	2006-08-09 22:48:44.000000000 +0200
+++ hugin-0.6.1/src/foreign/vigra/imageinfo.hxx	2008-04-30 00:43:14.000000000 +0200
@@ -50,10 +50,11 @@
 #ifndef VIGRA_IMAGEINFO_HXX
 #define VIGRA_IMAGEINFO_HXX
 
 #include <memory>
 #include <string>
+#include <cstring>
 #include "vigra/utilities.hxx"
 #include "vigra/codec.hxx"
 
 namespace vigra
 {
diff -NrU5 hugin-0.6.1.orig/src/include/common/utils.h hugin-0.6.1/src/include/common/utils.h
--- hugin-0.6.1.orig/src/include/common/utils.h	2006-01-09 16:33:16.000000000 +0100
+++ hugin-0.6.1/src/include/common/utils.h	2008-04-30 00:48:33.000000000 +0200
@@ -22,11 +22,13 @@
  */
 
 #ifndef _UTILS_H
 #define _UTILS_H
 
+#include <cstdlib>
 #include <string>
+#include <cstring>
 #include <vector>
 #include <iostream>
 #include <sstream>
 #include <cassert>
 
diff -NrU5 hugin-0.6.1.orig/src/tools/color_correct_tiff.cpp hugin-0.6.1/src/tools/color_correct_tiff.cpp
--- hugin-0.6.1.orig/src/tools/color_correct_tiff.cpp	2006-01-11 14:07:37.000000000 +0100
+++ hugin-0.6.1/src/tools/color_correct_tiff.cpp	2008-04-30 00:58:54.000000000 +0200
@@ -11,14 +11,15 @@
  * -c do per-channel correction (different correction on each RGB channel)
  * Images must be tiff, have the same size, have been aligned prior to correction
  * and have some opaque overlapping parts (ie use nona with multiple tiff output).
  */
 
+#include <cstdlib>
 #include <iostream>
 #include <sstream>
 #include <exception>
-#include <string>
+#include <cstring>
 #include <vector>
 #include <map>
 #include <utility>
 #include <cctype>
 #include <cmath>