diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am
index e51576292b..f1117b4d2c 100644
--- a/gst-libs/gst/gl/Makefile.am
+++ b/gst-libs/gst/gl/Makefile.am
@@ -1,7 +1,8 @@
 
 lib_LTLIBRARIES = libgstgl-@GST_API_VERSION@.la
 
-SUBDIRS =
+SUBDIRS = glprototypes
+DIST_SUBDIRS = glprototypes x11 win32 cocoa wayland
 
 noinst_HEADERS =
 
@@ -66,6 +67,7 @@ endif
 
 libgstgl_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/gl
 libgstgl_@GST_API_VERSION@include_HEADERS = \
+	gstglconfig.h \
 	gstglwindow.h \
 	gstgldisplay.h \
 	gstglmemory.h \
@@ -86,6 +88,7 @@ libgstgl_@GST_API_VERSION@include_HEADERS = \
 	gl.h
 
 libgstgl_@GST_API_VERSION@_la_CFLAGS = \
+	-I$(top_srcdir)/gst-libs \
 	$(GL_CFLAGS) \
 	$(X_CFLAGS) \
 	$(GST_PLUGINS_BASE_CFLAGS) \
diff --git a/gst-libs/gst/gl/cocoa/Makefile.am b/gst-libs/gst/gl/cocoa/Makefile.am
index 5239eecf09..ca8b9a3bbc 100644
--- a/gst-libs/gst/gl/cocoa/Makefile.am
+++ b/gst-libs/gst/gl/cocoa/Makefile.am
@@ -2,13 +2,10 @@
 
 noinst_LTLIBRARIES = libgstgl-cocoa.la
 
-libgstgl_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/gl
-libgstglcocoaincludedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/gl/cocoa
-
 libgstgl_cocoa_la_SOURCES = \
 	gstglwindow_cocoa.m
 
-libgstglcocoainclude_HEADERS = \
+noinst_HEADERS = \
 	gstglwindow_cocoa.h
 
 libgstgl_cocoa_la_CFLAGS = \
@@ -17,7 +14,7 @@ libgstgl_cocoa_la_CFLAGS = \
 	$(GST_PLUGINS_BASE_CFLAGS) \
 	$(GST_BASE_CFLAGS) \
 	$(GST_CFLAGS) \
-	-I$(top_srcdir)/gst-libs/gst/gl
+	-I$(top_srcdir)/gst-libs
 
 libgstgl_cocoa_la_OBJCFLAGS = \
 	$(GL_CFLAGS) \
@@ -26,7 +23,7 @@ libgstgl_cocoa_la_OBJCFLAGS = \
 	$(GST_PLUGINS_BASE_CFLAGS) \
 	$(GST_BASE_CFLAGS) \
 	$(GST_CFLAGS) \
-	-I$(top_srcdir)/gst-libs/gst/gl
+	-I$(top_srcdir)/gst-libs
 
 libgstgl_cocoa_la_LDFLAGS = \
 	$(GST_LIB_LDFLAGS) \
diff --git a/gst-libs/gst/gl/cocoa/gstglwindow_cocoa.h b/gst-libs/gst/gl/cocoa/gstglwindow_cocoa.h
index 4e8032443a..9d2eda0a4f 100644
--- a/gst-libs/gst/gl/cocoa/gstglwindow_cocoa.h
+++ b/gst-libs/gst/gl/cocoa/gstglwindow_cocoa.h
@@ -23,7 +23,7 @@
 
 #include <gst/gst.h>
 
-#include "gstglwindow.h"
+#include <gst/gl/gl.h>
 
 G_BEGIN_DECLS
 
diff --git a/gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m b/gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m
old mode 100755
new mode 100644
diff --git a/gst-libs/gst/gl/gl.h b/gst-libs/gst/gl/gl.h
index 940b6c7a65..03a1c13a03 100644
--- a/gst-libs/gst/gl/gl.h
+++ b/gst-libs/gst/gl/gl.h
@@ -21,21 +21,21 @@
 #ifndef __GL_H__
 #define __GL_H__
 
