diff --git a/docs/libs/gst-plugins-base-libs-sections.txt b/docs/libs/gst-plugins-base-libs-sections.txt
index 2170a4b3ce4..425b7c5c44f 100644
--- a/docs/libs/gst-plugins-base-libs-sections.txt
+++ b/docs/libs/gst-plugins-base-libs-sections.txt
@@ -565,7 +565,7 @@ KISS_FFT_F64_SIN
 
 <SECTION>
 <FILE>gstcolorbalance</FILE>
-<INCLUDE>gst/interfaces/color.h</INCLUDE>
+<INCLUDE>gst/video/colorbalance.h</INCLUDE>
 GstColorBalance
 GstColorBalanceInterface
 GstColorBalanceType
@@ -587,7 +587,7 @@ gst_color_balance_type_get_type
 
 <SECTION>
 <FILE>gstcolorbalancechannel</FILE>
-<INCLUDE>gst/interfaces/colorbalancechannel.h</INCLUDE>
+<INCLUDE>gst/video/colorbalancechannel.h</INCLUDE>
 GstColorBalanceChannel
 GstColorBalanceChannelClass
 <SUBSECTION Standard>
@@ -862,7 +862,7 @@ gst_tuner_norm_get_type
 
 <SECTION>
 <FILE>gstvideoorientation</FILE>
-<INCLUDE>gst/interfaces/videoorientation.h</INCLUDE>
+<INCLUDE>gst/video/videoorientation.h</INCLUDE>
 GstVideoOrientation
 GstVideoOrientationInterface
 gst_video_orientation_get_hcenter
@@ -883,7 +883,7 @@ gst_video_orientation_get_type
 
 <SECTION>
 <FILE>gstvideooverlay</FILE>
-<INCLUDE>gst/interfaces/videooverlay.h</INCLUDE>
+<INCLUDE>gst/video/videooverlay.h</INCLUDE>
 GstXOverlay
 GstXOverlayIface
 gst_video_overlay_got_window_handle
diff --git a/docs/libs/gst-plugins-base-libs.types b/docs/libs/gst-plugins-base-libs.types
index b091845482a..04ac2b7060e 100644
--- a/docs/libs/gst-plugins-base-libs.types
+++ b/docs/libs/gst-plugins-base-libs.types
@@ -22,9 +22,6 @@ gst_audio_base_src_get_type
 #include <gst/audio/gstaudioringbuffer.h>
 gst_audio_ring_buffer_get_type
 
-#include <gst/interfaces/colorbalance.h>
-gst_color_balance_get_type
-gst_color_balance_channel_get_type
 #include <gst/interfaces/mixer.h>
 gst_mixer_get_type
 gst_mixer_options_get_type
@@ -39,10 +36,6 @@ gst_tuner_channel_get_type
 gst_tuner_norm_get_type
 #include <gst/interfaces/streamvolume.h>
 gst_stream_volume_get_type
-#include <gst/interfaces/videoorientation.h>
-gst_video_orientation_get_type
-#include <gst/interfaces/videooverlay.h>
-gst_video_overlay_get_type
 
 
 #include <gst/rtp/gstrtpbasedepayload.h>
@@ -57,6 +50,13 @@ gst_rtp_base_audio_payload_get_type
 gst_video_filter_get_type
 #include <gst/video/gstvideosink.h>
 gst_video_sink_get_type
+#include <gst/video/colorbalance.h>
+gst_color_balance_get_type
+gst_color_balance_channel_get_type
+#include <gst/video/videoorientation.h>
+gst_video_orientation_get_type
+#include <gst/video/videooverlay.h>
+gst_video_overlay_get_type
 
 #include <gst/pbutils/pbutils.h>
 gst_discoverer_get_type
diff --git a/gst-libs/gst/interfaces/Makefile.am b/gst-libs/gst/interfaces/Makefile.am
index 85693a5a65d..4e0f2b9d0e8 100644
--- a/gst-libs/gst/interfaces/Makefile.am
+++ b/gst-libs/gst/interfaces/Makefile.am
@@ -3,8 +3,6 @@ libgstinterfacesincludedir = \
         $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/interfaces
 
 headers_interfaces = 		\
