diff --git a/debian.upstream/libgstvaapi-dev.install.in b/debian.upstream/libgstvaapi-dev.install.in
index b6aa01de4d..91ef83bd82 100644
--- a/debian.upstream/libgstvaapi-dev.install.in
+++ b/debian.upstream/libgstvaapi-dev.install.in
@@ -1,2 +1 @@
 debian/tmp/usr/lib/libgstvaapi*.so
-debian/tmp/usr/include/gstreamer-@GST_PKG_VERSION@/gst/vaapi/*.h
diff --git a/gst-libs/gst/vaapi/Makefile.am b/gst-libs/gst/vaapi/Makefile.am
index 1818f75c50..ec007260f5 100644
--- a/gst-libs/gst/vaapi/Makefile.am
+++ b/gst-libs/gst/vaapi/Makefile.am
@@ -20,9 +20,6 @@ if USE_WAYLAND
 lib_LTLIBRARIES += libgstvaapi-wayland-@GST_API_VERSION@.la
 endif
 
-libgstvaapi_includedir = \
-	$(includedir)/gstreamer-$(GST_PKG_VERSION)/gst/vaapi
-
 libgstvaapi_cflags =				\
 	-DIN_LIBGSTVAAPI			\
 	-DIN_LIBGSTVAAPI_CORE			\
@@ -342,15 +339,9 @@ libgstvaapi_wayland_source_priv_h =		\
 libgstvaapi_@GST_API_VERSION@_la_SOURCES =	\
 	$(libgstvaapi_source_c)			\
 	$(libgstvaapi_source_priv_h)		\
-	$(NULL)
-
-libgstvaapi_@GST_API_VERSION@include_HEADERS =	\
 	$(libgstvaapi_source_h)			\
 	$(NULL)
 
-libgstvaapi_@GST_API_VERSION@includedir =	\
-	$(libgstvaapi_includedir)
-
 libgstvaapi_@GST_API_VERSION@_la_CFLAGS =	\
 	$(libgstvaapi_cflags)			\
 	$(NULL)
@@ -368,15 +359,9 @@ libgstvaapi_@GST_API_VERSION@_la_LDFLAGS =	\
 libgstvaapi_drm_@GST_API_VERSION@_la_SOURCES =	\
 	$(libgstvaapi_drm_source_c)		\
 	$(libgstvaapi_drm_source_priv_h)	\
-	$(NULL)
-
-libgstvaapi_drm_@GST_API_VERSION@include_HEADERS = \
 	$(libgstvaapi_drm_source_h)		\
 	$(NULL)
 
-libgstvaapi_drm_@GST_API_VERSION@includedir =	\
-	$(libgstvaapi_includedir)
-
 libgstvaapi_drm_@GST_API_VERSION@_la_CFLAGS =	\
 	-DIN_LIBGSTVAAPI			\
 	-DGST_USE_UNSTABLE_API			\
@@ -406,15 +391,9 @@ libgstvaapi_drm_@GST_API_VERSION@_la_LDFLAGS =	\
 libgstvaapi_x11_@GST_API_VERSION@_la_SOURCES =	\
 	$(libgstvaapi_x11_source_c)		\
 	$(libgstvaapi_x11_source_priv_h)	\
-	$(NULL)
-
-libgstvaapi_x11_@GST_API_VERSION@include_HEADERS = \
 	$(libgstvaapi_x11_source_h)		\
 	$(NULL)
 
-libgstvaapi_x11_@GST_API_VERSION@includedir =	\
-	$(libgstvaapi_includedir)
-
 libgstvaapi_x11_@GST_API_VERSION@_la_CFLAGS =	\
 	-DIN_LIBGSTVAAPI			\
 	-DGST_USE_UNSTABLE_API			\
@@ -446,15 +425,9 @@ libgstvaapi_x11_@GST_API_VERSION@_la_LDFLAGS =	\
 libgstvaapi_glx_@GST_API_VERSION@_la_SOURCES =	\
 	$(libgstvaapi_glx_source_c)		\
 	$(libgstvaapi_glx_source_priv_h)	\
-	$(NULL)
-
-libgstvaapi_glx_@GST_API_VERSION@include_HEADERS = \
 	$(libgstvaapi_glx_source_h)		\
 	$(NULL)
 
-libgstvaapi_glx_@GST_API_VERSION@includedir =	\
-	$(libgstvaapi_includedir)
-
 libgstvaapi_glx_@GST_API_VERSION@_la_CFLAGS =	\
 	-DIN_LIBGSTVAAPI			\
 	-DGST_USE_UNSTABLE_API			\
@@ -487,15 +460,9 @@ libgstvaapi_glx_@GST_API_VERSION@_la_LDFLAGS =	\
 libgstvaapi_egl_@GST_API_VERSION@_la_SOURCES =	\
 	$(libgstvaapi_egl_source_c)		\
 	$(libgstvaapi_egl_source_priv_h)	\
-	$(NULL)
-
-libgstvaapi_egl_@GST_API_VERSION@include_HEADERS = \
 	$(libgstvaapi_egl_source_h)		\
 	$(NULL)
 
-libgstvaapi_egl_@GST_API_VERSION@includedir =	\
-	$(libgstvaapi_includedir)
-
 libgstvaapi_egl_@GST_API_VERSION@_la_CFLAGS =	\
 	-DIN_LIBGSTVAAPI			\
 	-DGST_USE_UNSTABLE_API			\
@@ -527,15 +494,9 @@ libgstvaapi_egl_@GST_API_VERSION@_la_LDFLAGS =	\
 libgstvaapi_wayland_@GST_API_VERSION@_la_SOURCES = \
 	$(libgstvaapi_wayland_source_c)		\
 	$(libgstvaapi_wayland_source_priv_h)	\
-	$(NULL)
-
-libgstvaapi_wayland_@GST_API_VERSION@include_HEADERS = \
 	$(libgstvaapi_wayland_source_h)		\
 	$(NULL)
 
-libgstvaapi_wayland_@GST_API_VERSION@includedir = \
-	$(libgstvaapi_includedir)
-
 libgstvaapi_wayland_@GST_API_VERSION@_la_CFLAGS = \
 	-DIN_LIBGSTVAAPI			\
 	-DGST_USE_UNSTABLE_API			\