diff --git a/ext/f2c_math/gmres.h b/ext/f2c_math/gmres.h
index 8bde197c2..1b5272184 100644
--- a/ext/f2c_math/gmres.h
+++ b/ext/f2c_math/gmres.h
@@ -29,8 +29,6 @@ gmres( int m, int N, const Matrix &A, const doublereal *b, doublereal *x, double
 
 // ============================================================================
 
-// #include "../../Cantera/src/blas.h"
-
 #include "cblas.h"
 #include "../../Cantera/src/ctlapack.h"
 
diff --git a/include/cantera/equil/equil.h b/include/cantera/equil/equil.h
index fc546ff09..2638575c7 100644
--- a/include/cantera/equil/equil.h
+++ b/include/cantera/equil/equil.h
@@ -11,7 +11,6 @@
 #ifndef CT_KERNEL_EQUIL_H
 #define CT_KERNEL_EQUIL_H
 
-//#include "ChemEquil.h"
 #include "MultiPhase.h"
 #include "vcs_defs.h"
 
diff --git a/include/cantera/oneD/StFlow.h b/include/cantera/oneD/StFlow.h
index c65957cca..f0a1e9bf5 100644
--- a/include/cantera/oneD/StFlow.h
+++ b/include/cantera/oneD/StFlow.h
@@ -13,8 +13,6 @@
 #include "cantera/thermo/IdealGasPhase.h"
 #include "cantera/kinetics/Kinetics.h"
 #include "cantera/numerics/funcs.h"
-//#include "../flowBoundaries.h"
-
 
 namespace Cantera
 {
diff --git a/include/cantera/radiation.h b/include/cantera/radiation.h
index 51bf4355a..3c4d20d13 100644
--- a/include/cantera/radiation.h
+++ b/include/cantera/radiation.h
@@ -3,6 +3,5 @@
 
 #include "spectra/rotor.h"
 #include "spectra/LineBroadener.h"
-//#include "kernel/AbsorptionLine.h"
 
 #endif
diff --git a/include/cantera/spectra.h b/include/cantera/spectra.h
index d32a2e60a..9be836294 100644
--- a/include/cantera/spectra.h
+++ b/include/cantera/spectra.h
@@ -3,6 +3,5 @@
 
 #include "spectra/LineBroadener.h"
 #include "spectra/rotor.h"
-//#include "kernel/AbsorptionLine.h"
 
 #endif
diff --git a/include/cantera/thermo/IdealGasPhase.h b/include/cantera/thermo/IdealGasPhase.h
index 4a2b7d160..4f91088ff 100644
--- a/include/cantera/thermo/IdealGasPhase.h
+++ b/include/cantera/thermo/IdealGasPhase.h
@@ -10,7 +10,6 @@
 #ifndef CT_IDEALGASPHASE_H
 #define CT_IDEALGASPHASE_H
 
-//#include "cantera/base/ct_defs.h"
 #include "mix_defs.h"
 #include "ThermoPhase.h"
 #include "SpeciesThermo.h"
diff --git a/include/cantera/thermo/MetalSHEelectrons.h b/include/cantera/thermo/MetalSHEelectrons.h
index 066768889..8e2525e3c 100644
--- a/include/cantera/thermo/MetalSHEelectrons.h
+++ b/include/cantera/thermo/MetalSHEelectrons.h
@@ -16,7 +16,6 @@
 
 #include "mix_defs.h"
 #include "SingleSpeciesTP.h"
-//#include "SpeciesThermo.h"
 
 namespace Cantera
 {
diff --git a/include/cantera/thermo/SemiconductorPhase.h b/include/cantera/thermo/SemiconductorPhase.h
index 43aeb4d2e..8f3925661 100644
--- a/include/cantera/thermo/SemiconductorPhase.h
+++ b/include/cantera/thermo/SemiconductorPhase.h
@@ -9,7 +9,6 @@
 
 #include "mix_defs.h"
 #include "ThermoPhase.h"
-//#include "SpeciesThermo.h"
 
 namespace Cantera
 {
diff --git a/include/cantera/transport/TransportFactory.h b/include/cantera/transport/TransportFactory.h
index 1283d8df7..f40c32410 100644
--- a/include/cantera/transport/TransportFactory.h
+++ b/include/cantera/transport/TransportFactory.h
@@ -9,8 +9,6 @@
 #define CT_TRANSPORTFACTORY_H
 
 // STL includes
-#include <vector>
-#include <string>
 #include <iostream>
 #include <new>
 
@@ -19,7 +17,6 @@
 #include "cantera/base/ct_thread.h"
 #include "TransportBase.h"
 #include "cantera/base/FactoryBase.h"
-//#include "LiquidTransportData.h"
 #include "LiquidTransportParams.h"
 
 //======================================================================================================================
diff --git a/include/cantera/zeroD/flowControllers.h b/include/cantera/zeroD/flowControllers.h
index de2f0da8f..a84a405d4 100644
--- a/include/cantera/zeroD/flowControllers.h
+++ b/include/cantera/zeroD/flowControllers.h
@@ -11,7 +11,6 @@
 
 #include "FlowDevice.h"
 #include "ReactorBase.h"
-//#include "PID_Controller.h"
 #include "cantera/numerics/Func1.h"
 
 namespace Cantera
diff --git a/src/equil/vcs_species_thermo.h b/src/equil/vcs_species_thermo.h
index 24f7364d5..f0b7cb3ef 100644
--- a/src/equil/vcs_species_thermo.h
+++ b/src/equil/vcs_species_thermo.h
@@ -8,7 +8,6 @@
 #ifndef VCS_SPECIES_THERMO_H
 #define VCS_SPECIES_THERMO_H
 
-//#include <vector>
 #include <cstdlib>
 
 namespace VCSnonideal
diff --git a/src/python/pycantera.cpp b/src/python/pycantera.cpp
index 1213bf15e..6fb1e22f8 100644
--- a/src/python/pycantera.cpp
+++ b/src/python/pycantera.cpp
@@ -62,7 +62,7 @@ pyct_appdelete(PyObject* self, PyObject* args)
 
 #include "methods.h"
 #include "pylogger.h"
-//#include "cantera/base/global.h"
+
 extern "C" {
 
     /* Initialization function for the module */
diff --git a/src/thermo/NasaThermo.h b/src/thermo/NasaThermo.h
index bbe07fbf9..7028c8443 100644
--- a/src/thermo/NasaThermo.h
+++ b/src/thermo/NasaThermo.h
@@ -14,7 +14,6 @@
 #include "cantera/thermo/SpeciesThermoMgr.h"
 #include "cantera/thermo/NasaPoly1.h"
 #include "cantera/thermo/speciesThermoTypes.h"
-//#include "cantera/numerics/polyfit.h"
 #include "cantera/base/global.h"
 
 namespace Cantera
diff --git a/src/tpx/subs.h b/src/tpx/subs.h
index 1f6f06713..7bb8c9080 100755
--- a/src/tpx/subs.h
+++ b/src/tpx/subs.h
@@ -10,7 +10,6 @@
 #include "Oxygen.h"
 #include "Water.h"
 #include "RedlichKwong.h"
-// #include "lk.h"
 
 #endif
 
diff --git a/test_problems/PecosTransport/PecosTransport.cpp b/test_problems/PecosTransport/PecosTransport.cpp
index 02f58e141..af9534106 100644
--- a/test_problems/PecosTransport/PecosTransport.cpp
+++ b/test_problems/PecosTransport/PecosTransport.cpp
@@ -36,11 +36,6 @@ using namespace std;
 #include "cantera/IdealGasMix.h"
 #include "cantera/transport/TransportFactory.h"
 
-//#include "transport.h"
-//#include "IdealGasMix.h"
-
-//#include "TransportFactory.h"
-
 using namespace Cantera;
 
 void printDbl(double val) {
diff --git a/test_problems/cxx_ex/rxnpath_example1.cpp b/test_problems/cxx_ex/rxnpath_example1.cpp
index 2cc0f4616..e9eb1b658 100644
--- a/test_problems/cxx_ex/rxnpath_example1.cpp
+++ b/test_problems/cxx_ex/rxnpath_example1.cpp
@@ -11,8 +11,6 @@
 #include "cantera/reactionpaths.h"
 #include "cantera/IdealGasMix.h"
 
-// #include <iostream>
-
 using namespace Cantera;
 using std::cout;
 using std::endl;
diff --git a/test_problems/statmech/statmech_test.cpp b/test_problems/statmech/statmech_test.cpp
index ca9a4ae8f..402a18937 100644
--- a/test_problems/statmech/statmech_test.cpp
+++ b/test_problems/statmech/statmech_test.cpp
@@ -17,7 +17,6 @@
 /*****************************************************************/
 /*****************************************************************/
 
-//#include "cantera/Cantera.h"
 #include "cantera/transport.h"
 #include "cantera/IdealGasMix.h"
 #include "cantera/equil/equil.h"
diff --git a/test_problems/statmech/statmech_test_Fe.cpp b/test_problems/statmech/statmech_test_Fe.cpp
index 3293c22b7..c44cd5a62 100644
--- a/test_problems/statmech/statmech_test_Fe.cpp
+++ b/test_problems/statmech/statmech_test_Fe.cpp
@@ -19,7 +19,6 @@ using namespace std;
 /*****************************************************************/
 /*****************************************************************/
 
-//#include "cantera/Cantera.h"
 #include "cantera/transport.h"
 #include "cantera/IdealGasMix.h"
 #include "cantera/equil/equil.h"
diff --git a/test_problems/statmech/statmech_test_poly.cpp b/test_problems/statmech/statmech_test_poly.cpp
index 7ce5af28d..ef33e1a7e 100644
--- a/test_problems/statmech/statmech_test_poly.cpp
+++ b/test_problems/statmech/statmech_test_poly.cpp
@@ -19,7 +19,6 @@ using namespace std;
 /*****************************************************************/
 /*****************************************************************/
 
-//#include "cantera/Cantera.h"
 #include "cantera/transport.h"
 #include "cantera/IdealGasMix.h"
 #include "cantera/equil/equil.h"
diff --git a/test_problems/statmech/statmech_transport.cpp b/test_problems/statmech/statmech_transport.cpp
index d20d9b6b6..a424c92f0 100644
--- a/test_problems/statmech/statmech_transport.cpp
+++ b/test_problems/statmech/statmech_transport.cpp
@@ -17,7 +17,6 @@
 /*****************************************************************/
 /*****************************************************************/
 
-//#include "cantera/Cantera.h"
 #include "cantera/transport.h"
 #include "cantera/IdealGasMix.h"
 #include "cantera/equil/equil.h"