diff --git a/libavcodec/opt.h b/libavcodec/opt.h
index c96893055b..0e39e3db38 100644
--- a/libavcodec/opt.h
+++ b/libavcodec/opt.h
@@ -28,6 +28,7 @@
  */
 
 #include "libavutil/rational.h"
+#include "avcodec.h"
 
 enum AVOptionType{
     FF_OPT_TYPE_FLAGS,
diff --git a/libavutil/fifo.h b/libavutil/fifo.h
index 37338ca673..93756e92c9 100644
--- a/libavutil/fifo.h
+++ b/libavutil/fifo.h
@@ -25,6 +25,7 @@
 #define AVUTIL_FIFO_H
 
 #include <stdint.h>
+#include "avutil.h"
 #include "common.h"
 
 typedef struct AVFifoBuffer {
diff --git a/libavutil/log.h b/libavutil/log.h
index 152e773c2c..8c93f9c853 100644
--- a/libavutil/log.h
+++ b/libavutil/log.h
@@ -22,6 +22,7 @@
 #define AVUTIL_LOG_H
 
 #include <stdarg.h>
+#include "avutil.h"
 
 /**
  * Describes the class of an AVClass context structure, that is an