diff --git a/Geo/GFaceCompound.cpp b/Geo/GFaceCompound.cpp
index 04076a4503050aba58391c932e56daa00eaeeb13..f11549ca8d73c6cc45c97f2abc9e2e496f7640a6 100644
--- a/Geo/GFaceCompound.cpp
+++ b/Geo/GFaceCompound.cpp
@@ -45,7 +45,7 @@
 #include "MPoint.h"
 #include "Numeric.h"
 #include "meshGFace.h"
-#include <ANN/ANN.h>
+#include "ANN/ANN.h"
 
 static void fixEdgeToValue(GEdge *ed, double value, dofManager<double> &myAssembler)
 {
diff --git a/Geo/GRbf.cpp b/Geo/GRbf.cpp
index 4c5189990e7a41585cb7c97b58307fec0eed8e7a..d91468e9c3544d10280034837d8615c563200157 100644
--- a/Geo/GRbf.cpp
+++ b/Geo/GRbf.cpp
@@ -24,7 +24,7 @@
 #endif
 
 #if defined(HAVE_ANN)
-#include <ANN/ANN.h>
+#include "ANN/ANN.h"
 #endif
 
 static void SphereBB(void *a, double*mmin, double*mmax)
diff --git a/Mesh/BackgroundMesh.h b/Mesh/BackgroundMesh.h
index 812ad9c60b06962b8bc73bed7d03f70cb440d623..7080c953c3da1c853fad91a04173c4bb63b17953 100644
--- a/Mesh/BackgroundMesh.h
+++ b/Mesh/BackgroundMesh.h
@@ -13,7 +13,7 @@
 #include "BackgroundMeshTools.h"
 
 #if defined(HAVE_ANN)
-#include <ANN/ANN.h>
+#include "ANN/ANN.h"
 class ANNkd_tree;
 #endif
 
diff --git a/Mesh/BackgroundMesh3D.h b/Mesh/BackgroundMesh3D.h
index 078ce130b4cd008ae9ae9349f7295170c88d95b8..9b70f5d6f6bcb09ff12d7dffdac791ac39a50204 100644
--- a/Mesh/BackgroundMesh3D.h
+++ b/Mesh/BackgroundMesh3D.h
@@ -18,7 +18,7 @@
 #include "pointInsertion.h"
 
 #if defined(HAVE_ANN)
-#include <ANN/ANN.h>
+#include "ANN/ANN.h"
 class ANNkd_tree;
 #endif
 
diff --git a/Mesh/CenterlineField.cpp b/Mesh/CenterlineField.cpp
index 3a743493e53c98ad948cf19a37981a8338c5688b..e776297ce7280583ece93bdf3603fec4cf7ca443 100644
--- a/Mesh/CenterlineField.cpp
+++ b/Mesh/CenterlineField.cpp
@@ -44,8 +44,7 @@
 #include "meshGRegion.h"
 
 #if defined(HAVE_ANN)
-#include <ANN/ANN.h>
-
+#include "ANN/ANN.h"
 
 static void erase(std::vector<MLine*>& lines, MLine* l)
 {
diff --git a/Mesh/meshGFaceElliptic.cpp b/Mesh/meshGFaceElliptic.cpp
index 99652442405669c271f7a3a78927f70547ba79f0..dab38e12a29d192189fa05f42995752b3eef0fb5 100644
--- a/Mesh/meshGFaceElliptic.cpp
+++ b/Mesh/meshGFaceElliptic.cpp
@@ -27,7 +27,7 @@
 #include "fullMatrix.h"
 #include "CenterlineField.h"
 #if defined(HAVE_ANN)
-#include <ANN/ANN.h>
+#include "ANN/ANN.h"
 #endif
 
 #define TRAN_QUAD(c1,c2,c3,c4,s1,s2,s3,s4,u,v) \
diff --git a/contrib/mobile/utils/onelab_android_build.sh b/contrib/mobile/utils/onelab_android_build.sh
index f30103c9f016063928963687507b046a79564cb9..a59de38742f16f61850ed3ac5de048d6a4711bb5 100755
--- a/contrib/mobile/utils/onelab_android_build.sh
+++ b/contrib/mobile/utils/onelab_android_build.sh
@@ -36,7 +36,7 @@ if [ ! -d "$gmsh_svn/build_android" ] || [ ! -f "$gmsh_svn/build_android/CMakeCa
   mkdir $gmsh_svn/build_android
 fi
 cd $gmsh_svn/build_android
-cmake $cmake_default -DENABLE_BLAS_LAPACK=1 -DENABLE_BUILD_SHARED=1 -DENABLE_MATHEX=1 -DENABLE_MESH=1 -DENABLE_ONELAB=1 -DENABLE_PARSER=1 -DENABLE_POST=1 -DENABLE_TETGEN=1 -DBLAS_LIB="$petsc_lib/libf2cblas.so" -DLAPACK_LIB="$petsc_lib/libf2clapack.so" ..
+cmake $cmake_default -DENABLE_BLAS_LAPACK=1 -DENABLE_BUILD_SHARED=1 -DENABLE_MATHEX=1 -DENABLE_MESH=1 -DENABLE_ONELAB=1 -DENABLE_PARSER=1 -DENABLE_POST=1 -DENABLE_ANN=1 -DENABLE_TETGEN=1 -DBLAS_LIB="$petsc_lib/libf2cblas.so" -DLAPACK_LIB="$petsc_lib/libf2clapack.so" ..
 check
 make androidGmsh -j$cmake_thread
 check
diff --git a/contrib/mobile/utils/onelab_ios_build.sh b/contrib/mobile/utils/onelab_ios_build.sh
index 6e7930880a19db1939d2360365f7463609d9cd03..ae479714d62118679a1e57ab39d2834b40030e22 100755
--- a/contrib/mobile/utils/onelab_ios_build.sh
+++ b/contrib/mobile/utils/onelab_ios_build.sh
@@ -29,7 +29,7 @@ function build_gmsh {
     mkdir $gmsh_svn/build_ios_$1
   fi
   cd $gmsh_svn/build_ios_$1
-  cmake $cmake_default -DENABLE_BLAS_LAPACK=1 -DENABLE_BUILD_LIB=1 -DENABLE_MATHEX=1 -DENABLE_MESH=1 -DENABLE_ONELAB=1 -DENABLE_PARSER=1 -DENABLE_POST=1 -DENABLE_TETGEN=1 -DCMAKE_OSX_ARCHITECTURES="$1" ..
+  cmake $cmake_default -DENABLE_BLAS_LAPACK=1 -DENABLE_BUILD_LIB=1 -DENABLE_MATHEX=1 -DENABLE_MESH=1 -DENABLE_ONELAB=1 -DENABLE_PARSER=1 -DENABLE_POST=1 -DENABLE_ANN=1 -DENABLE_TETGEN=1 -DCMAKE_OSX_ARCHITECTURES="$1" ..
   check
   $build_cmd
   check
diff --git a/contrib/mobile/utils/onelab_iossimulator_build.sh b/contrib/mobile/utils/onelab_iossimulator_build.sh
index 77ea8e6300229d5760fa4363f195bd617339ce14..1fa4b42ccfc0669b2ca46023a04dd24bb4e6fc09 100755
--- a/contrib/mobile/utils/onelab_iossimulator_build.sh
+++ b/contrib/mobile/utils/onelab_iossimulator_build.sh
@@ -17,7 +17,7 @@ function build_gmsh {
     mkdir $gmsh_svn/build_iossimulator
   fi
   cd $gmsh_svn/build_iossimulator
-  cmake $cmake_default -DENABLE_BLAS_LAPACK=1 -DENABLE_BUILD_LIB=1 -DENABLE_MATHEX=1 -DENABLE_MESH=1 -DENABLE_ONELAB=1 -DENABLE_PARSER=1 -DENABLE_POST=1 -DENABLE_TETGEN=1 ..
+  cmake $cmake_default -DENABLE_BLAS_LAPACK=1 -DENABLE_BUILD_LIB=1 -DENABLE_MATHEX=1 -DENABLE_MESH=1 -DENABLE_ONELAB=1 -DENABLE_PARSER=1 -DENABLE_POST=1 -DENABLE_ANN=1 -DENABLE_TETGEN=1 ..
   $build_cmd
   $headers_cmd
   cd -