diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c
index 30a5b1340b..1113517880 100644
--- a/libavcodec/diracdec.c
+++ b/libavcodec/diracdec.c
@@ -37,7 +37,7 @@
 #include "dirac_arith.h"
 #include "dirac_vlc.h"
 #include "mpeg12data.h"
-#include "libavcodec/mpegvideo.h"
+#include "mpegpicture.h"
 #include "mpegvideoencdsp.h"
 #include "dirac_dwt.h"
 #include "dirac.h"
diff --git a/libavcodec/h263data.c b/libavcodec/h263data.c
index 20d0436fda..c520df3574 100644
--- a/libavcodec/h263data.c
+++ b/libavcodec/h263data.c
@@ -26,7 +26,7 @@
 #include <stdint.h>
 
 #include "h263data.h"
-#include "mpegvideo.h"
+#include "rl.h"
 
 /* intra MCBPC, mb_type = (intra), then (intraq) */
 const uint8_t ff_h263_intra_MCBPC_code[9] = { 1, 1, 2, 3, 1, 1, 2, 3, 1 };
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index 9c2301d7e0..20055e6f7a 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -29,6 +29,7 @@
 #include "libavutil/display.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/stereo3d.h"
+#include "libavutil/timecode.h"
 #include "internal.h"
 #include "cabac.h"
 #include "cabac_functions.h"
@@ -43,7 +44,6 @@
 #include "golomb.h"
 #include "mathops.h"
 #include "mpegutils.h"
-#include "mpegvideo.h"
 #include "rectangle.h"
 #include "thread.h"
 
diff --git a/libavcodec/snowdec.c b/libavcodec/snowdec.c
index 7367176f07..1355ae6ed1 100644
--- a/libavcodec/snowdec.c
+++ b/libavcodec/snowdec.c
@@ -29,7 +29,6 @@
 #include "rangecoder.h"
 #include "mathops.h"
 
-#include "mpegvideo.h"
 #include "h263.h"
 
 static av_always_inline void predict_slice_buffered(SnowContext *s, slice_buffer * sb, IDWTELEM * old_buffer, int plane_index, int add, int mb_y){