Remove unnecessary avassert.h inclusions

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>

110 files changed, 2 insertions, 112 deletions

diff --git a/fftools/ffplay.c b/fftools/ffplay.c
index 833830bfc8..6b19574eae 100644
--- a/fftools/ffplay.c
+++ b/fftools/ffplay.c
@@ -40,7 +40,6 @@
 #include "libavutil/fifo.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"
@@ -61,8 +60,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 19e5c7cf03..4c066da5fc 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 968962102f..38e4acb4f0 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/cfhdencdsp.c b/libavcodec/cfhdencdsp.c
index b979e9e09a..5bd4d1ba0d 100644
--- a/libavcodec/cfhdencdsp.c
+++ b/libavcodec/cfhdencdsp.c
@@ -20,7 +20,6 @@
 
 #include "libavutil/attributes.h"
 #include "libavutil/common.h"
-#include "libavutil/avassert.h"
 
 #include "cfhdencdsp.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 7be97126ca..6d0b25f4c3 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 76d6f93808..8c06ce4ee6 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 a32bfa570a..4c18c00d7d 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 051d644c0d..7d29b34b04 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 1d523c8722..0b5c6268a4 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/cpu.h"
diff --git a/libavcodec/movtextenc.c b/libavcodec/movtextenc.c
index 383125b4ba..a6a1808592 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/nvenc.c b/libavcodec/nvenc.c
index ee046b9cef..b52b6bda6d 100644
--- a/libavcodec/nvenc.c
+++ b/libavcodec/nvenc.c
@@ -28,7 +28,6 @@
 #include "libavutil/hwcontext.h"
 #include "libavutil/cuda_check.h"
 #include "libavutil/imgutils.h"
-#include "libavutil/avassert.h"
 #include "libavutil/mem.h"
 #include "libavutil/pixdesc.h"
 #include "atsc_a53.h"
diff --git a/libavcodec/photocd.c b/libavcodec/photocd.c
index f95d5a8eb8..50b465c1cd 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 c1e9185192..7fedf73878 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/sga.c b/libavcodec/sga.c
index 5103d01f85..1bc6b0b140 100644
--- a/libavcodec/sga.c
+++ b/libavcodec/sga.c
@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavutil/avassert.h"
 #include "libavutil/common.h"
 #include "avcodec.h"
 #include "get_bits.h"
diff --git a/libavcodec/sgidec.c b/libavcodec/sgidec.c
index aa77a3b921..5fa3bf4a41 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 981b6207fb..1c0de118cc 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 ed7cf502de..007758bf57 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 a70af800c8..3c858021d1 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 a95f66d6bc..6ac39872ef 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 6ffb585f29..30f1a4cba5 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 1cf67ac186..b50bbfb6ce 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 9564441391..26df40107f 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 e05bb80e7a..9987eff8a2 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 ff9eff4e38..b34cdd38ee 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 abd722b83e..cec39dee76 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 eb60fe9b29..98b6389306 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 53a58a46ea..cc5d702e27 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 ab1c2bff53..08d93f8c6a 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 d20ab57990..71e27d4530 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 c38c73e0e5..481a218e6e 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 ea529d3fee..ef7e50e657 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 f5cd8c11a7..cb46f52a04 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 37589dd151..f1d8f16b32 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/channel_layout.h"
 #include "libavutil/opt.h"
 #include "libavutil/xga_font_data.h"
diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c
index 29c01285cd..4d0bb4f91d 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 1c33b4633d..81901c56d9 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 bd28ec67d1..b8694910d9 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 9bfb96211d..88218b913f 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 15f6076a67..a06e8172d3 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 92b092fac6..7d97295dd0 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/channel_layout.h"
 #include "libavutil/opt.h"
 #include "libavutil/imgutils.h"