-#include "gstgl_fwd.h"
-#include "gstglconfig.h"
-#include "gstglapi.h"
-#include "gstgldisplay.h"
-#include "gstglfeature.h"
-#include "gstglutils.h"
-#include "gstglwindow.h"
-#include "gstglshader.h"
-#include "gstglupload.h"
-#include "gstgldownload.h"
-#include "gstglmemory.h"
-#include "gstglbufferpool.h"
-#include "gstglframebuffer.h"
-#include "gstglfilter.h"
-#include "gstglmixer.h"
-#include "gstglshadervariables.h"
+#include <gst/gl/gstgl_fwd.h>
+#include <gst/gl/gstglconfig.h>
+#include <gst/gl/gstglapi.h>
+#include <gst/gl/gstgldisplay.h>
+#include <gst/gl/gstglfeature.h>
+#include <gst/gl/gstglutils.h>
+#include <gst/gl/gstglwindow.h>
+#include <gst/gl/gstglshader.h>
+#include <gst/gl/gstglupload.h>
+#include <gst/gl/gstgldownload.h>
+#include <gst/gl/gstglmemory.h>
+#include <gst/gl/gstglbufferpool.h>
+#include <gst/gl/gstglframebuffer.h>
+#include <gst/gl/gstglfilter.h>
+#include <gst/gl/gstglmixer.h>
+#include <gst/gl/gstglshadervariables.h>
 
 #endif /* __GL_H__ */
diff --git a/gst-libs/gst/gl/glprototypes/Makefile.am b/gst-libs/gst/gl/glprototypes/Makefile.am
new file mode 100644
index 0000000000..8c6d0e600f
--- /dev/null
+++ b/gst-libs/gst/gl/glprototypes/Makefile.am
@@ -0,0 +1,16 @@
+prototypedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/gl/glprototypes
+
+prototype_HEADERS = \
+	all_functions.h \
+	gles1_functions.h \
+	gles1gles2.h \
+	gles1gles2opengl.h \
+	gles1.h \
+	gles1opengl.h \
+	gles2_functions.h \
+	gles2.h \
+	gles2opengl.h \
+	gles3opengl.h \
+	opengl_functions.h \
+	opengl.h
+
diff --git a/gst-libs/gst/gl/glprototypes/gstgl_compat.h b/gst-libs/gst/gl/glprototypes/gstgl_compat.h
deleted file mode 100644
index a0f1ec4829..0000000000
--- a/gst-libs/gst/gl/glprototypes/gstgl_compat.h
+++ /dev/null
@@ -1,38 +0,0 @@
- /*
- * GStreamer
- * Copyright (C) 2012 Matthew Waters <ystreet00@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef __GST_GL_COMPAT_H__
-#define __GST_GL_COMPAT_H__
-
-/* undefined typedefs */
-#ifndef HAVE_GLEGLIMAGEOES
-typedef gpointer GLeglImageOES;
-#endif
-#ifndef HAVE_GLCHAR
-typedef gchar GLchar;
-#endif
-#ifndef HAVE_GLSIZEIPTR
-typedef ptrdiff_t GLsizeiptr;
-#endif
-#ifndef HAVE_GLINTPTR
-typedef ptrdiff_t GLintptr;
-#endif
-
-#endif
diff --git a/gst-libs/gst/gl/gstgl_fwd.h b/gst-libs/gst/gl/gstgl_fwd.h
index f0b049e495..b1305042fb 100644
--- a/gst-libs/gst/gl/gstgl_fwd.h
+++ b/gst-libs/gst/gl/gstgl_fwd.h
@@ -23,7 +23,7 @@
 
 #include <gst/gst.h>
 
