gl: Major header and include cleanup

77 files changed, 137 insertions, 200 deletions

diff --git a/configure.ac b/configure.ac
index 145c284..5683436 100644
--- a/configure.ac
+++ b/configure.ac
@@ -604,35 +604,6 @@ AM_CONDITIONAL(USE_GLX, test "x$USE_GLX" = "xyes")
 AM_CONDITIONAL(USE_WGL, test "x$USE_WGL" = "xyes")
 AM_CONDITIONAL(USE_COCOA, test "x$USE_COCOA" = "xyes")
 
-dnl Check for some types that are not always present
-GL_INCLUDES=""
-if test "x$USE_GLES2" = "xyes"; then
-  GL_INCLUDES="$GL_INCLUDES
-# include <GLES2/gl2.h>
-# include <GLES2/gl2ext.h>
-"
-fi
-
-if test "x$USE_OPENGL" = "xyes"; then
-  GL_INCLUDES="$GL_INCLUDES
-# if __APPLE__
-#  include <OpenGL/OpenGL.h>
-#  include <OpenGL/gl.h>
-# else
-#  include <GL/glu.h>
-#  include <GL/gl.h>
-#  if __WIN32__ || _WIN32
-#   include <GL/glext.h>
-#  endif
-# endif
-"
-fi
-
-AC_CHECK_TYPES(GLeglImageOES, [], [], [[$GL_INCLUDES]])
-AC_CHECK_TYPES(GLchar, [], [], [[$GL_INCLUDES]])
-AC_CHECK_TYPES(GLsizeiptr, [], [], [[$GL_INCLUDES]])
-AC_CHECK_TYPES(GLintptr, [], [], [[$GL_INCLUDES]])
-
 AC_CONFIG_COMMANDS([gst-libs/gst/gl/gstglconfig.h], [
 	outfile=gstglconfig.h-tmp
 	cat > $outfile <<\_______EOF
@@ -963,6 +934,7 @@ gst-libs/gst/gl/x11/Makefile
 gst-libs/gst/gl/win32/Makefile
 gst-libs/gst/gl/cocoa/Makefile
 gst-libs/gst/gl/wayland/Makefile
+gst-libs/gst/gl/glprototypes/Makefile
 ext/Makefile
 ext/libvisual/Makefile
 win32/common/config.h
diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am
index ee51e67..c9643de 100644
--- a/docs/libs/Makefile.am
+++ b/docs/libs/Makefile.am
@@ -50,6 +50,7 @@ extra_files =
 # CFLAGS and LDFLAGS for compiling scan program. Only needed if your app/lib
 # contains GtkObjects/GObjects and you want to document signals and properties.
 GTKDOC_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \
+	-I$(top_srcdir)/gst-libs \
 	-I$(top_srcdir)/gst-libs/gst/gl
 GTKDOC_LIBS = \
 	$(top_builddir)/gst-libs/gst/gl/libgstgl-@GST_API_VERSION@.la \
diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am
index e515762..f1117b4 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 5239eec..ca8b9a3 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 4e80324..9d2eda0 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
index 50f5596..50f5596 100755..100644
--- a/gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m
+++ b/gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m
diff --git a/gst-libs/gst/gl/gl.h b/gst-libs/gst/gl/gl.h
index 940b6c7..03a1c13 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 0000000..8c6d0e6
--- /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 a0f1ec4..0000000
--- 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 f0b049e..b130504 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 ee314cf..d1aec3c 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 d4456ba..ab78b83 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 bfe021d..9cbb21a 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 ded8a42..c6b2b40 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 4bfd479..4e5c3a5 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 eb9a04f..1595413 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 b989885..3b5c133 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 1f5fcc8..6d03692 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 7bec6cd..45b3dd3 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 3e287d5..7d8709f 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 682bf00..31f1d99 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 a75f3fd..aa0e12f 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 9d0bb6d..b37e1a5 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 8b93bca..cadc9a8 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 e22d5ce..421398c 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 f6f03b7..88450b0 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 a8819e7..daa5279 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 26c920f..e826e44 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 97bcdd3..11e52e1 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 1552481..de1779a 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 fa990ce..076b5c3 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 ea27cf1..54f66b7 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 9f9fce5..ddd4a28 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 e198917..d62a990 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 382b10a..f594383 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"
 
diff --git a/gst/gl/Makefile.am b/gst/gl/Makefile.am
index 484b478..66d61bc 100644
--- a/gst/gl/Makefile.am
+++ b/gst/gl/Makefile.am
@@ -78,9 +78,7 @@ libgstopengl_la_SOURCES = \
 # (like in AM_CFLAGS)?
 libgstopengl_la_CFLAGS = $(GST_CFLAGS) $(X_CFLAGS) $(GST_BASE_CFLAGS) \
 	$(GST_PLUGINS_BASE_CFLAGS) $(GL_CFLAGS) $(LIBPNG_CFLAGS) \
-	-I$(top_srcdir)/gst-libs \
-	-I$(top_srcdir)/gst-libs/gst/gl \
-	-I$(top_srcdir)/gst/gl/effects
+	-I$(top_srcdir)/gst-libs
 
 libgstopengl_la_LIBADD = \
 	$(top_builddir)/gst-libs/gst/gl/libgstgl-$(GST_API_VERSION).la \
diff --git a/gst/gl/effects/gstgleffectbulge.c b/gst/gl/effects/gstgleffectbulge.c
index 5e60ac1..02934e6 100644
--- a/gst/gl/effects/gstgleffectbulge.c
+++ b/gst/gl/effects/gstgleffectbulge.c
@@ -21,7 +21,7 @@
 #include "config.h"
 #endif
 
-#include <gstgleffects.h>
+#include "../gstgleffects.h"
 
 static void
 gst_gl_effects_bulge_callback (gint width, gint height, guint texture,
diff --git a/gst/gl/effects/gstgleffectfisheye.c b/gst/gl/effects/gstgleffectfisheye.c
index 711456e..801f62b 100644
--- a/gst/gl/effects/gstgleffectfisheye.c
+++ b/gst/gl/effects/gstgleffectfisheye.c
@@ -21,7 +21,7 @@
 #include "config.h"
 #endif
 
-#include <gstgleffects.h>
+#include "../gstgleffects.h"
 
 static void
 gst_gl_effects_fisheye_callback (gint width, gint height, guint texture,
diff --git a/gst/gl/effects/gstgleffectglow.c b/gst/gl/effects/gstgleffectglow.c
index 0d9e1ec..b3488c9 100644
--- a/gst/gl/effects/gstgleffectglow.c
+++ b/gst/gl/effects/gstgleffectglow.c
@@ -21,7 +21,7 @@
 #include "config.h"
 #endif
 
-#include <gstgleffects.h>
+#include "../gstgleffects.h"
 
 static gboolean kernel_ready = FALSE;
 static float gauss_kernel[7];
diff --git a/gst/gl/effects/gstgleffectidentity.c b/gst/gl/effects/gstgleffectidentity.c
index 122616b..c55b1a2 100644
--- a/gst/gl/effects/gstgleffectidentity.c
+++ b/gst/gl/effects/gstgleffectidentity.c
@@ -21,7 +21,7 @@
 #include "config.h"
 #endif
 
-#include <gstgleffects.h>
+#include "../gstgleffects.h"
 
 #define USING_OPENGL(display) (gst_gl_display_get_gl_api (display) & GST_GL_API_OPENGL)
 #define USING_OPENGL3(display) (gst_gl_display_get_gl_api (display) & GST_GL_API_OPENGL3)
diff --git a/gst/gl/effects/gstgleffectlumatocurve.c b/gst/gl/effects/gstgleffectlumatocurve.c
index 0e81da4..8847bce 100644
--- a/gst/gl/effects/gstgleffectlumatocurve.c
+++ b/gst/gl/effects/gstgleffectlumatocurve.c
@@ -21,8 +21,8 @@
 #include "config.h"
 #endif
 
-#include <gstgleffects.h>
-#include <gstgleffectlumatocurve.h>
+#include "../gstgleffects.h"
+#include "gstgleffectlumatocurve.h"
 
 void
 gst_gl_effects_luma_to_curve (GstGLEffects * effects,
diff --git a/gst/gl/effects/gstgleffectlumatocurve.h b/gst/gl/effects/gstgleffectlumatocurve.h
index 9475cc6..1260416 100644
--- a/gst/gl/effects/gstgleffectlumatocurve.h
+++ b/gst/gl/effects/gstgleffectlumatocurve.h
@@ -21,7 +21,7 @@
 #ifndef __GST_GL_LUMA_TO_CURVE_H__
 #define __GST_GL_LUMA_TO_CURVE_H__
 
-#include <gstgleffectscurves.h>
+#include "gstgleffectscurves.h"
 
 G_BEGIN_DECLS
 
diff --git a/gst/gl/effects/gstgleffectmirror.c b/gst/gl/effects/gstgleffectmirror.c
index 4e82507..2ec225c 100644
--- a/gst/gl/effects/gstgleffectmirror.c
+++ b/gst/gl/effects/gstgleffectmirror.c
@@ -21,7 +21,7 @@
 #include "config.h"
 #endif
 
-#include <gstgleffects.h>
+#include "../gstgleffects.h"
 
 #define USING_OPENGL(display) (gst_gl_display_get_gl_api (display) & GST_GL_API_OPENGL)
 #define USING_OPENGL3(display) (gst_gl_display_get_gl_api (display) & GST_GL_API_OPENGL3)
diff --git a/gst/gl/effects/gstgleffectrgbtocurve.c b/gst/gl/effects/gstgleffectrgbtocurve.c
index 8f4d9f7..f268187 100644
--- a/gst/gl/effects/gstgleffectrgbtocurve.c
+++ b/gst/gl/effects/gstgleffectrgbtocurve.c
@@ -21,8 +21,8 @@
 #include "config.h"
 #endif
 
-#include <gstgleffects.h>
-#include <gstgleffectscurves.h>
+#include "../gstgleffects.h"
+#include "gstgleffectscurves.h"
 
 static void
 gst_gl_effects_rgb_to_curve (GstGLEffects * effects,
diff --git a/gst/gl/effects/gstgleffectsin.c b/gst/gl/effects/gstgleffectsin.c
index 156c15c..f546085 100644
--- a/gst/gl/effects/gstgleffectsin.c
+++ b/gst/gl/effects/gstgleffectsin.c
@@ -21,7 +21,7 @@
 #include "config.h"
 #endif
 
-#include <gstgleffects.h>
+#include "../gstgleffects.h"
 
 static void
 gst_gl_effects_sin_callback (gint width, gint height, guint texture,
diff --git a/gst/gl/effects/gstgleffectsquare.c b/gst/gl/effects/gstgleffectsquare.c
index 1ad4668..0d8312a 100644
--- a/gst/gl/effects/gstgleffectsquare.c
+++ b/gst/gl/effects/gstgleffectsquare.c
@@ -21,7 +21,7 @@
 #include "config.h"
 #endif
 
-#include <gstgleffects.h>
+#include "../gstgleffects.h"
 
 static void
 gst_gl_effects_square_callback (gint width, gint height, guint texture,
diff --git a/gst/gl/effects/gstgleffectsqueeze.c b/gst/gl/effects/gstgleffectsqueeze.c
index d04df84..162ce42 100644
--- a/gst/gl/effects/gstgleffectsqueeze.c
+++ b/gst/gl/effects/gstgleffectsqueeze.c
@@ -21,7 +21,7 @@
 #include "config.h"
 #endif
 
-#include <gstgleffects.h>
+#include "../gstgleffects.h"
 
 #define USING_OPENGL(display) (gst_gl_display_get_gl_api (display) & GST_GL_API_OPENGL)
 #define USING_OPENGL3(display) (gst_gl_display_get_gl_api (display) & GST_GL_API_OPENGL3)
diff --git a/gst/gl/effects/gstgleffectssources.c b/gst/gl/effects/gstgleffectssources.c
index 7d95278..3e397c6 100644
--- a/gst/gl/effects/gstgleffectssources.c
+++ b/gst/gl/effects/gstgleffectssources.c
@@ -22,10 +22,10 @@
 #include "config.h"
 #endif
 
-#include <gstglconfig.h>
+#include <gst/gl/gstglconfig.h>
 
-#include <gstgleffects.h>
-#include <gstgleffectssources.h>
+#include "../gstgleffects.h"
+#include "gstgleffectssources.h"
 #include <math.h>
 
 /* A common file for sources is needed since shader sources can be
diff --git a/gst/gl/effects/gstgleffectstretch.c b/gst/gl/effects/gstgleffectstretch.c
index 80bf3ce..1291b09 100644
--- a/gst/gl/effects/gstgleffectstretch.c
+++ b/gst/gl/effects/gstgleffectstretch.c
@@ -21,7 +21,7 @@
 #include "config.h"
 #endif
 
-#include <gstgleffects.h>
+#include "../gstgleffects.h"
 
 static void
 gst_gl_effects_stretch_callback (gint width, gint height, guint texture,
diff --git a/gst/gl/effects/gstgleffecttunnel.c b/gst/gl/effects/gstgleffecttunnel.c
index 081fdd8..25a521f 100644
--- a/gst/gl/effects/gstgleffecttunnel.c
+++ b/gst/gl/effects/gstgleffecttunnel.c
@@ -21,7 +21,7 @@
 #include "config.h"
 #endif
 
-#include <gstgleffects.h>
+#include "../gstgleffects.h"
 
 static void
 gst_gl_effects_tunnel_callback (gint width, gint height, guint texture,
diff --git a/gst/gl/effects/gstgleffecttwirl.c b/gst/gl/effects/gstgleffecttwirl.c
index a7f4c12..88da80a 100644
--- a/gst/gl/effects/gstgleffecttwirl.c
+++ b/gst/gl/effects/gstgleffecttwirl.c
@@ -21,7 +21,7 @@
 #include "config.h"
 #endif
 
-#include <gstgleffects.h>
+#include "../gstgleffects.h"
 
 static void
 gst_gl_effects_twirl_callback (gint width, gint height, guint texture,
diff --git a/gst/gl/effects/gstgleffectxray.c b/gst/gl/effects/gstgleffectxray.c
index dcdbc99..0712672 100644
--- a/gst/gl/effects/gstgleffectxray.c
+++ b/gst/gl/effects/gstgleffectxray.c
@@ -21,9 +21,9 @@
 #include "config.h"
 #endif
 
-#include <gstgleffects.h>
-#include <gstgleffectscurves.h>
-#include <gstgleffectlumatocurve.h>
+#include "../gstgleffects.h"
+#include "gstgleffectscurves.h"
+#include "gstgleffectlumatocurve.h"
 
 static gboolean kernel_ready = FALSE;
 static float gauss_kernel[7];
diff --git a/gst/gl/gltestsrc.h b/gst/gl/gltestsrc.h
index edc432a..f79ffee 100644
--- a/gst/gl/gltestsrc.h
+++ b/gst/gl/gltestsrc.h
@@ -21,6 +21,7 @@
 #define __GL_TEST_SRC_H__
 
 #include <glib.h>
+
 #include "gstgltestsrc.h"
 
 struct vts_color_struct {
diff --git a/gst/gl/gstglbumper.h b/gst/gl/gstglbumper.h
index 83cb033..b1a1dc0 100644
--- a/gst/gl/gstglbumper.h
+++ b/gst/gl/gstglbumper.h
@@ -21,7 +21,7 @@
 #ifndef _GST_GL_BUMPER_H_
 #define _GST_GL_BUMPER_H_
 
-#include <gstglfilter.h>
+#include <gst/gl/gstglfilter.h>
 
 G_BEGIN_DECLS
 
diff --git a/gst/gl/gstglcolorscale.h b/gst/gl/gstglcolorscale.h
index 0489021..29e306e 100644
--- a/gst/gl/gstglcolorscale.h
+++ b/gst/gl/gstglcolorscale.h
@@ -24,7 +24,7 @@
 #include <gst/gst.h>
 #include <gst/video/video.h>
 
-#include "gstglfilter.h"
+#include <gst/gl/gstglfilter.h>
 
 G_BEGIN_DECLS
 
diff --git a/gst/gl/gstgldeinterlace.h b/gst/gl/gstgldeinterlace.h
index 9d69a61..3b10279 100644
--- a/gst/gl/gstgldeinterlace.h
+++ b/gst/gl/gstgldeinterlace.h
@@ -21,7 +21,7 @@
 #ifndef _GST_GL_DEINTERLACE_H_

 #define _GST_GL_DEINTERLACE_H_

 

-#include <gstglfilter.h>

+#include <gst/gl/gstglfilter.h>

 

 G_BEGIN_DECLS

 

diff --git a/gst/gl/gstgldifferencematte.c b/gst/gl/gstgldifferencematte.c
index ac41ff3..6a7a83f 100644
--- a/gst/gl/gstgldifferencematte.c
+++ b/gst/gl/gstgldifferencematte.c
@@ -38,8 +38,9 @@
 
 #include <stdlib.h>
 #include <png.h>
+
 #include "gstgldifferencematte.h"
-#include <gstgleffectssources.h>
+#include "effects/gstgleffectssources.h"
 
 #if PNG_LIBPNG_VER >= 10400
 #define int_p_NULL         NULL
diff --git a/gst/gl/gstgldifferencematte.h b/gst/gl/gstgldifferencematte.h
index e8a92be..a153c38 100644
--- a/gst/gl/gstgldifferencematte.h
+++ b/gst/gl/gstgldifferencematte.h
@@ -21,7 +21,7 @@
 #ifndef _GST_GL_DIFFERENCEMATTE_H_
 #define _GST_GL_DIFFERENCEMATTE_H_
 
-#include <gstglfilter.h>
+#include <gst/gl/gstglfilter.h>
 
 #define GST_TYPE_GL_DIFFERENCEMATTE            (gst_gl_differencematte_get_type())
 #define GST_GL_DIFFERENCEMATTE(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_GL_DIFFERENCEMATTE,GstGLDifferenceMatte))
diff --git a/gst/gl/gstgleffects.c b/gst/gl/gstgleffects.c
index b59cb03..a51ce2c 100644
--- a/gst/gl/gstgleffects.c
+++ b/gst/gl/gstgleffects.c
@@ -36,9 +36,8 @@
 #include "config.h"
 #endif
 
-#include <gstglconfig.h>
-
-#include <gstgleffects.h>
+#include <gst/gl/gstglconfig.h>
+#include "gstgleffects.h"
 
 #define GST_TYPE_GL_EFFECTS            (gst_gl_effects_get_type())
 #define GST_GL_EFFECTS(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_GL_EFFECTS,GstGLEffects))
diff --git a/gst/gl/gstgleffects.h b/gst/gl/gstgleffects.h
index 4f96fdc..adc35af 100644
--- a/gst/gl/gstgleffects.h
+++ b/gst/gl/gstgleffects.h
@@ -21,8 +21,8 @@
 #ifndef __GST_GL_EFFECTS_H__
 #define __GST_GL_EFFECTS_H__
 
-#include <gstglfilter.h>
-#include <gstgleffectssources.h>
+#include <gst/gl/gstglfilter.h>
+#include "effects/gstgleffectssources.h"
 
 G_BEGIN_DECLS
 
diff --git a/gst/gl/gstglfilterapp.h b/gst/gl/gstglfilterapp.h
index ffb79ce..f582ae3 100644
--- a/gst/gl/gstglfilterapp.h
+++ b/gst/gl/gstglfilterapp.h
@@ -21,7 +21,7 @@
 #ifndef _GST_GL_FILTERAPP_H_
 #define _GST_GL_FILTERAPP_H_
 
-#include "gstglfilter.h"
+#include <gst/gl/gstglfilter.h>
 
 G_BEGIN_DECLS
 
diff --git a/gst/gl/gstglfilterblur.c b/gst/gl/gstglfilterblur.c
index 22861de..79e751c 100644
--- a/gst/gl/gstglfilterblur.c
+++ b/gst/gl/gstglfilterblur.c
@@ -37,7 +37,7 @@
 #endif
 
 #include "gstglfilterblur.h"
-#include <gstgleffectssources.h>
+#include "effects/gstgleffectssources.h"
 
 #define GST_CAT_DEFAULT gst_gl_filterblur_debug
 GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
diff --git a/gst/gl/gstglfilterblur.h b/gst/gl/gstglfilterblur.h
index d71200a..5561cb5 100644
--- a/gst/gl/gstglfilterblur.h
+++ b/gst/gl/gstglfilterblur.h
@@ -21,7 +21,7 @@
 #ifndef _GST_GL_FILTERBLUR_H_
 #define _GST_GL_FILTERBLUR_H_
 
-#include <gstglfilter.h>
+#include <gst/gl/gstglfilter.h>
 
 #define GST_TYPE_GL_FILTERBLUR            (gst_gl_filterblur_get_type())
 #define GST_GL_FILTERBLUR(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_GL_FILTERBLUR,GstGLFilterBlur))
diff --git a/gst/gl/gstglfiltercube.h b/gst/gl/gstglfiltercube.h
index 1833818..a72d09a 100644
--- a/gst/gl/gstglfiltercube.h
+++ b/gst/gl/gstglfiltercube.h
@@ -21,7 +21,7 @@
 #ifndef _GST_GL_FILTERCUBE_H_
 #define _GST_GL_FILTERCUBE_H_
 
-#include "gstglfilter.h"
+#include <gst/gl/gstglfilter.h>
 
 G_BEGIN_DECLS
 
diff --git a/gst/gl/gstglfilterglass.h b/gst/gl/gstglfilterglass.h
index 9e7cf9b..0048851 100644
--- a/gst/gl/gstglfilterglass.h
+++ b/gst/gl/gstglfilterglass.h
@@ -21,7 +21,7 @@
 #ifndef _GST_GL_FILTERGLASS_H_
 #define _GST_GL_FILTERGLASS_H_
 
-#include <gstglfilter.h>
+#include <gst/gl/gstglfilter.h>
 
 G_BEGIN_DECLS
 
diff --git a/gst/gl/gstglfilterlaplacian.h b/gst/gl/gstglfilterlaplacian.h
index 0a4599b..acfa376 100644
--- a/gst/gl/gstglfilterlaplacian.h
+++ b/gst/gl/gstglfilterlaplacian.h
@@ -21,7 +21,7 @@
 #ifndef _GST_GL_FILTERLAPLACIAN_H_
 #define _GST_GL_FILTERLAPLACIAN_H_
 
-#include <gstglfilter.h>
+#include <gst/gl/gstglfilter.h>
 
 G_BEGIN_DECLS
 
diff --git a/gst/gl/gstglfilterreflectedscreen.h b/gst/gl/gstglfilterreflectedscreen.h
index b1b3c18..7f6c5cf 100644
--- a/gst/gl/gstglfilterreflectedscreen.h
+++ b/gst/gl/gstglfilterreflectedscreen.h
@@ -21,7 +21,7 @@
 #ifndef _GST_GL_FILTERREFLECTEDSCREEN_H_
 #define _GST_GL_FILTERREFLECTEDSCREEN_H_
 
-#include <gstglfilter.h>
+#include <gst/gl/gstglfilter.h>
 
 G_BEGIN_DECLS
 
diff --git a/gst/gl/gstglfiltershader.c b/gst/gl/gstglfiltershader.c
index 054ab99..e3824fa 100644
--- a/gst/gl/gstglfiltershader.c
+++ b/gst/gl/gstglfiltershader.c
@@ -44,8 +44,9 @@
 #include <string.h>
 
 #include <gst/gst.h>
+#include <gst/gl/gstglshadervariables.h>
+
 #include "gstglfiltershader.h"
-#include <gstglshadervariables.h>
 
 /* horizontal filter */
 static gchar *hfilter_fragment_source;
diff --git a/gst/gl/gstglfiltershader.h b/gst/gl/gstglfiltershader.h
index b733e80..00fa587 100644
--- a/gst/gl/gstglfiltershader.h
+++ b/gst/gl/gstglfiltershader.h
@@ -22,7 +22,7 @@
 #ifndef _GST_GL_FILTERSHADER_H_
 #define _GST_GL_FILTERSHADER_H_
 
-#include <gstglfilter.h>
+#include <gst/gl/gstglfilter.h>
 
 #define GST_TYPE_GL_FILTERSHADER            (gst_gl_filtershader_get_type())
 #define GST_GL_FILTERSHADER(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_GL_FILTERSHADER,GstGLFilterShader))
diff --git a/gst/gl/gstglfiltersobel.c b/gst/gl/gstglfiltersobel.c
index eba0ea0..c7768af 100644
--- a/gst/gl/gstglfiltersobel.c
+++ b/gst/gl/gstglfiltersobel.c
@@ -37,7 +37,7 @@
 #endif
 
 #include "gstglfiltersobel.h"
-#include <gstgleffectssources.h>
+#include "effects/gstgleffectssources.h"
 
 enum
 {
diff --git a/gst/gl/gstglfiltersobel.h b/gst/gl/gstglfiltersobel.h
index 29cada1..1a73891 100644
--- a/gst/gl/gstglfiltersobel.h
+++ b/gst/gl/gstglfiltersobel.h
@@ -21,7 +21,7 @@
 #ifndef _GST_GL_FILTERSOBEL_H_
 #define _GST_GL_FILTERSOBEL_H_
 
-#include <gstglfilter.h>
+#include <gst/gl/gstglfilter.h>
 
 #define GST_TYPE_GL_FILTERSOBEL            (gst_gl_filtersobel_get_type())
 #define GST_GL_FILTERSOBEL(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_GL_FILTERSOBEL,GstGLFilterSobel))
diff --git a/gst/gl/gstglimagesink.h b/gst/gl/gstglimagesink.h
index 8ac03fe..6d923fa 100644
--- a/gst/gl/gstglimagesink.h
+++ b/gst/gl/gstglimagesink.h
@@ -27,7 +27,7 @@
 #include <gst/video/gstvideosink.h>
 #include <gst/video/video.h>
 
-#include "gl.h"
+#include <gst/gl/gl.h>
 
 G_BEGIN_DECLS
 
diff --git a/gst/gl/gstglmosaic.h b/gst/gl/gstglmosaic.h
index 51836b9..51af171 100644
--- a/gst/gl/gstglmosaic.h
+++ b/gst/gl/gstglmosaic.h
@@ -21,7 +21,7 @@
 #ifndef _GST_GL_MOSAIC_H_
 #define _GST_GL_MOSAIC_H_
 
-#include "gstglmixer.h"
+#include <gst/gl/gstglmixer.h>
 
 G_BEGIN_DECLS
 
diff --git a/gst/gl/gstgloverlay.c b/gst/gl/gstgloverlay.c
index f228d92..fc3f5ba 100644
--- a/gst/gl/gstgloverlay.c
+++ b/gst/gl/gstgloverlay.c
@@ -36,10 +36,10 @@
 #include "config.h"
 #endif
 
-#include <gstglconfig.h>
+#include <gst/gl/gstglconfig.h>
 
 #include "gstgloverlay.h"
-#include <gstgleffectssources.h>
+#include "effects/gstgleffectssources.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/gst/gl/gstgloverlay.h b/gst/gl/gstgloverlay.h
index 609f233..1245f8e 100644
--- a/gst/gl/gstgloverlay.h
+++ b/gst/gl/gstgloverlay.h
@@ -21,7 +21,7 @@
 #ifndef _GST_GL_OVERLAY_H_
 #define _GST_GL_OVERLAY_H_
 
-#include <gstglfilter.h>
+#include <gst/gl/gstglfilter.h>
 
 #define GST_TYPE_GL_OVERLAY            (gst_gl_overlay_get_type())
 #define GST_GL_OVERLAY(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_GL_OVERLAY,GstGLOverlay))
diff --git a/gst/gl/gstgltestsrc.h b/gst/gl/gstgltestsrc.h
index 884ace2..1f065a9 100644
--- a/gst/gl/gstgltestsrc.h
+++ b/gst/gl/gstgltestsrc.h
@@ -26,7 +26,7 @@
 #include <gst/gst.h>
 #include <gst/base/gstpushsrc.h>
 
-#include "gl.h"
+#include <gst/gl/gl.h>
 
 G_BEGIN_DECLS
 
diff --git a/gst/gl/gstopengl.c b/gst/gl/gstopengl.c
index c2a3d8e..3019bcb 100644
--- a/gst/gl/gstopengl.c
+++ b/gst/gl/gstopengl.c
@@ -43,7 +43,7 @@
 #include "config.h"
 #endif
 
-#include <gstglconfig.h>
+#include <gst/gl/gstglconfig.h>
 
 #include "gstglimagesink.h"