diff --git a/include/cantera/thermo/speciesThermoTypes.h b/include/cantera/thermo/speciesThermoTypes.h index 92d10006a..d38624525 100644 --- a/include/cantera/thermo/speciesThermoTypes.h +++ b/include/cantera/thermo/speciesThermoTypes.h @@ -9,6 +9,10 @@ #ifndef SPECIES_THERMO_TYPES_H #define SPECIES_THERMO_TYPES_H +#include "cantera/base/ct_defs.h" +#include "cantera/base/global.h" +#include "cantera/base/stringUtils.h" + //! Constant Cp #define CONSTANT_CP 1 @@ -68,11 +72,6 @@ //! A general object is called with the pressure set at the reference state. #define PDSS_TYPE 37 -#include "cantera/base/ct_defs.h" - -#include "cantera/base/stringUtils.h" -#include "cantera/base/global.h" - namespace Cantera { diff --git a/src/base/application.cpp b/src/base/application.cpp index 0be77c8fb..6259b0924 100644 --- a/src/base/application.cpp +++ b/src/base/application.cpp @@ -62,7 +62,6 @@ static boost::mutex xml_mutex; #endif #if defined(BOOST_HAS_WINTHREADS) -#include typedef unsigned int cthreadId_t ; class thread_equal {