-#include "gstglapi.h"
+#include <gst/gl/gstglapi.h>
 
 G_BEGIN_DECLS
 
diff --git a/gst-libs/gst/gl/gstglapi.h b/gst-libs/gst/gl/gstglapi.h
index ee314cff43..d1aec3cdc0 100644
--- a/gst-libs/gst/gl/gstglapi.h
+++ b/gst-libs/gst/gl/gstglapi.h
@@ -21,14 +21,14 @@
 #ifndef __GST_GL_API_H__
 #define __GST_GL_API_H__
 
-#include "gstglconfig.h"
+#include <gst/gl/gstglconfig.h>
 
 /* OpenGL 2.0 for Embedded Systems */
 #if GST_GL_HAVE_GLES2
 # include <GLES2/gl2.h>
 # include <GLES2/gl2ext.h>
 # if !GST_GL_HAVE_OPENGL
-#  include "gstgles2.h"
+#  include <gst/gl/gstgles2.h>
 # endif
 #endif
 
@@ -55,8 +55,6 @@
 
 #include <gst/gst.h>
 
-#include "glprototypes/gstgl_compat.h"
-
 G_BEGIN_DECLS
 
 typedef enum {
@@ -88,21 +86,21 @@ typedef enum
 
 typedef struct _GstGLFuncs
 {
-#include "glprototypes/opengl.h"
+#include <gst/gl/glprototypes/opengl.h>
   gpointer padding1[GST_PADDING_LARGE];
-#include "glprototypes/gles1.h"
+#include <gst/gl/glprototypes/gles1.h>
   gpointer padding2[GST_PADDING_LARGE];
-#include "glprototypes/gles1gles2.h"
+#include <gst/gl/glprototypes/gles1gles2.h>
   gpointer padding3[GST_PADDING_LARGE];
-#include "glprototypes/gles1opengl.h"
+#include <gst/gl/glprototypes/gles1opengl.h>
   gpointer padding4[GST_PADDING_LARGE*2];
-#include "glprototypes/gles2.h"
+#include <gst/gl/glprototypes/gles2.h>
   gpointer padding5[GST_PADDING_LARGE*2];
-#include "glprototypes/gles2opengl.h"
+#include <gst/gl/glprototypes/gles2opengl.h>
   gpointer padding6[GST_PADDING_LARGE*2];
-#include "glprototypes/gles1gles2opengl.h"
+#include <gst/gl/glprototypes/gles1gles2opengl.h>
   gpointer padding7[GST_PADDING_LARGE*2];
-#include "glprototypes/gles3opengl.h"
+#include <gst/gl/glprototypes/gles3opengl.h>
   gpointer padding8[GST_PADDING_LARGE*4];
 } GstGLFuncs;
 
diff --git a/gst-libs/gst/gl/gstglbufferpool.h b/gst-libs/gst/gl/gstglbufferpool.h
index d4456ba10a..ab78b83fa0 100644
--- a/gst-libs/gst/gl/gstglbufferpool.h
+++ b/gst-libs/gst/gl/gstglbufferpool.h
@@ -25,7 +25,7 @@
 #include <gst/video/gstvideometa.h>
 #include <gst/video/gstvideopool.h>
 
-#include "gstgl_fwd.h"
+#include <gst/gl/gstgl_fwd.h>
 
 G_BEGIN_DECLS
 
diff --git a/gst-libs/gst/gl/gstgldisplay.h b/gst-libs/gst/gl/gstgldisplay.h
index bfe021d5d1..9cbb21a687 100644
--- a/gst-libs/gst/gl/gstgldisplay.h
+++ b/gst-libs/gst/gl/gstgldisplay.h
@@ -24,7 +24,7 @@
 #ifndef __GST_GL_DISPLAY_H__
 #define __GST_GL_DISPLAY_H__
 
-#include "gstgl_fwd.h"
+#include <gst/gl/gstgl_fwd.h>
 
 G_BEGIN_DECLS
 
diff --git a/gst-libs/gst/gl/gstgldownload.h b/gst-libs/gst/gl/gstgldownload.h
index ded8a42302..c6b2b40318 100644
--- a/gst-libs/gst/gl/gstgldownload.h
+++ b/gst-libs/gst/gl/gstgldownload.h
@@ -24,7 +24,7 @@
 #include <gst/video/video.h>
 #include <gst/gstmemory.h>
 
-#include "gstgl_fwd.h"
+#include <gst/gl/gstgl_fwd.h>
 
 G_BEGIN_DECLS
 
diff --git a/gst-libs/gst/gl/gstglegl.h b/gst-libs/gst/gl/gstglegl.h
index 4bfd479e91..4e5c3a5274 100644
--- a/gst-libs/gst/gl/gstglegl.h
+++ b/gst-libs/gst/gl/gstglegl.h
@@ -24,7 +24,7 @@
 #include <gst/gst.h>
 #include <EGL/egl.h>
 
-#include "gstgl_fwd.h"
+#include <gst/gl/gstgl_fwd.h>
 
 G_BEGIN_DECLS
 
diff --git a/gst-libs/gst/gl/gstglfeature.h b/gst-libs/gst/gl/gstglfeature.h
index eb9a04f81c..1595413d53 100644
--- a/gst-libs/gst/gl/gstglfeature.h
+++ b/gst-libs/gst/gl/gstglfeature.h
@@ -45,7 +45,7 @@
 
 #include <gst/gst.h>
 
-#include "gstgl_fwd.h"
+#include <gst/gl/gstgl_fwd.h>
 
 #define GST_GL_CHECK_GL_VERSION(driver_major, driver_minor, \
                                 target_major, target_minor) \
