diff --git a/libavfilter/af_ashowinfo.c b/libavfilter/af_ashowinfo.c
index db8aa029c4..72d795f8ee 100644
--- a/libavfilter/af_ashowinfo.c
+++ b/libavfilter/af_ashowinfo.c
@@ -37,6 +37,8 @@
 #include "libavutil/timestamp.h"
 #include "libavutil/samplefmt.h"
 
+#include "libavcodec/defs.h"
+
 #include "audio.h"
 #include "avfilter.h"
 #include "internal.h"
diff --git a/libavfilter/dnn/dnn_backend_tf.c b/libavfilter/dnn/dnn_backend_tf.c
index 6443c2fd1d..ac609ab9cb 100644
--- a/libavfilter/dnn/dnn_backend_tf.c
+++ b/libavfilter/dnn/dnn_backend_tf.c
@@ -31,6 +31,7 @@
 #include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
 #include "libavutil/cpu.h"
+#include "libavcodec/defs.h"
 #include "../internal.h"
 #include "dnn_backend_native_layer_pad.h"
 #include "dnn_backend_native_layer_maximum.h"
diff --git a/libavfilter/internal.h b/libavfilter/internal.h
index 742e8e27cb..6c908690b4 100644
--- a/libavfilter/internal.h
+++ b/libavfilter/internal.h
@@ -30,8 +30,6 @@
 #include "framequeue.h"
 #include "version.h"
 #include "video.h"
-#include "libavcodec/avcodec.h"
-#include "libavcodec/internal.h"
 
 typedef struct AVFilterCommand {
     double time;                ///< time expressed in seconds
diff --git a/libavfilter/vf_uspp.c b/libavfilter/vf_uspp.c
index b70d48e515..7029963e29 100644
--- a/libavfilter/vf_uspp.c
+++ b/libavfilter/vf_uspp.c
@@ -32,6 +32,7 @@
 #include "libavutil/mem_internal.h"
 #include "libavutil/opt.h"
 #include "libavutil/pixdesc.h"
+#include "libavcodec/avcodec.h"
 #include "internal.h"
 #include "qp_table.h"
 #include "avfilter.h"
diff --git a/libavfilter/vf_vpp_qsv.c b/libavfilter/vf_vpp_qsv.c
index 70bd5310c3..ee9317a49e 100644
--- a/libavfilter/vf_vpp_qsv.c
+++ b/libavfilter/vf_vpp_qsv.c
@@ -25,6 +25,7 @@
 
 #include "libavutil/opt.h"
 #include "libavutil/eval.h"
+#include "libavutil/hwcontext.h"
 #include "libavutil/pixdesc.h"
 #include "libavutil/mathematics.h"
 
diff --git a/libavfilter/vf_yadif_cuda.c b/libavfilter/vf_yadif_cuda.c
index 5099f0a806..95267d6a1c 100644
--- a/libavfilter/vf_yadif_cuda.c
+++ b/libavfilter/vf_yadif_cuda.c
@@ -19,6 +19,7 @@
  */
 
 #include "libavutil/avassert.h"
+#include "libavutil/hwcontext.h"
 #include "libavutil/hwcontext_cuda_internal.h"
 #include "libavutil/cuda_check.h"
 #include "internal.h"