diff --git a/include/cantera/base/ct_defs.h b/include/cantera/base/ct_defs.h
index 5a4cc8bab..8e7d72418 100644
--- a/include/cantera/base/ct_defs.h
+++ b/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__
diff --git a/include/cantera/base/utilities.h b/include/cantera/base/utilities.h
index 20374f6d5..940b18443 100644
--- a/include/cantera/base/utilities.h
+++ b/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.
diff --git a/include/cantera/kinetics/Group.h b/include/cantera/kinetics/Group.h
index b23679f87..7ac35cbe8 100644
--- a/include/cantera/kinetics/Group.h
+++ b/include/cantera/kinetics/Group.h
@@ -9,6 +9,8 @@
 
 #include "cantera/base/ct_defs.h"
 
+#include <iostream>
+
 namespace Cantera
 {
 
diff --git a/include/cantera/numerics/ResidEval.h b/include/cantera/numerics/ResidEval.h
index 64f070d3a..940b7f1dd 100644
--- a/include/cantera/numerics/ResidEval.h
+++ b/include/cantera/numerics/ResidEval.h
@@ -14,6 +14,8 @@
 #include "cantera/base/ct_defs.h"
 #include "cantera/base/ctexceptions.h"
 
+#include <cstdio>
+
 namespace Cantera
 {
 
diff --git a/src/base/global.cpp b/src/base/global.cpp
index c267e43cf..d8a6af391 100644
--- a/src/base/global.cpp
+++ b/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;
diff --git a/src/clib/ctrpath.cpp b/src/clib/ctrpath.cpp
index aff42f89f..3e0bb7522 100644
--- a/src/clib/ctrpath.cpp
+++ b/src/clib/ctrpath.cpp
@@ -8,6 +8,8 @@
 #include "cantera/kinetics/ReactionPath.h"
 #include "Cabinet.h"
 
+#include <fstream>
+
 using namespace Cantera;
 using namespace std;
 
diff --git a/src/clib/ctxml.cpp b/src/clib/ctxml.cpp
index 54e73e4de..6b24d0547 100644
--- a/src/clib/ctxml.cpp
+++ b/src/clib/ctxml.cpp
@@ -9,6 +9,7 @@
 #include "Cabinet.h"
 
 #include <string.h>
+#include <fstream>
 
 using namespace std;
 using namespace Cantera;
diff --git a/src/equil/MultiPhaseEquil.cpp b/src/equil/MultiPhaseEquil.cpp
index db9140d48..535388f10 100644
--- a/src/equil/MultiPhaseEquil.cpp
+++ b/src/equil/MultiPhaseEquil.cpp
@@ -11,6 +11,7 @@
 
 #include <math.h>
 #include <iostream>
+#include <cstdio>
 
 using namespace std;
 
diff --git a/src/equil/vcs_MultiPhaseEquil.cpp b/src/equil/vcs_MultiPhaseEquil.cpp
index 6b2b91214..0641aa249 100644
--- a/src/equil/vcs_MultiPhaseEquil.cpp
+++ b/src/equil/vcs_MultiPhaseEquil.cpp
@@ -33,6 +33,7 @@
 
 #include <string>
 #include <vector>
+#include <cstdio>
 
 using namespace Cantera;
 using namespace std;
diff --git a/src/equil/vcs_phaseStability.cpp b/src/equil/vcs_phaseStability.cpp
index aa0dd0d31..2abb3987e 100644
--- a/src/equil/vcs_phaseStability.cpp
+++ b/src/equil/vcs_phaseStability.cpp
@@ -13,6 +13,7 @@
 #include <cmath>
 #include <vector>
 #include <cstring>
+#include <algorithm>
 
 using namespace std;
 
diff --git a/src/equil/vcs_prob.cpp b/src/equil/vcs_prob.cpp
index 05c762421..e2205fcef 100644
--- a/src/equil/vcs_prob.cpp
+++ b/src/equil/vcs_prob.cpp
@@ -19,6 +19,8 @@
 
 #include <cstdlib>
 #include <string>
+#include <cstdio>
+
 using namespace std;
 
 namespace VCSnonideal
diff --git a/src/equil/vcs_solve.cpp b/src/equil/vcs_solve.cpp
index aae53379d..771831e44 100644
--- a/src/equil/vcs_solve.cpp
+++ b/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
diff --git a/src/fortran/fctxml.cpp b/src/fortran/fctxml.cpp
index b621930e4..6cdd598f6 100644
--- a/src/fortran/fctxml.cpp
+++ b/src/fortran/fctxml.cpp
@@ -9,6 +9,7 @@
 #include "cantera/base/ctml.h"
 
 #include <cstring>
+#include <fstream>
 
 using namespace ctml;
 using namespace std;
diff --git a/src/kinetics/ReactionStoichMgr.cpp b/src/kinetics/ReactionStoichMgr.cpp
index 97ff9d78e..be14037aa 100644
--- a/src/kinetics/ReactionStoichMgr.cpp
+++ b/src/kinetics/ReactionStoichMgr.cpp
@@ -10,6 +10,8 @@
 #include "cantera/base/ctexceptions.h"
 #include "ReactionData.h"
 
+#include <fstream>
+
 using namespace std;
 
 namespace Cantera
diff --git a/src/numerics/BandMatrix.cpp b/src/numerics/BandMatrix.cpp
index 43db2a058..bf41b1699 100644
--- a/src/numerics/BandMatrix.cpp
+++ b/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;
 
diff --git a/src/oneD/Domain1D.cpp b/src/oneD/Domain1D.cpp
index bb37e9688..ee6026f76 100644
--- a/src/oneD/Domain1D.cpp
+++ b/src/oneD/Domain1D.cpp
@@ -5,6 +5,8 @@
 
 #include "cantera/oneD/Domain1D.h"
 
+#include <cstdio>
+
 using namespace std;
 
 namespace Cantera
diff --git a/src/oneD/OneDim.cpp b/src/oneD/OneDim.cpp
index 06a9b9c0b..26a38fa0a 100644
--- a/src/oneD/OneDim.cpp
+++ b/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;
 
diff --git a/src/oneD/Sim1D.cpp b/src/oneD/Sim1D.cpp
index 1a71cb9fa..61904f31d 100644
--- a/src/oneD/Sim1D.cpp
+++ b/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;
 
diff --git a/src/oneD/StFlow.cpp b/src/oneD/StFlow.cpp
index c8ddc2e89..6a3a2e3a7 100644
--- a/src/oneD/StFlow.cpp
+++ b/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;
 
diff --git a/src/oneD/newton_utils.cpp b/src/oneD/newton_utils.cpp
index e065aefb2..a3ef61812 100644
--- a/src/oneD/newton_utils.cpp
+++ b/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
diff --git a/src/thermo/DebyeHuckel.cpp b/src/thermo/DebyeHuckel.cpp
index 837102742..894537f78 100644
--- a/src/thermo/DebyeHuckel.cpp
+++ b/src/thermo/DebyeHuckel.cpp
@@ -22,6 +22,7 @@
 
 #include <cstring>
 #include <cstdlib>
+#include <fstream>
 
 using namespace std;
 using namespace ctml;
diff --git a/src/thermo/HMWSoln.cpp b/src/thermo/HMWSoln.cpp
index 7e65fb7bb..f7b666ba1 100644
--- a/src/thermo/HMWSoln.cpp
+++ b/src/thermo/HMWSoln.cpp
@@ -26,6 +26,7 @@
 
 #include <cmath>
 #include <cstdlib>
+#include <cstdio>
 
 namespace Cantera
 {
diff --git a/src/thermo/HMWSoln_input.cpp b/src/thermo/HMWSoln_input.cpp
index 892500baf..27a38c87c 100644
--- a/src/thermo/HMWSoln_input.cpp
+++ b/src/thermo/HMWSoln_input.cpp
@@ -20,6 +20,8 @@
 
 #include <cstring>
 #include <cstdlib>
+#include <cstdio>
+#include <fstream>
 
 using namespace std;
 using namespace ctml;
diff --git a/src/thermo/IdealMolalSoln.cpp b/src/thermo/IdealMolalSoln.cpp
index d58306511..05a1cf51c 100644
--- a/src/thermo/IdealMolalSoln.cpp
+++ b/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;
 
diff --git a/src/thermo/IdealSolidSolnPhase.cpp b/src/thermo/IdealSolidSolnPhase.cpp
index 00a7dcbfb..f5c6e3fdb 100644
--- a/src/thermo/IdealSolidSolnPhase.cpp
+++ b/src/thermo/IdealSolidSolnPhase.cpp
@@ -14,6 +14,7 @@
 #include "cantera/base/stringUtils.h"
 
 #include <iostream>
+#include <fstream>
 
 using namespace std;
 
diff --git a/src/thermo/IonsFromNeutralVPSSTP.cpp b/src/thermo/IonsFromNeutralVPSSTP.cpp
index 4767d8fde..1601e9c4c 100644
--- a/src/thermo/IonsFromNeutralVPSSTP.cpp
+++ b/src/thermo/IonsFromNeutralVPSSTP.cpp
@@ -24,6 +24,7 @@
 
 #include <cmath>
 #include <iomanip>
+#include <fstream>
 
 using namespace std;
 
diff --git a/src/thermo/LatticePhase.cpp b/src/thermo/LatticePhase.cpp
index cef2cecaf..c77f1a200 100644
--- a/src/thermo/LatticePhase.cpp
+++ b/src/thermo/LatticePhase.cpp
@@ -18,6 +18,7 @@
 #include "cantera/base/stringUtils.h"
 
 #include <cmath>
+#include <fstream>
 
 namespace Cantera
 {
diff --git a/src/thermo/MargulesVPSSTP.cpp b/src/thermo/MargulesVPSSTP.cpp
index 770ec0c36..2613389d7 100644
--- a/src/thermo/MargulesVPSSTP.cpp
+++ b/src/thermo/MargulesVPSSTP.cpp
@@ -16,6 +16,7 @@
 #include "cantera/base/stringUtils.h"
 
 #include <iomanip>
+#include <fstream>
 
 using namespace std;
 
diff --git a/src/thermo/MixedSolventElectrolyte.cpp b/src/thermo/MixedSolventElectrolyte.cpp
index 547f2ac78..be4607836 100644
--- a/src/thermo/MixedSolventElectrolyte.cpp
+++ b/src/thermo/MixedSolventElectrolyte.cpp
@@ -17,6 +17,7 @@
 #include "cantera/base/stringUtils.h"
 
 #include <iomanip>
+#include <fstream>
 
 using namespace std;
 
diff --git a/src/thermo/MolalityVPSSTP.cpp b/src/thermo/MolalityVPSSTP.cpp
index a0cda144e..56c543dea 100644
--- a/src/thermo/MolalityVPSSTP.cpp
+++ b/src/thermo/MolalityVPSSTP.cpp
@@ -20,6 +20,8 @@
 #include "cantera/base/stringUtils.h"
 
 #include <iomanip>
+#include <cstdio>
+#include <fstream>
 
 using namespace std;
 
diff --git a/src/thermo/MolarityIonicVPSSTP.cpp b/src/thermo/MolarityIonicVPSSTP.cpp
index 7dc9c9707..51335e326 100644
--- a/src/thermo/MolarityIonicVPSSTP.cpp
+++ b/src/thermo/MolarityIonicVPSSTP.cpp
@@ -21,6 +21,7 @@
 #include "cantera/base/stringUtils.h"
 
 #include <cmath>
+#include <fstream>
 
 using namespace std;
 
diff --git a/src/thermo/PDSS_ConstVol.cpp b/src/thermo/PDSS_ConstVol.cpp
index 084445856..97abb3f88 100644
--- a/src/thermo/PDSS_ConstVol.cpp
+++ b/src/thermo/PDSS_ConstVol.cpp
@@ -16,6 +16,8 @@
 
 #include "cantera/thermo/VPStandardStateTP.h"
 
+#include <fstream>
+
 using namespace std;
 
 namespace Cantera
diff --git a/src/thermo/PDSS_HKFT.cpp b/src/thermo/PDSS_HKFT.cpp
index 01646c5c8..0166d9cd4 100644
--- a/src/thermo/PDSS_HKFT.cpp
+++ b/src/thermo/PDSS_HKFT.cpp
@@ -18,6 +18,7 @@
 #include "cantera/base/stringUtils.h"
 
 #include <cstdlib>
+#include <fstream>
 
 using namespace std;
 using namespace ctml;
diff --git a/src/thermo/PDSS_IdealGas.cpp b/src/thermo/PDSS_IdealGas.cpp
index 2e7badff0..562258f76 100644
--- a/src/thermo/PDSS_IdealGas.cpp
+++ b/src/thermo/PDSS_IdealGas.cpp
@@ -16,6 +16,8 @@
 
 #include "cantera/thermo/VPStandardStateTP.h"
 
+#include <fstream>
+
 using namespace std;
 
 namespace Cantera
diff --git a/src/thermo/PDSS_IonsFromNeutral.cpp b/src/thermo/PDSS_IonsFromNeutral.cpp
index 1668602dc..a74b578d5 100644
--- a/src/thermo/PDSS_IonsFromNeutral.cpp
+++ b/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
diff --git a/src/thermo/PDSS_SSVol.cpp b/src/thermo/PDSS_SSVol.cpp
index 28d78de56..7dc33ec14 100644
--- a/src/thermo/PDSS_SSVol.cpp
+++ b/src/thermo/PDSS_SSVol.cpp
@@ -16,6 +16,8 @@
 
 #include "cantera/thermo/VPStandardStateTP.h"
 
+#include <fstream>
+
 using namespace std;
 
 namespace Cantera
diff --git a/src/thermo/PDSS_Water.cpp b/src/thermo/PDSS_Water.cpp
index af76ea4ad..ac3067b57 100644
--- a/src/thermo/PDSS_Water.cpp
+++ b/src/thermo/PDSS_Water.cpp
@@ -20,6 +20,7 @@
 #include "cantera/base/stringUtils.h"
 
 #include <cmath>
+#include <fstream>
 
 namespace Cantera
 {
diff --git a/src/thermo/PhaseCombo_Interaction.cpp b/src/thermo/PhaseCombo_Interaction.cpp
index d6d947f3c..d91cbcaca 100644
--- a/src/thermo/PhaseCombo_Interaction.cpp
+++ b/src/thermo/PhaseCombo_Interaction.cpp
@@ -13,6 +13,7 @@
 #include "cantera/base/stringUtils.h"
 
 #include <iomanip>
+#include <fstream>
 
 using namespace std;
 
diff --git a/src/thermo/PseudoBinaryVPSSTP.cpp b/src/thermo/PseudoBinaryVPSSTP.cpp
index 4be705046..1075de39e 100644
--- a/src/thermo/PseudoBinaryVPSSTP.cpp
+++ b/src/thermo/PseudoBinaryVPSSTP.cpp
@@ -20,6 +20,7 @@
 #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 35b3f48a6..8c48e105d 100644
--- a/src/thermo/PureFluidPhase.cpp
+++ b/src/thermo/PureFluidPhase.cpp
@@ -15,6 +15,7 @@
 
 #include <cstdlib>
 #include <iomanip>
+#include <fstream>
 
 using std::string;
 using std::endl;
diff --git a/src/thermo/RedlichKisterVPSSTP.cpp b/src/thermo/RedlichKisterVPSSTP.cpp
index 2189bb925..1f049fd86 100644
--- a/src/thermo/RedlichKisterVPSSTP.cpp
+++ b/src/thermo/RedlichKisterVPSSTP.cpp
@@ -17,6 +17,7 @@
 #include "cantera/base/stringUtils.h"
 
 #include <iomanip>
+#include <fstream>
 
 using namespace std;
 
diff --git a/src/thermo/ThermoPhase.cpp b/src/thermo/ThermoPhase.cpp
index 3eb284185..1745c80c5 100644
--- a/src/thermo/ThermoPhase.cpp
+++ b/src/thermo/ThermoPhase.cpp
@@ -12,6 +12,7 @@
 #include "cantera/base/stringUtils.h"
 
 #include <iomanip>
+#include <fstream>
 
 using namespace std;
 using namespace ctml;
diff --git a/src/thermo/WaterSSTP.cpp b/src/thermo/WaterSSTP.cpp
index eaf7ebe2d..7abf6c89e 100644
--- a/src/thermo/WaterSSTP.cpp
+++ b/src/thermo/WaterSSTP.cpp
@@ -17,6 +17,7 @@
 #include "cantera/base/stringUtils.h"
 
 #include <cmath>
+#include <fstream>
 
 using namespace std;
 
diff --git a/src/transport/AqueousTransport.cpp b/src/transport/AqueousTransport.cpp
index 534d94f62..37b0de2b5 100644
--- a/src/transport/AqueousTransport.cpp
+++ b/src/transport/AqueousTransport.cpp
@@ -16,6 +16,8 @@
 #include "cantera/base/stringUtils.h"
 
 #include <iostream>
+#include <cstdio>
+
 using namespace std;
 
 /**
diff --git a/src/transport/LiquidTransport.cpp b/src/transport/LiquidTransport.cpp
index 14ca91e33..1ca2df89d 100644
--- a/src/transport/LiquidTransport.cpp
+++ b/src/transport/LiquidTransport.cpp
@@ -12,6 +12,8 @@
 #include "cantera/base/stringUtils.h"
 
 #include <iostream>
+#include <cstdio>
+
 using namespace std;
 
 /**
diff --git a/src/transport/MMCollisionInt.h b/src/transport/MMCollisionInt.h
index 3ed0f1628..f840d3244 100644
--- a/src/transport/MMCollisionInt.h
+++ b/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
 {
 
diff --git a/src/zeroD/ReactorNet.cpp b/src/zeroD/ReactorNet.cpp
index 126aef4c8..e12c463ae 100644
--- a/src/zeroD/ReactorNet.cpp
+++ b/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;