diff --git a/test_problems/ChemEquil_gri_pairs/gri_pairs.cpp b/test_problems/ChemEquil_gri_pairs/gri_pairs.cpp
index 896175718..d0fbb40bf 100644
--- a/test_problems/ChemEquil_gri_pairs/gri_pairs.cpp
+++ b/test_problems/ChemEquil_gri_pairs/gri_pairs.cpp
@@ -2,16 +2,9 @@
  *  Copyright 2002 California Institute of Technology
  */
 
-#ifdef SRCDIRTREE
-#include "cantera/base/ct_defs.h"
-#include "cantera/thermo/ThermoPhase.h"
-#include "cantera/IdealGasMix.h"
-#include "cantera/equil/equil.h"
-#else
 #include "cantera/Cantera.h"
 #include "cantera/IdealGasMix.h"
 #include "cantera/equilibrium.h"
-#endif
 
 using namespace std;
 using namespace Cantera;
diff --git a/test_problems/ChemEquil_ionizedGas/ionizedGasEquil.cpp b/test_problems/ChemEquil_ionizedGas/ionizedGasEquil.cpp
index 744e3f6d4..5b88a6aa0 100644
--- a/test_problems/ChemEquil_ionizedGas/ionizedGasEquil.cpp
+++ b/test_problems/ChemEquil_ionizedGas/ionizedGasEquil.cpp
@@ -1,14 +1,6 @@
-#ifdef SRCDIRTREE
-#include "cantera/base/ct_defs.h"
-#include "cantera/thermo/ThermoPhase.h"
-#include "cantera/IdealGasMix.h"
-#include "cantera/equil/equil.h"
-#else
 #include "cantera/Cantera.h"
 #include "cantera/IdealGasMix.h"
 #include "cantera/equilibrium.h"
-#endif
-
 
 using namespace std;
 using namespace Cantera;
diff --git a/test_problems/CpJump/CpJump.cpp b/test_problems/CpJump/CpJump.cpp
index b929f0f31..28a661dc4 100644
--- a/test_problems/CpJump/CpJump.cpp
+++ b/test_problems/CpJump/CpJump.cpp
@@ -2,16 +2,9 @@
  *  Copyright 2002 California Institute of Technology
  */
 
-#ifdef SRCDIRTREE
-#include "cantera/base/ct_defs.h"
-#include "cantera/thermo/ThermoPhase.h"
-#include "cantera/IdealGasMix.h"
-#include "cantera/equil/equil.h"
-#else
 #include "cantera/Cantera.h"
 #include "cantera/IdealGasMix.h"
 #include "cantera/equilibrium.h"
-#endif
 
 using namespace std;
 using namespace Cantera;
diff --git a/test_problems/cathermo/DH_graph_1/DH_graph_1.cpp b/test_problems/cathermo/DH_graph_1/DH_graph_1.cpp
index 36ba2f905..3f23bb783 100644
--- a/test_problems/cathermo/DH_graph_1/DH_graph_1.cpp
+++ b/test_problems/cathermo/DH_graph_1/DH_graph_1.cpp
@@ -2,15 +2,10 @@
  *
  *  @file DH_graph_1
  */
-#ifdef SRCDIRTREE
-#include "cantera/base/ct_defs.h"
-#include "cantera/base/logger.h"
-#include "cantera/thermo/DebyeHuckel.h"
-#else
 #include "cantera/Cantera.h"
 #include "cantera/base/logger.h"
 #include "cantera/thermo/DebyeHuckel.h"
-#endif
+
 #include <cstdio>
 
 using namespace std;
diff --git a/test_problems/cathermo/DH_graph_NM/DH_graph_1.cpp b/test_problems/cathermo/DH_graph_NM/DH_graph_1.cpp
index 9a84d4eb5..398fc5192 100644
--- a/test_problems/cathermo/DH_graph_NM/DH_graph_1.cpp
+++ b/test_problems/cathermo/DH_graph_NM/DH_graph_1.cpp
@@ -2,15 +2,9 @@
  *
  *  @file DH_graph_1
  */
-#ifdef SRCDIRTREE
-#include "cantera/base/ct_defs.h"
-#include "cantera/base/logger.h"
-#include "cantera/thermo/DebyeHuckel.h"
-#else
 #include "cantera/Cantera.h"
 #include "cantera/base/logger.h"
 #include "cantera/thermo/DebyeHuckel.h"
-#endif
 
 #include <cstdio>
 
