Index: /issm/trunk-jpl/src/c/analyses/AdjointCorePointerFromSolutionEnum.cpp
===================================================================
--- /issm/trunk-jpl/src/c/analyses/AdjointCorePointerFromSolutionEnum.cpp	(revision 15000)
+++ /issm/trunk-jpl/src/c/analyses/AdjointCorePointerFromSolutionEnum.cpp	(revision 15001)
@@ -11,6 +11,6 @@
 #include "./analyses.h"
 #include "../toolkits/toolkits.h"
-#include "../classes/objects/objects.h"
-#include "../shared/Enum/Enum.h"
+#include "../classes/classes.h"
+#include "../shared/shared.h"
 #include "../modules/modules.h"
 #include "../solutionsequences/solutionsequences.h"
Index: /issm/trunk-jpl/src/c/analyses/AnalysisConfiguration.cpp
===================================================================
--- /issm/trunk-jpl/src/c/analyses/AnalysisConfiguration.cpp	(revision 15000)
+++ /issm/trunk-jpl/src/c/analyses/AnalysisConfiguration.cpp	(revision 15001)
@@ -11,6 +11,6 @@
 #include "./analyses.h"
 #include "../toolkits/toolkits.h"
-#include "../classes/objects/objects.h"
-#include "../shared/Enum/Enum.h"
+#include "../classes/classes.h"
+#include "../shared/shared.h"
 #include "../modules/modules.h"
 #include "../solutionsequences/solutionsequences.h"
Index: /issm/trunk-jpl/src/c/analyses/CorePointerFromSolutionEnum.cpp
===================================================================
--- /issm/trunk-jpl/src/c/analyses/CorePointerFromSolutionEnum.cpp	(revision 15000)
+++ /issm/trunk-jpl/src/c/analyses/CorePointerFromSolutionEnum.cpp	(revision 15001)
@@ -11,6 +11,6 @@
 #include "./analyses.h"
 #include "../toolkits/toolkits.h"
-#include "../classes/objects/objects.h"
-#include "../shared/Enum/Enum.h"
+#include "../classes/classes.h"
+#include "../shared/shared.h"
 #include "../modules/modules.h"
 #include "../solutionsequences/solutionsequences.h"
Index: /issm/trunk-jpl/src/c/analyses/DakotaSpawnCore.cpp
===================================================================
--- /issm/trunk-jpl/src/c/analyses/DakotaSpawnCore.cpp	(revision 15000)
+++ /issm/trunk-jpl/src/c/analyses/DakotaSpawnCore.cpp	(revision 15001)
@@ -28,7 +28,6 @@
 
 #include "./analyses.h"
-#include "../classes/objects/objects.h"
-#include "../shared/io/io.h"
-#include "../shared/Enum/Enum.h"
+#include "../classes/classes.h"
+#include "../shared/shared.h"
 #include "../modules/modules.h"
 
Index: /issm/trunk-jpl/src/c/analyses/ResetBoundaryConditions.cpp
===================================================================
--- /issm/trunk-jpl/src/c/analyses/ResetBoundaryConditions.cpp	(revision 15000)
+++ /issm/trunk-jpl/src/c/analyses/ResetBoundaryConditions.cpp	(revision 15001)
@@ -3,5 +3,5 @@
  */ 
 
-#include "../classes/objects/objects.h"
+#include "../classes/classes.h"
 #include "../modules/modules.h"
 #include "../shared/io/io.h"
Index: /issm/trunk-jpl/src/c/analyses/WrapperCorePointerFromSolutionEnum.cpp
===================================================================
--- /issm/trunk-jpl/src/c/analyses/WrapperCorePointerFromSolutionEnum.cpp	(revision 15000)
+++ /issm/trunk-jpl/src/c/analyses/WrapperCorePointerFromSolutionEnum.cpp	(revision 15001)
@@ -10,6 +10,6 @@
 #include "./analyses.h"
 #include "../toolkits/toolkits.h"
-#include "../classes/objects/objects.h"
-#include "../shared/Enum/Enum.h"
+#include "../classes/classes.h"
+#include "../shared/shared.h"
 #include "../modules/modules.h"
 #include "../solutionsequences/solutionsequences.h"
