From c4beab316f594de6867ecb2a471abc77464f45f5 Mon Sep 17 00:00:00 2001
From: Ray Speth <speth@mit.edu>
Date: Thu, 10 Jul 2014 22:34:44 +0000
Subject: [PATCH] Remove unnecessary class forward declarations

---
 include/cantera/base/stringUtils.h              | 3 ---
 include/cantera/kinetics/InterfaceKinetics.h    | 2 --
 include/cantera/kinetics/importKinetics.h       | 4 ----
 include/cantera/kinetics/solveSP.h              | 2 --
 include/cantera/numerics/Func1.h                | 4 ----
 include/cantera/oneD/OneDim.h                   | 1 -
 include/cantera/oneD/StFlow.h                   | 2 --
 include/cantera/thermo/HMWSoln.h                | 1 -
 include/cantera/thermo/IdealSolnGasVPSS.h       | 3 ---
 include/cantera/thermo/MixtureFugacityTP.h      | 4 ----
 include/cantera/thermo/PDSS.h                   | 2 --
 include/cantera/thermo/PDSS_ConstVol.h          | 3 ---
 include/cantera/thermo/PDSS_HKFT.h              | 3 ---
 include/cantera/thermo/PDSS_IdealGas.h          | 3 ---
 include/cantera/thermo/PDSS_IonsFromNeutral.h   | 2 --
 include/cantera/thermo/PDSS_SSVol.h             | 3 ---
 include/cantera/thermo/PDSS_Water.h             | 3 ---
 include/cantera/thermo/Phase.h                  | 2 --
 include/cantera/thermo/RedlichKwongMFTP.h       | 3 ---
 include/cantera/thermo/ThermoPhase.h            | 2 --
 include/cantera/thermo/VPSSMgr.h                | 2 --
 include/cantera/thermo/VPSSMgr_ConstVol.h       | 4 ----
 include/cantera/thermo/VPSSMgr_General.h        | 6 ------
 include/cantera/thermo/VPSSMgr_IdealGas.h       | 6 ------
 include/cantera/thermo/VPSSMgr_Water_ConstVol.h | 5 -----
 include/cantera/thermo/VPSSMgr_Water_HKFT.h     | 5 -----
 include/cantera/thermo/VPStandardStateTP.h      | 4 ----
 include/cantera/transport/AqueousTransport.h    | 3 ---
 include/cantera/transport/LiquidTransport.h     | 4 ----
 include/cantera/transport/MixTransport.h        | 3 ---
 include/cantera/transport/MultiTransport.h      | 3 ---
 include/cantera/transport/PecosTransport.h      | 3 ---
 include/cantera/transport/SimpleTransport.h     | 4 ----
 include/cantera/transport/TransportBase.h       | 1 -
 include/cantera/transport/TransportFactory.h    | 3 ---
 include/cantera/transport/WaterTransport.h      | 1 -
 include/cantera/zeroD/Wall.h                    | 1 -
 src/thermo/VPSSMgr.cpp                          | 2 --
 src/thermo/VPSSMgrFactory.h                     | 4 ----
 39 files changed, 116 deletions(-)

