diff -up afflib-3.1.3/lib/s3_glue.h.gcc43 afflib-3.1.3/lib/s3_glue.h
--- afflib-3.1.3/lib/s3_glue.h.gcc43	2008-03-12 18:58:28.000000000 +0100
+++ afflib-3.1.3/lib/s3_glue.h	2008-03-12 18:59:25.000000000 +0100
@@ -17,6 +17,8 @@
 #include <string>
 #include <map>
 #include <vector>
+#include <cstring>                          // memcpy, strcmp, strlen
+#include <algorithm>                        // sort
 
 #define S3_DEFAULT_BUCKET "S3_DEFAULT_BUCKET"
 #define S3_DEBUG   "S3_DEBUG"
diff -up afflib-3.3.2/lib/utils.h.gcc43 afflib-3.3.2/lib/utils.h
--- afflib-3.3.2/lib/utils.h.gcc43	2008-09-04 18:36:08.000000000 +0200
+++ afflib-3.3.2/lib/utils.h	2008-09-04 18:37:24.000000000 +0200
@@ -11,6 +11,7 @@
 #include <cstdlib>
 #include <vector>
 #include <string>
+#include <cstring>
 #include <map>
 #include <iostream>