diff --git a/Cantera/src/oneD/MultiJac.cpp b/Cantera/src/oneD/MultiJac.cpp
index fb9e9ab90..69003381c 100644
--- a/Cantera/src/oneD/MultiJac.cpp
+++ b/Cantera/src/oneD/MultiJac.cpp
@@ -19,8 +19,6 @@
 #pragma warning(disable:4503)
 #endif
 
-//#include <vector>
-//#include <math.h>
 
 #include "MultiJac.h"
 using namespace std;
diff --git a/Cantera/src/oneD/MultiNewton.cpp b/Cantera/src/oneD/MultiNewton.cpp
index ba761026b..e85f4da54 100644
--- a/Cantera/src/oneD/MultiNewton.cpp
+++ b/Cantera/src/oneD/MultiNewton.cpp
@@ -23,13 +23,14 @@
 using namespace std;
 
 #include "MultiNewton.h"
-#include <stdio.h>
-#include <math.h>
 
 #include "ctexceptions.h"
 #include "vec_functions.h"
 #include "stringUtils.h"
-#include <time.h>
+
+#include <cstdio>
+#include <cmath>
+#include <ctime>
 
 using namespace std;
 
diff --git a/Cantera/src/oneD/Sim1D.cpp b/Cantera/src/oneD/Sim1D.cpp
index 56dd251d1..ef047eeb5 100644
--- a/Cantera/src/oneD/Sim1D.cpp
+++ b/Cantera/src/oneD/Sim1D.cpp
@@ -11,11 +11,12 @@
 #include "Sim1D.h"
 #include "MultiJac.h"
 
+#include <cstdlib>
+
 using namespace std;
 
 namespace Cantera {
 
-
     static void sim1D_drawline() {
         string s(78,'.');
         s += '\n';
@@ -232,7 +233,7 @@ namespace Cantera {
             throw CanteraError("Sim1D::newtonSolve","no solution found");
         else {
             writelog(string("ERROR: solve returned m = ") + int2str(m) + "\n");
-            exit(-1);
+            exit(EXIT_FAILURE);
         }
     }
 
diff --git a/test_problems/pureFluidTest/testPureWater.cpp b/test_problems/pureFluidTest/testPureWater.cpp
index a0eb8bd56..4c3dc15ff 100644
--- a/test_problems/pureFluidTest/testPureWater.cpp
+++ b/test_problems/pureFluidTest/testPureWater.cpp
@@ -1,10 +1,11 @@
 /*
  * $Id$
  */
-#include "stdio.h"
-#include "math.h"
 #include "PureFluid.h"
 #include <new>
+#include <cstdio>
+#include <cmath>
+
 using namespace std;
 using namespace Cantera;