diff --git a/histogram.cc b/histogram.cc
index 8184cd3a226fe5968dff5f19835a0336ebd2393f..5fe931f0c361179a67d94f6236f1c386e044d629 100644
--- a/histogram.cc
+++ b/histogram.cc
@@ -10,10 +10,9 @@
 #include "histogram.h"
 
 using namespace std;
+using namespace NEWMAT;
 
-#ifndef NO_NAMESPACE
 namespace MISCMATHS {
-#endif
 
   float Histogram::getPercentile(float perc) 
   {
@@ -267,11 +266,6 @@ namespace MISCMATHS {
       }
     }
   }
-  
-#ifndef NO_NAMESPACE
-  }
-#endif
-
 
 
 
diff --git a/kernel.cc b/kernel.cc
index 0cc024d8c28c349c3cd33dd27ed993c3ae16bdab..5f438e1bc9dcc71e65466961b44ef0ccc3bc9d1d 100644
--- a/kernel.cc
+++ b/kernel.cc
@@ -9,6 +9,8 @@
 #include "kernel.h"
 #include "miscmaths.h"
 
+using namespace NEWMAT;
+
 namespace MISCMATHS {
 
   set<kernelstorage*, kernelstorage::comparer> kernel::existingkernels;  
diff --git a/minimize.cc b/minimize.cc
index 46b84d01b3c685d5794f827d4f79c5aa872bbd83..f484768d87d4b0f2ce2cebf637b7f815d952e3d0 100644
--- a/minimize.cc
+++ b/minimize.cc
@@ -17,9 +17,6 @@
 #include "miscmaths.h"
 #include "minimize.h"
 
-#define WANT_STREAM
-#define WANT_MATH
-
 using namespace NEWMAT;
 using namespace std;
 ///////////////////////////////////////////////////////
diff --git a/miscmaths.cc b/miscmaths.cc
index 10a6971b2936c8bb8f1074c0f5c6162c474dad72..fc78720dd6f2f92427bac3f76605380137566b6e 100644
--- a/miscmaths.cc
+++ b/miscmaths.cc
@@ -15,8 +15,11 @@
 #include "miscprob.h"
 #include "stdlib.h"
 #include "armawrap/newmatio.h"
+#include "NewNifti/NewNifti.h"
 
 using namespace std;
+using namespace NEWMAT;
+using namespace NiftiIO;
 
 namespace MISCMATHS {
 
diff --git a/optimise.cc b/optimise.cc
index 07386c9a896596002a6ac01463d53c23c89376a0..22c308ed75fb6b1d6ea878153f280a11bf34865f 100644
--- a/optimise.cc
+++ b/optimise.cc
@@ -14,6 +14,9 @@
 #include "optimise.h"
 #include "miscmaths.h"
 
+using namespace NEWMAT;
+using namespace std;
+
 namespace MISCMATHS {
 
   // The following lines are ignored by the current SGI compiler
diff --git a/rungekutta.cc b/rungekutta.cc
index 2b83814c3ac56379cd9ff734006e00cbe5ad1311..9e7042d4b8f240e4e28175528711442d31832eef 100644
--- a/rungekutta.cc
+++ b/rungekutta.cc
@@ -9,6 +9,7 @@
 #include "rungekutta.h"
 
 using namespace std;
+using namespace NEWMAT;
 
 namespace MISCMATHS {