Index: /issm/trunk-jpl/src/c/analyses/ad_core.cpp
===================================================================
--- /issm/trunk-jpl/src/c/analyses/ad_core.cpp	(revision 15000)
+++ /issm/trunk-jpl/src/c/analyses/ad_core.cpp	(revision 15001)
@@ -13,8 +13,6 @@
 #include "./analyses.h"
 #include "../toolkits/toolkits.h"
-#include "../classes/objects/objects.h"
+#include "../classes/classes.h"
 #include "../shared/shared.h"
-#include "../shared/io/io.h"
-#include "../shared/Enum/Enum.h"
 #include "../modules/modules.h"
 #include "../solutionsequences/solutionsequences.h"
Index: /issm/trunk-jpl/src/c/analyses/adjointbalancethickness_core.cpp
===================================================================
--- /issm/trunk-jpl/src/c/analyses/adjointbalancethickness_core.cpp	(revision 15000)
+++ /issm/trunk-jpl/src/c/analyses/adjointbalancethickness_core.cpp	(revision 15001)
@@ -5,7 +5,6 @@
 #include "./analyses.h"
 #include "../toolkits/toolkits.h"
-#include "../classes/objects/objects.h"
-#include "../shared/io/io.h"
-#include "../shared/Enum/Enum.h"
+#include "../classes/classes.h"
+#include "../shared/shared.h"
 #include "../modules/modules.h"
 #include "../solutionsequences/solutionsequences.h"
Index: /issm/trunk-jpl/src/c/analyses/adjointdiagnostic_core.cpp
===================================================================
--- /issm/trunk-jpl/src/c/analyses/adjointdiagnostic_core.cpp	(revision 15000)
+++ /issm/trunk-jpl/src/c/analyses/adjointdiagnostic_core.cpp	(revision 15001)
@@ -5,7 +5,6 @@
 #include "./analyses.h"
 #include "../toolkits/toolkits.h"
-#include "../classes/objects/objects.h"
-#include "../shared/io/io.h"
-#include "../shared/Enum/Enum.h"
+#include "../classes/classes.h"
+#include "../shared/shared.h"
 #include "../modules/modules.h"
 #include "../solutionsequences/solutionsequences.h"
Index: /issm/trunk-jpl/src/c/analyses/balancethickness_core.cpp
===================================================================
--- /issm/trunk-jpl/src/c/analyses/balancethickness_core.cpp	(revision 15000)
+++ /issm/trunk-jpl/src/c/analyses/balancethickness_core.cpp	(revision 15001)
@@ -5,7 +5,6 @@
 #include "./analyses.h"
 #include "../toolkits/toolkits.h"
-#include "../classes/objects/objects.h"
-#include "../shared/io/io.h"
-#include "../shared/Enum/Enum.h"
+#include "../classes/classes.h"
+#include "../shared/shared.h"
 #include "../modules/modules.h"
 #include "../solutionsequences/solutionsequences.h"
Index: /issm/trunk-jpl/src/c/analyses/bedslope_core.cpp
===================================================================
--- /issm/trunk-jpl/src/c/analyses/bedslope_core.cpp	(revision 15000)
+++ /issm/trunk-jpl/src/c/analyses/bedslope_core.cpp	(revision 15001)
@@ -5,7 +5,6 @@
 #include "./analyses.h"
 #include "../toolkits/toolkits.h"
-#include "../classes/objects/objects.h"
-#include "../shared/io/io.h"
-#include "../shared/Enum/Enum.h"
+#include "../classes/classes.h"
+#include "../shared/shared.h"
 #include "../modules/modules.h"
 #include "../solutionsequences/solutionsequences.h"
Index: /issm/trunk-jpl/src/c/analyses/control_core.cpp
===================================================================
--- /issm/trunk-jpl/src/c/analyses/control_core.cpp	(revision 15000)
+++ /issm/trunk-jpl/src/c/analyses/control_core.cpp	(revision 15001)
@@ -5,7 +5,6 @@
 #include "./analyses.h"
 #include "../toolkits/toolkits.h"
