diff --git a/diff_pvm.cc b/diff_pvm.cc
index db6404a03c256c73fec360a35aed475196cea7a3..7d1ebfe13f4b767688f6a25062542eb2c60cd4b3 100644
--- a/diff_pvm.cc
+++ b/diff_pvm.cc
@@ -9,7 +9,7 @@
 #include <iostream>
 #include <fstream>
 #include <iomanip>
-#include <strstream>
+#include <sstream>
 #define WANT_STREAM
 #define WANT_MATH
 //  #include "newmatap.h"
diff --git a/diff_pvmoptions.cc b/diff_pvmoptions.cc
index fcef3cd310a5d7ec959f0564ebe15f10fafe8238..be14b7396cda01f51c7a3633337be31a92ec8a6b 100644
--- a/diff_pvmoptions.cc
+++ b/diff_pvmoptions.cc
@@ -9,8 +9,8 @@
 #define WANT_STREAM
 #define WANT_MATH
 
-#include <iostream.h>
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
 #include <stdlib.h>
 #include <stdio.h>
 #include "diff_pvmoptions.h"
diff --git a/diff_pvmoptions.h b/diff_pvmoptions.h
index b4440da681ce2cc2328c08d2b6f66eb187b8debd..784397e99ea2dd57c600ecd75e4e7305eb7ccf80 100644
--- a/diff_pvmoptions.h
+++ b/diff_pvmoptions.h
@@ -10,8 +10,8 @@
 #define Diff_pvmOptions_h
 
 #include <string>
-#include <iostream.h>
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
 #include <stdlib.h>
 #include <stdio.h>
 #include "utils/options.h"
diff --git a/dtifitOptions.cc b/dtifitOptions.cc
index d7eda900bfc746db2a713a68ee92051fd69ba5ed..cc4194e4115ab1679072e580bce79e91b2bbc091 100644
--- a/dtifitOptions.cc
+++ b/dtifitOptions.cc
@@ -9,8 +9,8 @@
 #define WANT_STREAM
 #define WANT_MATH
 
-#include <iostream.h>
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
 #include <stdlib.h>
 #include <stdio.h>
 #include "dtifitOptions.h"
diff --git a/dtifitOptions.h b/dtifitOptions.h
index c1aec126d6a2f44e2b2f0ca223b1b827d3c527c0..6edab1566d3abb5f614a3854790a24a6182790ad 100644
--- a/dtifitOptions.h
+++ b/dtifitOptions.h
@@ -10,8 +10,8 @@
 #define dtifitOptions_h
 
 #include <string>
-#include <iostream.h>
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
 #include <stdlib.h>
 #include <stdio.h>
 #include "utils/options.h"
diff --git a/probtrackOptions.cc b/probtrackOptions.cc
index a020c23e7f20ed46564e625cd9d07e7d34a56077..abc642e8cbeb3ae336078bec070d1d49c3b15189 100644
--- a/probtrackOptions.cc
+++ b/probtrackOptions.cc
@@ -9,8 +9,8 @@
 #define WANT_STREAM
 #define WANT_MATH
 
-#include <iostream.h>
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
 #include <stdlib.h>
 #include <stdio.h>
 #include "probtrackOptions.h"
diff --git a/probtrackOptions.h b/probtrackOptions.h
index 8a432de6b6d159187897687861ef5da55018758f..4717d6141f126b0fd03cb4d2e1b6b6053ee036a1 100644
--- a/probtrackOptions.h
+++ b/probtrackOptions.h
@@ -10,8 +10,8 @@
 #define probtrackOptions_h
 
 #include <string>
-#include <iostream.h>
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
 #include <stdlib.h>
 #include <stdio.h>
 #include "utils/options.h"
diff --git a/probtrackxOptions.cc b/probtrackxOptions.cc
index 150531c1ee2de3d0efd00f7885e15cb2c3de3fc7..682cd4797d2052a5a82c331041934d8be7a7599a 100644
--- a/probtrackxOptions.cc
+++ b/probtrackxOptions.cc
@@ -9,8 +9,8 @@
 #define WANT_STREAM
 #define WANT_MATH
 
-#include <iostream.h>
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
 #include <stdlib.h>
 #include <stdio.h>
 #include "probtrackxOptions.h"
diff --git a/probtrackxOptions.h b/probtrackxOptions.h
index 72aac7a2e372621e4a46d94f09d5d9945e9765d2..9e23fea9f05ecb8d5df73c13deac2144219a2987 100644
--- a/probtrackxOptions.h
+++ b/probtrackxOptions.h
@@ -10,8 +10,8 @@
 #define probtrackxOptions_h
 
 #include <string>
