Index: mttroot/mtt/lib/cr/hh/fade.hh
==================================================================
--- mttroot/mtt/lib/cr/hh/fade.hh
+++ mttroot/mtt/lib/cr/hh/fade.hh
@@ -1,9 +1,9 @@
 #ifndef FADE_HH
 #define FADE_HH
 
-#include <math.h>		// tanh
+#include <cmath>		// tanh
 
 #include "constants.hh"		// pi
 
 inline double
 fade(const double x,
@@ -31,13 +31,13 @@
 	const double y1,
 	const double y2)
 {
   double X1 = x1, X2 = x2;
   if (x1 > x2) {
-    cerr << "* Warning: chkfade; x2 > x1, swapping" << endl;
+    std::cerr << "* Warning: chkfade; x2 > x1, swapping" << std::endl;
     X1 = x2;
     X2 = x1;
   }
   return ((x <= X1) ? y1 : (x > X2) ? y2 : fade(x, X1, X2, y1, y2));
 }
 
 #endif // FADE_HH

Index: mttroot/mtt/lib/cr/hh/kinematicviscosity.hh
==================================================================
--- mttroot/mtt/lib/cr/hh/kinematicviscosity.hh
+++ mttroot/mtt/lib/cr/hh/kinematicviscosity.hh
@@ -1,9 +1,9 @@
 #ifndef KINEMATICVISCOSITY_HH
 #define KINEMATICVISCOSITY_HH
 
-#include <math.h>		// pow
+#include <cmath>		// pow
 #include <string>
 
 inline double
 kerosenekinematicviscosity(const double T)
   /*
@@ -45,17 +45,17 @@
 {
   return 1.79e6 * pow(T, -4.78);
 }
 
 inline double
-kinematicviscosity(const string fluid,
+kinematicviscosity(const std::string fluid,
 		   const double T)
 {
   if ("kerosene" == fluid) {
     return kerosenekinematicviscosity(T);
   } else {
-    cerr << __FILE__ << ": fluid \"" << fluid << "\" unknown" << endl;
+    std::cerr << __FILE__ << ": fluid \"" << fluid << "\" unknown" << std::endl;
     exit(-1);
   }
 }
 
 #endif // KINEMATICVISCOSITY_HH