Index: /issm/trunk-jpl/src/c/classes/Misfit.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/Misfit.h	(revision 22440)
+++ /issm/trunk-jpl/src/c/classes/Misfit.h	(revision 22441)
@@ -8,12 +8,5 @@
 /*Headers:*/
 #include "./Definition.h"
-#include "../datastructures/datastructures.h"
-#include "./Elements/Element.h"
-#include "./Elements/Elements.h"
 #include "./FemModel.h"
-#include "../modules/SurfaceAreax/SurfaceAreax.h"
-#include "../classes/Params/Parameters.h"
-#include "../classes/Inputs/Input.h"
-#include "../classes/gauss/Gauss.h"
 
 IssmDouble OutputDefinitionsResponsex(FemModel* femmodel,int output_enum);
Index: /issm/trunk-jpl/src/c/classes/Nodalvalue.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/Nodalvalue.h	(revision 22440)
+++ /issm/trunk-jpl/src/c/classes/Nodalvalue.h	(revision 22441)
@@ -9,12 +9,5 @@
 /*{{{*/
 #include "./Definition.h"
-#include "../datastructures/datastructures.h"
-#include "./Elements/Element.h"
-#include "./Elements/Elements.h"
 #include "./FemModel.h"
-#include "../modules/SurfaceAreax/SurfaceAreax.h"
-#include "../classes/Params/Parameters.h"
-#include "../classes/Inputs/Input.h"
-#include "../classes/gauss/Gauss.h"
 /*}}}*/
 
Index: /issm/trunk-jpl/src/c/classes/Numberedcostfunction.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/Numberedcostfunction.h	(revision 22440)
+++ /issm/trunk-jpl/src/c/classes/Numberedcostfunction.h	(revision 22441)
@@ -8,19 +8,5 @@
 /*Headers:*/
 #include "./Definition.h"
-#include "../datastructures/datastructures.h"
-#include "./Elements/Element.h"
-#include "./Elements/Elements.h"
 #include "./FemModel.h"
-#include "./ExternalResults/ExternalResult.h"
-#include "./ExternalResults/Results.h"
-#include "../modules/SurfaceAbsVelMisfitx/SurfaceAbsVelMisfitx.h"
-#include "../modules/SurfaceRelVelMisfitx/SurfaceRelVelMisfitx.h"
-#include "../modules/SurfaceLogVelMisfitx/SurfaceLogVelMisfitx.h"
-#include "../modules/SurfaceLogVxVyMisfitx/SurfaceLogVxVyMisfitx.h"
-#include "../modules/ThicknessAbsMisfitx/ThicknessAbsMisfitx.h"
-#include "../modules/ThicknessAlongGradientx/ThicknessAlongGradientx.h"
-#include "../modules/ThicknessAcrossGradientx/ThicknessAcrossGradientx.h"
-#include "../modules/RheologyBbarAbsGradientx/RheologyBbarAbsGradientx.h"
-#include "../modules/DragCoefficientAbsGradientx/DragCoefficientAbsGradientx.h"
 
 
@@ -29,28 +15,28 @@
 class Numberedcostfunction: public Object, public Definition{
 
-	public: 
+public: 
 
-		int   definitionenum;
-		char* name;
-		int   number_cost_functions;
-		int*  cost_functions_list;
-		
-		/*Numberedcostfunction constructors, destructors :*/
-		Numberedcostfunction();
-		Numberedcostfunction(char* in_name, int in_definitionenum,int number_cost_functions_in,int* cost_functions_list_in);
-		~Numberedcostfunction();
+int   definitionenum;
+char* name;
+int   number_cost_functions;
+int*  cost_functions_list;
 
-		/*Object virtual function resolutoin: */
-		Object*	copy();
-		void		DeepEcho(void);
-		void		Echo(void);
-		int		Id(void);
-		void		Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction);
-		int		ObjectEnum(void);
+/*Numberedcostfunction constructors, destructors :*/
+Numberedcostfunction();
+Numberedcostfunction(char* in_name, int in_definitionenum,int number_cost_functions_in,int* cost_functions_list_in);
+~Numberedcostfunction();
 
-		/*Definition virtual function resolutoin: */
-		int		DefinitionEnum();
-		char*		Name();
-		IssmDouble Response(FemModel* femmodel);
+/*Object virtual function resolutoin: */
+Object*	copy();
+void		DeepEcho(void);
+void		Echo(void);
+int		Id(void);
+void		Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction);
+int		ObjectEnum(void);
+
+/*Definition virtual function resolutoin: */
+int		DefinitionEnum();
+char*		Name();
+IssmDouble Response(FemModel* femmodel);
 };
 
Index: /issm/trunk-jpl/src/c/classes/Regionaloutput.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/Regionaloutput.h	(revision 22440)
+++ /issm/trunk-jpl/src/c/classes/Regionaloutput.h	(revision 22441)
@@ -9,9 +9,5 @@
 /*{{{*/
 #include "./Definition.h"
-#include "../datastructures/datastructures.h"
-#include "./Elements/Element.h"
-#include "./Elements/Elements.h"
 #include "./FemModel.h"
-#include "../classes/Params/Parameters.h"
 
 /*}}}*/