diff --git a/fftools/ffplay.c b/fftools/ffplay.c
index 9ff0425163..a0f5fcae24 100644
--- a/fftools/ffplay.c
+++ b/fftools/ffplay.c
@@ -38,7 +38,6 @@
 #include "libavutil/dict.h"
 #include "libavutil/parseutils.h"
 #include "libavutil/samplefmt.h"
-#include "libavutil/avassert.h"
 #include "libavutil/time.h"
 #include "libavutil/bprint.h"
 #include "libavformat/avformat.h"
@@ -59,8 +58,6 @@
 
 #include "cmdutils.h"
 
-#include <assert.h>
-
 const char program_name[] = "ffplay";
 const int program_birth_year = 2003;
 
diff --git a/libavcodec/ass.c b/libavcodec/ass.c
index 627741936a..907e2d7b88 100644
--- a/libavcodec/ass.c
+++ b/libavcodec/ass.c
@@ -21,7 +21,6 @@
 
 #include "avcodec.h"
 #include "ass.h"
-#include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
 #include "libavutil/bprint.h"
 #include "libavutil/common.h"
diff --git a/libavcodec/cfhd.h b/libavcodec/cfhd.h
index 8ea91270cd..43faa38fde 100644
--- a/libavcodec/cfhd.h
+++ b/libavcodec/cfhd.h
@@ -23,8 +23,6 @@
 
 #include <stdint.h>
 
-#include "libavutil/avassert.h"
-
 #include "avcodec.h"
 #include "bytestream.h"
 #include "get_bits.h"
diff --git a/libavcodec/cfhddsp.c b/libavcodec/cfhddsp.c
index 4028263f7a..da9254c718 100644
--- a/libavcodec/cfhddsp.c
+++ b/libavcodec/cfhddsp.c
@@ -20,7 +20,6 @@
 
 #include "libavutil/attributes.h"
 #include "libavutil/common.h"
-#include "libavutil/avassert.h"
 
 #include "cfhddsp.h"
 
diff --git a/libavcodec/cfhdenc.c b/libavcodec/cfhdenc.c
index 5554baefa3..ffe27b482e 100644
--- a/libavcodec/cfhdenc.c
+++ b/libavcodec/cfhdenc.c
@@ -26,7 +26,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "libavutil/avassert.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/opt.h"
 
diff --git a/libavcodec/dirac_dwt.c b/libavcodec/dirac_dwt.c
index cc08f8865a..fffaf82e23 100644
--- a/libavcodec/dirac_dwt.c
+++ b/libavcodec/dirac_dwt.c
@@ -20,7 +20,6 @@
  */
 
 #include "libavutil/attributes.h"
-#include "libavutil/avassert.h"
 #include "libavutil/common.h"
 #include "dirac_dwt.h"
 
diff --git a/libavcodec/dstdec.c b/libavcodec/dstdec.c
index 84d19b91aa..aa04a1d5ce 100644
--- a/libavcodec/dstdec.c
+++ b/libavcodec/dstdec.c
@@ -25,7 +25,6 @@
  * ISO/IEC 14496-3 Part 3 Subpart 10: Technical description of lossless coding of oversampled audio
  */
 
-#include "libavutil/avassert.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/mem_internal.h"
 #include "internal.h"
diff --git a/libavcodec/ffv1.h b/libavcodec/ffv1.h
index 147fe7ae16..473780c876 100644
--- a/libavcodec/ffv1.h
+++ b/libavcodec/ffv1.h
@@ -28,7 +28,6 @@
  * FF Video Codec 1 (a lossless codec)
  */
 
-#include "libavutil/avassert.h"
 #include "libavutil/crc.h"
 #include "libavutil/opt.h"
 #include "libavutil/imgutils.h"
diff --git a/libavcodec/g729_parser.c b/libavcodec/g729_parser.c
index 010f688104..029d2c035c 100644
--- a/libavcodec/g729_parser.c
+++ b/libavcodec/g729_parser.c
@@ -25,7 +25,6 @@
  * Splits packets into individual blocks.
  */
 
-#include "libavutil/avassert.h"
 #include "parser.h"
 #include "g729.h"
 
diff --git a/libavcodec/gif_parser.c b/libavcodec/gif_parser.c
index e88338fd47..84d999e661 100644
--- a/libavcodec/gif_parser.c
+++ b/libavcodec/gif_parser.c
@@ -24,7 +24,6 @@
  * GIF parser
  */
 
-#include "libavutil/avassert.h"
 #include "libavutil/bswap.h"
 #include "libavutil/common.h"
 
diff --git a/libavcodec/jpeg2000dwt.c b/libavcodec/jpeg2000dwt.c
index f418454ee9..f9a0977407 100644
--- a/libavcodec/jpeg2000dwt.c
+++ b/libavcodec/jpeg2000dwt.c
@@ -25,7 +25,6 @@
  * Discrete wavelet transform
  */
 
-#include "libavutil/avassert.h"
 #include "libavutil/common.h"
 #include "libavutil/mem.h"
 #include "jpeg2000dwt.h"
diff --git a/libavcodec/libopenjpegenc.c b/libavcodec/libopenjpegenc.c
index e4641235f5..f9d7b44c61 100644
--- a/libavcodec/libopenjpegenc.c
+++ b/libavcodec/libopenjpegenc.c
@@ -24,7 +24,6 @@
  * JPEG 2000 encoder using libopenjpeg
  */
 
-#include "libavutil/avassert.h"
 #include "libavutil/common.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/intreadwrite.h"
diff --git a/libavcodec/libuavs3d.c b/libavcodec/libuavs3d.c
index d77cc2192d..1b9936120e 100644
--- a/libavcodec/libuavs3d.c
+++ b/libavcodec/libuavs3d.c
@@ -21,7 +21,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavutil/avassert.h"
 #include "libavutil/avutil.h"
 #include "libavutil/common.h"
 #include "libavutil/imgutils.h"
