Moved a few standard library includes to more local scopes

include/cantera/base/ct_defs.h

@@ -14,17 +14,14 @@
 #ifndef CT_DEFS_H
 #define CT_DEFS_H
 
-#include <cmath>
 #include "config.h"
 
+#include <cmath>
+
 // STL includes
-#include <iostream>
-#include <fstream>
 #include <vector>
 #include <map>
-#include <numeric>
 #include <string>
-#include <algorithm>
 
 // Warn about deprecated functions at compile time
 #ifdef __GNUC__

include/cantera/base/utilities.h

@@ -18,6 +18,8 @@
 
 #include "ct_defs.h"
 
+#include <algorithm>
+
 //! Unary operator to multiply the argument by a constant.
 /*!
  *  The form of this operator is designed for use by std::transform.

include/cantera/kinetics/Group.h

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

include/cantera/numerics/ResidEval.h

@@ -14,6 +14,8 @@
 #include "cantera/base/ct_defs.h"
 #include "cantera/base/ctexceptions.h"
 
+#include <cstdio>
+
 namespace Cantera
 {
 

src/base/global.cpp

@@ -6,7 +6,7 @@
 #include "application.h"
 #include "units.h"
 
-// RFB:TODO May need OS specifc include to use varargs.h instead
+#include <cstdio>
 #include <stdarg.h>
 
 using namespace std;

src/clib/ctrpath.cpp

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

src/clib/ctxml.cpp

@@ -9,6 +9,7 @@
 #include "Cabinet.h"
 
 #include <string.h>
+#include <fstream>
 
 using namespace std;
 using namespace Cantera;

src/equil/MultiPhaseEquil.cpp

@@ -11,6 +11,7 @@
 
 #include <math.h>
 #include <iostream>
+#include <cstdio>
 
 using namespace std;
 

src/equil/vcs_MultiPhaseEquil.cpp

@@ -33,6 +33,7 @@
 
 #include <string>
 #include <vector>
+#include <cstdio>
 
 using namespace Cantera;
 using namespace std;

src/equil/vcs_phaseStability.cpp

@@ -13,6 +13,7 @@
 #include <cmath>
 #include <vector>
 #include <cstring>
+#include <algorithm>
 
 using namespace std;
 

src/equil/vcs_prob.cpp

@@ -19,6 +19,8 @@
 
 #include <cstdlib>
 #include <string>
+#include <cstdio>
+
 using namespace std;
 
 namespace VCSnonideal

src/equil/vcs_solve.cpp

@@ -21,7 +21,9 @@
 #include "cantera/base/clockWC.h"
 
 #include <string>
-#include "math.h"
+#include <cstdlib>
+#include <math.h>
+
 using namespace std;
 
 namespace VCSnonideal

src/fortran/fctxml.cpp

@@ -9,6 +9,7 @@
 #include "cantera/base/ctml.h"
 
 #include <cstring>
+#include <fstream>
 
 using namespace ctml;
 using namespace std;

src/kinetics/ReactionStoichMgr.cpp

@@ -10,6 +10,8 @@
 #include "cantera/base/ctexceptions.h"
 #include "ReactionData.h"
 
+#include <fstream>
+
 using namespace std;
 
 namespace Cantera

src/numerics/BandMatrix.cpp

@@ -12,7 +12,9 @@
 #include "cantera/base/ctexceptions.h"
 #include "cantera/base/stringUtils.h"
 #include "cantera/base/global.h"
+
 #include <cstring>
+#include <fstream>
 
 using namespace std;
 

src/oneD/Domain1D.cpp

@@ -5,6 +5,8 @@
 
 #include "cantera/oneD/Domain1D.h"
 
+#include <cstdio>
+
 using namespace std;
 
 namespace Cantera

src/oneD/OneDim.cpp

@@ -3,6 +3,9 @@
 #include "cantera/oneD/OneDim.h"
 
 #include "cantera/base/ctml.h"
+
+#include <fstream>
+
 using namespace ctml;
 using namespace std;
 

src/oneD/Sim1D.cpp

@@ -5,7 +5,9 @@
 #include "cantera/oneD/Sim1D.h"
 #include "cantera/oneD/MultiJac.h"
 
+#include <fstream>
 #include <cstdlib>
+#include <cstdio>
 
 using namespace std;
 

src/oneD/StFlow.cpp

@@ -10,6 +10,8 @@
 #include "cantera/base/ctml.h"
 #include "cantera/oneD/MultiJac.h"
 
+#include <cstdio>
+
 using namespace ctml;
 using namespace std;
 

src/oneD/newton_utils.cpp

@@ -5,6 +5,8 @@
 #include "cantera/base/ct_defs.h"
 #include "cantera/oneD/Domain1D.h"
 
+#include <cstdio>
+
 using namespace std;
 
 namespace Cantera

src/thermo/DebyeHuckel.cpp

@@ -22,6 +22,7 @@
 
 #include <cstring>
 #include <cstdlib>
+#include <fstream>
 
 using namespace std;
 using namespace ctml;

src/thermo/HMWSoln.cpp

@@ -26,6 +26,7 @@
 
 #include <cmath>
 #include <cstdlib>
+#include <cstdio>
 
 namespace Cantera
 {

src/thermo/HMWSoln_input.cpp

@@ -20,6 +20,8 @@
 
 #include <cstring>
 #include <cstdlib>
+#include <cstdio>
+#include <fstream>
 
 using namespace std;
 using namespace ctml;

src/thermo/IdealMolalSoln.cpp

@@ -19,7 +19,9 @@
  */
 #include "cantera/thermo/IdealMolalSoln.h"
 #include "cantera/thermo/ThermoFactory.h"
