9 files changed, 8 insertions, 20 deletions
diff --git a/ext/gl/gstopengl.c b/ext/gl/gstopengl.c
index ff5e1505e..6f2ec4963 100644
--- a/ext/gl/gstopengl.c
+++ b/ext/gl/gstopengl.c
@@ -47,8 +47,6 @@
 #include <bcm_host.h>
 #endif
 
-#include <gst/gl/gstglconfig.h>
-
 #include "gstglimagesink.h"
 
 #include "gstglfiltercube.h"
diff --git a/gst-libs/gst/gl/android/gstglwindow_android_egl.h b/gst-libs/gst/gl/android/gstglwindow_android_egl.h
index 7ff2bd9b8..e5ea1cb71 100644
--- a/gst-libs/gst/gl/android/gstglwindow_android_egl.h
+++ b/gst-libs/gst/gl/android/gstglwindow_android_egl.h
@@ -22,8 +22,6 @@
 #ifndef __GST_GL_WINDOW_ANDROID_EGL_H__
 #define __GST_GL_WINDOW_ANDROID_EGL_H__
 
-#include <EGL/egl.h>
-
 #include <gst/gl/gl.h>
 
 G_BEGIN_DECLS
diff --git a/gst-libs/gst/gl/dispmanx/gstglwindow_dispmanx_egl.h b/gst-libs/gst/gl/dispmanx/gstglwindow_dispmanx_egl.h
index 72e8848fe..a3f11a267 100644
--- a/gst-libs/gst/gl/dispmanx/gstglwindow_dispmanx_egl.h
+++ b/gst-libs/gst/gl/dispmanx/gstglwindow_dispmanx_egl.h
@@ -21,12 +21,9 @@
 #ifndef __GST_GL_WINDOW_DISPMANX_EGL_H__
 #define __GST_GL_WINDOW_DISPMANX_EGL_H__
 
-#include <bcm_host.h>
 #include <gst/video/gstvideosink.h>
-
-#include <EGL/egl.h>
-
 #include <gst/gl/gl.h>
+#include <bcm_host.h>
 
 G_BEGIN_DECLS
 
diff --git a/gst-libs/gst/gl/egl/gstglcontext_egl.c b/gst-libs/gst/gl/egl/gstglcontext_egl.c
index c7283eddf..f9a570d6f 100644
--- a/gst-libs/gst/gl/egl/gstglcontext_egl.c
+++ b/gst-libs/gst/gl/egl/gstglcontext_egl.c
@@ -27,7 +27,6 @@
  */
 
 #include "gstglcontext_egl.h"
-#include <gst/gl/gl.h>
 
 #if GST_GL_HAVE_WINDOW_X11
 #include "../x11/gstglwindow_x11.h"
diff --git a/gst-libs/gst/gl/egl/gstglcontext_egl.h b/gst-libs/gst/gl/egl/gstglcontext_egl.h
index fcd2fe18c..18c09ff4e 100644
--- a/gst-libs/gst/gl/egl/gstglcontext_egl.h
+++ b/gst-libs/gst/gl/egl/gstglcontext_egl.h
@@ -22,10 +22,7 @@
 #define __GST_GL_EGL_H__
 
 #include <gst/gst.h>
-#include <EGL/egl.h>
-
-#include <gst/gl/gstgl_fwd.h>
-#include <gst/gl/gstglcontext.h>
+#include <gst/gl/gl.h>
 
 G_BEGIN_DECLS
 
diff --git a/gst-libs/gst/gl/egl/gstgldisplay_egl.h b/gst-libs/gst/gl/egl/gstgldisplay_egl.h
index bd188d5ac..0a3b1db3c 100644
--- a/gst-libs/gst/gl/egl/gstgldisplay_egl.h
+++ b/gst-libs/gst/gl/egl/gstgldisplay_egl.h
@@ -22,12 +22,11 @@
 #define __GST_GL_DISPLAY_EGL_H__
 
 #include <gst/gst.h>
+#include <gst/gl/gl.h>
 
+/* FIXME temp until merge */
 #include <gst/egl/egl.h>
 
-#include <gst/gl/gstgl_fwd.h>
-#include <gst/gl/gstgldisplay.h>
-
 G_BEGIN_DECLS
 
 GType gst_gl_display_egl_get_type (void);
diff --git a/gst-libs/gst/gl/gstglapi.h b/gst-libs/gst/gl/gstglapi.h
index ba84958ce..78951d146 100644
--- a/gst-libs/gst/gl/gstglapi.h
+++ b/gst-libs/gst/gl/gstglapi.h
@@ -25,6 +25,10 @@
 
 #include <gst/gl/glprototypes/gstgl_compat.h>
 
+#if GST_GL_HAVE_PLATFORM_EGL
+#include <EGL/egl.h>
+#endif
+
 /* OpenGL 2.0 for Embedded Systems */
 #if GST_GL_HAVE_GLES2
 # include <GLES2/gl2.h>
diff --git a/gst-libs/gst/gl/wayland/gstglwindow_wayland_egl.h b/gst-libs/gst/gl/wayland/gstglwindow_wayland_egl.h
index 1cdd5e4a9..21b82da56 100644
--- a/gst-libs/gst/gl/wayland/gstglwindow_wayland_egl.h
+++ b/gst-libs/gst/gl/wayland/gstglwindow_wayland_egl.h
@@ -25,8 +25,6 @@
 #include <wayland-egl.h>
 #include <wayland-cursor.h>
 
-#include <EGL/egl.h>
-
 #include <gst/gl/gl.h>
 
 G_BEGIN_DECLS
diff --git a/gst-libs/gst/gl/win32/gstglwindow_win32_egl.h b/gst-libs/gst/gl/win32/gstglwindow_win32_egl.h
index f3167f443..ef851a718 100644
--- a/gst-libs/gst/gl/win32/gstglwindow_win32_egl.h
+++ b/gst-libs/gst/gl/win32/gstglwindow_win32_egl.h
@@ -23,8 +23,6 @@
 
 #include <gst/gst.h>
 
-#include <EGL/egl.h>
-
 #include "gstglwindow_win32.h"
 
 G_BEGIN_DECLS