Index: /issm/trunk-jpl/src/c/toolkits/issm/IssmAbsMat.h
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/issm/IssmAbsMat.h	(revision 15051)
+++ /issm/trunk-jpl/src/c/toolkits/issm/IssmAbsMat.h	(revision 15052)
@@ -19,8 +19,5 @@
 #endif
 
-#include "../../shared/Numerics/types.h"
-#include "../../shared/Exceptions/exceptions.h"
-#include "../../shared/MemOps/MemOps.h"
-#include "./IssmAbsVec.h"
+#include "../toolkitsenums.h"
 
 /*}}}*/
Index: /issm/trunk-jpl/src/c/toolkits/issm/IssmAbsVec.h
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/issm/IssmAbsVec.h	(revision 15051)
+++ /issm/trunk-jpl/src/c/toolkits/issm/IssmAbsVec.h	(revision 15052)
@@ -19,7 +19,5 @@
 #endif
 
-#include "../../shared/Exceptions/exceptions.h"
-#include "../../shared/MemOps/MemOps.h"
-#include <math.h>
+#include "../toolkitsenums.h"
 
 /*}}}*/
Index: /issm/trunk-jpl/src/c/toolkits/issm/IssmMat.h
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/issm/IssmMat.h	(revision 15051)
+++ /issm/trunk-jpl/src/c/toolkits/issm/IssmMat.h	(revision 15052)
@@ -14,8 +14,5 @@
 #endif
 
-#include "../../shared/Exceptions/exceptions.h"
-#include "../../shared/MemOps/MemOps.h"
-#include "../../shared/io/Comm/Comm.h"
-#include "../../shared/Enum/Enum.h"
+#include "../../shared/shared.h"
 #include "../ToolkitOptions.h"
 #include "./IssmToolkitUtils.h"
Index: /issm/trunk-jpl/src/c/toolkits/issm/IssmMpiDenseMat.h
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/issm/IssmMpiDenseMat.h	(revision 15051)
+++ /issm/trunk-jpl/src/c/toolkits/issm/IssmMpiDenseMat.h	(revision 15052)
@@ -18,7 +18,5 @@
 #endif
 
-#include "../../shared/Exceptions/exceptions.h"
-#include "../../shared/MemOps/MemOps.h"
-#include "../../shared/io/Comm/Comm.h"
+#include "../../shared/shared.h"
 #include "../../classes/DataSet.h"
 #include "../../classes/Bucket.h"
Index: /issm/trunk-jpl/src/c/toolkits/issm/IssmSolver.cpp
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/issm/IssmSolver.cpp	(revision 15051)
+++ /issm/trunk-jpl/src/c/toolkits/issm/IssmSolver.cpp	(revision 15052)
@@ -11,6 +11,5 @@
 
 #include "../../shared/shared.h"
-#include "../../classes/classes.h"
-#include "../../shared/io/io.h"
+#include "./issmtoolkit.h"
 
 void IssmSolve(IssmVec<IssmDouble>** pout,IssmMat<IssmDouble>* Kff, IssmVec<IssmDouble>* pf, Parameters* parameters){/*{{{*/
Index: /issm/trunk-jpl/src/c/toolkits/issm/IssmSolver.h
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/issm/IssmSolver.h	(revision 15051)
+++ /issm/trunk-jpl/src/c/toolkits/issm/IssmSolver.h	(revision 15052)
@@ -1,4 +1,4 @@
 /*!\file:  IssmSolver.h
- * \brief main hook up from Solver toolkit object (in src/c/classes/toolkits) to the ISSM toolkit
+ * \brief main hook up from Solver toolkit object to the ISSM toolkit
  */