Don't include common.h from avutil.h

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

21 files changed, 28 insertions, 2 deletions

diff --git a/libavutil/audio_fifo.c b/libavutil/audio_fifo.c
index 97c51a72c1..b562537cf6 100644
--- a/libavutil/audio_fifo.c
+++ b/libavutil/audio_fifo.c
@@ -26,6 +26,7 @@
 
 #include "avutil.h"
 #include "audio_fifo.h"
+#include "common.h"
 #include "fifo.h"
 #include "mem.h"
 #include "samplefmt.h"
diff --git a/libavutil/audioconvert.c b/libavutil/audioconvert.c
index 1ac63a37a6..09750ff435 100644
--- a/libavutil/audioconvert.c
+++ b/libavutil/audioconvert.c
@@ -26,6 +26,7 @@
 #include "avstring.h"
 #include "avutil.h"
 #include "audioconvert.h"
+#include "common.h"
 
 static const char * const channel_names[] = {
     [0]  = "FL",        /* front left */
diff --git a/libavutil/avstring.c b/libavutil/avstring.c
index 11f3a7c321..9b88c0b3dd 100644
--- a/libavutil/avstring.c
+++ b/libavutil/avstring.c
@@ -20,6 +20,7 @@
  */
 
 #include <stdarg.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
@@ -157,6 +158,7 @@ int av_strncasecmp(const char *a, const char *b, size_t n)
 
 #ifdef TEST
 
+#include "common.h"
 #undef printf
 
 int main(void)
diff --git a/libavutil/avutil.h b/libavutil/avutil.h
index 6811ad59bf..a1433b4e65 100644
--- a/libavutil/avutil.h
+++ b/libavutil/avutil.h
@@ -263,7 +263,6 @@ char av_get_picture_type_char(enum AVPictureType pict_type);
  * @}
  */
 
-#include "common.h"
 #include "error.h"
 #include "version.h"
 
diff --git a/libavutil/dict.c b/libavutil/dict.c
index bbee732db9..3c3194c1bc 100644
--- a/libavutil/dict.c
+++ b/libavutil/dict.c
@@ -18,6 +18,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <ctype.h>
+#include <string.h>
+
 #include "avstring.h"
 #include "dict.h"
 #include "internal.h"
diff --git a/libavutil/error.c b/libavutil/error.c
index 21b68762d2..c335cde13d 100644
--- a/libavutil/error.c
+++ b/libavutil/error.c
@@ -18,6 +18,7 @@
 
 #include "avutil.h"
 #include "avstring.h"
