diff --git a/Common/ListUtils.cpp b/Common/ListUtils.cpp
index beb8ecaf1bfc4da6587e759e452f900c3b33225a..3d9ffbc04bb5b5a1d95a048cda33a067709f3e7e 100644
--- a/Common/ListUtils.cpp
+++ b/Common/ListUtils.cpp
@@ -9,9 +9,7 @@
 
 #include "GmshConfig.h"
 #if defined(HAVE_NO_INTPTR_T)
-typedef unsigned intptr_t;
-#else
-#include <stdint.h>
+typedef unsigned long intptr_t;
 #endif
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/Common/avl.cpp b/Common/avl.cpp
index 3bccf2cbdf6b7a5c1c3062b1bdf4d1b10c1c21cd..11381b9d4753de226627661bcc6a7cb2fa9d0400 100644
--- a/Common/avl.cpp
+++ b/Common/avl.cpp
@@ -27,9 +27,7 @@
 
 #include "GmshConfig.h"
 #if defined(HAVE_NO_INTPTR_T)
-typedef unsigned intptr_t;
-#else
-#include <stdint.h>
+typedef unsigned long intptr_t;
 #endif
 #include <stdio.h>
 #include "avl.h"
diff --git a/Fltk/FlGui.cpp b/Fltk/FlGui.cpp
index ea0dff1db5fdb5482874fe13e2843d5745599ca0..e7493e19703b65c998418ab7c8e8d71552a7a0b1 100644
--- a/Fltk/FlGui.cpp
+++ b/Fltk/FlGui.cpp
@@ -5,9 +5,7 @@
 
 #include "GmshConfig.h"
 #if defined(HAVE_NO_INTPTR_T)
-typedef unsigned intptr_t;
-#else
-#include <stdint.h>
+typedef unsigned long intptr_t;
 #endif
 #include <sstream>
 #include <string.h>
diff --git a/Fltk/menuWindow.cpp b/Fltk/menuWindow.cpp
index caac5e5faa4140eff924764c4e1a8eac8692542c..75cdbc46dfda0a4a104ec4d0a490cae316cc3a75 100644
--- a/Fltk/menuWindow.cpp
+++ b/Fltk/menuWindow.cpp
@@ -5,9 +5,7 @@
 
 #include "GmshConfig.h"
 #if defined(HAVE_NO_INTPTR_T)
-typedef unsigned intptr_t;
-#else
-#include <stdint.h>
+typedef unsigned long intptr_t;
 #endif
 #include <string.h>
 #include <stdlib.h>
diff --git a/Fltk/optionWindow.cpp b/Fltk/optionWindow.cpp
index cee1eecff22bc8dd4d2941439073027daf2da32a..b8782983af2b2967520759b99a5010ba0191d28d 100644
--- a/Fltk/optionWindow.cpp
+++ b/Fltk/optionWindow.cpp
@@ -3,12 +3,14 @@
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
 
+#include "GmshConfig.h"
+#if defined(HAVE_NO_INTPTR_T)
+typedef unsigned long intptr_t;
+#endif
 #include <string.h>
-#include <stdint.h>
 #include <FL/Fl_Tabs.H>
 #include <FL/Fl_Scroll.H>
 #include <FL/Fl_Color_Chooser.H>
-#include "GmshConfig.h"
 #include "GmshDefines.h"
 #include "GmshMessage.h"
 #include "FlGui.h"
diff --git a/Fltk/pluginWindow.cpp b/Fltk/pluginWindow.cpp
index aa9296775ba6c098bcec4533376a41234bd5bdfe..5b79ec4362994b9cbb01e7389a9bdd8843a90e2d 100644
--- a/Fltk/pluginWindow.cpp
+++ b/Fltk/pluginWindow.cpp
@@ -5,9 +5,7 @@
 
 #include "GmshConfig.h"
 #if defined(HAVE_NO_INTPTR_T)
-typedef unsigned intptr_t;
-#else
-#include <stdint.h>
+typedef unsigned long intptr_t;
 #endif
 #include <vector>
 #include <string.h>
diff --git a/Fltk/visibilityWindow.cpp b/Fltk/visibilityWindow.cpp
index 069cfdd071d3ce8197fc62bc1aa39e9166ff69ae..e3b1f74cb7abbdf7dd2d694a9ac0e2400f0c0f37 100644
--- a/Fltk/visibilityWindow.cpp
+++ b/Fltk/visibilityWindow.cpp
@@ -5,9 +5,7 @@
 
 #include "GmshConfig.h"
 #if defined(HAVE_NO_INTPTR_T)
-typedef unsigned intptr_t;
-#else
-#include <stdint.h>
+typedef unsigned long intptr_t;
 #endif
 #include <string>
 #include <sstream>