diff --git a/test_problems/cathermo/DH_graph_1/DH_graph_1.cpp b/test_problems/cathermo/DH_graph_1/DH_graph_1.cpp
index 1334cc97c..16717cd90 100644
--- a/test_problems/cathermo/DH_graph_1/DH_graph_1.cpp
+++ b/test_problems/cathermo/DH_graph_1/DH_graph_1.cpp
@@ -8,7 +8,6 @@
  *  $Date$
  *  $Revision$
  */
-#include <stdio.h>
 
 #ifdef SRCDIRTREE
 #include "ct_defs.h"
@@ -20,6 +19,8 @@
 #include "kernel/DebyeHuckel.h"
 #endif
 
+#include <cstdio>
+
 using namespace std;
 using namespace Cantera;
 
diff --git a/test_problems/cathermo/DH_graph_NM/DH_graph_1.cpp b/test_problems/cathermo/DH_graph_NM/DH_graph_1.cpp
index 1334cc97c..16717cd90 100644
--- a/test_problems/cathermo/DH_graph_NM/DH_graph_1.cpp
+++ b/test_problems/cathermo/DH_graph_NM/DH_graph_1.cpp
@@ -8,7 +8,6 @@
  *  $Date$
  *  $Revision$
  */
-#include <stdio.h>
 
 #ifdef SRCDIRTREE
 #include "ct_defs.h"
@@ -20,6 +19,8 @@
 #include "kernel/DebyeHuckel.h"
 #endif
 
+#include <cstdio>
+
 using namespace std;
 using namespace Cantera;
 
diff --git a/test_problems/cathermo/DH_graph_Pitzer/DH_graph_1.cpp b/test_problems/cathermo/DH_graph_Pitzer/DH_graph_1.cpp
index 1334cc97c..16717cd90 100644
--- a/test_problems/cathermo/DH_graph_Pitzer/DH_graph_1.cpp
+++ b/test_problems/cathermo/DH_graph_Pitzer/DH_graph_1.cpp
@@ -8,7 +8,6 @@
  *  $Date$
  *  $Revision$
  */
-#include <stdio.h>
 
 #ifdef SRCDIRTREE
 #include "ct_defs.h"
@@ -20,6 +19,8 @@
 #include "kernel/DebyeHuckel.h"
 #endif
 
+#include <cstdio>
+
 using namespace std;
 using namespace Cantera;
 
diff --git a/test_problems/cathermo/DH_graph_acommon/DH_graph_1.cpp b/test_problems/cathermo/DH_graph_acommon/DH_graph_1.cpp
index 1334cc97c..16717cd90 100644
--- a/test_problems/cathermo/DH_graph_acommon/DH_graph_1.cpp
+++ b/test_problems/cathermo/DH_graph_acommon/DH_graph_1.cpp
@@ -8,7 +8,6 @@
  *  $Date$
  *  $Revision$
  */
-#include <stdio.h>
 
 #ifdef SRCDIRTREE
 #include "ct_defs.h"
@@ -20,6 +19,8 @@
 #include "kernel/DebyeHuckel.h"
 #endif
 
+#include <cstdio>
+
 using namespace std;
 using namespace Cantera;
 
diff --git a/test_problems/cathermo/DH_graph_bdotak/DH_graph_1.cpp b/test_problems/cathermo/DH_graph_bdotak/DH_graph_1.cpp
index 1334cc97c..16717cd90 100644
--- a/test_problems/cathermo/DH_graph_bdotak/DH_graph_1.cpp
+++ b/test_problems/cathermo/DH_graph_bdotak/DH_graph_1.cpp
@@ -8,7 +8,6 @@
  *  $Date$
  *  $Revision$
  */
-#include <stdio.h>
 
 #ifdef SRCDIRTREE
 #include "ct_defs.h"
@@ -20,6 +19,8 @@
 #include "kernel/DebyeHuckel.h"
 #endif
 
+#include <cstdio>
+
 using namespace std;
 using namespace Cantera;
 
diff --git a/test_problems/cathermo/HMW_dupl_test/HMW_dupl_test.cpp b/test_problems/cathermo/HMW_dupl_test/HMW_dupl_test.cpp
index 907b73d1d..84665e681 100644
--- a/test_problems/cathermo/HMW_dupl_test/HMW_dupl_test.cpp
+++ b/test_problems/cathermo/HMW_dupl_test/HMW_dupl_test.cpp
@@ -8,7 +8,6 @@
  *  $Date$
  *  $Revision$
  */
-#include <stdio.h>
 
 #ifdef SRCDIRTREE
 #include "ct_defs.h"
@@ -25,6 +24,8 @@
 #include "HMWSoln.h"
 #endif
 
