diff --git a/Phreeqc.h b/Phreeqc.h
index 0b74e8a5..6fa0e30a 100644
--- a/Phreeqc.h
+++ b/Phreeqc.h
@@ -31,6 +31,7 @@
 #define extern
 #include "p2c.h"
 #undef extern 
+#include "global_structures.h"
 
 class Phreeqc
 {
@@ -39,57 +40,57 @@ public:
 	~Phreeqc(void);
 
 
-private:
-
-struct _generic_N_Vector;
-struct calculate_value;
-struct conc;
-struct CVodeMemRec;
-struct element;
-struct exchange;
-struct exch_comp;
-struct elt_list;
-struct gas_phase;
-struct gas_comp;
-struct inverse;
-struct inv_elts;
-struct inv_phases;
-struct inv_isotope;
-struct irrev;
-struct isotope;
-struct kinetics;
-struct kinetics_comp;
-struct LOC_exec;
-struct master;
-struct master_activity;
-struct master_isotope;
-struct mix;
-struct mix_comp;
-struct name_coef;
-struct pe_data;
-struct phase;
-struct PHRQMemHeader;
-struct pitz_param;
-struct pp_assemblage;
-struct pure_phase;
-struct reaction;
-struct reaction_temp;
-struct rxn_token;
-struct rxn_token_temp;
-struct solution;
-struct species;
-struct s_s;
-struct s_s_assemblage;
-struct s_s_comp;
-struct species_diff_layer;
-struct surface;
-struct surface_comp;
-struct surface_charge;
-struct surface_diff_layer;
-struct theta_param;
-struct tokenrec;
-struct varrec;
-struct unknown;
+//private:
+//
+//struct _generic_N_Vector;
+//struct calculate_value;
+//struct conc;
+//struct CVodeMemRec;
+//struct element;
+//struct exchange;
+//struct exch_comp;
+//struct elt_list;
+//struct gas_phase;
+//struct gas_comp;
+//struct inverse;
+//struct inv_elts;
+//struct inv_phases;
+//struct inv_isotope;
+//struct irrev;
+//struct isotope;
+//struct kinetics;
+//struct kinetics_comp;
+//struct LOC_exec;
+//struct master;
+//struct master_activity;
+//struct master_isotope;
+//struct mix;
+//struct mix_comp;
+//struct name_coef;
+//struct pe_data;
+//struct phase;
+//struct PHRQMemHeader;
+//struct pitz_param;
+//struct pp_assemblage;
+//struct pure_phase;
+//struct reaction;
+//struct reaction_temp;
+//struct rxn_token;
+//struct rxn_token_temp;
+//struct solution;
+//struct species;
+//struct s_s;
+//struct s_s_assemblage;
+//struct s_s_comp;
+//struct species_diff_layer;
+//struct surface;
+//struct surface_comp;
+//struct surface_charge;
+//struct surface_diff_layer;
+//struct theta_param;
+//struct tokenrec;
+//struct varrec;
+//struct unknown;
 
 #define PITZER_EXTERNAL 
 #include "pitzer.h"
diff --git a/SSassemblage.cxx b/SSassemblage.cxx
index cd4c7acc..de9b9b87 100644
--- a/SSassemblage.cxx
+++ b/SSassemblage.cxx
@@ -4,16 +4,21 @@
 #ifdef _DEBUG
 #pragma warning(disable : 4786)	// disable truncation warning (Only used by debugger)
 #endif
+#include <float.h>
+#include <cassert>				// assert
+#include <algorithm>			// std::sort
 
 #include "Utils.h"				// define first
 #include "SSassemblage.h"
 #include "SSassemblageSS.h"
-#define EXTERNAL extern
-#include "global.h"
+#include "cxxMix.h"
+#if defined(PHREEQC_CLASS)
+#define CLASS_STATIC static
+#endif
+#include "global_structures.h"
 #include "phqalloc.h"
 #include "phrqproto.h"
-#include <cassert>				// assert
-#include <algorithm>			// std::sort
+
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
diff --git a/SSassemblage.h b/SSassemblage.h
index 0db532b3..a90811b0 100644
--- a/SSassemblage.h
+++ b/SSassemblage.h
@@ -2,8 +2,6 @@
 #define SSASSEMBLAGE_H_INCLUDED
 
 #include "NumKeyword.h"
-#define EXTERNAL extern
-#include "global.h"
 #include <cassert>				// assert
 #include <map>					// std::map
 #include <string>				// std::string
@@ -11,7 +9,11 @@
 #include <vector>				// std::vector
 
 #include "SSassemblageSS.h"
+//#include "NameDouble.h"
+//class cxxSSassemblageSS;
+
 #include "cxxMix.h"
+//class cxxMix;
 
 class cxxSSassemblage:public cxxNumKeyword
 {
diff --git a/SSassemblageSS.h b/SSassemblageSS.h
index 81bba9ce..8c601e52 100644
--- a/SSassemblageSS.h
+++ b/SSassemblageSS.h
@@ -2,8 +2,6 @@
 #define SSASSEMBLAGESS_H_INCLUDED
 
 #include "NameDouble.h"
-#define EXTERNAL extern
-#include "global.h"
 #include <cassert>				// assert
 #include <map>					// std::map
 #include <string>				// std::string
diff --git a/StorageBin.h b/StorageBin.h
index 5803a832..ad63e815 100644
--- a/StorageBin.h
+++ b/StorageBin.h
@@ -8,10 +8,13 @@
 #include "GasPhase.h"
 #include "cxxKinetics.h"
 #include "PPassemblage.h"
-#include "SSassemblage.h"
+//#include "SSassemblage.h"
+class NameDouble;
+class cxxSSassemblageSS;
 #include "Surface.h"
 #include "System.h"
-#include "cxxMix.h"
+//#include "cxxMix.h"
+class cxxMix;
 #include "Reaction.h"
 #include "Temperature.h"