--- CfgFileParser.cc~	2009-06-13 18:41:42.000000000 -0400
+++ CfgFileParser.cc	2009-06-13 18:42:25.965289233 -0400
@@ -21,7 +21,7 @@
 
 #include <iostream>
 #include <assert.h>
-#include <string>
+#include <cstring>
 #include <malloc.h>
 
 using namespace std;
--- Colorizer.cc~	2009-06-13 18:45:13.000000000 -0400
+++ Colorizer.cc	2009-06-13 18:45:45.698601174 -0400
@@ -22,6 +22,7 @@
 #include "TailFile.h"
 
 #include <assert.h>
+#include <cstdio>
 #include <iostream>
 #include <string>
 
--- Colorizer.cc~	2009-06-13 18:45:45.000000000 -0400
+++ Colorizer.cc	2009-06-13 18:47:53.138588904 -0400
@@ -24,7 +24,7 @@
 #include <assert.h>
 #include <cstdio>
 #include <iostream>
-#include <string>
+#include <cstring>
 
 using namespace std;
 
--- main.cc~	1999-08-03 15:42:59.000000000 -0400
+++ main.cc	2009-06-13 18:53:00.605224626 -0400
@@ -18,6 +18,7 @@
 */
 
 #include <stdio.h>
+ #include <cstdlib>
 #include <signal.h>
 
 #include "main.h"