+#include "common.h"
 
 int av_strerror(int errnum, char *errbuf, size_t errbuf_size)
 {
diff --git a/libavutil/error.h b/libavutil/error.h
index 11bcc5c4c4..8ac355cc41 100644
--- a/libavutil/error.h
+++ b/libavutil/error.h
@@ -25,6 +25,7 @@
 #define AVUTIL_ERROR_H
 
 #include <errno.h>
+#include <stddef.h>
 #include "avutil.h"
 
 /**
diff --git a/libavutil/eval.c b/libavutil/eval.c
index d274272205..9d179309b7 100644
--- a/libavutil/eval.c
+++ b/libavutil/eval.c
@@ -27,6 +27,7 @@
  */
 
 #include "avutil.h"
+#include "common.h"
 #include "eval.h"
 #include "log.h"
 #include "mathematics.h"
diff --git a/libavutil/fifo.h b/libavutil/fifo.h
index f106239304..e670175a76 100644
--- a/libavutil/fifo.h
+++ b/libavutil/fifo.h
@@ -26,6 +26,7 @@
 
 #include <stdint.h>
 #include "avutil.h"
+#include "attributes.h"
 
 typedef struct AVFifoBuffer {
     uint8_t *buffer;
diff --git a/libavutil/file.c b/libavutil/file.c
index e1d0831994..0739641820 100644
--- a/libavutil/file.c
+++ b/libavutil/file.c
@@ -16,6 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "config.h"
 #include "file.h"
 #include "log.h"
 #include <fcntl.h>
diff --git a/libavutil/file.h b/libavutil/file.h
index c481c37f93..e3f02a8308 100644
--- a/libavutil/file.h
+++ b/libavutil/file.h
@@ -19,6 +19,8 @@
 #ifndef AVUTIL_FILE_H
 #define AVUTIL_FILE_H
 
+#include <stdint.h>
+
 #include "avutil.h"
 
 /**
diff --git a/libavutil/imgutils.c b/libavutil/imgutils.c
index 3d28e5659b..4e394b6b50 100644
--- a/libavutil/imgutils.c
+++ b/libavutil/imgutils.c
@@ -21,6 +21,7 @@
  * misc image utilities
  */
 
+#include "common.h"
 #include "imgutils.h"
 #include "internal.h"
 #include "log.h"
diff --git a/libavutil/log.c b/libavutil/log.c
index 9f1d59ab9c..d2cf88fd4b 100644
--- a/libavutil/log.c
+++ b/libavutil/log.c
@@ -32,6 +32,7 @@
 #include <stdlib.h>
 #include "avstring.h"
 #include "avutil.h"
+#include "common.h"
 #include "log.h"
 
 static int av_log_level = AV_LOG_INFO;
diff --git a/libavutil/mem.h b/libavutil/mem.h
index 211d33f64f..21fecc86dc 100644
--- a/libavutil/mem.h
+++ b/libavutil/mem.h
@@ -26,6 +26,8 @@
 #ifndef AVUTIL_MEM_H
 #define AVUTIL_MEM_H
 
+#include <limits.h>
+
 #include "attributes.h"
 #include "avutil.h"
 
diff --git a/libavutil/opt.c b/libavutil/opt.c
index b1e50f7a59..607f7e6fd4 100644
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
@@ -27,6 +27,7 @@
 
 #include "avutil.h"
 #include "avstring.h"
+#include "common.h"
 #include "opt.h"
 #include "eval.h"
 #include "dict.h"
diff --git a/libavutil/parseutils.c b/libavutil/parseutils.c
index 34f45eb2d1..3149537f6a 100644
--- a/libavutil/parseutils.c
+++ b/libavutil/parseutils.c
@@ -25,6 +25,7 @@
 
 #include "avstring.h"
 #include "avutil.h"
+#include "common.h"
 #include "eval.h"
 #include "log.h"
 #include "random_seed.h"
diff --git a/libavutil/samplefmt.c b/libavutil/samplefmt.c
index b6e785cb67..102376ae38 100644
--- a/libavutil/samplefmt.c
+++ b/libavutil/samplefmt.c
@@ -16,6 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "common.h"
 #include "samplefmt.h"
 
 #include <stdio.h>
diff --git a/libavutil/samplefmt.h b/libavutil/samplefmt.h
index e3aa6a9c36..445856de73 100644
--- a/libavutil/samplefmt.h
+++ b/libavutil/samplefmt.h
@@ -19,7 +19,10 @@
 #ifndef AVUTIL_SAMPLEFMT_H
 #define AVUTIL_SAMPLEFMT_H
 
+#include <stdint.h>
+
 #include "avutil.h"
+#include "attributes.h"
 
 /**
  * Audio Sample Formats
diff --git a/libavutil/timer.h b/libavutil/timer.h
index 78d2b5f8fc..ea5c891cf3 100644
--- a/libavutil/timer.h
+++ b/libavutil/timer.h
@@ -28,6 +28,7 @@
 
 #include <stdlib.h>
 #include <stdint.h>
+#include <inttypes.h>
 
 #include "config.h"
 
diff --git a/libavutil/tree.c b/libavutil/tree.c
index e614f72cd8..0e68bb75f1 100644
--- a/libavutil/tree.c
+++ b/libavutil/tree.c
@@ -19,6 +19,7 @@
  */
 
 #include "log.h"
+#include "mem.h"
 #include "tree.h"
 
 typedef struct AVTreeNode {
@@ -157,6 +158,7 @@ void av_tree_enumerate(AVTreeNode *t, void *opaque,
 
 #ifdef TEST
 
+#include "common.h"
 #include "lfg.h"
 
 static int check(AVTreeNode *t)
diff --git a/libavutil/version.h b/libavutil/version.h
index de5731a5a5..2dc821d8f1 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -37,7 +37,7 @@
  */
 
 #define LIBAVUTIL_VERSION_MAJOR 51
-#define LIBAVUTIL_VERSION_MINOR 38
+#define LIBAVUTIL_VERSION_MINOR 39
 #define LIBAVUTIL_VERSION_MICRO  0
 
 #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \