diff -rupN gmsh-2.8.4-source/Geo/GFace.cpp gmsh-2.8.4-source-new/Geo/GFace.cpp
--- gmsh-2.8.4-source/Geo/GFace.cpp	2014-02-07 08:31:21.000000000 +0100
+++ gmsh-2.8.4-source-new/Geo/GFace.cpp	2014-06-14 03:58:59.651500043 +0200
@@ -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.8.4-source/Mesh/Levy3D.cpp gmsh-2.8.4-source-new/Mesh/Levy3D.cpp
--- gmsh-2.8.4-source/Mesh/Levy3D.cpp	2014-02-07 08:31:16.000000000 +0100
+++ gmsh-2.8.4-source-new/Mesh/Levy3D.cpp	2014-06-14 13:36:11.456929459 +0200
@@ -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.8.4-source/Mesh/meshGFaceLloyd.cpp gmsh-2.8.4-source-new/Mesh/meshGFaceLloyd.cpp
--- gmsh-2.8.4-source/Mesh/meshGFaceLloyd.cpp	2014-02-07 08:31:16.000000000 +0100
+++ gmsh-2.8.4-source-new/Mesh/meshGFaceLloyd.cpp	2014-06-14 13:17:49.104962030 +0200
@@ -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.8.4-source/Mesh/meshGFaceOptimize.cpp gmsh-2.8.4-source-new/Mesh/meshGFaceOptimize.cpp
--- gmsh-2.8.4-source/Mesh/meshGFaceOptimize.cpp	2014-02-07 08:31:16.000000000 +0100
+++ gmsh-2.8.4-source-new/Mesh/meshGFaceOptimize.cpp	2014-06-14 13:18:10.555961396 +0200
@@ -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)
diff -rupN gmsh-2.8.4-source/contrib/HighOrderMeshOptimizer/OptHOM.cpp gmsh-2.8.4-source-new/contrib/HighOrderMeshOptimizer/OptHOM.cpp
--- gmsh-2.8.4-source/contrib/HighOrderMeshOptimizer/OptHOM.cpp	2014-02-07 08:31:18.000000000 +0100
+++ gmsh-2.8.4-source-new/contrib/HighOrderMeshOptimizer/OptHOM.cpp	2014-06-14 17:41:43.537494175 +0200
@@ -37,11 +37,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>
 
 static inline double compute_f(double v, double barrier)
 {
diff -rupN gmsh-2.8.4-source/contrib/HighOrderMeshOptimizer/OptHOM.h gmsh-2.8.4-source-new/contrib/HighOrderMeshOptimizer/OptHOM.h
--- gmsh-2.8.4-source/contrib/HighOrderMeshOptimizer/OptHOM.h	2013-11-04 19:08:40.000000000 +0100
+++ gmsh-2.8.4-source-new/contrib/HighOrderMeshOptimizer/OptHOM.h	2014-06-14 17:41:28.652494615 +0200
@@ -37,7 +37,7 @@
 
 #if defined(HAVE_BFGS)
 
-#include "ap.h"
+#include <alglib/ap.h>
 
 class OptHOM
 {