diff --git a/gst-libs/gst/gl/gstglbuffer.c b/gst-libs/gst/gl/gstglbuffer.c
index f85179bc7b..9285a7af2c 100644
--- a/gst-libs/gst/gl/gstglbuffer.c
+++ b/gst-libs/gst/gl/gstglbuffer.c
@@ -4,7 +4,7 @@
 #endif
 
 #include <gstglbuffer.h>
-#include <glvideo.h>
+#include <gstgldisplay.h>
 #include <GL/glext.h>
 #include <unistd.h>
 #include "glextensions.h"
diff --git a/gst-libs/gst/gl/gstglbuffer.h b/gst-libs/gst/gl/gstglbuffer.h
index 3bb4437cff..e24b70f072 100644
--- a/gst-libs/gst/gl/gstglbuffer.h
+++ b/gst-libs/gst/gl/gstglbuffer.h
@@ -4,8 +4,7 @@
 
 #include <gst/gst.h>
 #include <gst/video/video.h>
-#include <xcb/xcb.h>
-#include <glvideo.h>
+#include <gstgldisplay.h>
 
 typedef struct _GstGLBuffer GstGLBuffer;
 
diff --git a/gst/gl/glvideo.c b/gst-libs/gst/gl/gstgldisplay.c
similarity index 99%
rename from gst/gl/glvideo.c
rename to gst-libs/gst/gl/gstgldisplay.c
index b574a154c4..7b1c39b2dc 100644
--- a/gst/gl/glvideo.c
+++ b/gst-libs/gst/gl/gstgldisplay.c
@@ -1,4 +1,4 @@
-/* glvideo.c
+/* gstgldisplay.c
  * Copyright (C) 2007 David A. Schleef <ds@schleef.org>
  *
  * This library is free software; you can redistribute it and/or
@@ -21,7 +21,7 @@
 #include "config.h"
 #endif
 
-#include "glvideo.h"
+#include "gstgldisplay.h"
 #include "glextensions.h"
 #include <gst/gst.h>
 
diff --git a/gst/gl/glvideo.h b/gst-libs/gst/gl/gstgldisplay.h
similarity index 100%
rename from gst/gl/glvideo.h
rename to gst-libs/gst/gl/gstgldisplay.h
diff --git a/gst/gl/Makefile.am b/gst/gl/Makefile.am
index 49d8ac4f00..ab1a6536dc 100644
--- a/gst/gl/Makefile.am
+++ b/gst/gl/Makefile.am
@@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgstglimagesink.la
 
 libgstglimagesink_la_SOURCES = \
 	glimagesink.c \
-	glvideo.c \
+	gstgldisplay.c \
 	gstopengl.c \
 	glextensions.c \
 	gstglbuffer.c \
@@ -19,6 +19,6 @@ libgstglimagesink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
 noinst_HEADERS = \
 	glimagesink.h \
-	glvideo.h \
+	gstgldisplay.h \
 	glextensions.h \
 	gstglbuffer.h
diff --git a/gst/gl/glimagesink.h b/gst/gl/glimagesink.h
index ff60955bee..3467c619d4 100644
--- a/gst/gl/glimagesink.h
+++ b/gst/gl/glimagesink.h
@@ -26,7 +26,7 @@
 #include <gst/video/gstvideosink.h>
 #include <gst/video/video.h>
 
-#include "glvideo.h"
+#include "gstgldisplay.h"
 
 GST_DEBUG_CATEGORY_EXTERN (gst_debug_glimage_sink);