diff --git a/gst-libs/gst/gl/gstglfilter.h b/gst-libs/gst/gl/gstglfilter.h
index b989885f11..3b5c1337e6 100644
--- a/gst-libs/gst/gl/gstglfilter.h
+++ b/gst-libs/gst/gl/gstglfilter.h
@@ -27,7 +27,7 @@
 #include <gst/base/gstbasetransform.h>
 #include <gst/video/video.h>
 
-#include "gl.h"
+#include <gst/gl/gl.h>
 
 G_BEGIN_DECLS
 
diff --git a/gst-libs/gst/gl/gstglframebuffer.h b/gst-libs/gst/gl/gstglframebuffer.h
index 1f5fcc8a14..6d0369240e 100644
--- a/gst-libs/gst/gl/gstglframebuffer.h
+++ b/gst-libs/gst/gl/gstglframebuffer.h
@@ -21,7 +21,7 @@
 #ifndef __GST_GL_FRAMEBUFFER_H__
 #define __GST_GL_FRAMEBUFFER_H__
 
-#include "gstgl_fwd.h"
+#include <gst/gl/gstgl_fwd.h>
 
 G_BEGIN_DECLS
 
diff --git a/gst-libs/gst/gl/gstglmemory.h b/gst-libs/gst/gl/gstglmemory.h
index 7bec6cd060..45b3dd369a 100644
--- a/gst-libs/gst/gl/gstglmemory.h
+++ b/gst-libs/gst/gl/gstglmemory.h
@@ -26,7 +26,7 @@
 #include <gst/gstmemory.h>
 #include <gst/video/video.h>
 
-#include "gl.h"
+#include <gst/gl/gl.h>
 
 G_BEGIN_DECLS
 
diff --git a/gst-libs/gst/gl/gstglmixer.h b/gst-libs/gst/gl/gstglmixer.h
index 3e287d5026..7d8709f84f 100644
--- a/gst-libs/gst/gl/gstglmixer.h
+++ b/gst-libs/gst/gl/gstglmixer.h
@@ -23,9 +23,8 @@
 
 #include <gst/gst.h>
 #include <gst/video/video.h>
