--- tagdemo/foo.cpp
+++ tagdemo/foo.cpp
@@ -20,7 +20,8 @@
 // USA.
 
 #include "foo.h"
-#include <iostream.h>
+#include <iostream>
+using namespace std;
 
 #ifdef HAVE_MATH_H
 #include <math.h>
--- tagdemo/main.cpp
+++ tagdemo/main.cpp
@@ -22,7 +22,8 @@
 
 #include "foo.h"
 #include "baz.h"
-#include <iostream.h>
+#include <iostream>
+using namespace std;
 
 
 int