+
 #include <cmath>
+#include <fstream>
 
 using namespace ctml;
 

src/thermo/IdealSolidSolnPhase.cpp

@@ -14,6 +14,7 @@
 #include "cantera/base/stringUtils.h"
 
 #include <iostream>
+#include <fstream>
 
 using namespace std;
 

src/thermo/IonsFromNeutralVPSSTP.cpp

@@ -24,6 +24,7 @@
 
 #include <cmath>
 #include <iomanip>
+#include <fstream>
 
 using namespace std;
 

src/thermo/LatticePhase.cpp

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

src/thermo/MargulesVPSSTP.cpp

@@ -16,6 +16,7 @@
 #include "cantera/base/stringUtils.h"
 
 #include <iomanip>
+#include <fstream>
 
 using namespace std;
 

src/thermo/MixedSolventElectrolyte.cpp

@@ -17,6 +17,7 @@
 #include "cantera/base/stringUtils.h"
 
 #include <iomanip>
+#include <fstream>
 
 using namespace std;
 

src/thermo/MolalityVPSSTP.cpp

@@ -20,6 +20,8 @@
 #include "cantera/base/stringUtils.h"
 
 #include <iomanip>
+#include <cstdio>
+#include <fstream>
 
 using namespace std;
 

src/thermo/MolarityIonicVPSSTP.cpp

@@ -21,6 +21,7 @@
 #include "cantera/base/stringUtils.h"
 
 #include <cmath>
+#include <fstream>
 
 using namespace std;
 

src/thermo/PDSS_ConstVol.cpp

@@ -16,6 +16,8 @@
 
 #include "cantera/thermo/VPStandardStateTP.h"
 
+#include <fstream>
+
 using namespace std;
 
 namespace Cantera

src/thermo/PDSS_HKFT.cpp

@@ -18,6 +18,7 @@
 #include "cantera/base/stringUtils.h"
 
 #include <cstdlib>
+#include <fstream>
 
 using namespace std;
 using namespace ctml;

src/thermo/PDSS_IdealGas.cpp

@@ -16,6 +16,8 @@
 
 #include "cantera/thermo/VPStandardStateTP.h"
 
+#include <fstream>
+
 using namespace std;
 
 namespace Cantera

src/thermo/PDSS_IonsFromNeutral.cpp

@@ -18,6 +18,8 @@
 #include "cantera/base/xml.h"
 #include "cantera/base/ctml.h"
 
+#include <fstream>
+
 using namespace std;
 
 namespace Cantera

src/thermo/PDSS_SSVol.cpp

@@ -16,6 +16,8 @@
 
 #include "cantera/thermo/VPStandardStateTP.h"
 
+#include <fstream>
+
 using namespace std;
 
 namespace Cantera

src/thermo/PDSS_Water.cpp

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

src/thermo/PhaseCombo_Interaction.cpp

@@ -13,6 +13,7 @@
 #include "cantera/base/stringUtils.h"
 
 #include <iomanip>
+#include <fstream>
 
 using namespace std;
 

src/thermo/PseudoBinaryVPSSTP.cpp

@@ -20,6 +20,7 @@
 #include "cantera/base/stringUtils.h"
 
 #include <cmath>
+#include <cstdio>
 
 using namespace std;
 

src/thermo/PureFluidPhase.cpp

@@ -15,6 +15,7 @@
 
 #include <cstdlib>
 #include <iomanip>
+#include <fstream>
 
 using std::string;
 using std::endl;

src/thermo/RedlichKisterVPSSTP.cpp

@@ -17,6 +17,7 @@
 #include "cantera/base/stringUtils.h"
 
 #include <iomanip>
+#include <fstream>
 
 using namespace std;
 

src/thermo/ThermoPhase.cpp

@@ -12,6 +12,7 @@
 #include "cantera/base/stringUtils.h"
 
 #include <iomanip>
+#include <fstream>
 
 using namespace std;
 using namespace ctml;

src/thermo/WaterSSTP.cpp

@@ -17,6 +17,7 @@
 #include "cantera/base/stringUtils.h"
 
 #include <cmath>
+#include <fstream>
 
 using namespace std;
 

src/transport/AqueousTransport.cpp

@@ -16,6 +16,8 @@
 #include "cantera/base/stringUtils.h"
 
 #include <iostream>
+#include <cstdio>
+
 using namespace std;
 
 /**

src/transport/LiquidTransport.cpp

@@ -12,6 +12,8 @@
 #include "cantera/base/stringUtils.h"
 
 #include <iostream>
+#include <cstdio>
+
 using namespace std;
 
 /**

src/transport/MMCollisionInt.h

@@ -7,9 +7,11 @@
 #ifndef CT_MMCOLLISIONINT_H
 #define CT_MMCOLLISIONINT_H
 
-#include <vector>
 #include "cantera/base/ct_defs.h"
 
+#include <vector>
+#include <iostream>
+
 namespace Cantera
 {
 

src/zeroD/ReactorNet.cpp

@@ -3,6 +3,8 @@
 #include "cantera/zeroD/FlowDevice.h"
 #include "cantera/zeroD/Wall.h"
 
+#include <cstdio>
+
 using namespace std;
 using namespace Cantera;