diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index 35ef0e1df72cd45d3ef9dd1f98fdeef5f8160a2d..2a493e7ad0bfd743b641d536a5dc10b5b7a37640 100644
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -32,6 +32,7 @@
 #include "bitstream.h"
 #include "ratecontrol.h"
 #include "parser.h"
+#include "rl.h"
 
 #define FRAME_SKIPPED 100 ///< return value for header parsers if frame is not coded
 
@@ -61,10 +62,6 @@ enum OutputFormat {
 #define ME_MAP_SHIFT 3
 #define ME_MAP_MV_BITS 11
 
-/* run length table */
-#define MAX_RUN    64
-#define MAX_LEVEL  64
-
 #define I_TYPE FF_I_TYPE  ///< Intra
 #define P_TYPE FF_P_TYPE  ///< Predicted
 #define B_TYPE FF_B_TYPE  ///< Bi-dir predicted
@@ -775,8 +772,6 @@ void ff_mpeg1_encode_slice_header(MpegEncContext *s);
 void ff_mpeg1_clean_buffers(MpegEncContext *s);
 int ff_mpeg1_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size);
 
-#include "rl.h"
-
 extern const uint8_t ff_mpeg4_y_dc_scale_table[32];
 extern const uint8_t ff_mpeg4_c_dc_scale_table[32];
 extern const uint8_t ff_aic_dc_scale_table[32];
diff --git a/libavcodec/rl.h b/libavcodec/rl.h
index ecea2c89111481c2954c9dd08303b8943783f3c6..03d2e56e4f767d498afe0e92db875348c7bf0e92 100644
--- a/libavcodec/rl.h
+++ b/libavcodec/rl.h
@@ -29,7 +29,10 @@
 
 #include <stdint.h>
 #include "bitstream.h"
-#include "mpegvideo.h"
+
+/* run length table */
+#define MAX_RUN    64
+#define MAX_LEVEL  64
 
 /** RLTable. */
 typedef struct RLTable {