-#include "gstglmixerpad.h"
-
-#include "gl.h"
+#include <gst/gl/gl.h>
+#include <gst/gl/gstglmixerpad.h>
 
 G_BEGIN_DECLS
 
diff --git a/gst-libs/gst/gl/gstglmixerpad.h b/gst-libs/gst/gl/gstglmixerpad.h
index 682bf0019a..31f1d99a47 100644
--- a/gst-libs/gst/gl/gstglmixerpad.h
+++ b/gst-libs/gst/gl/gstglmixerpad.h
@@ -24,8 +24,8 @@
 #include <gst/gst.h>
 #include <gst/base/gstcollectpads.h>
 
-#include "gstgldisplay.h"
-#include "gstglupload.h"
+#include <gst/gl/gstgldisplay.h>
+#include <gst/gl/gstglupload.h>
 
 G_BEGIN_DECLS
 
diff --git a/gst-libs/gst/gl/gstglshader.h b/gst-libs/gst/gl/gstglshader.h
index a75f3fd10d..aa0e12f526 100644
--- a/gst-libs/gst/gl/gstglshader.h
+++ b/gst-libs/gst/gl/gstglshader.h
@@ -21,7 +21,7 @@
 #ifndef __GST_GL_SHADER_H__
 #define __GST_GL_SHADER_H__
 
-#include "gstgl_fwd.h"
+#include <gst/gl/gstgl_fwd.h>
 
 G_BEGIN_DECLS
 
diff --git a/gst-libs/gst/gl/gstglshadervariables.h b/gst-libs/gst/gl/gstglshadervariables.h
index 9d0bb6de0f..b37e1a56be 100644
--- a/gst-libs/gst/gl/gstglshadervariables.h
+++ b/gst-libs/gst/gl/gstglshadervariables.h
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <gstglshader.h>
+#include <gst/gl/gstglshader.h>
 
 #define VALID_VARNAME_CHARS "abcdefghijklmnopqurstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_"
 
diff --git a/gst-libs/gst/gl/gstglupload.h b/gst-libs/gst/gl/gstglupload.h
index 8b93bcad58..cadc9a89cc 100644
--- a/gst-libs/gst/gl/gstglupload.h
+++ b/gst-libs/gst/gl/gstglupload.h
@@ -24,7 +24,7 @@
 #include <gst/video/video.h>
 #include <gst/gstmemory.h>
 
-#include "gstgl_fwd.h"
+#include <gst/gl/gstgl_fwd.h>
 
 G_BEGIN_DECLS
 
diff --git a/gst-libs/gst/gl/gstglutils.h b/gst-libs/gst/gl/gstglutils.h
index e22d5ce79b..421398cd52 100644
--- a/gst-libs/gst/gl/gstglutils.h
+++ b/gst-libs/gst/gl/gstglutils.h
@@ -23,7 +23,7 @@
 
 #include <gst/video/video.h>
 
