From 5606f613ac83e7d50374778635dcc534930f05cd Mon Sep 17 00:00:00 2001
From: Harry Moffat <hkmoffa@sandia.gov>
Date: Fri, 4 Jan 2008 23:07:24 +0000
Subject: [PATCH] took out all references to cantera/kernel and kernel in
 include paths. It was getting too confusing and counterproductive

---
 Cantera/src/equil/vcs_MultiPhaseEquil.cpp | 14 --------------
 Cantera/src/equil/vcs_MultiPhaseEquil.h   |  5 -----
 Cantera/src/equil/vcs_VolPhase.cpp        |  5 -----
 Cantera/src/equil/vcs_internal.h          |  4 ----
 Cantera/src/equil/vcs_prob.cpp            |  7 +------
 5 files changed, 1 insertion(+), 34 deletions(-)

diff --git a/Cantera/src/equil/vcs_MultiPhaseEquil.cpp b/Cantera/src/equil/vcs_MultiPhaseEquil.cpp
index 966c0ffe5..cbd5a7c5f 100644
--- a/Cantera/src/equil/vcs_MultiPhaseEquil.cpp
+++ b/Cantera/src/equil/vcs_MultiPhaseEquil.cpp
@@ -16,18 +16,6 @@
 #include "vcs_nasa_poly.h"
 #include "vcs_solve.h"
 
-#ifdef CANTERA_APP
-#include "cantera/Cantera.h"
-#include "cantera/thermo.h"
-#include "cantera/kernel/speciesThermoTypes.h"
-#ifdef WITH_IDEAL_SOLUTIONS
-#include "cantera/kernel/IdealSolidSolnPhase.h"
-#endif
-#ifdef WITH_ELECTROLYTES
-#include "cantera/kernel/IdealMolalSoln.h"
-#endif
-#include "cantera/kernel/ChemEquil.h"
-#else
 #include "ct_defs.h"
 #include "mix_defs.h"
 #include "speciesThermoTypes.h"
@@ -38,8 +26,6 @@
 #include "IdealMolalSoln.h"
 #endif
 #include "ChemEquil.h"
-#endif
-
 
 #include <string>
 #include <vector>
diff --git a/Cantera/src/equil/vcs_MultiPhaseEquil.h b/Cantera/src/equil/vcs_MultiPhaseEquil.h
index 3063e4373..5e17528c0 100644
--- a/Cantera/src/equil/vcs_MultiPhaseEquil.h
+++ b/Cantera/src/equil/vcs_MultiPhaseEquil.h
@@ -13,13 +13,8 @@
 #ifndef VCS_MULTIPHASEEQUIL_H
 #define VCS_MULTIPHASEEQUIL_H
 
-#ifdef CANTERA_APP
-#include "cantera/kernel/ct_defs.h"
-#include "cantera/kernel/MultiPhase.h"
-#else
 #include "ct_defs.h"
 #include "MultiPhase.h"
-#endif
 /*
  * VCS_PROB is outside of Cantera namespace
  */
diff --git a/Cantera/src/equil/vcs_VolPhase.cpp b/Cantera/src/equil/vcs_VolPhase.cpp
index 16315d54e..48209db79 100644
--- a/Cantera/src/equil/vcs_VolPhase.cpp
+++ b/Cantera/src/equil/vcs_VolPhase.cpp
@@ -14,12 +14,7 @@
 #include "vcs_SpeciesProperties.h"
 #include "vcs_species_thermo.h"
 
-#ifdef CANTERA_APP
-#include "cantera/Cantera.h"
-#include "cantera/kernel/ThermoPhase.h"
-#else
 #include "ThermoPhase.h"
-#endif
 
 
 #include <cstdio>
diff --git a/Cantera/src/equil/vcs_internal.h b/Cantera/src/equil/vcs_internal.h
index 673cd6a7e..6d0d96193 100644
--- a/Cantera/src/equil/vcs_internal.h
+++ b/Cantera/src/equil/vcs_internal.h
@@ -15,11 +15,7 @@
 #include "vcs_DoubleStarStar.h"
 #include "vcs_Exception.h"
 
-#ifdef CANTERA_APP
-#include "cantera/kernel/global.h"
-#else
 #include "global.h"
-#endif
 
 namespace VCSnonideal {
 
diff --git a/Cantera/src/equil/vcs_prob.cpp b/Cantera/src/equil/vcs_prob.cpp
index 8eb072976..e1b159c46 100644
--- a/Cantera/src/equil/vcs_prob.cpp
+++ b/Cantera/src/equil/vcs_prob.cpp
@@ -19,14 +19,9 @@
 #include "vcs_species_thermo.h"
 #include "vcs_internal.h"
 
-#ifdef CANTERA_APP
-#include "cantera/Cantera.h"
-#include "cantera/kernel/ThermoPhase.h"
-#include "cantera/kernel/MolalityVPSSTP.h"
-#else
 #include "ThermoPhase.h" 
 #include "MolalityVPSSTP.h" 
-#endif
+
 #include <string>
 using namespace std;