Index: trunk/SophyaPI/PIext/contmodex.h
===================================================================
--- trunk/SophyaPI/PIext/contmodex.h	(revision 2308)
+++ trunk/SophyaPI/PIext/contmodex.h	(revision 2322)
@@ -9,5 +9,5 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <iostream.h> 
+#include <iostream> 
 #include "piacmd.h"
 #include "nobjmgr.h"
Index: trunk/SophyaPI/PIext/cxxexecutor.cc
===================================================================
--- trunk/SophyaPI/PIext/cxxexecutor.cc	(revision 2308)
+++ trunk/SophyaPI/PIext/cxxexecutor.cc	(revision 2322)
@@ -347,6 +347,6 @@
   <<"#include <ctype.h>"<<endl
   <<"#include <string.h>"<<endl
-  <<"#include <iostream.h>"<<endl
-  <<"#include <fstream.h>"<<endl
+  <<"#include <iostream>"<<endl
+  <<"#include <fstream>"<<endl
   <<"#include <complex>"<<endl
   <<endl
Index: trunk/SophyaPI/PIext/cxxexecutor.h
===================================================================
--- trunk/SophyaPI/PIext/cxxexecutor.h	(revision 2308)
+++ trunk/SophyaPI/PIext/cxxexecutor.h	(revision 2322)
@@ -10,5 +10,5 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <iostream.h>
+#include <iostream>
 
 #include <vector>
Index: trunk/SophyaPI/PIext/flowmodex.h
===================================================================
--- trunk/SophyaPI/PIext/flowmodex.h	(revision 2308)
+++ trunk/SophyaPI/PIext/flowmodex.h	(revision 2322)
@@ -9,5 +9,5 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <iostream.h> 
+#include <iostream> 
 #include "piacmd.h"
 #include "nobjmgr.h"
Index: trunk/SophyaPI/PIext/nobjmgr.cc
===================================================================
--- trunk/SophyaPI/PIext/nobjmgr.cc	(revision 2308)
+++ trunk/SophyaPI/PIext/nobjmgr.cc	(revision 2322)
@@ -4,5 +4,5 @@
 
 #include <typeinfo>
-#include <iostream.h>
+#include <iostream>
 #include <string>
 #include <list>
Index: trunk/SophyaPI/PIext/nobjmgr.h
===================================================================
--- trunk/SophyaPI/PIext/nobjmgr.h	(revision 2308)
+++ trunk/SophyaPI/PIext/nobjmgr.h	(revision 2322)
@@ -9,5 +9,5 @@
 #include "machdefs.h"
 
-#include <fstream.h>
+#include <fstream>
 #include <string>
 #include <vector>
Index: trunk/SophyaPI/PIext/nomgadapter.cc
===================================================================
--- trunk/SophyaPI/PIext/nomgadapter.cc	(revision 2308)
+++ trunk/SophyaPI/PIext/nomgadapter.cc	(revision 2322)
@@ -2,5 +2,5 @@
 #include <stdlib.h>
 #include <typeinfo>
-#include <iostream.h>
+#include <iostream>
 #include <string>
 #include "nomgadapter.h"
Index: trunk/SophyaPI/PIext/nomgfdadapter.cc
===================================================================
--- trunk/SophyaPI/PIext/nomgfdadapter.cc	(revision 2308)
+++ trunk/SophyaPI/PIext/nomgfdadapter.cc	(revision 2322)
@@ -2,5 +2,5 @@
 #include <stdlib.h>
 #include <typeinfo>
-#include <iostream.h>
+#include <iostream>
 #include <string>
 
Index: trunk/SophyaPI/PIext/nomhistadapter.cc
===================================================================
--- trunk/SophyaPI/PIext/nomhistadapter.cc	(revision 2308)
+++ trunk/SophyaPI/PIext/nomhistadapter.cc	(revision 2322)
@@ -2,5 +2,5 @@
 #include <stdlib.h>
 #include <typeinfo>
-#include <iostream.h>
+#include <iostream>
 #include <string>
 
Index: trunk/SophyaPI/PIext/nomimagadapter.cc
===================================================================
--- trunk/SophyaPI/PIext/nomimagadapter.cc	(revision 2308)
+++ trunk/SophyaPI/PIext/nomimagadapter.cc	(revision 2322)
@@ -2,5 +2,5 @@
 #include <stdlib.h>
 #include <typeinfo>
-#include <iostream.h>
+#include <iostream>
 #include <string>
 