-#include "../classes/objects/objects.h"
-#include "../shared/io/io.h"
-#include "../shared/Enum/Enum.h"
+#include "../classes/classes.h"
+#include "../shared/shared.h"
 #include "../modules/modules.h"
 #include "../solutionsequences/solutionsequences.h"
Index: /issm/trunk-jpl/src/c/analyses/controlconvergence.cpp
===================================================================
--- /issm/trunk-jpl/src/c/analyses/controlconvergence.cpp	(revision 15000)
+++ /issm/trunk-jpl/src/c/analyses/controlconvergence.cpp	(revision 15001)
@@ -9,7 +9,6 @@
 
 #include "./analyses.h"
-#include "../classes/objects/objects.h"
-#include "../shared/io/io.h"
-#include "../shared/Enum/Enum.h"
+#include "../classes/classes.h"
+#include "../shared/shared.h"
 #include "../modules/modules.h"
 
Index: /issm/trunk-jpl/src/c/analyses/controlrestart.cpp
===================================================================
--- /issm/trunk-jpl/src/c/analyses/controlrestart.cpp	(revision 15000)
+++ /issm/trunk-jpl/src/c/analyses/controlrestart.cpp	(revision 15001)
@@ -5,5 +5,5 @@
 #include "./analyses.h"
 #include "../modules/modules.h"
