From 0a1a8fcd56bf62da0d4b32da3e915860ba96684e Mon Sep 17 00:00:00 2001
From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Date: Fri, 23 Jul 2021 11:31:02 +0200
Subject: [PATCH] avutil/fifo: Don't include avutil.h
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reviewed-by: Martin Storsjö <martin@martin.st>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavutil/fifo.c          | 5 ++++-
 libavutil/fifo.h          | 4 +++-
 libavutil/threadmessage.c | 2 ++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/libavutil/fifo.c b/libavutil/fifo.c
index 09c984143f..51a5af6f39 100644
--- a/libavutil/fifo.c
+++ b/libavutil/fifo.c
@@ -21,10 +21,13 @@
  */
 
 #include <stdint.h>
+#include <string.h>
 
 #include "avassert.h"
-#include "common.h"
+#include "error.h"
 #include "fifo.h"
+#include "macros.h"
+#include "mem.h"
 
 // by default the FIFO can be auto-grown to 1MB
 #define AUTO_GROW_DEFAULT_BYTES (1024 * 1024)
diff --git a/libavutil/fifo.h b/libavutil/fifo.h
index 4eb2ce42f8..4eed364afc 100644
--- a/libavutil/fifo.h
+++ b/libavutil/fifo.h
@@ -24,9 +24,11 @@
 #ifndef AVUTIL_FIFO_H
 #define AVUTIL_FIFO_H
 
+#include <stddef.h>
 #include <stdint.h>
-#include "avutil.h"
+
 #include "attributes.h"
+#include "version.h"
 
 typedef struct AVFifo AVFifo;
 
diff --git a/libavutil/threadmessage.c b/libavutil/threadmessage.c
index 6f25da76d7..f0e23f28fc 100644
--- a/libavutil/threadmessage.c
+++ b/libavutil/threadmessage.c
@@ -18,7 +18,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <limits.h>
 #include "fifo.h"
+#include "mem.h"
 #include "threadmessage.h"
 #include "thread.h"