diff -rupN gmsh-2.9.0-source/contrib/HighOrderMeshOptimizer/OptHOM.cpp gmsh-2.9.0-source-new/contrib/HighOrderMeshOptimizer/OptHOM.cpp
--- gmsh-2.9.0-source/contrib/HighOrderMeshOptimizer/OptHOM.cpp	2015-01-05 09:42:50.000000000 +0100
+++ gmsh-2.9.0-source-new/contrib/HighOrderMeshOptimizer/OptHOM.cpp	2015-03-14 00:50:16.890042054 +0100
@@ -44,11 +44,11 @@ static int NEVAL = 0;
 
 #if defined(HAVE_BFGS)
 
-#include "ap.h"
-#include "alglibinternal.h"
-#include "alglibmisc.h"
-#include "linalg.h"
-#include "optimization.h"
+#include <alglib/ap.h>
+#include <alglib/alglibinternal.h>
+#include <alglib/alglibmisc.h>
+#include <alglib/linalg.h>
+#include <alglib/optimization.h>
 
 static inline double compute_f(double v, double barrier)
 {
diff -rupN gmsh-2.9.0-source/contrib/HighOrderMeshOptimizer/OptHOM.h gmsh-2.9.0-source-new/contrib/HighOrderMeshOptimizer/OptHOM.h
--- gmsh-2.9.0-source/contrib/HighOrderMeshOptimizer/OptHOM.h	2015-01-05 09:42:50.000000000 +0100
+++ gmsh-2.9.0-source-new/contrib/HighOrderMeshOptimizer/OptHOM.h	2015-03-14 00:50:16.891042073 +0100
@@ -38,7 +38,7 @@
 
 #if defined(HAVE_BFGS)
 
-#include "ap.h"
+#include <alglib/ap.h>
 
 class OptHOM
 {
diff -rupN gmsh-2.9.0-source/contrib/MeshOptimizer/MeshOpt.cpp gmsh-2.9.0-source-new/contrib/MeshOptimizer/MeshOpt.cpp
--- gmsh-2.9.0-source/contrib/MeshOptimizer/MeshOpt.cpp	2015-01-05 09:42:50.000000000 +0100
+++ gmsh-2.9.0-source-new/contrib/MeshOptimizer/MeshOpt.cpp	2015-03-14 00:52:02.676089780 +0100
@@ -38,11 +38,11 @@
 
 #if defined(HAVE_BFGS)
 
-#include "ap.h"
-#include "alglibinternal.h"
-#include "alglibmisc.h"
-#include "linalg.h"
-#include "optimization.h"
+#include <alglib/ap.h>
+#include <alglib/alglibinternal.h>
+#include <alglib/alglibmisc.h>
+#include <alglib/linalg.h>
+#include <alglib/optimization.h>
 
 
 namespace {
diff -rupN gmsh-2.9.0-source/contrib/MeshOptimizer/MeshOpt.h gmsh-2.9.0-source-new/contrib/MeshOptimizer/MeshOpt.h
--- gmsh-2.9.0-source/contrib/MeshOptimizer/MeshOpt.h	2015-01-05 09:42:50.000000000 +0100
+++ gmsh-2.9.0-source-new/contrib/MeshOptimizer/MeshOpt.h	2015-03-14 00:51:32.175497694 +0100
@@ -37,7 +37,7 @@
 
 #if defined(HAVE_BFGS)
 
-#include "ap.h"
+#include <alglib/ap.h>
 
 
 class MeshOptParameters;
diff -rupN gmsh-2.9.0-source/contrib/MeshOptimizer/MeshOptObjContrib.h gmsh-2.9.0-source-new/contrib/MeshOptimizer/MeshOptObjContrib.h
--- gmsh-2.9.0-source/contrib/MeshOptimizer/MeshOptObjContrib.h	2014-10-24 09:37:44.000000000 +0200
+++ gmsh-2.9.0-source-new/contrib/MeshOptimizer/MeshOptObjContrib.h	2015-03-14 00:50:46.526614036 +0100
@@ -4,7 +4,7 @@
 #define _MESHOPTOBJCONTRIB_H_
 
 #include <string>
-#include "ap.h"
+#include <alglib/ap.h>
 #include "MeshOptCommon.h"
 
 
diff -rupN gmsh-2.9.0-source/contrib/MeshOptimizer/MeshOptObjectiveFunction.h gmsh-2.9.0-source-new/contrib/MeshOptimizer/MeshOptObjectiveFunction.h
--- gmsh-2.9.0-source/contrib/MeshOptimizer/MeshOptObjectiveFunction.h	2014-10-24 09:37:44.000000000 +0200
+++ gmsh-2.9.0-source-new/contrib/MeshOptimizer/MeshOptObjectiveFunction.h	2015-03-14 00:51:25.975377494 +0100
@@ -5,7 +5,7 @@
 
 #include <string>
 #include <vector>
-#include "ap.h"
+#include <alglib/ap.h>
 
 class ObjContrib;
 class Patch;
diff -rupN gmsh-2.9.0-source/Geo/GFace.cpp gmsh-2.9.0-source-new/Geo/GFace.cpp
--- gmsh-2.9.0-source/Geo/GFace.cpp	2015-03-08 14:03:26.000000000 +0100
+++ gmsh-2.9.0-source-new/Geo/GFace.cpp	2015-03-14 00:50:16.891042073 +0100
@@ -26,8 +26,8 @@
 #endif
 
 #if defined(HAVE_BFGS)
-#include "stdafx.h"
-#include "optimization.h"
+#include <alglib/stdafx.h>
+#include <alglib/optimization.h>
 #endif
 
 #define SQU(a)      ((a)*(a))
diff -rupN gmsh-2.9.0-source/Mesh/Levy3D.cpp gmsh-2.9.0-source-new/Mesh/Levy3D.cpp
--- gmsh-2.9.0-source/Mesh/Levy3D.cpp	2015-03-08 14:03:14.000000000 +0100
+++ gmsh-2.9.0-source-new/Mesh/Levy3D.cpp	2015-03-14 00:50:16.892042092 +0100
@@ -19,11 +19,11 @@
 #include "directions3D.h"
 
 #if defined(HAVE_BFGS)
-#include "ap.h"
-#include "alglibinternal.h"
-#include "alglibmisc.h"
-#include "linalg.h"
-#include "optimization.h"
+#include <alglib/ap.h>
+#include <alglib/alglibinternal.h>
+#include <alglib/alglibmisc.h>
+#include <alglib/linalg.h>
+#include <alglib/optimization.h>
 #endif
 
 /*********definitions*********/
diff -rupN gmsh-2.9.0-source/Mesh/meshGFaceLloyd.cpp gmsh-2.9.0-source-new/Mesh/meshGFaceLloyd.cpp
--- gmsh-2.9.0-source/Mesh/meshGFaceLloyd.cpp	2015-03-08 14:03:14.000000000 +0100
+++ gmsh-2.9.0-source-new/Mesh/meshGFaceLloyd.cpp	2015-03-14 00:50:16.893042112 +0100
@@ -22,11 +22,11 @@
 
 #if defined(HAVE_BFGS)
 
-#include "ap.h"
-#include "alglibinternal.h"
-#include "alglibmisc.h"
-#include "linalg.h"
-#include "optimization.h"
+#include <alglib/ap.h>
+#include <alglib/alglibinternal.h>
+#include <alglib/alglibmisc.h>
+#include <alglib/linalg.h>
+#include <alglib/optimization.h>
 #include "polynomialBasis.h"
 #include "MElementOctree.h"
 #include "GModel.h"
diff -rupN gmsh-2.9.0-source/Mesh/meshGFaceOptimize.cpp gmsh-2.9.0-source-new/Mesh/meshGFaceOptimize.cpp
--- gmsh-2.9.0-source/Mesh/meshGFaceOptimize.cpp	2015-03-08 14:03:14.000000000 +0100
+++ gmsh-2.9.0-source-new/Mesh/meshGFaceOptimize.cpp	2015-03-14 00:50:16.895042150 +0100
@@ -26,8 +26,8 @@
 #include "robustPredicates.h"
 
 #if defined(HAVE_BFGS)
-#include "stdafx.h"
-#include "optimization.h"
+#include <alglib/stdafx.h>
+#include <alglib/optimization.h>
 #endif
 
 #if defined(HAVE_POST)