diff --git a/Common/CMakeLists.txt b/Common/CMakeLists.txt
index 5ce071fdc2935f6d9ba47ad0dcd41e0c33a6d5e3..9133094fb1f45136b351e744017fc9942487bcc7 100644
--- a/Common/CMakeLists.txt
+++ b/Common/CMakeLists.txt
@@ -26,5 +26,5 @@ set(SRC
   Bindings.cpp
 )
 
-file(GLOB HDR RELATIVE ${CMAKE_SOURCE_DIR}/Common *.h) 
+file(GLOB HDR RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.h) 
 append_gmsh_src(Common "${SRC};${HDR}")
diff --git a/Fltk/CMakeLists.txt b/Fltk/CMakeLists.txt
index 35d616bee9f6a67ca84e20029f0c7e27ad211ab0..9a75c0fb0224dd8cc0311a1c683f40aa6268778a 100644
--- a/Fltk/CMakeLists.txt
+++ b/Fltk/CMakeLists.txt
@@ -27,5 +27,5 @@ set(SRC
     partitionDialog.cpp
 )
 
-file(GLOB HDR RELATIVE ${CMAKE_SOURCE_DIR}/Fltk *.h) 
+file(GLOB HDR RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.h) 
 append_gmsh_src(Fltk "${SRC};${HDR}")
diff --git a/Geo/CMakeLists.txt b/Geo/CMakeLists.txt
index f8b178b70e12c2768e0639fa284b8b730b4ce449..93e60452af075f93832c578370527e5e4721e8e3 100644
--- a/Geo/CMakeLists.txt
+++ b/Geo/CMakeLists.txt
@@ -35,5 +35,5 @@ set(SRC
   Cell.cpp CellComplex.cpp ChainComplex.cpp Homology.cpp
 )
 
-file(GLOB HDR RELATIVE ${CMAKE_SOURCE_DIR}/Geo *.h) 
+file(GLOB HDR RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.h) 
 append_gmsh_src(Geo "${SRC};${HDR}")
diff --git a/Graphics/CMakeLists.txt b/Graphics/CMakeLists.txt
index dda9f609f9ecb1a4efd0c3dea44124c11008a1ed..2f2d72cd3770074af87a9130eb72d1b124d26ad8 100644
--- a/Graphics/CMakeLists.txt
+++ b/Graphics/CMakeLists.txt
@@ -22,5 +22,5 @@ set(SRC
   gl2yuv.cpp
 )
 
-file(GLOB HDR RELATIVE ${CMAKE_SOURCE_DIR}/Graphics *.h) 
+file(GLOB HDR RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.h) 
 append_gmsh_src(Graphics "${SRC};${HDR}")
diff --git a/Mesh/CMakeLists.txt b/Mesh/CMakeLists.txt
index 53395398219266715b500f2f2295a9e7b9dc008f..faa3cdb9f851a613232687d2e32f95bb4863f14b 100644
--- a/Mesh/CMakeLists.txt
+++ b/Mesh/CMakeLists.txt
@@ -33,5 +33,5 @@ set(SRC
     multiscalePartition.cpp
 )
 
-file(GLOB HDR RELATIVE ${CMAKE_SOURCE_DIR}/Mesh *.h) 
+file(GLOB HDR RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.h) 
 append_gmsh_src(Mesh "${SRC};${HDR}")
diff --git a/Numeric/CMakeLists.txt b/Numeric/CMakeLists.txt
index 77f7f0bc4dbec31d33ad272cab58cd18aa248df1..68dc509f6b05d0cc327bf978141880e5535612e2 100644
--- a/Numeric/CMakeLists.txt
+++ b/Numeric/CMakeLists.txt
@@ -21,5 +21,5 @@ set(SRC
   cartesian.cpp
 )
 
-file(GLOB HDR RELATIVE ${CMAKE_SOURCE_DIR}/Numeric *.h) 
+file(GLOB HDR RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.h) 
 append_gmsh_src(Numeric "${SRC};${HDR}")
diff --git a/Parser/CMakeLists.txt b/Parser/CMakeLists.txt
index fee863d6ab5c742b673504edd80647b2f5e93e58..2a1bb4d92b3444bfd7a5fd55953a0a745a183639 100644
--- a/Parser/CMakeLists.txt
+++ b/Parser/CMakeLists.txt
@@ -9,5 +9,5 @@ set(SRC
   FunctionManager.cpp
 )
 
