diff --git a/include/cantera/Edge.h b/include/cantera/Edge.h
index 3d529ac81..0b3db91a2 100644
--- a/include/cantera/Edge.h
+++ b/include/cantera/Edge.h
@@ -1,8 +1,6 @@
 #ifndef CXX_EDGE
 #define CXX_EDGE
 
-#include <string>
-
 #include "thermo.h"
 #include "kinetics/EdgeKinetics.h"
 #include "kinetics/importKinetics.h"
diff --git a/include/cantera/GRI30.h b/include/cantera/GRI30.h
index f42580cfe..6826cd366 100644
--- a/include/cantera/GRI30.h
+++ b/include/cantera/GRI30.h
@@ -1,8 +1,6 @@
 #ifndef CXX_GRI30H
 #define CXX_GRI30H
 
-#include <string>
-
 #include "thermo/IdealGasPhase.h"
 #include "kinetics/GRI_30_Kinetics.h"
 #include "kinetics/importKinetics.h"
diff --git a/include/cantera/IdealGasMix.h b/include/cantera/IdealGasMix.h
index a6eb184de..1d34a420d 100644
--- a/include/cantera/IdealGasMix.h
+++ b/include/cantera/IdealGasMix.h
@@ -1,8 +1,6 @@
 #ifndef CXX_IDEALGASMIX
 #define CXX_IDEALGASMIX
 
-#include <string>
-
 #include "thermo/IdealGasPhase.h"
 #include "kinetics/GasKinetics.h"
 #include "kinetics/importKinetics.h"
diff --git a/include/cantera/IncompressibleSolid.h b/include/cantera/IncompressibleSolid.h
index 037e85acb..3d6c06ad0 100644
--- a/include/cantera/IncompressibleSolid.h
+++ b/include/cantera/IncompressibleSolid.h
@@ -1,8 +1,6 @@
 #ifndef CXX_INCOMPRESSIBLE
 #define CXX_INCOMPRESSIBLE
 
-#include <string>
-
 #include "thermo/ConstDensityThermo.h"
 #include "kinetics/importKinetics.h"
 
diff --git a/include/cantera/Interface.h b/include/cantera/Interface.h
index 56fa4f0cd..06359bb3a 100644
--- a/include/cantera/Interface.h
+++ b/include/cantera/Interface.h
@@ -5,7 +5,6 @@
 #ifndef CXX_INTERFACE
 #define CXX_INTERFACE
 
-#include <string>
 #include "thermo.h"
 #include "kinetics.h"
 
diff --git a/include/cantera/Metal.h b/include/cantera/Metal.h
index d6f7614d0..335ebab13 100644
--- a/include/cantera/Metal.h
+++ b/include/cantera/Metal.h
@@ -1,8 +1,6 @@
 #ifndef CXX_METAL
 #define CXX_METAL
 
-#include <string>
-
 #include "thermo/MetalPhase.h"
 #include "kinetics/importKinetics.h"
 
diff --git a/include/cantera/PureFluid.h b/include/cantera/PureFluid.h
index d71b14ce4..c120aa168 100644
--- a/include/cantera/PureFluid.h
+++ b/include/cantera/PureFluid.h
@@ -1,8 +1,6 @@
 #ifndef CXX_PUREFLUID
 #define CXX_PUREFLUID
 
-#include <string>
-
 #include "thermo/PureFluidPhase.h"
 #include "kinetics.h"
 #include "base/stringUtils.h"
diff --git a/include/cantera/base/Array.h b/include/cantera/base/Array.h
index e6435342f..098fb2802 100644
--- a/include/cantera/base/Array.h
+++ b/include/cantera/base/Array.h
@@ -12,6 +12,7 @@
 #include "ctexceptions.h"
 #include "utilities.h"
 
+#include <iostream>
 #include <cstring>
 
 namespace Cantera
diff --git a/include/cantera/base/ctexceptions.h b/include/cantera/base/ctexceptions.h
index 1fa4b7cb2..38ec6d5b6 100644
--- a/include/cantera/base/ctexceptions.h
+++ b/include/cantera/base/ctexceptions.h
@@ -10,7 +10,6 @@
 #define CT_CTEXCEPTIONS_H
 
 #include <exception>
-#include <iostream>
 #include <string>
 
 namespace Cantera
diff --git a/include/cantera/base/logger.h b/include/cantera/base/logger.h
index d57a1bc4b..00bc4951f 100644
--- a/include/cantera/base/logger.h
+++ b/include/cantera/base/logger.h
@@ -9,8 +9,6 @@
 #include "ct_defs.h"
 
 #include <iostream>
