Index: /issm/trunk-jpl/src/c/Makefile.am
===================================================================
--- /issm/trunk-jpl/src/c/Makefile.am	(revision 14976)
+++ /issm/trunk-jpl/src/c/Makefile.am	(revision 14977)
@@ -33,6 +33,4 @@
 					./classes/objects/Load.h\
 					./classes/objects/Contour.h\
-					./classes/objects/OptArgs.h\
-					./classes/objects/OptPars.h\
 					./classes/objects/Loads/Friction.h\
 					./classes/objects/Loads/Friction.cpp\
@@ -209,4 +207,6 @@
 					./shared/Numerics/XZvectorsToCoordinateSystem.cpp\
 					./shared/Numerics/UnitConversion.cpp\
+					./shared/Numerics/OptArgs.h\
+					./shared/Numerics/OptPars.h\
 					./shared/Exceptions/exceptions.h\
 					./shared/Exceptions/Exceptions.cpp\
Index: sm/trunk-jpl/src/c/classes/OptArgs.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/OptArgs.h	(revision 14976)
+++ 	(revision )
@@ -1,13 +1,0 @@
-/*!\file:  OptArgs.h
- * \brief place holder for optimization function arguments
- */ 
-
-#ifndef _OPTARGS_H_
-#define _OPTARGS_H_
-
-class Model;
-struct OptArgs{
-	FemModel* femmodel;
-};
-
-#endif
Index: sm/trunk-jpl/src/c/classes/OptPars.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/OptPars.h	(revision 14976)
+++ 	(revision )
@@ -1,17 +1,0 @@
-/*!\file:  OptPars.h
- * \brief place holder for optimization parameters
- */ 
-
-#ifndef _OPTPARS_H_
-#define _OPTPARS_H_
-
-struct OptPars{
-
-	IssmDouble xmin;
-	IssmDouble xmax;
-	IssmDouble cm_jump;
-	int maxiter;
-
-};
-
-#endif
Index: /issm/trunk-jpl/src/c/classes/classes.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/classes.h	(revision 14976)
+++ /issm/trunk-jpl/src/c/classes/classes.h	(revision 14977)
@@ -32,6 +32,4 @@
 #include "./FemModel.h"
 #include "./GiaDeflectionCoreArgs.h"
-#include "./OptArgs.h"
-#include "./OptPars.h"
 #include "./AdolcEdf.h"
 #include "./ToolkitOptions.h"
Index: /issm/trunk-jpl/src/c/classes/objects/Elements/Penta.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/objects/Elements/Penta.h	(revision 14976)
+++ /issm/trunk-jpl/src/c/classes/objects/Elements/Penta.h	(revision 14977)
@@ -14,4 +14,5 @@
 class Parameters;
 class Inputs;
+class Input;
 class IoModel;
 class Node;
Index: /issm/trunk-jpl/src/c/shared/Numerics/OptArgs.h
===================================================================
--- /issm/trunk-jpl/src/c/shared/Numerics/OptArgs.h	(revision 14977)
+++ /issm/trunk-jpl/src/c/shared/Numerics/OptArgs.h	(revision 14977)
@@ -0,0 +1,14 @@
+/*!\file:  OptArgs.h
+ * \brief place holder for optimization function arguments
+ */ 
+
+#ifndef _OPTARGS_H_
+#define _OPTARGS_H_
+
+class FemModel;
+
+struct OptArgs{
+	FemModel* femmodel;
+};
+
+#endif
Index: /issm/trunk-jpl/src/c/shared/Numerics/OptPars.h
===================================================================
--- /issm/trunk-jpl/src/c/shared/Numerics/OptPars.h	(revision 14977)
+++ /issm/trunk-jpl/src/c/shared/Numerics/OptPars.h	(revision 14977)
@@ -0,0 +1,19 @@
+/*!\file:  OptPars.h
+ * \brief place holder for optimization parameters
+ */ 
+
+#ifndef _OPTPARS_H_
+#define _OPTPARS_H_
+
+#include "./types.h"
+
+struct OptPars{
+
+	IssmDouble xmin;
+	IssmDouble xmax;
+	IssmDouble cm_jump;
+	int maxiter;
+
+};
+
+#endif
Index: /issm/trunk-jpl/src/c/shared/Numerics/numerics.h
===================================================================
--- /issm/trunk-jpl/src/c/shared/Numerics/numerics.h	(revision 14976)
+++ /issm/trunk-jpl/src/c/shared/Numerics/numerics.h	(revision 14977)
@@ -12,10 +12,6 @@
 #include "./types.h"
 #include "./constants.h"
-
-class Input;
-class Parameters;
-
-struct OptArgs;
-struct OptPars;
+#include "./OptArgs.h"
+#include "./OptPars.h"
 
 IssmDouble  min(IssmDouble a,IssmDouble b);