diff -rupN gmsh-4.1.5-source/Common/CommandLine.cpp gmsh-4.1.5-source-new/Common/CommandLine.cpp
--- gmsh-4.1.5-source/Common/CommandLine.cpp 2019-02-15 11:40:33.713750444 +0100
+++ gmsh-4.1.5-source-new/Common/CommandLine.cpp 2019-02-15 11:40:33.716750442 +0100
@@ -22,15 +22,6 @@
#include "GmshGlobal.h"
#include "StringUtils.h"
-#if defined(HAVE_FLTK)
-#include <FL/Fl.H>
-#if (FL_MAJOR_VERSION == 1) && (FL_MINOR_VERSION >= 3)
-// OK
-#else
-#error "Gmsh requires FLTK >= 1.3"
-#endif
-#endif
-
#if defined(HAVE_PETSC)
#include "petsc.h"
#endif
@@ -51,6 +42,15 @@
#include "Parser.h"
#endif
+#if defined(HAVE_FLTK)
+#include <FL/Fl.H>
+#if (FL_MAJOR_VERSION == 1) && (FL_MINOR_VERSION >= 3)
+// OK
+#else
+#error "Gmsh requires FLTK >= 1.3"
+#endif
+#endif
+
int GetGmshMajorVersion(){ return GMSH_MAJOR_VERSION; }
int GetGmshMinorVersion(){ return GMSH_MINOR_VERSION; }
int GetGmshPatchVersion(){ return GMSH_PATCH_VERSION; }
diff -rupN gmsh-4.1.5-source/Fltk/helpWindow.cpp gmsh-4.1.5-source-new/Fltk/helpWindow.cpp
--- gmsh-4.1.5-source/Fltk/helpWindow.cpp 2019-02-15 11:40:33.713750444 +0100
+++ gmsh-4.1.5-source-new/Fltk/helpWindow.cpp 2019-02-15 11:40:33.716750442 +0100
@@ -3,13 +3,18 @@
// See the LICENSE.txt file for license information. Please report all
// issues on https://gitlab.onelab.info/gmsh/gmsh/issues.
+#include "GmshConfig.h"
+
+#if defined(HAVE_MED)
+#include <med/med.h>
+#endif
+
#include <sstream>
#include <algorithm>
#include <FL/Fl_Help_View.H>
#include <FL/Fl_Check_Button.H>
#include <FL/Fl_Input.H>
#include <FL/Fl_Color_Chooser.H>
-#include "GmshConfig.h"
#include "FlGui.h"
#include "inputValue.h"
#include "helpWindow.h"
@@ -33,10 +38,6 @@
#include "Standard_Version.hxx"
#endif
-#if defined(HAVE_MED)
-#include <med/med.h>
-#endif
-
static const char *help_link(Fl_Widget *w, const char *uri)
{
fl_open_uri(uri);
diff -rupN gmsh-4.1.5-source/Geo/GModelIO_MED.cpp gmsh-4.1.5-source-new/Geo/GModelIO_MED.cpp
--- gmsh-4.1.5-source/Geo/GModelIO_MED.cpp 2019-02-15 11:40:33.714750443 +0100
+++ gmsh-4.1.5-source-new/Geo/GModelIO_MED.cpp 2019-02-15 11:40:33.716750442 +0100
@@ -26,9 +26,7 @@
#include "discreteVertex.h"
#include "Context.h"
-extern "C" {
#include <med/med.h>
-}
#if(MED_MAJOR_NUM >= 3)
// To avoid too many ifdefs below we use defines for the bits of the
diff -rupN gmsh-4.1.5-source/Post/PViewDataGModelIO.cpp gmsh-4.1.5-source-new/Post/PViewDataGModelIO.cpp
--- gmsh-4.1.5-source/Post/PViewDataGModelIO.cpp 2019-02-15 11:40:33.714750443 +0100
+++ gmsh-4.1.5-source-new/Post/PViewDataGModelIO.cpp 2019-02-15 11:40:33.716750442 +0100
@@ -469,9 +469,7 @@ void PViewDataGModel::importLists(int N[
#if defined(HAVE_MED)
-extern "C" {
#include <med/med.h>
-}
#if(MED_MAJOR_NUM >= 3)
// To avoid too many ifdefs below we use defines for the bits of the