Index: /issm/trunk-jpl/src/c/classes/AdaptiveMeshRefinement.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/AdaptiveMeshRefinement.cpp	(revision 24495)
+++ /issm/trunk-jpl/src/c/classes/AdaptiveMeshRefinement.cpp	(revision 24496)
@@ -10,4 +10,32 @@
 
 #include "./AdaptiveMeshRefinement.h"
+
+/*Includes*/
+/*{{{*/
+/*Common includes*/
+#include <iostream>
+#include <fstream>
+#include <string>
+#include <climits>
+#include <cfloat>
+
+/*NeoPZ includes*/
+#include <pz_config.h>
+#include <pzreal.h>
+#include <pzvec.h>
+#include <pzeltype.h>
+
+#include <TPZRefPatternTools.h>
+#include <TPZRefPatternDataBase.h>
+#include <TPZRefPattern.h>
+
+#include <tpzchangeel.h>
+#include <TPZGeoElement.h>
+#include <pzreftriangle.h>
+#include <pzgeotriangle.h>
+#include <tpzgeoelrefpattern.h>
+#include <pzgraphmesh.h>
+#include <TPZVTKGeoMesh.h>
+/*}}}*/
 
 using namespace pzgeom;
Index: /issm/trunk-jpl/src/c/classes/AdaptiveMeshRefinement.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/AdaptiveMeshRefinement.h	(revision 24495)
+++ /issm/trunk-jpl/src/c/classes/AdaptiveMeshRefinement.h	(revision 24496)
@@ -4,32 +4,8 @@
 /*Includes*/
 /*{{{*/
-/*Common includes*/
-#include <iostream>
-#include <fstream>
-#include <string>
-#include <climits>
-#include <cfloat>
-
 /*NeoPZ includes*/
-#include <pz_config.h>
-#include <pzreal.h>
 #include <pzgmesh.h>
-#include <pzvec.h>
-#include <pzeltype.h>
-
-#include <TPZRefPatternTools.h>
-#include <TPZRefPatternDataBase.h>
-#include <TPZRefPattern.h>
-
-#include <tpzchangeel.h>
-#include <TPZGeoElement.h>
-#include <pzreftriangle.h>
-#include <pzgeotriangle.h>
-#include <tpzgeoelrefpattern.h>
-#include <pzgraphmesh.h>
-#include <TPZVTKGeoMesh.h>
-
+/*ISSM includes*/
 #include "../shared/shared.h"
-
 /*}}}*/
 
Index: /issm/trunk-jpl/src/c/classes/FemModel.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/FemModel.cpp	(revision 24495)
+++ /issm/trunk-jpl/src/c/classes/FemModel.cpp	(revision 24496)
@@ -24,4 +24,8 @@
 #include <sstream> // for output of the CoDiPack tape
 extern CoDi_global codi_global;
+#endif
+
+#if defined(_HAVE_NEOPZ_) && !defined(_HAVE_AD_)
+#include <TPZRefPatternDataBase.h>
 #endif