-#include <string>
-#include <cstdlib>
 
 namespace Cantera
 {
diff --git a/include/cantera/base/plots.h b/include/cantera/base/plots.h
index 77c31ec0e..0e6031335 100644
--- a/include/cantera/base/plots.h
+++ b/include/cantera/base/plots.h
@@ -10,8 +10,6 @@
 #include "cantera/base/Array.h"
 #include "cantera/base/ctexceptions.h"
 
-#include <vector>
-#include <string>
 #include <fstream>
 
 namespace Cantera
diff --git a/include/cantera/base/xml.h b/include/cantera/base/xml.h
index 9685a6c53..705a4f7fa 100644
--- a/include/cantera/base/xml.h
+++ b/include/cantera/base/xml.h
@@ -10,13 +10,8 @@
 #define CT_XML_H
 
 #include "ctexceptions.h"
-#include "ct_defs.h"
 #include "global.h"
 
-#include <string>
-#include <vector>
-#include <iostream>
-
 //@{
 #define XML_INDENT 4
 //@}
diff --git a/include/cantera/equil/vcs_VolPhase.h b/include/cantera/equil/vcs_VolPhase.h
index 4035496f2..147d78efe 100644
--- a/include/cantera/equil/vcs_VolPhase.h
+++ b/include/cantera/equil/vcs_VolPhase.h
@@ -14,9 +14,6 @@
 #include "cantera/equil/vcs_DoubleStarStar.h"
 #include "cantera/equil/vcs_SpeciesProperties.h"
 
-#include <vector>
-#include <string>
-
 // Forward reference for ThermoPhase object within the Cantera namespace
 namespace Cantera
 {
diff --git a/include/cantera/equil/vcs_prob.h b/include/cantera/equil/vcs_prob.h
index 3830f0ab3..a6bf17b06 100644
--- a/include/cantera/equil/vcs_prob.h
+++ b/include/cantera/equil/vcs_prob.h
@@ -14,7 +14,6 @@
 #include "vcs_DoubleStarStar.h"
 #include "vcs_IntStarStar.h"
 #include "cantera/equil/vcs_defs.h"
-#include <vector>
 #include <string>
 
 namespace VCSnonideal
diff --git a/include/cantera/equil/vcs_solve.h b/include/cantera/equil/vcs_solve.h
index d122ccaa1..17e737545 100644
--- a/include/cantera/equil/vcs_solve.h
+++ b/include/cantera/equil/vcs_solve.h
@@ -22,8 +22,6 @@
 *
 *     ###  -> to be eliminated
 */
-#include <vector>
-#include <string>
 
 #include "cantera/base/ct_defs.h"
 #include "cantera/equil/vcs_defs.h"
diff --git a/include/cantera/kinetics/AqueousKinetics.h b/include/cantera/kinetics/AqueousKinetics.h
index d59793394..77f76a1ac 100644
--- a/include/cantera/kinetics/AqueousKinetics.h
+++ b/include/cantera/kinetics/AqueousKinetics.h
@@ -9,9 +9,6 @@
 #ifndef CT_AQUEOUSKINETICS_H
 #define CT_AQUEOUSKINETICS_H
 
-#include <fstream>
-#include <map>
-
 #include "cantera/thermo/mix_defs.h"
 #include "Kinetics.h"
 
@@ -22,9 +19,6 @@
 #include "FalloffMgr.h"
 #include "RateCoeffMgr.h"
 
-#include <cmath>
-#include <cstdlib>
-
 namespace Cantera
 {
 
diff --git a/include/cantera/kinetics/GasKinetics.h b/include/cantera/kinetics/GasKinetics.h
index d66504749..7dbaf4a55 100644
--- a/include/cantera/kinetics/GasKinetics.h
+++ b/include/cantera/kinetics/GasKinetics.h
@@ -9,9 +9,6 @@
 #ifndef CT_GASKINETICS_H
 #define CT_GASKINETICS_H
 
-#include <fstream>
-#include <map>
-
 #include "cantera/thermo/mix_defs.h"
 #include "Kinetics.h"
 
@@ -22,9 +19,6 @@
 #include "FalloffMgr.h"
 #include "RateCoeffMgr.h"
 
-#include <cmath>
-#include <cstdlib>
-
 namespace Cantera
 {
 
diff --git a/include/cantera/kinetics/InterfaceKinetics.h b/include/cantera/kinetics/InterfaceKinetics.h
index 4d9e9b78a..6accc1d0c 100644
--- a/include/cantera/kinetics/InterfaceKinetics.h
+++ b/include/cantera/kinetics/InterfaceKinetics.h
@@ -8,9 +8,6 @@
 #ifndef CT_IFACEKINETICS_H
 #define CT_IFACEKINETICS_H
 
-#include <fstream>
-#include <map>
-
 #include "cantera/thermo/mix_defs.h"
 #include "Kinetics.h"
 
@@ -18,9 +15,6 @@
 #include "RateCoeffMgr.h"
 #include "ReactionStoichMgr.h"
 
-#include <cmath>
-#include <cstdlib>
-
 namespace Cantera
 {
 
diff --git a/include/cantera/kinetics/importKinetics.h b/include/cantera/kinetics/importKinetics.h
index 9044c931c..c70171e83 100644
--- a/include/cantera/kinetics/importKinetics.h
+++ b/include/cantera/kinetics/importKinetics.h
@@ -15,8 +15,6 @@
 #ifndef CT_IMPORTCTML_H
 #define CT_IMPORTCTML_H
 
-#include <string>
-
 #include "cantera/thermo/ThermoPhase.h"
 #include "Kinetics.h"
 
diff --git a/include/cantera/kinetics/solveSP.h b/include/cantera/kinetics/solveSP.h
index 04142e588..202169c73 100644
--- a/include/cantera/kinetics/solveSP.h
+++ b/include/cantera/kinetics/solveSP.h
@@ -15,8 +15,6 @@
 
 #include "ImplicitSurfChem.h"
 #include "cantera/kinetics/InterfaceKinetics.h"
-
-#include <vector>
 #include "cantera/base/Array.h"
 
 //! @defgroup solvesp_methods Surface Problem Solver Methods
diff --git a/include/cantera/numerics/DAE_Solver.h b/include/cantera/numerics/DAE_Solver.h
index 99b89110d..a44af4ec7 100644
--- a/include/cantera/numerics/DAE_Solver.h
+++ b/include/cantera/numerics/DAE_Solver.h
@@ -8,9 +8,6 @@
 #ifndef CT_DAE_Solver_H
 #define CT_DAE_Solver_H
 
-#include <vector>
-
-#include "cantera/base/ct_defs.h"
 #include "ResidJacEval.h"
 #include "cantera/base/global.h"
 
diff --git a/include/cantera/numerics/Func1.h b/include/cantera/numerics/Func1.h
index e3f48fc38..cf5fb7af1 100644
--- a/include/cantera/numerics/Func1.h
+++ b/include/cantera/numerics/Func1.h
@@ -10,7 +10,6 @@
 #include "cantera/base/ct_defs.h"
 
 #include <iostream>
-#include <string>
 
 namespace Cantera
 {
diff --git a/include/cantera/numerics/IDA_Solver.h b/include/cantera/numerics/IDA_Solver.h
index 0c7fcbc13..50bc66559 100644
--- a/include/cantera/numerics/IDA_Solver.h
+++ b/include/cantera/numerics/IDA_Solver.h
@@ -8,8 +8,6 @@
 #ifndef CT_IDA_SOLVER_H
 #define CT_IDA_SOLVER_H
 
-#include <vector>
-
 #include "DAE_Solver.h"
 #include "cantera/base/ctexceptions.h"
 
diff --git a/include/cantera/numerics/RootFind.h b/include/cantera/numerics/RootFind.h
index 3de0743a5..0731b2f29 100644
--- a/include/cantera/numerics/RootFind.h
+++ b/include/cantera/numerics/RootFind.h
@@ -17,7 +17,6 @@
  * @defgroup solverGroup Solvers for Equation Systems
  */
 
-#include <vector>
 #include "ResidEval.h"
 
 namespace Cantera
diff --git a/include/cantera/numerics/polyfit.h b/include/cantera/numerics/polyfit.h
index e7c0a3330..ab94b3a2b 100644
--- a/include/cantera/numerics/polyfit.h
+++ b/include/cantera/numerics/polyfit.h
@@ -9,8 +9,6 @@
 #ifndef CT_POLYFIT_H
 #define CT_POLYFIT_H
 
-#include <vector>
-
 #include "cantera/base/ct_defs.h"
 
 namespace Cantera
diff --git a/include/cantera/numerics/solveProb.h b/include/cantera/numerics/solveProb.h
index 78f034ee6..7f5ec69b6 100644
--- a/include/cantera/numerics/solveProb.h
+++ b/include/cantera/numerics/solveProb.h
@@ -17,7 +17,6 @@
  * @defgroup solverGroup Solvers for Equation Systems
  */
 
-#include <vector>
 #include "cantera/base/Array.h"
 #include "ResidEval.h"
 
diff --git a/include/cantera/oneD/Inlet1D.h b/include/cantera/oneD/Inlet1D.h
index 8e0b8cc82..9bbf950f0 100644
--- a/include/cantera/oneD/Inlet1D.h
+++ b/include/cantera/oneD/Inlet1D.h
@@ -18,6 +18,8 @@
 #include "OneDim.h"
 #include "cantera/base/ctml.h"
 
+#include <cstdio>
+
 namespace Cantera
 {
 
diff --git a/include/cantera/thermo/GeneralSpeciesThermo.h b/include/cantera/thermo/GeneralSpeciesThermo.h
index 678eacc21..885bdafe7 100644
--- a/include/cantera/thermo/GeneralSpeciesThermo.h
+++ b/include/cantera/thermo/GeneralSpeciesThermo.h
@@ -8,7 +8,6 @@
  */
 #ifndef CT_GENERALSPECIESTHERMO_H
 #define CT_GENERALSPECIESTHERMO_H
-#include <string>
 #include "cantera/base/ct_defs.h"
 #include "SpeciesThermoMgr.h"
 #include "NasaPoly1.h"
diff --git a/include/cantera/thermo/SpeciesThermoMgr.h b/include/cantera/thermo/SpeciesThermoMgr.h
index ca3e26beb..e9aa42580 100644
--- a/include/cantera/thermo/SpeciesThermoMgr.h
+++ b/include/cantera/thermo/SpeciesThermoMgr.h
@@ -15,7 +15,6 @@
 #include "cantera/base/ctexceptions.h"
 #include "cantera/base/stringUtils.h"
 #include "SpeciesThermo.h"
-#include <map>
 
 namespace Cantera
 {
diff --git a/include/cantera/thermo/StatMech.h b/include/cantera/thermo/StatMech.h
index f02b53f16..094d6f1f8 100644
--- a/include/cantera/thermo/StatMech.h
+++ b/include/cantera/thermo/StatMech.h
@@ -15,8 +15,6 @@
 #include "cantera/base/global.h"
 #include "SpeciesThermoInterpType.h"
 #include "SpeciesThermoMgr.h"
-#include <string>
-#include <map>
 
 namespace Cantera
 {
diff --git a/include/cantera/tpx/Sub.h b/include/cantera/tpx/Sub.h
index b61fb6e56..717610f42 100644
--- a/include/cantera/tpx/Sub.h
+++ b/include/cantera/tpx/Sub.h
@@ -3,9 +3,6 @@
 
 #include "cantera/base/ctexceptions.h"
 
-#include <iostream>
-#include <string>
-
 namespace tpx
 {
 
diff --git a/include/cantera/transport/AqueousTransport.h b/include/cantera/transport/AqueousTransport.h
index b9e4a50f0..f3906aff2 100644
--- a/include/cantera/transport/AqueousTransport.h
+++ b/include/cantera/transport/AqueousTransport.h
@@ -13,12 +13,6 @@
 #include "TransportParams.h"
 #include "LiquidTransportParams.h"
 
-#include <vector>
-#include <string>
-#include <map>
-#include <numeric>
-#include <algorithm>
-
 namespace Cantera
 {
 
diff --git a/include/cantera/transport/LTPspecies.h b/include/cantera/transport/LTPspecies.h
index 36bb5a5b8..05d28b24d 100644
--- a/include/cantera/transport/LTPspecies.h
+++ b/include/cantera/transport/LTPspecies.h
@@ -6,15 +6,9 @@
 #ifndef CT_LTPSPECIES_H
 #define CT_LTPSPECIES_H
 
-// Cantera includes
-#include "cantera/base/ct_defs.h"
 #include "TransportBase.h"
 #include "cantera/base/FactoryBase.h"
 
-// STL includes
-#include <vector>
-#include <string>
-
 namespace Cantera
 {
 
diff --git a/include/cantera/transport/LiquidTransport.h b/include/cantera/transport/LiquidTransport.h
index 98cbc56c8..0d0554b2b 100644
--- a/include/cantera/transport/LiquidTransport.h
+++ b/include/cantera/transport/LiquidTransport.h
@@ -5,14 +5,6 @@
 #ifndef CT_LIQUIDTRAN_H
 #define CT_LIQUIDTRAN_H
 
-// STL includes
-#include <vector>
-#include <string>
-#include <map>
-#include <numeric>
-#include <algorithm>
-
-// Cantera includes
 #include "TransportBase.h"
 #include "cantera/numerics/DenseMatrix.h"
 #include "TransportParams.h"
diff --git a/include/cantera/transport/LiquidTransportData.h b/include/cantera/transport/LiquidTransportData.h
index 9a312fc94..7ad0d7377 100644
--- a/include/cantera/transport/LiquidTransportData.h
+++ b/include/cantera/transport/LiquidTransportData.h
@@ -5,13 +5,6 @@
 #ifndef CT_LIQUIDTRANSPORTDATA_H
 #define CT_LIQUIDTRANSPORTDATA_H
 
-
-// STL includes
-#include <vector>
-#include <string>
-
-// Cantera includes
-#include "cantera/base/ct_defs.h"
 #include "TransportBase.h"
 #include "cantera/base/FactoryBase.h"
 #include "LTPspecies.h"
diff --git a/include/cantera/transport/LiquidTransportParams.h b/include/cantera/transport/LiquidTransportParams.h
index 3917e9aa7..dfb91fbe5 100644
--- a/include/cantera/transport/LiquidTransportParams.h
+++ b/include/cantera/transport/LiquidTransportParams.h
@@ -6,7 +6,6 @@
 #ifndef CT_LIQUIDTRANSPORTPARAMS_H
 #define CT_LIQUIDTRANSPORTPARAMS_H
 
-#include "cantera/base/ct_defs.h"
 #include "TransportBase.h"
 #include "TransportParams.h"
 #include "LiquidTransportData.h"
@@ -14,8 +13,6 @@
 #include "cantera/base/xml.h"
 #include "cantera/base/XML_Writer.h"
 
-#include <vector>
-
 namespace Cantera
 {
 
diff --git a/include/cantera/transport/MixTransport.h b/include/cantera/transport/MixTransport.h
index f1411176d..c90929fa2 100644
--- a/include/cantera/transport/MixTransport.h
+++ b/include/cantera/transport/MixTransport.h
@@ -10,14 +10,6 @@
 #ifndef CT_MIXTRAN_H
 #define CT_MIXTRAN_H
 
-// STL includes
-#include <vector>
-#include <string>
-#include <map>
-#include <numeric>
-#include <algorithm>
-
-// Cantera includes
 #include "GasTransport.h"
 #include "cantera/numerics/DenseMatrix.h"
 
diff --git a/include/cantera/transport/PecosTransport.h b/include/cantera/transport/PecosTransport.h
index d109698bf..d0a04783b 100644
--- a/include/cantera/transport/PecosTransport.h
+++ b/include/cantera/transport/PecosTransport.h
@@ -8,22 +8,6 @@
 #ifndef CT_PECOSTRAN_H
 #define CT_PECOSTRAN_H
 
-// STL includes
-#include <vector>
-#include <string>
-#include <map>
-#include <numeric>
-#include <algorithm>
-
-#include <iostream>
-#include <cstdlib>
-#include <fstream>
-#include <sstream>
-#include <stdlib.h>
-#include <math.h>
-#include <stdio.h>
-
-// Cantera includes
 #include "TransportBase.h"
 #include "cantera/numerics/DenseMatrix.h"
 
diff --git a/include/cantera/transport/SimpleTransport.h b/include/cantera/transport/SimpleTransport.h
index 4683e8942..951a6c098 100644
--- a/include/cantera/transport/SimpleTransport.h
+++ b/include/cantera/transport/SimpleTransport.h
@@ -7,16 +7,6 @@
 #ifndef CT_SIMPLETRAN_H
 #define CT_SIMPLETRAN_H
 
-
-
-// STL includes
-#include <vector>
-#include <string>
-#include <map>
-#include <numeric>
-#include <algorithm>
-
-// Cantera includes
 #include "TransportBase.h"
 #include "cantera/numerics/DenseMatrix.h"
 #include "TransportParams.h"
diff --git a/include/cantera/transport/SolidTransport.h b/include/cantera/transport/SolidTransport.h
index 1ca321b71..e69d29bfc 100644
--- a/include/cantera/transport/SolidTransport.h
+++ b/include/cantera/transport/SolidTransport.h
@@ -10,14 +10,6 @@
 #ifndef CT_SOLIDTRAN_H
 #define CT_SOLIDTRAN_H
 
-// STL includes
-#include <vector>
-#include <string>
-#include <map>
-#include <numeric>
-#include <algorithm>
-
-// Cantera includes
 #include "LTPspecies.h"
 #include "TransportBase.h"
 #include "cantera/numerics/DenseMatrix.h"
diff --git a/include/cantera/transport/SolidTransportData.h b/include/cantera/transport/SolidTransportData.h
index c82007736..6a0f2ab44 100644
--- a/include/cantera/transport/SolidTransportData.h
+++ b/include/cantera/transport/SolidTransportData.h
@@ -6,12 +6,6 @@
 #ifndef CT_SOLIDTRANSPORTDATA_H
 #define CT_SOLIDTRANSPORTDATA_H
 
-// STL includes
-#include <vector>
-#include <string>
-
-// Cantera includes
-#include "cantera/base/ct_defs.h"
 #include "cantera/transport/TransportBase.h"
 #include "cantera/transport/TransportParams.h"
 #include "cantera/base/FactoryBase.h"
diff --git a/include/cantera/transport/TransportFactory.h b/include/cantera/transport/TransportFactory.h
index c6ce86bdd..b15a9c196 100644
--- a/include/cantera/transport/TransportFactory.h
+++ b/include/cantera/transport/TransportFactory.h
@@ -8,10 +8,6 @@
 #ifndef CT_TRANSPORTFACTORY_H
 #define CT_TRANSPORTFACTORY_H
 
-// STL includes
-#include <iostream>
-#include <new>
-
 // Cantera includes
 #include "cantera/base/ct_defs.h"
 #include "cantera/base/ct_thread.h"
diff --git a/include/cantera/transport/TransportParams.h b/include/cantera/transport/TransportParams.h
index df677f53f..150713be5 100644
--- a/include/cantera/transport/TransportParams.h
+++ b/include/cantera/transport/TransportParams.h
@@ -7,9 +7,6 @@
 #ifndef CT_TRANSPORTPARAMS_H
 #define CT_TRANSPORTPARAMS_H
 
-#include <vector>
-
-#include "cantera/base/ct_defs.h"
 #include "cantera/numerics/DenseMatrix.h"
 #include "TransportBase.h"
 
diff --git a/include/cantera/transport/WaterTransport.h b/include/cantera/transport/WaterTransport.h
index f7cc070e6..8f0d4a247 100644
--- a/include/cantera/transport/WaterTransport.h
+++ b/include/cantera/transport/WaterTransport.h
@@ -5,14 +5,6 @@
 #ifndef CT_WATERTRAN_H
 #define CT_WATERTRAN_H
 
-// STL includes
-#include <vector>
-#include <string>
-#include <map>
-#include <numeric>
-#include <algorithm>
-
-// Cantera includes
 #include "TransportBase.h"
 #include "cantera/numerics/DenseMatrix.h"
 #include "LiquidTransportParams.h"
diff --git a/include/cantera/zeroD/Reservoir.h b/include/cantera/zeroD/Reservoir.h
index 5763d77ec..38407bd17 100644
--- a/include/cantera/zeroD/Reservoir.h
+++ b/include/cantera/zeroD/Reservoir.h
@@ -6,7 +6,6 @@
 #ifndef CT_RESERVOIR_H
 #define CT_RESERVOIR_H
 
-#include <iostream>
 #include "ReactorBase.h"
 
 namespace Cantera
diff --git a/samples/cxx/NASA_coeffs/NASA_coeffs.cpp b/samples/cxx/NASA_coeffs/NASA_coeffs.cpp
index ccffc88e7..ab0c3f5c1 100644
--- a/samples/cxx/NASA_coeffs/NASA_coeffs.cpp
+++ b/samples/cxx/NASA_coeffs/NASA_coeffs.cpp
@@ -1,13 +1,5 @@
 #include "cantera/IdealGasMix.h"    // defines class IdealGasMix
 
-#include <iostream>
-#include <fstream>
-#include <vector>
-#include <map>
-#include <numeric>
-#include <string>
-#include <algorithm>
-
 using namespace Cantera;
 
 // The program is put into a function so that error handling code can
diff --git a/samples/cxx/rankine/rankine.cpp b/samples/cxx/rankine/rankine.cpp
index 04cfd9ef6..0248ebf7a 100644
--- a/samples/cxx/rankine/rankine.cpp
+++ b/samples/cxx/rankine/rankine.cpp
@@ -1,9 +1,7 @@
 // An open Rankine cycle
 
-#include <string>
-#include <map>
-
 #include "cantera/PureFluid.h"    // defines class Water
+#include <cstdio>
 
 using namespace Cantera;
 
diff --git a/src/apps/csvdiff.cpp b/src/apps/csvdiff.cpp
index 481782fbd..faaab432b 100644
--- a/src/apps/csvdiff.cpp
+++ b/src/apps/csvdiff.cpp
@@ -20,12 +20,8 @@
  *        one another.
  */
 
-#include <stdio.h>
-#include <cstdlib>
-#include <string.h>
 #include <math.h>
 #include <float.h>
-#include <limits.h>
 #include <algorithm>
 #include "cantera/base/config.h"
 #ifndef _MSC_VER
diff --git a/src/apps/cti2ctml.cpp b/src/apps/cti2ctml.cpp
index fb5f1c4f3..00a93dcde 100644
--- a/src/apps/cti2ctml.cpp
+++ b/src/apps/cti2ctml.cpp
@@ -2,10 +2,6 @@
  *  @file cti2ctml.cpp
  */
 
-#include <iostream>
-#include <string>
-#include <vector>
-
 #include "cantera/base/ct_defs.h"
 #include "cantera/base/xml.h"
 #include "cantera/base/ctml.h"
diff --git a/src/base/LogPrintCtrl.cpp b/src/base/LogPrintCtrl.cpp
index 103e86732..2782a671f 100644
--- a/src/base/LogPrintCtrl.cpp
+++ b/src/base/LogPrintCtrl.cpp
@@ -10,11 +10,6 @@
  * See file License.txt for licensing information.
  */
 
-#include <cmath>
-
-#include <iostream>
-#include <fstream>
-
 #include "LogPrintCtrl.h"
 #include "cantera/base/global.h"
 
diff --git a/src/base/PrintCtrl.cpp b/src/base/PrintCtrl.cpp
index 2fd3e455f..ea2de58d2 100644
--- a/src/base/PrintCtrl.cpp
+++ b/src/base/PrintCtrl.cpp
@@ -10,12 +10,8 @@
  * See file License.txt for licensing information.
  */
 
-#include <cmath>
-
-#include <iostream>
-#include <fstream>
-
 #include "cantera/base/PrintCtrl.h"
+#include <cmath>
 
 using namespace std;
 
diff --git a/src/base/application.cpp b/src/base/application.cpp
index d42dbbf24..a3789aa38 100644
--- a/src/base/application.cpp
+++ b/src/base/application.cpp
@@ -6,8 +6,6 @@
 #include "cantera/base/xml.h"
 #include "units.h"
 
-#include <map>
-#include <string>
 #include <fstream>
 #include <functional>
 
diff --git a/src/base/application.h b/src/base/application.h
index a6959736e..4f741da7c 100644
--- a/src/base/application.h
+++ b/src/base/application.h
@@ -5,11 +5,8 @@
 #include "cantera/base/ct_thread.h"
 #include "cantera/base/logger.h"
 
-#include <map>
 #include <set>
 #include <memory>
-#include <string>
-#include <vector>
 
 namespace Cantera
 {
diff --git a/src/base/checkFinite.cpp b/src/base/checkFinite.cpp
index 5e6aa2c08..77ca0b89a 100644
--- a/src/base/checkFinite.cpp
+++ b/src/base/checkFinite.cpp
@@ -12,9 +12,6 @@
 #include "cantera/base/ct_defs.h"
 
 #include <stdexcept>
-
-#include <cmath>
-#include <cstdlib>
 #include <cstdio>
 
 // We expect that there will be special casing based on the computer
diff --git a/src/base/ct2ctml.cpp b/src/base/ct2ctml.cpp
index 6c182b36a..1cad4f799 100644
--- a/src/base/ct2ctml.cpp
+++ b/src/base/ct2ctml.cpp
@@ -14,9 +14,6 @@
 
 #include <fstream>
 #include <sstream>
-#include <string>
-#include <cstdlib>
-#include <ctime>
 
 using namespace Cantera;
 using namespace std;
diff --git a/src/base/ctml.cpp b/src/base/ctml.cpp
index 0149db74f..7caf5e1e1 100644
--- a/src/base/ctml.cpp
+++ b/src/base/ctml.cpp
@@ -13,10 +13,6 @@
 #include "cantera/base/global.h"
 #include "cantera/base/stringUtils.h"
 
-#include <cctype>
-#include <cstring>
-#include <cstdlib>
-
 using namespace std;
 using namespace Cantera;
 
diff --git a/src/base/stringUtils.cpp b/src/base/stringUtils.cpp
index 3a907a878..92a6fedcc 100644
--- a/src/base/stringUtils.cpp
+++ b/src/base/stringUtils.cpp
@@ -20,12 +20,8 @@
 #include "cantera/base/global.h"
 #include "cantera/base/ctml.h"
 
-#include <string>
 #include <sstream>
 #include <cstdio>
-#include <cstring>
-#include <cstdlib>
-#include <cctype>
 
 namespace Cantera
 {
diff --git a/src/base/units.h b/src/base/units.h
index 11c8e51ae..787484af9 100644
--- a/src/base/units.h
+++ b/src/base/units.h
@@ -15,8 +15,6 @@
 #include "cantera/base/ctexceptions.h"
 #include "cantera/base/ct_thread.h"
 
-#include <string>
-
 namespace Cantera
 {
 
diff --git a/src/base/xml.cpp b/src/base/xml.cpp
index 33539ddf6..1accd5324 100644
--- a/src/base/xml.cpp
+++ b/src/base/xml.cpp
@@ -15,8 +15,6 @@ using namespace std;
 #include "cantera/base/xml.h"
 #include "cantera/base/global.h"
 #include "cantera/base/stringUtils.h"
-#include <ctype.h>
-#include <cstdlib>
 
 namespace Cantera
 {
diff --git a/src/clib/Cabinet.h b/src/clib/Cabinet.h
index 463256e75..5618af6a1 100644
--- a/src/clib/Cabinet.h
+++ b/src/clib/Cabinet.h
@@ -4,9 +4,7 @@
 #ifndef CT_CABINET_H
 #define CT_CABINET_H
 
-#include <vector>
 #include "cantera/base/stringUtils.h"
-#include "cantera/base/config.h"
 #include "cantera/base/ctexceptions.h"
 #include "clib_defs.h"
 
diff --git a/src/clib/clib_defs.h b/src/clib/clib_defs.h
index 0c76f5c86..c05972dda 100644
--- a/src/clib/clib_defs.h
+++ b/src/clib/clib_defs.h
@@ -7,6 +7,7 @@
 #include "cantera/base/ct_defs.h"
 #include "cantera/base/global.h"
 #include "cantera/base/ctexceptions.h"
+#include <iostream>
 
 #ifdef _WIN32
 // Windows (MSVC or MinGW)
diff --git a/src/clib/ctonedim.cpp b/src/clib/ctonedim.cpp
index 1bc7bd732..5fb37ded8 100644
--- a/src/clib/ctonedim.cpp
+++ b/src/clib/ctonedim.cpp
@@ -13,6 +13,8 @@
 #include "cantera/numerics/DenseMatrix.h"
 #include "Cabinet.h"
 
+#include <fstream>
+
 using namespace std;
 using namespace Cantera;
 
diff --git a/src/equil/BasisOptimize.cpp b/src/equil/BasisOptimize.cpp
index c8ecbf7f1..b6261facf 100644
--- a/src/equil/BasisOptimize.cpp
+++ b/src/equil/BasisOptimize.cpp
@@ -2,13 +2,9 @@
  * @file BasisOptimize.cpp Functions which calculation optimized basis of the
  *     stoichiometric coefficient matrix (see /ref equil functions)
  */
-#include "cantera/base/ct_defs.h"
-#include "cantera/base/global.h"
 #include "cantera/thermo/ThermoPhase.h"
 #include "cantera/equil/MultiPhase.h"
 
-#include <cstring>
-
 using namespace Cantera;
 using namespace std;
 
diff --git a/src/equil/ChemEquil.cpp b/src/equil/ChemEquil.cpp
index e2dca056d..1deec5c7a 100644
--- a/src/equil/ChemEquil.cpp
+++ b/src/equil/ChemEquil.cpp
@@ -6,8 +6,6 @@
 
 //  Copyright 2001 California Institute of Technology
 
-#include <vector>
-
 #include "cantera/equil/ChemEquil.h"
 #include "cantera/numerics/DenseMatrix.h"
 
@@ -26,7 +24,6 @@
 using namespace std;
 
 #include <cstdio>
-#include <cstdlib>
 
 int Cantera::ChemEquil_print_lvl = 0;
 
diff --git a/src/equil/MultiPhaseEquil.cpp b/src/equil/MultiPhaseEquil.cpp
index f7ef72e9c..3ec64627c 100644
--- a/src/equil/MultiPhaseEquil.cpp
+++ b/src/equil/MultiPhaseEquil.cpp
@@ -7,8 +7,6 @@
 #include "cantera/base/global.h"
 #include "cantera/base/stringUtils.h"
 
-#include <math.h>
-#include <iostream>
 #include <cstdio>
 
 using namespace std;
diff --git a/src/equil/PropertyCalculator.h b/src/equil/PropertyCalculator.h
index ef337e639..0cc149539 100644
--- a/src/equil/PropertyCalculator.h
+++ b/src/equil/PropertyCalculator.h
@@ -8,7 +8,6 @@
 #define CT_PROP_CALC_H
 
 #include "cantera/base/ct_defs.h"
-#include <string>
 
 namespace Cantera
 {
diff --git a/src/equil/vcs_MultiPhaseEquil.cpp b/src/equil/vcs_MultiPhaseEquil.cpp
index 77a0aa0f0..948f0503c 100644
--- a/src/equil/vcs_MultiPhaseEquil.cpp
+++ b/src/equil/vcs_MultiPhaseEquil.cpp
@@ -16,19 +16,15 @@
 
 #include "cantera/equil/vcs_solve.h"
 
-#include "cantera/base/ct_defs.h"
 #include "cantera/thermo/mix_defs.h"
 #include "cantera/base/clockWC.h"
 #include "cantera/base/stringUtils.h"
-#include "cantera/thermo/ThermoPhase.h"
 #include "cantera/thermo/speciesThermoTypes.h"
 #include "cantera/thermo/IdealSolidSolnPhase.h"
 #include "cantera/thermo/IdealMolalSoln.h"
 #include "cantera/equil/ChemEquil.h"
 #include "cantera/equil/vcs_SpeciesProperties.h"
 
-#include <string>
-#include <vector>
 #include <cstdio>
 
 using namespace Cantera;
diff --git a/src/equil/vcs_SpeciesProperties.cpp b/src/equil/vcs_SpeciesProperties.cpp
index b598768d2..aed3e3178 100644
--- a/src/equil/vcs_SpeciesProperties.cpp
+++ b/src/equil/vcs_SpeciesProperties.cpp
@@ -7,10 +7,6 @@
 #include "cantera/equil/vcs_species_thermo.h"
 #include "cantera/equil/vcs_internal.h"
 
-#include <cstdio>
-#include <cstdlib>
-#include <cmath>
-
 using namespace std;
 
 namespace VCSnonideal
diff --git a/src/equil/vcs_TP.cpp b/src/equil/vcs_TP.cpp
index 9e1b74d19..83dc4da1d 100644
--- a/src/equil/vcs_TP.cpp
+++ b/src/equil/vcs_TP.cpp
@@ -3,10 +3,6 @@
 #include "cantera/equil/vcs_species_thermo.h"
 #include "cantera/equil/vcs_VolPhase.h"
 
-#include <cstdio>
-#include <cstdlib>
-#include <cmath>
-
 namespace VCSnonideal
 {
 int VCS_SOLVE::vcs_TP(int ipr, int ip1, int maxit, double T_arg, double pres_arg)
diff --git a/src/equil/vcs_VolPhase.cpp b/src/equil/vcs_VolPhase.cpp
index 758d4188c..07af4de99 100644
--- a/src/equil/vcs_VolPhase.cpp
+++ b/src/equil/vcs_VolPhase.cpp
@@ -15,10 +15,8 @@
 #include "cantera/thermo/ThermoPhase.h"
 #include "cantera/thermo/mix_defs.h"
 
-#include <string>
 #include <sstream>
 #include <cstdio>
-#include <cstdlib>
 
 namespace VCSnonideal
 {
diff --git a/src/equil/vcs_elem_rearrange.cpp b/src/equil/vcs_elem_rearrange.cpp
index 1c5309140..a13dd9fd0 100644
--- a/src/equil/vcs_elem_rearrange.cpp
+++ b/src/equil/vcs_elem_rearrange.cpp
@@ -13,10 +13,6 @@
 #include "cantera/equil/vcs_internal.h"
 #include "cantera/equil/vcs_VolPhase.h"
 
-#include <cstdio>
-#include <cstdlib>
-#include <cmath>
-
 namespace VCSnonideal
 {
 
diff --git a/src/equil/vcs_equilibrate.cpp b/src/equil/vcs_equilibrate.cpp
index 3c649b08b..b0ae3e9ff 100644
--- a/src/equil/vcs_equilibrate.cpp
+++ b/src/equil/vcs_equilibrate.cpp
@@ -17,7 +17,6 @@
 #include "cantera/equil/vcs_solve.h"
 #include "cantera/equil/equil.h"
 
-#include "cantera/base/ct_defs.h"
 #include "cantera/base/stringUtils.h"
 #include "cantera/thermo/mix_defs.h"
 #include "cantera/thermo/speciesThermoTypes.h"
@@ -25,9 +24,6 @@
 #include "cantera/thermo/IdealMolalSoln.h"
 #include "cantera/equil/ChemEquil.h"
 
-#include <string>
-#include <vector>
-
 using namespace std;
 
 namespace Cantera
diff --git a/src/equil/vcs_inest.cpp b/src/equil/vcs_inest.cpp
index ba8272a98..b210e6803 100644
--- a/src/equil/vcs_inest.cpp
+++ b/src/equil/vcs_inest.cpp
@@ -14,10 +14,6 @@
 
 #include "cantera/base/clockWC.h"
 
-#include <cstdio>
-#include <cstdlib>
-#include <cmath>
-
 namespace VCSnonideal
 {
 
diff --git a/src/equil/vcs_nondim.cpp b/src/equil/vcs_nondim.cpp
index e529b4978..fde4c7405 100644
--- a/src/equil/vcs_nondim.cpp
+++ b/src/equil/vcs_nondim.cpp
@@ -14,10 +14,6 @@
 #include "cantera/base/stringUtils.h"
 #include "cantera/base/ctexceptions.h"
 
-#include <cstdio>
-#include <cstdlib>
-#include <cmath>
-
 namespace VCSnonideal
 {
 double VCS_SOLVE::vcs_nondim_Farad(int mu_units, double TKelvin) const
diff --git a/src/equil/vcs_phaseStability.cpp b/src/equil/vcs_phaseStability.cpp
index 2e7158885..14ff8ca0d 100644
--- a/src/equil/vcs_phaseStability.cpp
+++ b/src/equil/vcs_phaseStability.cpp
@@ -9,10 +9,6 @@
 #include "cantera/equil/vcs_VolPhase.h"
 
 #include <cstdio>
-#include <cstdlib>
-#include <cmath>
-#include <vector>
-#include <cstring>
 #include <algorithm>
 
 using namespace std;
diff --git a/src/equil/vcs_prep.cpp b/src/equil/vcs_prep.cpp
index 98dea4a08..89b61a8ea 100644
--- a/src/equil/vcs_prep.cpp
+++ b/src/equil/vcs_prep.cpp
@@ -15,10 +15,6 @@
 #include "cantera/equil/vcs_VolPhase.h"
 #include "cantera/equil/vcs_SpeciesProperties.h"
 
-#include <cstdio>
-#include <cstdlib>
-#include <cmath>
-
 namespace VCSnonideal
 {
 void VCS_SOLVE::vcs_SSPhase()
diff --git a/src/equil/vcs_prob.cpp b/src/equil/vcs_prob.cpp
index ddcf433e3..005a04381 100644
--- a/src/equil/vcs_prob.cpp
+++ b/src/equil/vcs_prob.cpp
@@ -17,8 +17,6 @@
 #include "cantera/thermo/ThermoPhase.h"
 #include "cantera/thermo/MolalityVPSSTP.h"
 
-#include <cstdlib>
-#include <string>
 #include <cstdio>
 
 using namespace std;
diff --git a/src/equil/vcs_rank.cpp b/src/equil/vcs_rank.cpp
index aef6c2ec2..4406fed6a 100644
--- a/src/equil/vcs_rank.cpp
+++ b/src/equil/vcs_rank.cpp
@@ -20,9 +20,7 @@
 #include "cantera/base/clockWC.h"
 #include "cantera/base/ctexceptions.h"
 
-#include <string>
 #include <cstdio>
-#include "math.h"
 using namespace std;
 
 namespace VCSnonideal {
diff --git a/src/equil/vcs_rearrange.cpp b/src/equil/vcs_rearrange.cpp
index 8bfe87db7..ad07e4cb9 100644
--- a/src/equil/vcs_rearrange.cpp
+++ b/src/equil/vcs_rearrange.cpp
@@ -11,10 +11,6 @@
 #include "cantera/equil/vcs_solve.h"
 #include "cantera/equil/vcs_internal.h"
 
-#include <cstdio>
-#include <cstdlib>
-#include <cmath>
-
 namespace VCSnonideal
 {
 int VCS_SOLVE::vcs_rearrange()
diff --git a/src/equil/vcs_report.cpp b/src/equil/vcs_report.cpp
index 80b38ec3d..6b2136e78 100644
--- a/src/equil/vcs_report.cpp
+++ b/src/equil/vcs_report.cpp
@@ -8,10 +8,6 @@
 #include "cantera/equil/vcs_internal.h"
 #include "cantera/equil/vcs_VolPhase.h"
 
-#include <cstdio>
-#include <cstdlib>
-#include <cmath>
-
 namespace VCSnonideal
 {
 static void print_space(int num)
diff --git a/src/equil/vcs_root1d.cpp b/src/equil/vcs_root1d.cpp
index fb86e17b3..6917f9c5f 100644
--- a/src/equil/vcs_root1d.cpp
+++ b/src/equil/vcs_root1d.cpp
@@ -11,8 +11,6 @@
 #include "cantera/equil/vcs_internal.h"
 
 #include <cstdio>
-#include <cstdlib>
-#include <cmath>
 
 namespace VCSnonideal
 {
diff --git a/src/equil/vcs_rxnadj.cpp b/src/equil/vcs_rxnadj.cpp
index 895020482..c7f0d0cc9 100644
--- a/src/equil/vcs_rxnadj.cpp
+++ b/src/equil/vcs_rxnadj.cpp
@@ -13,8 +13,6 @@
 #include "cantera/equil/vcs_VolPhase.h"
 
 #include <cstdio>
-#include <cstdlib>
-#include <cmath>
 
 namespace VCSnonideal
 {
diff --git a/src/equil/vcs_setMolesLinProg.cpp b/src/equil/vcs_setMolesLinProg.cpp
index 6c8c0160a..ee55bc6d4 100644
--- a/src/equil/vcs_setMolesLinProg.cpp
+++ b/src/equil/vcs_setMolesLinProg.cpp
@@ -12,11 +12,6 @@
 #include "cantera/equil/vcs_species_thermo.h"
 #include "cantera/equil/vcs_solve.h"
 
-#include <cstdio>
-#include <cstdlib>
-#include <cmath>
-#include <iostream>
-
 using namespace std;
 
 namespace VCSnonideal
diff --git a/src/equil/vcs_solve.cpp b/src/equil/vcs_solve.cpp
index 529d16b8d..96ab28d45 100644
--- a/src/equil/vcs_solve.cpp
+++ b/src/equil/vcs_solve.cpp
@@ -19,10 +19,6 @@
 
 #include "cantera/base/clockWC.h"
 
-#include <string>
-#include <cstdlib>
-#include <math.h>
-
 using namespace std;
 
 namespace VCSnonideal
diff --git a/src/equil/vcs_solve_TP.cpp b/src/equil/vcs_solve_TP.cpp
index 63692473a..5a69dfb8c 100644
--- a/src/equil/vcs_solve_TP.cpp
+++ b/src/equil/vcs_solve_TP.cpp
@@ -8,20 +8,17 @@
  * U.S. Government retains certain rights in this software.
  */
 
-#include <cstdio>
-#include <cstdlib>
-#include <cmath>
-#include <cassert>
-
 #include "cantera/equil/vcs_solve.h"
 #include "cantera/equil/vcs_internal.h"
 #include "cantera/equil/vcs_VolPhase.h"
 #include "cantera/equil/vcs_species_thermo.h"
-#include "cantera/base/ctexceptions.h"
 
+#include "cantera/base/ctexceptions.h"
 #include "cantera/base/clockWC.h"
 #include "cantera/base/stringUtils.h"
 
+#include <cstdio>
+
 using namespace std;
 using namespace Cantera;
 
diff --git a/src/equil/vcs_solve_phaseStability.cpp b/src/equil/vcs_solve_phaseStability.cpp
index 941f27825..0b5428e8c 100644
--- a/src/equil/vcs_solve_phaseStability.cpp
+++ b/src/equil/vcs_solve_phaseStability.cpp
@@ -9,11 +9,6 @@
  * U.S. Government retains certain rights in this software.
  */
 
-#include <cstdio>
-#include <cstdlib>
-#include <cmath>
-#include <cassert>
-
 #include "cantera/equil/vcs_solve.h"
 #include "cantera/equil/vcs_internal.h"
 #include "cantera/equil/vcs_VolPhase.h"
diff --git a/src/equil/vcs_species_thermo.cpp b/src/equil/vcs_species_thermo.cpp
index 7ba9f6ff7..0c803bbb4 100644
--- a/src/equil/vcs_species_thermo.cpp
+++ b/src/equil/vcs_species_thermo.cpp
@@ -16,10 +16,6 @@
 #include "cantera/base/ctexceptions.h"
 #include "cantera/equil/vcs_internal.h"
 
-#include <cstdio>
-#include <cstdlib>
-#include <cmath>
-
 using namespace std;
 
 namespace VCSnonideal
diff --git a/src/equil/vcs_util.cpp b/src/equil/vcs_util.cpp
index 05441e558..bf5a0bf1c 100644
--- a/src/equil/vcs_util.cpp
+++ b/src/equil/vcs_util.cpp
@@ -7,13 +7,9 @@
  * Contract DE-AC04-94AL85000 with Sandia Corporation, the
  * U.S. Government retains certain rights in this software.
  */
-#include <cstdlib>
-#include <cmath>
-#include <cassert>
 
 #include "cantera/equil/vcs_internal.h"
-#include <cstring>
-#include <cstdlib>
+#include <cassert>
 
 using namespace std;
 
diff --git a/src/kinetics/AqueousKinetics.cpp b/src/kinetics/AqueousKinetics.cpp
index 9cd60735c..5e5978f2c 100644
--- a/src/kinetics/AqueousKinetics.cpp
+++ b/src/kinetics/AqueousKinetics.cpp
@@ -16,7 +16,6 @@
 #include "cantera/kinetics/RateCoeffMgr.h"
 #include "cantera/base/stringUtils.h"
 
-#include <iostream>
 using namespace std;
 
 namespace Cantera
diff --git a/src/kinetics/FalloffFactory.cpp b/src/kinetics/FalloffFactory.cpp
index 2763366fd..abd5cff7b 100644
--- a/src/kinetics/FalloffFactory.cpp
+++ b/src/kinetics/FalloffFactory.cpp
@@ -7,8 +7,6 @@
 #include "cantera/base/ctexceptions.h"
 #include "cantera/base/stringUtils.h"
 
-#include <cmath>
-
 namespace Cantera
 {
 
diff --git a/src/kinetics/GRI_30_Kinetics.cpp b/src/kinetics/GRI_30_Kinetics.cpp
index 098a348d1..c6f420e7e 100644
--- a/src/kinetics/GRI_30_Kinetics.cpp
+++ b/src/kinetics/GRI_30_Kinetics.cpp
@@ -14,7 +14,6 @@
 #include "cantera/kinetics/RateCoeffMgr.h"
 #include "cantera/thermo/IdealGasPhase.h"
 
-#include <iostream>
 using namespace std;
 
 
diff --git a/src/kinetics/GasKinetics.cpp b/src/kinetics/GasKinetics.cpp
index 16f585a8f..5f16f0f9b 100644
--- a/src/kinetics/GasKinetics.cpp
+++ b/src/kinetics/GasKinetics.cpp
@@ -13,7 +13,6 @@
 #include "cantera/kinetics/ThirdBodyMgr.h"
 #include "cantera/kinetics/RateCoeffMgr.h"
 
-#include <iostream>
 using namespace std;
 
 namespace Cantera
diff --git a/src/kinetics/Group.cpp b/src/kinetics/Group.cpp
index ce43aef88..61c171724 100644
--- a/src/kinetics/Group.cpp
+++ b/src/kinetics/Group.cpp
@@ -10,9 +10,6 @@
 
 #include "cantera/kinetics/Group.h"
 
-#include <algorithm>
-#include <cmath>
-
 namespace Cantera
 {
 
diff --git a/src/kinetics/InterfaceKinetics.cpp b/src/kinetics/InterfaceKinetics.cpp
index 6ee2a8a68..12181bb98 100644
--- a/src/kinetics/InterfaceKinetics.cpp
+++ b/src/kinetics/InterfaceKinetics.cpp
@@ -6,12 +6,12 @@
 
 #include "cantera/kinetics/InterfaceKinetics.h"
 #include "cantera/kinetics/EdgeKinetics.h"
-#include "cantera/thermo/SurfPhase.h"
-
 #include "cantera/kinetics/ReactionData.h"
 #include "cantera/kinetics/RateCoeffMgr.h"
-
 #include "cantera/kinetics/ImplicitSurfChem.h"
+#include "cantera/thermo/SurfPhase.h"
+
+#include <cstdio>
 
 using namespace std;
 
diff --git a/src/kinetics/Kinetics.cpp b/src/kinetics/Kinetics.cpp
index e617b4172..bb5c54fa4 100644
--- a/src/kinetics/Kinetics.cpp
+++ b/src/kinetics/Kinetics.cpp
@@ -15,7 +15,6 @@
 
 #include "cantera/kinetics/ImplicitSurfChem.h"
 
-#include <iostream>
 using namespace std;
 
 
diff --git a/src/kinetics/importKinetics.cpp b/src/kinetics/importKinetics.cpp
index 04bb0540c..104b7a293 100644
--- a/src/kinetics/importKinetics.cpp
+++ b/src/kinetics/importKinetics.cpp
@@ -13,7 +13,6 @@
 
 #include "cantera/kinetics/importKinetics.h"
 #include "cantera/thermo/mix_defs.h"
-#include <time.h>
 #include <memory>
 
 //   Cantera includes
@@ -32,8 +31,6 @@
 #include "cantera/base/xml.h"
 #include "cantera/base/ctml.h"
 
-#include <cstdlib>
-
 using namespace ctml;
 using namespace std;
 
diff --git a/src/kinetics/solveSP.cpp b/src/kinetics/solveSP.cpp
index 869128a3f..435474536 100644
--- a/src/kinetics/solveSP.cpp
+++ b/src/kinetics/solveSP.cpp
@@ -12,13 +12,7 @@
 #include "cantera/base/clockWC.h"
 #include "cantera/numerics/ctlapack.h"
 
-/* Standard include files */
-
 #include <cstdio>
-#include <cstdlib>
-#include <cmath>
-
-#include <vector>
 
 using namespace std;
 namespace Cantera
diff --git a/src/numerics/BEulerInt.cpp b/src/numerics/BEulerInt.cpp
index 7258d3276..3c742e0be 100644
--- a/src/numerics/BEulerInt.cpp
+++ b/src/numerics/BEulerInt.cpp
@@ -11,8 +11,6 @@
 
 #include "cantera/numerics/BEulerInt.h"
 
-#include <iostream>
-
 using namespace std;
 
 namespace Cantera
diff --git a/src/numerics/CVodeInt.cpp b/src/numerics/CVodeInt.cpp
index 9ca07140f..d3b68b2d5 100644
--- a/src/numerics/CVodeInt.cpp
+++ b/src/numerics/CVodeInt.cpp
@@ -5,7 +5,6 @@
 // Copyright 2001  California Institute of Technology
 
 #include "CVodeInt.h"
-#include <iostream>
 using namespace std;
 
 // cvode includes
diff --git a/src/numerics/IDA_Solver.cpp b/src/numerics/IDA_Solver.cpp
index c4cb7b198..a438025de 100644
--- a/src/numerics/IDA_Solver.cpp
+++ b/src/numerics/IDA_Solver.cpp
@@ -7,8 +7,6 @@
 #include "cantera/numerics/IDA_Solver.h"
 #include "cantera/base/stringUtils.h"
 
-#include <iostream>
-
 #if SUNDIALS_VERSION >= 24
 #include "sundials/sundials_types.h"
 #include "sundials/sundials_math.h"
diff --git a/src/numerics/NonlinearSolver.cpp b/src/numerics/NonlinearSolver.cpp
index ffaea2075..eb9e945dd 100644
--- a/src/numerics/NonlinearSolver.cpp
+++ b/src/numerics/NonlinearSolver.cpp
@@ -9,7 +9,6 @@
  * See file License.txt for licensing information.
  */
 
-#include <limits>
 
 #include "cantera/numerics/SquareMatrix.h"
 #include "cantera/numerics/GeneralMatrix.h"
@@ -20,11 +19,7 @@
 #include "cantera/base/vec_functions.h"
 #include "cantera/base/stringUtils.h"
 
-#include <cfloat>
-#include <ctime>
-#include <vector>
-#include <cstdio>
-#include <cmath>
+#include <limits>
 
 using namespace std;
 
diff --git a/src/numerics/ResidJacEval.cpp b/src/numerics/ResidJacEval.cpp
index 9c4cc3de2..0b6c55019 100644
--- a/src/numerics/ResidJacEval.cpp
+++ b/src/numerics/ResidJacEval.cpp
@@ -13,9 +13,6 @@
 #include "cantera/numerics/ctlapack.h"
 #include "cantera/numerics/ResidJacEval.h"
 
-#include <iostream>
-#include <vector>
-
 using namespace std;
 
 namespace Cantera
diff --git a/src/numerics/RootFind.cpp b/src/numerics/RootFind.cpp
index bef5b8180..8f12785e9 100644
--- a/src/numerics/RootFind.cpp
+++ b/src/numerics/RootFind.cpp
@@ -9,7 +9,6 @@
  * See file License.txt for licensing information.
  */
 
-#include "cantera/base/ct_defs.h"
 #include "cantera/numerics/RootFind.h"
 
 // turn on debugging for now
@@ -20,13 +19,6 @@
 #include "cantera/base/global.h"
 #include "cantera/base/utilities.h"
 #include "cantera/base/stringUtils.h"
-/* Standard include files */
-
-#include <cstdio>
-#include <cstdlib>
-#include <cmath>
-
-#include <vector>
 
 using namespace std;
 namespace Cantera
diff --git a/src/numerics/SquareMatrix.cpp b/src/numerics/SquareMatrix.cpp
index f521a2384..e39572b7b 100644
--- a/src/numerics/SquareMatrix.cpp
+++ b/src/numerics/SquareMatrix.cpp
@@ -9,16 +9,11 @@
  * See file License.txt for licensing information.
  */
 
-#include "cantera/base/ct_defs.h"
 #include "cantera/base/stringUtils.h"
 #include "cantera/numerics/ctlapack.h"
 #include "cantera/numerics/SquareMatrix.h"
 #include "cantera/base/global.h"
 
-#include <iostream>
-#include <vector>
-#include <cstring>
-
 using namespace std;
 
 namespace Cantera
diff --git a/src/numerics/funcs.cpp b/src/numerics/funcs.cpp
index 72d7534b8..037ef4638 100644
--- a/src/numerics/funcs.cpp
+++ b/src/numerics/funcs.cpp
@@ -9,17 +9,13 @@
 
 #include "cantera/numerics/funcs.h"
 
-#include <vector>
-#include <algorithm>
-
-using namespace std;
-
 #include "cantera/numerics/ctlapack.h"
-#include "cantera/base/ct_defs.h"
 #include "cantera/base/ctexceptions.h"
 #include "cantera/base/stringUtils.h"
 #include "cantera/numerics/polyfit.h"
 
+using namespace std;
+
 #ifndef FTN_TRAILING_UNDERSCORE
 #define _DPOLFT_ dpolft
 #define _DPCOEF_ dpcoef
diff --git a/src/numerics/solveProb.cpp b/src/numerics/solveProb.cpp
index da670d5b6..1257b9fd9 100644
--- a/src/numerics/solveProb.cpp
+++ b/src/numerics/solveProb.cpp
@@ -14,12 +14,6 @@
 #include "cantera/numerics/ctlapack.h"
 #include "cantera/base/stringUtils.h"
 
-/* Standard include files */
-#include <cstdio>
-#include <cstdlib>
-#include <cmath>
-#include <vector>
-
 using namespace std;
 namespace Cantera
 {
diff --git a/src/oneD/MultiNewton.cpp b/src/oneD/MultiNewton.cpp
index e987bb93c..d06e222a9 100644
--- a/src/oneD/MultiNewton.cpp
+++ b/src/oneD/MultiNewton.cpp
@@ -6,8 +6,6 @@
  *  Copyright 2001 California Institute of Technology
  */
 
-#include <vector>
-
 #include "cantera/oneD/MultiNewton.h"
 
 #include "cantera/base/ctexceptions.h"
@@ -15,8 +13,6 @@
 #include "cantera/base/stringUtils.h"
 
 #include <cstdio>
-#include <cmath>
-#include <ctime>
 
 using namespace std;
 
diff --git a/src/oneD/Sim1D.cpp b/src/oneD/Sim1D.cpp
index 25cc95c99..6241e8a8c 100644
--- a/src/oneD/Sim1D.cpp
+++ b/src/oneD/Sim1D.cpp
@@ -6,8 +6,6 @@
 #include "cantera/oneD/MultiJac.h"
 
 #include <fstream>
-#include <cstdlib>
-#include <cstdio>
 
 using namespace std;
 
diff --git a/src/spectra/LineBroadener.cpp b/src/spectra/LineBroadener.cpp
index a852b9e23..81258d8e0 100644
--- a/src/spectra/LineBroadener.cpp
+++ b/src/spectra/LineBroadener.cpp
@@ -1,5 +1,6 @@
 #include "cantera/base/ct_defs.h"
 #include <math.h>
+#include <iostream>
 
 #ifdef USE_BOOST_MATH
 #include <boost/math/special_functions/erf.hpp>
diff --git a/src/thermo/ConstCpPoly.cpp b/src/thermo/ConstCpPoly.cpp
index 299843a21..16c4bef2e 100644
--- a/src/thermo/ConstCpPoly.cpp
+++ b/src/thermo/ConstCpPoly.cpp
@@ -7,7 +7,6 @@
 // Copyright 2001  California Institute of Technology
 
 #include "ConstCpPoly.h"
-#include <cmath>
 
 namespace Cantera
 {
diff --git a/src/thermo/ConstDensityThermo.cpp b/src/thermo/ConstDensityThermo.cpp
index 257f567ce..eb42636d3 100644
--- a/src/thermo/ConstDensityThermo.cpp
+++ b/src/thermo/ConstDensityThermo.cpp
@@ -11,8 +11,6 @@
 #include "cantera/thermo/ConstDensityThermo.h"
 #include "cantera/thermo/SpeciesThermo.h"
 
-#include <cmath>
-
 using namespace ctml;
 
 namespace Cantera
diff --git a/src/thermo/DebyeHuckel.cpp b/src/thermo/DebyeHuckel.cpp
index 26398d049..2e27bc339 100644
--- a/src/thermo/DebyeHuckel.cpp
+++ b/src/thermo/DebyeHuckel.cpp
@@ -20,9 +20,7 @@
 
 #include "cantera/base/stringUtils.h"
 
-#include <cstring>
-#include <cstdlib>
-#include <fstream>
+#include <cstdio>
 
 using namespace std;
 using namespace ctml;
diff --git a/src/thermo/Elements.cpp b/src/thermo/Elements.cpp
index 2b90936c8..0d7210fd8 100644
--- a/src/thermo/Elements.cpp
+++ b/src/thermo/Elements.cpp
@@ -14,8 +14,6 @@
 using namespace ctml;
 using namespace std;
 
-#include <cstdlib>
-
 namespace Cantera
 {
 
diff --git a/src/thermo/FixedChemPotSSTP.cpp b/src/thermo/FixedChemPotSSTP.cpp
index ea2b9209a..9f6076f77 100644
--- a/src/thermo/FixedChemPotSSTP.cpp
+++ b/src/thermo/FixedChemPotSSTP.cpp
@@ -16,9 +16,6 @@
 #include "cantera/thermo/FixedChemPotSSTP.h"
 #include "cantera/thermo/SpeciesThermo.h"
 #include "cantera/thermo/ThermoFactory.h"
-
-
-#include <string>
 #include "cantera/thermo/SimpleThermo.h"
 namespace Cantera
 {
diff --git a/src/thermo/HMWSoln.cpp b/src/thermo/HMWSoln.cpp
index 2a116e1d1..b4373c14d 100644
--- a/src/thermo/HMWSoln.cpp
+++ b/src/thermo/HMWSoln.cpp
@@ -23,9 +23,6 @@
 #include "cantera/thermo/WaterProps.h"
 #include "cantera/thermo/PDSS_Water.h"
 #include "cantera/base/stringUtils.h"
-
-#include <cmath>
-#include <cstdlib>
 #include <cstdio>
 
 namespace Cantera
diff --git a/src/thermo/HMWSoln_input.cpp b/src/thermo/HMWSoln_input.cpp
index d1a58265f..72f9388e2 100644
--- a/src/thermo/HMWSoln_input.cpp
+++ b/src/thermo/HMWSoln_input.cpp
@@ -18,9 +18,6 @@
 #include "cantera/thermo/PDSS_Water.h"
 #include "cantera/base/stringUtils.h"
 
-#include <cstring>
-#include <cstdlib>
-#include <cstdio>
 #include <fstream>
 
 using namespace std;
diff --git a/src/thermo/IdealMolalSoln.cpp b/src/thermo/IdealMolalSoln.cpp
index 0bf0097b0..dfadb865d 100644
--- a/src/thermo/IdealMolalSoln.cpp
+++ b/src/thermo/IdealMolalSoln.cpp
@@ -20,9 +20,6 @@
 #include "cantera/thermo/IdealMolalSoln.h"
 #include "cantera/thermo/ThermoFactory.h"
 
-#include <cmath>
-#include <fstream>
-
 using namespace ctml;
 
 namespace Cantera
diff --git a/src/thermo/IdealSolidSolnPhase.cpp b/src/thermo/IdealSolidSolnPhase.cpp
index b44df81bf..b1df4a3fb 100644
--- a/src/thermo/IdealSolidSolnPhase.cpp
+++ b/src/thermo/IdealSolidSolnPhase.cpp
@@ -13,9 +13,6 @@
 #include "cantera/thermo/IdealSolidSolnPhase.h"
 #include "cantera/base/stringUtils.h"
 
-#include <iostream>
-#include <fstream>
-
 using namespace std;
 
 namespace Cantera
diff --git a/src/thermo/IonsFromNeutralVPSSTP.cpp b/src/thermo/IonsFromNeutralVPSSTP.cpp
index 677e2a02a..6d94b7da3 100644
--- a/src/thermo/IonsFromNeutralVPSSTP.cpp
+++ b/src/thermo/IonsFromNeutralVPSSTP.cpp
@@ -19,11 +19,8 @@
 #include "cantera/thermo/IonsFromNeutralVPSSTP.h"
 #include "cantera/thermo/ThermoFactory.h"
 #include "cantera/thermo/PDSS_IonsFromNeutral.h"
-#include "cantera/thermo/mix_defs.h"
 #include "cantera/base/stringUtils.h"
 
-#include <cmath>
-#include <iomanip>
 #include <fstream>
 
 using namespace std;
diff --git a/src/thermo/LatticePhase.cpp b/src/thermo/LatticePhase.cpp
index 2437eacb0..ed8c986e5 100644
--- a/src/thermo/LatticePhase.cpp
+++ b/src/thermo/LatticePhase.cpp
@@ -15,9 +15,6 @@
 #include "cantera/thermo/ThermoFactory.h"
 #include "cantera/base/stringUtils.h"
 
-#include <cmath>
-#include <fstream>
-
 namespace Cantera
 {
 
diff --git a/src/thermo/LatticeSolidPhase.cpp b/src/thermo/LatticeSolidPhase.cpp
index dddc8c915..96086bb05 100644
--- a/src/thermo/LatticeSolidPhase.cpp
+++ b/src/thermo/LatticeSolidPhase.cpp
@@ -15,8 +15,6 @@
 #include "cantera/thermo/SpeciesThermoFactory.h"
 #include "cantera/thermo/GeneralSpeciesThermo.h"
 
-#include <string>
-
 using namespace std;
 
 namespace Cantera
diff --git a/src/thermo/MetalSHEelectrons.cpp b/src/thermo/MetalSHEelectrons.cpp
index e95e90662..3380b4a19 100644
--- a/src/thermo/MetalSHEelectrons.cpp
+++ b/src/thermo/MetalSHEelectrons.cpp
@@ -18,8 +18,6 @@
 #include "cantera/thermo/SingleSpeciesTP.h"
 #include "cantera/thermo/ThermoFactory.h"
 
-#include <string>
-
 namespace Cantera
 {
 
diff --git a/src/thermo/MineralEQ3.cpp b/src/thermo/MineralEQ3.cpp
index 904c085a6..c134cdcb4 100644
--- a/src/thermo/MineralEQ3.cpp
+++ b/src/thermo/MineralEQ3.cpp
@@ -20,8 +20,6 @@
 #include "cantera/thermo/ThermoFactory.h"
 #include "cantera/thermo/MineralEQ3.h"
 
-#include <string>
-
 using namespace std;
 
 namespace Cantera
diff --git a/src/thermo/MolarityIonicVPSSTP.cpp b/src/thermo/MolarityIonicVPSSTP.cpp
index de3085714..60e69b167 100644
--- a/src/thermo/MolarityIonicVPSSTP.cpp
+++ b/src/thermo/MolarityIonicVPSSTP.cpp
@@ -20,8 +20,7 @@
 #include "cantera/thermo/ThermoFactory.h"
 #include "cantera/base/stringUtils.h"
 
-#include <cmath>
-#include <fstream>
+#include <cstdio>
 
 using namespace std;
 
diff --git a/src/thermo/NasaThermo.h b/src/thermo/NasaThermo.h
index 623d72d95..037eb52b1 100644
--- a/src/thermo/NasaThermo.h
+++ b/src/thermo/NasaThermo.h
@@ -9,7 +9,6 @@
 
 #ifndef CT_NASATHERMO_H
 #define CT_NASATHERMO_H
-#include <string>
 
 #include "cantera/thermo/SpeciesThermoMgr.h"
 #include "cantera/thermo/NasaPoly1.h"
diff --git a/src/thermo/PDSS_HKFT.cpp b/src/thermo/PDSS_HKFT.cpp
index f1f29cd75..a9b0c3449 100644
--- a/src/thermo/PDSS_HKFT.cpp
+++ b/src/thermo/PDSS_HKFT.cpp
@@ -17,7 +17,6 @@
 #include "cantera/thermo/PDSS_Water.h"
 #include "cantera/base/stringUtils.h"
 
-#include <cstdlib>
 #include <fstream>
 
 using namespace std;
diff --git a/src/thermo/PDSS_Water.cpp b/src/thermo/PDSS_Water.cpp
index 0b9636d54..cf3ea2b80 100644
--- a/src/thermo/PDSS_Water.cpp
+++ b/src/thermo/PDSS_Water.cpp
@@ -19,7 +19,6 @@
 #include "cantera/thermo/VPStandardStateTP.h"
 #include "cantera/base/stringUtils.h"
 
-#include <cmath>
 #include <fstream>
 
 namespace Cantera
diff --git a/src/thermo/PseudoBinaryVPSSTP.cpp b/src/thermo/PseudoBinaryVPSSTP.cpp
index d0925c1de..988bbfd88 100644
--- a/src/thermo/PseudoBinaryVPSSTP.cpp
+++ b/src/thermo/PseudoBinaryVPSSTP.cpp
@@ -19,7 +19,6 @@
 #include "cantera/thermo/PseudoBinaryVPSSTP.h"
 #include "cantera/base/stringUtils.h"
 
-#include <cmath>
 #include <cstdio>
 
 using namespace std;
diff --git a/src/thermo/PureFluidPhase.cpp b/src/thermo/PureFluidPhase.cpp
index 17faed547..f3df32947 100644
--- a/src/thermo/PureFluidPhase.cpp
+++ b/src/thermo/PureFluidPhase.cpp
@@ -11,13 +11,10 @@
 #include "cantera/tpx/Sub.h"
 #include "cantera/tpx/utils.h"
 
-#include <cstdlib>
-#include <iomanip>
-#include <fstream>
+#include <cstdio>
 
 using std::string;
 using std::endl;
-using std::setw;
 
 namespace Cantera
 {
diff --git a/src/thermo/SpeciesThermoFactory.cpp b/src/thermo/SpeciesThermoFactory.cpp
index 9be67f335..37163bc56 100644
--- a/src/thermo/SpeciesThermoFactory.cpp
+++ b/src/thermo/SpeciesThermoFactory.cpp
@@ -28,8 +28,6 @@ using namespace std;
 #include "cantera/base/xml.h"
 #include "cantera/base/ctml.h"
 
-#include <cmath>
-
 using namespace ctml;
 
 namespace Cantera
diff --git a/src/thermo/StatMech.cpp b/src/thermo/StatMech.cpp
index 17f3ad2c1..326bb13cc 100644
--- a/src/thermo/StatMech.cpp
+++ b/src/thermo/StatMech.cpp
@@ -6,8 +6,7 @@
 // Copyright 2007  Sandia National Laboratories
 
 #include "cantera/thermo/StatMech.h"
-#include <vector>
-#include <map>
+#include <iostream>
 
 namespace Cantera
 {
diff --git a/src/thermo/StoichSubstanceSSTP.cpp b/src/thermo/StoichSubstanceSSTP.cpp
index 0da82938c..e0c43d6f4 100644
--- a/src/thermo/StoichSubstanceSSTP.cpp
+++ b/src/thermo/StoichSubstanceSSTP.cpp
@@ -18,8 +18,6 @@
 #include "cantera/thermo/SpeciesThermo.h"
 #include "cantera/thermo/ThermoFactory.h"
 
-#include <string>
-
 namespace Cantera
 {
 
diff --git a/src/thermo/ThermoFactory.cpp b/src/thermo/ThermoFactory.cpp
index 90d52a552..4dcb3b310 100644
--- a/src/thermo/ThermoFactory.cpp
+++ b/src/thermo/ThermoFactory.cpp
@@ -53,8 +53,6 @@
 
 #include "cantera/base/stringUtils.h"
 
-#include <cstdlib>
-
 using namespace std;
 using namespace ctml;
 
diff --git a/src/thermo/WaterProps.cpp b/src/thermo/WaterProps.cpp
index 61bfa8373..9e111604b 100644
--- a/src/thermo/WaterProps.cpp
+++ b/src/thermo/WaterProps.cpp
@@ -13,8 +13,6 @@
 #include "cantera/thermo/WaterPropsIAPWS.h"
 #include "cantera/base/stringUtils.h"
 
-#include <cmath>
-
 namespace Cantera
 {
 WaterProps::WaterProps():
diff --git a/src/thermo/WaterPropsIAPWS.cpp b/src/thermo/WaterPropsIAPWS.cpp
index 339a71501..462eb63c8 100644
--- a/src/thermo/WaterPropsIAPWS.cpp
+++ b/src/thermo/WaterPropsIAPWS.cpp
@@ -12,9 +12,6 @@
 #include "cantera/thermo/WaterPropsIAPWS.h"
 #include "cantera/base/ctexceptions.h"
 #include "cantera/base/stringUtils.h"
-#include <cmath>
-#include <cstdio>
-#include <cstdlib>
 
 namespace Cantera
 {
diff --git a/src/thermo/WaterSSTP.cpp b/src/thermo/WaterSSTP.cpp
index 8984a5589..dc62a7b7b 100644
--- a/src/thermo/WaterSSTP.cpp
+++ b/src/thermo/WaterSSTP.cpp
@@ -16,9 +16,6 @@
 #include "cantera/base/xml.h"
 #include "cantera/base/stringUtils.h"
 
-#include <cmath>
-#include <fstream>
-
 using namespace std;
 
 namespace Cantera
diff --git a/src/tpx/CarbonDioxide.cpp b/src/tpx/CarbonDioxide.cpp
index 43851953b..51fbbf9f7 100644
--- a/src/tpx/CarbonDioxide.cpp
+++ b/src/tpx/CarbonDioxide.cpp
@@ -7,8 +7,6 @@
  */
 
 #include "CarbonDioxide.h"
-#include <math.h>
-#include <string.h>
 #include "cantera/base/stringUtils.h"
 
 using namespace Cantera;
diff --git a/src/tpx/HFC134a.cpp b/src/tpx/HFC134a.cpp
index 38db2834a..7cf77a519 100644
--- a/src/tpx/HFC134a.cpp
+++ b/src/tpx/HFC134a.cpp
@@ -1,7 +1,6 @@
 // HFC134a
 
 #include "HFC134a.h"
-#include <math.h>
 #include "cantera/base/stringUtils.h"
 
 using namespace Cantera;
diff --git a/src/tpx/Heptane.cpp b/src/tpx/Heptane.cpp
index e3df1a397..146ed7391 100644
--- a/src/tpx/Heptane.cpp
+++ b/src/tpx/Heptane.cpp
@@ -9,8 +9,6 @@
 
 #include "Heptane.h"
 #include "cantera/base/stringUtils.h"
-#include <math.h>
-#include <string.h>
 
 using namespace Cantera;
 
diff --git a/src/tpx/Hydrogen.cpp b/src/tpx/Hydrogen.cpp
index 1dcf234a7..6247df065 100644
--- a/src/tpx/Hydrogen.cpp
+++ b/src/tpx/Hydrogen.cpp
@@ -1,5 +1,4 @@
 #include "Hydrogen.h"
-#include <math.h>
 #include "cantera/base/stringUtils.h"
 
 using namespace Cantera;
diff --git a/src/tpx/Methane.cpp b/src/tpx/Methane.cpp
index 6870be605..016bde002 100644
--- a/src/tpx/Methane.cpp
+++ b/src/tpx/Methane.cpp
@@ -1,7 +1,5 @@
 #include "Methane.h"
 #include "cantera/base/stringUtils.h"
-#include <math.h>
-#include <iostream>
 
 using namespace std;
 using namespace Cantera;
diff --git a/src/tpx/Nitrogen.cpp b/src/tpx/Nitrogen.cpp
index 8bed8b969..830850a11 100644
--- a/src/tpx/Nitrogen.cpp
+++ b/src/tpx/Nitrogen.cpp
@@ -1,8 +1,6 @@
 #include "Nitrogen.h"
 #include "cantera/base/stringUtils.h"
-#include <math.h>
-#include <iostream>
-using namespace std;
+
 using namespace Cantera;
 
 namespace tpx
diff --git a/src/tpx/Oxygen.cpp b/src/tpx/Oxygen.cpp
index db3f8451c..1ab24bb3b 100644
--- a/src/tpx/Oxygen.cpp
+++ b/src/tpx/Oxygen.cpp
@@ -1,6 +1,5 @@
 #include "Oxygen.h"
 #include "cantera/base/stringUtils.h"
-#include <math.h>
 
 using namespace Cantera;
 
diff --git a/src/tpx/RedlichKwong.cpp b/src/tpx/RedlichKwong.cpp
index c3911b354..f928be8b6 100644
--- a/src/tpx/RedlichKwong.cpp
+++ b/src/tpx/RedlichKwong.cpp
@@ -1,5 +1,4 @@
 #include "RedlichKwong.h"
-#include <math.h>
 
 namespace tpx
 {
diff --git a/src/tpx/Sub.cpp b/src/tpx/Sub.cpp
index 67834339d..51d0ae8e0 100644
--- a/src/tpx/Sub.cpp
+++ b/src/tpx/Sub.cpp
@@ -4,9 +4,6 @@
  */
 #include "cantera/tpx/Sub.h"
 #include "cantera/base/stringUtils.h"
-#include <math.h>
-#include <fstream>
-#include <stdio.h>
 
 using std::string;
 using namespace Cantera;
diff --git a/src/tpx/Water.cpp b/src/tpx/Water.cpp
index 258420299..92fa25178 100644
--- a/src/tpx/Water.cpp
+++ b/src/tpx/Water.cpp
@@ -1,7 +1,5 @@
 #include "Water.h"
 #include "cantera/base/stringUtils.h"
-#include <math.h>
-#include <string.h>
 
 using namespace Cantera;
 
diff --git a/src/transport/AqueousTransport.cpp b/src/transport/AqueousTransport.cpp
index f978edab3..9a7890848 100644
--- a/src/transport/AqueousTransport.cpp
+++ b/src/transport/AqueousTransport.cpp
@@ -15,7 +15,6 @@
 
 #include "cantera/base/stringUtils.h"
 
-#include <iostream>
 #include <cstdio>
 
 using namespace std;
diff --git a/src/transport/LiquidTranInteraction.cpp b/src/transport/LiquidTranInteraction.cpp
index 890dd8b69..28146e481 100644
--- a/src/transport/LiquidTranInteraction.cpp
+++ b/src/transport/LiquidTranInteraction.cpp
@@ -4,12 +4,10 @@
  */
 
 #include "cantera/transport/LiquidTransportParams.h"
-#include <iostream>
 #include "cantera/thermo/IonsFromNeutralVPSSTP.h"
 #include "cantera/thermo/MargulesVPSSTP.h"
 #include "cantera/base/stringUtils.h"
 
-#include <stdlib.h>
 using namespace std;
 using namespace ctml;
 
diff --git a/src/transport/LiquidTransport.cpp b/src/transport/LiquidTransport.cpp
index 22b9eff13..e8b66be42 100644
--- a/src/transport/LiquidTransport.cpp
+++ b/src/transport/LiquidTransport.cpp
@@ -11,7 +11,6 @@
 #include "cantera/numerics/ctlapack.h"
 #include "cantera/base/stringUtils.h"
 
-#include <iostream>
 #include <cstdio>
 
 using namespace std;
diff --git a/src/transport/LiquidTransportParams.cpp b/src/transport/LiquidTransportParams.cpp
index f0a0e87b3..04853a776 100644
--- a/src/transport/LiquidTransportParams.cpp
+++ b/src/transport/LiquidTransportParams.cpp
@@ -4,10 +4,8 @@
  */
 
 #include "cantera/transport/LiquidTransportParams.h"
-#include <iostream>
 #include "cantera/thermo/IonsFromNeutralVPSSTP.h"
 #include "cantera/thermo/MargulesVPSSTP.h"
-#include <stdlib.h>
 using namespace std;
 
 namespace Cantera
diff --git a/src/transport/MMCollisionInt.h b/src/transport/MMCollisionInt.h
index 795b29685..9947097fc 100644
--- a/src/transport/MMCollisionInt.h
+++ b/src/transport/MMCollisionInt.h
@@ -9,9 +9,6 @@
 
 #include "cantera/base/ct_defs.h"
 
-#include <vector>
-#include <iostream>
-
 namespace Cantera
 {
 
diff --git a/src/transport/MixTransport.cpp b/src/transport/MixTransport.cpp
index f2162999b..1692e2f23 100644
--- a/src/transport/MixTransport.cpp
+++ b/src/transport/MixTransport.cpp
@@ -12,7 +12,6 @@
 #include "cantera/transport/TransportFactory.h"
 #include "cantera/base/stringUtils.h"
 
-#include <iostream>
 using namespace std;
 
 namespace Cantera
diff --git a/src/transport/MultiTransport.cpp b/src/transport/MultiTransport.cpp
index 5002711e6..55770d6e1 100644
--- a/src/transport/MultiTransport.cpp
+++ b/src/transport/MultiTransport.cpp
@@ -16,7 +16,6 @@
 #include "cantera/transport/TransportFactory.h"
 #include "cantera/base/stringUtils.h"
 
-#include <iostream>
 using namespace std;
 
 namespace Cantera
diff --git a/src/transport/PecosTransport.cpp b/src/transport/PecosTransport.cpp
index a6003925b..5387a11e9 100755
--- a/src/transport/PecosTransport.cpp
+++ b/src/transport/PecosTransport.cpp
@@ -5,15 +5,14 @@
 
 #include "cantera/thermo/ThermoPhase.h"
 #include "cantera/transport/PecosTransport.h"
-
 #include "cantera/base/utilities.h"
 #include "cantera/transport/TransportParams.h"
 #include "cantera/transport/TransportFactory.h"
 #include "cantera/base/stringUtils.h"
-
 #include "cantera/thermo/IdealGasPhase.h"
 
-#include <iostream>
+#include <sstream>
+
 using namespace std;
 
 namespace Cantera
diff --git a/src/transport/SimpleTransport.cpp b/src/transport/SimpleTransport.cpp
index c1f0969ca..babd08c20 100644
--- a/src/transport/SimpleTransport.cpp
+++ b/src/transport/SimpleTransport.cpp
@@ -11,7 +11,6 @@
 #include "cantera/numerics/ctlapack.h"
 #include "cantera/base/stringUtils.h"
 
-#include <iostream>
 using namespace std;
 
 namespace Cantera
diff --git a/src/transport/SolidTransport.cpp b/src/transport/SolidTransport.cpp
index a45614ef2..9ace17c9a 100644
--- a/src/transport/SolidTransport.cpp
+++ b/src/transport/SolidTransport.cpp
@@ -10,11 +10,6 @@
 #include "cantera/transport/SolidTransportData.h"
 #include "cantera/transport/SolidTransport.h"
 
-
-#include "cantera/base/utilities.h"
-
-#include <iostream>
-
 using namespace std;
 
 namespace Cantera
diff --git a/src/transport/TortuosityBase.cpp b/src/transport/TortuosityBase.cpp
index 500a64dbc..be1536952 100644
--- a/src/transport/TortuosityBase.cpp
+++ b/src/transport/TortuosityBase.cpp
@@ -13,8 +13,6 @@
 #include "TortuosityBase.h"
 #include "cantera/base/ctexceptions.h"
 
-#include <string>
-
 namespace Cantera
 {
 //====================================================================================================================
diff --git a/src/transport/TortuosityBruggeman.cpp b/src/transport/TortuosityBruggeman.cpp
index dff326a6d..8d445f0ed 100644
--- a/src/transport/TortuosityBruggeman.cpp
+++ b/src/transport/TortuosityBruggeman.cpp
@@ -13,8 +13,6 @@
 #include "TortuosityBruggeman.h"
 #include "cantera/base/ctexceptions.h"
 
-#include <string>
-
 namespace Cantera
 {
 
diff --git a/src/transport/TortuosityMaxwell.cpp b/src/transport/TortuosityMaxwell.cpp
index e2ca4475e..05986d379 100644
--- a/src/transport/TortuosityMaxwell.cpp
+++ b/src/transport/TortuosityMaxwell.cpp
@@ -13,8 +13,6 @@
 #include "TortuosityMaxwell.h"
 #include "cantera/base/ctexceptions.h"
 
-#include <string>
-
 namespace Cantera
 {
 
diff --git a/src/transport/TortuosityPercolation.cpp b/src/transport/TortuosityPercolation.cpp
index 76e8e74c9..e26e9708a 100644
--- a/src/transport/TortuosityPercolation.cpp
+++ b/src/transport/TortuosityPercolation.cpp
@@ -13,8 +13,6 @@
 #include "TortuosityPercolation.h"
 #include "cantera/base/ctexceptions.h"
 
-#include <string>
-
 namespace Cantera
 {
 
diff --git a/src/transport/TransportBase.cpp b/src/transport/TransportBase.cpp
index 4a1691422..e616aea0e 100644
--- a/src/transport/TransportBase.cpp
+++ b/src/transport/TransportBase.cpp
@@ -13,7 +13,6 @@
 
 #include "cantera/numerics/ctlapack.h"
 
-#include <iostream>
 using namespace std;
 
 namespace Cantera
diff --git a/src/transport/TransportFactory.cpp b/src/transport/TransportFactory.cpp
index 5fb98442f..d57c39c87 100644
--- a/src/transport/TransportFactory.cpp
+++ b/src/transport/TransportFactory.cpp
@@ -31,8 +31,6 @@
 #include "cantera/base/ctml.h"
 #include "cantera/base/stringUtils.h"
 
-#include <cstdio>
-#include <cstring>
 #include <fstream>
 
 using namespace std;
diff --git a/src/transport/WaterTransport.cpp b/src/transport/WaterTransport.cpp
index c03ef54f9..c738591c3 100644
--- a/src/transport/WaterTransport.cpp
+++ b/src/transport/WaterTransport.cpp
@@ -10,7 +10,6 @@
 #include "cantera/thermo/WaterSSTP.h"
 #include "cantera/thermo/WaterProps.h"
 
-#include <iostream>
 using namespace std;
 
 namespace Cantera
diff --git a/test_problems/ChemEquil_gri_pairs/gri_pairs.cpp b/test_problems/ChemEquil_gri_pairs/gri_pairs.cpp
index 484fe29bf..e5d63cf5a 100644
--- a/test_problems/ChemEquil_gri_pairs/gri_pairs.cpp
+++ b/test_problems/ChemEquil_gri_pairs/gri_pairs.cpp
@@ -5,6 +5,8 @@
 #include "cantera/IdealGasMix.h"
 #include "cantera/equilibrium.h"
 
+#include <cstdio>
+
 using namespace std;
 using namespace Cantera;
 
diff --git a/test_problems/ChemEquil_ionizedGas/ionizedGasEquil.cpp b/test_problems/ChemEquil_ionizedGas/ionizedGasEquil.cpp
index f1a88842b..d696b7988 100644
--- a/test_problems/ChemEquil_ionizedGas/ionizedGasEquil.cpp
+++ b/test_problems/ChemEquil_ionizedGas/ionizedGasEquil.cpp
@@ -1,6 +1,8 @@
 #include "cantera/IdealGasMix.h"
 #include "cantera/equilibrium.h"
 
+#include <cstdio>
+
 using namespace std;
 using namespace Cantera;
 
diff --git a/test_problems/ChemEquil_red1/basopt_red1.cpp b/test_problems/ChemEquil_red1/basopt_red1.cpp
index a0bc987a4..5fd62e980 100644
--- a/test_problems/ChemEquil_red1/basopt_red1.cpp
+++ b/test_problems/ChemEquil_red1/basopt_red1.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
 #include "cantera/IdealGasMix.h"
 #include "cantera/equilibrium.h"
 
diff --git a/test_problems/NASA9poly_test/NASA9poly_test.cpp b/test_problems/NASA9poly_test/NASA9poly_test.cpp
index 373880dc9..55c638ac1 100644
--- a/test_problems/NASA9poly_test/NASA9poly_test.cpp
+++ b/test_problems/NASA9poly_test/NASA9poly_test.cpp
@@ -6,9 +6,8 @@
 #include "cantera/IdealGasMix.h"
 #include "cantera/transport/TransportFactory.h"
 
-#include <iostream>
-#include <vector>
 #include <memory>
+#include <cstdio>
 
 using namespace Cantera;
 
diff --git a/test_problems/PecosTransport/PecosTransport.cpp b/test_problems/PecosTransport/PecosTransport.cpp
index 916fe2f73..ab60a6b45 100644
--- a/test_problems/PecosTransport/PecosTransport.cpp
+++ b/test_problems/PecosTransport/PecosTransport.cpp
@@ -17,19 +17,13 @@
 
 // perhaps, later, an analytical solution could be added
 
-
-#include <iostream>
-#include <string>
-#include <vector>
-#include <string>
-#include <iomanip>
-
-using namespace std;
-
 #include "cantera/transport.h"
 #include "cantera/IdealGasMix.h"
 #include "cantera/transport/TransportFactory.h"
 
+#include <cstdio>
+
+using namespace std;
 using namespace Cantera;
 
 void printDbl(double val)
diff --git a/test_problems/cathermo/VPissp/ISSPTester.cpp b/test_problems/cathermo/VPissp/ISSPTester.cpp
index bd34ef804..08b8ca026 100644
--- a/test_problems/cathermo/VPissp/ISSPTester.cpp
+++ b/test_problems/cathermo/VPissp/ISSPTester.cpp
@@ -18,9 +18,6 @@
 #include "cantera/thermo/IdealSolidSolnPhase.h"
 #include "cantera/thermo/IdealSolnGasVPSS.h"
 
-#include <iostream>
-#include <string>
-#include <vector>
 #include <cstdio>
 
 using namespace std;
diff --git a/test_problems/cathermo/ims/IMSTester.cpp b/test_problems/cathermo/ims/IMSTester.cpp
index 15c43b9fc..ea5ec61c0 100644
--- a/test_problems/cathermo/ims/IMSTester.cpp
+++ b/test_problems/cathermo/ims/IMSTester.cpp
@@ -15,10 +15,6 @@
 //  working correctly
 
 #include "cantera/thermo/IdealMolalSoln.h"
-
-#include <iostream>
-#include <string>
-#include <vector>
 #include <cstdio>
 
 using namespace std;
diff --git a/test_problems/cathermo/issp/ISSPTester.cpp b/test_problems/cathermo/issp/ISSPTester.cpp
index 079aebdaf..392a9af00 100644
--- a/test_problems/cathermo/issp/ISSPTester.cpp
+++ b/test_problems/cathermo/issp/ISSPTester.cpp
@@ -15,10 +15,6 @@
 //  working correctly
 //
 
-#include <iostream>
-#include <string>
-#include <vector>
-
 #include "cantera/thermo/IdealSolidSolnPhase.h"
 
 #include <cstdio>
diff --git a/test_problems/cathermo/testIAPWSPres/testPress.cpp b/test_problems/cathermo/testIAPWSPres/testPress.cpp
index 45577e7a2..f40a8bbc2 100644
--- a/test_problems/cathermo/testIAPWSPres/testPress.cpp
+++ b/test_problems/cathermo/testIAPWSPres/testPress.cpp
@@ -1,6 +1,5 @@
 
 #include "cantera/thermo/WaterPropsIAPWS.h"
-#include <new>
 
 #include <cstdio>
 #include <cmath>
diff --git a/test_problems/cathermo/testIAPWSTripP/testTripleP.cpp b/test_problems/cathermo/testIAPWSTripP/testTripleP.cpp
index a4ccd2662..3ec2e3177 100644
--- a/test_problems/cathermo/testIAPWSTripP/testTripleP.cpp
+++ b/test_problems/cathermo/testIAPWSTripP/testTripleP.cpp
@@ -1,6 +1,5 @@
 
 #include "cantera/thermo/WaterPropsIAPWS.h"
-#include <new>
 
 #include <cstdio>
 #include <cmath>
diff --git a/test_problems/cathermo/testWaterTP/testWaterSSTP.cpp b/test_problems/cathermo/testWaterTP/testWaterSSTP.cpp
index 002113903..c1cfc127f 100644
--- a/test_problems/cathermo/testWaterTP/testWaterSSTP.cpp
+++ b/test_problems/cathermo/testWaterTP/testWaterSSTP.cpp
@@ -2,7 +2,6 @@
 #include "cantera/thermo/WaterSSTP.h"
 
 #include <cstdio>
-#include <cmath>
 
 using namespace std;
 using namespace Cantera;
diff --git a/test_problems/cxx_ex/examples.cpp b/test_problems/cxx_ex/examples.cpp
index d41174e7f..8002ada10 100644
--- a/test_problems/cxx_ex/examples.cpp
+++ b/test_problems/cxx_ex/examples.cpp
@@ -2,7 +2,6 @@
 #include "cantera/base/global.h"
 
 #include <iostream>
-#include <stdlib.h>
 
 using namespace Cantera;
 using namespace std;
diff --git a/test_problems/diamondSurf/runDiamond.cpp b/test_problems/diamondSurf/runDiamond.cpp
index 11e95367d..cfe4b6cab 100644
--- a/test_problems/diamondSurf/runDiamond.cpp
+++ b/test_problems/diamondSurf/runDiamond.cpp
@@ -12,12 +12,6 @@
 
 #include "cantera/kinetics.h"
 
-#include <iostream>
-#include <string>
-#include <vector>
-#include <string>
-#include <iomanip>
-
 using namespace std;
 using namespace Cantera;
 
diff --git a/test_problems/diamondSurf_dupl/runDiamondDupl.cpp b/test_problems/diamondSurf_dupl/runDiamondDupl.cpp
index 619156c59..5c32fc3f2 100644
--- a/test_problems/diamondSurf_dupl/runDiamondDupl.cpp
+++ b/test_problems/diamondSurf_dupl/runDiamondDupl.cpp
@@ -12,12 +12,6 @@
 
 #include "cantera/kinetics.h"
 
-#include <iostream>
-#include <string>
-#include <vector>
-#include <string>
-#include <iomanip>
-
 using namespace std;
 using namespace Cantera;
 
diff --git a/test_problems/dustyGasTransport/dustyGasTransportTest.cpp b/test_problems/dustyGasTransport/dustyGasTransportTest.cpp
index 8ca6dcf67..8d26b1a5f 100644
--- a/test_problems/dustyGasTransport/dustyGasTransportTest.cpp
+++ b/test_problems/dustyGasTransport/dustyGasTransportTest.cpp
@@ -3,6 +3,7 @@
 #include "cantera/transport/DustyGasTransport.h"
 
 #include <memory>
+#include <cstdio>
 
 using namespace std;
 using namespace Cantera;
diff --git a/test_problems/fracCoeff/fracCoeff.cpp b/test_problems/fracCoeff/fracCoeff.cpp
index 7534d925a..18e3af716 100644
--- a/test_problems/fracCoeff/fracCoeff.cpp
+++ b/test_problems/fracCoeff/fracCoeff.cpp
@@ -10,12 +10,7 @@
 // make things simpler.
 
 #include "cantera/kinetics.h"
-
-#include <iostream>
-#include <string>
-#include <vector>
-#include <string>
-#include <iomanip>
+#include <cstdio>
 
 using namespace std;
 using namespace Cantera;
diff --git a/test_problems/mixGasTransport/mixGasTransport.cpp b/test_problems/mixGasTransport/mixGasTransport.cpp
index 8f8e537cd..d61f9fb53 100644
--- a/test_problems/mixGasTransport/mixGasTransport.cpp
+++ b/test_problems/mixGasTransport/mixGasTransport.cpp
@@ -19,13 +19,7 @@
 
 #include "cantera/transport.h"
 #include "cantera/IdealGasMix.h"
-#include "cantera/transport/TransportFactory.h"
-
-#include <iostream>
-#include <string>
-#include <vector>
-#include <string>
-#include <iomanip>
+#include <cstdio>
 
 using namespace std;
 using namespace Cantera;
diff --git a/test_problems/multiGasTransport/multiGasTransport.cpp b/test_problems/multiGasTransport/multiGasTransport.cpp
index 694634fa3..e8d0a0d98 100644
--- a/test_problems/multiGasTransport/multiGasTransport.cpp
+++ b/test_problems/multiGasTransport/multiGasTransport.cpp
@@ -21,11 +21,7 @@
 #include "cantera/IdealGasMix.h"
 #include "cantera/transport/TransportFactory.h"
 
-#include <iostream>
-#include <string>
-#include <vector>
-#include <string>
-#include <iomanip>
+#include <cstdio>
 
 using namespace std;
 using namespace Cantera;
diff --git a/test_problems/negATest/negATest.cpp b/test_problems/negATest/negATest.cpp
index 66ec42d90..2f06696bd 100644
--- a/test_problems/negATest/negATest.cpp
+++ b/test_problems/negATest/negATest.cpp
@@ -1,6 +1,6 @@
 #include "cantera/kinetics.h"
 
-#include <string>
+#include <cstdio>
 
 using namespace Cantera;
 using namespace std;
diff --git a/test_problems/printUtilUnitTest/pUtest.cpp b/test_problems/printUtilUnitTest/pUtest.cpp
index 858282f0d..e61f9e3b7 100644
--- a/test_problems/printUtilUnitTest/pUtest.cpp
+++ b/test_problems/printUtilUnitTest/pUtest.cpp
@@ -1,4 +1,3 @@
-#include <iostream>
 #include <fstream>
 #include <cmath>
 #include <sstream>
diff --git a/test_problems/pureFluidTest/testPureWater.cpp b/test_problems/pureFluidTest/testPureWater.cpp
index 636e3f0f2..ed1689ca2 100644
--- a/test_problems/pureFluidTest/testPureWater.cpp
+++ b/test_problems/pureFluidTest/testPureWater.cpp
@@ -1,7 +1,5 @@
 #include "cantera/PureFluid.h"
-#include <new>
 #include <cstdio>
-#include <cmath>
 
 using namespace std;
 using namespace Cantera;
diff --git a/test_problems/rankine_democxx/rankine.cpp b/test_problems/rankine_democxx/rankine.cpp
index 2fe707f98..13e545d7a 100644
--- a/test_problems/rankine_democxx/rankine.cpp
+++ b/test_problems/rankine_democxx/rankine.cpp
@@ -1,9 +1,7 @@
 // An open Rankine cycle
 
-#include <string>
-#include <map>
-
 #include "cantera/PureFluid.h"    // defines class Water
+#include <cstdio>
 
 using namespace Cantera;
 using namespace std;
diff --git a/test_problems/shared/fileLog.h b/test_problems/shared/fileLog.h
index 2415b60d7..f7cd9c4d9 100644
--- a/test_problems/shared/fileLog.h
+++ b/test_problems/shared/fileLog.h
@@ -1,6 +1,5 @@
 #include "cantera/base/logger.h"
 
-#include <string>
 #include <fstream>
 
 class fileLog: public Cantera::Logger
diff --git a/test_problems/simpleTransport/simpleTransportTest.cpp b/test_problems/simpleTransport/simpleTransportTest.cpp
index 002affc5a..5acaa482b 100644
--- a/test_problems/simpleTransport/simpleTransportTest.cpp
+++ b/test_problems/simpleTransport/simpleTransportTest.cpp
@@ -4,6 +4,7 @@
 #include "cantera/transport/SimpleTransport.h"
 
 #include <memory>
+#include <cstdio>
 
 using namespace std;
 using namespace Cantera;
diff --git a/test_problems/statmech/statmech_test.cpp b/test_problems/statmech/statmech_test.cpp
index 3fbd80c68..039db7216 100644
--- a/test_problems/statmech/statmech_test.cpp
+++ b/test_problems/statmech/statmech_test.cpp
@@ -8,21 +8,10 @@
 // Test case for the statistical mechanics in cantera
 //
 
-#include <iostream>
-#include <string>
-#include <vector>
-#include <string>
-#include <iomanip>
-
-/*****************************************************************/
-/*****************************************************************/
-
 #include "cantera/transport.h"
 #include "cantera/IdealGasMix.h"
 #include "cantera/equil/equil.h"
 
-#include "cantera/transport/TransportFactory.h"
-
 using namespace std;
 using namespace Cantera;
 
diff --git a/test_problems/statmech/statmech_test_Fe.cpp b/test_problems/statmech/statmech_test_Fe.cpp
index 43a053930..682ce70cd 100644
--- a/test_problems/statmech/statmech_test_Fe.cpp
+++ b/test_problems/statmech/statmech_test_Fe.cpp
@@ -8,23 +8,11 @@
 // Test case to check error thrown if using Fe (not supported species)
 //
 
-#include <iostream>
-#include <string>
-#include <vector>
-#include <string>
-#include <iomanip>
-
-using namespace std;
-
-/*****************************************************************/
-/*****************************************************************/
-
 #include "cantera/transport.h"
 #include "cantera/IdealGasMix.h"
 #include "cantera/equil/equil.h"
 
-#include "cantera/transport/TransportFactory.h"
-
+using namespace std;
 using namespace Cantera;
 
 int main(int argc, char** argv)
diff --git a/test_problems/statmech/statmech_test_poly.cpp b/test_problems/statmech/statmech_test_poly.cpp
index 65c48ebc6..f2b4abc09 100644
--- a/test_problems/statmech/statmech_test_poly.cpp
+++ b/test_problems/statmech/statmech_test_poly.cpp
@@ -8,23 +8,11 @@
 // Test case for the statistical mechanics in cantera
 //
 
-#include <iostream>
-#include <string>
-#include <vector>
-#include <string>
-#include <iomanip>
-
-using namespace std;
-
-/*****************************************************************/
-/*****************************************************************/
-
 #include "cantera/transport.h"
 #include "cantera/IdealGasMix.h"
 #include "cantera/equil/equil.h"
 
-#include "cantera/transport/TransportFactory.h"
-
+using namespace std;
 using namespace Cantera;
 
 int main(int argc, char** argv)
diff --git a/test_problems/statmech/statmech_transport.cpp b/test_problems/statmech/statmech_transport.cpp
index e25c9e2de..b745d146c 100644
--- a/test_problems/statmech/statmech_transport.cpp
+++ b/test_problems/statmech/statmech_transport.cpp
@@ -8,21 +8,10 @@
 // Test case for the statistical mechanics in cantera
 //
 
-#include <iostream>
-#include <string>
-#include <vector>
-#include <string>
-#include <iomanip>
-
-/*****************************************************************/
-/*****************************************************************/
-
 #include "cantera/transport.h"
 #include "cantera/IdealGasMix.h"
 #include "cantera/equil/equil.h"
 
-#include "cantera/transport/TransportFactory.h"
-
 using namespace std;
 using namespace Cantera;
 
diff --git a/test_problems/surfSolverTest/surfaceSolver.cpp b/test_problems/surfSolverTest/surfaceSolver.cpp
index 374a92c1a..a44fdcc5d 100644
--- a/test_problems/surfSolverTest/surfaceSolver.cpp
+++ b/test_problems/surfSolverTest/surfaceSolver.cpp
@@ -14,13 +14,17 @@
 //  using Placid.
 //
 
-#include <iostream>
-#include <string>
-#include <vector>
+#include "cantera/Interface.h"
+#include "cantera/kinetics.h"
+#include "cantera/kinetics/ImplicitSurfChem.h"
+#include "cantera/kinetics/solveSP.h"
+#include <cstdio>
 #include <fstream>
 
-#define MSSIZE 200
 using namespace std;
+using namespace Cantera;
+
+#define MSSIZE 200
 
 /*****************************************************************/
 /*****************************************************************/
@@ -30,14 +34,6 @@ static void printUsage()
 
 }
 
-#include "cantera/Interface.h"
-#include "cantera/kinetics.h"
-#include "cantera/kinetics/ImplicitSurfChem.h"
-#include "cantera/kinetics/solveSP.h"
-
-using namespace Cantera;
-
-
 void printGas(ostream& oooo, ThermoPhase* gasTP, InterfaceKinetics* iKin_ptr, double* src)
 {
     double x[MSSIZE];
diff --git a/test_problems/surfSolverTest/surfaceSolver2.cpp b/test_problems/surfSolverTest/surfaceSolver2.cpp
index 78cca65b7..2f92138dc 100644
--- a/test_problems/surfSolverTest/surfaceSolver2.cpp
+++ b/test_problems/surfSolverTest/surfaceSolver2.cpp
@@ -14,12 +14,7 @@
 //  using Placid.
 //
 
-#include <iostream>
-#include <string>
-#include <vector>
-
 #define MSSIZE 200
-using namespace std;
 
 #ifdef DEBUG_HKM
 int iDebug_HKM = 0;
@@ -37,7 +32,10 @@ static void printUsage()
 #include "cantera/kinetics.h"
 #include "cantera/kinetics/ImplicitSurfChem.h"
 #include "cantera/kinetics/solveSP.h"
+#include <cstdio>
+#include <fstream>
 
+using namespace std;
 using namespace Cantera;
 
 void printGas(ostream& oooo, ThermoPhase* gasTP, InterfaceKinetics* iKin_ptr, double* src)
diff --git a/test_problems/surfkin/surfdemo.cpp b/test_problems/surfkin/surfdemo.cpp
index 5caa50c66..f2817e821 100644
--- a/test_problems/surfkin/surfdemo.cpp
+++ b/test_problems/surfkin/surfdemo.cpp
@@ -3,7 +3,6 @@
  *  site fractions.
  */
 
-#include <iostream>
 #include "cantera/IdealGasMix.h"
 #include "cantera/Interface.h"