+#include <cstdio>
+
 using namespace std;
 using namespace Cantera;
 
diff --git a/test_problems/cathermo/HMW_graph_CpvT/Cp_standalone.cpp b/test_problems/cathermo/HMW_graph_CpvT/Cp_standalone.cpp
index e21ef9390..bf21a76a9 100644
--- a/test_problems/cathermo/HMW_graph_CpvT/Cp_standalone.cpp
+++ b/test_problems/cathermo/HMW_graph_CpvT/Cp_standalone.cpp
@@ -1,7 +1,7 @@
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cmath>
 
 using namespace std;
 
diff --git a/test_problems/cathermo/HMW_graph_CpvT/HMW_graph_CpvT.cpp b/test_problems/cathermo/HMW_graph_CpvT/HMW_graph_CpvT.cpp
index 035fa5ed8..ae879bb25 100755
--- a/test_problems/cathermo/HMW_graph_CpvT/HMW_graph_CpvT.cpp
+++ b/test_problems/cathermo/HMW_graph_CpvT/HMW_graph_CpvT.cpp
@@ -8,7 +8,6 @@
  *  $Date$
  *  $Revision$
  */
-#include <stdio.h>
 
 #ifdef SRCDIRTREE
 #include "ct_defs.h"
@@ -25,6 +24,8 @@
 #include "HMWSoln.h"
 #endif
 
+#include <cstdio>
+
 using namespace std;
 using namespace Cantera;
 
diff --git a/test_problems/cathermo/HMW_graph_GvI/HMW_graph_GvI.cpp b/test_problems/cathermo/HMW_graph_GvI/HMW_graph_GvI.cpp
index 3f58f94f5..40f927a49 100644
--- a/test_problems/cathermo/HMW_graph_GvI/HMW_graph_GvI.cpp
+++ b/test_problems/cathermo/HMW_graph_GvI/HMW_graph_GvI.cpp
@@ -8,7 +8,6 @@
  *  $Date$
  *  $Revision$
  */
-#include <stdio.h>
 
 #ifdef SRCDIRTREE
 #include "ct_defs.h"
@@ -22,6 +21,8 @@
 #include "HMWSoln.h"
 #endif
 
+#include <cstdio>
+
 using namespace std;
 using namespace Cantera;
 
diff --git a/test_problems/cathermo/HMW_graph_GvT/Gex_standalone.cpp b/test_problems/cathermo/HMW_graph_GvT/Gex_standalone.cpp
index 8ca978154..daed32b02 100644
--- a/test_problems/cathermo/HMW_graph_GvT/Gex_standalone.cpp
+++ b/test_problems/cathermo/HMW_graph_GvT/Gex_standalone.cpp
@@ -1,7 +1,7 @@
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cmath>
 
 using namespace std;
 
diff --git a/test_problems/cathermo/HMW_graph_GvT/HMW_graph_GvT.cpp b/test_problems/cathermo/HMW_graph_GvT/HMW_graph_GvT.cpp
index 9096910d2..b41a61106 100644
--- a/test_problems/cathermo/HMW_graph_GvT/HMW_graph_GvT.cpp
+++ b/test_problems/cathermo/HMW_graph_GvT/HMW_graph_GvT.cpp
@@ -8,7 +8,6 @@
  *  $Date$
  *  $Revision$
  */
-#include <stdio.h>
 
 #ifdef SRCDIRTREE
 #include "ct_defs.h"
@@ -27,6 +26,8 @@
 
 #include "TemperatureTable.h"
 
+#include <cstdio>
+
 using namespace std;
 using namespace Cantera;
 
diff --git a/test_problems/cathermo/HMW_graph_HvT/HMW_graph_HvT.cpp b/test_problems/cathermo/HMW_graph_HvT/HMW_graph_HvT.cpp
index 77f5ecc6d..15de6a268 100644
--- a/test_problems/cathermo/HMW_graph_HvT/HMW_graph_HvT.cpp
+++ b/test_problems/cathermo/HMW_graph_HvT/HMW_graph_HvT.cpp
@@ -8,13 +8,14 @@
  *  $Date$
  *  $Revision$
  */
-#include <stdio.h>
 
 #include "Cantera.h"
 #include "thermo.h"
 #include "kernel/HMWSoln.h"
 #include "TemperatureTable.h"
 
+#include <cstdio>
+
 using namespace std;
 using namespace Cantera;
 
diff --git a/test_problems/cathermo/HMW_graph_HvT/L_standalone.cpp b/test_problems/cathermo/HMW_graph_HvT/L_standalone.cpp
index f9fd7aacf..072d124b9 100644
--- a/test_problems/cathermo/HMW_graph_HvT/L_standalone.cpp
+++ b/test_problems/cathermo/HMW_graph_HvT/L_standalone.cpp
@@ -1,7 +1,7 @@
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cmath>
 
 using namespace std;
 
