diff --git a/libavcodec/dirac.c b/libavcodec/dirac.c
index bc51a2fbd7..4736304977 100644
--- a/libavcodec/dirac.c
+++ b/libavcodec/dirac.c
@@ -26,9 +26,12 @@
  * @author Marco Gerards <marco@gnu.org>, David Conrad, Jordi Ortiz <nenjordi@gmail.com>
  */
 
+#include "config.h"
+
 #include "libavutil/pixdesc.h"
 
 #include "dirac.h"
+#include "get_bits.h"
 #include "golomb.h"
 #include "mpeg12data.h"
 
diff --git a/libavcodec/dirac.h b/libavcodec/dirac.h
index e6d9d346d9..8c348cdc02 100644
--- a/libavcodec/dirac.h
+++ b/libavcodec/dirac.h
@@ -31,7 +31,11 @@
  * @author Jordi Ortiz
  */
 
-#include "avcodec.h"
+#include <stddef.h>
+#include <stdint.h>
+
+#include "libavutil/pixfmt.h"
+#include "libavutil/rational.h"
 
 /**
  * The spec limits the number of wavelet decompositions to 4 for both