diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/va/gstva.h b/subprojects/gst-plugins-bad/gst-libs/gst/va/gstva.h
index dc830ab235..e9c08eb125 100644
--- a/subprojects/gst-plugins-bad/gst-libs/gst/va/gstva.h
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/va/gstva.h
@@ -25,7 +25,13 @@
 #pragma message ("You can define GST_USE_UNSTABLE_API to avoid this warning.")
 #endif
 
+#include <gst/va/va-prelude.h>
 #include <gst/va/gstvadisplay.h>
 #include <gst/va/gstvadisplay_drm.h>
 #include <gst/va/gstvadisplay_wrapped.h>
+
+#include <gst/va/gstvaallocator.h>
+#include <gst/va/gstvapool.h>
+
 #include <gst/va/gstvautils.h>
+#include <gst/va/gstvavideoformat.h>
diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvaallocator.h b/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvaallocator.h
index a61b7c6a08..afd55a1551 100644
--- a/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvaallocator.h
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvaallocator.h
@@ -28,11 +28,6 @@
 
 G_BEGIN_DECLS
 
-typedef struct _GstVaAllocator GstVaAllocator;
-typedef struct _GstVaAllocatorClass GstVaAllocatorClass;
-typedef struct _GstVaDmabufAllocator GstVaDmabufAllocator;
-typedef struct _GstVaDmabufAllocatorClass GstVaDmabufAllocatorClass;
-
 #define GST_TYPE_VA_DMABUF_ALLOCATOR (gst_va_dmabuf_allocator_get_type())
 #define GST_VA_DMABUF_ALLOCATOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_VA_DMABUF_ALLOCATOR, GstVaDmabufAllocator))
 #define GST_VA_DMABUF_ALLOCATOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_VA_DMABUF_ALLOCATOR, GstVaDmabufAllocatorClass))
diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvadisplay.c b/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvadisplay.c
index db6a499197..8470c41e9e 100644
--- a/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvadisplay.c
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvadisplay.c
@@ -41,6 +41,7 @@
 #endif
 
 #include "gstvadisplay.h"
+
 #include <va/va.h>
 
 GST_DEBUG_CATEGORY (gst_va_display_debug);
diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvadisplay.h b/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvadisplay.h
index e448755315..88f356954b 100644
--- a/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvadisplay.h
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvadisplay.h
@@ -20,9 +20,9 @@
 
 #pragma once
 
-#include <gst/va/va_fwd.h>
-#include <gst/va/va-prelude.h>
 #include <gst/gst.h>
+#include <gst/va/gstva.h>
+#include <gst/va/va_fwd.h>
 
 G_BEGIN_DECLS
 
diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvadisplay_drm.c b/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvadisplay_drm.c
index d92569a07f..71bdee518e 100644
--- a/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvadisplay_drm.c
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvadisplay_drm.c
@@ -33,6 +33,7 @@
 #endif
 
 #include "gstvadisplay_drm.h"
+
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/types.h>
diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvadisplay_drm.h b/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvadisplay_drm.h
index 496e89356c..d14a1f6448 100644
--- a/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvadisplay_drm.h
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvadisplay_drm.h
@@ -20,7 +20,8 @@
 
 #pragma once
 
-#include "gstvadisplay.h"
+#include <gst/va/gstva.h>
+#include <gst/va/va_fwd.h>
 
 G_BEGIN_DECLS
 
diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvadisplay_wrapped.h b/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvadisplay_wrapped.h
index 8a7945b12f..ade0e7b084 100644
--- a/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvadisplay_wrapped.h
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvadisplay_wrapped.h
@@ -20,7 +20,8 @@
 
 #pragma once
 
-#include "gstvadisplay.h"
+#include <gst/va/gstva.h>
+#include <gst/va/va_fwd.h>
 
 G_BEGIN_DECLS
 
diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvapool.c b/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvapool.c
index fda830e383..b394a1fb4f 100644
--- a/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvapool.c
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvapool.c
@@ -23,7 +23,6 @@
 #endif
 
 #include "gstvapool.h"
-#include "gstvaallocator.h"
 
 GST_DEBUG_CATEGORY_STATIC (gst_va_pool_debug);
 #define GST_CAT_DEFAULT gst_va_pool_debug
diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvapool.h b/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvapool.h
index d38a6a08e9..5d0ae37832 100644
--- a/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvapool.h
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvapool.h
@@ -20,15 +20,12 @@
 
 #pragma once
 
-#include <gst/va/va_fwd.h>
-#include <gst/va/va-prelude.h>
 #include <gst/gst.h>
+#include <gst/va/gstva.h>
+#include <gst/va/va_fwd.h>
 
 G_BEGIN_DECLS
 
