diff --git a/gst-libs/gst/vaapi/gstvaapiutils_h264.h b/gst-libs/gst/vaapi/gstvaapiutils_h264.h
index 8dea3efffb..057705033d 100644
--- a/gst-libs/gst/vaapi/gstvaapiutils_h264.h
+++ b/gst-libs/gst/vaapi/gstvaapiutils_h264.h
@@ -24,7 +24,6 @@
 #define GST_VAAPI_UTILS_H264_H
 
 #include <gst/vaapi/gstvaapiprofile.h>
-#include <gst/vaapi/gstvaapisurface.h>
 
 G_BEGIN_DECLS
 
diff --git a/gst-libs/gst/vaapi/gstvaapiutils_h264_priv.h b/gst-libs/gst/vaapi/gstvaapiutils_h264_priv.h
index 8fe0d41c44..6a0c61d03c 100644
--- a/gst-libs/gst/vaapi/gstvaapiutils_h264_priv.h
+++ b/gst-libs/gst/vaapi/gstvaapiutils_h264_priv.h
@@ -25,6 +25,7 @@
 
 #include "gstvaapiutils_h264.h"
 #include "libgstvaapi_priv_check.h"
+#include "gstvaapisurface.h"
 
 G_BEGIN_DECLS
 
diff --git a/gst-libs/gst/vaapi/gstvaapiutils_h265.h b/gst-libs/gst/vaapi/gstvaapiutils_h265.h
index 373764e990..930da0b61b 100644
--- a/gst-libs/gst/vaapi/gstvaapiutils_h265.h
+++ b/gst-libs/gst/vaapi/gstvaapiutils_h265.h
@@ -24,7 +24,6 @@
 #define GST_VAAPI_UTILS_H265_H
 
 #include <gst/vaapi/gstvaapiprofile.h>
-#include <gst/vaapi/gstvaapisurface.h>
 
 G_BEGIN_DECLS
 
diff --git a/gst-libs/gst/vaapi/gstvaapiutils_h265_priv.h b/gst-libs/gst/vaapi/gstvaapiutils_h265_priv.h
index 5e9f53211d..7b5173ed4d 100644
--- a/gst-libs/gst/vaapi/gstvaapiutils_h265_priv.h
+++ b/gst-libs/gst/vaapi/gstvaapiutils_h265_priv.h
@@ -25,6 +25,7 @@
 
 #include "gstvaapiutils_h265.h"
 #include "libgstvaapi_priv_check.h"
+#include "gstvaapisurface.h"
 
 G_BEGIN_DECLS
 
diff --git a/gst-libs/gst/vaapi/gstvaapiutils_mpeg2.h b/gst-libs/gst/vaapi/gstvaapiutils_mpeg2.h
index d846f86a1f..64e38d1cb2 100644
--- a/gst-libs/gst/vaapi/gstvaapiutils_mpeg2.h
+++ b/gst-libs/gst/vaapi/gstvaapiutils_mpeg2.h
@@ -24,7 +24,6 @@
 #define GST_VAAPI_UTILS_MPEG2_H
 
 #include <gst/vaapi/gstvaapiprofile.h>
-#include <gst/vaapi/gstvaapisurface.h>
 
 G_BEGIN_DECLS
 
diff --git a/gst-libs/gst/vaapi/gstvaapiutils_mpeg2_priv.h b/gst-libs/gst/vaapi/gstvaapiutils_mpeg2_priv.h
index e6507faa4b..231a6b4fcd 100644
--- a/gst-libs/gst/vaapi/gstvaapiutils_mpeg2_priv.h
+++ b/gst-libs/gst/vaapi/gstvaapiutils_mpeg2_priv.h
@@ -25,6 +25,7 @@
 
 #include "gstvaapiutils_mpeg2.h"
 #include "libgstvaapi_priv_check.h"
+#include "gstvaapisurface.h"
 
 G_BEGIN_DECLS