Index: /issm/trunk-jpl/src/c/Container/Container.h
===================================================================
--- /issm/trunk-jpl/src/c/Container/Container.h	(revision 14902)
+++ /issm/trunk-jpl/src/c/Container/Container.h	(revision 14903)
@@ -6,5 +6,4 @@
 #define  _CONTAINER_CONTAINER_H_
 
-#include "../include/include.h"
 #include "./DataSet.h"
 #include "./Constraints.h"
Index: /issm/trunk-jpl/src/c/Container/DataSet.h
===================================================================
--- /issm/trunk-jpl/src/c/Container/DataSet.h	(revision 14902)
+++ /issm/trunk-jpl/src/c/Container/DataSet.h	(revision 14903)
@@ -3,8 +3,7 @@
 
 #include <vector>
-#include "../classes/objects/Object.h"
-#include "../EnumDefinitions/EnumDefinitions.h"
 
 /*forward declarations */
+class Object;
 class Elements;
 class Loads;
Index: /issm/trunk-jpl/src/c/Container/Inputs.h
===================================================================
--- /issm/trunk-jpl/src/c/Container/Inputs.h	(revision 14902)
+++ /issm/trunk-jpl/src/c/Container/Inputs.h	(revision 14903)
@@ -14,4 +14,5 @@
 class GaussTria;
 class GaussPenta;
+#include "../include/types.h"
 
 /*! \brief Declaration of Inputs class.
Index: /issm/trunk-jpl/src/c/Container/Nodes.h
===================================================================
--- /issm/trunk-jpl/src/c/Container/Nodes.h	(revision 14902)
+++ /issm/trunk-jpl/src/c/Container/Nodes.h	(revision 14903)
@@ -2,5 +2,5 @@
 #define  _CONTAINER_NODES_H_
 
-#include "./DataSet.h"
+class DataSet;
 
 /*!\brief Declaration of Nodes class.
Index: /issm/trunk-jpl/src/c/Container/Observations.h
===================================================================
--- /issm/trunk-jpl/src/c/Container/Observations.h	(revision 14902)
+++ /issm/trunk-jpl/src/c/Container/Observations.h	(revision 14903)
@@ -1,11 +1,9 @@
 #ifndef _CONTAINER_OBSERVATIONS_H_
 #define  _CONTAINER_OBSERVATIONS_H_
-
-#include "../include/include.h"
-#include "../classes/objects/Options/GenericOption.h"
 
 class Quadtree;
 class Variogram;
 class Options;
+#include "../include/types.h"
 
 /*!\brief Declaration of Observations class.
Index: /issm/trunk-jpl/src/c/Container/Options.h
===================================================================
--- /issm/trunk-jpl/src/c/Container/Options.h	(revision 14902)
+++ /issm/trunk-jpl/src/c/Container/Options.h	(revision 14903)
@@ -2,8 +2,7 @@
 #define _CONTAINER_OPTIONS_H_
 
-#include "../classes/objects/Options/GenericOption.h"
-
 /*forward declarations */
 class Option;
+#include "../classes/objects/Options/GenericOption.h"
 
 /*!\brief Declaration of Options class.