diff --git a/Mesh/BackgroundMesh2D.cpp b/Mesh/BackgroundMesh2D.cpp
index d9e3147f416fa8bc8b7084b8c7015e9bbe0c9230..0c0ce3414d54c4aa30c8b035ab3dad3eba993abb 100644
--- a/Mesh/BackgroundMesh2D.cpp
+++ b/Mesh/BackgroundMesh2D.cpp
@@ -7,6 +7,7 @@
 #include "BackgroundMeshTools.h"
 
 #include "GmshMessage.h"
+#include "GModel.h"
 #include "GVertex.h"
 #include "GEdge.h"
 #include "GEdgeCompound.h"
@@ -21,6 +22,8 @@
 #include "MTriangle.h"
 #include "Field.h"
 #include "OS.h"
+#include "Context.h"
+#include "meshGFaceOptimize.h"
 
 #if defined(HAVE_SOLVER)
 #include "dofManager.h"
@@ -32,17 +35,18 @@
 #endif
 
 class evalDiffusivityFunction : public simpleFunction<double>{
-  public:
-    evalDiffusivityFunction(frameFieldBackgroundMesh2D *_bgm, double t=0.95):bgm(_bgm),threshold(t){};
-    double operator () (double u, double v, double w) const{
-      return ((bgm->get_smoothness(u,v) >= threshold) ? 1. : 1.e-3);
-    }
-  private:
-    frameFieldBackgroundMesh2D *bgm;
-    const double threshold;
+public:
+  evalDiffusivityFunction(frameFieldBackgroundMesh2D *_bgm, double t=0.95)
+    : bgm(_bgm),threshold(t){};
+  double operator () (double u, double v, double w) const
+  {
+    return ((bgm->get_smoothness(u,v) >= threshold) ? 1. : 1.e-3);
+  }
+private:
+  frameFieldBackgroundMesh2D *bgm;
+  const double threshold;
 };
 
-
 //TODO: move this fct ???
 /* applies rotations of amplitude pi to set the
    angle in the first quadrant (in [0,pi/2[ ) */