Remove unnecessary libavutil/(avutil|common|internal).h inclusions

Some of these were made possible by moving several common macros to
libavutil/macros.h.

While just at it, also improve the other headers a bit.

Reviewed-by: Martin Storsjö <martin@martin.st>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>

libavcodec/ac3.c

@@ -24,7 +24,8 @@
  * Common code between the AC-3 encoder and decoder.
  */
 
-#include "libavutil/common.h"
+#include "libavutil/error.h"
+#include "libavutil/macros.h"
 
 #include "ac3.h"
 

libavcodec/ac3.h

@@ -78,6 +78,7 @@ typedef int                     INTFLOAT;
 typedef int16_t                 SHORTFLOAT;
 
 #else /* USE_FIXED */
+#include "libavutil/libm.h"
 
 #define FIXR(x)                 ((float)(x))
 #define FIXR12(x)               ((float)(x))

libavcodec/ass_split.c

@@ -19,8 +19,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavutil/common.h"
+#include <limits.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+
 #include "libavutil/error.h"
+#include "libavutil/macros.h"
 #include "libavutil/mem.h"
 #include "ass_split.h"
 

libavcodec/av1_parse.h

@@ -24,9 +24,9 @@
 #include <limits.h>
 #include <stdint.h>
 
-#include "libavutil/common.h"
 #include "libavutil/error.h"
 #include "libavutil/intmath.h"
+#include "libavutil/macros.h"
 
 #include "av1.h"
 #include "get_bits.h"

libavcodec/bitstream.c

@@ -36,11 +36,11 @@
 #include "config.h"
 #include "libavutil/avassert.h"
 #include "libavutil/bswap.h"
-#include "libavutil/common.h"
 #include "libavutil/error.h"
 #include "libavutil/internal.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/log.h"
+#include "libavutil/macros.h"
 #include "libavutil/mem.h"
 #include "libavutil/qsort.h"
 #include "mathops.h"

libavcodec/cabac.c

@@ -24,13 +24,10 @@
  * Context Adaptive Binary Arithmetic Coder.
  */
 
-#include <string.h>
-
-#include "libavutil/common.h"
+#include "libavutil/error.h"
 #include "libavutil/mem_internal.h"
 
 #include "cabac.h"
