diff -N -u -r colortail-0.3.0/CfgFileParser.cc new/CfgFileParser.cc
--- colortail-0.3.0/CfgFileParser.cc	1999-08-03 21:40:44.000000000 +0200
+++ new/CfgFileParser.cc	2006-04-03 12:48:02.000000000 +0200
@@ -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 -N -u -r colortail-0.3.0/CfgFileParser.h new/CfgFileParser.h
--- colortail-0.3.0/CfgFileParser.h	1999-08-03 21:40:52.000000000 +0200
+++ new/CfgFileParser.h	2006-04-03 12:48:52.000000000 +0200
@@ -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 -N -u -r colortail-0.3.0/Colorizer.cc new/Colorizer.cc
--- colortail-0.3.0/Colorizer.cc	1999-08-03 21:41:17.000000000 +0200
+++ new/Colorizer.cc	2006-04-03 12:43:18.000000000 +0200
@@ -23,7 +23,7 @@
 
 #include <assert.h>
 #include <stdio.h>
-#include <strstream.h>
+#include <strstream>
 
 
 Colorizer::Colorizer()
diff -N -u -r colortail-0.3.0/ColorTail.cc new/ColorTail.cc
--- colortail-0.3.0/ColorTail.cc	1999-08-03 21:41:02.000000000 +0200
+++ new/ColorTail.cc	2006-04-03 12:38:21.000000000 +0200
@@ -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 -N -u -r colortail-0.3.0/Info.cc new/Info.cc
--- colortail-0.3.0/Info.cc	1999-08-03 21:41:38.000000000 +0200
+++ new/Info.cc	2006-04-03 12:46:00.000000000 +0200
@@ -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 -N -u -r colortail-0.3.0/OptionsParser.cc new/OptionsParser.cc
--- colortail-0.3.0/OptionsParser.cc	1999-08-05 01:23:39.000000000 +0200
+++ new/OptionsParser.cc	2006-04-03 12:44:28.000000000 +0200
@@ -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 -N -u -r colortail-0.3.0/TailFile.cc new/TailFile.cc
--- colortail-0.3.0/TailFile.cc	1999-08-05 01:09:38.000000000 +0200
+++ new/TailFile.cc	2006-04-03 12:45:21.000000000 +0200
@@ -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 -N -u -r colortail-0.3.0/TailFile.h new/TailFile.h
--- colortail-0.3.0/TailFile.h	1999-08-03 21:42:33.000000000 +0200
+++ new/TailFile.h	2006-04-03 12:42:17.000000000 +0200
@@ -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 -N -u -r colortail-0.3.0/Usage.cc new/Usage.cc
--- colortail-0.3.0/Usage.cc	1999-08-05 01:44:37.000000000 +0200
+++ new/Usage.cc	2006-04-03 12:46:17.000000000 +0200
@@ -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()
 {
 }