diff --git a/libavcodec/eatqi.c b/libavcodec/eatqi.c
index 9beab58a83..8f502b3c56 100644
--- a/libavcodec/eatqi.c
+++ b/libavcodec/eatqi.c
@@ -37,6 +37,7 @@
 #include "idctdsp.h"
 #include "internal.h"
 #include "mpeg12.h"
+#include "mpeg12data.h"
 
 typedef struct TqiContext {
     AVCodecContext *avctx;
diff --git a/libavcodec/mdec.c b/libavcodec/mdec.c
index 39efed69b1..007e7fada8 100644
--- a/libavcodec/mdec.c
+++ b/libavcodec/mdec.c
@@ -34,6 +34,7 @@
 #include "bswapdsp.h"
 #include "idctdsp.h"
 #include "mpeg12.h"
+#include "mpeg12data.h"
 #include "thread.h"
 
 typedef struct MDECContext {
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index a974650133..657970a450 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -31,7 +31,6 @@
 #include "libavutil/avassert.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/internal.h"
-#include "libavutil/motion_vector.h"
 #include "libavutil/video_enc_params.h"
 
 #include "avcodec.h"
@@ -44,8 +43,6 @@
 #include "mpegutils.h"
 #include "mpegvideo.h"
 #include "mpegvideodata.h"
-#include "mjpegenc.h"
-#include "msmpeg4.h"
 #include "qpeldsp.h"
 #include "thread.h"
 #include "wmv2.h"
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index 942b05ba37..d810f900f2 100644
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -53,9 +53,8 @@
 #include "parser.h"
 #endif
 #include "mpegutils.h"
-#include "mpeg12data.h"
 #include "qpeldsp.h"
-#include "thread.h"
+#include "rl.h"
 #include "videodsp.h"
 
 #include "libavutil/opt.h"
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index 9807e491e5..4ee7666c78 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -45,6 +45,7 @@
 #include "encode.h"
 #include "idctdsp.h"
 #include "mpeg12.h"
+#include "mpeg12data.h"
 #include "mpegvideo.h"
 #include "mpegvideodata.h"
 #include "h261.h"
diff --git a/libavcodec/mpegvideo_parser.c b/libavcodec/mpegvideo_parser.c
index 39b9f2e43a..c5dc867d24 100644
--- a/libavcodec/mpegvideo_parser.c
+++ b/libavcodec/mpegvideo_parser.c
@@ -22,6 +22,7 @@
 
 #include "parser.h"
 #include "mpeg12.h"
+#include "mpeg12data.h"
 #include "internal.h"
 
 struct MpvParseContext {
diff --git a/libavcodec/speedhqenc.c b/libavcodec/speedhqenc.c
index 4a2b422f13..8f8b791164 100644
--- a/libavcodec/speedhqenc.c
+++ b/libavcodec/speedhqenc.c
@@ -32,6 +32,7 @@
 
 #include "avcodec.h"
 #include "mpeg12.h"
+#include "mpeg12data.h"
 #include "mpegvideo.h"
 #include "speedhqenc.h"