--- clipper/mmdb/clipper_mmdb.cpp_orig	2008-11-12 11:01:28.000000000 -0800
+++ clipper/mmdb/clipper_mmdb.cpp	2008-11-12 12:12:32.000000000 -0800
@@ -43,6 +43,9 @@
 
 #include <algorithm>
 
+extern "C" {
+#include <string.h>
+}
 
 namespace clipper {
 
--- clipper/ccp4/ccp4_mtz_io.cpp_orig	2008-11-12 11:02:16.000000000 -0800
+++ clipper/ccp4/ccp4_mtz_io.cpp	2008-11-12 12:12:15.000000000 -0800
@@ -45,6 +45,9 @@
 
 #include <ccp4/cmtzlib.h>
 
+extern "C" {
+#include <string.h>
+}
 
 namespace clipper {
 
--- clipper/cif/cif_data_io.cpp_orig	2008-11-12 12:11:17.000000000 -0800
+++ clipper/cif/cif_data_io.cpp	2008-11-12 12:11:49.000000000 -0800
@@ -46,6 +46,7 @@
 extern "C" {
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 }
 #include <vector>
 #include <fstream>
--- clipper/minimol/minimol.cpp_orig	2008-11-12 12:22:06.000000000 -0800
+++ clipper/minimol/minimol.cpp	2008-11-12 12:23:05.000000000 -0800
@@ -41,6 +41,9 @@
 
 #include "minimol.h"
 
+extern "C" {
+#include <string.h>
+}
 
 namespace clipper {
 
--- examples/compress42.c_orig	2008-11-14 10:54:03.000000000 -0800
+++ examples/compress42.c	2008-11-14 11:09:52.000000000 -0800
@@ -140,6 +140,8 @@
 #include	<sys/types.h>
 #include	<sys/stat.h>
 #include	<errno.h>
+#include        <stdlib.h>
+#include        <string.h>
 
 #ifdef DIRENT
 #	include	<dirent.h>