diff --git a/libavcodec/movtextenc.c b/libavcodec/movtextenc.c
index 1bef21e0b9..987e6fd7c6 100644
--- a/libavcodec/movtextenc.c
+++ b/libavcodec/movtextenc.c
@@ -22,7 +22,6 @@
 #include <stdarg.h>
 #include "avcodec.h"
 #include "libavutil/opt.h"
-#include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/mem.h"
diff --git a/libavcodec/photocd.c b/libavcodec/photocd.c
index 408ddeaac8..a8f4a44e10 100644
--- a/libavcodec/photocd.c
+++ b/libavcodec/photocd.c
@@ -31,7 +31,6 @@
 
 #define CACHED_BITSTREAM_READER !ARCH_X86_32
 
-#include "libavutil/avassert.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/opt.h"
 #include "avcodec.h"
diff --git a/libavcodec/rasc.c b/libavcodec/rasc.c
index 706940bf5f..9ddfe32aff 100644
--- a/libavcodec/rasc.c
+++ b/libavcodec/rasc.c
@@ -24,7 +24,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "libavutil/avassert.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/opt.h"
 
diff --git a/libavcodec/sgidec.c b/libavcodec/sgidec.c
index e954140258..479efa4b44 100644
--- a/libavcodec/sgidec.c
+++ b/libavcodec/sgidec.c
@@ -20,7 +20,6 @@
  */
 
 #include "libavutil/imgutils.h"
-#include "libavutil/avassert.h"
 #include "avcodec.h"
 #include "bytestream.h"
 #include "internal.h"
diff --git a/libavdevice/v4l2-common.h b/libavdevice/v4l2-common.h
index 0cbaec8bb9..c7bed3e3b4 100644
--- a/libavdevice/v4l2-common.h
+++ b/libavdevice/v4l2-common.h
@@ -35,7 +35,6 @@
 #endif
 #include <linux/videodev2.h>
 #endif
-#include "libavutil/avassert.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/log.h"
 #include "libavutil/opt.h"
diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
index 365bacd771..e205069e73 100644
--- a/libavdevice/v4l2.c
+++ b/libavdevice/v4l2.c
@@ -32,6 +32,7 @@
 
 #include <stdatomic.h>
 
+#include "libavutil/avassert.h"
 #include "v4l2-common.h"
 #include <dirent.h>
 
diff --git a/libavfilter/aeval.c b/libavfilter/aeval.c
index d5437431ab..787b327fa9 100644
--- a/libavfilter/aeval.c
+++ b/libavfilter/aeval.c
@@ -23,7 +23,6 @@
  * eval audio source
  */
 
-#include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
 #include "libavutil/channel_layout.h"
 #include "libavutil/eval.h"
diff --git a/libavfilter/af_agate.c b/libavfilter/af_agate.c
index 5fcf6eceb1..e7f7832f03 100644
--- a/libavfilter/af_agate.c
+++ b/libavfilter/af_agate.c
@@ -24,7 +24,6 @@
  */
 
 #include "libavutil/audio_fifo.h"
-#include "libavutil/avassert.h"
 #include "libavutil/channel_layout.h"
 #include "libavutil/opt.h"
 #include "avfilter.h"
diff --git a/libavfilter/af_aiir.c b/libavfilter/af_aiir.c
index f2e9d8e4e2..cea8e2b9cc 100644
--- a/libavfilter/af_aiir.c
+++ b/libavfilter/af_aiir.c
@@ -20,7 +20,6 @@
 
 #include <float.h>
 
-#include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/opt.h"
diff --git a/libavfilter/af_alimiter.c b/libavfilter/af_alimiter.c
index c41e95576f..54067b4fb0 100644
--- a/libavfilter/af_alimiter.c
+++ b/libavfilter/af_alimiter.c
@@ -24,7 +24,6 @@
  * Lookahead limiter filter
  */
 
-#include "libavutil/avassert.h"
 #include "libavutil/channel_layout.h"
 #include "libavutil/common.h"
 #include "libavutil/opt.h"
diff --git a/libavfilter/af_amultiply.c b/libavfilter/af_amultiply.c
index cc032846fa..91d9f9d2f5 100644
--- a/libavfilter/af_amultiply.c
+++ b/libavfilter/af_amultiply.c
@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavutil/avassert.h"
 #include "libavutil/channel_layout.h"
 #include "libavutil/common.h"
 #include "libavutil/float_dsp.h"
diff --git a/libavfilter/af_anlms.c b/libavfilter/af_anlms.c
index 55e6946b68..fc0f58ab8b 100644
--- a/libavfilter/af_anlms.c
+++ b/libavfilter/af_anlms.c
@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavutil/avassert.h"
 #include "libavutil/channel_layout.h"
 #include "libavutil/common.h"
 #include "libavutil/float_dsp.h"
diff --git a/libavfilter/af_asetnsamples.c b/libavfilter/af_asetnsamples.c
index bbc391a4ff..6dcc4930ce 100644
--- a/libavfilter/af_asetnsamples.c
+++ b/libavfilter/af_asetnsamples.c
@@ -24,7 +24,6 @@
  * Filter that changes number of samples on single output operation
  */
 
-#include "libavutil/avassert.h"
 #include "libavutil/channel_layout.h"
 #include "libavutil/opt.h"
 #include "avfilter.h"
diff --git a/libavfilter/af_asr.c b/libavfilter/af_asr.c
index 0c08df1356..56b240534c 100644
--- a/libavfilter/af_asr.c
+++ b/libavfilter/af_asr.c
@@ -20,7 +20,6 @@
 
 #include <pocketsphinx/pocketsphinx.h>
 
-#include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
 #include "libavutil/channel_layout.h"
 #include "libavutil/opt.h"