-typedef struct _GstVaPool GstVaPool;
-typedef struct _GstVaPoolClass GstVaPoolClass;
-
 #define GST_TYPE_VA_POOL (gst_va_pool_get_type())
 #define GST_VA_POOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_VA_POOL, GstVaPool))
 #define GST_VA_POOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_VA_POOL, GstVaPoolClass))
diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvasurfacecopy.h b/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvasurfacecopy.h
index 624169ad4f..0aaf13b570 100644
--- a/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvasurfacecopy.h
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvasurfacecopy.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <gst/va/gstva.h>
+#include <gst/va/va_fwd.h>
 #include <gst/video/video.h>
 #include <va/va.h>
 
diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvautils.c b/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvautils.c
index bc54f26742..0478a52226 100644
--- a/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvautils.c
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvautils.c
@@ -23,6 +23,7 @@
 #endif
 
 #include "gstvautils.h"
+
 #include <gst/va/gstvadisplay_drm.h>
 #include <gst/va/gstvadisplay_wrapped.h>
 
diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvautils.h b/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvautils.h
index 65de738b16..a36c2bf2e8 100644
--- a/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvautils.h
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvautils.h
@@ -20,7 +20,9 @@
 
 #pragma once
 
-#include <gst/va/gstvadisplay.h>
+#include <gst/gst.h>
+#include <gst/va/gstva.h>
+#include <gst/va/va_fwd.h>
 
 G_BEGIN_DECLS
 
diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvavideoformat.h b/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvavideoformat.h
index a11bed3743..bda88dffd6 100644
--- a/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvavideoformat.h
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/va/gstvavideoformat.h
@@ -20,8 +20,8 @@
 
 #pragma once
 
-#include <gst/va/va_fwd.h>
-#include <gst/va/va-prelude.h>
+#include <gst/gst.h>
+#include <gst/va/gstva.h>
 #include <gst/video/video.h>
 #include <va/va.h>
 
diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/va/va_fwd.h b/subprojects/gst-plugins-bad/gst-libs/gst/va/va_fwd.h
index 0b1b8cb339..b159728292 100644
--- a/subprojects/gst-plugins-bad/gst-libs/gst/va/va_fwd.h
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/va/va_fwd.h
@@ -32,4 +32,13 @@ typedef struct _GstVaDisplayDrmClass GstVaDisplayDrmClass;
 typedef struct _GstVaDisplayWrapped GstVaDisplayWrapped;
 typedef struct _GstVaDisplayWrappedClass GstVaDisplayWrappedClass;
 
+typedef struct _GstVaAllocator GstVaAllocator;
+typedef struct _GstVaAllocatorClass GstVaAllocatorClass;
+
+typedef struct _GstVaDmabufAllocator GstVaDmabufAllocator;
+typedef struct _GstVaDmabufAllocatorClass GstVaDmabufAllocatorClass;
+
+typedef struct _GstVaPool GstVaPool;
+typedef struct _GstVaPoolClass GstVaPoolClass;
+
 G_END_DECLS
diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/va/vasurfaceimage.h b/subprojects/gst-plugins-bad/gst-libs/gst/va/vasurfaceimage.h
index 41af438821..4a68ac1c3e 100644
--- a/subprojects/gst-plugins-bad/gst-libs/gst/va/vasurfaceimage.h
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/va/vasurfaceimage.h
@@ -20,7 +20,7 @@
 
 #pragma once
 
-#include <gst/va/gstva.h>
+#include <gst/va/va_fwd.h>
 #include <gst/video/video.h>
 #include <va/va.h>
 #include <va/va_drmcommon.h>
diff --git a/subprojects/gst-plugins-bad/sys/va/gstvaav1dec.c b/subprojects/gst-plugins-bad/sys/va/gstvaav1dec.c
index fd8300ce0c..539251a465 100644
--- a/subprojects/gst-plugins-bad/sys/va/gstvaav1dec.c
+++ b/subprojects/gst-plugins-bad/sys/va/gstvaav1dec.c
@@ -43,7 +43,7 @@
 #include "config.h"
 #endif
 
-#include <gst/va/gstvaallocator.h>
+#include <gst/va/gstva.h>
 
 #include "gstvaav1dec.h"
 #include "gstvabasedec.h"
diff --git a/subprojects/gst-plugins-bad/sys/va/gstvabasedec.c b/subprojects/gst-plugins-bad/sys/va/gstvabasedec.c
index f00ebf41af..ccdcf1369a 100644
--- a/subprojects/gst-plugins-bad/sys/va/gstvabasedec.c
+++ b/subprojects/gst-plugins-bad/sys/va/gstvabasedec.c
@@ -20,9 +20,7 @@
 
 #include "gstvabasedec.h"
 
-#include <gst/va/gstvaallocator.h>
-#include <gst/va/gstvapool.h>
-#include <gst/va/gstvavideoformat.h>
+#include <gst/va/gstva.h>
 
 #include "gstvacaps.h"
 
