Eliminate redundant standard library includes

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"

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"

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"

include/cantera/IncompressibleSolid.h

@@ -1,8 +1,6 @@
 #ifndef CXX_INCOMPRESSIBLE
 #define CXX_INCOMPRESSIBLE
 
-#include <string>
-
 #include "thermo/ConstDensityThermo.h"
 #include "kinetics/importKinetics.h"
 

include/cantera/Interface.h

@@ -5,7 +5,6 @@
 #ifndef CXX_INTERFACE
 #define CXX_INTERFACE
 
-#include <string>
 #include "thermo.h"
 #include "kinetics.h"
 

include/cantera/Metal.h

@@ -1,8 +1,6 @@
 #ifndef CXX_METAL
 #define CXX_METAL
 
-#include <string>
-
 #include "thermo/MetalPhase.h"
 #include "kinetics/importKinetics.h"
 

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"

include/cantera/base/Array.h

@@ -12,6 +12,7 @@
 #include "ctexceptions.h"
 #include "utilities.h"
 
+#include <iostream>
 #include <cstring>
 
 namespace Cantera

include/cantera/base/ctexceptions.h

@@ -10,7 +10,6 @@
 #define CT_CTEXCEPTIONS_H
 
 #include <exception>
-#include <iostream>
 #include <string>
 
 namespace Cantera

include/cantera/base/logger.h

@@ -9,8 +9,6 @@
 #include "ct_defs.h"
 
 #include <iostream>
-#include <string>
-#include <cstdlib>
 
 namespace Cantera
 {

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

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
 //@}

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
 {

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

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"

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
 {
 

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
 {
 

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
 {
 

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"
 

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

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"
 

include/cantera/numerics/Func1.h

@@ -10,7 +10,6 @@
 #include "cantera/base/ct_defs.h"
 
 #include <iostream>
-#include <string>
 
 namespace Cantera
 {

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"
 

include/cantera/numerics/RootFind.h

@@ -17,7 +17,6 @@
  * @defgroup solverGroup Solvers for Equation Systems
  */
 
-#include <vector>
 #include "ResidEval.h"
 
 namespace Cantera

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

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"
 

include/cantera/oneD/Inlet1D.h

@@ -18,6 +18,8 @@
 #include "OneDim.h"
 #include "cantera/base/ctml.h"
 
+#include <cstdio>
+
 namespace Cantera
 {
 

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"

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
 {

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
 {

include/cantera/tpx/Sub.h

@@ -3,9 +3,6 @@
 
 #include "cantera/base/ctexceptions.h"
 
-#include <iostream>
-#include <string>
-
 namespace tpx
 {
 

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
 {
 

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
 {
 

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"

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"

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
 {
 

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"
 

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"
 

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"

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"

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"

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"

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"
 

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"

include/cantera/zeroD/Reservoir.h

@@ -6,7 +6,6 @@
 #ifndef CT_RESERVOIR_H
 #define CT_RESERVOIR_H
 
-#include <iostream>
 #include "ReactorBase.h"
 
 namespace Cantera

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

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;
 

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

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"

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"
 

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;
 

src/base/application.cpp

@@ -6,8 +6,6 @@
 #include "cantera/base/xml.h"
 #include "units.h"
 
-#include <map>
-#include <string>
 #include <fstream>
 #include <functional>
 

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
 {

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

src/base/ct2ctml.cpp

@@ -14,9 +14,6 @@
 
 #include <fstream>
 #include <sstream>
-#include <string>
-#include <cstdlib>
-#include <ctime>
 
 using namespace Cantera;
 using namespace std;

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;
 

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
 {

src/base/units.h

@@ -15,8 +15,6 @@
 #include "cantera/base/ctexceptions.h"
 #include "cantera/base/ct_thread.h"
 
-#include <string>
-
 namespace Cantera
 {
 

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
 {

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"
 

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)

src/clib/ctonedim.cpp

@@ -13,6 +13,8 @@
 #include "cantera/numerics/DenseMatrix.h"
 #include "Cabinet.h"
 
+#include <fstream>
+
 using namespace std;
 using namespace Cantera;
 

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;
 

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;
 

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;

src/equil/PropertyCalculator.h

@@ -8,7 +8,6 @@
 #define CT_PROP_CALC_H
 
 #include "cantera/base/ct_defs.h"
-#include <string>
 
 namespace Cantera
 {

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;

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

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)

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
 {

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
 {
 

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

src/equil/vcs_inest.cpp

@@ -14,10 +14,6 @@
 
 #include "cantera/base/clockWC.h"
 
-#include <cstdio>
-#include <cstdlib>
-#include <cmath>
-
 namespace VCSnonideal
 {
 

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

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;

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()

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;

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 {

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()

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)

src/equil/vcs_root1d.cpp

@@ -11,8 +11,6 @@
 #include "cantera/equil/vcs_internal.h"
 
 #include <cstdio>
-#include <cstdlib>
-#include <cmath>
 
 namespace VCSnonideal
 {

src/equil/vcs_rxnadj.cpp

@@ -13,8 +13,6 @@
 #include "cantera/equil/vcs_VolPhase.h"
 
 #include <cstdio>
-#include <cstdlib>
-#include <cmath>
 
 namespace VCSnonideal
 {

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

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

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;
 

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"

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

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 <cassert>
-#include <cstdlib>
 
 using namespace std;
 

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

src/kinetics/FalloffFactory.cpp

@@ -7,8 +7,6 @@
 #include "cantera/base/ctexceptions.h"
 #include "cantera/base/stringUtils.h"
 
-#include <cmath>
-
 namespace Cantera
 {
 

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;
 
 

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

src/kinetics/Group.cpp

@@ -10,9 +10,6 @@
 
 #include "cantera/kinetics/Group.h"
 
-#include <algorithm>
-#include <cmath>
-
 namespace Cantera
 {
 

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;
 

src/kinetics/Kinetics.cpp

@@ -15,7 +15,6 @@
 
 #include "cantera/kinetics/ImplicitSurfChem.h"
 
-#include <iostream>
 using namespace std;
 
 

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;
 

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

src/numerics/BEulerInt.cpp

@@ -11,8 +11,6 @@
 
 #include "cantera/numerics/BEulerInt.h"
 
-#include <iostream>
-
 using namespace std;
 
 namespace Cantera

src/numerics/CVodeInt.cpp

@@ -5,7 +5,6 @@
 // Copyright 2001  California Institute of Technology
 
 #include "CVodeInt.h"
-#include <iostream>
 using namespace std;
 
 // cvode includes

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"