diff --git a/libavfilter/af_axcorrelate.c b/libavfilter/af_axcorrelate.c
index 6e9a028716..cbabaabb7e 100644
--- a/libavfilter/af_axcorrelate.c
+++ b/libavfilter/af_axcorrelate.c
@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavutil/avassert.h"
 #include "libavutil/audio_fifo.h"
 #include "libavutil/channel_layout.h"
 #include "libavutil/common.h"
diff --git a/libavfilter/af_join.c b/libavfilter/af_join.c
index 8f5df267de..2ce0eb0727 100644
--- a/libavfilter/af_join.c
+++ b/libavfilter/af_join.c
@@ -24,7 +24,6 @@
  * a single output
  */
 
-#include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
 #include "libavutil/channel_layout.h"
 #include "libavutil/common.h"
diff --git a/libavfilter/af_lv2.c b/libavfilter/af_lv2.c
index 3dabe566f5..fdb5c1bba3 100644
--- a/libavfilter/af_lv2.c
+++ b/libavfilter/af_lv2.c
@@ -28,7 +28,6 @@
 #include <lv2/lv2plug.in/ns/ext/atom/atom.h>
 #include <lv2/lv2plug.in/ns/ext/buf-size/buf-size.h>
 
-#include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
 #include "libavutil/channel_layout.h"
 #include "libavutil/opt.h"
diff --git a/libavfilter/af_mcompand.c b/libavfilter/af_mcompand.c
index ce4f366ad7..7cd0d22983 100644
--- a/libavfilter/af_mcompand.c
+++ b/libavfilter/af_mcompand.c
@@ -28,7 +28,6 @@
  * audio multiband compand filter
  */
 
-#include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
 #include "libavutil/ffmath.h"
 #include "libavutil/opt.h"
diff --git a/libavfilter/af_sidechaincompress.c b/libavfilter/af_sidechaincompress.c
index 80d1d8a10b..fe675fe1b1 100644
--- a/libavfilter/af_sidechaincompress.c
+++ b/libavfilter/af_sidechaincompress.c
@@ -25,7 +25,6 @@
  */
 
 #include "libavutil/audio_fifo.h"
-#include "libavutil/avassert.h"
 #include "libavutil/channel_layout.h"
 #include "libavutil/common.h"
 #include "libavutil/opt.h"
diff --git a/libavfilter/avf_abitscope.c b/libavfilter/avf_abitscope.c
index 5011943888..893d3dc153 100644
--- a/libavfilter/avf_abitscope.c
+++ b/libavfilter/avf_abitscope.c
@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/opt.h"
diff --git a/libavfilter/avf_aphasemeter.c b/libavfilter/avf_aphasemeter.c
index 61da9a90b6..3bcba67b86 100644
--- a/libavfilter/avf_aphasemeter.c
+++ b/libavfilter/avf_aphasemeter.c
@@ -23,7 +23,6 @@
  * audio to video multimedia aphasemeter filter
  */
 
-#include "libavutil/avassert.h"
 #include "libavutil/channel_layout.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/opt.h"
diff --git a/libavfilter/avf_concat.c b/libavfilter/avf_concat.c
index df6414704d..79947a2652 100644
--- a/libavfilter/avf_concat.c
+++ b/libavfilter/avf_concat.c
@@ -23,7 +23,6 @@
  * concat audio-video filter
  */
 
-#include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
 #include "libavutil/channel_layout.h"
 #include "libavutil/opt.h"
diff --git a/libavfilter/avf_showcqt.c b/libavfilter/avf_showcqt.c
index 115174a9b4..4ecff379f8 100644
--- a/libavfilter/avf_showcqt.c
+++ b/libavfilter/avf_showcqt.c
@@ -20,7 +20,6 @@
 
 #include "config.h"
 #include "libavcodec/avfft.h"
-#include "libavutil/avassert.h"
 #include "libavutil/opt.h"
 #include "libavutil/xga_font_data.h"
 #include "libavutil/eval.h"
diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c
index bf30f54177..36af133413 100644
--- a/libavfilter/buffersrc.c
+++ b/libavfilter/buffersrc.c
@@ -25,7 +25,6 @@
 
 #include <float.h>
 
-#include "libavutil/avassert.h"
 #include "libavutil/channel_layout.h"
 #include "libavutil/common.h"
 #include "libavutil/frame.h"
diff --git a/libavfilter/dnn/dnn_backend_native_layer_depth2space.c b/libavfilter/dnn/dnn_backend_native_layer_depth2space.c
index 2fde6d1ba4..30ced43cd5 100644
--- a/libavfilter/dnn/dnn_backend_native_layer_depth2space.c
+++ b/libavfilter/dnn/dnn_backend_native_layer_depth2space.c
@@ -24,7 +24,6 @@
  */
 
 #include "dnn_backend_native.h"
-#include "libavutil/avassert.h"
 #include "dnn_backend_native_layer_depth2space.h"
 
 int ff_dnn_load_layer_depth2space(Layer *layer, AVIOContext *model_file_context, int file_size, int operands_num)
diff --git a/libavfilter/dnn/dnn_backend_native_layer_mathbinary.c b/libavfilter/dnn/dnn_backend_native_layer_mathbinary.c
index c116188bab..02016e79f0 100644
--- a/libavfilter/dnn/dnn_backend_native_layer_mathbinary.c
+++ b/libavfilter/dnn/dnn_backend_native_layer_mathbinary.c
@@ -24,7 +24,6 @@
  */
 
 #include "dnn_backend_native.h"
-#include "libavutil/avassert.h"
 #include "dnn_backend_native_layer_mathbinary.h"
 
 typedef float (*FunType)(float src0, float src1);
diff --git a/libavfilter/dnn/dnn_backend_native_layer_mathunary.c b/libavfilter/dnn/dnn_backend_native_layer_mathunary.c
index 1bb05d02a7..b758df8160 100644
--- a/libavfilter/dnn/dnn_backend_native_layer_mathunary.c
+++ b/libavfilter/dnn/dnn_backend_native_layer_mathunary.c
@@ -26,7 +26,6 @@
 #include <math.h>
 
 #include "dnn_backend_native.h"
