9 files changed, 33 insertions, 18 deletions
diff --git a/make/stub_includes/opengl/gl2.c b/make/stub_includes/opengl/gl2.c
index 1d2a67ae7..037d67d0b 100644
--- a/make/stub_includes/opengl/gl2.c
+++ b/make/stub_includes/opengl/gl2.c
@@ -4,5 +4,6 @@
 // "glext.h" are parsed.
 #define GL_GLEXT_PROTOTYPES
 
+#include <GL/glext-supplement.h>
 #include <GL/gl.h>
 #include <GL/glext.h>
diff --git a/make/stub_includes/opengl/gl3bc.c b/make/stub_includes/opengl/gl3bc.c
index a40fe13c1..81f7a50d6 100644
--- a/make/stub_includes/opengl/gl3bc.c
+++ b/make/stub_includes/opengl/gl3bc.c
@@ -3,6 +3,7 @@
 // Define GL_GLEXT_PROTOTYPES so that the OpenGL extension prototypes are parsed.
 #define GL_GLEXT_PROTOTYPES
 
+#include <GL/glext-supplement.h>
 #include <GL/gl.h>
 #include <GL/glext.h>
 
diff --git a/make/stub_includes/opengl/gl4bc.c b/make/stub_includes/opengl/gl4bc.c
index a40fe13c1..81f7a50d6 100644
--- a/make/stub_includes/opengl/gl4bc.c
+++ b/make/stub_includes/opengl/gl4bc.c
@@ -3,6 +3,7 @@
 // Define GL_GLEXT_PROTOTYPES so that the OpenGL extension prototypes are parsed.
 #define GL_GLEXT_PROTOTYPES
 
+#include <GL/glext-supplement.h>
 #include <GL/gl.h>
 #include <GL/glext.h>
 
diff --git a/make/stub_includes/opengl/gles1.c b/make/stub_includes/opengl/gles1.c
index ff6056ce8..f8ae02f44 100644
--- a/make/stub_includes/opengl/gles1.c
+++ b/make/stub_includes/opengl/gles1.c
@@ -5,5 +5,6 @@
 // "glext.h" are parsed.
 #define GL_GLEXT_PROTOTYPES
 
+#include <GLES/glext-supplement.h>
 #include <GLES/gl.h>
 #include <GLES/glext.h>
diff --git a/make/stub_includes/opengl/gles2.c b/make/stub_includes/opengl/gles2.c
index cbc5cf847..a1e108803 100644
--- a/make/stub_includes/opengl/gles2.c
+++ b/make/stub_includes/opengl/gles2.c
@@ -2,8 +2,10 @@
 #define GL_APIENTRY
 
 // Define GL_GLEXT_PROTOTYPES so that the OpenGL extension prototypes in
-// "glext.h" are parsed.
+// "gl2ext.h" are parsed.
 #define GL_GLEXT_PROTOTYPES
 
+#include <GLES2/gl2ext-supplement.h>
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
+
diff --git a/make/stub_includes/opengl/gles3.c b/make/stub_includes/opengl/gles3.c
index 3d2ad8c75..437d61a60 100644
--- a/make/stub_includes/opengl/gles3.c
+++ b/make/stub_includes/opengl/gles3.c
@@ -2,11 +2,13 @@
 #define GL_APIENTRY
 
 // Define GL_GLEXT_PROTOTYPES so that the OpenGL extension prototypes in
-// "glext.h" are parsed.
+// "gl2ext.h" and "gl3ext.h" are parsed.
 #define GL_GLEXT_PROTOTYPES
 
-#include <GLES3/gl3.h>
+#include <GLES3/gl31.h>
 #include <GLES3/gl3ext.h>
 
-/** We assume ES2 extensions maybe avail on ES3 .. */
+/** Shared between ES2 and ES3 .. */
+#include <GLES2/gl2ext-supplement.h>
 #include <GLES2/gl2ext.h>
+
diff --git a/make/stub_includes/win32/wglext.c b/make/stub_includes/win32/wglext.c
index 9c6120411..60c1f74ac 100644
--- a/make/stub_includes/win32/wglext.c
+++ b/make/stub_includes/win32/wglext.c
@@ -10,4 +10,5 @@
 #define WGL_WGLEXT_PROTOTYPES
 #define SKIP_WGL_HANDLE_DEFINITIONS
 #include <windows.h>
+#include <wingdi_types.h>
 #include <GL/wglext.h>
diff --git a/make/stub_includes/x11/glxext.c b/make/stub_includes/x11/glxext.c
index 67906a088..e781b6e88 100644
--- a/make/stub_includes/x11/glxext.c
+++ b/make/stub_includes/x11/glxext.c
@@ -1,14 +1,17 @@
-#define GLAPI
+// Routines needed from Xlib.h and Xutil.h (placed here to avoid having
+// XVisualInfo generated multiple times)
+#ifndef _Xconst
+#define _Xconst const
+#endif /* _Xconst */
 
-// Define GL_GLEXT_PROTOTYPES so that the OpenGL extension prototypes in
-// "glext.h" are parsed.
+// Define GL_GLEXT_PROTOTYPES so that the OpenGL GLX extension prototypes in
+// "glx.h" are parsed.
 #define GL_GLEXT_PROTOTYPES
 
-#include <GL/gl.h>
-
 // Define GLX_GLXEXT_PROTOTYPES so that the OpenGL GLX extension prototypes in
 // "glxext.h" are parsed.
 #define GLX_GLXEXT_PROTOTYPES
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
-#include <GL/glxext.h>
+#include <GL/glx.h>
+// GL/glxext.h included by GL/glx.h
diff --git a/make/stub_includes/x11/window-system1.c b/make/stub_includes/x11/window-system1.c
index a06f39dae..e781b6e88 100644
--- a/make/stub_includes/x11/window-system1.c
+++ b/make/stub_includes/x11/window-system1.c
@@ -1,14 +1,17 @@
-// Define GL_GLEXT_PROTOTYPES so that the OpenGL extension prototypes in
-// "glext.h" are parsed.
-#define GL_GLEXT_PROTOTYPES
-
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <GL/glx.h>
-
 // Routines needed from Xlib.h and Xutil.h (placed here to avoid having
 // XVisualInfo generated multiple times)
 #ifndef _Xconst
 #define _Xconst const
 #endif /* _Xconst */
 
+// Define GL_GLEXT_PROTOTYPES so that the OpenGL GLX extension prototypes in
+// "glx.h" are parsed.
+#define GL_GLEXT_PROTOTYPES
+
+// Define GLX_GLXEXT_PROTOTYPES so that the OpenGL GLX extension prototypes in
+// "glxext.h" are parsed.
+#define GLX_GLXEXT_PROTOTYPES
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <GL/glx.h>
+// GL/glxext.h included by GL/glx.h