diff --git a/Common/Makefile b/Common/Makefile
index be0c12a8b8e9128f6c54071498ddbec67547326a..a1654365c3bd4ae1f6a5dd9cc61ca757c2f821f6 100644
--- a/Common/Makefile
+++ b/Common/Makefile
@@ -129,10 +129,12 @@ OpenFile${OBJEXT}: OpenFile.cpp GmshConfig.h GmshMessage.h ../Geo/Geo.h \
   ../Geo/SPoint2.h ../Geo/GFace.h ../Geo/GEntity.h ../Geo/GPoint.h \
   ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h \
   ../Geo/Pair.h ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \
-  ../Geo/SBoundingBox3d.h Context.h ../Geo/CGNSOptions.h \
-  ../Mesh/meshPartitionOptions.h OpenFile.h CommandLine.h \
-  ../Graphics/ReadImg.h OS.h StringUtils.h ../Parser/Parser.h \
-  ../Post/PView.h ../Post/PViewData.h ../Fltk/GUI.h ../Fltk/Draw.h
+  ../Geo/SBoundingBox3d.h ../Mesh/HighOrder.h ../Geo/MFace.h \
+  ../Geo/MVertex.h ../Geo/SPoint2.h ../Geo/SPoint3.h ../Geo/SVector3.h \
+  Context.h ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h \
+  OpenFile.h CommandLine.h ../Graphics/ReadImg.h OS.h StringUtils.h \
+  ../Parser/Parser.h ../Post/PView.h ../Post/PViewData.h ../Fltk/GUI.h \
+  ../Fltk/Draw.h
 CreateFile${OBJEXT}: CreateFile.cpp GmshConfig.h GmshMessage.h ../Geo/GModel.h \
   ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
   ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \
diff --git a/Geo/MVertex.h b/Geo/MVertex.h
index 72ec064b919b2ee49ba1f4235e3ee5d83e07210a..3873f65405abd2d6a0be50c271645584b597c26d 100644
--- a/Geo/MVertex.h
+++ b/Geo/MVertex.h
@@ -80,7 +80,7 @@ class MVertex{
 
   // get/set the parent entity
   inline GEntity* onWhat() const { return _ge; }
-  inline void setEntity(GEntity *ge) {_ge = ge; }
+  inline void setEntity(GEntity *ge) { _ge = ge; }
 
   // get/set the number
   inline int getNum() const { return _num; }
diff --git a/Geo/Makefile b/Geo/Makefile
index 7abff5c43d152f9ddf2190d804c409bf5b8abd59..93ea9eec425b7b7b5b5efdb2d6abb5d4c948928f 100644
--- a/Geo/Makefile
+++ b/Geo/Makefile
@@ -80,6 +80,7 @@ GEdge${OBJEXT}: GEdge.cpp ../Common/GmshConfig.h ../Common/GmshDefines.h \
   SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h GFace.h \
   GEdgeLoop.h Pair.h GRegion.h MElement.h MVertex.h MEdge.h MFace.h \
   ../Numeric/FunctionSpace.h ../Numeric/GmshMatrix.h ../Numeric/Gauss.h \
+  ../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h \
   ../Numeric/GaussLegendre1D.h
 GEdgeLoop${OBJEXT}: GEdgeLoop.cpp GEdgeLoop.h GEdge.h GEntity.h Range.h \
   SPoint3.h SBoundingBox3d.h GVertex.h GPoint.h SPoint2.h SVector3.h \
diff --git a/Mesh/HighOrder.cpp b/Mesh/HighOrder.cpp
index 64107668f1db3dcfe4146f54db99e9c2734174cc..e73cbe252bb1bafb8a17bad6a860cbaf6a302fc0 100644
--- a/Mesh/HighOrder.cpp
+++ b/Mesh/HighOrder.cpp
@@ -261,8 +261,9 @@ static void getEdgeVertices(GEdge *ge, MElement *ele, std::vector<MVertex*> &ve,
               break;
           } 
           if(relax < 1.e-2)
-            Msg::Warning("Failed to compute equidistant parameters (relax = %g) for edge %d-%d",
-                         relax,v0->getNum(),v1->getNum());
+            Msg::Warning
+              ("Failed to compute equidistant parameters (relax = %g) for edge %d-%d",
+               relax, v0->getNum(), v1->getNum());
         }
       }
       for(int j = 0; j < nPts; j++){
@@ -271,7 +272,8 @@ static void getEdgeVertices(GEdge *ge, MElement *ele, std::vector<MVertex*> &ve,
         double uc = (1. - t) * u0 + t * u1; // can be wrong, that's ok
         MVertex *v;
         if(linear || !reparamOK || uc < u0 || uc > u1){ 
-          Msg::Warning("We don't have a valid parameter on curve %d-%d",v0->getNum(),v1->getNum());
+          Msg::Warning("We don't have a valid parameter on curve %d-%d",
+             v0->getNum(), v1->getNum());
           // we don't have a (valid) parameter on the curve
           SPoint3 pc = edge.interpolate(t);
           v = new MVertex(pc.x(), pc.y(), pc.z(), ge);