-#include "libavutil/avassert.h"
 #include "dnn_backend_native_layer_mathunary.h"
 
 int ff_dnn_load_layer_math_unary(Layer *layer, AVIOContext *model_file_context, int file_size, int operands_num)
diff --git a/libavfilter/dnn/dnn_backend_native_layer_maximum.c b/libavfilter/dnn/dnn_backend_native_layer_maximum.c
index 65af553765..a38759eeee 100644
--- a/libavfilter/dnn/dnn_backend_native_layer_maximum.c
+++ b/libavfilter/dnn/dnn_backend_native_layer_maximum.c
@@ -24,7 +24,6 @@
  */
 
 #include "dnn_backend_native.h"
-#include "libavutil/avassert.h"
 #include "dnn_backend_native_layer_maximum.h"
 
 int ff_dnn_load_layer_maximum(Layer *layer, AVIOContext *model_file_context, int file_size, int operands_num)
diff --git a/libavfilter/dnn/queue.c b/libavfilter/dnn/queue.c
index 954437a8b4..1f84c2dec7 100644
--- a/libavfilter/dnn/queue.c
+++ b/libavfilter/dnn/queue.c
@@ -21,7 +21,6 @@
 #include <stdio.h>
 #include "queue.h"
 #include "libavutil/mem.h"
-#include "libavutil/avassert.h"
 
 typedef struct QueueEntry QueueEntry;
 
diff --git a/libavfilter/drawutils.c b/libavfilter/drawutils.c
index 33f0fecb32..6987b57252 100644
--- a/libavfilter/drawutils.c
+++ b/libavfilter/drawutils.c
@@ -21,7 +21,6 @@
 
 #include <string.h>
 
-#include "libavutil/avassert.h"
 #include "libavutil/avutil.h"
 #include "libavutil/colorspace.h"
 #include "libavutil/intreadwrite.h"
diff --git a/libavfilter/f_loop.c b/libavfilter/f_loop.c
index 0a029f0104..cf95d4d203 100644
--- a/libavfilter/f_loop.c
+++ b/libavfilter/f_loop.c
@@ -19,7 +19,6 @@
  */
 
 #include "libavutil/audio_fifo.h"
-#include "libavutil/avassert.h"
 #include "libavutil/fifo.h"
 #include "libavutil/internal.h"
 #include "libavutil/opt.h"
diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c
index 5892500410..63e5fd5a25 100644
--- a/libavfilter/src_movie.c
+++ b/libavfilter/src_movie.c
@@ -32,7 +32,6 @@
 
 #include "libavutil/attributes.h"
 #include "libavutil/avstring.h"
-#include "libavutil/avassert.h"
 #include "libavutil/opt.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/internal.h"
diff --git a/libavfilter/trim.c b/libavfilter/trim.c
index 889fe96b9b..0fbf3f129d 100644
--- a/libavfilter/trim.c
+++ b/libavfilter/trim.c
@@ -20,7 +20,6 @@
 
 #include "config.h"
 
-#include "libavutil/avassert.h"
 #include "libavutil/channel_layout.h"
 #include "libavutil/common.h"
 #include "libavutil/log.h"
diff --git a/libavfilter/vf_bm3d.c b/libavfilter/vf_bm3d.c
index 18d13b25ff..6f01ef08b6 100644
--- a/libavfilter/vf_bm3d.c
+++ b/libavfilter/vf_bm3d.c
@@ -32,7 +32,6 @@
 
 #include <float.h>
 
-#include "libavutil/avassert.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/opt.h"
 #include "libavutil/pixdesc.h"
diff --git a/libavfilter/vf_bwdif.c b/libavfilter/vf_bwdif.c
index b6aed7a450..c40b1ebb7e 100644
--- a/libavfilter/vf_bwdif.c
+++ b/libavfilter/vf_bwdif.c
@@ -28,7 +28,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavutil/avassert.h"
 #include "libavutil/common.h"
 #include "libavutil/opt.h"
 #include "libavutil/pixdesc.h"
diff --git a/libavfilter/vf_cover_rect.c b/libavfilter/vf_cover_rect.c
index 898debf09d..da192c42d7 100644
--- a/libavfilter/vf_cover_rect.c
+++ b/libavfilter/vf_cover_rect.c
@@ -22,7 +22,6 @@
  * @todo switch to dualinput
  */
 
-#include "libavutil/avassert.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/opt.h"
 #include "internal.h"
diff --git a/libavfilter/vf_datascope.c b/libavfilter/vf_datascope.c
index a561cc5051..607bbd8cbb 100644
--- a/libavfilter/vf_datascope.c
+++ b/libavfilter/vf_datascope.c
@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavutil/avassert.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/opt.h"
 #include "libavutil/parseutils.h"
diff --git a/libavfilter/vf_deinterlace_vaapi.c b/libavfilter/vf_deinterlace_vaapi.c
index e5e7faaea8..647d7d6507 100644
--- a/libavfilter/vf_deinterlace_vaapi.c
+++ b/libavfilter/vf_deinterlace_vaapi.c
@@ -18,7 +18,6 @@
 
 #include <string.h>
 
-#include "libavutil/avassert.h"
 #include "libavutil/common.h"
 #include "libavutil/opt.h"
 #include "libavutil/pixdesc.h"
diff --git a/libavfilter/vf_epx.c b/libavfilter/vf_epx.c
index 65b8975c23..70633a9653 100644
--- a/libavfilter/vf_epx.c
+++ b/libavfilter/vf_epx.c
@@ -17,7 +17,6 @@
  */
 
 #include "libavutil/opt.h"
