diff --git a/gst-libs/gst/gl/gstglcontext.c b/gst-libs/gst/gl/gstglcontext.c
index 0d7a5326c4..11967e9d29 100644
--- a/gst-libs/gst/gl/gstglcontext.c
+++ b/gst-libs/gst/gl/gstglcontext.c
@@ -41,6 +41,7 @@
 #endif
 
 #include "gstglcontext.h"
+#include <gst/gl/gl.h>
 
 #include <gmodule.h>
 #include <string.h>
diff --git a/gst-libs/gst/gl/win32/gstglcontext_wgl.c b/gst-libs/gst/gl/win32/gstglcontext_wgl.c
index 0c745adc56..47b576c0b7 100644
--- a/gst-libs/gst/gl/win32/gstglcontext_wgl.c
+++ b/gst-libs/gst/gl/win32/gstglcontext_wgl.c
@@ -25,8 +25,8 @@
 
 #include <gst/gst.h>
 
-#include "../gstgl_fwd.h"
-#include <gst/gl/gstglcontext.h>
+#include <gst/gl/gl.h>
+#include <gst/gl/gstglfuncs.h>
 
 #include "gstglcontext_wgl.h"
 #include <GL/wglext.h>
diff --git a/sys/applemedia/iosglmemory.h b/sys/applemedia/iosglmemory.h
index ec1035dd54..089bdc6a6b 100644
--- a/sys/applemedia/iosglmemory.h
+++ b/sys/applemedia/iosglmemory.h
@@ -25,6 +25,7 @@
 #include <gst/gstallocator.h>
 #include <gst/video/video.h>
 #include <gst/gl/gl.h>
+#include <gst/gl/gstglfuncs.h>
 #include "corevideomemory.h"
 
 G_BEGIN_DECLS
diff --git a/sys/applemedia/videotexturecache.h b/sys/applemedia/videotexturecache.h
index 8dc927a785..85add3e24c 100644
--- a/sys/applemedia/videotexturecache.h
+++ b/sys/applemedia/videotexturecache.h
@@ -21,7 +21,7 @@
 #define __GST_CORE_VIDEO_TEXTURE_CACHE_H__
 
 #include <gst/video/gstvideometa.h>
-#include <gst/gl/gstglcontext.h>
+#include <gst/gl/gl.h>
 #include "corevideomemory.h"
 
 G_BEGIN_DECLS
diff --git a/sys/applemedia/videotexturecache.m b/sys/applemedia/videotexturecache.m
index 89bc33efe7..3a29a2a1ca 100644
--- a/sys/applemedia/videotexturecache.m
+++ b/sys/applemedia/videotexturecache.m
@@ -24,7 +24,6 @@
 #if !HAVE_IOS
 #import <AppKit/AppKit.h>
 #include <gst/gl/cocoa/gstglcontext_cocoa.h>
-#include <gst/gl/gstglbufferpool.h>
 #include "iosurfacememory.h"
 #endif
 #include "iosglmemory.h"