diff --git a/subprojects/gst-plugins-bad/sys/va/gstvaav1enc.c b/subprojects/gst-plugins-bad/sys/va/gstvaav1enc.c
index 80a5228f57..bc243d621d 100644
--- a/subprojects/gst-plugins-bad/sys/va/gstvaav1enc.c
+++ b/subprojects/gst-plugins-bad/sys/va/gstvaav1enc.c
@@ -53,9 +53,7 @@
 #include "vacompat.h"
 #include "gstvabaseenc.h"
 #include "gstvaencoder.h"
-#include "gstvacaps.h"
 #include "gstvaprofile.h"
-#include "gstvadisplay_priv.h"
 #include "gstvapluginutils.h"
 
 #include "gst/glib-compat-private.h"
diff --git a/subprojects/gst-plugins-bad/sys/va/gstvacaps.c b/subprojects/gst-plugins-bad/sys/va/gstvacaps.c
index 45b2cd89eb..4bc0cc96e0 100644
--- a/subprojects/gst-plugins-bad/sys/va/gstvacaps.c
+++ b/subprojects/gst-plugins-bad/sys/va/gstvacaps.c
@@ -28,7 +28,6 @@
 #include <gst/va/vasurfaceimage.h>
 #include <va/va_drmcommon.h>
 
-#include "gstvadisplay_priv.h"
 #include "gstvaprofile.h"
 
 GST_DEBUG_CATEGORY_EXTERN (gstva_debug);
diff --git a/subprojects/gst-plugins-bad/sys/va/gstvacompositor.c b/subprojects/gst-plugins-bad/sys/va/gstvacompositor.c
index 0bd4805f55..bc2fc71769 100644
--- a/subprojects/gst-plugins-bad/sys/va/gstvacompositor.c
+++ b/subprojects/gst-plugins-bad/sys/va/gstvacompositor.c
@@ -55,7 +55,6 @@
 
 #include "gstvabase.h"
 #include "gstvacaps.h"
-#include "gstvadisplay_priv.h"
 #include "gstvafilter.h"
 #include "gstvapluginutils.h"
 
diff --git a/subprojects/gst-plugins-bad/sys/va/gstvadeinterlace.c b/subprojects/gst-plugins-bad/sys/va/gstvadeinterlace.c
index 63b9d01e0e..78f0368e6e 100644
--- a/subprojects/gst-plugins-bad/sys/va/gstvadeinterlace.c
+++ b/subprojects/gst-plugins-bad/sys/va/gstvadeinterlace.c
@@ -56,8 +56,6 @@
 #include <va/va_drmcommon.h>
 
 #include "gstvabasetransform.h"
-#include "gstvacaps.h"
-#include "gstvadisplay_priv.h"
 #include "gstvafilter.h"
 #include "gstvapluginutils.h"
 
diff --git a/subprojects/gst-plugins-bad/sys/va/gstvaencoder.c b/subprojects/gst-plugins-bad/sys/va/gstvaencoder.c
index d114217656..e0e69ed45d 100644
--- a/subprojects/gst-plugins-bad/sys/va/gstvaencoder.c
+++ b/subprojects/gst-plugins-bad/sys/va/gstvaencoder.c
@@ -28,10 +28,10 @@
 #include <gst/va/gstvavideoformat.h>
 #include <gst/va/vasurfaceimage.h>
 
+#include "vacompat.h"
 #include "gstvacaps.h"
 #include "gstvaprofile.h"
 #include "gstvadisplay_priv.h"
