diff --git a/configure b/configure
index 036967a3cd..0ee6b54e57 100755
--- a/configure
+++ b/configure
@@ -1797,8 +1797,8 @@ vc1image_decoder_select="vc1_decoder"
 vorbis_decoder_select="mdct"
 vorbis_encoder_select="mdct"
 vp3_decoder_select="vp3dsp videodsp"
-vp5_decoder_select="h264chroma vp3dsp videodsp"
-vp6_decoder_select="h264chroma huffman vp3dsp videodsp"
+vp5_decoder_select="h264chroma videodsp vp3dsp"
+vp6_decoder_select="h264chroma huffman videodsp vp3dsp"
 vp6a_decoder_select="vp6_decoder"
 vp6f_decoder_select="vp6_decoder"
 vp8_decoder_select="h264pred videodsp"
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index e231b08548..70e4febd22 100644
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -30,6 +30,7 @@
 #include "libavutil/cpu.h"
 #include "internal.h"
 #include "avcodec.h"
+#include "error_resilience.h"
 #include "mpegvideo.h"
 #include "h263.h"
 #include "h263_parser.h"
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 3a83b4b031..56189614bb 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -33,6 +33,7 @@
 #include "cabac.h"
 #include "cabac_functions.h"
 #include "dsputil.h"
+#include "error_resilience.h"
 #include "avcodec.h"
 #include "mpegvideo.h"
 #include "h264.h"
diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index 03be472c51..1dfb9fa384 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -30,6 +30,7 @@
 
 #include "libavutil/intreadwrite.h"
 #include "cabac.h"
+#include "error_resilience.h"
 #include "get_bits.h"
 #include "mpegvideo.h"
 #include "h264chroma.h"
diff --git a/libavcodec/intrax8.c b/libavcodec/intrax8.c
index 5b76942add..06496ca659 100644
--- a/libavcodec/intrax8.c
+++ b/libavcodec/intrax8.c
@@ -23,6 +23,7 @@
 
 #include "libavutil/avassert.h"
 #include "avcodec.h"
+#include "error_resilience.h"
 #include "get_bits.h"
 #include "mpegvideo.h"
 #include "msmpeg4data.h"
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
index 9d2743a6df..1e11ea798d 100644
--- a/libavcodec/mpeg12.c
+++ b/libavcodec/mpeg12.c
@@ -28,13 +28,14 @@
 #define UNCHECKED_BITSTREAM_READER 1
 
 //#define DEBUG
+#include "libavutil/avassert.h"
+#include "libavutil/timecode.h"
+
 #include "internal.h"
 #include "avcodec.h"
 #include "dsputil.h"
 #include "mpegvideo.h"
-#include "libavutil/avassert.h"
-#include "libavutil/timecode.h"
-
+#include "error_resilience.h"
 #include "mpeg12.h"
 #include "mpeg12data.h"
 #include "mpeg12decdata.h"
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c
index 8bdc29363e..09bd0dcce2 100644
--- a/libavcodec/mpeg4videodec.c
+++ b/libavcodec/mpeg4videodec.c
@@ -23,6 +23,7 @@
 #define UNCHECKED_BITSTREAM_READER 1
 
 #include "libavutil/opt.h"
+#include "error_resilience.h"
 #include "mpegvideo.h"
 #include "mpeg4video.h"
 #include "h263.h"
diff --git a/libavcodec/mss2.c b/libavcodec/mss2.c
index afdf33c244..71bd0b858b 100644
--- a/libavcodec/mss2.c
+++ b/libavcodec/mss2.c
@@ -24,6 +24,7 @@
  */
 
 #include "libavutil/avassert.h"
+#include "error_resilience.h"
 #include "internal.h"
 #include "msmpeg4data.h"
 #include "vc1.h"
diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c
index 3f338f3ff3..e51adc0307 100644
--- a/libavcodec/rv10.c
+++ b/libavcodec/rv10.c
@@ -27,6 +27,7 @@
 
 #include "libavutil/imgutils.h"
 #include "avcodec.h"
+#include "error_resilience.h"
 #include "mpegvideo.h"
 #include "mpeg4video.h"
 #include "h263.h"
diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c
index 462cef91ad..31e5d03332 100644
--- a/libavcodec/rv34.c
+++ b/libavcodec/rv34.c
@@ -28,6 +28,7 @@
 #include "libavutil/internal.h"
 
 #include "avcodec.h"
+#include "error_resilience.h"
 #include "mpegvideo.h"
 #include "golomb.h"
 #include "internal.h"
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index 2130c74109..fb4046b2d2 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -28,6 +28,7 @@
 
 #include "internal.h"
 #include "avcodec.h"
+#include "error_resilience.h"
 #include "mpegvideo.h"
 #include "h263.h"
 #include "h264chroma.h"