--- metacam.cc~ 2007-04-02 18:49:33.000000000 +0000
+++ metacam.cc  2007-04-02 18:49:47.000000000 +0000
@@ -23,6 +23,7 @@
 #include <iostream>
 #include <fstream>
 #include <cstdio>
+#include <cstdlib>
 #include <errno.h>
 #include <netinet/in.h>
 #include <string.h>
--- datatiff.h~ 2007-04-02 18:51:37.000000000 +0000
+++ datatiff.h  2007-04-02 18:51:45.000000000 +0000
@@ -24,6 +24,7 @@
 #define DATATIFF_H_INCLUDED
 
 #include "metatiff.h"
+#include <cstdlib>
 
 class _DataIFD;
 class _DataIFDEntry;
--- edittiff.h~ 2007-04-02 18:52:04.000000000 +0000
+++ edittiff.h  2007-04-02 18:52:09.000000000 +0000
@@ -24,6 +24,7 @@
 #define EDITTIFF_H_INCLUDED
 
 #include "metatiff.h"
+#include <cstdlib>
 
 class _EditIFD;
 
--- ocontext.cc~        2007-04-02 18:52:34.000000000 +0000
+++ ocontext.cc 2007-04-02 18:52:40.000000000 +0000
@@ -25,6 +25,7 @@
 #include "odrivers.h"
 
 #include <ctype.h>
+#include <cstdlib>
 
 OutputContext::~OutputContext()
 {
--- dpyfuncs.cc
+++ dpyfuncs.cc
@@ -28,6 +28,8 @@
 #include "metacam.h"
 #include "dpyfuncs.h"
 
+#include <cstring>
+
 static const char *rcsid __attribute__((unused))="$Id: dpyfuncs.cc,v 1.14 2004/08/21 17:54:20 daniel Exp $";
 
 void
--- ocontext.cc
+++ ocontext.cc
@@ -26,6 +26,7 @@
 
 #include <ctype.h>
 #include <cstdlib>
+#include <cstring>
 
 OutputContext::~OutputContext()
 {