diff --git a/Fltk/FlGui.h b/Fltk/FlGui.h
index 6bdc2043654074d392ad4393005e0788076bcbe7..2386eee950bb2e661008180a83e86b6cb4d8e3b6 100644
--- a/Fltk/FlGui.h
+++ b/Fltk/FlGui.h
@@ -63,7 +63,9 @@ class FlGui{
   geometryContextWindow *geoContext;
   meshContextWindow *meshContext;
   aboutWindow *about;
+#if (FL_MAJOR_VERSION == 1) && (FL_MINOR_VERSION == 3)
   onelabWindow *onelab;
+#endif
   std::vector<solverWindow*> solver;
  public:
   FlGui(int argc, char **argv);
diff --git a/Fltk/onelabWindow.cpp b/Fltk/onelabWindow.cpp
index 3486501aa3a937d6a2a3664d73af75ff920eaf76..a6100527545e89e291b5f2f07318a1656a376157 100644
--- a/Fltk/onelabWindow.cpp
+++ b/Fltk/onelabWindow.cpp
@@ -3,8 +3,7 @@
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
 
-#include "onelab.h"
-
+#include <FL/Fl.H>
 #if (FL_MAJOR_VERSION == 1) && (FL_MINOR_VERSION == 3)
 #include <FL/Fl_Value_Input.H>
 #include <FL/Fl_Box.H>
@@ -20,6 +19,7 @@
 #include "paletteWindow.h"
 #include "menuWindow.h"
 #include "fileDialogs.h"
+#include "onelab.h"
 #include "onelabWindow.h"
 
 // This file contains the Gmsh/FLTK specific parts of the ONELAB
diff --git a/Fltk/onelabWindow.h b/Fltk/onelabWindow.h
index e2d78e780213601e3a90b17ffc2db7469dad184e..bebc14ada31692232ea0539ac84bbe16ae1a721e 100644
--- a/Fltk/onelabWindow.h
+++ b/Fltk/onelabWindow.h
@@ -6,7 +6,7 @@
 #ifndef _ONELAB_WINDOW_H_
 #define _ONELAB_WINDOW_H_
 
-#include "GmshConfig.h"
+#include <FL/Fl.H>
 #if (FL_MAJOR_VERSION == 1) && (FL_MINOR_VERSION == 3)
 #include <vector>
 #include <FL/Fl_Window.H>