diff -Naur include/BTree.h include/BTree.h
--- include/BTree.h	2003-01-19 22:22:30.000000000 -0600
+++ include/BTree.h	2008-12-04 17:51:22.000000000 -0600
@@ -24,6 +24,7 @@
 #define BTree_included
 
 #include "Boolean.h"
+#include <cstdlib>
 
 //  This is an in-core B-Tree implementation.
 //
diff -Naur lib/Client.c++ lib/Client.c++
--- lib/Client.c++	2003-01-18 08:18:12.000000000 -0600
+++ lib/Client.c++	2008-12-04 17:51:19.000000000 -0600
@@ -34,7 +34,7 @@
 #include <syslog.h>
 #include <errno.h>
 
-#include <iostream.h>
+#include <iostream>
 
 #include "fam.h"
 #include "Client.h"
diff -Naur src/DNotify.c++ src/DNotify.c++
--- src/DNotify.c++	2008-12-04 17:50:48.000000000 -0600
+++ src/DNotify.c++	2008-12-04 17:51:19.000000000 -0600
@@ -31,6 +31,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <libgen.h>
+#include <cstdlib>
 
 #include "DNotify.h"
 
diff -Naur src/IMon.c++ src/IMon.c++
--- src/IMon.c++	2003-01-18 08:18:12.000000000 -0600
+++ src/IMon.c++	2008-12-04 17:51:19.000000000 -0600
@@ -40,7 +40,7 @@
 #include "Interest.h"
 #include "Log.h"
 #include "Scheduler.h"
-#include "alloc.h"
+#include <memory>
 
 int		   IMon::imonfd = -2;
 IMon::EventHandler IMon::ehandler = NULL;
diff -Naur src/Interest.h src/Interest.h
--- src/Interest.h	2008-12-04 17:50:48.000000000 
-0600
+++ src/Interest.h	2008-12-04 17:51:22.000000000 -0600
@@ -29,6 +29,7 @@
 #include <netinet/in.h>  //  for in_addr
 
 #include "Boolean.h"
+#include <cstdlib>
 
 class Event;
 class FileSystem;