diff --git a/Cantera/src/thermo/ConstCpPoly.cpp b/Cantera/src/thermo/ConstCpPoly.cpp
index c6406c7f9..2cfcd2a37 100644
--- a/Cantera/src/thermo/ConstCpPoly.cpp
+++ b/Cantera/src/thermo/ConstCpPoly.cpp
@@ -15,7 +15,8 @@
 
 
 #include "ConstCpPoly.h"
-#include <math.h>
+
+#include <cmath>
 
 namespace Cantera {
 
diff --git a/Cantera/src/thermo/ConstDensityThermo.cpp b/Cantera/src/thermo/ConstDensityThermo.cpp
index 2de457734..b0adfaca1 100755
--- a/Cantera/src/thermo/ConstDensityThermo.cpp
+++ b/Cantera/src/thermo/ConstDensityThermo.cpp
@@ -19,7 +19,8 @@
 #include "mix_defs.h"
 #include "ConstDensityThermo.h"
 #include "SpeciesThermo.h"
-#include <math.h>
+
+#include <cmath>
 
 namespace Cantera {
 
diff --git a/Cantera/src/thermo/IdealMolalSoln.cpp b/Cantera/src/thermo/IdealMolalSoln.cpp
index 41948a135..e58e1d6b1 100644
--- a/Cantera/src/thermo/IdealMolalSoln.cpp
+++ b/Cantera/src/thermo/IdealMolalSoln.cpp
@@ -26,7 +26,7 @@
 
 #include "IdealMolalSoln.h"
 #include "ThermoFactory.h"
-#include <math.h>
+#include <cmath>
 
 #ifndef MAX
 #define MAX(x,y)    (( (x) > (y) ) ? (x) : (y))
diff --git a/Cantera/src/thermo/LatticePhase.cpp b/Cantera/src/thermo/LatticePhase.cpp
index 974d2c23c..cba39e8e8 100644
--- a/Cantera/src/thermo/LatticePhase.cpp
+++ b/Cantera/src/thermo/LatticePhase.cpp
@@ -24,7 +24,7 @@
 #include "LatticePhase.h"
 #include "SpeciesThermo.h"
 
-#include <math.h>
+#include <cmath>
 
 namespace Cantera {
 
diff --git a/Cantera/src/thermo/PDSS_Water.cpp b/Cantera/src/thermo/PDSS_Water.cpp
index 54dff4432..17015c511 100644
--- a/Cantera/src/thermo/PDSS_Water.cpp
+++ b/Cantera/src/thermo/PDSS_Water.cpp
@@ -16,7 +16,8 @@
 #include "PDSS_Water.h"
 #include "WaterPropsIAPWS.h"
 #include "ThermoFactory.h"
-#include <math.h>
+
+#include <cmath>
 
 
 #include "VPStandardStateTP.h"
diff --git a/Cantera/src/thermo/WaterProps.cpp b/Cantera/src/thermo/WaterProps.cpp
index 5099a467e..54a61c499 100644
--- a/Cantera/src/thermo/WaterProps.cpp
+++ b/Cantera/src/thermo/WaterProps.cpp
@@ -20,7 +20,8 @@
 #include "ctml.h"
 #include "PDSS_Water.h"
 #include "WaterPropsIAPWS.h"
-#include <math.h>
+
+#include <cmath>
 
 namespace Cantera {
 
diff --git a/Cantera/src/transport/MMCollisionInt.cpp b/Cantera/src/transport/MMCollisionInt.cpp
index 01be6c3b7..c50855c32 100755
--- a/Cantera/src/transport/MMCollisionInt.cpp
+++ b/Cantera/src/transport/MMCollisionInt.cpp
@@ -20,7 +20,9 @@
 #include "polyfit.h"
 #include "xml.h"
 #include "XML_Writer.h"
-#include <stdio.h>
+
+#include <cstdio>
+
 using namespace std;
 
 namespace Cantera {
diff --git a/Cantera/src/transport/TransportFactory.cpp b/Cantera/src/transport/TransportFactory.cpp
index b544d2400..0f263babb 100755
--- a/Cantera/src/transport/TransportFactory.cpp
+++ b/Cantera/src/transport/TransportFactory.cpp
@@ -26,7 +26,6 @@
 
 #include "polyfit.h"
 #include "MMCollisionInt.h"
-#include <stdio.h>
 #include "xml.h"
 #include "XML_Writer.h"
 #include "TransportParams.h"
@@ -34,6 +33,8 @@
 #include "IdealGasPhase.h"
 #include "ctml.h"
 
+#include <cstdio>
+
 using namespace std;
 
 /**