diff --git a/Cantera/src/equil/vcs_MultiPhaseEquil.cpp b/Cantera/src/equil/vcs_MultiPhaseEquil.cpp index 42761f874..966c0ffe5 100644 --- a/Cantera/src/equil/vcs_MultiPhaseEquil.cpp +++ b/Cantera/src/equil/vcs_MultiPhaseEquil.cpp @@ -16,16 +16,7 @@ #include "vcs_nasa_poly.h" #include "vcs_solve.h" -#ifdef CANTERA_SRC_TREE -#include "speciesThermoTypes.h" -#ifdef WITH_IDEAL_SOLUTIONS -#include "IdealSolidSolnPhase.h" -#endif -#ifdef WITH_ELECTROLYTES -#include "IdealMolalSoln.h" -#endif -#include "ChemEquil.h" -#else +#ifdef CANTERA_APP #include "cantera/Cantera.h" #include "cantera/thermo.h" #include "cantera/kernel/speciesThermoTypes.h" @@ -36,6 +27,17 @@ #include "cantera/kernel/IdealMolalSoln.h" #endif #include "cantera/kernel/ChemEquil.h" +#else +#include "ct_defs.h" +#include "mix_defs.h" +#include "speciesThermoTypes.h" +#ifdef WITH_IDEAL_SOLUTIONS +#include "IdealSolidSolnPhase.h" +#endif +#ifdef WITH_ELECTROLYTES +#include "IdealMolalSoln.h" +#endif +#include "ChemEquil.h" #endif diff --git a/Cantera/src/equil/vcs_VolPhase.cpp b/Cantera/src/equil/vcs_VolPhase.cpp index 0b70c005a..16315d54e 100644 --- a/Cantera/src/equil/vcs_VolPhase.cpp +++ b/Cantera/src/equil/vcs_VolPhase.cpp @@ -14,13 +14,14 @@ #include "vcs_SpeciesProperties.h" #include "vcs_species_thermo.h" -#ifdef CANTERA_SRC_TREE -#include "ThermoPhase.h" -#else +#ifdef CANTERA_APP #include "cantera/Cantera.h" #include "cantera/kernel/ThermoPhase.h" +#else +#include "ThermoPhase.h" #endif + #include #include