Index: /issm/trunk-jpl/src/c/Makefile.am
===================================================================
--- /issm/trunk-jpl/src/c/Makefile.am	(revision 14915)
+++ /issm/trunk-jpl/src/c/Makefile.am	(revision 14916)
@@ -21,5 +21,4 @@
 core_sources = ./issm.h\
 					./issm-binding.h\
-					./include/typedefs.h\
 					./include/include.h\
 					./classes/classes.h\
@@ -184,4 +183,5 @@
 					./shared/Numerics/numerics.h\
 					./shared/Numerics/types.h\
+					./shared/Numerics/constants.h\
 					./shared/Numerics/Verbosity.h\
 					./shared/Numerics/Verbosity.cpp\
Index: /issm/trunk-jpl/src/c/classes/DofIndexing.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/DofIndexing.cpp	(revision 14915)
+++ /issm/trunk-jpl/src/c/classes/DofIndexing.cpp	(revision 14916)
@@ -13,5 +13,5 @@
 #include "./DofIndexing.h"
 #include "../shared/Numerics/types.h"
-#include "../include/typedefs.h"
+#include "../shared/Numerics/constants.h"
 #include "../io/Print/Print.h"
 #include "../shared/Exceptions/exceptions.h"
Index: /issm/trunk-jpl/src/c/classes/gauss/GaussPenta.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/gauss/GaussPenta.cpp	(revision 14915)
+++ /issm/trunk-jpl/src/c/classes/gauss/GaussPenta.cpp	(revision 14916)
@@ -6,8 +6,8 @@
 #include "./GaussTria.h"
 #include "../../io/Print/Print.h"
-#include "../../include/typedefs.h"
 #include "../../shared/Exceptions/exceptions.h"
 #include "../../shared/MemOps/MemOps.h"
 #include "../../shared/Numerics/GaussPoints.h"
+#include "../../shared/Numerics/constants.h"
 
 /*GaussPenta constructors and destructors:*/
Index: /issm/trunk-jpl/src/c/classes/gauss/GaussTria.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/gauss/GaussTria.cpp	(revision 14915)
+++ /issm/trunk-jpl/src/c/classes/gauss/GaussTria.cpp	(revision 14916)
@@ -8,5 +8,5 @@
 #include "../../shared/MemOps/MemOps.h"
 #include "../../shared/Numerics/GaussPoints.h"
-#include "../../include/typedefs.h"
+#include "../../shared/Numerics/constants.h"
 
 /*GaussTria constructors and destructors:*/
Index: /issm/trunk-jpl/src/c/classes/objects/Segment.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/objects/Segment.h	(revision 14915)
+++ /issm/trunk-jpl/src/c/classes/objects/Segment.h	(revision 14916)
@@ -9,4 +9,5 @@
 /*{{{*/
 #include "./Object.h"
+#include "../../shared/Numerics/constants.h"
 /*}}}*/
 
Index: /issm/trunk-jpl/src/c/include/include.h
===================================================================
--- /issm/trunk-jpl/src/c/include/include.h	(revision 14915)
+++ /issm/trunk-jpl/src/c/include/include.h	(revision 14916)
@@ -6,5 +6,3 @@
 #define  _INCLUDEGLOBAL_H_
 
-#include "./typedefs.h"
-
 #endif //ifndef _INCLUDE_H_
Index: sm/trunk-jpl/src/c/include/typedefs.h
===================================================================
--- /issm/trunk-jpl/src/c/include/typedefs.h	(revision 14915)
+++ 	(revision )
@@ -1,41 +1,0 @@
-/*!\file: typedefs.h
- * \brief prototypes for typedefs.h
- */ 
-
-#ifndef _ISSMTYPEDEFS_H_
-#define  _ISSMTYPEDEFS_H_
-
-#define UNDEF -9999
-#define ONETHIRD 0.333333333333333333333333333333333333333333333333333333333333
-#define SQRT2 1.414213562373095048801688724209698078569671875376948073176679738
-#define SQRT3 1.732050807568877293527446341505872366942805253810380628055806979
-#define PI 3.141592653589793238462643383279502884197169399375105820974944592308
-
-#define NDOF1 1
-#define NDOF2 2
-#define NDOF3 3
-#define NDOF4 4
-
-#define DIM2 2
-#define DIM3 3
-
-/*Windows specific typefefs: */
-#ifdef _INTEL_WIN_
-
-/*Complicated way, which does not handle INFINITY though: */
-/*#ifndef NAN
-	static const unsigned long __nan[2] = {0xffffffff, 0x7fffffff};
-	#define NAN (*(const float *) __nan)
-#endif*/
-
-//For reference, for Intel compile on win64
-//#define NAN 0.0/0.0 
-//#define INFINITY 1.0/0.0
-
-//Most generic way it would seem:
-#define INFINITY (DBL_MAX+DBL_MAX)
-#define NAN (INFINITY-INFINITY)
-
-#endif
-
-#endif //ifndef _ISSMTYPEDEFS_H_
Index: /issm/trunk-jpl/src/c/shared/Numerics/GaussPoints.cpp
===================================================================
--- /issm/trunk-jpl/src/c/shared/Numerics/GaussPoints.cpp	(revision 14915)
+++ /issm/trunk-jpl/src/c/shared/Numerics/GaussPoints.cpp	(revision 14916)
@@ -5,4 +5,5 @@
 #include "../MemOps/MemOps.h"
 #include "../Exceptions/exceptions.h"
+#include "../Numerics/constants.h"
 #include <math.h>
 #include <float.h>
Index: /issm/trunk-jpl/src/c/shared/Numerics/constants.h
===================================================================
--- /issm/trunk-jpl/src/c/shared/Numerics/constants.h	(revision 14916)
+++ /issm/trunk-jpl/src/c/shared/Numerics/constants.h	(revision 14916)
@@ -0,0 +1,41 @@
+/*!\file: constants.h
+ * \brief prototypes for constants.h
+ */ 
+
+#ifndef _ISSM_CONSTANTS_H_
+#define _ISSM_CONSTANTS_H_
+
+#define UNDEF -9999
+#define ONETHIRD 0.333333333333333333333333333333333333333333333333333333333333
+#define SQRT2 1.414213562373095048801688724209698078569671875376948073176679738
+#define SQRT3 1.732050807568877293527446341505872366942805253810380628055806979
+#define PI 3.141592653589793238462643383279502884197169399375105820974944592308
+
+#define NDOF1 1
+#define NDOF2 2
+#define NDOF3 3
+#define NDOF4 4
+
+#define DIM2 2
+#define DIM3 3
+
+/*Windows specific typefefs: */
+#ifdef _INTEL_WIN_
+
+/*Complicated way, which does not handle INFINITY though: */
+/*#ifndef NAN
+	static const unsigned long __nan[2] = {0xffffffff, 0x7fffffff};
+	#define NAN (*(const float *) __nan)
+#endif*/
+
+//For reference, for Intel compile on win64
+//#define NAN 0.0/0.0 
+//#define INFINITY 1.0/0.0
+
+//Most generic way it would seem:
+#define INFINITY (DBL_MAX+DBL_MAX)
+#define NAN (INFINITY-INFINITY)
+
+#endif
+
+#endif //ifndef _ISSMTYPEDEFS_H_