diff --git a/src/render/opengl/SDL_shaders_gl.c b/src/render/opengl/SDL_shaders_gl.c
index 2803ee6d4..1bf351d72 100644
--- a/src/render/opengl/SDL_shaders_gl.c
+++ b/src/render/opengl/SDL_shaders_gl.c
@@ -34,9 +34,9 @@
 
 typedef struct
 {
-    GLenum program;
-    GLenum vert_shader;
-    GLenum frag_shader;
+    GLhandleARB program;
+    GLhandleARB vert_shader;
+    GLhandleARB frag_shader;
 } GL_ShaderData;
 
 struct GL_ShaderContext
@@ -167,7 +167,7 @@ static const char *shader_source[NUM_SHADERS][2] =
 };
 
 static SDL_bool
-CompileShader(GL_ShaderContext *ctx, GLenum shader, const char *defines, const char *source)
+CompileShader(GL_ShaderContext *ctx, GLhandleARB shader, const char *defines, const char *source)
 {
     GLint status;
     const char *sources[2];
diff --git a/test/testshader.c b/test/testshader.c
index 2c0920f21..6b27c3447 100644
--- a/test/testshader.c
+++ b/test/testshader.c
@@ -29,9 +29,9 @@ enum {
 };
 
 typedef struct {
-    GLuint program;
-    GLuint vert_shader;
-    GLuint frag_shader;
+    GLhandleARB program;
+    GLhandleARB vert_shader;
+    GLhandleARB frag_shader;
     const char *vert_source;
     const char *frag_source;
 } ShaderData;
@@ -124,7 +124,7 @@ static PFNGLSHADERSOURCEARBPROC glShaderSourceARB;
 static PFNGLUNIFORM1IARBPROC glUniform1iARB;
 static PFNGLUSEPROGRAMOBJECTARBPROC glUseProgramObjectARB;
 
-static SDL_bool CompileShader(GLenum shader, const char *source)
+static SDL_bool CompileShader(GLhandleARB shader, const char *source)
 {
     GLint status;