10 files changed, 16 insertions, 5 deletions
diff --git a/make/stub_includes/egl/window-system-ext.c b/make/stub_includes/egl/window-system-ext.c
index 7398847ac..3e0d705f3 100644
--- a/make/stub_includes/egl/window-system-ext.c
+++ b/make/stub_includes/egl/window-system-ext.c
@@ -1,7 +1,9 @@
-#define USE_GLUEGEN
+#define EGLAPI
+#define EGLAPIENTRY
 
 // Define EGL_EGLEXT_PROTOTYPES so that the EGL extension prototypes in
 // "eglext.h" are parsed.
 #define EGL_EGLEXT_PROTOTYPES
 
+#include <EGL/egl.h>
 #include <EGL/eglext.h>
diff --git a/make/stub_includes/egl/window-system1.c b/make/stub_includes/egl/window-system1.c
index fbd0f0cde..630ae5339 100644
--- a/make/stub_includes/egl/window-system1.c
+++ b/make/stub_includes/egl/window-system1.c
@@ -1,2 +1,4 @@
-#define USE_GLUEGEN
+#define EGLAPI
+#define EGLAPIENTRY
+
 #include <EGL/egl.h>
diff --git a/make/stub_includes/opengl/gl2.c b/make/stub_includes/opengl/gl2.c
index e91ee95f3..1d2a67ae7 100644
--- a/make/stub_includes/opengl/gl2.c
+++ b/make/stub_includes/opengl/gl2.c
@@ -5,3 +5,4 @@
 #define GL_GLEXT_PROTOTYPES
 
 #include <GL/gl.h>
+#include <GL/glext.h>
diff --git a/make/stub_includes/opengl/gl2es12.c b/make/stub_includes/opengl/gl2es12.c
index bc9d24ace..514393f0b 100644
--- a/make/stub_includes/opengl/gl2es12.c
+++ b/make/stub_includes/opengl/gl2es12.c
@@ -5,4 +5,5 @@
 #define GL_GLEXT_PROTOTYPES
 
 #include <GL/gl.h>
+#include <GL/glext.h>
 
diff --git a/make/stub_includes/opengl/gl3.c b/make/stub_includes/opengl/gl3.c
index a66cdb2dd..ff035e40b 100644
--- a/make/stub_includes/opengl/gl3.c
+++ b/make/stub_includes/opengl/gl3.c
@@ -9,4 +9,5 @@
 #define GL_GL3EXT_PROTOTYPES
 
 #include <GL3/gl3.h>
+#include <GL3/gl3ext.h>
 
diff --git a/make/stub_includes/opengl/gl3bc.c b/make/stub_includes/opengl/gl3bc.c
index 262e005f7..eed7c9c26 100644
--- a/make/stub_includes/opengl/gl3bc.c
+++ b/make/stub_includes/opengl/gl3bc.c
@@ -5,6 +5,7 @@
 #define GL_GLEXT_PROTOTYPES
 
 #include <GL/gl.h>
+#include <GL/glext.h>
 
 // Define GL3_PROTOTYPES so that the OpenGL prototypes in
 // "gl3.h" are parsed.
diff --git a/make/stub_includes/opengl/gl4.c b/make/stub_includes/opengl/gl4.c
index 5e9d87ccd..3a3adf0f4 100644
--- a/make/stub_includes/opengl/gl4.c
+++ b/make/stub_includes/opengl/gl4.c
@@ -9,3 +9,4 @@
 #define GL_GL3EXT_PROTOTYPES
 
 #include <GL3/gl3.h>
+#include <GL3/gl3ext.h>
diff --git a/make/stub_includes/opengl/gl4bc.c b/make/stub_includes/opengl/gl4bc.c
index 262e005f7..eed7c9c26 100644
--- a/make/stub_includes/opengl/gl4bc.c
+++ b/make/stub_includes/opengl/gl4bc.c
@@ -5,6 +5,7 @@
 #define GL_GLEXT_PROTOTYPES
 
 #include <GL/gl.h>
+#include <GL/glext.h>
 
 // Define GL3_PROTOTYPES so that the OpenGL prototypes in
 // "gl3.h" are parsed.
diff --git a/make/stub_includes/opengl/gles1.c b/make/stub_includes/opengl/gles1.c
index 63df1c967..ff6056ce8 100644
--- a/make/stub_includes/opengl/gles1.c
+++ b/make/stub_includes/opengl/gles1.c
@@ -1,5 +1,5 @@
-#define GLAPI
-#define GL_APICALL
+#define GL_API
+#define GL_APIENTRY
 
 // Define GL_GLEXT_PROTOTYPES so that the OpenGL extension prototypes in
 // "glext.h" are parsed.
diff --git a/make/stub_includes/opengl/gles2.c b/make/stub_includes/opengl/gles2.c
index f74b1686f..cbc5cf847 100644
--- a/make/stub_includes/opengl/gles2.c
+++ b/make/stub_includes/opengl/gles2.c
@@ -1,8 +1,9 @@
-#define GL_APIENTRY
 #define GL_APICALL
+#define GL_APIENTRY
 
 // Define GL_GLEXT_PROTOTYPES so that the OpenGL extension prototypes in
 // "glext.h" are parsed.
 #define GL_GLEXT_PROTOTYPES
 
+#include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>