diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h
index e29d11f150..02292faf8e 100644
--- a/libavcodec/dsputil.h
+++ b/libavcodec/dsputil.h
@@ -30,7 +30,6 @@
 #ifndef AVCODEC_DSPUTIL_H
 #define AVCODEC_DSPUTIL_H
 
-#include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 #include "rnd_avg.h"
 
diff --git a/libavcodec/h264pred_template.c b/libavcodec/h264pred_template.c
index 8d8d62e0b6..fd1515b36d 100644
--- a/libavcodec/h264pred_template.c
+++ b/libavcodec/h264pred_template.c
@@ -25,6 +25,8 @@
  * @author Michael Niedermayer <michaelni@gmx.at>
  */
 
+#include "libavutil/intreadwrite.h"
+
 #include "mathops.h"
 
 #include "bit_depth_template.c"
diff --git a/libavcodec/h264qpel_template.c b/libavcodec/h264qpel_template.c
index 48eb8c874b..37c48a991d 100644
--- a/libavcodec/h264qpel_template.c
+++ b/libavcodec/h264qpel_template.c
@@ -20,6 +20,8 @@
  */
 
 #include "libavutil/common.h"
+#include "libavutil/intreadwrite.h"
+
 #include "bit_depth_template.c"
 #include "hpel_template.c"
 
diff --git a/libavcodec/nuv.c b/libavcodec/nuv.c
index 358bf0567c..c01d6264ba 100644
--- a/libavcodec/nuv.c
+++ b/libavcodec/nuv.c
@@ -25,6 +25,7 @@
 
 #include "libavutil/bswap.h"
 #include "libavutil/common.h"
+#include "libavutil/intreadwrite.h"
 #include "libavutil/lzo.h"
 #include "libavutil/imgutils.h"
 #include "avcodec.h"
diff --git a/libavcodec/vc1dsp.c b/libavcodec/vc1dsp.c
index ec9c17b198..6e4a796d40 100644
--- a/libavcodec/vc1dsp.c
+++ b/libavcodec/vc1dsp.c
@@ -27,6 +27,7 @@
 
 #include "libavutil/avassert.h"
 #include "libavutil/common.h"
+#include "libavutil/intreadwrite.h"
 #include "h264chroma.h"
 #include "rnd_avg.h"
 #include "vc1dsp.h"
diff --git a/libavcodec/vp3dsp.c b/libavcodec/vp3dsp.c
index 56566293d7..56fffb7cbc 100644
--- a/libavcodec/vp3dsp.c
+++ b/libavcodec/vp3dsp.c
@@ -26,6 +26,7 @@
 
 #include "libavutil/attributes.h"
 #include "libavutil/common.h"
+#include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 #include "dsputil.h"
 #include "rnd_avg.h"
diff --git a/libavcodec/vp8dsp.c b/libavcodec/vp8dsp.c
index 00b4118b57..51e17b6a62 100644
--- a/libavcodec/vp8dsp.c
+++ b/libavcodec/vp8dsp.c
@@ -28,6 +28,7 @@
 #include "dsputil.h"
 #include "vp8dsp.h"
 #include "libavutil/common.h"
+#include "libavutil/intreadwrite.h"
 
 #define MK_IDCT_DC_ADD4_C(name) \
 static void name ## _idct_dc_add4uv_c(uint8_t *dst, int16_t block[4][16], ptrdiff_t stride)\