diff --git a/libavfilter/trim.c b/libavfilter/trim.c
index 4f842eb7ff..261dacbc5c 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 326b258616..f719e79cb0 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 49b6e73f11..228067c8e5 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 26a0fb3a4d..337778224d 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 3af22771b2..63c93fd98d 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 b05d1f2393..fa71947098 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 731ba821a8..676513c302 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 8dc50b776f..78dde44e80 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 d5978ae3aa..9cf8fbab15 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 58ffd9dd33..e29eb07cec 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 d14c05cb5e..44d22fc1e4 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 0862b2ae2a..bd9408c42d 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 e9bb69187e..f34add961a 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 4d8037df25..1e66ab87ff 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 f1935244c1..f57f2578ec 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 77462dbd5d..c6aed7755f 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 8bfdcdfa07..ca0d46ff19 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 dd476aeb04..b802ca5433 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 7a4afd77d4..14c4c37a3c 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 c53a8716cb..a9a2fa3d19 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 efc2ab832d..5527556d09 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 71d7fa2890..f07e01bf90 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 f914fd2cd7..41ff93156d 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 3f7b7c5f25..ff8bf21a9c 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 588fd2faab..2455af687c 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 6424e4ee2c..cdc70f552e 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 d93c4a5606..cfa1cb77c4 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 9b3e2ad03b..d33c4f8f6d 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 2d89537abd..d23869f3e2 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 d354c3a4eb..2877d3c826 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 2abe8517e0..79413e0eeb 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 e5842b19da..91754306ae 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 74d1d51e7c..11ee490935 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 2fa1815d6c..977ebad9ce 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 7226c03783..1300693bac 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 9cfd2437ac..17269d6b96 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/common.h"
 #include "libavutil/pixdesc.h"
 #include "libavutil/imgutils.h"
diff --git a/libavfilter/vf_zoompan.c b/libavfilter/vf_zoompan.c
index e18ebb4f11..9115c23dc4 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 f77aa720c4..d21de8d9db 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 643bc5f9a5..ea0f2af1c9 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 "internal.h"
diff --git a/libavformat/apm.c b/libavformat/apm.c
index a377fc4da7..1ced771745 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/channel_layout.h"
 #include "libavutil/internal.h"
 #include "libavutil/intreadwrite.h"
diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c
index 2e1b5115d3..74354fce25 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 62670d6d5d..80c0c84612 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 e4f2249083..cba87d3eae 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 4d5cf2ee7d..a3b4a2e11e 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 7b5133d300..655595374d 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/imx.c b/libavformat/imx.c
index 6d3a5ad8d7..e8ca79d057 100644
--- a/libavformat/imx.c
+++ b/libavformat/imx.c
@@ -23,7 +23,6 @@
 #include "avformat.h"
 #include "internal.h"
 #include "libavutil/intreadwrite.h"
-#include "libavutil/avassert.h"
 #include "libavutil/channel_layout.h"
 #include "libavutil/internal.h"
 
diff --git a/libavformat/libsrt.c b/libavformat/libsrt.c
index 8dee6aa3f3..e5701625b8 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 f813408b3d..52fbbc6e35 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/rawdec.c b/libavformat/rawdec.c
index cf5da8c21e..06406424c8 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 f6e7f00bbe..3802a57407 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 05a6d59086..a852b0782b 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 82aaa358c0..f80a439bcc 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 227c3d0210..11a557c1a0 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/libavformat/westwood_audenc.c b/libavformat/westwood_audenc.c
index b4fad83a17..597d68350f 100644
--- a/libavformat/westwood_audenc.c
+++ b/libavformat/westwood_audenc.c
@@ -28,8 +28,6 @@
  * @see http://xhp.xwis.net/documents/aud3.txt
  */
 
-#include "libavutil/avassert.h"
-
 #include "avformat.h"
 #include "avio_internal.h"
 #include "internal.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 e12fb263fe..a6849d7178 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 063635fb22..0969749077 100644
--- a/libavutil/mem.c
+++ b/libavutil/mem.c
@@ -37,7 +37,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 ab44a1843c..63dc6bbe6d 100644
--- a/libavutil/tx_priv.h
+++ b/libavutil/tx_priv.h
@@ -22,7 +22,6 @@
 #include "tx.h"
 #include "thread.h"
 #include "mem_internal.h"
-#include "avassert.h"
 #include "attributes.h"
 
 #ifdef TX_FLOAT