--- six/carrier.h.orig	2004-07-19 10:30:51.000000000 +0200
+++ six/carrier.h	2008-01-10 14:52:10.000000000 +0100
@@ -4,6 +4,7 @@
 
 #include <iostream>
 #include <vector>
+#include <cstring>
 
 using std::vector;
 using std::istream;
--- six/hexgame.cpp.orig	2004-07-19 10:30:51.000000000 +0200
+++ six/hexgame.cpp	2008-01-10 14:46:30.000000000 +0100
@@ -3,6 +3,7 @@
 #include <cassert>
 #include <cctype>
 #include <cstdio>
+#include <cstdlib>
 
 #include <string>
 
--- six/main.cpp.orig	2004-07-19 10:30:51.000000000 +0200
+++ six/main.cpp	2008-01-10 15:18:16.000000000 +0100
@@ -11,6 +11,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <qfile.h>
+#include <cstdlib>
 
 using std::cin;
 
--- tests/testutil.cpp.orig	2004-07-19 10:30:57.000000000 +0200
+++ tests/testutil.cpp	2008-01-10 15:32:44.000000000 +0100
@@ -1,6 +1,8 @@
 #include "testutil.h"
 
 #include <ctype.h>
+#include <cstdlib>
+#include <cstring>
 
 vector<HexMove> parseMoves(const HexBoard &b, const char *s)
 {
--- tests/connectortest.cpp.orig	2004-07-19 10:30:57.000000000 +0200
+++ tests/connectortest.cpp	2008-01-10 15:48:57.000000000 +0100
@@ -11,6 +11,10 @@
 
 #include <sstream>
 #include <string>
+#include <algorithm>
+#include <climits>
+#include <cstdlib>
+
 
 using std::cout;
 using std::endl;