-	colorbalance.h		\
-	colorbalancechannel.h	\
 	mixer.h			\
 	mixeroptions.h		\
 	mixertrack.h		\
@@ -13,9 +11,7 @@ headers_interfaces = 		\
 	streamvolume.h          \
 	tuner.h			\
 	tunernorm.h		\
-	tunerchannel.h		\
-	videoorientation.h	\
-	videooverlay.h
+	tunerchannel.h
 
 # variables used for enum/marshal generation
 glib_enum_headers = $(headers_interfaces)
@@ -38,8 +34,6 @@ nodist_libgstinterfacesinclude_HEADERS = \
 	interfaces-enumtypes.h
 
 libgstinterfaces_@GST_MAJORMINOR@_la_SOURCES = \
-	colorbalance.c		\
-	colorbalancechannel.c	\
 	mixer.c			\
 	mixeroptions.c		\
 	mixertrack.c		\
@@ -48,9 +42,7 @@ libgstinterfaces_@GST_MAJORMINOR@_la_SOURCES = \
 	streamvolume.c          \
 	tuner.c			\
 	tunernorm.c		\
-	tunerchannel.c		\
-	videoorientation.c	\
-	videooverlay.c
+	tunerchannel.c
 
 nodist_libgstinterfaces_@GST_MAJORMINOR@_la_SOURCES = 	\
 	$(built_sources)				\
diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am
index aeda56f5d4a..f66b4717340 100644
--- a/gst-libs/gst/video/Makefile.am
+++ b/gst-libs/gst/video/Makefile.am
@@ -1,19 +1,31 @@
 # variables used for enum/marshal generation
-glib_enum_headers = video.h
+glib_enum_headers = video.h colorbalance.h
 glib_enum_define = GST_VIDEO
 glib_gen_prefix = gst_video
 glib_gen_basename = video
 
-built_sources = video-enumtypes.c
-built_headers = video-enumtypes.h
+built_sources = video-enumtypes.c video-marshal.c
+built_headers = video-enumtypes.h video-marshal.h
 BUILT_SOURCES = $(built_sources) $(built_headers)
 
 lib_LTLIBRARIES = libgstvideo-@GST_MAJORMINOR@.la
 
 CLEANFILES = $(BUILT_SOURCES)
 
+EXTRA_DIST = video-marshal.list
+
 libgstvideo_@GST_MAJORMINOR@_la_SOURCES = \
-	video.c gstvideosink.c gstvideofilter.c convertframe.c gstvideometa.c gstvideopool.c
+	colorbalance.c   	\
+	colorbalancechannel.c   \
+	video.c          	\
+	gstvideosink.c   	\
+	gstvideofilter.c 	\
+	convertframe.c   	\
+	gstvideometa.c   	\
+	gstvideopool.c		\
+	videoorientation.c	\
+	videooverlay.c
+
 nodist_libgstvideo_@GST_MAJORMINOR@_la_SOURCES = $(BUILT_SOURCES)
 
 libgstvideo_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/video
diff --git a/gst-libs/gst/interfaces/colorbalance.c b/gst-libs/gst/video/colorbalance.c
similarity index 98%
rename from gst-libs/gst/interfaces/colorbalance.c
rename to gst-libs/gst/video/colorbalance.c
index 31d49b087df..a73c7d7ff6f 100644
--- a/gst-libs/gst/interfaces/colorbalance.c
+++ b/gst-libs/gst/video/colorbalance.c
@@ -25,7 +25,7 @@
 #endif
 
 #include "colorbalance.h"