-#include "../shared/Enum/Enum.h"
+#include "../shared/shared.h"
 
 void controlrestart(FemModel* femmodel,IssmDouble* J){
Index: /issm/trunk-jpl/src/c/analyses/controltao_core.cpp
===================================================================
--- /issm/trunk-jpl/src/c/analyses/controltao_core.cpp	(revision 15000)
+++ /issm/trunk-jpl/src/c/analyses/controltao_core.cpp	(revision 15001)
@@ -5,7 +5,6 @@
 #include "./analyses.h"
 #include "../toolkits/toolkits.h"
-#include "../classes/objects/objects.h"
-#include "../shared/io/io.h"
-#include "../shared/Enum/Enum.h"
+#include "../classes/classes.h"
+#include "../shared/shared.h"
 #include "../modules/modules.h"
 #include "../solutionsequences/solutionsequences.h"
Index: /issm/trunk-jpl/src/c/analyses/convergence.cpp
===================================================================
--- /issm/trunk-jpl/src/c/analyses/convergence.cpp	(revision 15000)
+++ /issm/trunk-jpl/src/c/analyses/convergence.cpp	(revision 15001)
@@ -3,8 +3,7 @@
  */ 
 
-#include "../classes/objects/objects.h"
+#include "../classes/classes.h"
 #include "../modules/modules.h"
-#include "../shared/io/io.h"
-#include "../shared/Enum/Enum.h"
+#include "../shared/shared.h"
 
 void convergence(bool* pconverged, Matrix<IssmDouble>* Kff,Vector<IssmDouble>* pf,Vector<IssmDouble>* uf,Vector<IssmDouble>* old_uf,Parameters* parameters){
Index: /issm/trunk-jpl/src/c/analyses/dakota_core.cpp
===================================================================
--- /issm/trunk-jpl/src/c/analyses/dakota_core.cpp	(revision 15000)
+++ /issm/trunk-jpl/src/c/analyses/dakota_core.cpp	(revision 15001)
@@ -35,8 +35,7 @@
 
 #include "./analyses.h"
-#include "../shared/io/io.h"
 #include "../toolkits/toolkits.h"
-#include "../shared/Enum/Enum.h"
-#include "../classes/classes.h"
+#include "../shared/shared.h"
+#include "../classes/object/objects.h"
 
 #ifdef _HAVE_DAKOTA_ //only works if dakota library has been compiled in.
Index: /issm/trunk-jpl/src/c/analyses/diagnostic_core.cpp
===================================================================
--- /issm/trunk-jpl/src/c/analyses/diagnostic_core.cpp	(revision 15000)
+++ /issm/trunk-jpl/src/c/analyses/diagnostic_core.cpp	(revision 15001)
@@ -5,7 +5,6 @@
 #include "./analyses.h"
 #include "../toolkits/toolkits.h"
-#include "../classes/objects/objects.h"
-#include "../shared/io/io.h"
-#include "../shared/Enum/Enum.h"
+#include "../classes/classes.h"
+#include "../shared/shared.h"
 #include "../modules/modules.h"
 #include "../solutionsequences/solutionsequences.h"
Index: /issm/trunk-jpl/src/c/analyses/enthalpy_core.cpp
===================================================================
--- /issm/trunk-jpl/src/c/analyses/enthalpy_core.cpp	(revision 15000)
+++ /issm/trunk-jpl/src/c/analyses/enthalpy_core.cpp	(revision 15001)
@@ -5,8 +5,7 @@
 #include "./analyses.h"
 #include "../toolkits/toolkits.h"
-#include "../classes/objects/objects.h"
-#include "../shared/Enum/Enum.h"
+#include "../classes/classes.h"
 #include "../modules/modules.h"
-#include "../shared/io/io.h"
+#include "../shared/shared.h"
 #include "../solutionsequences/solutionsequences.h"
 
Index: /issm/trunk-jpl/src/c/analyses/gia_core.cpp
===================================================================
--- /issm/trunk-jpl/src/c/analyses/gia_core.cpp	(revision 15000)
+++ /issm/trunk-jpl/src/c/analyses/gia_core.cpp	(revision 15001)
@@ -5,7 +5,6 @@
 #include "./analyses.h"
 #include "../toolkits/toolkits.h"
-#include "../classes/objects/objects.h"
-#include "../shared/io/io.h"
-#include "../shared/Enum/Enum.h"
+#include "../classes/classes.h"
+#include "../shared/shared.h"
 #include "../modules/modules.h"
 #include "../solutionsequences/solutionsequences.h"
Index: /issm/trunk-jpl/src/c/analyses/gradient_core.cpp
===================================================================
--- /issm/trunk-jpl/src/c/analyses/gradient_core.cpp	(revision 15000)
+++ /issm/trunk-jpl/src/c/analyses/gradient_core.cpp	(revision 15001)
@@ -5,7 +5,6 @@
 #include "./analyses.h"
 #include "../toolkits/toolkits.h"
-#include "../classes/objects/objects.h"
-#include "../shared/io/io.h"
-#include "../shared/Enum/Enum.h"
+#include "../classes/classes.h"
+#include "../shared/shared.h"
 #include "../modules/modules.h"
 #include "../solutionsequences/solutionsequences.h"
Index: /issm/trunk-jpl/src/c/analyses/hydrology_core.cpp
===================================================================
--- /issm/trunk-jpl/src/c/analyses/hydrology_core.cpp	(revision 15000)
+++ /issm/trunk-jpl/src/c/analyses/hydrology_core.cpp	(revision 15001)
@@ -5,7 +5,6 @@
 #include "./analyses.h"
 #include "../toolkits/toolkits.h"
-#include "../classes/objects/objects.h"
-#include "../shared/io/io.h"
-#include "../shared/Enum/Enum.h"
+#include "../classes/classes.h"
+#include "../shared/shared.h"
 #include "../modules/modules.h"
 #include "../solutionsequences/solutionsequences.h"
Index: /issm/trunk-jpl/src/c/analyses/objectivefunction.cpp
===================================================================
--- /issm/trunk-jpl/src/c/analyses/objectivefunction.cpp	(revision 15000)
+++ /issm/trunk-jpl/src/c/analyses/objectivefunction.cpp	(revision 15001)
@@ -11,6 +11,6 @@
 #include "./analyses.h"
 #include "../toolkits/toolkits.h"
-#include "../classes/objects/objects.h"
-#include "../shared/Enum/Enum.h"
+#include "../classes/classes.h"
+#include "../shared/shared.h"
 #include "../solutionsequences/solutionsequences.h"
 #include "../modules/modules.h"
Index: /issm/trunk-jpl/src/c/analyses/prognostic_core.cpp
===================================================================
--- /issm/trunk-jpl/src/c/analyses/prognostic_core.cpp	(revision 15000)
+++ /issm/trunk-jpl/src/c/analyses/prognostic_core.cpp	(revision 15001)
@@ -5,7 +5,6 @@
 #include "./analyses.h"
 #include "../toolkits/toolkits.h"
-#include "../classes/objects/objects.h"
-#include "../shared/io/io.h"
-#include "../shared/Enum/Enum.h"
+#include "../classes/classes.h"
+#include "../shared/shared.h"
 #include "../modules/modules.h"
 #include "../solutionsequences/solutionsequences.h"
Index: /issm/trunk-jpl/src/c/analyses/steadystate_core.cpp
===================================================================
--- /issm/trunk-jpl/src/c/analyses/steadystate_core.cpp	(revision 15000)
+++ /issm/trunk-jpl/src/c/analyses/steadystate_core.cpp	(revision 15001)
@@ -10,7 +10,6 @@
 #include "./analyses.h"
 #include "../toolkits/toolkits.h"
-#include "../classes/objects/objects.h"
-#include "../shared/io/io.h"
-#include "../shared/Enum/Enum.h"
+#include "../classes/classes.h"
+#include "../shared/shared.h"
 #include "../modules/modules.h"
 #include "../solutionsequences/solutionsequences.h"
Index: /issm/trunk-jpl/src/c/analyses/steadystateconvergence.cpp
===================================================================
--- /issm/trunk-jpl/src/c/analyses/steadystateconvergence.cpp	(revision 15000)
+++ /issm/trunk-jpl/src/c/analyses/steadystateconvergence.cpp	(revision 15001)
@@ -9,6 +9,6 @@
 #endif
 #include "./analyses.h"
-#include "../classes/objects/objects.h"
-#include "../shared/Enum/Enum.h"
+#include "../classes/classes.h"
+#include "../shared/shared.h"
 #include "../modules/modules.h"
 
Index: /issm/trunk-jpl/src/c/analyses/surfaceslope_core.cpp
===================================================================
--- /issm/trunk-jpl/src/c/analyses/surfaceslope_core.cpp	(revision 15000)
+++ /issm/trunk-jpl/src/c/analyses/surfaceslope_core.cpp	(revision 15001)
@@ -5,7 +5,6 @@
 #include "./analyses.h"
 #include "../toolkits/toolkits.h"
-#include "../classes/objects/objects.h"
-#include "../shared/io/io.h"
-#include "../shared/Enum/Enum.h"
+#include "../classes/classes.h"
+#include "../shared/shared.h"
 #include "../solutionsequences/solutionsequences.h"
 #include "../modules/modules.h"
Index: /issm/trunk-jpl/src/c/analyses/thermal_core.cpp
===================================================================
--- /issm/trunk-jpl/src/c/analyses/thermal_core.cpp	(revision 15000)
+++ /issm/trunk-jpl/src/c/analyses/thermal_core.cpp	(revision 15001)
@@ -5,7 +5,6 @@
 #include "./analyses.h"
 #include "../toolkits/toolkits.h"
-#include "../classes/objects/objects.h"
-#include "../shared/io/io.h"
-#include "../shared/Enum/Enum.h"
+#include "../classes/classes.h"
+#include "../shared/shared.h"
 #include "../modules/modules.h"
 #include "../solutionsequences/solutionsequences.h"
Index: /issm/trunk-jpl/src/c/analyses/transient_core.cpp
===================================================================
--- /issm/trunk-jpl/src/c/analyses/transient_core.cpp	(revision 15000)
+++ /issm/trunk-jpl/src/c/analyses/transient_core.cpp	(revision 15001)
@@ -12,7 +12,6 @@
 #include "./analyses.h"
 #include "../toolkits/toolkits.h"
-#include "../classes/objects/objects.h"
-#include "../shared/io/io.h"
-#include "../shared/Enum/Enum.h"
+#include "../classes/classes.h"
+#include "../shared/shared.h"
 #include "../modules/modules.h"
 #include "../solutionsequences/solutionsequences.h"