diff --git a/include/cantera/base/stringUtils.h b/include/cantera/base/stringUtils.h
index e626b98bb..bcc86aa2b 100644
--- a/include/cantera/base/stringUtils.h
+++ b/include/cantera/base/stringUtils.h
@@ -14,9 +14,6 @@
 namespace Cantera
 {
 
-class Phase;
-class ThermoPhase;
-
 //! Convert a double into a c++ string
 /*!
  * @param x double to be converted
diff --git a/include/cantera/kinetics/InterfaceKinetics.h b/include/cantera/kinetics/InterfaceKinetics.h
index a92d2fcad..0433f1a71 100644
--- a/include/cantera/kinetics/InterfaceKinetics.h
+++ b/include/cantera/kinetics/InterfaceKinetics.h
@@ -19,8 +19,6 @@ namespace Cantera
 {
 
 // forward references
-class ReactionData;
-class ThermoPhase;
 class SurfPhase;
 class ImplicitSurfChem;
 
diff --git a/include/cantera/kinetics/importKinetics.h b/include/cantera/kinetics/importKinetics.h
index c70171e83..2b66bdf07 100644
--- a/include/cantera/kinetics/importKinetics.h
+++ b/include/cantera/kinetics/importKinetics.h
@@ -21,10 +21,6 @@
 namespace Cantera
 {
 
-class Kinetics;
-class SpeciesThermoFactory;
-class XML_Node;
-
 //! Rules for parsing and installing reactions
 struct ReactionRules {
     ReactionRules();
diff --git a/include/cantera/kinetics/solveSP.h b/include/cantera/kinetics/solveSP.h
index fe60649d5..805eabd9d 100644
--- a/include/cantera/kinetics/solveSP.h
+++ b/include/cantera/kinetics/solveSP.h
@@ -63,8 +63,6 @@ const int BULK_ETCH = 2;
 namespace Cantera
 {
 
-class InterfaceKinetics;
-
 //! Method to solve a pseudo steady state surface problem
 /*!
  *  The following class handles solving the surface problem. The calculation
diff --git a/include/cantera/numerics/Func1.h b/include/cantera/numerics/Func1.h
index cf5fb7af1..7b1c52be7 100644
--- a/include/cantera/numerics/Func1.h
+++ b/include/cantera/numerics/Func1.h
@@ -32,10 +32,6 @@ const int ExpFuncType = 104;
 const int PowFuncType = 106;
 const int ConstFuncType = 110;
 
-class Sin1;
-class Cos1;
-class Exp1;
-class Pow1;
 class TimesConstant1;
 
 /**
diff --git a/include/cantera/oneD/OneDim.h b/include/cantera/oneD/OneDim.h
index e9f8360d6..de45457d3 100644
--- a/include/cantera/oneD/OneDim.h
+++ b/include/cantera/oneD/OneDim.h
@@ -10,7 +10,6 @@
 namespace Cantera
 {
 
-class MultiJac;
 class MultiNewton;
 class Func1;
 
diff --git a/include/cantera/oneD/StFlow.h b/include/cantera/oneD/StFlow.h
index 354e8b63e..a4a09d0cc 100644
--- a/include/cantera/oneD/StFlow.h
+++ b/include/cantera/oneD/StFlow.h
@@ -15,8 +15,6 @@
 
 namespace Cantera
 {
-class MultiJac;
-
 //------------------------------------------
 //   constants
 //------------------------------------------
diff --git a/include/cantera/thermo/HMWSoln.h b/include/cantera/thermo/HMWSoln.h
index 7a7dfa80e..40213acee 100644
--- a/include/cantera/thermo/HMWSoln.h
+++ b/include/cantera/thermo/HMWSoln.h
@@ -79,7 +79,6 @@ namespace Cantera
 //@}
 
 class WaterProps;
-class PDSS_Water;
 
 /**
  * Class %HMWSoln represents a dilute or concentrated liquid electrolyte
diff --git a/include/cantera/thermo/IdealSolnGasVPSS.h b/include/cantera/thermo/IdealSolnGasVPSS.h
index 6857ec87e..9de9c995f 100644
--- a/include/cantera/thermo/IdealSolnGasVPSS.h
+++ b/include/cantera/thermo/IdealSolnGasVPSS.h
@@ -19,9 +19,6 @@
 
 namespace Cantera
 {
-class XML_Node;
-class PDSS;
-
 /*!
   * @name CONSTANTS
   * Models for the Standard State of an IdealSolnPhase
diff --git a/include/cantera/thermo/MixtureFugacityTP.h b/include/cantera/thermo/MixtureFugacityTP.h
index 0270f776b..cb9b8a134 100644
--- a/include/cantera/thermo/MixtureFugacityTP.h
+++ b/include/cantera/thermo/MixtureFugacityTP.h
@@ -19,10 +19,6 @@
 
 namespace Cantera
 {
-
-class XML_Node;
-class PDSS;
-
 //! Various states of the Fugacity object. In general there can be multiple liquid
 //! objects for a single phase identified with each species.
 
diff --git a/include/cantera/thermo/PDSS.h b/include/cantera/thermo/PDSS.h
index ab0d47062..135b01d69 100644
--- a/include/cantera/thermo/PDSS.h
+++ b/include/cantera/thermo/PDSS.h
@@ -14,8 +14,6 @@
 #include "cantera/base/ct_defs.h"
 #include "mix_defs.h"
 
-class WaterPropsIAPWS;
-
 namespace Cantera
 {
 /**
diff --git a/include/cantera/thermo/PDSS_ConstVol.h b/include/cantera/thermo/PDSS_ConstVol.h
index 2f4ee933e..d09fd12eb 100644
--- a/include/cantera/thermo/PDSS_ConstVol.h
+++ b/include/cantera/thermo/PDSS_ConstVol.h
@@ -16,9 +16,6 @@
 
 namespace Cantera
 {
-class XML_Node;
-class VPStandardStateTP;
-
 //! Class for pressure dependent standard states that use a constant volume model
 /*!
  * @ingroup pdssthermo
diff --git a/include/cantera/thermo/PDSS_HKFT.h b/include/cantera/thermo/PDSS_HKFT.h
index 3494c6ec6..909c1b5fc 100644
--- a/include/cantera/thermo/PDSS_HKFT.h
+++ b/include/cantera/thermo/PDSS_HKFT.h
@@ -14,13 +14,10 @@
 #ifndef CT_PDSS_HKFT_H
 #define CT_PDSS_HKFT_H
 
-class WaterPropsIAPWS;
 #include "PDSS.h"
 
 namespace Cantera
 {
-class XML_Node;
-class VPStandardState;
 class PDSS_Water;
 class WaterProps;
 
diff --git a/include/cantera/thermo/PDSS_IdealGas.h b/include/cantera/thermo/PDSS_IdealGas.h
index ddfdb762d..738d30c8a 100644
--- a/include/cantera/thermo/PDSS_IdealGas.h
+++ b/include/cantera/thermo/PDSS_IdealGas.h
@@ -16,9 +16,6 @@
 
 namespace Cantera
 {
-class XML_Node;
-class VPStandardStateTP;
-
 //! Derived class for pressure dependent standard states of an ideal gas species
 /*!
  * This class is for a single Ideal Gas species.
diff --git a/include/cantera/thermo/PDSS_IonsFromNeutral.h b/include/cantera/thermo/PDSS_IonsFromNeutral.h
index c137c5d39..9b4affe8a 100644
--- a/include/cantera/thermo/PDSS_IonsFromNeutral.h
+++ b/include/cantera/thermo/PDSS_IonsFromNeutral.h
@@ -17,8 +17,6 @@
 
 namespace Cantera
 {
-class XML_Node;
-class VPStandardStateTP;
 class ThermoPhase;
 
 //! Derived class for pressure dependent standard states of an ideal gas species
diff --git a/include/cantera/thermo/PDSS_SSVol.h b/include/cantera/thermo/PDSS_SSVol.h
index c91f0840c..da5eb5fb1 100644
--- a/include/cantera/thermo/PDSS_SSVol.h
+++ b/include/cantera/thermo/PDSS_SSVol.h
@@ -17,9 +17,6 @@
 
 namespace Cantera
 {
-class XML_Node;
-class VPStandardStateTP;
-
 //! Class for pressure dependent standard states that uses a standard state volume
 //! model of some sort.
 /*!
diff --git a/include/cantera/thermo/PDSS_Water.h b/include/cantera/thermo/PDSS_Water.h
index 6878fcf0c..70ada958b 100644
--- a/include/cantera/thermo/PDSS_Water.h
+++ b/include/cantera/thermo/PDSS_Water.h
@@ -20,9 +20,6 @@
 
 namespace Cantera
 {
-class WaterPropsIAPWS;
-class WaterProps;
-
 //!  Class for the liquid water pressure dependent
 //!  standard state
 /*!
diff --git a/include/cantera/thermo/Phase.h b/include/cantera/thermo/Phase.h
index 989094783..7ee1fc392 100644
--- a/include/cantera/thermo/Phase.h
+++ b/include/cantera/thermo/Phase.h
@@ -14,8 +14,6 @@
 
 namespace Cantera
 {
-class SpeciesThermo;
-
 /**
  * @defgroup phases Models of Phases of Matter
  *
diff --git a/include/cantera/thermo/RedlichKwongMFTP.h b/include/cantera/thermo/RedlichKwongMFTP.h
index f457fd421..037ee9138 100644
--- a/include/cantera/thermo/RedlichKwongMFTP.h
+++ b/include/cantera/thermo/RedlichKwongMFTP.h
@@ -19,9 +19,6 @@
 
 namespace Cantera
 {
-
-class XML_Node;
-
 /**
  * @ingroup thermoprops
  *
diff --git a/include/cantera/thermo/ThermoPhase.h b/include/cantera/thermo/ThermoPhase.h
index c64a957b6..42182147f 100644
--- a/include/cantera/thermo/ThermoPhase.h
+++ b/include/cantera/thermo/ThermoPhase.h
@@ -38,8 +38,6 @@ const int cSS_CONVENTION_VPSS = 1;
 const int cSS_CONVENTION_SLAVE = 2;
 //@}
 
-class XML_Node;
-
 //!   Base class for a phase with thermodynamic properties.
 /*!
  * Class ThermoPhase is the base class for the family of classes
diff --git a/include/cantera/thermo/VPSSMgr.h b/include/cantera/thermo/VPSSMgr.h
index ffb4cb398..6536e778f 100644
--- a/include/cantera/thermo/VPSSMgr.h
+++ b/include/cantera/thermo/VPSSMgr.h
@@ -22,9 +22,7 @@
 namespace Cantera
 {
 
-class SpeciesThermoInterpType;
 class VPStandardStateTP;
-class XML_Node;
 class SpeciesThermo;
 class PDSS;
 /**
diff --git a/include/cantera/thermo/VPSSMgr_ConstVol.h b/include/cantera/thermo/VPSSMgr_ConstVol.h
index 45c0d67fa..ac39cf142 100644
--- a/include/cantera/thermo/VPSSMgr_ConstVol.h
+++ b/include/cantera/thermo/VPSSMgr_ConstVol.h
@@ -19,10 +19,6 @@
 
 namespace Cantera
 {
-
-class SpeciesThermoInterpType;
-class PDSS;
-
 //! Constant Molar Volume e VPSS species thermo manager class
 /*!
  *  The calculation of multiple-species thermodynamic
diff --git a/include/cantera/thermo/VPSSMgr_General.h b/include/cantera/thermo/VPSSMgr_General.h
index 43af85a55..c72f80a39 100644
--- a/include/cantera/thermo/VPSSMgr_General.h
+++ b/include/cantera/thermo/VPSSMgr_General.h
@@ -20,12 +20,6 @@
 
 namespace Cantera
 {
-
-class SpeciesThermoInterpType;
-class VPStandardStateTP;
-class SpeciesThermo;
-class PDSS;
-
 //!  Class that handles the calculation of standard state thermo properties for
 //!  a set of species belonging to a single phase in a completely general
 //!  but slow way.
diff --git a/include/cantera/thermo/VPSSMgr_IdealGas.h b/include/cantera/thermo/VPSSMgr_IdealGas.h
index 4a42d8478..a2363ea15 100644
--- a/include/cantera/thermo/VPSSMgr_IdealGas.h
+++ b/include/cantera/thermo/VPSSMgr_IdealGas.h
@@ -21,12 +21,6 @@
 
 namespace Cantera
 {
-
-class SpeciesThermoInterpType;
-class VPStandardStateTP;
-class SpeciesThermo;
-
-
 //! A VPSSMgr where all species in the phase obey an ideal gas equation of state
 class VPSSMgr_IdealGas : public VPSSMgr
 {
diff --git a/include/cantera/thermo/VPSSMgr_Water_ConstVol.h b/include/cantera/thermo/VPSSMgr_Water_ConstVol.h
index 4c48a009a..cdfbfaac4 100644
--- a/include/cantera/thermo/VPSSMgr_Water_ConstVol.h
+++ b/include/cantera/thermo/VPSSMgr_Water_ConstVol.h
@@ -20,11 +20,6 @@
 
 namespace Cantera
 {
-
-class SpeciesThermoInterpType;
-class VPStandardStateTP;
-class SpeciesThermo;
-class PDSS;
 class PDSS_Water;
 
 //! Handles the calculation of standard state thermo properties for real water
diff --git a/include/cantera/thermo/VPSSMgr_Water_HKFT.h b/include/cantera/thermo/VPSSMgr_Water_HKFT.h
index 9d03b9f19..3c7551bc7 100644
--- a/include/cantera/thermo/VPSSMgr_Water_HKFT.h
+++ b/include/cantera/thermo/VPSSMgr_Water_HKFT.h
@@ -19,11 +19,6 @@
 
 namespace Cantera
 {
-
-class SpeciesThermoInterpType;
-class VPStandardStateTP;
-class SpeciesThermo;
-class PDSS;
 class PDSS_Water;
 
 //! Manages standard state thermo properties for real water and a set of
diff --git a/include/cantera/thermo/VPStandardStateTP.h b/include/cantera/thermo/VPStandardStateTP.h
index eb4c97c80..cab1a80f6 100644
--- a/include/cantera/thermo/VPStandardStateTP.h
+++ b/include/cantera/thermo/VPStandardStateTP.h
@@ -21,10 +21,6 @@
 
 namespace Cantera
 {
-
-class XML_Node;
-class PDSS;
-
 /**
  * @ingroup thermoprops
  *
diff --git a/include/cantera/transport/AqueousTransport.h b/include/cantera/transport/AqueousTransport.h
index 3d0a8e1fa..8441ccfb4 100644
--- a/include/cantera/transport/AqueousTransport.h
+++ b/include/cantera/transport/AqueousTransport.h
@@ -15,9 +15,6 @@
 
 namespace Cantera
 {
-
-class LiquidTransportParams;
-
 //! Class AqueousTransport implements mixture-averaged transport
 //! properties for brine phases.
 /*!
diff --git a/include/cantera/transport/LiquidTransport.h b/include/cantera/transport/LiquidTransport.h
index bfbc87837..2343d19bb 100644
--- a/include/cantera/transport/LiquidTransport.h
+++ b/include/cantera/transport/LiquidTransport.h
@@ -12,10 +12,6 @@
 
 namespace Cantera
 {
-
-// Forward references
-class LiquidTransportParams;
-
 //! Class LiquidTransport implements models for transport
 //! properties for liquid phases.
 /*!
diff --git a/include/cantera/transport/MixTransport.h b/include/cantera/transport/MixTransport.h
index 24f59a9fb..633241459 100644
--- a/include/cantera/transport/MixTransport.h
+++ b/include/cantera/transport/MixTransport.h
@@ -15,9 +15,6 @@
 
 namespace Cantera
 {
-
-class GasTransportParams;
-
 //! Class MixTransport implements mixture-averaged transport properties for ideal gas mixtures.
 /*!
  * The model is based on that described by Kee, Coltrin, and Glarborg,
diff --git a/include/cantera/transport/MultiTransport.h b/include/cantera/transport/MultiTransport.h
index 75592bfb8..0ad9f770a 100644
--- a/include/cantera/transport/MultiTransport.h
+++ b/include/cantera/transport/MultiTransport.h
@@ -14,9 +14,6 @@
 
 namespace Cantera
 {
-
-class GasTransportParams;
-
 //! Class MultiTransport implements multicomponent transport properties for
 //! ideal gas mixtures.
 /*!
diff --git a/include/cantera/transport/PecosTransport.h b/include/cantera/transport/PecosTransport.h
index f00264155..e8d80592c 100644
--- a/include/cantera/transport/PecosTransport.h
+++ b/include/cantera/transport/PecosTransport.h
@@ -13,9 +13,6 @@
 
 namespace Cantera
 {
-
-class GasTransportParams;
-
 /**
  * Class PecosTransport implements mixture-averaged transport
  * properties for ideal gas mixtures.
diff --git a/include/cantera/transport/SimpleTransport.h b/include/cantera/transport/SimpleTransport.h
index 5a26c7c43..fb19692be 100644
--- a/include/cantera/transport/SimpleTransport.h
+++ b/include/cantera/transport/SimpleTransport.h
@@ -14,10 +14,6 @@
 
 namespace Cantera
 {
-
-class LiquidTransportParams;
-
-
 //! Class SimpleTransport implements mixture-averaged transport
 //! properties for liquid phases.
 /*!
diff --git a/include/cantera/transport/TransportBase.h b/include/cantera/transport/TransportBase.h
index 0c1c5e675..b51623798 100644
--- a/include/cantera/transport/TransportBase.h
+++ b/include/cantera/transport/TransportBase.h
@@ -27,7 +27,6 @@
 namespace Cantera
 {
 
-class TransportParams;
 class GasTransportParams;
 class LiquidTransportParams;
 class SolidTransportData;
diff --git a/include/cantera/transport/TransportFactory.h b/include/cantera/transport/TransportFactory.h
index f4541e7b1..c7d8f085f 100644
--- a/include/cantera/transport/TransportFactory.h
+++ b/include/cantera/transport/TransportFactory.h
@@ -21,9 +21,6 @@ namespace Cantera
 
 // forward references
 class MMCollisionInt;
-class GasTransportParams;
-class LiquidTransportParams;
-class XML_Node;
 
 //! Factory class for creating new instances of classes derived from Transport.
 /*!
diff --git a/include/cantera/transport/WaterTransport.h b/include/cantera/transport/WaterTransport.h
index 7504e0a10..896498425 100644
--- a/include/cantera/transport/WaterTransport.h
+++ b/include/cantera/transport/WaterTransport.h
@@ -22,7 +22,6 @@ const int LDIFF_MULTICOMP_STEFANMAXWELL  = 2;
 //! @}
 
 
-class TransportParams;
 class WaterProps;
 class PDSS_Water;
 
diff --git a/include/cantera/zeroD/Wall.h b/include/cantera/zeroD/Wall.h
index c5efe98ef..a5a9e48fd 100644
--- a/include/cantera/zeroD/Wall.h
+++ b/include/cantera/zeroD/Wall.h
@@ -17,7 +17,6 @@ namespace Cantera
 // forward references
 class ReactorBase;
 class Kinetics;
-class Func1;
 class SurfPhase;
 
 //! Represents a wall between between two ReactorBase objects.
diff --git a/src/thermo/VPSSMgr.cpp b/src/thermo/VPSSMgr.cpp
index 334c8a51f..2f0124890 100644
--- a/src/thermo/VPSSMgr.cpp
+++ b/src/thermo/VPSSMgr.cpp
@@ -22,8 +22,6 @@ using namespace std;
 
 namespace Cantera
 {
-class SpeciesThermo;
-
 VPSSMgr::VPSSMgr(VPStandardStateTP* vptp_ptr, SpeciesThermo* spthermo) :
     m_kk(0),
     m_vptp_ptr(vptp_ptr),
diff --git a/src/thermo/VPSSMgrFactory.h b/src/thermo/VPSSMgrFactory.h
index 45d65fbd4..80ae3414a 100644
--- a/src/thermo/VPSSMgrFactory.h
+++ b/src/thermo/VPSSMgrFactory.h
@@ -21,10 +21,6 @@
 
 namespace Cantera
 {
-
-class XML_Node;
-class VPStandardStateTP;
-
 //! Throw a named error for an unknown or missing vpss species thermo model.
 /*!
  * @ingroup mgrpdssthermocalc