diff --git a/test_problems/cathermo/HMW_graph_VvT/HMW_graph_VvT.cpp b/test_problems/cathermo/HMW_graph_VvT/HMW_graph_VvT.cpp
index 40f7aea57..c4ebc6008 100755
--- a/test_problems/cathermo/HMW_graph_VvT/HMW_graph_VvT.cpp
+++ b/test_problems/cathermo/HMW_graph_VvT/HMW_graph_VvT.cpp
@@ -7,7 +7,6 @@
  *  $Date$
  *  $Revision$
  */
-#include <stdio.h>
 
 #ifdef SRCDIRTREE
 #include "ct_defs.h"
@@ -27,6 +26,8 @@
 
 #endif
 
+#include <cstdio>
+
 using namespace std;
 using namespace Cantera;
 
diff --git a/test_problems/cathermo/HMW_graph_VvT/V_standalone.cpp b/test_problems/cathermo/HMW_graph_VvT/V_standalone.cpp
index 0b2c08bda..9e6f4612f 100644
--- a/test_problems/cathermo/HMW_graph_VvT/V_standalone.cpp
+++ b/test_problems/cathermo/HMW_graph_VvT/V_standalone.cpp
@@ -1,7 +1,7 @@
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cmath>
 
 using namespace std;
 
diff --git a/test_problems/cathermo/HMW_test_1/HMW_test_1.cpp b/test_problems/cathermo/HMW_test_1/HMW_test_1.cpp
index c6ca856e4..1e8395181 100644
--- a/test_problems/cathermo/HMW_test_1/HMW_test_1.cpp
+++ b/test_problems/cathermo/HMW_test_1/HMW_test_1.cpp
@@ -5,11 +5,12 @@
 /* $Revision$ */
 /* ======================================================================= */
 
-#include <stdio.h>
 
 #include "Cantera.h"
 #include "kernel/HMWSoln.h"
 
+#include <cstdio>
+
 using namespace std;
 using namespace Cantera;
 
diff --git a/test_problems/cathermo/HMW_test_3/HMW_test_3.cpp b/test_problems/cathermo/HMW_test_3/HMW_test_3.cpp
index c5ec79e70..527a01c48 100644
--- a/test_problems/cathermo/HMW_test_3/HMW_test_3.cpp
+++ b/test_problems/cathermo/HMW_test_3/HMW_test_3.cpp
@@ -5,7 +5,6 @@
 /* $Revision$ */
 /* ======================================================================= */
 
-#include <stdio.h>
 
 #ifdef SRCDIRTREE
 #include "ct_defs.h"
@@ -15,6 +14,8 @@
 #include "HMWSoln.h"
 #endif
 
+#include <cstdio>
+
 using namespace std;
 using namespace Cantera;
 
diff --git a/test_problems/cathermo/VPissp/ISSPTester.cpp b/test_problems/cathermo/VPissp/ISSPTester.cpp
index d3b365491..9e55800db 100644
--- a/test_problems/cathermo/VPissp/ISSPTester.cpp
+++ b/test_problems/cathermo/VPissp/ISSPTester.cpp
@@ -22,13 +22,14 @@
 #include <iostream>
 #include <string>
 #include <vector>
-#include <stdio.h>
 
 
 #include "Cantera.h"
 #include "kernel/IdealSolidSolnPhase.h"
 #include "kernel/IdealSolnGasVPSS.h"
 
+#include <cstdio>
+
 using namespace std;
 
 #ifdef DEBUG_HKM
diff --git a/test_problems/cathermo/ims/IMSTester.cpp b/test_problems/cathermo/ims/IMSTester.cpp
index c8526e13f..18b0b0d0c 100644
--- a/test_problems/cathermo/ims/IMSTester.cpp
+++ b/test_problems/cathermo/ims/IMSTester.cpp
@@ -22,7 +22,6 @@
 #include <iostream>
 #include <string>
 #include <vector>
-#include <stdio.h>
 
 #ifdef SRCDIRTREE
 #include "ct_defs.h"
@@ -32,6 +31,8 @@
 #include "kernel/IdealMolalSoln.h"
 #endif
 
+#include <cstdio>
+
 using namespace std;
 
 #ifdef DEBUG_HKM
diff --git a/test_problems/cathermo/issp/ISSPTester.cpp b/test_problems/cathermo/issp/ISSPTester.cpp
index f89dff018..1d875a10e 100644
--- a/test_problems/cathermo/issp/ISSPTester.cpp
+++ b/test_problems/cathermo/issp/ISSPTester.cpp
@@ -22,7 +22,6 @@
 #include <iostream>
 #include <string>
 #include <vector>
