diff --git a/libavcodec/bsf/Makefile b/libavcodec/bsf/Makefile
index e506ac61fd..fb70ad0c21 100644
--- a/libavcodec/bsf/Makefile
+++ b/libavcodec/bsf/Makefile
@@ -45,3 +45,5 @@ OBJS-$(CONFIG_VP9_SUPERFRAME_BSF)         += bsf/vp9_superframe.o
 OBJS-$(CONFIG_VP9_SUPERFRAME_SPLIT_BSF)   += bsf/vp9_superframe_split.o
 OBJS-$(CONFIG_VVC_METADATA_BSF)           += bsf/h266_metadata.o
 OBJS-$(CONFIG_VVC_MP4TOANNEXB_BSF)        += bsf/vvc_mp4toannexb.o
+
+libavcodec/bsf/%.o: CPPFLAGS += -I$(SRC_PATH)/libavcodec/
diff --git a/libavcodec/bsf/aac_adtstoasc.c b/libavcodec/bsf/aac_adtstoasc.c
index 08373fc3b2..dd5e8b2a31 100644
--- a/libavcodec/bsf/aac_adtstoasc.c
+++ b/libavcodec/bsf/aac_adtstoasc.c
@@ -19,14 +19,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavcodec/adts_header.h"
-#include "libavcodec/adts_parser.h"
-#include "libavcodec/bsf.h"
-#include "libavcodec/bsf_internal.h"
-#include "libavcodec/put_bits.h"
-#include "libavcodec/get_bits.h"
-#include "libavcodec/mpeg4audio.h"
-#include "libavcodec/mpeg4audio_copy_pce.h"
+#include "adts_header.h"
+#include "adts_parser.h"
+#include "bsf.h"
+#include "bsf_internal.h"
+#include "put_bits.h"
+#include "get_bits.h"
+#include "mpeg4audio.h"
+#include "mpeg4audio_copy_pce.h"
 
 typedef struct AACBSFContext {
     int first_frame_done;
diff --git a/libavcodec/bsf/av1_frame_merge.c b/libavcodec/bsf/av1_frame_merge.c
index 12d53fba7c..4c54f2167e 100644
--- a/libavcodec/bsf/av1_frame_merge.c
+++ b/libavcodec/bsf/av1_frame_merge.c
@@ -18,10 +18,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavcodec/bsf.h"
-#include "libavcodec/bsf_internal.h"
-#include "libavcodec/cbs.h"
-#include "libavcodec/cbs_av1.h"
+#include "bsf.h"
+#include "bsf_internal.h"
+#include "cbs.h"
+#include "cbs_av1.h"
 
 typedef struct AV1FMergeContext {
     CodedBitstreamContext *input;
diff --git a/libavcodec/bsf/av1_frame_split.c b/libavcodec/bsf/av1_frame_split.c
index 953aa83fc2..5f6a40316c 100644
--- a/libavcodec/bsf/av1_frame_split.c
+++ b/libavcodec/bsf/av1_frame_split.c
@@ -32,10 +32,10 @@
 
 #include "libavutil/avassert.h"
 
-#include "libavcodec/bsf.h"
-#include "libavcodec/bsf_internal.h"
-#include "libavcodec/cbs.h"
-#include "libavcodec/cbs_av1.h"
+#include "bsf.h"
+#include "bsf_internal.h"
+#include "cbs.h"
+#include "cbs_av1.h"
 
 typedef struct AV1FSplitContext {
     AVPacket *buffer_pkt;
diff --git a/libavcodec/bsf/av1_metadata.c b/libavcodec/bsf/av1_metadata.c
index 34864d4d58..cb51d2eee6 100644
--- a/libavcodec/bsf/av1_metadata.c
+++ b/libavcodec/bsf/av1_metadata.c
@@ -19,11 +19,11 @@
 #include "libavutil/common.h"
 #include "libavutil/opt.h"
 
-#include "libavcodec/bsf.h"
-#include "libavcodec/bsf_internal.h"
-#include "libavcodec/cbs.h"
-#include "libavcodec/cbs_bsf.h"
-#include "libavcodec/cbs_av1.h"
+#include "bsf.h"
+#include "bsf_internal.h"
+#include "cbs.h"
+#include "cbs_bsf.h"
+#include "cbs_av1.h"
 
 typedef struct AV1MetadataContext {
     CBSBSFContext common;
diff --git a/libavcodec/bsf/chomp.c b/libavcodec/bsf/chomp.c
index 88110142ed..532b4e6a94 100644
--- a/libavcodec/bsf/chomp.c
+++ b/libavcodec/bsf/chomp.c
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavcodec/bsf.h"
-#include "libavcodec/bsf_internal.h"
+#include "bsf.h"
+#include "bsf_internal.h"
 
 static int chomp_filter(AVBSFContext *ctx, AVPacket *pkt)
 {
diff --git a/libavcodec/bsf/dca_core.c b/libavcodec/bsf/dca_core.c
index a239e7fa07..1a2db39cba 100644
--- a/libavcodec/bsf/dca_core.c
+++ b/libavcodec/bsf/dca_core.c
@@ -18,10 +18,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavcodec/bsf.h"
-#include "libavcodec/bsf_internal.h"
-#include "libavcodec/bytestream.h"
-#include "libavcodec/dca_syncwords.h"
+#include "bsf.h"
+#include "bsf_internal.h"
+#include "bytestream.h"
+#include "dca_syncwords.h"
 
 static int dca_core_filter(AVBSFContext *ctx, AVPacket *pkt)
 {
diff --git a/libavcodec/bsf/dts2pts.c b/libavcodec/bsf/dts2pts.c
index 78d86ca86c..53a54fb1cc 100644
--- a/libavcodec/bsf/dts2pts.c
+++ b/libavcodec/bsf/dts2pts.c
@@ -28,12 +28,12 @@
 #include "libavutil/mem.h"
 #include "libavutil/tree.h"
 
-#include "libavcodec/bsf.h"
-#include "libavcodec/bsf_internal.h"
-#include "libavcodec/cbs.h"
-#include "libavcodec/cbs_h264.h"
-#include "libavcodec/h264_parse.h"
-#include "libavcodec/h264_ps.h"
+#include "bsf.h"
+#include "bsf_internal.h"
+#include "cbs.h"
+#include "cbs_h264.h"
+#include "h264_parse.h"
+#include "h264_ps.h"
 
 typedef struct DTS2PTSNode {
     int64_t      dts;
diff --git a/libavcodec/bsf/dump_extradata.c b/libavcodec/bsf/dump_extradata.c
index 9db66d1d27..43619879cc 100644
--- a/libavcodec/bsf/dump_extradata.c
+++ b/libavcodec/bsf/dump_extradata.c
@@ -20,8 +20,8 @@
 
 #include <string.h>
 
-#include "libavcodec/bsf.h"
-#include "libavcodec/bsf_internal.h"
+#include "bsf.h"
+#include "bsf_internal.h"
 
 #include "libavutil/log.h"
 #include "libavutil/opt.h"
diff --git a/libavcodec/bsf/dv_error_marker.c b/libavcodec/bsf/dv_error_marker.c
index 644cde28fb..c8bb9e062f 100644
--- a/libavcodec/bsf/dv_error_marker.c
+++ b/libavcodec/bsf/dv_error_marker.c
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavcodec/bsf.h"
-#include "libavcodec/bsf_internal.h"
+#include "bsf.h"
+#include "bsf_internal.h"
 #include "libavutil/colorspace.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/opt.h"
diff --git a/libavcodec/bsf/eac3_core.c b/libavcodec/bsf/eac3_core.c
index 4fd0d962d3..1c714b18f9 100644
--- a/libavcodec/bsf/eac3_core.c
+++ b/libavcodec/bsf/eac3_core.c
@@ -18,10 +18,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavcodec/bsf.h"
-#include "libavcodec/bsf_internal.h"
-#include "libavcodec/get_bits.h"
-#include "libavcodec/ac3_parser_internal.h"
+#include "bsf.h"
+#include "bsf_internal.h"
+#include "get_bits.h"
+#include "ac3_parser_internal.h"
 
 static int eac3_core_filter(AVBSFContext *ctx, AVPacket *pkt)
 {
diff --git a/libavcodec/bsf/evc_frame_merge.c b/libavcodec/bsf/evc_frame_merge.c
index 1b96eec85b..1b52ba2900 100644
--- a/libavcodec/bsf/evc_frame_merge.c
+++ b/libavcodec/bsf/evc_frame_merge.c
@@ -18,13 +18,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include "libavutil/mem.h"
-#include "libavcodec/get_bits.h"
-#include "libavcodec/bsf.h"
-#include "libavcodec/bsf_internal.h"
+#include "get_bits.h"
+#include "bsf.h"
+#include "bsf_internal.h"
 
-#include "libavcodec/evc.h"
-#include "libavcodec/evc_parse.h"
-#include "libavcodec/evc_ps.h"
+#include "evc.h"
+#include "evc_parse.h"
+#include "evc_ps.h"
 
 // Access unit data
 typedef struct AccessUnitBuffer {
diff --git a/libavcodec/bsf/extract_extradata.c b/libavcodec/bsf/extract_extradata.c
index 6518199a5b..c3c98c7d77 100644
--- a/libavcodec/bsf/extract_extradata.c
+++ b/libavcodec/bsf/extract_extradata.c
@@ -22,17 +22,17 @@
 #include "libavutil/mem.h"
 #include "libavutil/opt.h"
 
-#include "libavcodec/av1.h"
-#include "libavcodec/av1_parse.h"
-#include "libavcodec/bsf.h"
-#include "libavcodec/bsf_internal.h"
-#include "libavcodec/bytestream.h"
-#include "libavcodec/h2645_parse.h"
-#include "libavcodec/h264.h"
-#include "libavcodec/hevc.h"
-#include "libavcodec/startcode.h"
-#include "libavcodec/vc1_common.h"
-#include "libavcodec/vvc.h"
+#include "av1.h"
+#include "av1_parse.h"
+#include "bsf.h"
+#include "bsf_internal.h"
+#include "bytestream.h"
+#include "h2645_parse.h"
+#include "h264.h"
+#include "hevc.h"
+#include "startcode.h"
+#include "vc1_common.h"
+#include "vvc.h"
 
 typedef struct ExtractExtradataContext {
     const AVClass *class;
diff --git a/libavcodec/bsf/filter_units.c b/libavcodec/bsf/filter_units.c
index 8bfdec6a6d..029c86048b 100644
--- a/libavcodec/bsf/filter_units.c
+++ b/libavcodec/bsf/filter_units.c
@@ -21,9 +21,9 @@
 #include "libavutil/mem.h"
 #include "libavutil/opt.h"
 
-#include "libavcodec/bsf.h"
-#include "libavcodec/bsf_internal.h"
-#include "libavcodec/cbs.h"
+#include "bsf.h"
+#include "bsf_internal.h"
+#include "cbs.h"
 
 
 typedef struct FilterUnitsContext {
diff --git a/libavcodec/bsf/h264_metadata.c b/libavcodec/bsf/h264_metadata.c
index b5d81e41e5..477f1b18b6 100644
--- a/libavcodec/bsf/h264_metadata.c
+++ b/libavcodec/bsf/h264_metadata.c
@@ -22,16 +22,16 @@
 #include "libavutil/mem.h"
 #include "libavutil/opt.h"
 
-#include "libavcodec/bsf.h"
-#include "libavcodec/bsf_internal.h"
-#include "libavcodec/cbs.h"
-#include "libavcodec/cbs_bsf.h"
-#include "libavcodec/cbs_h264.h"
-#include "libavcodec/cbs_sei.h"
-#include "libavcodec/h264.h"
-#include "libavcodec/h264_levels.h"
-#include "libavcodec/h2645data.h"
-#include "libavcodec/sei.h"
+#include "bsf.h"
+#include "bsf_internal.h"
+#include "cbs.h"
+#include "cbs_bsf.h"
+#include "cbs_h264.h"
+#include "cbs_sei.h"
+#include "h264.h"
+#include "h264_levels.h"
+#include "h2645data.h"
+#include "sei.h"
 
 enum {
     FLIP_HORIZONTAL = 1,
diff --git a/libavcodec/bsf/h264_mp4toannexb.c b/libavcodec/bsf/h264_mp4toannexb.c
index 95721ad647..92af6a6881 100644
--- a/libavcodec/bsf/h264_mp4toannexb.c
+++ b/libavcodec/bsf/h264_mp4toannexb.c
@@ -25,11 +25,11 @@
 #include "libavutil/intreadwrite.h"
 #include "libavutil/mem.h"
 
-#include "libavcodec/bsf.h"
-#include "libavcodec/bsf_internal.h"
-#include "libavcodec/bytestream.h"
-#include "libavcodec/defs.h"
-#include "libavcodec/h264.h"
+#include "bsf.h"
+#include "bsf_internal.h"
+#include "bytestream.h"
+#include "defs.h"
+#include "h264.h"
 
 typedef struct H264BSFContext {
     uint8_t *sps;
diff --git a/libavcodec/bsf/h264_redundant_pps.c b/libavcodec/bsf/h264_redundant_pps.c
index a07e87cac7..df9a88a705 100644
--- a/libavcodec/bsf/h264_redundant_pps.c
+++ b/libavcodec/bsf/h264_redundant_pps.c
@@ -20,14 +20,14 @@
 
 #include "libavutil/log.h"
 
-#include "libavcodec/bsf.h"
-#include "libavcodec/bsf_internal.h"
-#include "libavcodec/cbs.h"
-#include "libavcodec/cbs_bsf.h"
-#include "libavcodec/cbs_h264.h"
-#include "libavcodec/codec_id.h"
-#include "libavcodec/h264.h"
-#include "libavcodec/packet.h"
+#include "bsf.h"
+#include "bsf_internal.h"
+#include "cbs.h"
+#include "cbs_bsf.h"
+#include "cbs_h264.h"
+#include "codec_id.h"
+#include "h264.h"
+#include "packet.h"
 
 #define NEW_GLOBAL_PIC_INIT_QP 26
 
diff --git a/libavcodec/bsf/h265_metadata.c b/libavcodec/bsf/h265_metadata.c
index d3f6596407..c9e1cc3eed 100644
--- a/libavcodec/bsf/h265_metadata.c
+++ b/libavcodec/bsf/h265_metadata.c
@@ -19,14 +19,14 @@
 #include "libavutil/common.h"
 #include "libavutil/opt.h"
 
-#include "libavcodec/bsf.h"
-#include "libavcodec/bsf_internal.h"
-#include "libavcodec/cbs.h"
-#include "libavcodec/cbs_bsf.h"
-#include "libavcodec/cbs_h265.h"
-#include "libavcodec/h2645data.h"
-#include "libavcodec/hevc.h"
-#include "libavcodec/h265_profile_level.h"
+#include "bsf.h"
+#include "bsf_internal.h"
+#include "cbs.h"
+#include "cbs_bsf.h"
+#include "cbs_h265.h"
+#include "h2645data.h"
+#include "hevc.h"
+#include "h265_profile_level.h"
 
 enum {
     LEVEL_UNSET = -2,
diff --git a/libavcodec/bsf/h266_metadata.c b/libavcodec/bsf/h266_metadata.c
index b847dc1860..1f0f875cfe 100644
--- a/libavcodec/bsf/h266_metadata.c
+++ b/libavcodec/bsf/h266_metadata.c
@@ -19,12 +19,12 @@
 #include "libavutil/common.h"
 #include "libavutil/opt.h"
 
-#include "libavcodec/bsf.h"
-#include "libavcodec/bsf_internal.h"
-#include "libavcodec/cbs.h"
-#include "libavcodec/cbs_bsf.h"
-#include "libavcodec/cbs_h266.h"
-#include "libavcodec/vvc.h"
+#include "bsf.h"
+#include "bsf_internal.h"
+#include "cbs.h"
+#include "cbs_bsf.h"
+#include "cbs_h266.h"
+#include "vvc.h"
 
 #define IS_H266_SLICE(nut) (nut <= VVC_RASL_NUT || (nut >= VVC_IDR_W_RADL && nut <= VVC_GDR_NUT))
 
diff --git a/libavcodec/bsf/hapqa_extract.c b/libavcodec/bsf/hapqa_extract.c
index ece79d1e57..5c49a4de22 100644
--- a/libavcodec/bsf/hapqa_extract.c
+++ b/libavcodec/bsf/hapqa_extract.c
@@ -25,10 +25,10 @@
  * extract one of the two textures of the HAQA
  */
 
-#include "libavcodec/bsf.h"
-#include "libavcodec/bsf_internal.h"
-#include "libavcodec/bytestream.h"
-#include "libavcodec/hap.h"
+#include "bsf.h"
+#include "bsf_internal.h"
+#include "bytestream.h"
+#include "hap.h"
 
 #include "libavutil/opt.h"
 
diff --git a/libavcodec/bsf/hevc_mp4toannexb.c b/libavcodec/bsf/hevc_mp4toannexb.c
index 055852b4a4..8eec18f31e 100644
--- a/libavcodec/bsf/hevc_mp4toannexb.c
+++ b/libavcodec/bsf/hevc_mp4toannexb.c
@@ -24,11 +24,11 @@
 #include "libavutil/intreadwrite.h"
 #include "libavutil/mem.h"
 
-#include "libavcodec/bsf.h"
-#include "libavcodec/bsf_internal.h"
-#include "libavcodec/bytestream.h"
-#include "libavcodec/defs.h"
-#include "libavcodec/hevc.h"
+#include "bsf.h"
+#include "bsf_internal.h"
+#include "bytestream.h"
+#include "defs.h"
+#include "hevc.h"
 
 #define MIN_HEVCC_LENGTH 23
 
diff --git a/libavcodec/bsf/imx_dump_header.c b/libavcodec/bsf/imx_dump_header.c
index ea6526b22b..241415a0ef 100644
--- a/libavcodec/bsf/imx_dump_header.c
+++ b/libavcodec/bsf/imx_dump_header.c
@@ -25,9 +25,9 @@
  * modifies bitstream to fit in mov and be decoded by final cut pro decoder
  */
 
-#include "libavcodec/bsf.h"
-#include "libavcodec/bsf_internal.h"
-#include "libavcodec/bytestream.h"
+#include "bsf.h"
+#include "bsf_internal.h"
+#include "bytestream.h"
 
 
 static int imx_dump_header(AVBSFContext *ctx, AVPacket *out)
diff --git a/libavcodec/bsf/media100_to_mjpegb.c b/libavcodec/bsf/media100_to_mjpegb.c
index a738a52bf0..6e117ae20f 100644
--- a/libavcodec/bsf/media100_to_mjpegb.c
+++ b/libavcodec/bsf/media100_to_mjpegb.c
@@ -25,9 +25,9 @@
  */
 
 #include "libavutil/intreadwrite.h"
-#include "libavcodec/bsf.h"
-#include "libavcodec/bsf_internal.h"
-#include "libavcodec/bytestream.h"
+#include "bsf.h"
+#include "bsf_internal.h"
+#include "bytestream.h"
 
 static av_cold int init(AVBSFContext *ctx)
 {
diff --git a/libavcodec/bsf/mjpeg2jpeg.c b/libavcodec/bsf/mjpeg2jpeg.c
index 2aad5498c6..f545e9438d 100644
--- a/libavcodec/bsf/mjpeg2jpeg.c
+++ b/libavcodec/bsf/mjpeg2jpeg.c
@@ -29,10 +29,10 @@
 #include "libavutil/error.h"
 #include "libavutil/intreadwrite.h"
 
-#include "libavcodec/bsf.h"
-#include "libavcodec/bsf_internal.h"
-#include "libavcodec/jpegtables.h"
-#include "libavcodec/mjpeg.h"
+#include "bsf.h"
+#include "bsf_internal.h"
+#include "jpegtables.h"
+#include "mjpeg.h"
 
 static const uint8_t jpeg_header[] = {
     0xff, 0xd8,                     // SOI
diff --git a/libavcodec/bsf/mjpega_dump_header.c b/libavcodec/bsf/mjpega_dump_header.c
index 089358a5e1..d541084e74 100644
--- a/libavcodec/bsf/mjpega_dump_header.c
+++ b/libavcodec/bsf/mjpega_dump_header.c
@@ -25,10 +25,10 @@
  * modifies bitstream to be decoded by quicktime
  */
 
-#include "libavcodec/bsf.h"
-#include "libavcodec/bsf_internal.h"
-#include "libavcodec/bytestream.h"
-#include "libavcodec/mjpeg.h"
+#include "bsf.h"
+#include "bsf_internal.h"
+#include "bytestream.h"
+#include "mjpeg.h"
 
 
 static int mjpega_dump_header(AVBSFContext *ctx, AVPacket *out)
diff --git a/libavcodec/bsf/movsub.c b/libavcodec/bsf/movsub.c
index 1c709a4bd7..a5125c7aff 100644
--- a/libavcodec/bsf/movsub.c
+++ b/libavcodec/bsf/movsub.c
@@ -20,8 +20,8 @@
 
 #include "libavutil/common.h"
 #include "libavutil/intreadwrite.h"
-#include "libavcodec/bsf.h"
-#include "libavcodec/bsf_internal.h"
+#include "bsf.h"
+#include "bsf_internal.h"
 
 static int text2movsub(AVBSFContext *ctx, AVPacket *out)
 {
diff --git a/libavcodec/bsf/mpeg2_metadata.c b/libavcodec/bsf/mpeg2_metadata.c
index e206c49b79..1aa6e02791 100644
--- a/libavcodec/bsf/mpeg2_metadata.c
+++ b/libavcodec/bsf/mpeg2_metadata.c
@@ -19,12 +19,12 @@
 #include "libavutil/common.h"
 #include "libavutil/opt.h"
 
-#include "libavcodec/bsf.h"
-#include "libavcodec/bsf_internal.h"
-#include "libavcodec/cbs.h"
-#include "libavcodec/cbs_bsf.h"
-#include "libavcodec/cbs_mpeg2.h"
-#include "libavcodec/mpeg12.h"
+#include "bsf.h"
+#include "bsf_internal.h"
+#include "cbs.h"
+#include "cbs_bsf.h"
+#include "cbs_mpeg2.h"
+#include "mpeg12.h"
 
 typedef struct MPEG2MetadataContext {
     CBSBSFContext common;
diff --git a/libavcodec/bsf/mpeg4_unpack_bframes.c b/libavcodec/bsf/mpeg4_unpack_bframes.c
index 97d2c09482..3a3aad795f 100644
--- a/libavcodec/bsf/mpeg4_unpack_bframes.c
+++ b/libavcodec/bsf/mpeg4_unpack_bframes.c
@@ -19,10 +19,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavcodec/bsf.h"
-#include "libavcodec/bsf_internal.h"
-#include "libavcodec/mpeg4videodefs.h"
-#include "libavcodec/startcode.h"
+#include "bsf.h"
+#include "bsf_internal.h"
+#include "mpeg4videodefs.h"
+#include "startcode.h"
 
 typedef struct UnpackBFramesBSFContext {
     AVBufferRef *b_frame_ref;
diff --git a/libavcodec/bsf/noise.c b/libavcodec/bsf/noise.c
index e95917b3e8..a622855717 100644
--- a/libavcodec/bsf/noise.c
+++ b/libavcodec/bsf/noise.c
@@ -20,8 +20,8 @@
 
 #include <stdlib.h>
 
-#include "libavcodec/bsf.h"
-#include "libavcodec/bsf_internal.h"
+#include "bsf.h"
+#include "bsf_internal.h"
 
 #include "libavutil/log.h"
 #include "libavutil/mem.h"
diff --git a/libavcodec/bsf/null.c b/libavcodec/bsf/null.c
index e4da649a0c..28237076fb 100644
--- a/libavcodec/bsf/null.c
+++ b/libavcodec/bsf/null.c
@@ -21,7 +21,7 @@
  * Null bitstream filter -- pass the input through unchanged.
  */
 
-#include "libavcodec/bsf_internal.h"
+#include "bsf_internal.h"
 
 const FFBitStreamFilter ff_null_bsf = {
     .p.name         = "null",
diff --git a/libavcodec/bsf/opus_metadata.c b/libavcodec/bsf/opus_metadata.c
index c6fcd9b0f1..2a0f86cec3 100644
--- a/libavcodec/bsf/opus_metadata.c
+++ b/libavcodec/bsf/opus_metadata.c
@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavcodec/bsf.h"
-#include "libavcodec/bsf_internal.h"
+#include "bsf.h"
+#include "bsf_internal.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/opt.h"
 
diff --git a/libavcodec/bsf/pcm_rechunk.c b/libavcodec/bsf/pcm_rechunk.c
index 0c1007e271..b1b57f96a9 100644
--- a/libavcodec/bsf/pcm_rechunk.c
+++ b/libavcodec/bsf/pcm_rechunk.c
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavcodec/bsf.h"
-#include "libavcodec/bsf_internal.h"
+#include "bsf.h"
+#include "bsf_internal.h"
 #include "libavutil/avassert.h"
 #include "libavutil/opt.h"
 
diff --git a/libavcodec/bsf/pgs_frame_merge.c b/libavcodec/bsf/pgs_frame_merge.c
index fb587831a4..bcd8945335 100644
--- a/libavcodec/bsf/pgs_frame_merge.c
+++ b/libavcodec/bsf/pgs_frame_merge.c
@@ -30,8 +30,8 @@
 #include "libavutil/attributes.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/log.h"
-#include "libavcodec/bsf.h"
-#include "libavcodec/bsf_internal.h"
+#include "bsf.h"
+#include "bsf_internal.h"
 
 enum PGSSegmentType {
     PALETTE_SEGMENT         = 0x14,
diff --git a/libavcodec/bsf/prores_metadata.c b/libavcodec/bsf/prores_metadata.c
index 8248004713..32af17cedf 100644
--- a/libavcodec/bsf/prores_metadata.c
+++ b/libavcodec/bsf/prores_metadata.c
@@ -29,8 +29,8 @@
 #include "libavutil/intreadwrite.h"
 #include "libavutil/opt.h"
 
-#include "libavcodec/bsf.h"
-#include "libavcodec/bsf_internal.h"
+#include "bsf.h"
+#include "bsf_internal.h"
 
 typedef struct ProresMetadataContext {
     const AVClass *class;
diff --git a/libavcodec/bsf/remove_extradata.c b/libavcodec/bsf/remove_extradata.c
index 65bb62b24a..3010eba058 100644
--- a/libavcodec/bsf/remove_extradata.c
+++ b/libavcodec/bsf/remove_extradata.c
@@ -21,13 +21,13 @@
 #include "libavutil/log.h"
 #include "libavutil/opt.h"
 
-#include "libavcodec/av1_parse.h"
-#include "libavcodec/bsf.h"
-#include "libavcodec/bsf_internal.h"
-#include "libavcodec/h264.h"
-#include "libavcodec/hevc.h"
-#include "libavcodec/startcode.h"
-#include "libavcodec/vc1_common.h"
+#include "av1_parse.h"
+#include "bsf.h"
+#include "bsf_internal.h"
+#include "h264.h"
+#include "hevc.h"
+#include "startcode.h"
+#include "vc1_common.h"
 
 enum RemoveFreq {
     REMOVE_FREQ_KEYFRAME,
diff --git a/libavcodec/bsf/setts.c b/libavcodec/bsf/setts.c
index 07b204fa3a..9c27b24a39 100644
--- a/libavcodec/bsf/setts.c
+++ b/libavcodec/bsf/setts.c
@@ -26,8 +26,8 @@
 #include "libavutil/opt.h"
 #include "libavutil/eval.h"
 
-#include "libavcodec/bsf.h"
-#include "libavcodec/bsf_internal.h"
+#include "bsf.h"
+#include "bsf_internal.h"
 
 static const char *const var_names[] = {
     "N",           ///< frame number (starting at zero)
diff --git a/libavcodec/bsf/showinfo.c b/libavcodec/bsf/showinfo.c
index 073c3701ac..4e31e0b5cb 100644
--- a/libavcodec/bsf/showinfo.c
+++ b/libavcodec/bsf/showinfo.c
@@ -20,8 +20,8 @@
 
 #include <inttypes.h>
 
-#include "libavcodec/bsf.h"
-#include "libavcodec/bsf_internal.h"
+#include "bsf.h"
+#include "bsf_internal.h"
 
 #include "libavutil/log.h"
 #include "libavutil/timestamp.h"
diff --git a/libavcodec/bsf/trace_headers.c b/libavcodec/bsf/trace_headers.c
index 92c9f5e9cc..8781f5f100 100644
--- a/libavcodec/bsf/trace_headers.c
+++ b/libavcodec/bsf/trace_headers.c
@@ -22,9 +22,9 @@
 #include "libavutil/avutil.h"
 #include "libavutil/log.h"
 
-#include "libavcodec/bsf.h"
-#include "libavcodec/bsf_internal.h"
-#include "libavcodec/cbs.h"
+#include "bsf.h"
+#include "bsf_internal.h"
+#include "cbs.h"
 
 
 typedef struct TraceHeadersContext {
diff --git a/libavcodec/bsf/truehd_core.c b/libavcodec/bsf/truehd_core.c
index bb113593ad..ee1060b021 100644
--- a/libavcodec/bsf/truehd_core.c
+++ b/libavcodec/bsf/truehd_core.c
@@ -18,11 +18,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavcodec/bsf.h"
-#include "libavcodec/bsf_internal.h"
-#include "libavcodec/get_bits.h"
-#include "libavcodec/mlp_parse.h"
-#include "libavcodec/mlp.h"
+#include "bsf.h"
+#include "bsf_internal.h"
+#include "get_bits.h"
+#include "mlp_parse.h"
+#include "mlp.h"
 
 typedef struct AccessUnit {
     uint8_t bits[4];
diff --git a/libavcodec/bsf/vp9_metadata.c b/libavcodec/bsf/vp9_metadata.c
index d5e083eeb5..355ffd5f8d 100644
--- a/libavcodec/bsf/vp9_metadata.c
+++ b/libavcodec/bsf/vp9_metadata.c
@@ -19,11 +19,11 @@
 #include "libavutil/log.h"
 #include "libavutil/opt.h"
 
-#include "libavcodec/bsf.h"
-#include "libavcodec/bsf_internal.h"
-#include "libavcodec/cbs.h"
-#include "libavcodec/cbs_bsf.h"
-#include "libavcodec/cbs_vp9.h"
+#include "bsf.h"
+#include "bsf_internal.h"
+#include "cbs.h"
+#include "cbs_bsf.h"
+#include "cbs_vp9.h"
 
 typedef struct VP9MetadataContext {
     CBSBSFContext common;
diff --git a/libavcodec/bsf/vp9_raw_reorder.c b/libavcodec/bsf/vp9_raw_reorder.c
index df2d1da5e9..d36093316c 100644
--- a/libavcodec/bsf/vp9_raw_reorder.c
+++ b/libavcodec/bsf/vp9_raw_reorder.c
@@ -21,10 +21,10 @@
 #include "libavutil/log.h"
 #include "libavutil/mem.h"
 
-#include "libavcodec/bsf.h"
-#include "libavcodec/bsf_internal.h"
-#include "libavcodec/get_bits.h"
-#include "libavcodec/put_bits.h"
+#include "bsf.h"
+#include "bsf_internal.h"
+#include "get_bits.h"
+#include "put_bits.h"
 
 #define FRAME_SLOTS 8
 
diff --git a/libavcodec/bsf/vp9_superframe.c b/libavcodec/bsf/vp9_superframe.c
index bd9a251d2c..a0978c7ef0 100644
--- a/libavcodec/bsf/vp9_superframe.c
+++ b/libavcodec/bsf/vp9_superframe.c
@@ -21,9 +21,9 @@
 
 #include "libavutil/avassert.h"
 
-#include "libavcodec/bsf.h"
-#include "libavcodec/bsf_internal.h"
-#include "libavcodec/get_bits.h"
+#include "bsf.h"
+#include "bsf_internal.h"
+#include "get_bits.h"
 
 #define MAX_CACHE 8
 typedef struct VP9BSFContext {
diff --git a/libavcodec/bsf/vp9_superframe_split.c b/libavcodec/bsf/vp9_superframe_split.c
index 92bad62e29..cddd48119c 100644
--- a/libavcodec/bsf/vp9_superframe_split.c
+++ b/libavcodec/bsf/vp9_superframe_split.c
@@ -24,10 +24,10 @@
 
 #include <stddef.h>
 
-#include "libavcodec/bsf.h"
-#include "libavcodec/bsf_internal.h"
-#include "libavcodec/bytestream.h"
-#include "libavcodec/get_bits.h"
+#include "bsf.h"
+#include "bsf_internal.h"
+#include "bytestream.h"
+#include "get_bits.h"
 
 typedef struct VP9SFSplitContext {
     AVPacket *buffer_pkt;
diff --git a/libavcodec/bsf/vvc_mp4toannexb.c b/libavcodec/bsf/vvc_mp4toannexb.c
index ece3bb930e..36bdae8f49 100644
--- a/libavcodec/bsf/vvc_mp4toannexb.c
+++ b/libavcodec/bsf/vvc_mp4toannexb.c
@@ -24,11 +24,11 @@
 #include "libavutil/intreadwrite.h"
 #include "libavutil/mem.h"
 
-#include "libavcodec/bsf.h"
-#include "libavcodec/bsf_internal.h"
-#include "libavcodec/bytestream.h"
-#include "libavcodec/defs.h"
-#include "libavcodec/vvc.h"
+#include "bsf.h"
+#include "bsf_internal.h"
+#include "bytestream.h"
+#include "defs.h"
+#include "vvc.h"
 
 #define MIN_VVCC_LENGTH 23