diff --git a/libavutil/audio_fifo.c b/libavutil/audio_fifo.c
index b1355e55a0..f4103178ba 100644
--- a/libavutil/audio_fifo.c
+++ b/libavutil/audio_fifo.c
@@ -24,10 +24,13 @@
  * Audio FIFO
  */
 
-#include "avutil.h"
+#include <limits.h>
+#include <stddef.h>
+
 #include "audio_fifo.h"
-#include "common.h"
+#include "error.h"
 #include "fifo.h"
+#include "macros.h"
 #include "mem.h"
 #include "samplefmt.h"
 
diff --git a/libavutil/audio_fifo.h b/libavutil/audio_fifo.h
index 9d570b04c0..d1e4c856dc 100644
--- a/libavutil/audio_fifo.h
+++ b/libavutil/audio_fifo.h
@@ -27,7 +27,7 @@
 #ifndef AVUTIL_AUDIO_FIFO_H
 #define AVUTIL_AUDIO_FIFO_H
 
-#include "avutil.h"
+#include "attributes.h"
 #include "samplefmt.h"
 
 /**