diff -ub ./libpqxx-2.6.9-orig/src/binarystring.cxx ./libpqxx-2.6.9/src/binarystring.cxx
--- ./libpqxx-2.6.9-orig/src/binarystring.cxx	2008-04-16 19:52:13.000000000 +0200
+++ ./libpqxx-2.6.9/src/binarystring.cxx	2008-04-16 19:52:39.000000000 +0200
@@ -18,6 +18,7 @@
 
 #include <new>
 #include <stdexcept>
+#include <cstring>
 
 #include "libpq-fe.h"
 
diff -ub ./libpqxx-2.6.9-orig/src/connection_base.cxx ./libpqxx-2.6.9/src/connection_base.cxx
--- ./libpqxx-2.6.9-orig/src/connection_base.cxx	2008-04-16 19:52:13.000000000 +0200
+++ ./libpqxx-2.6.9/src/connection_base.cxx	2008-04-16 19:53:10.000000000 +0200
@@ -22,6 +22,7 @@
 #include <cerrno>
 #include <cstdio>
 #include <ctime>
+#include <cstring>
 #include <stdexcept>
 
 #ifdef PQXX_HAVE_SYS_SELECT_H
diff -ub ./libpqxx-2.6.9-orig/src/cursor.cxx ./libpqxx-2.6.9/src/cursor.cxx
--- ./libpqxx-2.6.9-orig/src/cursor.cxx	2008-04-16 19:52:13.000000000 +0200
+++ ./libpqxx-2.6.9/src/cursor.cxx	2008-04-16 19:53:30.000000000 +0200
@@ -17,6 +17,7 @@
  */
 #include "pqxx/compiler-internal.hxx"
 
+#include <cstring>
 #include <cstdlib>
 
 #include "pqxx/cursor"
diff -ub ./libpqxx-2.6.9-orig/src/result.cxx ./libpqxx-2.6.9/src/result.cxx
--- ./libpqxx-2.6.9-orig/src/result.cxx	2008-04-16 19:52:13.000000000 +0200
+++ ./libpqxx-2.6.9/src/result.cxx	2008-04-16 19:54:02.000000000 +0200
@@ -18,6 +18,8 @@
 #include "pqxx/compiler-internal.hxx"
 
 #include <stdexcept>
+#include <cstring>
+#include <cstdlib>
 
 #include "libpq-fe.h"
 
diff -ub ./libpqxx-2.6.9-orig/src/transaction_base.cxx ./libpqxx-2.6.9/src/transaction_base.cxx
--- ./libpqxx-2.6.9-orig/src/transaction_base.cxx	2008-04-16 19:52:13.000000000 +0200
+++ ./libpqxx-2.6.9/src/transaction_base.cxx	2008-04-16 19:54:20.000000000 +0200
@@ -19,6 +19,7 @@
 #include "pqxx/compiler-internal.hxx"
 
 #include <stdexcept>
+#include <cstring>
 
 #include "pqxx/connection_base"
 #include "pqxx/result"