-file(GLOB HDR RELATIVE ${CMAKE_SOURCE_DIR}/Parser *.h) 
+file(GLOB HDR RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.h) 
 append_gmsh_src(Parser "${SRC};${HDR}")
diff --git a/Plugin/CMakeLists.txt b/Plugin/CMakeLists.txt
index 55637ba2fb456ef4e06a34c45ca07810fe5b45a0..bd3c5e262259855ea9b14dd44277bc7f907b8f9b 100644
--- a/Plugin/CMakeLists.txt
+++ b/Plugin/CMakeLists.txt
@@ -26,5 +26,5 @@ set(SRC
   Distance.cpp ExtractEdges.cpp
 )
 
-file(GLOB HDR RELATIVE ${CMAKE_SOURCE_DIR}/Plugin *.h) 
+file(GLOB HDR RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.h) 
 append_gmsh_src(Plugin "${SRC};${HDR}")
diff --git a/Post/CMakeLists.txt b/Post/CMakeLists.txt
index eaf012a37821de65f73af51acf456e57f2c21b07..6942bee19d6ba5500cfe15b4c5c5bff8de9bec43 100644
--- a/Post/CMakeLists.txt
+++ b/Post/CMakeLists.txt
@@ -14,5 +14,5 @@ set(SRC
   ColorTable.cpp
 )
 
-file(GLOB HDR RELATIVE ${CMAKE_SOURCE_DIR}/Post *.h) 
+file(GLOB HDR RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.h) 
 append_gmsh_src(Post "${SRC};${HDR}")
diff --git a/Qt/CMakeLists.txt b/Qt/CMakeLists.txt
index b52cb8a99ab97b03b135d9d2e94d1e0d307252e1..8be7adfeb99d4d66380efde9007dd1cbc68d5c33 100644
--- a/Qt/CMakeLists.txt
+++ b/Qt/CMakeLists.txt
@@ -14,7 +14,7 @@ set(MOC_HDR
   graphicWindow.h
 )
 
-file(GLOB HDR RELATIVE ${CMAKE_SOURCE_DIR}/Qt *.h) 
+file(GLOB HDR RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.h) 
 append_gmsh_src(Qt "${SRC};${HDR}")
 
 foreach(FILE ${MOC_HDR})
diff --git a/Solver/CMakeLists.txt b/Solver/CMakeLists.txt
index 52d251eee9d922af2ffb32d32fb00452d49d28ac..7d71f39788f90f4885abc9fd17643c3c2757aed3 100644
--- a/Solver/CMakeLists.txt
+++ b/Solver/CMakeLists.txt
@@ -35,5 +35,5 @@ set(SRC
   dgMesh2MeshProjection.cpp
 )
 
-file(GLOB HDR RELATIVE ${CMAKE_SOURCE_DIR}/Solver *.h) 
+file(GLOB HDR RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.h) 
 append_gmsh_src(Solver "${SRC};${HDR}")
diff --git a/contrib/ANN/CMakeLists.txt b/contrib/ANN/CMakeLists.txt
index 6685b1c4fd6f405a20c5229ac19b5847e7994ba6..ee78b5e7ae714eb7c9830a3677f283ca17e83496 100644
--- a/contrib/ANN/CMakeLists.txt
+++ b/contrib/ANN/CMakeLists.txt
@@ -20,5 +20,5 @@ set(SRC
   src/perf.cpp
 )
 
-file(GLOB_RECURSE HDR RELATIVE ${CMAKE_SOURCE_DIR}/contrib/ANN *.h)
+file(GLOB_RECURSE HDR RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.h)
 append_gmsh_src(contrib/ANN "${SRC};${HDR}")
diff --git a/contrib/Chaco/CMakeLists.txt b/contrib/Chaco/CMakeLists.txt
index 0b10d68dcf9e2013c5cec738687c40a05a3f2b35..61fbf58ddfcd473d3a1ab96c3360286512f15ccc 100644
--- a/contrib/Chaco/CMakeLists.txt
+++ b/contrib/Chaco/CMakeLists.txt
@@ -88,5 +88,5 @@ set(SRC
   util/vecscale.c 
 )
 
-file(GLOB_RECURSE HDR RELATIVE ${CMAKE_SOURCE_DIR}/contrib/Chaco *.h)
+file(GLOB_RECURSE HDR RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.h)
 append_gmsh_src(contrib/Chaco "${SRC};${HDR}")
