diff -Naur colortail-0.3.0/CfgFileParser.cc colortail-0.3.0_psc/CfgFileParser.cc
--- colortail-0.3.0/CfgFileParser.cc	1999-08-03 19:40:44.000000000 +0000
+++ colortail-0.3.0_psc/CfgFileParser.cc	2010-09-15 19:15:17.612947871 +0000
@@ -19,8 +19,9 @@
 
 #include "CfgFileParser.h"
 
+#include <iostream>
 #include <stdio.h>
-#include <fstream.h>
+#include <fstream>
 #include <assert.h>
 #include <string.h>
 #include <malloc.h>
diff -Naur colortail-0.3.0/CfgFileParser.h colortail-0.3.0_psc/CfgFileParser.h
--- colortail-0.3.0/CfgFileParser.h	1999-08-03 19:40:52.000000000 +0000
+++ colortail-0.3.0_psc/CfgFileParser.h	2010-09-15 19:15:17.612947871 +0000
@@ -25,7 +25,7 @@
 
 #include <sys/types.h>
 #include <regex.h>
-#include <fstream.h>
+#include <fstream>
 
 #ifdef HAVE_GNUREGEX_H
 # include <gnuregex.h>
@@ -37,6 +37,7 @@
 # endif
 #endif
 
+using namespace std;
 
 class SearchData
 {
diff -Naur colortail-0.3.0/Colorizer.cc colortail-0.3.0_psc/Colorizer.cc
--- colortail-0.3.0/Colorizer.cc	1999-08-03 19:41:17.000000000 +0000
+++ colortail-0.3.0_psc/Colorizer.cc	2010-09-15 19:16:55.792752519 +0000
@@ -20,10 +20,11 @@
 #include "Colorizer.h"
 #include "CfgFileParser.h"
 #include "TailFile.h"
+#include "string.h"
 
 #include <assert.h>
 #include <stdio.h>
-#include <strstream.h>
+#include <strstream>
 
 
 Colorizer::Colorizer()
diff -Naur colortail-0.3.0/ColorTail.cc colortail-0.3.0_psc/ColorTail.cc
--- colortail-0.3.0/ColorTail.cc	1999-08-03 19:41:02.000000000 +0000
+++ colortail-0.3.0_psc/ColorTail.cc	2010-09-15 19:15:17.612947871 +0000
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <iostream.h>
+#include <iostream>
 #include <assert.h>
 #include <unistd.h>
 
diff -Naur colortail-0.3.0/Info.cc colortail-0.3.0_psc/Info.cc
--- colortail-0.3.0/Info.cc	1999-08-03 19:41:38.000000000 +0000
+++ colortail-0.3.0_psc/Info.cc	2010-09-15 19:15:17.612947871 +0000
@@ -17,11 +17,13 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <iostream.h>
+#include <iostream>
 
 #include "Info.h"
 #include "config.h"
 
+using namespace std;
+
 Info::Info()
 {
 }
diff -Naur colortail-0.3.0/main.cc colortail-0.3.0_psc/main.cc
--- colortail-0.3.0/main.cc	1999-08-03 19:42:59.000000000 +0000
+++ colortail-0.3.0_psc/main.cc	2010-09-15 19:18:17.265417696 +0000
@@ -19,6 +19,7 @@
 
 #include <stdio.h>
 #include <signal.h>
+#include <stdlib.h>
 
 #include "main.h"
 #include "ColorTail.h"
diff -Naur colortail-0.3.0/OptionsParser.cc colortail-0.3.0_psc/OptionsParser.cc
--- colortail-0.3.0/OptionsParser.cc	1999-08-04 23:23:39.000000000 +0000
+++ colortail-0.3.0_psc/OptionsParser.cc	2010-09-15 19:15:17.612947871 +0000
@@ -17,8 +17,8 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <iostream.h>
-#include <strstream.h>
+#include <iostream>
+#include <strstream>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -27,6 +27,7 @@
 #include "Info.h"
 #include "Usage.h"
 
+using namespace std;
 // methods for class Options
 
 Options::Options()
diff -Naur colortail-0.3.0/TailFile.cc colortail-0.3.0_psc/TailFile.cc
--- colortail-0.3.0/TailFile.cc	1999-08-04 23:09:38.000000000 +0000
+++ colortail-0.3.0_psc/TailFile.cc	2010-09-15 19:15:17.614789043 +0000
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <iostream.h>
+#include <iostream>
 #include <string.h>
 #include <stdio.h>
 #include <sys/stat.h>
diff -Naur colortail-0.3.0/TailFile.h colortail-0.3.0_psc/TailFile.h
--- colortail-0.3.0/TailFile.h	1999-08-03 19:42:33.000000000 +0000
+++ colortail-0.3.0_psc/TailFile.h	2010-09-15 19:15:17.614789043 +0000
@@ -23,10 +23,12 @@
 #include "Colorizer.h"
 
 #include <stdio.h>
-#include <strstream.h>
+#include <strstream>
 
 #define MAX_CHARS_READ 1024
 
+using namespace std;
+
 class TailFile
 {
   private:
diff -Naur colortail-0.3.0/Usage.cc colortail-0.3.0_psc/Usage.cc
--- colortail-0.3.0/Usage.cc	1999-08-04 23:44:37.000000000 +0000
+++ colortail-0.3.0_psc/Usage.cc	2010-09-15 19:15:17.614789043 +0000
@@ -17,10 +17,12 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <iostream.h>
+#include <iostream>
 
 #include "Usage.h"
 
+using namespace std;
+
 Usage::Usage()
 {
 }