-#include "cabac_functions.h"
 
 DECLARE_ASM_ALIGNED(1, const uint8_t, ff_h264_cabac_tables)[512 + 4*2*64 + 4*64 + 63] = {
     9,8,7,7,6,6,6,6,5,5,5,5,5,5,5,5,

libavcodec/celp_math.c

@@ -20,14 +20,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <inttypes.h>
-#include <limits.h>
+#include <stdint.h>
 
+#include "config.h"
 #include "libavutil/avassert.h"
-#include "avcodec.h"
+#include "libavutil/intmath.h"
 #include "mathops.h"
 #include "celp_math.h"
-#include "libavutil/common.h"
 
 #ifdef G729_BITEXACT
 static const uint16_t exp2a[]=

libavcodec/codec_desc.c

@@ -19,10 +19,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <stdlib.h>
 #include <string.h>
 
-#include "libavutil/common.h"
 #include "libavutil/internal.h"
+#include "libavutil/macros.h"
 
 #include "codec_id.h"
 #include "codec_desc.h"

libavcodec/dca_exss.h

@@ -21,7 +21,7 @@
 #ifndef AVCODEC_DCA_EXSS_H
 #define AVCODEC_DCA_EXSS_H
 
-#include "libavutil/common.h"
+#include <stdint.h>
 
 #include "avcodec.h"
 #include "get_bits.h"

libavcodec/dcadct.c

@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavutil/common.h"
+#include <stdlib.h>
 
 #include "dcadct.h"
 #include "dcamath.h"

libavcodec/dcadct.h

@@ -21,7 +21,8 @@
 #ifndef AVCODEC_DCADCT_H
 #define AVCODEC_DCADCT_H
 
-#include "libavutil/common.h"
+#include <stdint.h>
+#include "libavutil/attributes.h"
 
 typedef struct DCADCTContext {
     void (*imdct_half[2])(int32_t *output, const int32_t *input);

libavcodec/dcadec.h

@@ -21,9 +21,11 @@
 #ifndef AVCODEC_DCADEC_H
 #define AVCODEC_DCADEC_H
 
-#include "libavutil/common.h"
+#include <stdint.h>
+
 #include "libavutil/crc.h"
 #include "libavutil/float_dsp.h"
+#include "libavutil/log.h"
 
 #include "avcodec.h"
 #include "get_bits.h"

libavcodec/dcahuff.c

@@ -23,7 +23,7 @@
 #include <stddef.h>
 
 #include "libavutil/avassert.h"
-#include "libavutil/common.h"
+#include "libavutil/macros.h"
 
 #include "dcahuff.h"
 #include "put_bits.h"

libavcodec/dirac_vlc.h

@@ -19,7 +19,7 @@
 #ifndef AVCODEC_DIRAC_VLC_H
 #define AVCODEC_DIRAC_VLC_H
 
-#include "libavutil/avutil.h"
+#include <stdint.h>
 
 int ff_dirac_golomb_read_16bit(const uint8_t *buf, int bytes,
                                uint8_t *_dst, int coeffs);

libavcodec/dnxhddata.c

@@ -19,9 +19,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <stddef.h>
+#include "libavutil/log.h"
+#include "libavutil/macros.h"
 #include "avcodec.h"
 #include "dnxhddata.h"
-#include "libavutil/common.h"
 
 /* The quantization tables below are in zigzag order! */
 

libavcodec/dnxhddata.h

@@ -24,8 +24,9 @@
 
 #include <stdint.h>
 #include "avcodec.h"
-#include "libavutil/internal.h"
+#include "libavutil/attributes.h"
 #include "libavutil/intreadwrite.h"
+#include "libavutil/rational.h"
 
 /** Additional profile info flags */
 #define DNXHD_INTERLACED   (1<<0)

libavcodec/dv_profile.c

@@ -18,11 +18,12 @@
 
 #include "config.h"
 
+#include <stddef.h>
 #include <stdint.h>
 
-#include "libavutil/common.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/log.h"
+#include "libavutil/macros.h"
 #include "libavutil/pixdesc.h"
 
 #include "avcodec.h"

libavcodec/elsdec.c

@@ -25,11 +25,14 @@
  * Entropy Logarithmic-Scale binary arithmetic decoder
  */
 
-#include <math.h>
+#include <stddef.h>
 #include <stdint.h>
+#include <string.h>
 
-#include "libavutil/common.h"
+#include "libavutil/error.h"
 #include "libavutil/intreadwrite.h"
+#include "libavutil/macros.h"
+#include "libavutil/mem.h"
 
 #include "elsdec.h"
 

libavcodec/exrdsp.h

@@ -19,8 +19,8 @@
 #ifndef AVCODEC_EXRDSP_H
 #define AVCODEC_EXRDSP_H
 
+#include <stddef.h>
 #include <stdint.h>
-#include "libavutil/common.h"
 
 typedef struct ExrDSPContext {
     void (*reorder_pixels)(uint8_t *dst, const uint8_t *src, ptrdiff_t size);

libavcodec/flacdsp.c

@@ -19,6 +19,7 @@
  */
 
 #include "libavutil/attributes.h"
+#include "libavutil/internal.h"
 #include "libavutil/samplefmt.h"
 #include "flacdsp.h"
 #include "config.h"

libavcodec/flacdsp.h

@@ -20,7 +20,7 @@
 #define AVCODEC_FLACDSP_H
 
 #include <stdint.h>
-#include "libavutil/internal.h"
+
 #include "libavutil/samplefmt.h"
 
 typedef struct FLACDSPContext {

libavcodec/flacdsp_lpc_template.c

@@ -17,7 +17,7 @@
  */
 
 #include <stdint.h>
-#include "libavutil/avutil.h"
+#include "libavutil/common.h"
 #include "mathops.h"
 
 #undef FUNC

libavcodec/flacdsp_template.c

@@ -19,7 +19,7 @@
  */
 
 #include <stdint.h>
-#include "libavutil/avutil.h"
+#include "libavutil/macros.h"
 
 #undef FUNC
 #undef FSUF

libavcodec/fmtconvert.c

@@ -20,9 +20,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "config.h"
+#include "libavutil/attributes.h"
 #include "avcodec.h"
 #include "fmtconvert.h"
-#include "libavutil/common.h"
 
 static void int32_to_float_fmul_scalar_c(float *dst, const int32_t *src,
                                          float mul, int len)

libavcodec/golomb.c

@@ -26,7 +26,7 @@
  * @author Michael Niedermayer <michaelni@gmx.at>
  */
 
-#include "libavutil/common.h"
+#include <stdint.h>
 
 const uint8_t ff_golomb_vlc_len[512]={
 19,17,15,15,13,13,13,13,11,11,11,11,11,11,11,11,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,

libavcodec/h264_levels.c

@@ -17,7 +17,7 @@
  */
 
 #include <stddef.h>
-#include "libavutil/common.h"
+#include "libavutil/macros.h"
 #include "h264_levels.h"
 
 // H.264 table A-1.

libavcodec/h264_redundant_pps_bsf.c

@@ -16,16 +16,17 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <string.h>
+#include <inttypes.h>
 
-#include "libavutil/common.h"
+#include "libavutil/log.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
 

libavcodec/h264_sei.c

@@ -28,9 +28,9 @@
 #include <limits.h>
 #include <stdio.h>
 #include <string.h>
-#include "libavutil/common.h"
 #include "libavutil/error.h"
 #include "libavutil/log.h"
+#include "libavutil/macros.h"
 #include "libavutil/mem.h"
 #include "atsc_a53.h"
 #include "get_bits.h"

libavcodec/huffman.c

@@ -26,8 +26,11 @@
 
 #include <stdint.h>
 
+#include "libavutil/error.h"
+#include "libavutil/log.h"
+#include "libavutil/macros.h"
+#include "libavutil/mem.h"
 #include "libavutil/qsort.h"
-#include "libavutil/common.h"
 
 #include "huffman.h"
 #include "vlc.h"

libavcodec/jfdctfst.c

@@ -66,9 +66,8 @@
  * Independent JPEG Group's fast AAN dct.
  */
 
-#include <stdlib.h>
-#include <stdio.h>
-#include "libavutil/common.h"
+#include <stdint.h>
+#include "libavutil/attributes.h"
 #include "dct.h"
 
 #define DCTSIZE 8

libavcodec/jpeg2000dwt.c

@@ -25,7 +25,8 @@
  * Discrete wavelet transform
  */
 
-#include "libavutil/common.h"
+#include "libavutil/error.h"
+#include "libavutil/macros.h"
 #include "libavutil/mem.h"
 #include "jpeg2000dwt.h"
 

libavcodec/jrevdct.c

@@ -62,7 +62,9 @@
  * Independent JPEG Group's LLM idct.
  */
 
-#include "libavutil/common.h"
+#include <stddef.h>
+#include <stdint.h>
+
 #include "libavutil/intreadwrite.h"
 
 #include "dct.h"

libavcodec/lagarithrac.h

@@ -31,7 +31,6 @@
 #define AVCODEC_LAGARITHRAC_H
 
 #include <stdint.h>
-#include "libavutil/common.h"
 #include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 #include "get_bits.h"

libavcodec/libopus.c

@@ -21,7 +21,6 @@
 
 #include <opus_defines.h>
 
-#include "libavutil/common.h"
 #include "libavutil/error.h"
 #include "libopus.h"
 

libavcodec/lsp.c

@@ -21,10 +21,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <inttypes.h>
+#include <math.h>
 
 #define FRAC_BITS 14
-#include "libavutil/common.h"
+#include "libavutil/macros.h"
 #include "mathops.h"
 #include "lsp.h"
 #include "libavcodec/mips/lsp_mips.h"

libavcodec/lzwenc.c

@@ -27,7 +27,7 @@
 
 #include <stdint.h>
 #include "libavutil/avassert.h"
-#include "libavutil/common.h"
+#include "libavutil/macros.h"
 #include "lzw.h"
 #include "put_bits.h"
 

libavcodec/mdct15.c

@@ -27,11 +27,12 @@
 #include <float.h>
 #include <math.h>
 #include <stddef.h>
+#include <stdint.h>
 
 #include "config.h"
 
 #include "libavutil/attributes.h"
-#include "libavutil/common.h"
+#include "libavutil/error.h"
 
 #include "mdct15.h"
 

libavcodec/mips/mpegaudiodsp_mips_fixed.c

@@ -54,6 +54,7 @@
 
 #include <string.h>
 
+#include "config.h"
 #include "libavutil/mips/asmdefs.h"
 #include "libavcodec/mpegaudiodsp.h"
 

libavcodec/mips/mpegaudiodsp_mips_float.c

@@ -55,6 +55,7 @@
 
 #include <string.h>
 
+#include "config.h"
 #include "libavutil/mips/asmdefs.h"
 #include "libavcodec/mpegaudiodsp.h"
 

libavcodec/mjpegenc_huffman.c

@@ -21,10 +21,7 @@
 
 #include <string.h>
 #include <stdint.h>
-#include <stdlib.h>
 #include "libavutil/avassert.h"
-#include "libavutil/common.h"
-#include "libavutil/error.h"
 #include "libavutil/qsort.h"
 #include "mjpegenc_huffman.h"
 

libavcodec/mpegaudiodecheader.c

@@ -24,7 +24,7 @@
  * MPEG Audio header decoder.
  */
 
-#include "libavutil/common.h"
+#include "libavutil/macros.h"
 
 #include "mpegaudio.h"
 #include "mpegaudiodata.h"

libavcodec/mpegaudiodsp.h

@@ -22,7 +22,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "libavutil/common.h"
+#include "libavutil/macros.h"
 
 typedef struct MPADSPContext {
     void (*apply_window_float)(float *synth_buf, float *window,

libavcodec/msmpeg4data.h

@@ -30,7 +30,7 @@
 #ifndef AVCODEC_MSMPEG4DATA_H
 #define AVCODEC_MSMPEG4DATA_H
 
-#include "libavutil/common.h"
+#include <stdint.h>
 
 #include "rl.h"
 #include "vlc.h"

libavcodec/opusdsp.c

@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "config.h"
+#include "libavutil/attributes.h"
 #include "opusdsp.h"
 
 static void postfilter_c(float *data, int period, float *gains, int len)

libavcodec/opusdsp.h

@@ -19,8 +19,6 @@
 #ifndef AVCODEC_OPUSDSP_H
 #define AVCODEC_OPUSDSP_H
 
-#include "libavutil/common.h"
-
 #define CELT_EMPH_COEFF 0.8500061035f
 
 typedef struct OpusDSP {

libavcodec/pngdsp.c

@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "config.h"
 #include "libavutil/attributes.h"
-#include "libavutil/common.h"
 #include "png.h"
 #include "pngdsp.h"
 

libavcodec/ra288.h

@@ -23,7 +23,7 @@
 #define AVCODEC_RA288_H
 
 #include <stdint.h>
-#include "libavutil/common.h"
+#include "libavutil/macros.h"
 #include "libavutil/mem_internal.h"
 
 static const float amptable[8]={

libavcodec/rangecoder.h

@@ -29,8 +29,8 @@
 
 #include <stdint.h>
 
-#include "libavutil/common.h"
 #include "libavutil/avassert.h"
+#include "libavutil/intmath.h"
 
 typedef struct RangeCoder {
     int low;

libavcodec/raw.c

@@ -24,9 +24,9 @@
  * Raw Video Codec
  */
 
+#include "libavutil/macros.h"
 #include "avcodec.h"
 #include "raw.h"
-#include "libavutil/common.h"
 
 static const PixelFormatTag raw_pix_fmt_tags[] = {
     { AV_PIX_FMT_YUV420P, MKTAG('I', '4', '2', '0') }, /* Planar formats */

libavcodec/rle.c

@@ -21,7 +21,7 @@
 
 #include <string.h>
 
-#include "libavutil/common.h"
+#include "libavutil/macros.h"
 
 #include "rle.h"
 

libavcodec/scpr3.h

@@ -23,12 +23,7 @@
 #ifndef AVCODEC_SCPR3_H
 #define AVCODEC_SCPR3_H
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "avcodec.h"
-#include "internal.h"
+#include <stdint.h>
 
 typedef struct PixelModel3 {
     uint8_t    type;

libavcodec/tests/cabac.c

@@ -18,12 +18,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavcodec/cabac_functions.h"
 #include "libavcodec/cabac.c"
 
 #define SIZE 10240
 
 #include "libavutil/lfg.h"
-#include "libavcodec/avcodec.h"
 #include "libavcodec/put_bits.h"
 
 typedef struct CABACTestContext {

libavcodec/tests/jpeg2000dwt.c

@@ -20,6 +20,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <inttypes.h>
+#include <stdio.h>
+
+#include "libavutil/common.h"
+
 #include "libavcodec/jpeg2000dwt.c"
 
 #include "libavutil/lfg.h"

libavcodec/tests/rangecoder.c

@@ -19,6 +19,7 @@
 #include <stdint.h>
 #include <string.h>
 
+#include "libavutil/error.h"
 #include "libavutil/lfg.h"
 #include "libavutil/log.h"
 

libavcodec/trace_headers_bsf.c

@@ -16,10 +16,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <stdio.h>
+#include <inttypes.h>
 
 #include "libavutil/avstring.h"
-#include "libavutil/common.h"
+#include "libavutil/avutil.h"
 #include "libavutil/log.h"
 
 #include "bsf.h"

libavcodec/videodsp.c

@@ -18,9 +18,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "config.h"
 #include "libavutil/attributes.h"
 #include "libavutil/avassert.h"
-#include "libavutil/common.h"
+#include "libavutil/macros.h"
 #include "videodsp.h"
 
 #define BIT_DEPTH 8

libavcodec/vp56data.h

@@ -26,7 +26,7 @@
 #ifndef AVCODEC_VP56DATA_H
 #define AVCODEC_VP56DATA_H
 
-#include "libavutil/common.h"
+#include <stdint.h>
 #include "vp56.h"
 
 extern const uint8_t ff_vp56_b2p[];

libavcodec/vp56rac.c

@@ -19,7 +19,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavutil/common.h"
+#include <stdint.h>
+#include "libavutil/error.h"
+#include "bytestream.h"
 #include "vp56.h"
 
 const uint8_t ff_vp56_norm_shift[256]= {

libavcodec/vp9dsp.c

@@ -21,8 +21,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "config.h"
+
+#include "libavutil/attributes.h"
 #include "libavutil/avassert.h"
-#include "libavutil/common.h"
 #include "libavutil/mem_internal.h"
 
 #include "vp9dsp.h"

libavcodec/wavpack.h

@@ -22,7 +22,10 @@
 #ifndef AVCODEC_WAVPACK_H
 #define AVCODEC_WAVPACK_H
 
-#include "libavutil/common.h"
+#include <limits.h>
+#include <stdint.h>
+#include "libavutil/attributes.h"
+#include "libavutil/intmath.h"
 
 #define MAX_TERMS      16
 #define MAX_TERM        8

libavcodec/wavpackenc.h

@@ -21,6 +21,8 @@
 #ifndef AVCODEC_WAVPACKENC_H
 #define AVCODEC_WAVPACKENC_H
 
+#include <stdint.h>
+#include "libavutil/macros.h"
 #include "wavpack.h"
 
 typedef struct WavPackDecorrSpec {

libavcodec/x86/fdct.c

@@ -30,8 +30,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "config.h"
 #include "libavutil/attributes.h"
-#include "libavutil/common.h"
+#include "libavutil/macros.h"
 #include "libavutil/mem_internal.h"
 #include "libavutil/x86/asm.h"
 #include "fdct.h"

libavcodec/x86/mpegaudiodsp.c

@@ -19,9 +19,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <stddef.h>
+
+#include "config.h"
 #include "libavutil/attributes.h"
 #include "libavutil/cpu.h"
-#include "libavutil/internal.h"
 #include "libavutil/mem_internal.h"
 #include "libavutil/x86/asm.h"
 #include "libavutil/x86/cpu.h"

libavcodec/x86/pngdsp_init.c

@@ -19,8 +19,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <stdint.h>
+#include "config.h"
 #include "libavutil/attributes.h"
-#include "libavutil/common.h"
 #include "libavutil/x86/cpu.h"
 #include "libavcodec/pngdsp.h"
 

libavcodec/xiph.c

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <limits.h>
+#include "libavutil/error.h"
 #include "libavutil/intreadwrite.h"
 #include "xiph.h"
 

libavcodec/xiph.h

@@ -21,7 +21,7 @@
 #ifndef AVCODEC_XIPH_H
 #define AVCODEC_XIPH_H
 
-#include "libavutil/common.h"
+#include <stdint.h>
 
 /**
  * Split a single extradata buffer into the three headers that most

libavdevice/timefilter.c

@@ -22,7 +22,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavutil/common.h"
+#include <math.h>
+#include <stddef.h>
+
+#include "libavutil/macros.h"
+#include "libavutil/mathematics.h"
 #include "libavutil/mem.h"
 
 #include "timefilter.h"

libavfilter/af_afir.h

@@ -21,15 +21,14 @@
 #ifndef AVFILTER_AFIR_H
 #define AVFILTER_AFIR_H
 
-#include "libavutil/tx.h"
-#include "libavutil/common.h"
-#include "libavutil/float_dsp.h"
-#include "libavutil/opt.h"
+#include <stddef.h>
+#include <stdint.h>
 
-#include "audio.h"
-#include "avfilter.h"
-#include "formats.h"
-#include "internal.h"
+#include "libavutil/tx.h"
+#include "libavutil/float_dsp.h"
+#include "libavutil/frame.h"
+#include "libavutil/log.h"
+#include "libavutil/rational.h"
 
 typedef struct AudioFIRSegment {
     int nb_partitions;

libavfilter/af_volume.h

@@ -24,10 +24,10 @@
 #ifndef AVFILTER_VOLUME_H
 #define AVFILTER_VOLUME_H
 
-#include "libavutil/common.h"
+#include <stdint.h>
 #include "libavutil/eval.h"
 #include "libavutil/float_dsp.h"
-#include "libavutil/opt.h"
+#include "libavutil/log.h"
 #include "libavutil/samplefmt.h"
 
 enum PrecisionType {

libavfilter/avfiltergraph.c

@@ -25,11 +25,9 @@
 #include <string.h>
 
 #include "libavutil/avassert.h"
-#include "libavutil/avstring.h"
 #include "libavutil/bprint.h"
 #include "libavutil/channel_layout.h"
 #include "libavutil/imgutils.h"
-#include "libavutil/internal.h"
 #include "libavutil/opt.h"
 #include "libavutil/pixdesc.h"
 

libavfilter/colorspace.h

@@ -20,8 +20,8 @@
 #ifndef AVFILTER_COLORSPACE_H
 #define AVFILTER_COLORSPACE_H
 
-#include "libavutil/common.h"
 #include "libavutil/frame.h"
+#include "libavutil/pixfmt.h"
 
 #define REFERENCE_WHITE 100.0f
 

libavfilter/ebur128.c

@@ -47,7 +47,8 @@
 #include <limits.h>
 #include <math.h>               /* You may have to define _USE_MATH_DEFINES if you use MSVC */
 
-#include "libavutil/common.h"
+#include "libavutil/error.h"
+#include "libavutil/macros.h"
 #include "libavutil/mem.h"
 #include "libavutil/mem_internal.h"
 #include "libavutil/thread.h"

libavfilter/motion_estimation.c

@@ -18,6 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/common.h"
 #include "motion_estimation.h"
 
 static const int8_t sqr1[8][2]  = {{ 0,-1}, { 0, 1}, {-1, 0}, { 1, 0}, {-1,-1}, {-1, 1}, { 1,-1}, { 1, 1}};

libavfilter/motion_estimation.h

@@ -21,7 +21,7 @@
 #ifndef AVFILTER_MOTION_ESTIMATION_H
 #define AVFILTER_MOTION_ESTIMATION_H
 
-#include "libavutil/avutil.h"
+#include <stdint.h>
 
 #define AV_ME_METHOD_ESA        1
 #define AV_ME_METHOD_TSS        2

libavfilter/pthread.c

@@ -21,11 +21,11 @@
  * Libavfilter multithreading support
  */
 
-#include "config.h"
+#include <stddef.h>
 
-#include "libavutil/common.h"
+#include "libavutil/error.h"
+#include "libavutil/macros.h"
 #include "libavutil/mem.h"
-#include "libavutil/thread.h"
 #include "libavutil/slicethread.h"
 
 #include "avfilter.h"

libavformat/argo_asf.h

@@ -24,7 +24,7 @@
 #define AVFORMAT_ARGO_ASF_H
 
 #include <stdint.h>
-#include "libavutil/common.h"
+#include "libavutil/macros.h"
 
 #include "avformat.h"
 

libavformat/asfcrypt.c

@@ -20,10 +20,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <stddef.h>
 #include "libavutil/bswap.h"
-#include "libavutil/common.h"
 #include "libavutil/des.h"
 #include "libavutil/intreadwrite.h"
+#include "libavutil/mem.h"
 #include "libavutil/rc4.h"
 #include "asfcrypt.h"
 

libavformat/avlanguage.c

@@ -19,8 +19,7 @@
  */
 
 #include "avlanguage.h"
-#include "libavutil/avstring.h"
-#include "libavutil/common.h"
+#include "libavutil/macros.h"
 #include <stdlib.h>
 #include <stdint.h>
 #include <string.h>

libavformat/hlsplaylist.h

@@ -25,7 +25,6 @@
 
 #include <stdint.h>
 
-#include "libavutil/common.h"
 #include "avformat.h"
 #include "avio.h"
 

libavformat/matroska.h

@@ -23,8 +23,8 @@
 #define AVFORMAT_MATROSKA_H
 
 #include "libavcodec/codec_id.h"
+#include "avformat.h"
 #include "metadata.h"
-#include "internal.h"
 
 /* EBML version supported */
 #define EBML_VERSION 1

libavformat/network.c

@@ -22,7 +22,6 @@
 #include "network.h"
 #include "tls.h"
 #include "url.h"
-#include "libavutil/avutil.h"
 #include "libavutil/avassert.h"
 #include "libavutil/mem.h"
 #include "libavutil/time.h"

libavformat/riff.c

@@ -19,8 +19,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <stddef.h>
 #include "config.h"
-#include "libavutil/common.h"
+#include "libavutil/macros.h"
 #include "avformat.h"
 #include "internal.h"
 #include "metadata.h"

libavformat/tee_common.c

@@ -19,8 +19,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavutil/avutil.h"
-#include "libavutil/avstring.h"
+#include <string.h>
+
+#include "libavutil/log.h"
 #include "libavutil/opt.h"
 
 #include "tee_common.h"

libavformat/webmdashenc.c

@@ -38,6 +38,8 @@
 #include "libavutil/opt.h"
 #include "libavutil/time_internal.h"
 
+#include "libavcodec/codec_desc.h"
+
 typedef struct AdaptationSet {
     char id[10];
     int *streams;

libavformat/wv.c

@@ -21,8 +21,9 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "libavutil/common.h"
+#include "libavutil/error.h"
 #include "libavutil/intreadwrite.h"
+#include "libavutil/macros.h"
 
 #include "wv.h"
 

libavutil/adler32.c

@@ -32,8 +32,8 @@
 
 #include "config.h"
 #include "adler32.h"
-#include "common.h"
 #include "intreadwrite.h"
+#include "macros.h"
 
 #define BASE 65521L /* largest prime smaller than 65536 */
 

libavutil/aes.c

@@ -20,11 +20,15 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "common.h"
+#include <string.h>
+
+#include "config.h"
 #include "aes.h"
 #include "aes_internal.h"
+#include "error.h"
 #include "intreadwrite.h"
-#include "timer.h"
+#include "macros.h"
+#include "mem.h"
 
 const int av_aes_size= sizeof(AVAES);
 

libavutil/aes_ctr.c

@@ -19,10 +19,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "common.h"
+#include <string.h>
+
 #include "aes_ctr.h"
 #include "aes.h"
 #include "aes_internal.h"
+#include "macros.h"
+#include "mem.h"
 #include "random_seed.h"
 
 #define AES_BLOCK_SIZE (16)

libavutil/avsscanf.c

@@ -21,16 +21,18 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#include <errno.h>
+#include <limits.h>
+#include <math.h>
 #include <stdarg.h>
+#include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 #include <float.h>
 
-#include "config.h"
-#include "common.h"
 #include "avstring.h"
-#include "bprint.h"
+#include "libm.h"
 
 typedef struct FFFILE {
     size_t buf_size;

libavutil/avstring.c

@@ -19,17 +19,20 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <limits.h>
 #include <stdarg.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 
 #include "config.h"
-#include "common.h"
 #include "mem.h"
 #include "avassert.h"
 #include "avstring.h"
 #include "bprint.h"
+#include "error.h"
+#include "macros.h"
+#include "version.h"
 
 int av_strstart(const char *str, const char *pfx, const char **ptr)
 {

libavutil/base64.c

@@ -24,10 +24,12 @@
  * @author Ryan Martell <rdm4@martellventures.com> (with lots of Michael)
  */
 
-#include "common.h"
+#include <limits.h>
+#include <stddef.h>
+
 #include "base64.h"
+#include "error.h"
 #include "intreadwrite.h"
-#include "timer.h"
 
 /* ---------------- private code */
 static const uint8_t map2[256] =

libavutil/blowfish.c

@@ -21,8 +21,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "avutil.h"
-#include "common.h"
+#include <string.h>
+
+#include "attributes.h"
 #include "intreadwrite.h"
 #include "mem.h"
 #include "blowfish.h"

libavutil/bprint.c

@@ -18,15 +18,16 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <limits.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
 #include "avstring.h"
 #include "bprint.h"
-#include "common.h"
 #include "compat/va_copy.h"
 #include "error.h"
+#include "macros.h"
 #include "mem.h"
 
 #define av_bprint_room(buf) ((buf)->size - FFMIN((buf)->len, (buf)->size))

libavutil/buffer_internal.h

@@ -22,7 +22,6 @@
 #include <stdatomic.h>
 #include <stdint.h>
 
-#include "internal.h"
 #include "buffer.h"
 #include "thread.h"
 

libavutil/camellia.c

@@ -18,9 +18,13 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include <string.h>
+
 #include "camellia.h"
-#include "common.h"
+#include "error.h"
 #include "intreadwrite.h"
+#include "mem.h"
 #include "attributes.h"
 
 #define LR32(x,c) ((x) << (c) | (x) >> (32 - (c)))

libavutil/cast5.c

@@ -18,9 +18,13 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include <string.h>
+
 #include "cast5.h"
-#include "common.h"
+#include "error.h"
 #include "intreadwrite.h"
+#include "mem.h"
 #include "attributes.h"
 
 #define IA(x) ((x) >> 24)

libavutil/channel_layout.c

@@ -24,12 +24,14 @@
  */
 
 #include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
 
-#include "avstring.h"
-#include "avutil.h"
 #include "channel_layout.h"
 #include "bprint.h"
 #include "common.h"
+#include "error.h"
+#include "macros.h"
 
 struct channel_name {
     const char *name;

libavutil/color_utils.c

@@ -21,7 +21,6 @@
 #include <stddef.h>
 #include <math.h>
 
-#include "common.h"
 #include "libavutil/color_utils.h"
 #include "libavutil/pixfmt.h"
 

libavutil/crc.c

@@ -23,8 +23,8 @@
 #include "thread.h"
 #include "avassert.h"
 #include "bswap.h"
-#include "common.h"
 #include "crc.h"
+#include "error.h"
 
 #if CONFIG_HARDCODED_TABLES
 static const AVCRC av_crc_table[AV_CRC_MAX][257] = {

libavutil/des.c

@@ -19,10 +19,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "config.h"
+
 #include <stdint.h>
 
-#include "avutil.h"
-#include "common.h"
+#include "attributes.h"
+#include "error.h"
 #include "intreadwrite.h"
 #include "mem.h"
 #include "des.h"