-#include "libavutil/avassert.h"
 #include "libavutil/pixdesc.h"
 #include "internal.h"
 
diff --git a/libavfilter/vf_fftdnoiz.c b/libavfilter/vf_fftdnoiz.c
index 856d716be5..fbdb27713c 100644
--- a/libavfilter/vf_fftdnoiz.c
+++ b/libavfilter/vf_fftdnoiz.c
@@ -18,7 +18,6 @@
 
 #include <float.h>
 
-#include "libavutil/avassert.h"
 #include "libavutil/common.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/opt.h"
diff --git a/libavfilter/vf_freezedetect.c b/libavfilter/vf_freezedetect.c
index cc086afee6..e42ba197da 100644
--- a/libavfilter/vf_freezedetect.c
+++ b/libavfilter/vf_freezedetect.c
@@ -21,7 +21,6 @@
  * video freeze detection filter
  */
 
-#include "libavutil/avassert.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/opt.h"
 #include "libavutil/pixdesc.h"
diff --git a/libavfilter/vf_freezeframes.c b/libavfilter/vf_freezeframes.c
index b6cd5dba68..f66255fd75 100644
--- a/libavfilter/vf_freezeframes.c
+++ b/libavfilter/vf_freezeframes.c
@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
 #include "libavutil/common.h"
 #include "libavutil/internal.h"
diff --git a/libavfilter/vf_fspp.c b/libavfilter/vf_fspp.c
index d70952a142..ac3e3583c3 100644
--- a/libavfilter/vf_fspp.c
+++ b/libavfilter/vf_fspp.c
@@ -35,7 +35,6 @@
  * project, and ported by Arwa Arif for FFmpeg.
  */
 
-#include "libavutil/avassert.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/mem_internal.h"
 #include "libavutil/opt.h"
diff --git a/libavfilter/vf_histogram.c b/libavfilter/vf_histogram.c
index ed6892bc8b..10ed8f2177 100644
--- a/libavfilter/vf_histogram.c
+++ b/libavfilter/vf_histogram.c
@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavutil/avassert.h"
 #include "libavutil/colorspace.h"
 #include "libavutil/opt.h"
 #include "libavutil/parseutils.h"
diff --git a/libavfilter/vf_lensfun.c b/libavfilter/vf_lensfun.c
index 089121ed08..a6f0af55c2 100644
--- a/libavfilter/vf_lensfun.c
+++ b/libavfilter/vf_lensfun.c
@@ -28,7 +28,6 @@
 #include <float.h>
 #include <math.h>
 
-#include "libavutil/avassert.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/opt.h"
 #include "libswscale/swscale.h"
diff --git a/libavfilter/vf_median.c b/libavfilter/vf_median.c
index 0189fabd07..7a036ec066 100644
--- a/libavfilter/vf_median.c
+++ b/libavfilter/vf_median.c
@@ -20,7 +20,6 @@
  * are permitted provided that the following conditions are met:
  */
 
-#include "libavutil/avassert.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/opt.h"
 #include "libavutil/pixdesc.h"
diff --git a/libavfilter/vf_mestimate.c b/libavfilter/vf_mestimate.c
index 7ecfe7da60..7c866a0b20 100644
--- a/libavfilter/vf_mestimate.c
+++ b/libavfilter/vf_mestimate.c
@@ -20,7 +20,6 @@
 
 #include "motion_estimation.h"
 #include "libavcodec/mathops.h"
-#include "libavutil/avassert.h"
 #include "libavutil/common.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/opt.h"
diff --git a/libavfilter/vf_minterpolate.c b/libavfilter/vf_minterpolate.c
index 969463f021..475c933f34 100644
--- a/libavfilter/vf_minterpolate.c
+++ b/libavfilter/vf_minterpolate.c
@@ -21,7 +21,6 @@
 
 #include "motion_estimation.h"
 #include "libavcodec/mathops.h"
-#include "libavutil/avassert.h"
 #include "libavutil/common.h"
 #include "libavutil/motion_vector.h"
 #include "libavutil/opt.h"
diff --git a/libavfilter/vf_misc_vaapi.c b/libavfilter/vf_misc_vaapi.c
index e84c6ef2ca..7c1a93ad25 100644
--- a/libavfilter/vf_misc_vaapi.c
+++ b/libavfilter/vf_misc_vaapi.c
@@ -17,7 +17,6 @@
  */
 #include <string.h>
 
-#include "libavutil/avassert.h"
 #include "libavutil/opt.h"
 #include "libavutil/pixdesc.h"
 
diff --git a/libavfilter/vf_nnedi.c b/libavfilter/vf_nnedi.c
index 4229150668..d1a9a9c728 100644
--- a/libavfilter/vf_nnedi.c
+++ b/libavfilter/vf_nnedi.c
@@ -21,7 +21,6 @@
 
 #include <float.h>
 
-#include "libavutil/avassert.h"
 #include "libavutil/common.h"
 #include "libavutil/float_dsp.h"
 #include "libavutil/imgutils.h"
diff --git a/libavfilter/vf_overlay_qsv.c b/libavfilter/vf_overlay_qsv.c
index dd6c30f2a2..070f7acfa9 100644
--- a/libavfilter/vf_overlay_qsv.c
+++ b/libavfilter/vf_overlay_qsv.c
@@ -27,7 +27,6 @@
 #include "libavutil/eval.h"
 #include "libavutil/hwcontext.h"
 #include "libavutil/avstring.h"
-#include "libavutil/avassert.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/mathematics.h"
 
diff --git a/libavfilter/vf_pp7.c b/libavfilter/vf_pp7.c
index ade7feb0b2..e0fcb71cde 100644
--- a/libavfilter/vf_pp7.c
+++ b/libavfilter/vf_pp7.c
@@ -27,7 +27,6 @@
  * project, and ported by Arwa Arif for FFmpeg.
  */
 
-#include "libavutil/avassert.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/mem_internal.h"
 #include "libavutil/opt.h"
