diff --git a/libavfilter/ccfifo.c b/libavfilter/ccfifo.c
index 29108822be..d76dbff149 100644
--- a/libavfilter/ccfifo.c
+++ b/libavfilter/ccfifo.c
@@ -22,6 +22,7 @@
  */
 
 #include "ccfifo.h"
+#include "libavutil/fifo.h"
 
 #define MAX_CC_ELEMENTS 128
 
diff --git a/libavfilter/ccfifo.h b/libavfilter/ccfifo.h
index 565a837a00..d3f8a52cc1 100644
--- a/libavfilter/ccfifo.h
+++ b/libavfilter/ccfifo.h
@@ -29,15 +29,17 @@
 #ifndef AVFILTER_CCFIFO_H
 #define AVFILTER_CCFIFO_H
 
-#include "libavutil/avutil.h"
+#include <stddef.h>
+#include <stdint.h>
+
 #include "libavutil/frame.h"
-#include "libavutil/fifo.h"
+#include "libavutil/rational.h"
 
 #define CC_BYTES_PER_ENTRY 3
 
 typedef struct CCFifo {
-    AVFifo *cc_608_fifo;
-    AVFifo *cc_708_fifo;
+    struct AVFifo *cc_608_fifo;
+    struct AVFifo *cc_708_fifo;
     AVRational framerate;
     int expected_cc_count;
     int expected_608;