Index: /issm/trunk-jpl/src/c/Makefile.am
===================================================================
--- /issm/trunk-jpl/src/c/Makefile.am	(revision 14906)
+++ /issm/trunk-jpl/src/c/Makefile.am	(revision 14907)
@@ -363,4 +363,5 @@
 					  ./modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp\
 					  ./solutions/dakota_core.cpp\
+					  ./solutions/DakotaSpawnCore.h\
 					  ./solutions/DakotaSpawnCore.cpp
 #}}}
Index: /issm/trunk-jpl/src/c/classes/dakota/DakotaPlugin.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/dakota/DakotaPlugin.cpp	(revision 14906)
+++ /issm/trunk-jpl/src/c/classes/dakota/DakotaPlugin.cpp	(revision 14907)
@@ -21,12 +21,12 @@
 #endif
 
-/*Standard ISSM includes: */
-#include "../../shared/shared.h"
-#include "../../include/include.h"
-#include "../../solutions/solutions.h"
-#include "../classes.h"
-
 /*Standard includes: */
 #include <string>
+
+/*ISSM includes: */
+#include "../../include/types.h"
+#include "../../shared/MemOps/MemOps.h"
+#include "../../solutions/DakotaSpawnCore.h"
+
 
 #ifdef _HAVE_DAKOTA_ //only works if dakota library has been compiled in.
Index: /issm/trunk-jpl/src/c/classes/dakota/DakotaPlugin.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/dakota/DakotaPlugin.h	(revision 14906)
+++ /issm/trunk-jpl/src/c/classes/dakota/DakotaPlugin.h	(revision 14907)
@@ -9,6 +9,4 @@
 /*Headers:*/
 #include <DirectApplicInterface.H>
-#include "../../toolkits/toolkits.h"
-#include "../../classes/classes.h"
 
 namespace SIM {
Index: /issm/trunk-jpl/src/c/solutions/DakotaSpawnCore.h
===================================================================
--- /issm/trunk-jpl/src/c/solutions/DakotaSpawnCore.h	(revision 14907)
+++ /issm/trunk-jpl/src/c/solutions/DakotaSpawnCore.h	(revision 14907)
@@ -0,0 +1,4 @@
+#ifndef _DAKOTA_SPAWN_CORE_
+#define _DAKOTA_SPAWN_CORE_
+int  DakotaSpawnCore(double* responses, int numresponses, double* variables, char** variables_descriptors,int numvariables, void* femmodel,int counter);
+#endif
Index: /issm/trunk-jpl/src/c/solutions/dakota_core.cpp
===================================================================
--- /issm/trunk-jpl/src/c/solutions/dakota_core.cpp	(revision 14906)
+++ /issm/trunk-jpl/src/c/solutions/dakota_core.cpp	(revision 14907)
@@ -48,4 +48,5 @@
 #include <DakotaModel.H>
 #include <DakotaInterface.H>
+#include "./DakotaSpawnCore.h"
 #endif
 /*}}}*/
Index: /issm/trunk-jpl/src/c/solutions/solutions.h
===================================================================
--- /issm/trunk-jpl/src/c/solutions/solutions.h	(revision 14906)
+++ /issm/trunk-jpl/src/c/solutions/solutions.h	(revision 14907)
@@ -6,10 +6,13 @@
 #define SOLUTIONS_H_
 
-#include "../classes/objects/objects.h"
-#include "../io/io.h"
-#include "../toolkits/toolkits.h"
-
+/*forward declarations: */
 struct OptArgs;
 class FemModel;
+class Parameters;
+template <class doubletype> class Matrix;
+template <class doubletype> class Vector;
+
+#include "../io/Comm/Comm.h"
+#include "../include/types.h"
 
 /*cores: */
@@ -51,5 +54,4 @@
 COMM EnvironmentInit(int argc,char** argv);
 void EnvironmentFinalize(void);
-int  DakotaSpawnCore(double* responses, int numresponses, double* variables, char** variables_descriptors,int numvariables, void* femmodel,int counter);
 void PrintBanner(void);
 
@@ -60,3 +62,4 @@
 void AdjointCorePointerFromSolutionEnum(void (**padjointcore)(FemModel*),int solutiontype);
 
+
 #endif