diff --git a/test_problems/cathermo/DH_graph_Pitzer/DH_graph_1.cpp b/test_problems/cathermo/DH_graph_Pitzer/DH_graph_1.cpp
index 9a84d4eb5..398fc5192 100644
--- a/test_problems/cathermo/DH_graph_Pitzer/DH_graph_1.cpp
+++ b/test_problems/cathermo/DH_graph_Pitzer/DH_graph_1.cpp
@@ -2,15 +2,9 @@
  *
  *  @file DH_graph_1
  */
-#ifdef SRCDIRTREE
-#include "cantera/base/ct_defs.h"
-#include "cantera/base/logger.h"
-#include "cantera/thermo/DebyeHuckel.h"
-#else
 #include "cantera/Cantera.h"
 #include "cantera/base/logger.h"
 #include "cantera/thermo/DebyeHuckel.h"
-#endif
 
 #include <cstdio>
 
diff --git a/test_problems/cathermo/DH_graph_acommon/DH_graph_1.cpp b/test_problems/cathermo/DH_graph_acommon/DH_graph_1.cpp
index 9a84d4eb5..398fc5192 100644
--- a/test_problems/cathermo/DH_graph_acommon/DH_graph_1.cpp
+++ b/test_problems/cathermo/DH_graph_acommon/DH_graph_1.cpp
@@ -2,15 +2,9 @@
  *
  *  @file DH_graph_1
  */
-#ifdef SRCDIRTREE
-#include "cantera/base/ct_defs.h"
-#include "cantera/base/logger.h"
-#include "cantera/thermo/DebyeHuckel.h"
-#else
 #include "cantera/Cantera.h"
 #include "cantera/base/logger.h"
 #include "cantera/thermo/DebyeHuckel.h"
-#endif
 
 #include <cstdio>
 
diff --git a/test_problems/cathermo/DH_graph_bdotak/DH_graph_1.cpp b/test_problems/cathermo/DH_graph_bdotak/DH_graph_1.cpp
index 9a84d4eb5..398fc5192 100644
--- a/test_problems/cathermo/DH_graph_bdotak/DH_graph_1.cpp
+++ b/test_problems/cathermo/DH_graph_bdotak/DH_graph_1.cpp
@@ -2,15 +2,9 @@
  *
  *  @file DH_graph_1
  */
-#ifdef SRCDIRTREE
-#include "cantera/base/ct_defs.h"
-#include "cantera/base/logger.h"
-#include "cantera/thermo/DebyeHuckel.h"
-#else
 #include "cantera/Cantera.h"
 #include "cantera/base/logger.h"
 #include "cantera/thermo/DebyeHuckel.h"
-#endif
 
 #include <cstdio>
 
diff --git a/test_problems/cathermo/HMW_dupl_test/HMW_dupl_test.cpp b/test_problems/cathermo/HMW_dupl_test/HMW_dupl_test.cpp
index fc9cb67a6..dd031be16 100644
--- a/test_problems/cathermo/HMW_dupl_test/HMW_dupl_test.cpp
+++ b/test_problems/cathermo/HMW_dupl_test/HMW_dupl_test.cpp
@@ -2,20 +2,11 @@
  *
  *  @file HMW_graph_1.cpp
  */
-#ifdef SRCDIRTREE
-#include "cantera/base/ct_defs.h"
-#include "cantera/base/logger.h"
-#include "TemperatureTable.h"
-#include "cantera/thermo/ThermoPhase.h"
-#include "cantera/thermo/HMWSoln.h"
-#include "importCTML.h"
-#else
 #include "cantera/Cantera.h"
 #include "cantera/base/logger.h"
 #include "cantera/thermo.h"
 #include "TemperatureTable.h"
 #include "cantera/thermo/HMWSoln.h"
-#endif
 
 #include <cstdio>
 
diff --git a/test_problems/cathermo/HMW_graph_CpvT/HMW_graph_CpvT.cpp b/test_problems/cathermo/HMW_graph_CpvT/HMW_graph_CpvT.cpp
index 8d3dc078c..160bd71c3 100644
--- a/test_problems/cathermo/HMW_graph_CpvT/HMW_graph_CpvT.cpp
+++ b/test_problems/cathermo/HMW_graph_CpvT/HMW_graph_CpvT.cpp
@@ -2,20 +2,11 @@
  *
  *  @file HMW_graph_1.cpp
  */