diff --git a/contrib/DiscreteIntegration/CMakeLists.txt b/contrib/DiscreteIntegration/CMakeLists.txt
index d968c6a5c0ee5431f095d173bcd9fbb970ee5ea4..a26faa2c7aa45194a43fc5084348cc45e93d94ad 100644
--- a/contrib/DiscreteIntegration/CMakeLists.txt
+++ b/contrib/DiscreteIntegration/CMakeLists.txt
@@ -9,5 +9,5 @@ set(SRC
   recurCut.cpp
 )
 
-file(GLOB_RECURSE HDR RELATIVE ${CMAKE_SOURCE_DIR}/contrib/DiscreteIntegration *.h)
+file(GLOB_RECURSE HDR RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.h)
 append_gmsh_src(contrib/DiscreteIntegration "${SRC};${HDR}")
diff --git a/contrib/Fl_Tree/CMakeLists.txt b/contrib/Fl_Tree/CMakeLists.txt
index 9186125b92b21d2565a8b9dc23ca4eebf03a8d4f..a4d3c147864aece4ab18aa76cfa17faba3602e5b 100644
--- a/contrib/Fl_Tree/CMakeLists.txt
+++ b/contrib/Fl_Tree/CMakeLists.txt
@@ -10,5 +10,5 @@ set(SRC
   Fl_Tree_Prefs.cxx
 )
 
-file(GLOB_RECURSE HDR RELATIVE ${CMAKE_SOURCE_DIR}/contrib/Fl_Tree *.H)
+file(GLOB_RECURSE HDR RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.H)
 append_gmsh_src(contrib/Fl_Tree "${SRC};${HDR}")
diff --git a/contrib/MathEx/CMakeLists.txt b/contrib/MathEx/CMakeLists.txt
index 376ffcec60e0f1950111652831c6732bef47a8c7..f77f774b4bf1b9dd9813b98476e512f73a051388 100644
--- a/contrib/MathEx/CMakeLists.txt
+++ b/contrib/MathEx/CMakeLists.txt
@@ -7,5 +7,5 @@ set(SRC
   mathex.cpp
 )
 
-file(GLOB_RECURSE HDR RELATIVE ${CMAKE_SOURCE_DIR}/contrib/MathEx *.h)
+file(GLOB_RECURSE HDR RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.h)
 append_gmsh_src(contrib/MathEx "${SRC};${HDR}")
diff --git a/contrib/Metis/CMakeLists.txt b/contrib/Metis/CMakeLists.txt
index a23404903f9cb424398a259db1eb087f5958fb3c..0440704545c2b2860dfcab31fe094ce9009899a0 100644
--- a/contrib/Metis/CMakeLists.txt
+++ b/contrib/Metis/CMakeLists.txt
@@ -58,5 +58,5 @@ set(SRC
   stat.c
 )
 
-file(GLOB_RECURSE HDR RELATIVE ${CMAKE_SOURCE_DIR}/contrib/Metis *.h)
+file(GLOB_RECURSE HDR RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.h)
 append_gmsh_src(contrib/Metis "${SRC};${HDR}")
diff --git a/contrib/NativeFileChooser/CMakeLists.txt b/contrib/NativeFileChooser/CMakeLists.txt
index 26bdee559734b85a61e34f2042aac30f584dba3b..86a1d6e07a62128f8ca64e249e2b3fb3106621ec 100644
--- a/contrib/NativeFileChooser/CMakeLists.txt
+++ b/contrib/NativeFileChooser/CMakeLists.txt
@@ -7,5 +7,5 @@ set(SRC
   Fl_Native_File_Chooser.cxx
 )
 
-file(GLOB_RECURSE HDR RELATIVE ${CMAKE_SOURCE_DIR}/contrib/NativeFileChooser *.H)
+file(GLOB_RECURSE HDR RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.H)
 append_gmsh_src(contrib/NativeFileChooser "${SRC};${HDR}")
diff --git a/contrib/Netgen/CMakeLists.txt b/contrib/Netgen/CMakeLists.txt
index 8c6c7b38d9a5458dc8354cd015a231ffee5dcbf5..966eff799ee966bba14a78ff27a94399e7a5b541 100644
--- a/contrib/Netgen/CMakeLists.txt
+++ b/contrib/Netgen/CMakeLists.txt
@@ -38,5 +38,5 @@ set(SRC
   ${opt}/bfgs.cpp ${opt}/linsearch.cpp ${opt}/linopt.cpp
 )
 