-#include "interfaces-marshal.h"
+#include "video-marshal.h"
 
 /**
  * SECTION:gstcolorbalance
@@ -100,7 +100,7 @@ gst_color_balance_class_init (GstColorBalanceInterface * iface)
         GST_TYPE_COLOR_BALANCE, G_SIGNAL_RUN_LAST,
         G_STRUCT_OFFSET (GstColorBalanceInterface, value_changed),
         NULL, NULL,
-        gst_interfaces_marshal_VOID__OBJECT_INT,
+        gst_video_marshal_VOID__OBJECT_INT,
         G_TYPE_NONE, 2, GST_TYPE_COLOR_BALANCE_CHANNEL, G_TYPE_INT);
 
     initialized = TRUE;
diff --git a/gst-libs/gst/interfaces/colorbalance.h b/gst-libs/gst/video/colorbalance.h
similarity index 97%
rename from gst-libs/gst/interfaces/colorbalance.h
rename to gst-libs/gst/video/colorbalance.h
index 76eebd41d1d..8cc4276f040 100644
--- a/gst-libs/gst/interfaces/colorbalance.h
+++ b/gst-libs/gst/video/colorbalance.h
@@ -23,8 +23,7 @@
 #define __GST_COLOR_BALANCE_H__
 
 #include <gst/gst.h>
-#include <gst/interfaces/colorbalancechannel.h>
-#include <gst/interfaces/interfaces-enumtypes.h>
+#include <gst/video/colorbalancechannel.h>
 
 G_BEGIN_DECLS
 
diff --git a/gst-libs/gst/interfaces/colorbalancechannel.c b/gst-libs/gst/video/colorbalancechannel.c
similarity index 100%
rename from gst-libs/gst/interfaces/colorbalancechannel.c
rename to gst-libs/gst/video/colorbalancechannel.c
diff --git a/gst-libs/gst/interfaces/colorbalancechannel.h b/gst-libs/gst/video/colorbalancechannel.h
similarity index 100%
rename from gst-libs/gst/interfaces/colorbalancechannel.h
rename to gst-libs/gst/video/colorbalancechannel.h
diff --git a/gst-libs/gst/video/video-marshal.list b/gst-libs/gst/video/video-marshal.list
new file mode 100644
index 00000000000..b9d0c499aa4
--- /dev/null
+++ b/gst-libs/gst/video/video-marshal.list
@@ -0,0 +1 @@
+VOID:OBJECT,INT
diff --git a/gst-libs/gst/interfaces/videoorientation.c b/gst-libs/gst/video/videoorientation.c
similarity index 99%
rename from gst-libs/gst/interfaces/videoorientation.c
rename to gst-libs/gst/video/videoorientation.c
index 6b6001a2758..0f8ede4c2ac 100644
--- a/gst-libs/gst/interfaces/videoorientation.c
+++ b/gst-libs/gst/video/videoorientation.c
@@ -24,7 +24,7 @@
 #endif
 
 #include "videoorientation.h"
-#include "interfaces-marshal.h"
+#include "video-marshal.h"
 
 #include <string.h>
 
diff --git a/gst-libs/gst/interfaces/videoorientation.h b/gst-libs/gst/video/videoorientation.h
similarity index 100%
rename from gst-libs/gst/interfaces/videoorientation.h
rename to gst-libs/gst/video/videoorientation.h
diff --git a/gst-libs/gst/interfaces/videooverlay.c b/gst-libs/gst/video/videooverlay.c
similarity index 100%
rename from gst-libs/gst/interfaces/videooverlay.c
rename to gst-libs/gst/video/videooverlay.c
diff --git a/gst-libs/gst/interfaces/videooverlay.h b/gst-libs/gst/video/videooverlay.h
similarity index 100%
rename from gst-libs/gst/interfaces/videooverlay.h
rename to gst-libs/gst/video/videooverlay.h
diff --git a/sys/ximage/ximagesink.c b/sys/ximage/ximagesink.c
index f9420e38ed5..20b958e6265 100644
--- a/sys/ximage/ximagesink.c
+++ b/sys/ximage/ximagesink.c
@@ -105,7 +105,7 @@
 
 /* Our interfaces */
 #include <gst/interfaces/navigation.h>
-#include <gst/interfaces/videooverlay.h>
+#include <gst/video/videooverlay.h>
 
 #include <gst/video/gstvideometa.h>
 
diff --git a/sys/xvimage/xvimagesink.c b/sys/xvimage/xvimagesink.c
index a876f579ed4..4c217b197ee 100644
--- a/sys/xvimage/xvimagesink.c
+++ b/sys/xvimage/xvimagesink.c
@@ -115,9 +115,9 @@
 
 /* Our interfaces */
 #include <gst/interfaces/navigation.h>
-#include <gst/interfaces/videooverlay.h>
-#include <gst/interfaces/colorbalance.h>
 #include <gst/interfaces/propertyprobe.h>