-#include "gstgl_fwd.h"
+#include <gst/gl/gstgl_fwd.h>
 
 /**
  * GstGLDisplayProjection:
diff --git a/gst-libs/gst/gl/gstglwindow.h b/gst-libs/gst/gl/gstglwindow.h
index f6f03b7387..88450b01a9 100644
--- a/gst-libs/gst/gl/gstglwindow.h
+++ b/gst-libs/gst/gl/gstglwindow.h
@@ -24,7 +24,7 @@
 
 #include <gst/gst.h>
 
-#include "gstgl_fwd.h"
+#include <gst/gl/gstgl_fwd.h>
 
 G_BEGIN_DECLS
 
diff --git a/gst-libs/gst/gl/wayland/Makefile.am b/gst-libs/gst/gl/wayland/Makefile.am
index a8819e7f4a..daa5279a7c 100644
--- a/gst-libs/gst/gl/wayland/Makefile.am
+++ b/gst-libs/gst/gl/wayland/Makefile.am
@@ -2,14 +2,11 @@
 
 noinst_LTLIBRARIES = libgstgl-wayland.la
 
-libgstgl_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/gl
-libgstglwaylandincludedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/gl/wayland
-
 libgstgl_wayland_la_SOURCES = \
 	gstglwindow_wayland_egl.c \
 	wayland_event_source.c
 
-libgstglwaylandinclude_HEADERS = \
+noinst_HEADERS = \
 	gstglwindow_wayland_egl.h \
 	wayland_event_source.h
 
@@ -19,7 +16,7 @@ libgstgl_wayland_la_CFLAGS = \
 	$(GST_PLUGINS_BASE_CFLAGS) \
 	$(GST_BASE_CFLAGS) \
 	$(GST_CFLAGS) \
-	-I$(top_srcdir)/gst-libs/gst/gl
+	-I$(top_srcdir)/gst-libs
 
 libgstgl_wayland_la_LDFLAGS = \
 	$(GST_LIB_LDFLAGS) \
diff --git a/gst-libs/gst/gl/wayland/gstglwindow_wayland_egl.h b/gst-libs/gst/gl/wayland/gstglwindow_wayland_egl.h
index 26c920fb2f..e826e44763 100644
--- a/gst-libs/gst/gl/wayland/gstglwindow_wayland_egl.h
+++ b/gst-libs/gst/gl/wayland/gstglwindow_wayland_egl.h
@@ -27,8 +27,8 @@
 
 #include <EGL/egl.h>
 
-#include "gstglwindow.h"
-#include "gstglegl.h"
+#include <gst/gl/gl.h>
+#include "../gstglegl.h"
 
 G_BEGIN_DECLS
 
diff --git a/gst-libs/gst/gl/win32/Makefile.am b/gst-libs/gst/gl/win32/Makefile.am
index 97bcdd3d69..11e52e1ed4 100644
--- a/gst-libs/gst/gl/win32/Makefile.am
+++ b/gst-libs/gst/gl/win32/Makefile.am
@@ -2,13 +2,10 @@
 
 noinst_LTLIBRARIES = libgstgl-win32.la
 
-libgstgl_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/gl
-libgstglwin32includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/gl/win32
-
 libgstgl_win32_la_SOURCES = \
 	gstglwindow_win32.c
 
-libgstglwin32include_HEADERS = \
+noinst_HEADERS = \
 	gstglwindow_win32.h
 
 if USE_WGL
@@ -26,7 +23,7 @@ libgstgl_win32_la_CFLAGS = \
 	$(GST_PLUGINS_BASE_CFLAGS) \
 	$(GST_BASE_CFLAGS) \
 	$(GST_CFLAGS) \
-	-I$(top_srcdir)/gst-libs/gst/gl
+	-I$(top_srcdir)/gst-libs
 
 libgstgl_win32_la_LDFLAGS = \
 	$(GST_LIB_LDFLAGS) \
diff --git a/gst-libs/gst/gl/win32/gstglwindow_win32.h b/gst-libs/gst/gl/win32/gstglwindow_win32.h
index 1552481689..de1779a99e 100644
--- a/gst-libs/gst/gl/win32/gstglwindow_win32.h
+++ b/gst-libs/gst/gl/win32/gstglwindow_win32.h
@@ -21,7 +21,7 @@
 #ifndef __GST_GL_WINDOW_WIN32_H__
 #define __GST_GL_WINDOW_WIN32_H__
 
-#include "gstglwindow.h"
+#include <gst/gl/gl.h>
 
 #undef UNICODE
 #include <windows.h>
diff --git a/gst-libs/gst/gl/x11/Makefile.am b/gst-libs/gst/gl/x11/Makefile.am
index fa990ce38b..076b5c302c 100644
--- a/gst-libs/gst/gl/x11/Makefile.am
+++ b/gst-libs/gst/gl/x11/Makefile.am
@@ -2,24 +2,21 @@
 
 noinst_LTLIBRARIES = libgstgl-x11.la
 
-libgstgl_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/gl
-libgstglx11includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/gl/x11
-
 libgstgl_x11_la_SOURCES = \
 	gstglwindow_x11.c \
 	x11_event_source.c
 
-libgstglx11include_HEADERS = \
+noinst_HEADERS = \
 	gstglwindow_x11.h \
 	x11_event_source.h
 
 if USE_GLX
 libgstgl_x11_la_SOURCES += gstglwindow_x11_glx.c
-libgstglx11include_HEADERS += gstglwindow_x11_glx.h
+noinst_HEADERS += gstglwindow_x11_glx.h
 endif
 if USE_EGL
 libgstgl_x11_la_SOURCES += gstglwindow_x11_egl.c
-libgstglx11include_HEADERS += gstglwindow_x11_egl.h
+noinst_HEADERS += gstglwindow_x11_egl.h
 endif
 
 libgstgl_x11_la_CFLAGS = \
@@ -28,7 +25,7 @@ libgstgl_x11_la_CFLAGS = \
 	$(GST_PLUGINS_BASE_CFLAGS) \
 	$(GST_BASE_CFLAGS) \
 	$(GST_CFLAGS) \
-	-I$(top_srcdir)/gst-libs/gst/gl
+	-I$(top_srcdir)/gst-libs
 
 libgstgl_x11_la_LDFLAGS = \
 	$(GST_LIB_LDFLAGS) \
diff --git a/gst-libs/gst/gl/x11/gstglwindow_x11.h b/gst-libs/gst/gl/x11/gstglwindow_x11.h
index ea27cf191c..54f66b72cb 100644
--- a/gst-libs/gst/gl/x11/gstglwindow_x11.h
+++ b/gst-libs/gst/gl/x11/gstglwindow_x11.h
@@ -24,8 +24,7 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 
-#include "gstglapi.h"
-#include "gstglwindow.h"
+#include <gst/gl/gl.h>
 
 G_BEGIN_DECLS
 
diff --git a/gst-libs/gst/gl/x11/gstglwindow_x11_egl.h b/gst-libs/gst/gl/x11/gstglwindow_x11_egl.h
index 9f9fce518c..ddd4a28506 100644
--- a/gst-libs/gst/gl/x11/gstglwindow_x11_egl.h
+++ b/gst-libs/gst/gl/x11/gstglwindow_x11_egl.h
@@ -22,7 +22,7 @@
 #define __GST_GL_WINDOW_X11_EGL_H__
 
 #include "gstglwindow_x11.h"
-#include "gstglegl.h"
+#include "../gstglegl.h"
 
 #include <EGL/egl.h>
 
diff --git a/gst-libs/gst/gl/x11/gstglwindow_x11_glx.c b/gst-libs/gst/gl/x11/gstglwindow_x11_glx.c
index e198917ab3..d62a990c46 100644
--- a/gst-libs/gst/gl/x11/gstglwindow_x11_glx.c
+++ b/gst-libs/gst/gl/x11/gstglwindow_x11_glx.c
@@ -27,7 +27,7 @@
 
 #include <gst/gst.h>
 
-#include <gstglfeature.h>
+#include <gst/gl/gl.h>
 #include "gstglwindow_x11_glx.h"
 
 #define GST_CAT_DEFAULT gst_gl_window_debug
diff --git a/gst-libs/gst/gl/x11/x11_event_source.c b/gst-libs/gst/gl/x11/x11_event_source.c
index 382b10a950..f594383098 100644
--- a/gst-libs/gst/gl/x11/x11_event_source.c
+++ b/gst-libs/gst/gl/x11/x11_event_source.c
@@ -24,7 +24,6 @@
 
 #include <stdint.h>
 #include <stdlib.h>
-#include <wayland-client.h>
 
 #include "x11_event_source.h"