-file(GLOB_RECURSE HDR RELATIVE ${CMAKE_SOURCE_DIR}/contrib/Netgen *.h)
+file(GLOB_RECURSE HDR RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.h)
 append_gmsh_src(contrib/Netgen "${SRC};${HDR}")
diff --git a/contrib/Tetgen/CMakeLists.txt b/contrib/Tetgen/CMakeLists.txt
index 9e24e34c939abccfb42328146160c2e98a8e5268..52a24fba3f20b57598aea262866b901747e944ba 100644
--- a/contrib/Tetgen/CMakeLists.txt
+++ b/contrib/Tetgen/CMakeLists.txt
@@ -8,5 +8,5 @@ set(SRC
   predicates.cxx
 )
 
-file(GLOB_RECURSE HDR RELATIVE ${CMAKE_SOURCE_DIR}/contrib/Tetgen *.h)
+file(GLOB_RECURSE HDR RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.h)
 append_gmsh_src(contrib/Tetgen "${SRC};${HDR}")
diff --git a/contrib/TetgenNew/CMakeLists.txt b/contrib/TetgenNew/CMakeLists.txt
index 52b9c194e80f4b5835c03046eec6ea6df84993ac..1293041291b4d2af1cf502c0357ef8ca0f362d71 100644
--- a/contrib/TetgenNew/CMakeLists.txt
+++ b/contrib/TetgenNew/CMakeLists.txt
@@ -19,5 +19,5 @@ set(SRC
   surface.cxx
 )
 
-file(GLOB_RECURSE HDR RELATIVE ${CMAKE_SOURCE_DIR}/contrib/TetgenNew *.h)
+file(GLOB_RECURSE HDR RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.h)
 append_gmsh_src(contrib/TetgenNew "${SRC};${HDR}")
diff --git a/contrib/kbipack/CMakeLists.txt b/contrib/kbipack/CMakeLists.txt
index 253ced8236496713a1aab9d9db1240715cc32344..523dc33ff702381a887f12ebb95599973916fc52 100644
--- a/contrib/kbipack/CMakeLists.txt
+++ b/contrib/kbipack/CMakeLists.txt
@@ -11,5 +11,5 @@ set(SRC
   mpz.cpp
 )
 
-file(GLOB_RECURSE HDR RELATIVE ${CMAKE_SOURCE_DIR}/contrib/kbipack *.h)
+file(GLOB_RECURSE HDR RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.h)
 append_gmsh_src(contrib/kbipack "${SRC};${HDR}")
diff --git a/doc/texinfo/gmsh.texi b/doc/texinfo/gmsh.texi
index 09ff8d8df83df49d3ccb7fb1a9c5de5f6e761716..21a83edd264889808f3d2e7b11cbef78ac9afafa 100644
--- a/doc/texinfo/gmsh.texi
+++ b/doc/texinfo/gmsh.texi
@@ -846,8 +846,10 @@ Set geometrical tolerance
 @ftable @code
 @item -1, -2, -3
 Perform 1D, 2D or 3D mesh generation, then exit
+@item -refine
+Perform uniform mesh refinement by subdivision, then exit
 @item -part int
-Partition the mesh after batch mesh generation.
+Partition the mesh after batch mesh generation
 @item -saveall
 Save all elements (discard physical group definitions)
 @item -o file
@@ -3674,7 +3676,8 @@ element. By default, the first @var{tag} is the number of the physical
 entity to which the element belongs; the second is the number of the
 elementary geometrical entity to which the element belongs; the third is
 the number of mesh partitions to which the element belongs, followed by
-the partition ids. A zero tag is equivalent to no tag.
+the partition ids (negative partition ids indicate ghost cells). A zero
+tag is equivalent to no tag.
 
 @item @var{node-number-list}
 is the list of the node numbers of the @var{n}-th element. The ordering of
diff --git a/utils/api_demos/mainAntTweakBar.cpp b/utils/api_demos/mainAntTweakBar.cpp
index 0e6a7ed6c0ea2243d0bed69caa31b5b87a779944..299c777018c928fced4a7d530e9335e718d1274a 100644
--- a/utils/api_demos/mainAntTweakBar.cpp
+++ b/utils/api_demos/mainAntTweakBar.cpp
@@ -9,10 +9,10 @@
 #  include <GL/glut.h>
 #endif
 #include <AntTweakBar.h>
