Don't include common.h from avutil.h

Signed-off-by: Martin Storsjö <martin@martin.st>

57 files changed, 98 insertions, 0 deletions

diff --git a/libavfilter/af_aformat.c b/libavfilter/af_aformat.c
index 6c46f4b1be..9e69fd0ad8 100644
--- a/libavfilter/af_aformat.c
+++ b/libavfilter/af_aformat.c
@@ -25,6 +25,7 @@
 
 #include "libavutil/audioconvert.h"
 #include "libavutil/avstring.h"
+#include "libavutil/common.h"
 #include "libavutil/opt.h"
 
 #include "audio.h"
diff --git a/libavfilter/af_amix.c b/libavfilter/af_amix.c
index d79a626d0a..7bb43ea53e 100644
--- a/libavfilter/af_amix.c
+++ b/libavfilter/af_amix.c
@@ -32,6 +32,7 @@
 #include "libavutil/audio_fifo.h"
 #include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
+#include "libavutil/common.h"
 #include "libavutil/float_dsp.h"
 #include "libavutil/mathematics.h"
 #include "libavutil/opt.h"
diff --git a/libavfilter/af_anull.c b/libavfilter/af_anull.c
index 462ad68269..7082adb7d9 100644
--- a/libavfilter/af_anull.c
+++ b/libavfilter/af_anull.c
@@ -24,6 +24,7 @@
 #include "audio.h"
 #include "avfilter.h"
 #include "internal.h"
