diff --git a/ext/vp8/Makefile.am b/ext/vp8/Makefile.am
index ca9c7a10b9..cd58e28a8f 100644
--- a/ext/vp8/Makefile.am
+++ b/ext/vp8/Makefile.am
@@ -11,7 +11,8 @@ libgstvp8_la_CFLAGS = \
 	$(GST_PLUGINS_BAD_CFLAGS) \
 	$(GST_PLUGINS_BASE_CFLAGS) \
 	$(GST_BASE_CFLAGS) \
-	$(GST_CFLAGS)
+	$(GST_CFLAGS) \
+	-DGST_USE_UNSTABLE_API
 libgstvp8_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstvp8_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS)
 libgstvp8_la_LIBADD += $(GST_PLUGINS_BASE_LIBS) -lgsttag-@GST_MAJORMINOR@ -lgstvideo-@GST_MAJORMINOR@
diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am
index baf42094d4..5072f1df68 100644
--- a/gst-libs/gst/video/Makefile.am
+++ b/gst-libs/gst/video/Makefile.am
@@ -20,7 +20,8 @@ libgstbasevideo_@GST_MAJORMINOR@include_HEADERS = \
 
 libgstbasevideo_@GST_MAJORMINOR@_la_CFLAGS = \
 	$(GST_PLUGINS_BAD_CFLAGS) \
-	$(GST_PLUGINS_BASE_CFLAGS) -DGST_USE_UNSTABLE_API \
+	$(GST_PLUGINS_BASE_CFLAGS) \
+	-DGST_USE_UNSTABLE_API \
 	$(GST_CFLAGS)
 libgstbasevideo_@GST_MAJORMINOR@_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) -lgstvideo-@GST_MAJORMINOR@
 libgstbasevideo_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
diff --git a/gst-libs/gst/video/gstbasevideocodec.h b/gst-libs/gst/video/gstbasevideocodec.h
index f4a1cf95b7..b6acf62ee6 100644
--- a/gst-libs/gst/video/gstbasevideocodec.h
+++ b/gst-libs/gst/video/gstbasevideocodec.h
@@ -20,6 +20,11 @@
 #ifndef _GST_BASE_VIDEO_CODEC_H_
 #define _GST_BASE_VIDEO_CODEC_H_
 
+#ifndef GST_USE_UNSTABLE_API
+#warning "GstBaseVideoCodec is unstable API and may change in future."
+#warning "You can define GST_USE_UNSTABLE_API to avoid this warning."
+#endif
+
 #include <gst/gst.h>
 #include <gst/video/gstbasevideoutils.h>
 
diff --git a/gst-libs/gst/video/gstbasevideodecoder.h b/gst-libs/gst/video/gstbasevideodecoder.h
index 13b588605c..20d6f0a7a1 100644
--- a/gst-libs/gst/video/gstbasevideodecoder.h
+++ b/gst-libs/gst/video/gstbasevideodecoder.h
@@ -20,6 +20,11 @@
 #ifndef _GST_BASE_VIDEO_DECODER_H_
 #define _GST_BASE_VIDEO_DECODER_H_
 
+#ifndef GST_USE_UNSTABLE_API
+#warning "GstBaseVideoDecoder is unstable API and may change in future."
+#warning "You can define GST_USE_UNSTABLE_API to avoid this warning."
+#endif
+
 #include <gst/video/gstbasevideocodec.h>
 
 G_BEGIN_DECLS
diff --git a/gst-libs/gst/video/gstbasevideoencoder.h b/gst-libs/gst/video/gstbasevideoencoder.h
index 761a9d707a..436d904fe5 100644
--- a/gst-libs/gst/video/gstbasevideoencoder.h
+++ b/gst-libs/gst/video/gstbasevideoencoder.h
@@ -20,6 +20,11 @@
 #ifndef _GST_BASE_VIDEO_ENCODER_H_
 #define _GST_BASE_VIDEO_ENCODER_H_
 
+#ifndef GST_USE_UNSTABLE_API
+#warning "GstBaseVideoEncoder is unstable API and may change in future."
+#warning "You can define GST_USE_UNSTABLE_API to avoid this warning."
+#endif
+
 #include <gst/video/gstbasevideocodec.h>
 #include <gst/video/gstbasevideoutils.h>
 
diff --git a/gst-libs/gst/video/gstbasevideoparse.h b/gst-libs/gst/video/gstbasevideoparse.h
index 5a1469f1f4..252685acd1 100644
--- a/gst-libs/gst/video/gstbasevideoparse.h
+++ b/gst-libs/gst/video/gstbasevideoparse.h
@@ -20,6 +20,11 @@
 #ifndef _GST_BASE_VIDEO_PARSE_H_
 #define _GST_BASE_VIDEO_PARSE_H_
 
+#ifndef GST_USE_UNSTABLE_API
+#warning "GstBaseVideoParse is unstable API and may change in future."
+#warning "You can define GST_USE_UNSTABLE_API to avoid this warning."
+#endif
+
 #include <gst/video/gstbasevideocodec.h>
 #include <gst/video/gstbasevideoutils.h>
 
diff --git a/gst-libs/gst/video/gstbasevideoutils.h b/gst-libs/gst/video/gstbasevideoutils.h
index 47871dcff2..6d83742913 100644
--- a/gst-libs/gst/video/gstbasevideoutils.h
+++ b/gst-libs/gst/video/gstbasevideoutils.h
@@ -20,6 +20,11 @@
 #ifndef _GST_BASE_VIDEO_UTILS_H_
 #define _GST_BASE_VIDEO_UTILS_H_
 
+#ifndef GST_USE_UNSTABLE_API
+#warning "The base video utils API is unstable and may change in future."
+#warning "You can define GST_USE_UNSTABLE_API to avoid this warning."
+#endif
+
 #include <gst/gst.h>
 #include <gst/video/video.h>
 #include <gst/base/gstadapter.h>