-#include <gmsh/Gmsh.h>
-#include <gmsh/GModel.h>
-#include <gmsh/MElement.h>
-#include <gmsh/drawContext.h>
+#include "Gmsh.h"
+#include "GModel.h"
+#include "MElement.h"
+#include "drawContext.h"
 
 static drawContext *ctx = 0;
 static mousePosition clickPos, prevPos;
diff --git a/utils/api_demos/mainCartesian.cpp b/utils/api_demos/mainCartesian.cpp
index be30ed48a5801cf88110b7038131e15cb2ee7fbf..ed1057e39ed223931251b097a0f2377051d9194e 100644
--- a/utils/api_demos/mainCartesian.cpp
+++ b/utils/api_demos/mainCartesian.cpp
@@ -1,13 +1,13 @@
-#include <gmsh/Gmsh.h>
-#include <gmsh/GModel.h>
-#include <gmsh/MVertex.h>
-#include <gmsh/cartesian.h>
-#include <gmsh/MTriangle.h>
-#include <gmsh/SOrientedBoundingBox.h>
-#include <gmsh/Numeric.h>
-
-void insertBoxes ( double x, double y, double z, double EP, cartesianBox<double> &box){
-  
+#include "Gmsh.h"
+#include "GModel.h"
+#include "MVertex.h"
+#include "cartesian.h"
+#include "MTriangle.h"
+#include "SOrientedBoundingBox.h"
+#include "Numeric.h"
+
+void insertBoxes ( double x, double y, double z, double EP, cartesianBox<double> &box)
+{
   int id1 = box.index_of_element(x-EP,y-EP,z-EP);      
   int id2 = box.index_of_element(x+EP,y+EP,z+EP);      
   int i1,j1,k1;
@@ -25,7 +25,8 @@ void insertBoxes ( double x, double y, double z, double EP, cartesianBox<double>
   }
 }
 
-void test(){
+void test()
+{
   printf("enter z coordinate : ");
   double x,y,z=-1;
   scanf ("%lf",&z);
@@ -49,11 +50,10 @@ void test(){
   }
   fprintf(f,"};\n");
   fclose(f);
-  
 }
 
-int main (int argc,char *argv[]){
-  
+int main (int argc,char *argv[])
+{
   //  test();
   //  return 1;
 
diff --git a/utils/api_demos/mainElasticity.cpp b/utils/api_demos/mainElasticity.cpp
index 82b965550271e62f5e41a98e27333e153ccada17..89ce6923b5417ccc64e7797fb3ed4d0642df0d50 100644
--- a/utils/api_demos/mainElasticity.cpp
+++ b/utils/api_demos/mainElasticity.cpp
@@ -1,7 +1,7 @@
-#include <gmsh/Gmsh.h>
-#include <gmsh/elasticitySolver.h>
-#include <gmsh/PView.h>
-#include <gmsh/PViewData.h>
+#include "Gmsh.h"
+#include "elasticitySolver.h"
+#include "PView.h"
+#include "PViewData.h"
 
 int main (int argc, char* argv[]){
   
diff --git a/utils/api_demos/mainGlut.cpp b/utils/api_demos/mainGlut.cpp
index 8fcaa5bc37c2907c324705f28d49004930cd0a7a..67cb5f177dfcb1b25f8a62af4afbb129cf4eb35d 100644
--- a/utils/api_demos/mainGlut.cpp
+++ b/utils/api_demos/mainGlut.cpp
@@ -7,10 +7,10 @@
 #else
 #  include <GL/glut.h>
 #endif
-#include <Gmsh/Gmsh.h>
-#include <gmsh/GModel.h>
-#include <gmsh/MElement.h>
-#include <Gmsh/drawContext.h>
+#include "Gmsh.h"
+#include "GModel.h"
+#include "MElement.h"
+#include "drawContext.h"
 
 drawContext *ctx = 0;
 
diff --git a/utils/api_demos/mainHomology.cpp b/utils/api_demos/mainHomology.cpp
index 00d7639c5c1845b5cd1ce8842d9d29c81772dd63..201ca5a1941e45c12df33e5bc499c5e5eccb1c3a 100644
--- a/utils/api_demos/mainHomology.cpp
+++ b/utils/api_demos/mainHomology.cpp
@@ -8,12 +8,11 @@
 
 #include <stdio.h>
 #include <sstream>
-#include <gmsh/Gmsh.h>
-#include <gmsh/GModel.h>
-#include <gmsh/MElement.h>
-#include <gmsh/CellComplex.h>
-//#include <gmsh/ChainComplex.h>
-#include <gmsh/Homology.h>
+#include "Gmsh.h"
+#include "GModel.h"
+#include "MElement.h"
+#include "CellComplex.h"
+#include "Homology.h"
 
 int main(int argc, char **argv)
 {
diff --git a/utils/api_demos/mainLevelset.cpp b/utils/api_demos/mainLevelset.cpp
index d37f3a0dd84d0534d122b2eaddf8309e0c760695..d6ca525fa33cf2aa050f6783dffccf96c0a71198 100644
--- a/utils/api_demos/mainLevelset.cpp
+++ b/utils/api_demos/mainLevelset.cpp
@@ -1,18 +1,18 @@
 
-#include "../../contrib/DiscreteIntegration/Integration3D.h"
-#include <gmsh/Gmsh.h>
-#include <gmsh/GModel.h>
-#include <gmsh/MElement.h>
-#include <gmsh/MHexahedron.h>
-#include <gmsh/MTetrahedron.h>
-#include <gmsh/MQuadrangle.h>
-#include <gmsh/MTriangle.h>
-#include <gmsh/MLine.h>
-#include "../../contrib/DiscreteIntegration/DILevelset.h"
 #include <time.h>
 #include <iostream>
 #include <queue>
 #include <limits>
+#include "Gmsh.h"
+#include "GModel.h"
+#include "MElement.h"
+#include "MHexahedron.h"
+#include "MTetrahedron.h"
+#include "MQuadrangle.h"
+#include "MTriangle.h"
+#include "MLine.h"
+#include "Integration3D.h"
+#include "DILevelset.h"
 
 #define PI 3.14159265
 
diff --git a/utils/api_demos/mainOcc.cpp b/utils/api_demos/mainOcc.cpp
index 0f3459305a09b3b1c703e482e36128b12a40fa40..e55e6c56ab980aa779cad1eda285e61651db5ccf 100644
--- a/utils/api_demos/mainOcc.cpp
+++ b/utils/api_demos/mainOcc.cpp
@@ -13,10 +13,10 @@
 // -lTKMath -lTKernel -lm
 
 #include <stdio.h>
-#include <gmsh/Gmsh.h>
-#include <gmsh/GmshConfig.h>
-#include <gmsh/GModel.h>
-#include <gmsh/MElement.h>
+#include "Gmsh.h"
+#include "GmshConfig.h"
+#include "GModel.h"
+#include "MElement.h"
 
 #if !defined(HAVE_NO_OCC_CONFIG_H)
 #include "config.h"
diff --git a/utils/api_demos/mainPost.cpp b/utils/api_demos/mainPost.cpp
index 207b27c749d1f945abbdcf5de8c8c3674551d7ab..30ea994456415125ae74069c2e5a117d1257b003 100644
--- a/utils/api_demos/mainPost.cpp
+++ b/utils/api_demos/mainPost.cpp
@@ -1,9 +1,9 @@
-#include <gmsh/Gmsh.h>
-#include <gmsh/GModel.h>
-#include <gmsh/MVertex.h>
-#include <gmsh/PView.h>
-#include <gmsh/PViewData.h>
-#include <gmsh/PluginManager.h>
+#include "Gmsh.h"
+#include "GModel.h"
+#include "MVertex.h"
+#include "PView.h"
+#include "PViewData.h"
+#include "PluginManager.h"
 
 int main(int argc, char **argv)
 {
diff --git a/utils/api_demos/mainSimple.cpp b/utils/api_demos/mainSimple.cpp
index bbeae799428bfd397cb623e11a916aed1fe5bfba..806daa8b4f2c51ca8a59a1a7bd4e7aa4effa3075 100644
--- a/utils/api_demos/mainSimple.cpp
+++ b/utils/api_demos/mainSimple.cpp
@@ -1,7 +1,7 @@
 #include <stdio.h>
-#include <gmsh/Gmsh.h>
-#include <gmsh/GModel.h>
-#include <gmsh/MElement.h>
+#include "Gmsh.h"
+#include "GModel.h"
+#include "MElement.h"
 
 int main(int argc, char **argv)
 {