Index: ../trunk-jpl/src/c/solutions/solutions.h
===================================================================
--- ../trunk-jpl/src/c/solutions/solutions.h	(revision 14914)
+++ ../trunk-jpl/src/c/solutions/solutions.h	(revision 14915)
@@ -13,7 +13,7 @@
 template <class doubletype> class Vector;
 
 #include "../io/Comm/Comm.h"
-#include "../include/types.h"
+#include "../shared/Numerics/types.h"
 
 /*cores: */
 void adjointdiagnostic_core(FemModel* femmodel);
Index: ../trunk-jpl/src/c/Container/Observations.h
===================================================================
--- ../trunk-jpl/src/c/Container/Observations.h	(revision 14914)
+++ ../trunk-jpl/src/c/Container/Observations.h	(revision 14915)
@@ -4,7 +4,7 @@
 class Quadtree;
 class Variogram;
 class Options;
-#include "../include/types.h"
+#include "../shared/Numerics/types.h"
 
 /*!\brief Declaration of Observations class.
  *
Index: ../trunk-jpl/src/c/Container/Inputs.h
===================================================================
--- ../trunk-jpl/src/c/Container/Inputs.h	(revision 14914)
+++ ../trunk-jpl/src/c/Container/Inputs.h	(revision 14915)
@@ -13,7 +13,7 @@
 class Node;
 class GaussTria;
 class GaussPenta;
-#include "../include/types.h"
+#include "../shared/Numerics/types.h"
 
 /*! \brief Declaration of Inputs class.
  *
Index: ../trunk-jpl/src/c/include/types.h
===================================================================
--- ../trunk-jpl/src/c/include/types.h	(revision 14914)
+++ ../trunk-jpl/src/c/include/types.h	(revision 14915)
@@ -1,38 +0,0 @@
-/*!\file: types.h
- * \brief prototypes for types.h
- */ 
-
-#ifndef _TYPES_H_
-#define  _TYPES_H_
-
-#ifdef HAVE_CONFIG_H
-	#include <config.h>
-#else
-#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
-#endif
-
-#include <stdio.h>
-
-/*here are our abstracted types: inspired on petsc */
-#if ISSM_USE_64BIT_INDICES == 1
-typedef long long IssmInt;
-//#define MPIU_INT MPI_LONG_LONG_INT already define in petsc
-#else
-typedef int IssmInt;
-//#define MPIU_INT MPI_INT already defined in petsc
-#endif  
-
-#if defined(_HAVE_ADOLC_) &&  !defined(_WRAPPERS_)
-#include "adolc/adolc.h"
-// for active variables
-typedef adouble IssmDouble;
-// for passive variables
-typedef double IssmPDouble;
-#else 
-// see above
-typedef double IssmDouble; 
-// see above
-typedef IssmDouble IssmPDouble;
-#endif
-
-#endif //ifndef _TYPES_H_
Index: ../trunk-jpl/src/c/include/globals.h
===================================================================
--- ../trunk-jpl/src/c/include/globals.h	(revision 14914)
+++ ../trunk-jpl/src/c/include/globals.h	(revision 14915)
@@ -5,7 +5,6 @@
 #ifndef _GLOBALS_H_
 #define _GLOBALS_H_
 
-#include "./types.h"
 #include "../io/Comm/Comm.h"
 #include "../classes/ToolkitOptions.h"
 
Index: ../trunk-jpl/src/c/include/include.h
===================================================================
--- ../trunk-jpl/src/c/include/include.h	(revision 14914)
+++ ../trunk-jpl/src/c/include/include.h	(revision 14915)
@@ -6,6 +6,5 @@
 #define  _INCLUDEGLOBAL_H_
 
 #include "./typedefs.h"
-#include "./types.h"
 
 #endif //ifndef _INCLUDE_H_