+#include "libavutil/internal.h"
 
 AVFilter avfilter_af_anull = {
     .name      = "anull",
diff --git a/libavfilter/af_asyncts.c b/libavfilter/af_asyncts.c
index 21850dd1d2..b58e2499d8 100644
--- a/libavfilter/af_asyncts.c
+++ b/libavfilter/af_asyncts.c
@@ -18,6 +18,7 @@
 
 #include "libavresample/avresample.h"
 #include "libavutil/audio_fifo.h"
+#include "libavutil/common.h"
 #include "libavutil/mathematics.h"
 #include "libavutil/opt.h"
 #include "libavutil/samplefmt.h"
diff --git a/libavfilter/af_channelmap.c b/libavfilter/af_channelmap.c
index b5cd96a8d3..3e945d6e91 100644
--- a/libavfilter/af_channelmap.c
+++ b/libavfilter/af_channelmap.c
@@ -27,6 +27,7 @@
 
 #include "libavutil/audioconvert.h"
 #include "libavutil/avstring.h"
+#include "libavutil/common.h"
 #include "libavutil/mathematics.h"
 #include "libavutil/opt.h"
 #include "libavutil/samplefmt.h"
diff --git a/libavfilter/af_channelsplit.c b/libavfilter/af_channelsplit.c
index 32b85d82f8..68615aa609 100644
--- a/libavfilter/af_channelsplit.c
+++ b/libavfilter/af_channelsplit.c
@@ -24,6 +24,7 @@
  */
 
 #include "libavutil/audioconvert.h"
+#include "libavutil/internal.h"
 #include "libavutil/opt.h"
 
 #include "audio.h"
diff --git a/libavfilter/af_join.c b/libavfilter/af_join.c
index f25ec921dc..c44788bd80 100644
--- a/libavfilter/af_join.c
+++ b/libavfilter/af_join.c
@@ -27,6 +27,7 @@
 
 #include "libavutil/audioconvert.h"
 #include "libavutil/avassert.h"
+#include "libavutil/common.h"
 #include "libavutil/opt.h"
 
 #include "audio.h"
diff --git a/libavfilter/af_resample.c b/libavfilter/af_resample.c
index 1360c1ca49..eb2d2f9e21 100644
--- a/libavfilter/af_resample.c
+++ b/libavfilter/af_resample.c
@@ -24,6 +24,7 @@
 
 #include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
+#include "libavutil/common.h"
 #include "libavutil/mathematics.h"
 #include "libavutil/opt.h"
 
diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c
index 9c22b4fe9e..94b31154df 100644
--- a/libavfilter/allfilters.c
+++ b/libavfilter/allfilters.c
@@ -20,6 +20,7 @@
  */
 
 #include "avfilter.h"
+#include "config.h"
 
 
 #define REGISTER_FILTER(X,x,y) { \
diff --git a/libavfilter/asink_anullsink.c b/libavfilter/asink_anullsink.c
index 557655f182..cada5c548d 100644
--- a/libavfilter/asink_anullsink.c
+++ b/libavfilter/asink_anullsink.c
@@ -16,6 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/internal.h"
 #include "avfilter.h"
 #include "internal.h"
 
diff --git a/libavfilter/asrc_anullsrc.c b/libavfilter/asrc_anullsrc.c
index 20489e7121..6627c33b3f 100644
--- a/libavfilter/asrc_anullsrc.c
+++ b/libavfilter/asrc_anullsrc.c
@@ -21,9 +21,13 @@
  * null audio source
  */
 
+#include <inttypes.h>
+#include <stdio.h>
+
 #include "avfilter.h"
 #include "internal.h"
 #include "libavutil/audioconvert.h"
+#include "libavutil/internal.h"
 
 typedef struct {
     uint64_t channel_layout;
diff --git a/libavfilter/audio.c b/libavfilter/audio.c
index bd718c611d..66010c18c5 100644
--- a/libavfilter/audio.c
+++ b/libavfilter/audio.c
@@ -17,6 +17,7 @@
  */
 
 #include "libavutil/audioconvert.h"
+#include "libavutil/common.h"
 
 #include "audio.h"
 #include "avfilter.h"
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index d302264137..77b36339a1 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -21,6 +21,7 @@
 
 /* #define DEBUG */
 
+#include "libavutil/common.h"
 #include "libavutil/pixdesc.h"
 #include "libavutil/rational.h"
 #include "libavutil/audioconvert.h"
diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c
index a0aa807b9c..525a1dc6c7 100644
--- a/libavfilter/avfiltergraph.c
+++ b/libavfilter/avfiltergraph.c
@@ -30,6 +30,7 @@
 
 #include "libavutil/audioconvert.h"
 #include "libavutil/avassert.h"
+#include "libavutil/common.h"
 #include "libavutil/log.h"
 
 static const AVClass filtergraph_class = {
diff --git a/libavfilter/buffer.c b/libavfilter/buffer.c
index e3ebc9b8c7..c939388656 100644
--- a/libavfilter/buffer.c
+++ b/libavfilter/buffer.c
@@ -17,6 +17,7 @@
  */
 
 #include "libavutil/audioconvert.h"
+#include "libavutil/common.h"
 #include "libavcodec/avcodec.h"
 
 #include "avfilter.h"
diff --git a/libavfilter/buffersink.c b/libavfilter/buffersink.c
index 04320b5654..d62b08128a 100644
--- a/libavfilter/buffersink.c
+++ b/libavfilter/buffersink.c
@@ -26,6 +26,7 @@
 #include "libavutil/audio_fifo.h"
 #include "libavutil/audioconvert.h"
 #include "libavutil/avassert.h"
+#include "libavutil/common.h"
 #include "libavutil/mathematics.h"
 
 #include "audio.h"
diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c
index 33cb63b46b..5f4e9b7496 100644
--- a/libavfilter/buffersrc.c
+++ b/libavfilter/buffersrc.c
@@ -31,6 +31,7 @@
 #include "video.h"
 
 #include "libavutil/audioconvert.h"
+#include "libavutil/common.h"
 #include "libavutil/fifo.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/opt.h"
diff --git a/libavfilter/drawutils.c b/libavfilter/drawutils.c
index 6aaf5c5866..60710243c1 100644
--- a/libavfilter/drawutils.c
+++ b/libavfilter/drawutils.c
@@ -16,8 +16,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <string.h>
+
 #include "libavutil/avutil.h"
 #include "libavutil/colorspace.h"
+#include "libavutil/mem.h"
 #include "libavutil/pixdesc.h"
 #include "drawutils.h"
 
diff --git a/libavfilter/fifo.c b/libavfilter/fifo.c
index 3226a0ddbe..bf78bb6aef 100644
--- a/libavfilter/fifo.c
+++ b/libavfilter/fifo.c
@@ -25,6 +25,7 @@
 
 #include "libavutil/avassert.h"
 #include "libavutil/audioconvert.h"
+#include "libavutil/common.h"
 #include "libavutil/mathematics.h"
 #include "libavutil/samplefmt.h"
 
diff --git a/libavfilter/formats.c b/libavfilter/formats.c
index 3ec68397c9..98cda8b8e5 100644
--- a/libavfilter/formats.c
+++ b/libavfilter/formats.c
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/common.h"
 #include "libavutil/pixdesc.h"
 #include "avfilter.h"
 #include "internal.h"
diff --git a/libavfilter/graphparser.c b/libavfilter/graphparser.c
index 49155293d8..3921189aa9 100644
--- a/libavfilter/graphparser.c
+++ b/libavfilter/graphparser.c
@@ -22,8 +22,10 @@
 
 #include <ctype.h>
 #include <string.h>
+#include <stdio.h>
 
 #include "libavutil/avstring.h"
+#include "libavutil/mem.h"
 #include "avfilter.h"
 #include "avfiltergraph.h"
 
diff --git a/libavfilter/split.c b/libavfilter/split.c
index 084d555f1a..88224092d6 100644
--- a/libavfilter/split.c
+++ b/libavfilter/split.c
@@ -23,6 +23,10 @@
  * audio and video splitter
  */
 
+#include <stdio.h>
+
+#include "libavutil/internal.h"
+#include "libavutil/mem.h"
 #include "avfilter.h"
 #include "audio.h"
 #include "internal.h"
diff --git a/libavfilter/vf_aspect.c b/libavfilter/vf_aspect.c
index 8738b0a764..04c854d1bd 100644
--- a/libavfilter/vf_aspect.c
+++ b/libavfilter/vf_aspect.c
@@ -23,6 +23,7 @@
  * aspect ratio modification video filters
  */
 
+#include "libavutil/common.h"
 #include "libavutil/mathematics.h"
 #include "avfilter.h"
 #include "internal.h"
diff --git a/libavfilter/vf_blackframe.c b/libavfilter/vf_blackframe.c
index bf0b18bea3..65443fc24c 100644
--- a/libavfilter/vf_blackframe.c
+++ b/libavfilter/vf_blackframe.c
@@ -27,6 +27,10 @@
  * Ported from MPlayer libmpcodecs/vf_blackframe.c.
  */
 
+#include <stdio.h>
+#include <inttypes.h>
+
+#include "libavutil/internal.h"
 #include "avfilter.h"
 #include "formats.h"
 #include "internal.h"
diff --git a/libavfilter/vf_boxblur.c b/libavfilter/vf_boxblur.c
index 0247e93e6b..cfe33da9be 100644
--- a/libavfilter/vf_boxblur.c
+++ b/libavfilter/vf_boxblur.c
@@ -26,6 +26,7 @@
  */
 
 #include "libavutil/avstring.h"
+#include "libavutil/common.h"
 #include "libavutil/eval.h"
 #include "libavutil/pixdesc.h"
 #include "avfilter.h"
diff --git a/libavfilter/vf_copy.c b/libavfilter/vf_copy.c
index 425b0eb8b5..243702b6e5 100644
--- a/libavfilter/vf_copy.c
+++ b/libavfilter/vf_copy.c
@@ -21,6 +21,7 @@
  * copy video filter
  */
 
+#include "libavutil/internal.h"
 #include "avfilter.h"
 #include "internal.h"
 #include "video.h"
diff --git a/libavfilter/vf_crop.c b/libavfilter/vf_crop.c
index 4361ba5a8c..1c8e87799a 100644
--- a/libavfilter/vf_crop.c
+++ b/libavfilter/vf_crop.c
@@ -25,12 +25,15 @@
 
 /* #define DEBUG */
 
+#include <stdio.h>
+
 #include "avfilter.h"
 #include "formats.h"
 #include "internal.h"
 #include "video.h"
 #include "libavutil/eval.h"
 #include "libavutil/avstring.h"
+#include "libavutil/internal.h"
 #include "libavutil/libm.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/mathematics.h"
diff --git a/libavfilter/vf_cropdetect.c b/libavfilter/vf_cropdetect.c
index 8b6063c996..e107f471c3 100644
--- a/libavfilter/vf_cropdetect.c
+++ b/libavfilter/vf_cropdetect.c
@@ -23,7 +23,10 @@
  * Ported from MPlayer libmpcodecs/vf_cropdetect.c.
  */
 
+#include <stdio.h>
+
 #include "libavutil/imgutils.h"
+#include "libavutil/internal.h"
 #include "avfilter.h"
 #include "formats.h"
 #include "internal.h"
diff --git a/libavfilter/vf_delogo.c b/libavfilter/vf_delogo.c
index e8b5431caf..5e2cf48e3b 100644
--- a/libavfilter/vf_delogo.c
+++ b/libavfilter/vf_delogo.c
@@ -25,6 +25,7 @@
  * Ported from MPlayer libmpcodecs/vf_delogo.c.
  */
 
+#include "libavutil/common.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/opt.h"
 #include "libavutil/pixdesc.h"
diff --git a/libavfilter/vf_drawbox.c b/libavfilter/vf_drawbox.c
index 96b1c00911..69fdd790d7 100644
--- a/libavfilter/vf_drawbox.c
+++ b/libavfilter/vf_drawbox.c
@@ -25,6 +25,7 @@
  */
 
 #include "libavutil/colorspace.h"
+#include "libavutil/common.h"
 #include "libavutil/pixdesc.h"
 #include "libavutil/parseutils.h"
 #include "avfilter.h"
diff --git a/libavfilter/vf_fade.c b/libavfilter/vf_fade.c
index c30a862ad6..ca847929ae 100644
--- a/libavfilter/vf_fade.c
+++ b/libavfilter/vf_fade.c
@@ -25,6 +25,7 @@
  * based heavily on vf_negate.c by Bobby Bingham
  */
 
+#include "libavutil/common.h"
 #include "libavutil/pixdesc.h"
 #include "avfilter.h"
 #include "formats.h"
diff --git a/libavfilter/vf_fieldorder.c b/libavfilter/vf_fieldorder.c
index 4ea7fe1127..5a8e6f94a1 100644
--- a/libavfilter/vf_fieldorder.c
+++ b/libavfilter/vf_fieldorder.c
@@ -25,7 +25,11 @@
 
 /* #define DEBUG */
 
+#include <stdio.h>
+#include <string.h>
+
 #include "libavutil/imgutils.h"
+#include "libavutil/internal.h"
 #include "libavutil/pixdesc.h"
 #include "avfilter.h"
 #include "formats.h"
diff --git a/libavfilter/vf_format.c b/libavfilter/vf_format.c
index 8528b0b3ff..0437bfaa07 100644
--- a/libavfilter/vf_format.c
+++ b/libavfilter/vf_format.c
@@ -23,6 +23,10 @@
  * format and noformat video filters
  */
 
+#include <string.h>
+
+#include "libavutil/internal.h"
+#include "libavutil/mem.h"
 #include "libavutil/pixdesc.h"
 #include "avfilter.h"
 #include "formats.h"
diff --git a/libavfilter/vf_fps.c b/libavfilter/vf_fps.c
index d95fef5993..73058009a5 100644
--- a/libavfilter/vf_fps.c
+++ b/libavfilter/vf_fps.c
@@ -21,6 +21,7 @@
  * a filter enforcing given constant framerate
  */
 
+#include "libavutil/common.h"
 #include "libavutil/fifo.h"
 #include "libavutil/mathematics.h"
 #include "libavutil/opt.h"
diff --git a/libavfilter/vf_gradfun.c b/libavfilter/vf_gradfun.c
index f8896b5e57..2953256521 100644
--- a/libavfilter/vf_gradfun.c
+++ b/libavfilter/vf_gradfun.c
@@ -33,6 +33,7 @@
  */
 
 #include "libavutil/imgutils.h"
+#include "libavutil/common.h"
 #include "libavutil/cpu.h"
 #include "libavutil/pixdesc.h"
 #include "avfilter.h"
diff --git a/libavfilter/vf_hflip.c b/libavfilter/vf_hflip.c
index 06c42483d1..87bfe11191 100644
--- a/libavfilter/vf_hflip.c
+++ b/libavfilter/vf_hflip.c
@@ -24,11 +24,14 @@
  * horizontal flip filter
  */
 
+#include <string.h>
+
 #include "avfilter.h"
 #include "formats.h"
 #include "internal.h"
 #include "video.h"
 #include "libavutil/pixdesc.h"
+#include "libavutil/internal.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/imgutils.h"
 
diff --git a/libavfilter/vf_hqdn3d.c b/libavfilter/vf_hqdn3d.c
index 138b527a70..3a81f37ae1 100644
--- a/libavfilter/vf_hqdn3d.c
+++ b/libavfilter/vf_hqdn3d.c
@@ -26,6 +26,7 @@
  * libmpcodecs/vf_hqdn3d.c.
  */
 
+#include "libavutil/common.h"
 #include "libavutil/pixdesc.h"
 #include "libavutil/intreadwrite.h"
 #include "avfilter.h"
diff --git a/libavfilter/vf_lut.c b/libavfilter/vf_lut.c
index c56c55b88c..adbc0f04c2 100644
--- a/libavfilter/vf_lut.c
+++ b/libavfilter/vf_lut.c
@@ -24,6 +24,7 @@
  * value, and apply it to input video.
  */
 
+#include "libavutil/common.h"
 #include "libavutil/eval.h"
 #include "libavutil/mathematics.h"
 #include "libavutil/opt.h"
diff --git a/libavfilter/vf_null.c b/libavfilter/vf_null.c
index 8a2a8cb11a..9f2e15addb 100644
--- a/libavfilter/vf_null.c
+++ b/libavfilter/vf_null.c
@@ -21,6 +21,7 @@
  * null video filter
  */
 
+#include "libavutil/internal.h"
 #include "avfilter.h"
 #include "internal.h"
 #include "video.h"
diff --git a/libavfilter/vf_overlay.c b/libavfilter/vf_overlay.c
index 5a8da27a16..6dd9be4975 100644
--- a/libavfilter/vf_overlay.c
+++ b/libavfilter/vf_overlay.c
@@ -27,6 +27,7 @@
 
 #include "avfilter.h"
 #include "formats.h"
+#include "libavutil/common.h"
 #include "libavutil/eval.h"
 #include "libavutil/avstring.h"
 #include "libavutil/pixdesc.h"
diff --git a/libavfilter/vf_pad.c b/libavfilter/vf_pad.c
index ed2e2e0891..2291b138fb 100644
--- a/libavfilter/vf_pad.c
+++ b/libavfilter/vf_pad.c
@@ -29,6 +29,7 @@
 #include "internal.h"
 #include "video.h"
 #include "libavutil/avstring.h"
+#include "libavutil/common.h"
 #include "libavutil/eval.h"
 #include "libavutil/pixdesc.h"
 #include "libavutil/colorspace.h"
diff --git a/libavfilter/vf_pixdesctest.c b/libavfilter/vf_pixdesctest.c
index 11905e625c..cf08977b1f 100644
--- a/libavfilter/vf_pixdesctest.c
+++ b/libavfilter/vf_pixdesctest.c
@@ -23,6 +23,7 @@
  * pixdesc test filter
  */
 
+#include "libavutil/common.h"
 #include "libavutil/pixdesc.h"
 #include "avfilter.h"
 #include "internal.h"
diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c
index 66005303f5..949691f797 100644
--- a/libavfilter/vf_scale.c
+++ b/libavfilter/vf_scale.c
@@ -23,12 +23,16 @@
  * scale video filter
  */
 
+#include <stdio.h>
+#include <string.h>
+
 #include "avfilter.h"
 #include "formats.h"
 #include "internal.h"
 #include "video.h"
 #include "libavutil/avstring.h"
 #include "libavutil/eval.h"
+#include "libavutil/internal.h"
 #include "libavutil/mathematics.h"
 #include "libavutil/opt.h"
 #include "libavutil/pixdesc.h"
diff --git a/libavfilter/vf_select.c b/libavfilter/vf_select.c
index 59030ebced..dabd3d173d 100644
--- a/libavfilter/vf_select.c
+++ b/libavfilter/vf_select.c
@@ -25,6 +25,7 @@
 
 #include "libavutil/eval.h"
 #include "libavutil/fifo.h"
+#include "libavutil/internal.h"
 #include "libavutil/mathematics.h"
 #include "avfilter.h"
 #include "internal.h"
diff --git a/libavfilter/vf_setpts.c b/libavfilter/vf_setpts.c
index c4339b202a..e347716dff 100644
--- a/libavfilter/vf_setpts.c
+++ b/libavfilter/vf_setpts.c
@@ -27,6 +27,7 @@
 /* #define DEBUG */
 
 #include "libavutil/eval.h"
+#include "libavutil/internal.h"
 #include "libavutil/mathematics.h"
 #include "avfilter.h"
 #include "internal.h"
diff --git a/libavfilter/vf_settb.c b/libavfilter/vf_settb.c
index 0a5ce4d173..24c2a637ab 100644
--- a/libavfilter/vf_settb.c
+++ b/libavfilter/vf_settb.c
@@ -23,8 +23,12 @@
  * Set timebase for the output link.
  */
 
+#include <inttypes.h>
+#include <stdio.h>
+
 #include "libavutil/avstring.h"
 #include "libavutil/eval.h"
+#include "libavutil/internal.h"
 #include "libavutil/mathematics.h"
 #include "libavutil/rational.h"
 #include "avfilter.h"
diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c
index 254141d677..b53ccd10db 100644
--- a/libavfilter/vf_showinfo.c
+++ b/libavfilter/vf_showinfo.c
@@ -24,6 +24,7 @@
 
 #include "libavutil/adler32.h"
 #include "libavutil/imgutils.h"
+#include "libavutil/internal.h"
 #include "libavutil/pixdesc.h"
 #include "avfilter.h"
 #include "internal.h"
diff --git a/libavfilter/vf_slicify.c b/libavfilter/vf_slicify.c
index 3c69cfd350..e0e2718ebd 100644
--- a/libavfilter/vf_slicify.c
+++ b/libavfilter/vf_slicify.c
@@ -26,6 +26,7 @@
 #include "avfilter.h"
 #include "internal.h"
 #include "video.h"
+#include "libavutil/common.h"
 #include "libavutil/pixdesc.h"
 
 typedef struct {
diff --git a/libavfilter/vf_transpose.c b/libavfilter/vf_transpose.c
index 90f08e42cd..8135f5b74f 100644
--- a/libavfilter/vf_transpose.c
+++ b/libavfilter/vf_transpose.c
@@ -25,9 +25,12 @@
  * Based on MPlayer libmpcodecs/vf_rotate.c.
  */
 
+#include <stdio.h>
+
 #include "libavutil/intreadwrite.h"
 #include "libavutil/pixdesc.h"
 #include "libavutil/imgutils.h"
+#include "libavutil/internal.h"
 #include "avfilter.h"
 #include "formats.h"
 #include "internal.h"
diff --git a/libavfilter/vf_vflip.c b/libavfilter/vf_vflip.c
index f0fb32aadc..742fe6a38c 100644
--- a/libavfilter/vf_vflip.c
+++ b/libavfilter/vf_vflip.c
@@ -23,6 +23,7 @@
  * video vertical flip filter
  */
 
+#include "libavutil/internal.h"
 #include "libavutil/pixdesc.h"
 #include "avfilter.h"
 #include "internal.h"
diff --git a/libavfilter/video.c b/libavfilter/video.c
index ebbbc346bc..31a093e155 100644
--- a/libavfilter/video.c
+++ b/libavfilter/video.c
@@ -16,7 +16,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <string.h>
+
 #include "libavutil/imgutils.h"
+#include "libavutil/mem.h"
 
 #include "avfilter.h"
 #include "internal.h"
diff --git a/libavfilter/vsink_nullsink.c b/libavfilter/vsink_nullsink.c
index e03dcf0085..27d85a07ec 100644
--- a/libavfilter/vsink_nullsink.c
+++ b/libavfilter/vsink_nullsink.c
@@ -18,6 +18,7 @@
 
 #include "avfilter.h"
 #include "internal.h"
+#include "libavutil/internal.h"
 
 static int start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
 {
diff --git a/libavfilter/vsrc_color.c b/libavfilter/vsrc_color.c
index ec83f03c5c..d7a26a7f9d 100644
--- a/libavfilter/vsrc_color.c
+++ b/libavfilter/vsrc_color.c
@@ -23,6 +23,9 @@
  * color source
  */
 
+#include <stdio.h>
+#include <string.h>
+
 #include "avfilter.h"
 #include "formats.h"
 #include "internal.h"
@@ -30,7 +33,9 @@
 #include "libavutil/pixdesc.h"
 #include "libavutil/colorspace.h"
 #include "libavutil/imgutils.h"
+#include "libavutil/internal.h"
 #include "libavutil/mathematics.h"
+#include "libavutil/mem.h"
 #include "libavutil/parseutils.h"
 #include "drawutils.h"
 
diff --git a/libavfilter/vsrc_nullsrc.c b/libavfilter/vsrc_nullsrc.c
index 84a2ff86f5..888dbcc71a 100644
--- a/libavfilter/vsrc_nullsrc.c
+++ b/libavfilter/vsrc_nullsrc.c
@@ -21,8 +21,11 @@
  * null video source
  */
 
+#include <stdio.h>
+
 #include "libavutil/avstring.h"
 #include "libavutil/eval.h"
+#include "libavutil/internal.h"
 #include "libavutil/mathematics.h"
 #include "libavutil/parseutils.h"
 #include "avfilter.h"
diff --git a/libavfilter/vsrc_testsrc.c b/libavfilter/vsrc_testsrc.c
index 42cd58ed89..56404fe21a 100644
--- a/libavfilter/vsrc_testsrc.c
+++ b/libavfilter/vsrc_testsrc.c
@@ -32,6 +32,7 @@
 
 #include <float.h>
 
+#include "libavutil/common.h"
 #include "libavutil/mathematics.h"
 #include "libavutil/opt.h"
 #include "libavutil/intreadwrite.h"
diff --git a/libavfilter/x86/gradfun.c b/libavfilter/x86/gradfun.c
index 4cd481c05f..140f5e87cc 100644
--- a/libavfilter/x86/gradfun.c
+++ b/libavfilter/x86/gradfun.c
@@ -20,6 +20,7 @@
 
 #include "libavutil/attributes.h"
 #include "libavutil/cpu.h"
+#include "libavutil/mem.h"
 #include "libavutil/x86/asm.h"
 #include "libavfilter/gradfun.h"
 
diff --git a/libavfilter/x86/yadif.c b/libavfilter/x86/yadif.c
index ee3a016bd0..750db4261e 100644
--- a/libavfilter/x86/yadif.c
+++ b/libavfilter/x86/yadif.c
@@ -20,6 +20,8 @@
 
 #include "libavutil/attributes.h"
 #include "libavutil/cpu.h"
+#include "libavutil/internal.h"
+#include "libavutil/mem.h"
 #include "libavutil/x86/asm.h"
 #include "libavcodec/x86/dsputil_mmx.h"
 #include "libavfilter/yadif.h"