diff --git a/libavfilter/vf_procamp_vaapi.c b/libavfilter/vf_procamp_vaapi.c
index 240ab09e20..fb9dbd80ba 100644
--- a/libavfilter/vf_procamp_vaapi.c
+++ b/libavfilter/vf_procamp_vaapi.c
@@ -17,7 +17,6 @@
  */
 #include <string.h>
 
-#include "libavutil/avassert.h"
 #include "libavutil/opt.h"
 #include "libavutil/pixdesc.h"
 
diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c
index 58eee96744..d26322611c 100644
--- a/libavfilter/vf_scale.c
+++ b/libavfilter/vf_scale.c
@@ -39,7 +39,6 @@
 #include "libavutil/parseutils.h"
 #include "libavutil/pixdesc.h"
 #include "libavutil/imgutils.h"
-#include "libavutil/avassert.h"
 #include "libswscale/swscale.h"
 
 static const char *const var_names[] = {
diff --git a/libavfilter/vf_scale_vaapi.c b/libavfilter/vf_scale_vaapi.c
index 01983d5996..0ce8beeb46 100644
--- a/libavfilter/vf_scale_vaapi.c
+++ b/libavfilter/vf_scale_vaapi.c
@@ -18,7 +18,6 @@
 
 #include <string.h>
 
-#include "libavutil/avassert.h"
 #include "libavutil/opt.h"
 #include "libavutil/pixdesc.h"
 
diff --git a/libavfilter/vf_scdet.c b/libavfilter/vf_scdet.c
index b91d91f1e1..d407726415 100644
--- a/libavfilter/vf_scdet.c
+++ b/libavfilter/vf_scdet.c
@@ -21,7 +21,6 @@
  * video scene change detection filter
  */
 
-#include "libavutil/avassert.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/opt.h"
 #include "libavutil/pixdesc.h"
diff --git a/libavfilter/vf_showpalette.c b/libavfilter/vf_showpalette.c
index c0327acf5c..0ee03e2aa9 100644
--- a/libavfilter/vf_showpalette.c
+++ b/libavfilter/vf_showpalette.c
@@ -21,7 +21,6 @@
  * Display frame palette (AV_PIX_FMT_PAL8)
  */
 
-#include "libavutil/avassert.h"
 #include "libavutil/opt.h"
 #include "avfilter.h"
 #include "formats.h"
diff --git a/libavfilter/vf_shuffleframes.c b/libavfilter/vf_shuffleframes.c
index 1f780c7d49..94fa557d78 100644
--- a/libavfilter/vf_shuffleframes.c
+++ b/libavfilter/vf_shuffleframes.c
@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
 #include "libavutil/common.h"
 #include "libavutil/internal.h"
diff --git a/libavfilter/vf_spp.c b/libavfilter/vf_spp.c
index 6ea7e7458f..5f724399c2 100644
--- a/libavfilter/vf_spp.c
+++ b/libavfilter/vf_spp.c
@@ -31,7 +31,6 @@
  * ported by Clément Bœsch for FFmpeg.
  */
 
-#include "libavutil/avassert.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/mem_internal.h"
 #include "libavutil/opt.h"
diff --git a/libavfilter/vf_tonemap_vaapi.c b/libavfilter/vf_tonemap_vaapi.c
index 0e22b859b8..76af42feca 100644
--- a/libavfilter/vf_tonemap_vaapi.c
+++ b/libavfilter/vf_tonemap_vaapi.c
@@ -17,7 +17,6 @@
  */
 #include <string.h>
 
-#include "libavutil/avassert.h"
 #include "libavutil/opt.h"
 #include "libavutil/pixdesc.h"
 #include "libavutil/mastering_display_metadata.h"
diff --git a/libavfilter/vf_tpad.c b/libavfilter/vf_tpad.c
index 0cd65d3e7b..cb7fcb2ea2 100644
--- a/libavfilter/vf_tpad.c
+++ b/libavfilter/vf_tpad.c
@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavutil/avassert.h"
 #include "libavutil/channel_layout.h"
 #include "libavutil/opt.h"
 #include "avfilter.h"
diff --git a/libavfilter/vf_transpose_opencl.c b/libavfilter/vf_transpose_opencl.c
index ecf4b48bec..bd7511a637 100644
--- a/libavfilter/vf_transpose_opencl.c
+++ b/libavfilter/vf_transpose_opencl.c
@@ -17,7 +17,6 @@
  */
 #include <float.h>
 
-#include "libavutil/avassert.h"
 #include "libavutil/common.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/opt.h"
diff --git a/libavfilter/vf_transpose_vaapi.c b/libavfilter/vf_transpose_vaapi.c
index 6d2bb3a341..e272815bd5 100644
--- a/libavfilter/vf_transpose_vaapi.c
+++ b/libavfilter/vf_transpose_vaapi.c
@@ -17,7 +17,6 @@
  */
 #include <string.h>
 
-#include "libavutil/avassert.h"
 #include "libavutil/opt.h"
 #include "libavutil/pixdesc.h"
 
diff --git a/libavfilter/vf_vignette.c b/libavfilter/vf_vignette.c
index ecb04a9643..5f99e88f6f 100644
--- a/libavfilter/vf_vignette.c
+++ b/libavfilter/vf_vignette.c
@@ -22,7 +22,6 @@
 
 #include "libavutil/opt.h"
 #include "libavutil/eval.h"
-#include "libavutil/avassert.h"
 #include "libavutil/pixdesc.h"
 #include "avfilter.h"
 #include "formats.h"
diff --git a/libavfilter/vf_vpp_qsv.c b/libavfilter/vf_vpp_qsv.c
index 5d57707455..b5e1cbe47f 100644
--- a/libavfilter/vf_vpp_qsv.c
+++ b/libavfilter/vf_vpp_qsv.c
@@ -25,7 +25,6 @@
 
 #include "libavutil/opt.h"
 #include "libavutil/eval.h"
-#include "libavutil/avassert.h"
 #include "libavutil/pixdesc.h"
 #include "libavutil/mathematics.h"
 
diff --git a/libavfilter/vf_waveform.c b/libavfilter/vf_waveform.c
index 8191da2792..4f2272c675 100644
--- a/libavfilter/vf_waveform.c
+++ b/libavfilter/vf_waveform.c
@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavutil/avassert.h"
 #include "libavutil/opt.h"
 #include "libavutil/parseutils.h"
 #include "libavutil/pixdesc.h"
diff --git a/libavfilter/vf_xbr.c b/libavfilter/vf_xbr.c
index a381be4553..ce67b51fcd 100644
--- a/libavfilter/vf_xbr.c
+++ b/libavfilter/vf_xbr.c
@@ -29,7 +29,6 @@
  */
 
 #include "libavutil/opt.h"
-#include "libavutil/avassert.h"
 #include "libavutil/pixdesc.h"
 #include "internal.h"
 
diff --git a/libavfilter/vf_yadif.c b/libavfilter/vf_yadif.c
index 43dea67add..13dd7b7851 100644
--- a/libavfilter/vf_yadif.c
+++ b/libavfilter/vf_yadif.c
@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavutil/avassert.h"
 #include "libavutil/cpu.h"
 #include "libavutil/common.h"
 #include "libavutil/pixdesc.h"
diff --git a/libavfilter/vf_zoompan.c b/libavfilter/vf_zoompan.c
index d9d53decf4..65fa01c22b 100644
--- a/libavfilter/vf_zoompan.c
+++ b/libavfilter/vf_zoompan.c
@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavutil/avassert.h"
 #include "libavutil/eval.h"
 #include "libavutil/opt.h"
 #include "libavutil/pixdesc.h"
diff --git a/libavfilter/vf_zscale.c b/libavfilter/vf_zscale.c
index 8059061827..5d5349b33a 100644
--- a/libavfilter/vf_zscale.c
+++ b/libavfilter/vf_zscale.c
@@ -42,7 +42,6 @@
 #include "libavutil/parseutils.h"
 #include "libavutil/pixdesc.h"
 #include "libavutil/imgutils.h"
-#include "libavutil/avassert.h"
 
 #define ZIMG_ALIGNMENT 32
 
diff --git a/libavfilter/video.c b/libavfilter/video.c
index ee1d440bb2..0771268c40 100644
--- a/libavfilter/video.c
+++ b/libavfilter/video.c
@@ -23,7 +23,6 @@
 #include <string.h>
 #include <stdio.h>
 
-#include "libavutil/avassert.h"
 #include "libavutil/buffer.h"
 #include "libavutil/hwcontext.h"
 #include "libavutil/imgutils.h"
diff --git a/libavformat/aaxdec.c b/libavformat/aaxdec.c
index 45648532d6..06a8e62e74 100644
--- a/libavformat/aaxdec.c
+++ b/libavformat/aaxdec.c
@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavutil/avassert.h"
 #include "libavutil/intreadwrite.h"
 #include "avformat.h"
 #include "avio_internal.h"
diff --git a/libavformat/apm.c b/libavformat/apm.c
index 38a0f6382a..02e8783565 100644
--- a/libavformat/apm.c
+++ b/libavformat/apm.c
@@ -22,7 +22,6 @@
 #include "avformat.h"
 #include "internal.h"
 #include "rawenc.h"
-#include "libavutil/avassert.h"
 #include "libavutil/internal.h"
 #include "libavutil/intreadwrite.h"
 
diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c
index 6d5b9914f9..b29c1fd390 100644
--- a/libavformat/concatdec.c
+++ b/libavformat/concatdec.c
@@ -18,7 +18,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
 #include "libavutil/bprint.h"
 #include "libavutil/intreadwrite.h"
diff --git a/libavformat/dash.c b/libavformat/dash.c
index d2501f013a..d7ba8540d7 100644
--- a/libavformat/dash.c
+++ b/libavformat/dash.c
@@ -24,7 +24,6 @@
 #include <unistd.h>
 #endif
 
-#include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/mathematics.h"
diff --git a/libavformat/fifo_test.c b/libavformat/fifo_test.c
index 02ec215cbb..7c58a78e0e 100644
--- a/libavformat/fifo_test.c
+++ b/libavformat/fifo_test.c
@@ -23,7 +23,6 @@
 
 #include "libavutil/opt.h"
 #include "libavutil/time.h"
-#include "libavutil/avassert.h"
 
 #include "avformat.h"
 #include "url.h"
diff --git a/libavformat/gif.c b/libavformat/gif.c
index e125d386bd..2b9cca1ab1 100644
--- a/libavformat/gif.c
+++ b/libavformat/gif.c
@@ -23,7 +23,6 @@
 
 #include "avformat.h"
 #include "internal.h"
-#include "libavutil/avassert.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/log.h"
 #include "libavutil/opt.h"
diff --git a/libavformat/hashenc.c b/libavformat/hashenc.c
index 1e9faf372a..36914b20bd 100644
--- a/libavformat/hashenc.c
+++ b/libavformat/hashenc.c
@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
 #include "libavutil/hash.h"
 #include "libavutil/intreadwrite.h"
diff --git a/libavformat/img2enc.c b/libavformat/img2enc.c
index 84201d3beb..666b689ea5 100644
--- a/libavformat/img2enc.c
+++ b/libavformat/img2enc.c
@@ -21,7 +21,6 @@
  */
 
 #include "libavutil/intreadwrite.h"
-#include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
 #include "libavutil/dict.h"
 #include "libavutil/log.h"
diff --git a/libavformat/libsrt.c b/libavformat/libsrt.c
index f73e7dbfa5..d1fd7e0bd0 100644
--- a/libavformat/libsrt.c
+++ b/libavformat/libsrt.c
@@ -23,7 +23,6 @@
 
 #include <srt/srt.h>
 
-#include "libavutil/avassert.h"
 #include "libavutil/opt.h"
 #include "libavutil/parseutils.h"
 #include "libavutil/time.h"
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
index 93fa7a97c0..b88d8e8cc2 100644
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@ -47,7 +47,6 @@
 #include <inttypes.h>
 
 #include "libavutil/aes.h"
-#include "libavutil/avassert.h"
 #include "libavutil/mastering_display_metadata.h"
 #include "libavutil/mathematics.h"
 #include "libavcodec/bytestream.h"
diff --git a/libavformat/pp_bnk.c b/libavformat/pp_bnk.c
index 8364de1fd9..c32190f86f 100644
--- a/libavformat/pp_bnk.c
+++ b/libavformat/pp_bnk.c
@@ -22,7 +22,6 @@
 #include "avformat.h"
 #include "internal.h"
 #include "libavutil/intreadwrite.h"
-#include "libavutil/avassert.h"
 #include "libavutil/internal.h"
 
 #define PP_BNK_MAX_READ_SIZE    4096
diff --git a/libavformat/rawdec.c b/libavformat/rawdec.c
index 122afca1b6..ab4e73b7dd 100644
--- a/libavformat/rawdec.c
+++ b/libavformat/rawdec.c
@@ -27,7 +27,6 @@
 #include "libavutil/opt.h"
 #include "libavutil/parseutils.h"
 #include "libavutil/pixdesc.h"
-#include "libavutil/avassert.h"
 #include "libavutil/intreadwrite.h"
 
 #define RAW_PACKET_SIZE 1024
diff --git a/libavformat/rtpdec_asf.c b/libavformat/rtpdec_asf.c
index e58f0260f3..09d643184a 100644
--- a/libavformat/rtpdec_asf.c
+++ b/libavformat/rtpdec_asf.c
@@ -25,7 +25,6 @@
  * @author Ronald S. Bultje <rbultje@ronald.bitfreak.net>
  */
 
-#include "libavutil/avassert.h"
 #include "libavutil/base64.h"
 #include "libavutil/avstring.h"
 #include "libavutil/intreadwrite.h"
diff --git a/libavformat/sapdec.c b/libavformat/sapdec.c
index eec73aa2f4..8847dd6feb 100644
--- a/libavformat/sapdec.c
+++ b/libavformat/sapdec.c
@@ -20,7 +20,6 @@
  */
 
 #include "avformat.h"
-#include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
 #include "libavutil/intreadwrite.h"
 #include "network.h"
diff --git a/libavformat/subfile.c b/libavformat/subfile.c
index 300672e657..2936c79e06 100644
--- a/libavformat/subfile.c
+++ b/libavformat/subfile.c
@@ -18,7 +18,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
 #include "libavutil/opt.h"
 #include "avformat.h"
diff --git a/libavformat/subtitles.c b/libavformat/subtitles.c
index ad7f68938e..10ed1d436b 100644
--- a/libavformat/subtitles.c
+++ b/libavformat/subtitles.c
@@ -21,7 +21,6 @@
 #include "avformat.h"
 #include "subtitles.h"
 #include "avio_internal.h"
-#include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
 
 void ff_text_init_avio(void *s, FFTextReader *r, AVIOContext *pb)
diff --git a/libavformat/tests/fifo_muxer.c b/libavformat/tests/fifo_muxer.c
index 5127a8aadb..fd559afdf0 100644
--- a/libavformat/tests/fifo_muxer.c
+++ b/libavformat/tests/fifo_muxer.c
@@ -22,7 +22,6 @@
 #include <stdlib.h>
 #include "libavutil/opt.h"
 #include "libavutil/time.h"
-#include "libavutil/avassert.h"
 #include "libavformat/avformat.h"
 #include "libavformat/url.h"
 #include "libavformat/network.h"
diff --git a/libavutil/avsscanf.c b/libavutil/avsscanf.c
index a20cb15b01..a034407d14 100644
--- a/libavutil/avsscanf.c
+++ b/libavutil/avsscanf.c
@@ -29,7 +29,6 @@
 
 #include "config.h"
 #include "common.h"
-#include "avassert.h"
 #include "avstring.h"
 #include "bprint.h"
 
diff --git a/libavutil/bprint.c b/libavutil/bprint.c
index 2f059c5ba6..8e7cdd91fb 100644
--- a/libavutil/bprint.c
+++ b/libavutil/bprint.c
@@ -22,7 +22,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
-#include "avassert.h"
 #include "avstring.h"
 #include "bprint.h"
 #include "common.h"
diff --git a/libavutil/mem.c b/libavutil/mem.c
index cfb6d8ab8f..abe1bebb50 100644
--- a/libavutil/mem.c
+++ b/libavutil/mem.c
@@ -36,7 +36,6 @@
 #include <malloc.h>
 #endif
 
-#include "avassert.h"
 #include "avutil.h"
 #include "common.h"
 #include "dynarray.h"
diff --git a/libavutil/tests/bprint.c b/libavutil/tests/bprint.c
index 5a46f55d7a..d7f9abf23e 100644
--- a/libavutil/tests/bprint.c
+++ b/libavutil/tests/bprint.c
@@ -18,6 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/avassert.h"
 #include "libavutil/bprint.c"
 
 #undef printf
diff --git a/libavutil/tx_priv.h b/libavutil/tx_priv.h
index 7edaa8d8c6..c40f07fde0 100644
--- a/libavutil/tx_priv.h
+++ b/libavutil/tx_priv.h
@@ -23,7 +23,6 @@
 #include <stddef.h>
 #include "thread.h"
 #include "mem_internal.h"
-#include "avassert.h"
 #include "attributes.h"
 
 #ifdef TX_FLOAT
