Index: /issm/trunk-jpl/src/c/Container/Observations.cpp
===================================================================
--- /issm/trunk-jpl/src/c/Container/Observations.cpp	(revision 14895)
+++ /issm/trunk-jpl/src/c/Container/Observations.cpp	(revision 14896)
@@ -22,5 +22,4 @@
 #include "../classes/classes.h"
 #include "../include/include.h"
-#include "../modules/modules.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
 #include "../io/io.h"
Index: /issm/trunk-jpl/src/c/classes/FemModel.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/FemModel.cpp	(revision 14895)
+++ /issm/trunk-jpl/src/c/classes/FemModel.cpp	(revision 14896)
@@ -11,5 +11,4 @@
 #include <stdio.h>
 #include "../Container/Container.h"
-#include "../modules/ModelProcessorx/ModelProcessorx.h"
 #include "../solutions/solutions.h"
 #include "../io/io.h"
@@ -17,5 +16,29 @@
 #include "../include/include.h"
 #include "../EnumDefinitions/EnumDefinitions.h"
-#include "../modules/modules.h"
+
+/*module includes: {{{*/
+#include "../modules/ModelProcessorx/ModelProcessorx.h"
+#include "../modules/VerticesDofx/VerticesDofx.h"
+#include "../modules/SpcNodesx/SpcNodesx.h"
+#include "../modules/ConfigureObjectsx/ConfigureObjectsx.h"
+#include "../modules/ParseToolkitsOptionsx/ParseToolkitsOptionsx.h"
+#include "../modules/OutputResultsx/OutputResultsx.h"
+#include "../modules/GetVectorFromInputsx/GetVectorFromInputsx.h"
+#include "../modules/InputUpdateFromVectorx/InputUpdateFromVectorx.h"
+#include "../modules/NodesDofx/NodesDofx.h"
+#include "../modules/SurfaceAbsVelMisfitx/SurfaceAbsVelMisfitx.h"
+#include "../modules/SurfaceRelVelMisfitx/SurfaceRelVelMisfitx.h"
+#include "../modules/SurfaceLogVelMisfitx/SurfaceLogVelMisfitx.h"
+#include "../modules/SurfaceLogVxVyMisfitx/SurfaceLogVxVyMisfitx.h"
+#include "../modules/SurfaceAverageVelMisfitx/SurfaceAverageVelMisfitx.h"
+#include "../modules/ThicknessAbsMisfitx/ThicknessAbsMisfitx.h"
+#include "../modules/ThicknessAlongGradientx/ThicknessAlongGradientx.h"
+#include "../modules/ThicknessAcrossGradientx/ThicknessAcrossGradientx.h"
+#include "../modules/RheologyBbarAbsGradientx/RheologyBbarAbsGradientx.h"
+#include "../modules/DragCoefficientAbsGradientx/DragCoefficientAbsGradientx.h"
+#include "../modules/NodalValuex/NodalValuex.h"
+#include "../modules/GetVectorFromInputsx/GetVectorFromInputsx.h"
+#include "../modules/AverageOntoPartitionx/AverageOntoPartitionx.h"
+/*}}}*/
 
 /*Object constructors and destructor*/
Index: /issm/trunk-jpl/src/c/classes/objects/Node.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/objects/Node.cpp	(revision 14895)
+++ /issm/trunk-jpl/src/c/classes/objects/Node.cpp	(revision 14896)
@@ -17,5 +17,5 @@
 #include "../../shared/shared.h"
 #include "../../include/include.h"
-#include "../../modules/modules.h"
+#include "../../modules/ModelProcessorx/ModelProcessorx.h"
 /*}}}*/