-#include <iostream.h>
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
 #include <stdlib.h>
 #include <stdio.h>
 #include "utils/options.h"
diff --git a/replacevols.cc b/replacevols.cc
index 46061e40bb590edd1a09fc939d365f4b37d14e75..e728cd8defeaf78f5eb97e91c9a2132df2df8c5b 100644
--- a/replacevols.cc
+++ b/replacevols.cc
@@ -33,7 +33,7 @@ int read_avg_file (vector<vector<int> >& avgs,const string fname){
 	}
       }
 
-      istrstream mylinestr(myline.c_str());   
+      istringstream mylinestr(myline.c_str());   
 
       while(!mylinestr.eof()){
 
diff --git a/testfile.cc b/testfile.cc
index 847fd1a84e0dceed6902da9b2079c3944d40c928..099c30f9d2fa81858a62c7267ed5926489637522 100644
--- a/testfile.cc
+++ b/testfile.cc
@@ -17,7 +17,7 @@ using namespace NEWIMAGE;
   string myline;
   else{
       avg_file.getline(myline);
-      istrstream mylinestr(myline);
+      istringstream mylinestr(myline);
       mylinestr>>start;
       mylinestr>>length;
       cerr<<start<<" "<<length<<endl;
diff --git a/tractOptions.cc b/tractOptions.cc
index c5229d22ee9cb60724cbbb9459f36eb7155cf5f3..3a3558aa6a56a24900d1144a6c864f1612df01a6 100644
--- a/tractOptions.cc
+++ b/tractOptions.cc
@@ -9,8 +9,8 @@
 #define WANT_STREAM
 #define WANT_MATH
 
-#include <iostream.h>
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
 #include <stdlib.h>
 #include <stdio.h>
 #include "tractOptions.h"
diff --git a/tractOptions.h b/tractOptions.h
index 034198a9cee46655c60a03bf0d8f2d7c82bcd196..3fbab83ff12931e6acfe87459cd34e1c61d759af 100644
--- a/tractOptions.h
+++ b/tractOptions.h
@@ -10,8 +10,8 @@
 #define tractOptions_h
 
 #include <string>
-#include <iostream.h>
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
 #include <stdlib.h>
 #include <stdio.h>
 #include "utils/options.h"
diff --git a/tractOpts.h b/tractOpts.h
index 69ceacc08e844600895140d915189d41d4f8ec1d..d91219ea6166f115a967713fb8ff0d77d9cc476c 100644
--- a/tractOpts.h
+++ b/tractOpts.h
@@ -10,8 +10,8 @@
 #define tractOptions_h
 
 #include <string>
-#include <iostream.h>
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
 #include <stdlib.h>
 #include <stdio.h>
 #include "utils/options.h"
diff --git a/xfibres.cc b/xfibres.cc
index 1ff4446b14b98dbc16040e044f2fa2f3ea9a2b0b..9974ae7ec045f3e846abc153c21d0476fe2f3842 100644
--- a/xfibres.cc
+++ b/xfibres.cc
@@ -9,7 +9,7 @@
 #include <iostream>
 #include <fstream>
 #include <iomanip>
-#include <strstream>
+#include <sstream>
 #define WANT_STREAM
 #define WANT_MATH
 //  #include "newmatap.h"
diff --git a/xfibresoptions.cc b/xfibresoptions.cc
index 42a0a4e62f5510ea8f185a57cbd3b681e5e65dc6..bb560db33923ee2196ffdb816d2e61d744f1c06f 100644
--- a/xfibresoptions.cc
+++ b/xfibresoptions.cc
@@ -9,8 +9,8 @@
 #define WANT_STREAM
 #define WANT_MATH
 
-#include <iostream.h>
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
 #include <stdlib.h>
 #include <stdio.h>
 #include "xfibresoptions.h"
diff --git a/xfibresoptions.h b/xfibresoptions.h
index 67512bc7a02bc0620f7645559c95313c5206e169..f70c3a653dfb8780f59bb90a0224d44f09b523b6 100644
--- a/xfibresoptions.h
+++ b/xfibresoptions.h
@@ -10,8 +10,8 @@
 #define xfibresOptions_h
 
 #include <string>
-#include <iostream.h>
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
 #include <stdlib.h>
 #include <stdio.h>
 #include "utils/options.h"