diff --git a/subprojects/gst-plugins-bad/sys/va/gstvabasetransform.c b/subprojects/gst-plugins-bad/sys/va/gstvabasetransform.c
index 98435ec448..68bdf1c2b6 100644
--- a/subprojects/gst-plugins-bad/sys/va/gstvabasetransform.c
+++ b/subprojects/gst-plugins-bad/sys/va/gstvabasetransform.c
@@ -24,8 +24,7 @@
 
 #include "gstvabasetransform.h"
 
-#include <gst/va/gstvaallocator.h>
-#include <gst/va/gstvapool.h>
+#include <gst/va/gstva.h>
 
 #include "gstvacaps.h"
 
diff --git a/subprojects/gst-plugins-bad/sys/va/gstvacaps.c b/subprojects/gst-plugins-bad/sys/va/gstvacaps.c
index e56b00707d..40e9c79942 100644
--- a/subprojects/gst-plugins-bad/sys/va/gstvacaps.c
+++ b/subprojects/gst-plugins-bad/sys/va/gstvacaps.c
@@ -24,9 +24,6 @@
 
 #include "gstvacaps.h"
 
-#include <gst/allocators/allocators.h>
-#include <gst/va/gstvavideoformat.h>
-
 #include <va/va_drmcommon.h>
 
 #include "gstvadisplay_priv.h"
diff --git a/subprojects/gst-plugins-bad/sys/va/gstvadecoder.c b/subprojects/gst-plugins-bad/sys/va/gstvadecoder.c
index 50f7e4c64b..8948dd3e62 100644
--- a/subprojects/gst-plugins-bad/sys/va/gstvadecoder.c
+++ b/subprojects/gst-plugins-bad/sys/va/gstvadecoder.c
@@ -24,8 +24,7 @@
 
 #include "gstvadecoder.h"
 
-#include <gst/va/gstvaallocator.h>
-#include <gst/va/gstvavideoformat.h>
+#include <gst/va/gstva.h>
 
 #include "gstvacaps.h"
 #include "gstvadisplay_priv.h"
diff --git a/subprojects/gst-plugins-bad/sys/va/gstvadeinterlace.c b/subprojects/gst-plugins-bad/sys/va/gstvadeinterlace.c
index ff2aad60c1..c7b729037b 100644
--- a/subprojects/gst-plugins-bad/sys/va/gstvadeinterlace.c
+++ b/subprojects/gst-plugins-bad/sys/va/gstvadeinterlace.c
@@ -51,8 +51,7 @@
 
 #include "gstvadeinterlace.h"
 
-#include <gst/va/gstvaallocator.h>
-#include <gst/va/gstvapool.h>
+#include <gst/va/gstva.h>
 #include <gst/video/video.h>
 #include <va/va_drmcommon.h>
 
diff --git a/subprojects/gst-plugins-bad/sys/va/gstvadisplay_priv.c b/subprojects/gst-plugins-bad/sys/va/gstvadisplay_priv.c
index bb10e541f0..9a9ea68bfb 100644
--- a/subprojects/gst-plugins-bad/sys/va/gstvadisplay_priv.c
+++ b/subprojects/gst-plugins-bad/sys/va/gstvadisplay_priv.c
@@ -22,9 +22,8 @@
 #include "config.h"
 #endif
 
-#include <gst/va/gstvavideoformat.h>
-
 #include "gstvadisplay_priv.h"
+
 #include "gstvaprofile.h"
 
 GArray *
diff --git a/subprojects/gst-plugins-bad/sys/va/gstvadisplay_priv.h b/subprojects/gst-plugins-bad/sys/va/gstvadisplay_priv.h
index 2f9200b48e..ac0fa6c477 100644
--- a/subprojects/gst-plugins-bad/sys/va/gstvadisplay_priv.h
+++ b/subprojects/gst-plugins-bad/sys/va/gstvadisplay_priv.h
@@ -20,7 +20,7 @@
 
 #pragma once
 
-#include <gst/va/gstvadisplay.h>
+#include <gst/va/gstva.h>
 #include <va/va.h>
 
 G_BEGIN_DECLS
diff --git a/subprojects/gst-plugins-bad/sys/va/gstvaencoder.c b/subprojects/gst-plugins-bad/sys/va/gstvaencoder.c
index 55a77540d1..8067ff33b9 100644
--- a/subprojects/gst-plugins-bad/sys/va/gstvaencoder.c
+++ b/subprojects/gst-plugins-bad/sys/va/gstvaencoder.c
@@ -25,11 +25,6 @@
 
 #include "gstvaencoder.h"
 