-#ifdef SRCDIRTREE
-#include "cantera/base/ct_defs.h"
-#include "cantera/base/logger.h"
-#include "TemperatureTable.h"
-#include "cantera/thermo/ThermoPhase.h"
-#include "cantera/thermo/HMWSoln.h"
-#include "importCTML.h"
-#else
 #include "cantera/Cantera.h"
 #include "cantera/base/logger.h"
 #include "cantera/thermo.h"
 #include "TemperatureTable.h"
 #include "cantera/thermo/HMWSoln.h"
-#endif
 
 #include <cstdio>
 
diff --git a/test_problems/cathermo/HMW_graph_GvT/HMW_graph_GvT.cpp b/test_problems/cathermo/HMW_graph_GvT/HMW_graph_GvT.cpp
index afd0eba5d..27aea566e 100644
--- a/test_problems/cathermo/HMW_graph_GvT/HMW_graph_GvT.cpp
+++ b/test_problems/cathermo/HMW_graph_GvT/HMW_graph_GvT.cpp
@@ -2,19 +2,11 @@
  *
  *  @file HMW_graph_1.cpp
  */
-#ifdef SRCDIRTREE
-#include "cantera/base/ct_defs.h"
-#include "cantera/base/logger.h"
-#include "cantera/thermo/ThermoPhase.h"
-#include "cantera/thermo/HMWSoln.h"
-#include "importCTML.h"
-#else
 #include "cantera/Cantera.h"
 #include "cantera/thermo/ThermoPhase.h"
 #include "cantera/base/logger.h"
 #include "cantera/thermo.h"
 #include "cantera/thermo/HMWSoln.h"
-#endif
 
 #include "TemperatureTable.h"
 
diff --git a/test_problems/cathermo/HMW_graph_VvT/HMW_graph_VvT.cpp b/test_problems/cathermo/HMW_graph_VvT/HMW_graph_VvT.cpp
index cc43a7b92..cd75bad28 100644
--- a/test_problems/cathermo/HMW_graph_VvT/HMW_graph_VvT.cpp
+++ b/test_problems/cathermo/HMW_graph_VvT/HMW_graph_VvT.cpp
@@ -1,24 +1,13 @@
 /**
  *  @file HMW_graph_VvT
  */
-#ifdef SRCDIRTREE
-#include "cantera/base/ct_defs.h"
-#include "cantera/base/logger.h"
-#include "TemperatureTable.h"
-#include "cantera/thermo/HMWSoln.h"
-#include "importCTML.h"
-#else
-//#include "vcsc.h"
+
 #include "cantera/Cantera.h"
-//#include "vcs_Cantera_input.h"
-//#include "vcs_Cantera_convert.h"
 #include "cantera/base/logger.h"
 #include "cantera/thermo.h"
 #include "TemperatureTable.h"
 #include "cantera/thermo/HMWSoln.h"
 
-#endif
-
 #include <cstdio>
 
 using namespace std;
diff --git a/test_problems/cathermo/HMW_test_3/HMW_test_3.cpp b/test_problems/cathermo/HMW_test_3/HMW_test_3.cpp
index 6e1c144ec..797fe2acd 100644
--- a/test_problems/cathermo/HMW_test_3/HMW_test_3.cpp
+++ b/test_problems/cathermo/HMW_test_3/HMW_test_3.cpp
@@ -1,10 +1,5 @@
-#ifdef SRCDIRTREE
-#include "cantera/base/ct_defs.h"
-#include "cantera/thermo/HMWSoln.h"
-#else
 #include "cantera/Cantera.h"
 #include "cantera/thermo/HMWSoln.h"
-#endif
 
 #include <cstdio>
 
diff --git a/test_problems/cathermo/ims/IMSTester.cpp b/test_problems/cathermo/ims/IMSTester.cpp
index 61ef5f92d..f98daea2c 100644
--- a/test_problems/cathermo/ims/IMSTester.cpp
+++ b/test_problems/cathermo/ims/IMSTester.cpp
@@ -18,13 +18,8 @@
 #include <string>
 #include <vector>
 
-#ifdef SRCDIRTREE
-#include "cantera/base/ct_defs.h"
-#include "cantera/thermo/IdealMolalSoln.h"
-#else
 #include "cantera/Cantera.h"
 #include "cantera/thermo/IdealMolalSoln.h"
-#endif
 
 #include <cstdio>
 
