--- xapian-omega-1.2.3/common/str.cc	Tue Aug 24 09:55:28 2010
+++ xapian-omega-1.2.3/common/str.cc	Sat Aug 28 13:04:54 2010
@@ -24,7 +24,7 @@
 
 #include "omassert.h"
 
-#include <cstdio> // For snprintf() or sprintf().
+#include <stdio.h> // For snprintf() or sprintf().
 #include <cstdlib> // For abort().
 #include <string>
 
--- xapian-omega-1.2.3/values.h	Tue Aug 24 09:50:21 2010
+++ xapian-omega-1.2.3/values.h	Sat Aug 28 13:02:09 2010
@@ -1,6 +1,6 @@
 /* values.h: constants and functions for document value handling.
  *
- * Copyright (C) 2006 Olly Betts
+ * Copyright (C) 2006,2010 Olly Betts
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,6 +20,7 @@
 #ifndef OMEGA_INCLUDED_VALUES_H
 #define OMEGA_INCLUDED_VALUES_H
 
+#include <cstring>
 #include <string>
 
 // Include these to get uint32_t and htonl, etc.
@@ -51,7 +52,7 @@
 {
     if (s.size() != 4) return (uint32_t)-1;
     uint32_t v;
-    memcpy(&v, s.data(), 4);
+    std::memcpy(&v, s.data(), 4);
     return ntohl(v);
 }
 
--- xapian-omega-1.2.3/md5.cc	Tue Aug 24 09:50:21 2010
+++ xapian-omega-1.2.3/md5.cc	Sat Aug 28 13:03:47 2010
@@ -32,6 +32,8 @@
 #include <cstring>		/* for memcpy() */
 #include "md5.h"
 
+using namespace std;
+
 #ifndef WORDS_BIGENDIAN
 #define byteReverse(buf, len)	/* Nothing */
 #else
--- xapian-omega-1.2.3/query.cc	Tue Aug 24 09:50:21 2010
+++ xapian-omega-1.2.3/query.cc	Sat Aug 28 13:06:14 2010
@@ -34,7 +34,7 @@
 #include <cassert>
 #include <cctype>
 #include "safeerrno.h"
-#include <cstdio>
+#include <stdio.h>
 #include <cstdlib>
 #include <cstring>
 #include "strcasecmp.h"
--- xapian-omega-1.2.3/cgiparam.cc	Tue Aug 24 09:50:21 2010
+++ xapian-omega-1.2.3/cgiparam.cc	Sat Aug 28 13:06:59 2010
@@ -32,9 +32,7 @@
 #include <map>
 #include <string>
 
-using std::string;
-using std::map;
-using std::multimap;
+using namespace std;
 
 multimap<string, string> cgi_params;
 
--- xapian-omega-1.2.3/utils.cc	Tue Aug 24 09:50:21 2010
+++ xapian-omega-1.2.3/utils.cc	Sat Aug 28 13:03:14 2010
@@ -23,7 +23,7 @@
 
 #include "utils.h"
 
-#include <cstdio> // for sprintf/snprintf
+#include <stdio.h> // for sprintf/snprintf
 #include <cstdlib>
 
 #include <string>
--- xapian-omega-1.2.3/date.cc	Tue Aug 24 09:50:21 2010
+++ xapian-omega-1.2.3/date.cc	Sat Aug 28 13:25:16 2010
@@ -28,7 +28,7 @@
 
 #include <vector>
 
-#include <cstdio>
+#include <stdio.h>
 #include <cstdlib>
 #include <ctime>
 
--- xapian-omega-1.2.3/cdb_init.cc	Tue Aug 24 09:50:21 2010
+++ xapian-omega-1.2.3/cdb_init.cc	Sat Aug 28 13:28:26 2010
@@ -19,6 +19,9 @@
 #endif
 #include "safesysstat.h"
 #include "cdb_int.h"
+#include <cstring>
+
+using namespace std;
 
 int
 cdb_init(struct cdb *cdbp, int fd)
--- xapian-omega-1.2.3/cdb_find.cc	Tue Aug 24 09:50:21 2010
+++ xapian-omega-1.2.3/cdb_find.cc	Sat Aug 28 13:29:22 2010
@@ -9,6 +9,10 @@
 
 #include "cdb_int.h"
 
+#include <cstring>
+
+using namespace std;
+
 int
 cdb_find(struct cdb *cdbp, const void *key, unsigned klen)
 {