+#include <gst/video/videooverlay.h>
+#include <gst/video/colorbalance.h>
 /* Helper functions */
 #include <gst/video/gstvideometa.h>
 
diff --git a/tests/check/libs/gstlibscpp.cc b/tests/check/libs/gstlibscpp.cc
index 1b73efed9d0..c5c9d9507da 100644
--- a/tests/check/libs/gstlibscpp.cc
+++ b/tests/check/libs/gstlibscpp.cc
@@ -47,8 +47,6 @@
 #include <gst/fft/gstffts16.h>
 #include <gst/fft/gstffts32.h>
 
-#include <gst/interfaces/colorbalancechannel.h>
-#include <gst/interfaces/colorbalance.h>
 #include <gst/interfaces/interfaces-enumtypes.h>
 #include <gst/interfaces/interfaces-marshal.h>
 #include <gst/interfaces/mixer.h>
@@ -60,8 +58,6 @@
 #include <gst/interfaces/tunerchannel.h>
 #include <gst/interfaces/tuner.h>
 #include <gst/interfaces/tunernorm.h>
-#include <gst/interfaces/videoorientation.h>
-#include <gst/interfaces/videooverlay.h>
 
 #include <gst/pbutils/codec-utils.h>
 #include <gst/pbutils/descriptions.h>
@@ -106,7 +102,12 @@
 #include <gst/video/gstvideofilter.h>
 #include <gst/video/gstvideosink.h>
 #include <gst/video/video-enumtypes.h>
+#include <gst/video/video-marshal.h>
 #include <gst/video/video.h>
+#include <gst/video/colorbalancechannel.h>
+#include <gst/video/colorbalance.h>
+#include <gst/video/videoorientation.h>
+#include <gst/video/videooverlay.h>
 
 /* we mostly just want to make sure that our library headers don't
  * contain anything a C++ compiler might not like */
diff --git a/tests/check/libs/libsabi.c b/tests/check/libs/libsabi.c
index bf8d1c5db5f..2ab56ae59a3 100644
--- a/tests/check/libs/libsabi.c
+++ b/tests/check/libs/libsabi.c
@@ -38,14 +38,11 @@
 #include <gst/fft/gstffts32.h>
 #include <gst/fft/gstfftf32.h>
 #include <gst/fft/gstfftf64.h>
-#include <gst/interfaces/colorbalance.h>
 #include <gst/interfaces/mixer.h>
 #include <gst/interfaces/navigation.h>
 #include <gst/interfaces/propertyprobe.h>
 #include <gst/interfaces/streamvolume.h>
 #include <gst/interfaces/tuner.h>
-#include <gst/interfaces/videoorientation.h>
-#include <gst/interfaces/videooverlay.h>
 #include <gst/pbutils/pbutils.h>
 #include <gst/riff/riff-media.h>
 #include <gst/riff/riff-read.h>
@@ -69,6 +66,9 @@
 #include <gst/video/video.h>
 #include <gst/video/gstvideofilter.h>
 #include <gst/video/gstvideosink.h>
