diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 094683f12a..efe1f5823f 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -309,7 +309,12 @@
 
 #include <time.h>
 #include <stdio.h>  /* FILE */
-#include "libavcodec/avcodec.h"
+
+#include "libavcodec/codec.h"
+#include "libavcodec/codec_par.h"
+#include "libavcodec/defs.h"
+#include "libavcodec/packet.h"
+
 #include "libavutil/dict.h"
 #include "libavutil/log.h"