diff --git a/docs/reference/libs/Makefile.am b/docs/reference/libs/Makefile.am
index 3a753c533a..99947eef6f 100644
--- a/docs/reference/libs/Makefile.am
+++ b/docs/reference/libs/Makefile.am
@@ -54,6 +54,7 @@ CFILE_GLOB = $(top_srcdir)/gst-libs/gst/vaapi/*.c
 IGNORE_HFILES = \
 	gstvaapidebug.h \
 	gstvaapiutils.h \
+	gstvaapiutils_glx.h \
 	gstvaapiutils_x11.h \
 	$(NULL)
 
@@ -91,6 +92,7 @@ INCLUDES = \
 GTKDOC_LIBS = \
 	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-$(GST_MAJORMINOR).la \
 	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-x11-$(GST_MAJORMINOR).la \
+	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-glx-$(GST_MAJORMINOR).la \
 	$(GLIB_LIBS)
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
diff --git a/docs/reference/libs/libs-docs.xml.in b/docs/reference/libs/libs-docs.xml.in
index 46a6cb4df1..29ef9b990b 100644
--- a/docs/reference/libs/libs-docs.xml.in
+++ b/docs/reference/libs/libs-docs.xml.in
@@ -13,8 +13,10 @@
     <xi:include href="xml/gstvaapiparamspecs.xml"/>
     <xi:include href="xml/gstvaapidisplay.xml"/>
     <xi:include href="xml/gstvaapidisplay_x11.xml"/>
+    <xi:include href="xml/gstvaapidisplay_glx.xml"/>
     <xi:include href="xml/gstvaapiwindow.xml"/>
     <xi:include href="xml/gstvaapiwindow_x11.xml"/>
+    <xi:include href="xml/gstvaapiwindow_glx.xml"/>
     <xi:include href="xml/gstvaapiobject.xml"/>
     <xi:include href="xml/gstvaapisurface.xml"/>
     <xi:include href="xml/gstvaapiimage.xml"/>
diff --git a/docs/reference/libs/libs-sections.txt b/docs/reference/libs/libs-sections.txt
index 2c118668d0..9ab6b92e08 100644
--- a/docs/reference/libs/libs-sections.txt
+++ b/docs/reference/libs/libs-sections.txt
@@ -74,6 +74,7 @@ GST_VAAPI_WINDOW_XWINDOW
 gst_vaapi_window_x11_new
 gst_vaapi_window_x11_new_with_xid
 gst_vaapi_window_x11_get_xid
+gst_vaapi_window_x11_is_foreign_xid
 <SUBSECTION Standard>
 GST_VAAPI_WINDOW_X11
 GST_VAAPI_IS_WINDOW_X11
@@ -84,6 +85,43 @@ GST_VAAPI_IS_WINDOW_X11_CLASS
 GST_VAAPI_WINDOW_X11_GET_CLASS
 </SECTION>
 
+<SECTION>
+<FILE>gstvaapidisplay_glx</FILE>
+<TITLE>GstVaapiDisplayGLX</TITLE>
+GstVaapiDisplayGLX
+GstVaapiDisplayGLXClass
+gst_vaapi_display_glx_new
+gst_vaapi_display_glx_new_with_display
+<SUBSECTION Standard>
+GST_VAAPI_DISPLAY_GLX
+GST_VAAPI_IS_DISPLAY_GLX
+GST_VAAPI_TYPE_DISPLAY_GLX
+gst_vaapi_display_glx_get_type
+GST_VAAPI_DISPLAY_GLX_CLASS
+GST_VAAPI_IS_DISPLAY_GLX_CLASS
+GST_VAAPI_DISPLAY_GLX_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>gstvaapiwindow_glx</FILE>
+<TITLE>GstVaapiWindowGLX</TITLE>
+GstVaapiWindowGLX
+GstVaapiWindowGLXClass
+gst_vaapi_window_glx_new
+gst_vaapi_window_glx_new_with_xid
+gst_vaapi_window_glx_get_context
+gst_vaapi_window_glx_set_context
+gst_vaapi_window_glx_swap_buffers
+<SUBSECTION Standard>
+GST_VAAPI_WINDOW_GLX
+GST_VAAPI_IS_WINDOW_GLX
+GST_VAAPI_TYPE_WINDOW_GLX
+gst_vaapi_window_glx_get_type
+GST_VAAPI_WINDOW_GLX_CLASS
+GST_VAAPI_IS_WINDOW_GLX_CLASS
+GST_VAAPI_WINDOW_GLX_GET_CLASS
+</SECTION>
+
 <SECTION>
 <FILE>gstvaapidisplay</FILE>
 GST_VAAPI_DISPLAY_VADISPLAY
diff --git a/docs/reference/libs/libs.types b/docs/reference/libs/libs.types
index 3d7aca2ae3..0bd9e59ad3 100644
--- a/docs/reference/libs/libs.types
+++ b/docs/reference/libs/libs.types
@@ -1,4 +1,5 @@
 gst_vaapi_display_get_type
+gst_vaapi_display_glx_get_type
 gst_vaapi_display_x11_get_type
 gst_vaapi_image_get_type
 gst_vaapi_image_pool_get_type
@@ -10,4 +11,5 @@ gst_vaapi_video_buffer_get_type
 gst_vaapi_video_pool_get_type
 gst_vaapi_video_sink_get_type
 gst_vaapi_window_get_type
+gst_vaapi_window_glx_get_type
 gst_vaapi_window_x11_get_type