Index: trunk/SophyaPI/PIext/nommatvecadapter.cc
===================================================================
--- trunk/SophyaPI/PIext/nommatvecadapter.cc	(revision 2308)
+++ trunk/SophyaPI/PIext/nommatvecadapter.cc	(revision 2322)
@@ -2,5 +2,5 @@
 #include <stdlib.h>
 #include <typeinfo>
-#include <iostream.h>
+#include <iostream>
 #include <string>
 
Index: trunk/SophyaPI/PIext/nomskymapadapter.cc
===================================================================
--- trunk/SophyaPI/PIext/nomskymapadapter.cc	(revision 2308)
+++ trunk/SophyaPI/PIext/nomskymapadapter.cc	(revision 2322)
@@ -3,5 +3,5 @@
 #include <math.h>
 #include <typeinfo>
-#include <iostream.h>
+#include <iostream>
 #include <string>
 #include <complex>
Index: trunk/SophyaPI/PIext/nomspecrespadapter.cc
===================================================================
--- trunk/SophyaPI/PIext/nomspecrespadapter.cc	(revision 2308)
+++ trunk/SophyaPI/PIext/nomspecrespadapter.cc	(revision 2322)
@@ -2,5 +2,5 @@
 #include <stdlib.h>
 #include <typeinfo>
-#include <iostream.h>
+#include <iostream>
 #include <string>
 
Index: trunk/SophyaPI/PIext/nomstladapter.cc
===================================================================
--- trunk/SophyaPI/PIext/nomstladapter.cc	(revision 2308)
+++ trunk/SophyaPI/PIext/nomstladapter.cc	(revision 2322)
@@ -2,5 +2,5 @@
 #include <stdlib.h>
 #include <typeinfo>
-#include <iostream.h>
+#include <iostream>
 #include <string>
 
Index: trunk/SophyaPI/PIext/nomtarradapter.cc
===================================================================
--- trunk/SophyaPI/PIext/nomtarradapter.cc	(revision 2308)
+++ trunk/SophyaPI/PIext/nomtarradapter.cc	(revision 2322)
@@ -2,5 +2,5 @@
 #include <stdlib.h>
 #include <typeinfo>
-#include <iostream.h>
+#include <iostream>
 #include <string>
 #include <complex>
Index: trunk/SophyaPI/PIext/nomtmatvecadapter.cc
===================================================================
--- trunk/SophyaPI/PIext/nomtmatvecadapter.cc	(revision 2308)
+++ trunk/SophyaPI/PIext/nomtmatvecadapter.cc	(revision 2322)
@@ -2,5 +2,5 @@
 #include <stdlib.h>
 #include <typeinfo>
-#include <iostream.h>
+#include <iostream>
 #include <string>
 #include <complex>
Index: trunk/SophyaPI/PIext/pawexecut.cc
===================================================================
--- trunk/SophyaPI/PIext/pawexecut.cc	(revision 2308)
+++ trunk/SophyaPI/PIext/pawexecut.cc	(revision 2322)
@@ -2,5 +2,5 @@
 #include <stdlib.h>
 #include <ctype.h>
-#include <iostream.h>
+#include <iostream>
 #include <typeinfo>
 
Index: trunk/SophyaPI/PIext/pi2dvec.cc
===================================================================
--- trunk/SophyaPI/PIext/pi2dvec.cc	(revision 2308)
+++ trunk/SophyaPI/PIext/pi2dvec.cc	(revision 2322)
@@ -9,5 +9,5 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <iostream.h>
+#include <iostream>
 #include <math.h>
 
Index: trunk/SophyaPI/PIext/piacmd.h
===================================================================
--- trunk/SophyaPI/PIext/piacmd.h	(revision 2308)
+++ trunk/SophyaPI/PIext/piacmd.h	(revision 2322)
@@ -8,6 +8,6 @@
 
 #include "machdefs.h"
-#include <iostream.h>
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
 #include <string>
 #include <vector>
Index: trunk/SophyaPI/PIext/piafitting.cc
===================================================================
--- trunk/SophyaPI/PIext/piafitting.cc	(revision 2308)
+++ trunk/SophyaPI/PIext/piafitting.cc	(revision 2322)
@@ -9,5 +9,5 @@
 #include <stdlib.h>
 #include <ctype.h>
-#include <iostream.h>
+#include <iostream>
 #include <typeinfo>
 
Index: trunk/SophyaPI/PIext/servnobjm.cc
===================================================================
--- trunk/SophyaPI/PIext/servnobjm.cc	(revision 2308)
+++ trunk/SophyaPI/PIext/servnobjm.cc	(revision 2322)
@@ -4,5 +4,5 @@
 
 #include <typeinfo>
-#include <iostream.h>
+#include <iostream>
 #include <string>
 #include <list>