Index: ../trunk-jpl/src/c/shared/Matrix/matrix.h
===================================================================
--- ../trunk-jpl/src/c/shared/Matrix/matrix.h	(revision 14914)
+++ ../trunk-jpl/src/c/shared/Matrix/matrix.h	(revision 14915)
@@ -5,7 +5,7 @@
 #ifndef _MATRIXUTILS_H_
 #define _MATRIXUTILS_H_
 
-#include "../../include/include.h"
+#include "../../shared/Numerics/types.h"
 
 int  TripleMultiply( IssmDouble* a, int nrowa, int ncola, int itrna, IssmDouble* b, int nrowb, int ncolb, int itrnb, IssmDouble* c, int nrowc, int ncolc, int itrnc, IssmDouble* d, int iaddd);
 int  MatrixMultiply( IssmDouble* a, int nrowa, int ncola, int itrna, IssmDouble* b, int nrowb, int ncolb, int itrnb, IssmDouble* c, int iaddc );
Index: ../trunk-jpl/src/c/shared/Numerics/extrema.cpp
===================================================================
--- ../trunk-jpl/src/c/shared/Numerics/extrema.cpp	(revision 14914)
+++ ../trunk-jpl/src/c/shared/Numerics/extrema.cpp	(revision 14915)
@@ -8,7 +8,7 @@
 #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
 #endif
 
