diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index ed7ec48afb..9a84b1138d 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -35,7 +35,6 @@
 #include "dsputil.h"
 #include "error_resilience.h"
 #include "avcodec.h"
-#include "mpegvideo.h"
 #include "h264.h"
 #include "h264data.h"
 #include "h264chroma.h"
diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index e3c0ac04f2..db14e0810b 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -33,13 +33,14 @@
 #include "dsputil.h"
 #include "error_resilience.h"
 #include "get_bits.h"
-#include "mpegvideo.h"
 #include "h264chroma.h"
 #include "h264dsp.h"
 #include "h264pred.h"
 #include "h264qpel.h"
 #include "mpegutils.h"
+#include "parser.h"
 #include "rectangle.h"
+#include "videodsp.h"
 
 #define H264_MAX_PICTURE_COUNT 32
 #define H264_MAX_THREADS       16
diff --git a/libavcodec/h264_cavlc.c b/libavcodec/h264_cavlc.c
index c0fd2e878e..0ab0355143 100644
--- a/libavcodec/h264_cavlc.c
+++ b/libavcodec/h264_cavlc.c
@@ -29,7 +29,6 @@
 
 #include "internal.h"
 #include "avcodec.h"
-#include "mpegvideo.h"
 #include "h264.h"
 #include "h264data.h" // FIXME FIXME FIXME
 #include "h264_mvpred.h"
diff --git a/libavcodec/h264_direct.c b/libavcodec/h264_direct.c
index 21c3d7725a..83c5958a4b 100644
--- a/libavcodec/h264_direct.c
+++ b/libavcodec/h264_direct.c
@@ -27,7 +27,6 @@
 
 #include "internal.h"
 #include "avcodec.h"
-#include "mpegvideo.h"
 #include "h264.h"
 #include "mpegutils.h"
 #include "rectangle.h"
diff --git a/libavcodec/h264_loopfilter.c b/libavcodec/h264_loopfilter.c
index 267884ff89..717c22551b 100644
--- a/libavcodec/h264_loopfilter.c
+++ b/libavcodec/h264_loopfilter.c
@@ -29,7 +29,6 @@
 #include "libavutil/intreadwrite.h"
 #include "internal.h"
 #include "avcodec.h"
-#include "mpegvideo.h"
 #include "h264.h"
 #include "mathops.h"
 #include "mpegutils.h"
diff --git a/libavcodec/h264data.h b/libavcodec/h264data.h
index f90a267387..6b40b39f0a 100644
--- a/libavcodec/h264data.h
+++ b/libavcodec/h264data.h
@@ -32,7 +32,6 @@
 #include <stdint.h>
 
 #include "libavutil/rational.h"
-#include "mpegvideo.h"
 #include "h264.h"
 
 static const uint8_t golomb_to_pict_type[5] = {
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c
index 342c4efc5c..265ca6d94e 100644
--- a/libavcodec/svq3.c
+++ b/libavcodec/svq3.c
@@ -44,7 +44,6 @@
 #include "internal.h"
 #include "avcodec.h"
 #include "mpegutils.h"
-#include "mpegvideo.h"
 #include "h264.h"
 
 #include "h264data.h" // FIXME FIXME FIXME