diff --git a/docs/reference/libs/Makefile.am b/docs/reference/libs/Makefile.am
index 745a932415..f8eafeb2c8 100644
--- a/docs/reference/libs/Makefile.am
+++ b/docs/reference/libs/Makefile.am
@@ -102,12 +102,14 @@ expand_content_files = \
 
 INCLUDES = \
 	$(GLIB_CFLAGS) \
+	$(GST_CFLAGS) \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/gst-libs \
 	-I$(top_srcdir)/gst-libs/gst/vaapi
 
 GTKDOC_LIBS = \
 	$(GLIB_LIBS) \
+	$(GST_LIBS) \
 	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-$(GST_MAJORMINOR).la
 
 GTKDOC_LIBS += \
diff --git a/docs/reference/plugins/Makefile.am b/docs/reference/plugins/Makefile.am
index 473ba988b8..457dfd13ab 100644
--- a/docs/reference/plugins/Makefile.am
+++ b/docs/reference/plugins/Makefile.am
@@ -83,7 +83,9 @@ INCLUDES = \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/gst-libs \
 	-I$(top_srcdir)/gst-libs/gst/vaapi \
-	$(GLIB_CFLAGS)
+	$(GLIB_CFLAGS) \
+	$(GST_CFLAGS) \
+	$(NULL)
 
 GTKDOC_LIBS = \
 	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-$(GST_MAJORMINOR).la \
@@ -91,7 +93,9 @@ GTKDOC_LIBS = \
 	$(top_builddir)/gst/vaapidecode/libgstvaapidecode.la \
 	$(top_builddir)/gst/vaapiconvert/libgstvaapiconvert.la \
 	$(top_builddir)/gst/vaapisink/libgstvaapisink.la \
-	$(GLIB_LIBS)
+	$(GLIB_LIBS) \
+	$(GST_LIBS) \
+	$(NULL)
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 40f28e3e17..ba6490ab38 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -20,14 +20,19 @@ TEST_MIX_CFLAGS		+= $(TEST_GLX_CFLAGS)
 endif
 
 TEST_LIBS = \
+	$(GST_LIBS) \
 	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-@GST_MAJORMINOR@.la
 
 TEST_X11_LIBS = \
 	$(X11_LIBS) \
+	$(GST_LIBS) \
+	$(LIBVA_X11_LIBS) \
 	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-x11-@GST_MAJORMINOR@.la
 
 TEST_GLX_LIBS = \
 	$(GLX_LIBS) \
+	$(GST_LIBS) \
+	$(LIBVA_GLX_LIBS) \
 	$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-glx-@GST_MAJORMINOR@.la
 
 TEST_MIX_LIBS		= $(TEST_X11_LIBS)