-#include <stdio.h>
 
 #ifdef SRCDIRTREE
 #include "ct_defs.h"
@@ -32,6 +31,8 @@
 #include "kernel/IdealSolidSolnPhase.h"
 #endif
 
+#include <cstdio>
+
 using namespace std;
 
 #ifdef DEBUG_HKM
diff --git a/test_problems/cathermo/stoichSubSSTP/stoichSubSSTP.cpp b/test_problems/cathermo/stoichSubSSTP/stoichSubSSTP.cpp
index 5fac8fad6..b7d15fb78 100644
--- a/test_problems/cathermo/stoichSubSSTP/stoichSubSSTP.cpp
+++ b/test_problems/cathermo/stoichSubSSTP/stoichSubSSTP.cpp
@@ -8,7 +8,6 @@
  *  $Date$
  *  $Revision$
  */
-#include <stdio.h>
 
 #ifdef SRCDIRTREE
 #include "ct_defs.h"
@@ -24,6 +23,8 @@
 
 #include "TemperatureTable.h"
 
+#include <cstdio>
+
 using namespace std;
 using namespace Cantera;
 
diff --git a/test_problems/cathermo/testIAPWS/testIAPWSphi.cpp b/test_problems/cathermo/testIAPWS/testIAPWSphi.cpp
index 1689b2421..7e630a470 100644
--- a/test_problems/cathermo/testIAPWS/testIAPWSphi.cpp
+++ b/test_problems/cathermo/testIAPWS/testIAPWSphi.cpp
@@ -1,9 +1,11 @@
 /*
  * $Id$
  */
-#include "stdio.h"
 #include "WaterPropsIAPWSphi.h"
 #include <new>
+
+#include <cstdio>
+
 using namespace std;
 
 int main () {
diff --git a/test_problems/cathermo/testIAPWSPres/testPress.cpp b/test_problems/cathermo/testIAPWSPres/testPress.cpp
index 1ab7e11c5..74f14b1ae 100644
--- a/test_problems/cathermo/testIAPWSPres/testPress.cpp
+++ b/test_problems/cathermo/testIAPWSPres/testPress.cpp
@@ -1,8 +1,10 @@
 
-#include "stdio.h"
-#include "math.h"
 #include "WaterPropsIAPWS.h"
 #include <new>
+
+#include <cstdio>
+#include <cmath>
+
 using namespace std;
 
 
diff --git a/test_problems/cathermo/testIAPWSTripP/testTripleP.cpp b/test_problems/cathermo/testIAPWSTripP/testTripleP.cpp
index 133afb604..782662e74 100644
--- a/test_problems/cathermo/testIAPWSTripP/testTripleP.cpp
+++ b/test_problems/cathermo/testIAPWSTripP/testTripleP.cpp
@@ -1,8 +1,10 @@
 
-#include "stdio.h"
-#include "math.h"
 #include "WaterPropsIAPWS.h"
 #include <new>
+
+#include <cstdio>
+#include <cmath>
+
 using namespace std;
 
 int main () {
diff --git a/test_problems/cathermo/testWaterPDSS/testWaterPDSS.cpp b/test_problems/cathermo/testWaterPDSS/testWaterPDSS.cpp
index a3f6cf95b..975961487 100644
--- a/test_problems/cathermo/testWaterPDSS/testWaterPDSS.cpp
+++ b/test_problems/cathermo/testWaterPDSS/testWaterPDSS.cpp
@@ -1,7 +1,6 @@
 /*
  * $Id$
  */
-#include "stdio.h"
 #include "ct_defs.h"
 #include "ctexceptions.h"
 #include "global.h"
@@ -11,6 +10,9 @@
 #include "ThermoPhase.h"
 #include "VPStandardStateTP.h"
 #include <new>
+
+#include <cstdio>
+
 using namespace std;
 using namespace Cantera;
 
diff --git a/test_problems/cathermo/testWaterTP/testWaterSSTP.cpp b/test_problems/cathermo/testWaterTP/testWaterSSTP.cpp
index a9a2d0c6e..a5681c8be 100644
--- a/test_problems/cathermo/testWaterTP/testWaterSSTP.cpp
+++ b/test_problems/cathermo/testWaterTP/testWaterSSTP.cpp
@@ -1,13 +1,14 @@
 /*
  * $Id$
  */
-#include "stdio.h"
-#include "math.h"
 
 #include "Cantera.h"
 #include "thermo.h"
 #include "WaterSSTP.h"
 
+#include <cstdio>
+#include <cmath>
+
 #include <new>
 using namespace std;
 using namespace Cantera;