diff --git a/docs/reference/libs/libs-docs.xml.in b/docs/reference/libs/libs-docs.xml.in
index f8940f8ac0..1f7f8409b6 100644
--- a/docs/reference/libs/libs-docs.xml.in
+++ b/docs/reference/libs/libs-docs.xml.in
@@ -27,9 +27,6 @@
     <xi:include href="xml/gstvaapivideopool.xml"/>
     <xi:include href="xml/gstvaapisurfacepool.xml"/>
     <xi:include href="xml/gstvaapiimagepool.xml"/>
-    <xi:include href="xml/gstvaapivideobuffer.xml"/>
-    <xi:include href="xml/gstvaapivideometa.xml"/>
-    <xi:include href="xml/gstvaapicontext.xml"/>
     <xi:include href="xml/gstvaapidecoder.xml"/>
     <xi:include href="xml/gstvaapidecoder_jpeg.xml"/>
     <xi:include href="xml/gstvaapidecoder_mpeg2.xml"/>
diff --git a/docs/reference/libs/libs-sections.txt b/docs/reference/libs/libs-sections.txt
index 3c1b03aa9e..91796d9fe0 100644
--- a/docs/reference/libs/libs-sections.txt
+++ b/docs/reference/libs/libs-sections.txt
@@ -304,24 +304,6 @@ gst_vaapi_texture_get_size
 gst_vaapi_texture_put_surface
 </SECTION>
 
-<SECTION>
-<FILE>gstvaapicontext</FILE>
-<TITLE>GstVaapiContext</TITLE>
-GstVaapiContext
-gst_vaapi_context_new
-gst_vaapi_context_reset
-gst_vaapi_context_get_id
-gst_vaapi_context_get_profile
-gst_vaapi_context_set_profile
-gst_vaapi_context_get_entrypoint
-gst_vaapi_context_get_size
-gst_vaapi_context_get_surface_proxy
-gst_vaapi_context_get_surface_count
-gst_vaapi_context_apply_composition
-<SUBSECTION Standard>
-GST_VAAPI_CONTEXT
-</SECTION>
-
 <SECTION>
 <FILE>gstvaapidecoder</FILE>
 GstVaapiDecoderStatus
diff --git a/gst-libs/gst/vaapi/Makefile.am b/gst-libs/gst/vaapi/Makefile.am
index a8ccd6fe8a..3e0a02a4fd 100644
--- a/gst-libs/gst/vaapi/Makefile.am
+++ b/gst-libs/gst/vaapi/Makefile.am
@@ -74,14 +74,13 @@ libgstvaapi_source_c =				\
 	$(NULL)
 
 libgstvaapi_source_h =				\
-	gstvaapicontext.h			\
 	gstvaapidecoder.h			\
 	gstvaapidecoder_h264.h			\
 	gstvaapidecoder_mpeg2.h			\
 	gstvaapidecoder_mpeg4.h			\
 	gstvaapidecoder_vc1.h			\
 	gstvaapidisplay.h			\
-	gstvaapidisplaycache.h			\
+	gstvaapifilter.h			\
 	gstvaapiimage.h				\
 	gstvaapiimagepool.h			\
 	gstvaapiobject.h			\
@@ -103,12 +102,14 @@ libgstvaapi_source_priv_h =			\
 	gstcompat.h				\
 	gstvaapicodec_objects.h			\
 	gstvaapicompat.h			\
+	gstvaapicontext.h			\
 	gstvaapidebug.h				\
 	gstvaapidecoder_dpb.h			\
 	gstvaapidecoder_objects.h		\
 	gstvaapidecoder_priv.h			\
 	gstvaapidecoder_unit.h			\
 	gstvaapidisplay_priv.h			\
+	gstvaapidisplaycache.h			\
 	gstvaapiimage_priv.h			\
 	gstvaapiminiobject.h			\
 	gstvaapiobject_priv.h			\
diff --git a/gst-libs/gst/vaapi/gstvaapicontext.h b/gst-libs/gst/vaapi/gstvaapicontext.h
index 2414e9da92..3803314e3c 100644
--- a/gst-libs/gst/vaapi/gstvaapicontext.h
+++ b/gst-libs/gst/vaapi/gstvaapicontext.h
@@ -52,6 +52,7 @@ struct _GstVaapiContextInfo {
     guint               ref_frames;
 };
 
+G_GNUC_INTERNAL
 GstVaapiContext *
 gst_vaapi_context_new(
     GstVaapiDisplay    *display,
@@ -61,10 +62,12 @@ gst_vaapi_context_new(
     guint               height
 );
 
+G_GNUC_INTERNAL
 GstVaapiContext *
 gst_vaapi_context_new_full(GstVaapiDisplay *display,
     const GstVaapiContextInfo *cip);
 
+G_GNUC_INTERNAL
 gboolean
 gst_vaapi_context_reset(
     GstVaapiContext    *context,
@@ -74,22 +77,28 @@ gst_vaapi_context_reset(
     guint               height
 );
 
+G_GNUC_INTERNAL
 gboolean
 gst_vaapi_context_reset_full(GstVaapiContext *context,
     const GstVaapiContextInfo *new_cip);
 
+G_GNUC_INTERNAL
 GstVaapiID
 gst_vaapi_context_get_id(GstVaapiContext *context);
 
+G_GNUC_INTERNAL
 GstVaapiProfile
 gst_vaapi_context_get_profile(GstVaapiContext *context);
 
+G_GNUC_INTERNAL
 gboolean
 gst_vaapi_context_set_profile(GstVaapiContext *context, GstVaapiProfile profile);
 
+G_GNUC_INTERNAL
 GstVaapiEntrypoint
 gst_vaapi_context_get_entrypoint(GstVaapiContext *context);
 
+G_GNUC_INTERNAL
 void
 gst_vaapi_context_get_size(
     GstVaapiContext *context,
@@ -97,12 +106,15 @@ gst_vaapi_context_get_size(
     guint           *pheight
 );
 
+G_GNUC_INTERNAL
 GstVaapiSurfaceProxy *
 gst_vaapi_context_get_surface_proxy(GstVaapiContext *context);
 
+G_GNUC_INTERNAL
 guint
 gst_vaapi_context_get_surface_count(GstVaapiContext *context);
 
+G_GNUC_INTERNAL
 gboolean
 gst_vaapi_context_apply_composition(
     GstVaapiContext            *context,
diff --git a/gst-libs/gst/vaapi/gstvaapidisplaycache.h b/gst-libs/gst/vaapi/gstvaapidisplaycache.h
index 72b6fac038..4b0bb5e75f 100644
--- a/gst-libs/gst/vaapi/gstvaapidisplaycache.h
+++ b/gst-libs/gst/vaapi/gstvaapidisplaycache.h
@@ -26,21 +26,26 @@
 
 typedef struct _GstVaapiDisplayCache    GstVaapiDisplayCache;
 
+G_GNUC_INTERNAL
 GstVaapiDisplayCache *
 gst_vaapi_display_cache_new(void);
 
+G_GNUC_INTERNAL
 void
 gst_vaapi_display_cache_free(GstVaapiDisplayCache *cache);
 
+G_GNUC_INTERNAL
 guint
 gst_vaapi_display_cache_get_size(GstVaapiDisplayCache *cache);
 
+G_GNUC_INTERNAL
 gboolean
 gst_vaapi_display_cache_add(
     GstVaapiDisplayCache       *cache,
     GstVaapiDisplayInfo        *info
 );
 
+G_GNUC_INTERNAL
 void
 gst_vaapi_display_cache_remove(
     GstVaapiDisplayCache       *cache,