+#include <gst/video/colorbalance.h>
+#include <gst/video/videoorientation.h>
+#include <gst/video/videooverlay.h>
 
 /* initial version of the file was generated using:
  * grep -A1 "<STRUCT>" ../../docs/libs/gst-plugins-base-libs-decl.txt | \
diff --git a/tests/examples/overlay/Makefile.am b/tests/examples/overlay/Makefile.am
index 31615b44a42..23c25467f5d 100644
--- a/tests/examples/overlay/Makefile.am
+++ b/tests/examples/overlay/Makefile.am
@@ -8,7 +8,7 @@ EXAMPLES += gtk-videooverlay
 gtk_videooverlay_SOURCES = gtk-videooverlay.c
 gtk_videooverlay_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(X_CFLAGS) $(GTK_CFLAGS)
 gtk_videooverlay_LDADD = \
-	$(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la \
+	$(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la \
 	$(GST_LIBS) $(X_LIBS) $(LIBM) $(GTK_LIBS)
 endif
 
@@ -18,7 +18,7 @@ EXAMPLES += qt-videooverlay
 qt_videooverlay_SOURCES = qt-videooverlay.cpp
 qt_videooverlay_CXXFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CXXFLAGS) $(X_CFLAGS) $(QT_CFLAGS)
 qt_videooverlay_LDADD = \
-	$(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la \
+	$(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la \
 	$(GST_LIBS) $(X_LIBS) $(LIBM) $(QT_LIBS)
 endif
 
@@ -28,7 +28,7 @@ EXAMPLES += qtgv-videooverlay
 qtgv_videooverlay_SOURCES = qtgv-videooverlay.cpp qtgv-videooverlay.h
 qtgv_videooverlay_CXXFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CXXFLAGS) $(X_CFLAGS) $(QT_CFLAGS)
 qtgv_videooverlay_LDADD = \
-	$(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la \
+	$(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la \
 	$(GST_LIBS) $(X_LIBS) $(LIBM) $(QT_LIBS)
 
 # qt moc support, according to http://qtnode.net/wiki/Qt_with_autotools
diff --git a/tests/examples/overlay/qt-videooverlay.cpp b/tests/examples/overlay/qt-videooverlay.cpp
index e1022806767..d33c51dc12f 100644
--- a/tests/examples/overlay/qt-videooverlay.cpp
+++ b/tests/examples/overlay/qt-videooverlay.cpp
@@ -25,7 +25,7 @@
 
 #include <glib.h>
 #include <gst/gst.h>
-#include <gst/interfaces/videooverlay.h>
+#include <gst/video/videooverlay.h>
 
 #include <QApplication>
 #include <QTimer>
diff --git a/tests/examples/overlay/qtgv-videooverlay.cpp b/tests/examples/overlay/qtgv-videooverlay.cpp
index fea8c5252ad..cc82107cb8a 100644
--- a/tests/examples/overlay/qtgv-videooverlay.cpp
+++ b/tests/examples/overlay/qtgv-videooverlay.cpp
@@ -28,7 +28,7 @@
 #include <QApplication>
 #include <QTimer>
 
-#include <gst/interfaces/videooverlay.h>
+#include <gst/video/videooverlay.h>
 
 SinkPipeline::SinkPipeline(QGraphicsView *parent) : QObject(parent)
 {
diff --git a/tests/icles/Makefile.am b/tests/icles/Makefile.am
index de853c433d2..d671c56e049 100644
--- a/tests/icles/Makefile.am
+++ b/tests/icles/Makefile.am
@@ -8,7 +8,7 @@ stress_videooverlay_SOURCES = stress-videooverlay.c
 stress_videooverlay_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
 	$(GST_BASE_CFLAGS) $(GST_CFLAGS) $(X_CFLAGS)
 stress_videooverlay_LDADD = \
-	$(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la \
+	$(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la \
 	$(GST_LIBS) $(X_LIBS) $(LIBM)
 
 if HAVE_GTK_X11
@@ -18,14 +18,14 @@ test_colorkey_SOURCES = test-colorkey.c
 test_colorkey_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
 	$(GST_BASE_CFLAGS) $(GST_CFLAGS) $(X_CFLAGS) $(GTK_CFLAGS)
 test_colorkey_LDADD = \
-	$(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la \
+	$(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la \
 	$(GST_LIBS) $(X_LIBS) $(LIBM) $(GTK_LIBS)
 
 test_videooverlay_SOURCES = test-videooverlay.c
 test_videooverlay_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
 	$(GST_BASE_CFLAGS) $(GST_CFLAGS) $(X_CFLAGS) $(GTK_CFLAGS)
 test_videooverlay_LDADD = \
-	$(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la \
+	$(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la \
 	$(GST_LIBS) $(X_LIBS) $(LIBM) $(GTK_LIBS)
 endif
 
diff --git a/tests/icles/stress-videooverlay.c b/tests/icles/stress-videooverlay.c
index bcbe7dc6fc2..b0072227cc2 100644
--- a/tests/icles/stress-videooverlay.c
+++ b/tests/icles/stress-videooverlay.c
@@ -22,7 +22,7 @@
 #endif
 
 #include <gst/gst.h>
-#include <gst/interfaces/videooverlay.h>
+#include <gst/video/videooverlay.h>
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>