-#include <gst/va/gstvaallocator.h>
-#include <gst/va/gstvadisplay_wrapped.h>
-#include <gst/va/gstvapool.h>
-#include <gst/va/gstvavideoformat.h>
-
 #include "vacompat.h"
 #include "gstvacaps.h"
 #include "gstvadisplay_priv.h"
diff --git a/subprojects/gst-plugins-bad/sys/va/gstvaencoder.h b/subprojects/gst-plugins-bad/sys/va/gstvaencoder.h
index 138bb10295..3dd9a1a789 100644
--- a/subprojects/gst-plugins-bad/sys/va/gstvaencoder.h
+++ b/subprojects/gst-plugins-bad/sys/va/gstvaencoder.h
@@ -21,8 +21,8 @@
 
 #pragma once
 
+#include <gst/va/gstva.h>
 #include <gst/video/video.h>
-#include <gst/va/gstvadisplay.h>
 #include <va/va.h>
 
 G_BEGIN_DECLS
diff --git a/subprojects/gst-plugins-bad/sys/va/gstvafilter.c b/subprojects/gst-plugins-bad/sys/va/gstvafilter.c
index 5979fd13cb..41eb229b69 100644
--- a/subprojects/gst-plugins-bad/sys/va/gstvafilter.c
+++ b/subprojects/gst-plugins-bad/sys/va/gstvafilter.c
@@ -24,8 +24,6 @@
 
 #include "gstvafilter.h"
 
-#include <gst/va/gstvaallocator.h>
-#include <gst/va/gstvavideoformat.h>
 #include <gst/video/video.h>
 #include <va/va_drmcommon.h>
 
diff --git a/subprojects/gst-plugins-bad/sys/va/gstvah264enc.c b/subprojects/gst-plugins-bad/sys/va/gstvah264enc.c
index 124ba0f70e..69f38825b4 100644
--- a/subprojects/gst-plugins-bad/sys/va/gstvah264enc.c
+++ b/subprojects/gst-plugins-bad/sys/va/gstvah264enc.c
@@ -54,10 +54,7 @@
 #include "gstvah264enc.h"
 
 #include <gst/codecparsers/gsth264bitwriter.h>
-#include <gst/va/gstvaallocator.h>
-#include <gst/va/gstvapool.h>
-#include <gst/va/gstvautils.h>
-#include <gst/va/gstvavideoformat.h>
+#include <gst/va/gstva.h>
 #include <gst/video/video.h>
 #include <va/va_drmcommon.h>
 
diff --git a/subprojects/gst-plugins-bad/sys/va/gstvavpp.c b/subprojects/gst-plugins-bad/sys/va/gstvavpp.c
index 9ec189afac..a47b25c0fd 100644
--- a/subprojects/gst-plugins-bad/sys/va/gstvavpp.c
+++ b/subprojects/gst-plugins-bad/sys/va/gstvavpp.c
@@ -62,9 +62,8 @@
 
 #include "gstvavpp.h"
 
+#include <gst/va/gstva.h>
 #include <gst/video/video.h>
-#include <gst/va/gstvaallocator.h>
-#include <gst/va/gstvapool.h>
 #include <va/va_drmcommon.h>
 
 #include "gstvabasetransform.h"
diff --git a/subprojects/gst-plugins-bad/tests/examples/va/main.c b/subprojects/gst-plugins-bad/tests/examples/va/main.c
index 4f37243351..19341e84fb 100644
--- a/subprojects/gst-plugins-bad/tests/examples/va/main.c
+++ b/subprojects/gst-plugins-bad/tests/examples/va/main.c
@@ -11,10 +11,10 @@
 
 #include <gtk/gtk.h>
 
-#include <gst/gst.h>
 #include <gst/app/gstappsink.h>
-#include <gst/video/video.h>
+#include <gst/gst.h>
 #include <gst/va/gstva.h>
+#include <gst/video/video.h>
 
 #include <va/va_x11.h>
 
diff --git a/subprojects/gst-plugins-bad/tests/examples/va/multiple-vpp.c b/subprojects/gst-plugins-bad/tests/examples/va/multiple-vpp.c
index 8c08c2b41b..b6c926a57c 100644
--- a/subprojects/gst-plugins-bad/tests/examples/va/multiple-vpp.c
+++ b/subprojects/gst-plugins-bad/tests/examples/va/multiple-vpp.c
@@ -1,10 +1,10 @@
 #include <stdlib.h>
 
-#include <gst/gst.h>
-#include <gst/video/video.h>
-#include <gst/controller/gstinterpolationcontrolsource.h>
 #include <gst/controller/gstdirectcontrolbinding.h>
+#include <gst/controller/gstinterpolationcontrolsource.h>
+#include <gst/gst.h>
 #include <gst/va/gstva.h>
+#include <gst/video/video.h>
 
 #define CHANGE_DIR_WITH_EVENT 0