diff -ub libpqxx-2.6.8-orig/work/libpqxx-2.6.8/src/binarystring.cxx libpqxx-2.6.8/work/libpqxx-2.6.8/src/binarystring.cxx
--- libpqxx-2.6.8-orig/work/libpqxx-2.6.8/src/binarystring.cxx	2008-04-18 20:30:29.000000000 +0200
+++ libpqxx-2.6.8/work/libpqxx-2.6.8/src/binarystring.cxx	2008-04-18 20:35:23.000000000 +0200
@@ -18,6 +18,7 @@
 
 #include <new>
 #include <stdexcept>
+#include <cstring>
 
 #include "libpq-fe.h"
 
diff -ub libpqxx-2.6.8-orig/work/libpqxx-2.6.8/src/connection_base.cxx libpqxx-2.6.8/work/libpqxx-2.6.8/src/connection_base.cxx
--- libpqxx-2.6.8-orig/work/libpqxx-2.6.8/src/connection_base.cxx	2008-04-18 20:30:29.000000000 +0200
+++ libpqxx-2.6.8/work/libpqxx-2.6.8/src/connection_base.cxx	2008-04-18 20:35:05.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.8-orig/work/libpqxx-2.6.8/src/cursor.cxx libpqxx-2.6.8/work/libpqxx-2.6.8/src/cursor.cxx
--- libpqxx-2.6.8-orig/work/libpqxx-2.6.8/src/cursor.cxx	2008-04-18 20:30:29.000000000 +0200
+++ libpqxx-2.6.8/work/libpqxx-2.6.8/src/cursor.cxx	2008-04-18 20:35:57.000000000 +0200
@@ -17,6 +17,7 @@
  */
 #include "pqxx/compiler-internal.hxx"
 
+#include <cstring>
 #include <cstdlib>
 
 #include "pqxx/cursor"
diff -ub libpqxx-2.6.8-orig/work/libpqxx-2.6.8/src/result.cxx libpqxx-2.6.8/work/libpqxx-2.6.8/src/result.cxx
--- libpqxx-2.6.8-orig/work/libpqxx-2.6.8/src/result.cxx	2008-04-18 20:30:29.000000000 +0200
+++ libpqxx-2.6.8/work/libpqxx-2.6.8/src/result.cxx	2008-04-18 20:36:49.000000000 +0200
@@ -17,6 +17,8 @@
  */
 #include "pqxx/compiler-internal.hxx"
 
+#include <cstdlib>
+#include <cstring>
 #include <stdexcept>
 
 #include "libpq-fe.h"
diff -ub libpqxx-2.6.8-orig/work/libpqxx-2.6.8/src/transaction_base.cxx libpqxx-2.6.8/work/libpqxx-2.6.8/src/transaction_base.cxx
--- libpqxx-2.6.8-orig/work/libpqxx-2.6.8/src/transaction_base.cxx	2008-04-18 20:30:29.000000000 +0200
+++ libpqxx-2.6.8/work/libpqxx-2.6.8/src/transaction_base.cxx	2008-04-18 20:37:23.000000000 +0200
@@ -18,6 +18,7 @@
  */
 #include "pqxx/compiler-internal.hxx"
 
+#include <cstring>
 #include <stdexcept>
 
 #include "pqxx/connection_base"