-#include "vacompat.h"
 
 struct _GstVaEncoder
 {
diff --git a/subprojects/gst-plugins-bad/sys/va/gstvafilter.c b/subprojects/gst-plugins-bad/sys/va/gstvafilter.c
index 8a87d59b89..aa92c46c57 100644
--- a/subprojects/gst-plugins-bad/sys/va/gstvafilter.c
+++ b/subprojects/gst-plugins-bad/sys/va/gstvafilter.c
@@ -28,10 +28,10 @@
 #include <gst/va/vasurfaceimage.h>
 #include <gst/video/video.h>
 #include <va/va_drmcommon.h>
+#include <string.h>
 
 #include "gstvacaps.h"
 #include "gstvadisplay_priv.h"
-#include <string.h>
 
 struct _GstVaFilter
 {
diff --git a/subprojects/gst-plugins-bad/sys/va/gstvah264enc.c b/subprojects/gst-plugins-bad/sys/va/gstvah264enc.c
index cb22ed9fe8..87160ffdcb 100644
--- a/subprojects/gst-plugins-bad/sys/va/gstvah264enc.c
+++ b/subprojects/gst-plugins-bad/sys/va/gstvah264enc.c
@@ -60,12 +60,10 @@
 #include <gst/video/video.h>
 #include <va/va_drmcommon.h>
 
+#include "vacompat.h"
 #include "gstvabaseenc.h"
-#include "gstvacaps.h"
-#include "gstvadisplay_priv.h"
 #include "gstvaencoder.h"
 #include "gstvaprofile.h"
-#include "vacompat.h"
 #include "gstvapluginutils.h"
 
 #include "gst/glib-compat-private.h"
diff --git a/subprojects/gst-plugins-bad/sys/va/gstvah265enc.c b/subprojects/gst-plugins-bad/sys/va/gstvah265enc.c
index 4cc04620ad..3340d9815d 100644
--- a/subprojects/gst-plugins-bad/sys/va/gstvah265enc.c
+++ b/subprojects/gst-plugins-bad/sys/va/gstvah265enc.c
@@ -53,9 +53,7 @@
 #include "vacompat.h"
 #include "gstvabaseenc.h"
 #include "gstvaencoder.h"
-#include "gstvacaps.h"
 #include "gstvaprofile.h"
-#include "gstvadisplay_priv.h"
 #include "gstvapluginutils.h"
 
 #include "gst/glib-compat-private.h"
diff --git a/subprojects/gst-plugins-bad/sys/va/gstvajpegenc.c b/subprojects/gst-plugins-bad/sys/va/gstvajpegenc.c
index 3850a8cc52..4b189e52b4 100644
--- a/subprojects/gst-plugins-bad/sys/va/gstvajpegenc.c
+++ b/subprojects/gst-plugins-bad/sys/va/gstvajpegenc.c
@@ -53,9 +53,7 @@
 #include "vacompat.h"
 #include "gstvabaseenc.h"
 #include "gstvaencoder.h"
-#include "gstvacaps.h"
 #include "gstvaprofile.h"
-#include "gstvadisplay_priv.h"
 #include "gstvapluginutils.h"
 
 GST_DEBUG_CATEGORY_STATIC (gst_va_jpegenc_debug);
diff --git a/subprojects/gst-plugins-bad/sys/va/gstvavp9enc.c b/subprojects/gst-plugins-bad/sys/va/gstvavp9enc.c
index 030c24a70f..eefba5b8b1 100644
--- a/subprojects/gst-plugins-bad/sys/va/gstvavp9enc.c
+++ b/subprojects/gst-plugins-bad/sys/va/gstvavp9enc.c
@@ -54,9 +54,7 @@
 #include "vacompat.h"
 #include "gstvabaseenc.h"
 #include "gstvaencoder.h"
-#include "gstvacaps.h"
 #include "gstvaprofile.h"
-#include "gstvadisplay_priv.h"
 #include "gstvapluginutils.h"
 
 #include "gst/glib-compat-private.h"
diff --git a/subprojects/gst-plugins-bad/sys/va/gstvavpp.c b/subprojects/gst-plugins-bad/sys/va/gstvavpp.c
index fb9cdf7077..13e69bca43 100644
--- a/subprojects/gst-plugins-bad/sys/va/gstvavpp.c
+++ b/subprojects/gst-plugins-bad/sys/va/gstvavpp.c
@@ -69,7 +69,6 @@
 
 #include "gstvabasetransform.h"
 #include "gstvacaps.h"
-#include "gstvadisplay_priv.h"
 #include "gstvafilter.h"
 #include "gstvapluginutils.h"