-#include "../../include/include.h"
+#include "../../shared/Numerics/types.h"
 
 IssmDouble min(IssmDouble a,IssmDouble b){
 	if (a<b)return a;
Index: ../trunk-jpl/src/c/shared/Numerics/types.h
===================================================================
--- ../trunk-jpl/src/c/shared/Numerics/types.h	(revision 0)
+++ ../trunk-jpl/src/c/shared/Numerics/types.h	(revision 14915)
@@ -0,0 +1,38 @@
+/*!\file: types.h
+ * \brief prototypes for types.h
+ */ 
+
+#ifndef _TYPES_H_
+#define  _TYPES_H_
+
+#ifdef HAVE_CONFIG_H
+	#include <config.h>
+#else
+#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
+#endif
+
+#include <stdio.h>
+
+/*here are our abstracted types: inspired on petsc */
+#if ISSM_USE_64BIT_INDICES == 1
+typedef long long IssmInt;
+//#define MPIU_INT MPI_LONG_LONG_INT already define in petsc
+#else
+typedef int IssmInt;
+//#define MPIU_INT MPI_INT already defined in petsc
+#endif  
+
+#if defined(_HAVE_ADOLC_) &&  !defined(_WRAPPERS_)
+#include "adolc/adolc.h"
+// for active variables
+typedef adouble IssmDouble;
+// for passive variables
+typedef double IssmPDouble;
+#else 
+// see above
+typedef double IssmDouble; 
+// see above
+typedef IssmDouble IssmPDouble;
+#endif
+
+#endif //ifndef _TYPES_H_
Index: ../trunk-jpl/src/c/shared/Numerics/GaussPoints.h
===================================================================
--- ../trunk-jpl/src/c/shared/Numerics/GaussPoints.h	(revision 14914)
+++ ../trunk-jpl/src/c/shared/Numerics/GaussPoints.h	(revision 14915)
@@ -2,7 +2,7 @@
  * \brief
  */ 
 
-#include "../../include/types.h"
+#include "../../shared/Numerics/types.h"
 #ifndef _GAUSSPOINTS_H
 #define _GAUSSPOINTS_H
 
Index: ../trunk-jpl/src/c/shared/Numerics/XZvectorsToCoordinateSystem.cpp
===================================================================
--- ../trunk-jpl/src/c/shared/Numerics/XZvectorsToCoordinateSystem.cpp	(revision 14914)
+++ ../trunk-jpl/src/c/shared/Numerics/XZvectorsToCoordinateSystem.cpp	(revision 14915)
@@ -1,6 +1,7 @@
 #include "../MemOps/MemOps.h"
 #include "../../include/include.h"
 #include "../Exceptions/exceptions.h"
+#include "../Numerics/types.h"
 #include "./isnan.h"
 #include <math.h>
 
Index: ../trunk-jpl/src/c/shared/Numerics/cross.cpp
===================================================================
--- ../trunk-jpl/src/c/shared/Numerics/cross.cpp	(revision 14914)
+++ ../trunk-jpl/src/c/shared/Numerics/cross.cpp	(revision 14915)
@@ -8,7 +8,7 @@
 #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
 #endif
 
-#include "../../include/include.h"
+#include "../../shared/Numerics/types.h"
 
 void cross(IssmDouble* result,IssmDouble* vector1,IssmDouble* vector2){
 
Index: ../trunk-jpl/src/c/shared/Numerics/numerics.h
===================================================================
--- ../trunk-jpl/src/c/shared/Numerics/numerics.h	(revision 14914)
+++ ../trunk-jpl/src/c/shared/Numerics/numerics.h	(revision 14915)
@@ -9,6 +9,7 @@
 #include "./GaussPoints.h"
 #include "./isnan.h"
 #include "./recast.h"
+#include "./types.h"
 
 class Input;
 class Parameters;
Index: ../trunk-jpl/src/c/shared/Elements/Paterson.cpp
===================================================================
--- ../trunk-jpl/src/c/shared/Elements/Paterson.cpp	(revision 14914)
+++ ../trunk-jpl/src/c/shared/Elements/Paterson.cpp	(revision 14915)
@@ -6,7 +6,7 @@
 
 #include <math.h>
 
-#include "../../include/include.h"
+#include "../../shared/Numerics/types.h"
 
 IssmDouble Paterson(IssmDouble temperature){
 
Index: ../trunk-jpl/src/c/io/Comm/IssmComm.cpp
===================================================================
--- ../trunk-jpl/src/c/io/Comm/IssmComm.cpp	(revision 14914)
+++ ../trunk-jpl/src/c/io/Comm/IssmComm.cpp	(revision 14915)
@@ -9,7 +9,7 @@
 #endif
 
 #include "./IssmComm.h"
-#include "../../include/types.h"
+#include "../../shared/Numerics/types.h"
 #include "../../shared/Exceptions/exceptions.h"
 
 void IssmComm::SetComm(COMM incomm){ /*{{{*/
Index: ../trunk-jpl/src/c/toolkits/mumps/MpiDenseMumpsSolve.cpp
===================================================================
--- ../trunk-jpl/src/c/toolkits/mumps/MpiDenseMumpsSolve.cpp	(revision 14914)
+++ ../trunk-jpl/src/c/toolkits/mumps/MpiDenseMumpsSolve.cpp	(revision 14915)
@@ -9,7 +9,7 @@
 #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
 #endif
 
-#include "../../include/types.h"
+#include "../../shared/Numerics/types.h"
 #include "../../shared/MemOps/MemOps.h"
 #include "../../shared/Exceptions/exceptions.h"
 #include "../../io/Comm/Comm.h"
Index: ../trunk-jpl/src/c/toolkits/gsl/gslincludes.h
===================================================================
--- ../trunk-jpl/src/c/toolkits/gsl/gslincludes.h	(revision 14914)
+++ ../trunk-jpl/src/c/toolkits/gsl/gslincludes.h	(revision 14915)
@@ -12,7 +12,7 @@
 #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
 #endif
 
-#include "../../include/types.h"
+#include "../../shared/Numerics/types.h"
 /*}}}*/
 
 template <class doubletype> class IssmVec;
Index: ../trunk-jpl/src/c/toolkits/mpi/patches/DetermineLocalSize.cpp
===================================================================
--- ../trunk-jpl/src/c/toolkits/mpi/patches/DetermineLocalSize.cpp	(revision 14914)
+++ ../trunk-jpl/src/c/toolkits/mpi/patches/DetermineLocalSize.cpp	(revision 14915)
@@ -5,7 +5,7 @@
 #include <stdio.h>
 #include <math.h>
 #include "../../../shared/shared.h"
-#include "../../../include/types.h"
+#include "../../../shared/Numerics/types.h"
 
 int DetermineLocalSize(int global_size,COMM comm){
 
Index: ../trunk-jpl/src/c/toolkits/mpi/patches/mpipatches.h
===================================================================
--- ../trunk-jpl/src/c/toolkits/mpi/patches/mpipatches.h	(revision 14914)
+++ ../trunk-jpl/src/c/toolkits/mpi/patches/mpipatches.h	(revision 14915)
@@ -5,7 +5,7 @@
 #ifndef MPI_PATCHES_H_ 
 #define MPI_PATCHES_H_
 
-#include "../../../include/types.h"
+#include "../../../shared/Numerics/types.h"
 
 int DetermineLocalSize(int global_size,COMM comm);
 int* DetermineRowRankFromLocalSize(int global_size,int localsize,COMM comm);
Index: ../trunk-jpl/src/c/toolkits/mpi/patches/DetermineGlobalSize.cpp
===================================================================
--- ../trunk-jpl/src/c/toolkits/mpi/patches/DetermineGlobalSize.cpp	(revision 14914)
+++ ../trunk-jpl/src/c/toolkits/mpi/patches/DetermineGlobalSize.cpp	(revision 14915)
@@ -5,7 +5,7 @@
 #include <stdio.h>
 #include <math.h>
 #include "../../../shared/shared.h"
-#include "../../../include/types.h"
+#include "../../../shared/Numerics/types.h"
 
 int DetermineGlobalSize(int local_size,COMM comm){
 
Index: ../trunk-jpl/src/c/toolkits/mpi/patches/DetermineRowRankFromLocalSize.cpp
===================================================================
--- ../trunk-jpl/src/c/toolkits/mpi/patches/DetermineRowRankFromLocalSize.cpp	(revision 14914)
+++ ../trunk-jpl/src/c/toolkits/mpi/patches/DetermineRowRankFromLocalSize.cpp	(revision 14915)
@@ -7,7 +7,7 @@
 #include <stdio.h>
 #include <math.h>
 #include "../../../shared/shared.h"
-#include "../../../include/types.h"
+#include "../../../shared/Numerics/types.h"
 
 int* DetermineRowRankFromLocalSize(int global_size,int localsize,COMM comm){
 
Index: ../trunk-jpl/src/c/toolkits/issm/IssmSolver.h
===================================================================
--- ../trunk-jpl/src/c/toolkits/issm/IssmSolver.h	(revision 14914)
+++ ../trunk-jpl/src/c/toolkits/issm/IssmSolver.h	(revision 14915)
@@ -13,7 +13,7 @@
 #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
 #endif
 
-#include "../../include/types.h"
+#include "../../shared/Numerics/types.h"
 
 /*}}}*/
 
Index: ../trunk-jpl/src/c/toolkits/petsc/objects/PetscMat.h
===================================================================
--- ../trunk-jpl/src/c/toolkits/petsc/objects/PetscMat.h	(revision 14914)
+++ ../trunk-jpl/src/c/toolkits/petsc/objects/PetscMat.h	(revision 14915)
@@ -16,7 +16,7 @@
 #endif
 
 #include "../petscincludes.h"
-#include "../../../include/include.h"
+#include "../../../shared/Numerics/types.h"
 
 /*}}}*/
 class PetscVec;
Index: ../trunk-jpl/src/c/Makefile.am
===================================================================
--- ../trunk-jpl/src/c/Makefile.am	(revision 14914)
+++ ../trunk-jpl/src/c/Makefile.am	(revision 14915)
@@ -21,7 +21,6 @@
 core_sources = ./issm.h\
 					./issm-binding.h\
 					./include/typedefs.h\
-					./include/types.h\
 					./include/include.h\
 					./classes/classes.h\
 					./classes/objects.h\
@@ -183,6 +182,7 @@
 					./shared/Matrix/matrix.h\
 					./shared/Matrix/MatrixUtils.cpp\
 					./shared/Numerics/numerics.h\
+					./shared/Numerics/types.h\
 					./shared/Numerics/Verbosity.h\
 					./shared/Numerics/Verbosity.cpp\
 					./shared/Numerics/IsInputConverged.cpp\
Index: ../trunk-jpl/src/c/classes/DofIndexing.cpp
===================================================================
--- ../trunk-jpl/src/c/classes/DofIndexing.cpp	(revision 14914)
+++ ../trunk-jpl/src/c/classes/DofIndexing.cpp	(revision 14915)
@@ -11,7 +11,7 @@
 #include <string.h>
 
 #include "./DofIndexing.h"
-#include "../include/types.h"
+#include "../shared/Numerics/types.h"
 #include "../include/typedefs.h"
 #include "../io/Print/Print.h"
 #include "../shared/Exceptions/exceptions.h"
Index: ../trunk-jpl/src/c/classes/gauss/GaussPenta.h
===================================================================
--- ../trunk-jpl/src/c/classes/gauss/GaussPenta.h	(revision 14914)
+++ ../trunk-jpl/src/c/classes/gauss/GaussPenta.h	(revision 14915)
@@ -6,7 +6,7 @@
 #define _GAUSSPENTA_H_
 
 /*Headers:*/
-#include "../../include/types.h"
+#include "../../shared/Numerics/types.h"
 class GaussTria;
 
 class GaussPenta{
Index: ../trunk-jpl/src/c/classes/gauss/GaussTria.h
===================================================================
--- ../trunk-jpl/src/c/classes/gauss/GaussTria.h	(revision 14914)
+++ ../trunk-jpl/src/c/classes/gauss/GaussTria.h	(revision 14915)
@@ -6,7 +6,7 @@
 #define _GAUSSTRIA_H_
 
 /*Headers:*/
-#include "../../include/types.h"
+#include "../../shared/Numerics/types.h"
 
 class GaussTria{
 
Index: ../trunk-jpl/src/c/classes/ToolkitOptions.cpp
===================================================================
--- ../trunk-jpl/src/c/classes/ToolkitOptions.cpp	(revision 14914)
+++ ../trunk-jpl/src/c/classes/ToolkitOptions.cpp	(revision 14915)
@@ -10,7 +10,7 @@
 
 #include <string.h>
 #include "./ToolkitOptions.h"
-#include "../include/types.h"
+#include "../shared/Numerics/types.h"
 #include "../shared/Exceptions/exceptions.h"
 #include "../shared/MemOps/MemOps.h"
 
Index: ../trunk-jpl/src/c/classes/DofIndexing.h
===================================================================
--- ../trunk-jpl/src/c/classes/DofIndexing.h	(revision 14914)
+++ ../trunk-jpl/src/c/classes/DofIndexing.h	(revision 14915)
@@ -5,7 +5,7 @@
 #ifndef _DOFINDEXING_H_
 #define  _DOFINDEXING_H_
 
-#include "../include/types.h"
+#include "../shared/Numerics/types.h"
 
 class DofIndexing{
 
Index: ../trunk-jpl/src/c/classes/dakota/DakotaPlugin.cpp
===================================================================
--- ../trunk-jpl/src/c/classes/dakota/DakotaPlugin.cpp	(revision 14914)
+++ ../trunk-jpl/src/c/classes/dakota/DakotaPlugin.cpp	(revision 14915)
@@ -24,7 +24,7 @@
 #include <string>
 
 /*ISSM includes: */
-#include "../../include/types.h"
+#include "../../shared/Numerics/types.h"
 #include "../../shared/MemOps/MemOps.h"
 #include "../../solutions/DakotaSpawnCore.h"