diff --git a/Mesh/meshGFace.h b/Mesh/meshGFace.h
index 4619dbe766f52855a218df95b74e78673e1312a1..62fa4a61d060ce4b43720d33e269289525fca1ad 100644
--- a/Mesh/meshGFace.h
+++ b/Mesh/meshGFace.h
@@ -8,8 +8,9 @@
 
 #include <vector>
 #include <set>
-#include "GFaceCompound.h"
+#include <list>
 
+class GEdge;
 class GFace;
 class MVertex;
 class GFaceCompound;
@@ -20,19 +21,19 @@ class meshGFace {
   int twoPassesMesh;
   bool onlyInitialMesh;
  public :
-  meshGFace (bool r = true, int t = 0) : repairSelfIntersecting1dMesh(r), twoPassesMesh(t)
-    ,onlyInitialMesh(false)
+  meshGFace(bool r = true, int t = 0)
+    : repairSelfIntersecting1dMesh(r), twoPassesMesh(t), onlyInitialMesh(false)
   {
   }
-  void operator () (GFace *);
-  void setOnlyInitial() {onlyInitialMesh = true;}
+  void operator()(GFace *);
+  void setOnlyInitial(){ onlyInitialMesh = true; }
 };
 
 // Destroy the mesh of the face
 class deMeshGFace {
  public :
-  deMeshGFace (){}
-  void operator () (GFace *);
+  deMeshGFace(){}
+  void operator()(GFace *);
 };
 
 // Orient the mesh of a face to match the orientation of the
@@ -42,8 +43,8 @@ class deMeshGFace {
 // 2) some volume algorithms need to change the surface mesh
 //    orientation
 class orientMeshGFace {
-  public :
-  void operator () (GFace *);
+ public :
+  void operator()(GFace *);
 };
 
 void fourthPoint(double *p1, double *p2, double *p3, double *p4);
diff --git a/utils/api_demos/CMakeLists.txt b/utils/api_demos/CMakeLists.txt
index 15193579ebe12bb6e92599175a84bbac708951b8..ff246526e7eaad62f127cfa719df61e614c93e6c 100644
--- a/utils/api_demos/CMakeLists.txt
+++ b/utils/api_demos/CMakeLists.txt
@@ -14,7 +14,7 @@ project(api_demos CXX)
 add_subdirectory(../.. "${CMAKE_CURRENT_BINARY_DIR}/gmsh")
 
 include_directories(../../Common ../../Numeric ../../Geo ../../Mesh 
-   ../../Solver ../../Post ../../Plugin ../../Graphics 
+   ../../Solver ../../Post ../../Plugin ../../Graphics ../../contrib/ANN/include
    ../../contrib/DiscreteIntegration ${GMSH_EXTERNAL_INCLUDE_DIRS}
    ${CMAKE_CURRENT_BINARY_DIR}/gmsh/Common)
 
@@ -50,3 +50,6 @@ target_link_libraries(mainPost shared)
 
 add_executable(mainSimple mainSimple.cpp)
 target_link_libraries(mainSimple shared)
+
+add_executable(mainMoving mainMoving.cpp)
+target_link_libraries(mainMoving shared)