Index: /issm/trunk-jpl/src/c/shared/Numerics/GaussPoints.cpp
===================================================================
--- /issm/trunk-jpl/src/c/shared/Numerics/GaussPoints.cpp	(revision 14978)
+++ /issm/trunk-jpl/src/c/shared/Numerics/GaussPoints.cpp	(revision 14979)
@@ -1,3 +1,5 @@
 /*  Gauss point structures and prototypes  */
+#include <math.h>
+#include <float.h>
 
 #include "./GaussPoints.h"
@@ -5,6 +7,4 @@
 #include "../Exceptions/exceptions.h"
 #include "../Numerics/constants.h"
-#include <math.h>
-#include <float.h>
 
 /*General Gauss points*/
Index: /issm/trunk-jpl/src/c/shared/Numerics/OptimalSearch.cpp
===================================================================
--- /issm/trunk-jpl/src/c/shared/Numerics/OptimalSearch.cpp	(revision 14978)
+++ /issm/trunk-jpl/src/c/shared/Numerics/OptimalSearch.cpp	(revision 14979)
@@ -9,9 +9,14 @@
 #endif
 
-#include "./numerics.h"
-#include "../../classes/objects/objects.h"
-#include "../../shared/io/io.h"
-#include "../../shared/shared.h"
 #include <float.h>
+
+#include "../Exceptions/exceptions.h"
+#include "../io/io.h"
+#include "../MemOps/MemOps.h"
+#include "./Verbosity.h"
+#include "./OptPars.h"
+#include "./OptArgs.h"
+#include "./types.h"
+#include "./isnan.h"
 
 void OptimalSearch(IssmDouble* psearch_scalar,IssmDouble* pJ,OptPars* optpars,IssmDouble (*f)(IssmDouble,OptArgs*), OptArgs* optargs){