--- ./source/capi/geos_c.cpp.orig	2008-07-02 17:37:37.000000000 +0100
+++ ./source/capi/geos_c.cpp	2008-07-02 17:37:58.000000000 +0100
@@ -15,8 +15,8 @@
  *
  ***********************************************************************/
 
-#include <stdio.h>
-
+#include <cstdio>
+#include <cstring>
 #include <string>
 #include <iostream>
 #include <sstream>
--- ./source/index/quadtree/DoubleBits.cpp.orig	2008-07-02 17:31:56.000000000 +0100
+++ ./source/index/quadtree/DoubleBits.cpp	2008-07-02 17:32:57.000000000 +0100
@@ -15,6 +15,7 @@
 
 #include <geos/indexQuadtree.h>
 #include <geos/util.h>
+#include <cstring>
 
 namespace geos {
 
--- ./source/io/markup/MarkupSTL.cpp.orig	2008-07-02 17:39:57.000000000 +0100
+++ ./source/io/markup/MarkupSTL.cpp	2008-07-02 17:41:38.000000000 +0100
@@ -6,8 +6,10 @@
 // Use in commercial applications requires written permission
 // This software is provided "as is", with no warranty.
 
+#include <cstring>
 #include "MarkupSTL.h"
-#include <stdio.h>
+#include <cstdio>
+
 
 using namespace std;
 
--- ./source/io/StringTokenizer.cpp.orig	2008-07-02 17:33:49.000000000 +0100
+++ ./source/io/StringTokenizer.cpp	2008-07-02 17:34:22.000000000 +0100
@@ -36,6 +36,7 @@
 
 
 #include <geos/io.h>
+#include <cstring>
 
 namespace geos {
 
--- ./source/io/ByteOrderValues.cpp.orig	2008-07-02 17:34:48.000000000 +0100
+++ ./source/io/ByteOrderValues.cpp	2008-07-02 17:35:23.000000000 +0100
@@ -16,6 +16,7 @@
 
 #include <geos/io.h>
 #include <geos/util.h>
+#include <cstring>
 
 namespace geos {
 
--- ./source/test/XMLTester.cpp.orig	2008-07-02 17:38:47.000000000 +0100
+++ ./source/test/XMLTester.cpp	2008-07-02 17:39:10.000000000 +0100
@@ -23,6 +23,7 @@
 #include <cassert>
 #include <cctype>
 #include <cstdlib>
+#include <cstring>
 #include <fstream>
 #include <functional>
 #include <iostream>