Index: ../trunk-jpl/src/c/solutions/DakotaSpawnCore.h
===================================================================
--- ../trunk-jpl/src/c/solutions/DakotaSpawnCore.h	(revision 0)
+++ ../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: ../trunk-jpl/src/c/solutions/solutions.h
===================================================================
--- ../trunk-jpl/src/c/solutions/solutions.h	(revision 14906)
+++ ../trunk-jpl/src/c/solutions/solutions.h	(revision 14907)
@@ -5,13 +5,16 @@
 #ifndef SOLUTIONS_H_
 #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: */
 void adjointdiagnostic_core(FemModel* femmodel);
 void adjointbalancethickness_core(FemModel* femmodel);
@@ -50,7 +53,6 @@
 void ResetBoundaryConditions(FemModel* femmodel, int analysis_type);
 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);
 
 //solution configuration
@@ -59,4 +61,5 @@
 void WrapperCorePointerFromSolutionEnum(void (**psolutioncore)(FemModel*),Parameters* parameters,int solutiontype,bool nodakotacore=false);
 void AdjointCorePointerFromSolutionEnum(void (**padjointcore)(FemModel*),int solutiontype);
 
+
 #endif
Index: ../trunk-jpl/src/c/solutions/dakota_core.cpp
===================================================================
--- ../trunk-jpl/src/c/solutions/dakota_core.cpp	(revision 14906)
+++ ../trunk-jpl/src/c/solutions/dakota_core.cpp	(revision 14907)
@@ -47,6 +47,7 @@
 #include <DakotaStrategy.H>
 #include <DakotaModel.H>
 #include <DakotaInterface.H>
+#include "./DakotaSpawnCore.h"
 #endif
 /*}}}*/
 
Index: ../trunk-jpl/src/c/Makefile.am
===================================================================
--- ../trunk-jpl/src/c/Makefile.am	(revision 14906)
+++ ../trunk-jpl/src/c/Makefile.am	(revision 14907)
@@ -362,6 +362,7 @@
 					  ./modules/AverageOntoPartitionx/AverageOntoPartitionx.h\
 					  ./modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp\
 					  ./solutions/dakota_core.cpp\
+					  ./solutions/DakotaSpawnCore.h\
 					  ./solutions/DakotaSpawnCore.cpp
 #}}}
 #Transient sources  {{{
Index: ../trunk-jpl/src/c/classes/dakota/DakotaPlugin.cpp
===================================================================
--- ../trunk-jpl/src/c/classes/dakota/DakotaPlugin.cpp	(revision 14906)
+++ ../trunk-jpl/src/c/classes/dakota/DakotaPlugin.cpp	(revision 14907)
@@ -20,15 +20,15 @@
 #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
 #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.
 
 //Dakota headers
Index: ../trunk-jpl/src/c/classes/dakota/DakotaPlugin.h
===================================================================
--- ../trunk-jpl/src/c/classes/dakota/DakotaPlugin.h	(revision 14906)
+++ ../trunk-jpl/src/c/classes/dakota/DakotaPlugin.h	(revision 14907)
@@ -8,8 +8,6 @@
 
 /*Headers:*/
 #include <DirectApplicInterface.H>
-#include "../../toolkits/toolkits.h"
-#include "../../classes/classes.h"
 
 namespace SIM {