diff --git a/test_problems/cathermo/issp/ISSPTester.cpp b/test_problems/cathermo/issp/ISSPTester.cpp
index 3a91eac90..7b79ae330 100644
--- a/test_problems/cathermo/issp/ISSPTester.cpp
+++ b/test_problems/cathermo/issp/ISSPTester.cpp
@@ -19,13 +19,8 @@
 #include <string>
 #include <vector>
 
-#ifdef SRCDIRTREE
-#include "cantera/base/ct_defs.h"
-#include "cantera/thermo/IdealSolidSolnPhase.h"
-#else
 #include "cantera/Cantera.h"
 #include "cantera/thermo/IdealSolidSolnPhase.h"
-#endif
 
 #include <cstdio>
 
diff --git a/test_problems/cathermo/stoichSubSSTP/stoichSubSSTP.cpp b/test_problems/cathermo/stoichSubSSTP/stoichSubSSTP.cpp
index 70dbfb97c..8575e6443 100644
--- a/test_problems/cathermo/stoichSubSSTP/stoichSubSSTP.cpp
+++ b/test_problems/cathermo/stoichSubSSTP/stoichSubSSTP.cpp
@@ -2,17 +2,9 @@
  *
  *  @file HMW_graph_1.cpp
  */
-#ifdef SRCDIRTREE
-#include "cantera/base/ct_defs.h"
-#include "cantera/base/logger.h"
-#include "cantera/thermo/ThermoPhase.h"
-#include "cantera/thermo/StoichSubstanceSSTP.h"
-#include "importCTML.h"
-#else
 #include "cantera/Cantera.h"
 #include "cantera/thermo.h"
 #include "cantera/thermo/StoichSubstanceSSTP.h"
-#endif
 
 #include "TemperatureTable.h"
 
diff --git a/test_problems/fracCoeff/fracCoeff.cpp b/test_problems/fracCoeff/fracCoeff.cpp
index 77499e2e5..1e18c18da 100644
--- a/test_problems/fracCoeff/fracCoeff.cpp
+++ b/test_problems/fracCoeff/fracCoeff.cpp
@@ -27,17 +27,8 @@ int iDebug_HKM = 0;
 /*****************************************************************/
 /*****************************************************************/
 
-#ifdef SRCDIRTREE
-#include "cantera/base/ct_defs.h"
-#include "cantera/base/ctml.h"
-#include "cantera/kinetics/GasKinetics.h"
-#include "importCTML.h"
-#include "cantera/thermo/ThermoPhase.h"
-#include "cantera/kinetics/InterfaceKinetics.h"
-#else
 #include "cantera/Cantera.h"
 #include "cantera/kinetics.h"
-#endif
 
 using namespace Cantera;
 
diff --git a/test_problems/min_python/negATest/negATest.cpp b/test_problems/min_python/negATest/negATest.cpp
index a1f5bde9d..60f63f0c2 100644
--- a/test_problems/min_python/negATest/negATest.cpp
+++ b/test_problems/min_python/negATest/negATest.cpp
@@ -1,20 +1,9 @@
-
-#ifdef SRCDIRTREE
-#include "cantera/base/ct_defs.h"
-#include "cantera/base/ctml.h"
-#include "cantera/kinetics/GasKinetics.h"
-#include "importCTML.h"
-#include "cantera/thermo/ThermoPhase.h"
-#include "cantera/kinetics/InterfaceKinetics.h"
-#else
 #include "cantera/Cantera.h"
 #include "cantera/kinetics.h"
-#endif
 
 using namespace Cantera;
 using namespace std;
 
-#
 int main(int argc, char** argv)
 {
 #ifdef _MSC_VER
diff --git a/test_problems/silane_equil/silane_equil.cpp b/test_problems/silane_equil/silane_equil.cpp
index eef095ba8..4f6d46b6b 100644
--- a/test_problems/silane_equil/silane_equil.cpp
+++ b/test_problems/silane_equil/silane_equil.cpp
@@ -2,16 +2,9 @@
  *  Copyright 2002 California Institute of Technology
  */
 
-#ifdef SRCDIRTREE
-#include "cantera/base/ct_defs.h"
-#include "cantera/thermo/ThermoPhase.h"
-#include "cantera/IdealGasMix.h"
-#include "cantera/equil/equil.h"
-#else
 #include "cantera/Cantera.h"
 #include "cantera/IdealGasMix.h"
 #include "cantera/equilibrium.h"
-#endif
 
 using namespace std;
 using namespace Cantera;