diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c
index 0fc7a2e6d8..3f1af194e4 100644
--- a/libavcodec/4xm.c
+++ b/libavcodec/4xm.c
@@ -24,6 +24,7 @@
  * 4XM codec.
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 #include "dsputil.h"
 #include "bitstream.h"
diff --git a/libavcodec/8bps.c b/libavcodec/8bps.c
index 4376d07064..5a5f764101 100644
--- a/libavcodec/8bps.c
+++ b/libavcodec/8bps.c
@@ -34,6 +34,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 
 
diff --git a/libavcodec/adxdec.c b/libavcodec/adxdec.c
index 5512d7fc56..aa0e896128 100644
--- a/libavcodec/adxdec.c
+++ b/libavcodec/adxdec.c
@@ -18,6 +18,8 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 #include "adx.h"
 
diff --git a/libavcodec/adxenc.c b/libavcodec/adxenc.c
index 6bce31a186..1ba860831e 100644
--- a/libavcodec/adxenc.c
+++ b/libavcodec/adxenc.c
@@ -18,6 +18,8 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 #include "adx.h"
 
diff --git a/libavcodec/bytestream.h b/libavcodec/bytestream.h
index e0d7111d17..0f2178a86e 100644
--- a/libavcodec/bytestream.h
+++ b/libavcodec/bytestream.h
@@ -23,6 +23,7 @@
 #define AVCODEC_BYTESTREAM_H
 
 #include "libavutil/common.h"
+#include "libavutil/intreadwrite.h"
 
 #define DEF_T(type, name, bytes, read, write)                             \
 static av_always_inline type bytestream_get_ ## name(const uint8_t **b){\
diff --git a/libavcodec/cinepak.c b/libavcodec/cinepak.c
index 8c2efba03b..67193b94d6 100644
--- a/libavcodec/cinepak.c
+++ b/libavcodec/cinepak.c
@@ -34,6 +34,7 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 
 
diff --git a/libavcodec/dirac_parser.c b/libavcodec/dirac_parser.c
index ac82dcabf1..511563cb6c 100644
--- a/libavcodec/dirac_parser.c
+++ b/libavcodec/dirac_parser.c
@@ -27,6 +27,7 @@
  * @author Marco Gerards <marco@gnu.org>
  */
 
+#include "libavutil/intreadwrite.h"
 #include "parser.h"
 
 #define DIRAC_PARSE_INFO_PREFIX 0x42424344
diff --git a/libavcodec/dpcm.c b/libavcodec/dpcm.c
index 74ca9ec8ec..be976e842c 100644
--- a/libavcodec/dpcm.c
+++ b/libavcodec/dpcm.c
@@ -37,6 +37,7 @@
  * the fourcc 'Axan' in the 'auds' chunk of the AVI header.
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 
 typedef struct DPCMContext {
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h
index a81d4184a5..2cdeef5b7c 100644
--- a/libavcodec/dsputil.h
+++ b/libavcodec/dsputil.h
@@ -30,6 +30,7 @@
 #ifndef AVCODEC_DSPUTIL_H
 #define AVCODEC_DSPUTIL_H
 
+#include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 
 
diff --git a/libavcodec/dvdsub_parser.c b/libavcodec/dvdsub_parser.c
index 0893daca65..ed6ed36933 100644
--- a/libavcodec/dvdsub_parser.c
+++ b/libavcodec/dvdsub_parser.c
@@ -18,6 +18,8 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 
 /* parser definition */
diff --git a/libavcodec/dxa.c b/libavcodec/dxa.c
index 3d03445c0c..e0f4430a0e 100644
--- a/libavcodec/dxa.c
+++ b/libavcodec/dxa.c
@@ -27,6 +27,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 
 #include <zlib.h>
diff --git a/libavcodec/eacmv.c b/libavcodec/eacmv.c
index a9f624e046..ffd8f462de 100644
--- a/libavcodec/eacmv.c
+++ b/libavcodec/eacmv.c
@@ -28,6 +28,7 @@
  * http://wiki.multimedia.cx/index.php?title=Electronic_Arts_CMV
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 
 typedef struct CmvContext {
diff --git a/libavcodec/flicvideo.c b/libavcodec/flicvideo.c
index 4a8cb5e043..d6faa34128 100644
--- a/libavcodec/flicvideo.c
+++ b/libavcodec/flicvideo.c
@@ -40,7 +40,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "libavutil/bswap.h"
+#include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 
 #define FLI_256_COLOR 4
diff --git a/libavcodec/h264_mp4toannexb_bsf.c b/libavcodec/h264_mp4toannexb_bsf.c
index e94f8c6565..af79fee946 100644
--- a/libavcodec/h264_mp4toannexb_bsf.c
+++ b/libavcodec/h264_mp4toannexb_bsf.c
@@ -18,6 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 
 typedef struct H264BSFContext {
diff --git a/libavcodec/mlp.c b/libavcodec/mlp.c
index 7ef7f97526..6f10c3535e 100644
--- a/libavcodec/mlp.c
+++ b/libavcodec/mlp.c
@@ -22,6 +22,7 @@
 #include <stdint.h>
 
 #include "libavutil/crc.h"
+#include "libavutil/intreadwrite.h"
 #include "mlp.h"
 
 const uint8_t ff_mlp_huffman_tables[3][18][2] = {
diff --git a/libavcodec/mmvideo.c b/libavcodec/mmvideo.c
index 03d86ee9dc..c1f1d36f7d 100644
--- a/libavcodec/mmvideo.c
+++ b/libavcodec/mmvideo.c
@@ -31,6 +31,7 @@
  *  http://wiki.multimedia.cx/index.php?title=American_Laser_Games_MM
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 
 #define MM_PREAMBLE_SIZE    6
diff --git a/libavcodec/movsub_bsf.c b/libavcodec/movsub_bsf.c
index 99e8135f5e..2423f2db94 100644
--- a/libavcodec/movsub_bsf.c
+++ b/libavcodec/movsub_bsf.c
@@ -18,6 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 
 
diff --git a/libavcodec/msrledec.c b/libavcodec/msrledec.c
index 7d09ed99a6..0a7fda2286 100644
--- a/libavcodec/msrledec.c
+++ b/libavcodec/msrledec.c
@@ -26,6 +26,7 @@
  *   http://www.multimedia.cx/msrle.txt
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 
 #define FETCH_NEXT_STREAM_BYTE() \
diff --git a/libavcodec/msvideo1.c b/libavcodec/msvideo1.c
index 8621d661df..c208d47e81 100644
--- a/libavcodec/msvideo1.c
+++ b/libavcodec/msvideo1.c
@@ -35,6 +35,7 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 
 #define PALETTE_COUNT 256
diff --git a/libavcodec/ptx.c b/libavcodec/ptx.c
index 79424b9c42..2ab45b08a7 100644
--- a/libavcodec/ptx.c
+++ b/libavcodec/ptx.c
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 
 typedef struct PTXContext {
diff --git a/libavcodec/qdrw.c b/libavcodec/qdrw.c
index e0e4142b81..80b84a02c0 100644
--- a/libavcodec/qdrw.c
+++ b/libavcodec/qdrw.c
@@ -24,6 +24,7 @@
  * Apple QuickDraw codec.
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 
 typedef struct QdrawContext{
diff --git a/libavcodec/qtrle.c b/libavcodec/qtrle.c
index 33a7eb5731..306a07424e 100644
--- a/libavcodec/qtrle.c
+++ b/libavcodec/qtrle.c
@@ -36,6 +36,7 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 
 typedef struct QtrleContext {
diff --git a/libavcodec/rl2.c b/libavcodec/rl2.c
index ad830e7b65..2bd7b157df 100644
--- a/libavcodec/rl2.c
+++ b/libavcodec/rl2.c
@@ -32,6 +32,7 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 
 
diff --git a/libavcodec/rpza.c b/libavcodec/rpza.c
index ddf39544ff..ddfe05c983 100644
--- a/libavcodec/rpza.c
+++ b/libavcodec/rpza.c
@@ -39,6 +39,7 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 
 typedef struct RpzaContext {
diff --git a/libavcodec/s3tc.c b/libavcodec/s3tc.c
index fc035e5778..546ee2156f 100644
--- a/libavcodec/s3tc.c
+++ b/libavcodec/s3tc.c
@@ -21,6 +21,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 #include "s3tc.h"
 
diff --git a/libavcodec/smc.c b/libavcodec/smc.c
index e05e0b1625..197c053182 100644
--- a/libavcodec/smc.c
+++ b/libavcodec/smc.c
@@ -33,6 +33,7 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 
 #define CPAIR 2
diff --git a/libavcodec/sunrast.c b/libavcodec/sunrast.c
index c8f021f850..f7a7f9c6c0 100644
--- a/libavcodec/sunrast.c
+++ b/libavcodec/sunrast.c
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 
 #define RT_OLD          0
diff --git a/libavcodec/targa.c b/libavcodec/targa.c
index f9bc343997..56a6876ec4 100644
--- a/libavcodec/targa.c
+++ b/libavcodec/targa.c
@@ -18,6 +18,8 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 
 enum TargaCompr{
diff --git a/libavcodec/targaenc.c b/libavcodec/targaenc.c
index 958ae50553..21747bb368 100644
--- a/libavcodec/targaenc.c
+++ b/libavcodec/targaenc.c
@@ -18,6 +18,8 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 #include "rle.h"
 
diff --git a/libavcodec/truespeech.c b/libavcodec/truespeech.c
index 3df71cb7f2..2c0b22f098 100644
--- a/libavcodec/truespeech.c
+++ b/libavcodec/truespeech.c
@@ -18,6 +18,8 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 
 #include "truespeech_data.h"
diff --git a/libavcodec/txd.c b/libavcodec/txd.c
index 284b00d2de..44bbad4cab 100644
--- a/libavcodec/txd.c
+++ b/libavcodec/txd.c
@@ -21,6 +21,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 #include "s3tc.h"
 
diff --git a/libavcodec/vmdav.c b/libavcodec/vmdav.c
index 328abbb3c7..48f76bfaf3 100644
--- a/libavcodec/vmdav.c
+++ b/libavcodec/vmdav.c
@@ -44,6 +44,7 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 
 #define VMD_HEADER_SIZE 0x330
diff --git a/libavcodec/vmnc.c b/libavcodec/vmnc.c
index c07d0016f5..5a7e5b0243 100644
--- a/libavcodec/vmnc.c
+++ b/libavcodec/vmnc.c
@@ -28,6 +28,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 
 enum EncTypes {
diff --git a/libavcodec/vqavideo.c b/libavcodec/vqavideo.c
index 028895f8d1..c392a829c9 100644
--- a/libavcodec/vqavideo.c
+++ b/libavcodec/vqavideo.c
@@ -68,6 +68,7 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 
 #define PALETTE_COUNT 256
diff --git a/libavcodec/ws-snd1.c b/libavcodec/ws-snd1.c
index 24753b0c9c..2dc49fcefa 100644
--- a/libavcodec/ws-snd1.c
+++ b/libavcodec/ws-snd1.c
@@ -18,6 +18,8 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 
 /**
diff --git a/libavcodec/xan.c b/libavcodec/xan.c
index 12b00b1b66..236c22c7dd 100644
--- a/libavcodec/xan.c
+++ b/libavcodec/xan.c
@@ -33,6 +33,7 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 
 typedef struct XanContext {
diff --git a/libavcodec/xiph.c b/libavcodec/xiph.c
index 6554264648..2f4f25c929 100644
--- a/libavcodec/xiph.c
+++ b/libavcodec/xiph.c
@@ -18,6 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/intreadwrite.h"
 #include "xiph.h"
 
 int ff_split_xiph_headers(uint8_t *extradata, int extradata_size,
diff --git a/libavcodec/xl.c b/libavcodec/xl.c
index b6911dd359..8af9a3287a 100644
--- a/libavcodec/xl.c
+++ b/libavcodec/xl.c
@@ -24,6 +24,7 @@
  * Miro VideoXL codec.
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 
 typedef struct VideoXLContext{
diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c
index e36ff27301..6943ff3568 100644
--- a/libavcodec/zmbv.c
+++ b/libavcodec/zmbv.c
@@ -27,6 +27,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 
 #include <zlib.h>
diff --git a/libavcodec/zmbvenc.c b/libavcodec/zmbvenc.c
index 79478de510..a960f7a8b5 100644
--- a/libavcodec/zmbvenc.c
+++ b/libavcodec/zmbvenc.c
@@ -27,6 +27,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 
 #include <zlib.h>
diff --git a/libavformat/4xm.c b/libavformat/4xm.c
index f5a8a7e77d..c792a776ef 100644
--- a/libavformat/4xm.c
+++ b/libavformat/4xm.c
@@ -27,6 +27,7 @@
  *   http://www.pcisys.net/~melanson/codecs/
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 #define     RIFF_TAG MKTAG('R', 'I', 'F', 'F')
diff --git a/libavformat/ape.c b/libavformat/ape.c
index 5ab92b10e1..34b1d14b21 100644
--- a/libavformat/ape.c
+++ b/libavformat/ape.c
@@ -22,6 +22,7 @@
 
 #include <stdio.h>
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 #define ENABLE_DEBUG 0
diff --git a/libavformat/avc.c b/libavformat/avc.c
index 0c180c86b7..df95bd0633 100644
--- a/libavformat/avc.c
+++ b/libavformat/avc.c
@@ -18,6 +18,8 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 #include "avio.h"
 
diff --git a/libavformat/bethsoftvid.c b/libavformat/bethsoftvid.c
index a80b105e2c..7fcf65143a 100644
--- a/libavformat/bethsoftvid.c
+++ b/libavformat/bethsoftvid.c
@@ -27,6 +27,7 @@
  * @sa http://www.svatopluk.com/andux/docs/dfvid.html
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 #include "libavcodec/bethsoftvideo.h"
 
diff --git a/libavformat/bfi.c b/libavformat/bfi.c
index c6efdd47e0..b08d166f65 100644
--- a/libavformat/bfi.c
+++ b/libavformat/bfi.c
@@ -26,6 +26,7 @@
  * @sa http://wiki.multimedia.cx/index.php?title=BFI
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 typedef struct BFIContext {
diff --git a/libavformat/dsicin.c b/libavformat/dsicin.c
index 945bacbb47..8e486518db 100644
--- a/libavformat/dsicin.c
+++ b/libavformat/dsicin.c
@@ -24,6 +24,7 @@
  * Delphine Software International CIN file demuxer
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 
diff --git a/libavformat/dxa.c b/libavformat/dxa.c
index 18fb5296cb..1ff44cfd56 100644
--- a/libavformat/dxa.c
+++ b/libavformat/dxa.c
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 #include "riff.h"
 
diff --git a/libavformat/electronicarts.c b/libavformat/electronicarts.c
index 2eb586895e..96345cc1f4 100644
--- a/libavformat/electronicarts.c
+++ b/libavformat/electronicarts.c
@@ -25,6 +25,7 @@
  * by Robin Kay (komadori at gekkou.co.uk)
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 #define SCHl_TAG MKTAG('S', 'C', 'H', 'l')
diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c
index 345e62e6a3..fd859552d3 100644
--- a/libavformat/ffmdec.c
+++ b/libavformat/ffmdec.c
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 #include "ffm.h"
 #ifdef CONFIG_FFSERVER
diff --git a/libavformat/ffmenc.c b/libavformat/ffmenc.c
index 80ec872553..4bb28e23e8 100644
--- a/libavformat/ffmenc.c
+++ b/libavformat/ffmenc.c
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 #include "ffm.h"
 
diff --git a/libavformat/flic.c b/libavformat/flic.c
index 62ea94ef63..7867f9c083 100644
--- a/libavformat/flic.c
+++ b/libavformat/flic.c
@@ -31,6 +31,7 @@
  * handles special FLIs from the PC game "Magic Carpet".
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 #define FLIC_FILE_MAGIC_1 0xAF11
diff --git a/libavformat/idcin.c b/libavformat/idcin.c
index 55ad28b080..a0361899b5 100644
--- a/libavformat/idcin.c
+++ b/libavformat/idcin.c
@@ -68,6 +68,7 @@
  *       transmitting them to the video decoder
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 #define HUFFMAN_TABLE_SIZE (64 * 1024)
diff --git a/libavformat/idroq.c b/libavformat/idroq.c
index acf2db6c1c..0326140308 100644
--- a/libavformat/idroq.c
+++ b/libavformat/idroq.c
@@ -27,6 +27,7 @@
  *   http://www.csse.monash.edu.au/~timf/
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 #define RoQ_MAGIC_NUMBER 0x1084
diff --git a/libavformat/iff.c b/libavformat/iff.c
index e5158f68b4..035477988d 100644
--- a/libavformat/iff.c
+++ b/libavformat/iff.c
@@ -27,6 +27,7 @@
  * http://wiki.multimedia.cx/index.php?title=IFF
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 #define ID_8SVX       MKTAG('8','S','V','X')
diff --git a/libavformat/ipmovie.c b/libavformat/ipmovie.c
index 35c61ded9d..71bae337f7 100644
--- a/libavformat/ipmovie.c
+++ b/libavformat/ipmovie.c
@@ -32,6 +32,7 @@
  * up and sending out the chunks.
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 /* debugging support: #define DEBUG_IPMOVIE as non-zero to see extremely
diff --git a/libavformat/lmlm4.c b/libavformat/lmlm4.c
index 7f01124ad0..dc0a90125a 100644
--- a/libavformat/lmlm4.c
+++ b/libavformat/lmlm4.c
@@ -22,6 +22,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 #define LMLM4_I_FRAME   0x00
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 6478d8484a..710214284b 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -36,6 +36,7 @@
 #include "matroska.h"
 #include "libavcodec/mpeg4audio.h"
 #include "libavutil/intfloat_readwrite.h"
+#include "libavutil/intreadwrite.h"
 #include "libavutil/avstring.h"
 #include "libavutil/lzo.h"
 #ifdef CONFIG_ZLIB
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index a2d7347cba..44c23a4057 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -24,6 +24,7 @@
 #include "isom.h"
 #include "matroska.h"
 #include "avc.h"
+#include "libavutil/intreadwrite.h"
 #include "libavutil/md5.h"
 #include "libavcodec/xiph.h"
 #include "libavcodec/mpeg4audio.h"
diff --git a/libavformat/mm.c b/libavformat/mm.c
index 347d8ebac2..c6467e1396 100644
--- a/libavformat/mm.c
+++ b/libavformat/mm.c
@@ -31,6 +31,7 @@
  *  http://wiki.multimedia.cx/index.php?title=American_Laser_Games_MM
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 #define MM_PREAMBLE_SIZE    6
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 159589b871..94bc1014f7 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -23,6 +23,7 @@
 
 //#define DEBUG
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 #include "riff.h"
 #include "isom.h"
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 00ce336eb1..ac7737eaa0 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -20,6 +20,7 @@
  */
 
 #include "libavutil/crc.h"
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 #include "mpegts.h"
 #include "internal.h"
diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
index fadbb0c591..0e892e99d8 100644
--- a/libavformat/mpegtsenc.c
+++ b/libavformat/mpegtsenc.c
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/bswap.h"
 #include "libavutil/crc.h"
 #include "avformat.h"
 #include "mpegts.h"
diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index 098bc84079..5bcc44df2c 100644
--- a/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@ -21,6 +21,7 @@
  */
 
 #include "libavutil/avstring.h"
+#include "libavutil/bswap.h"
 #include "libavutil/tree.h"
 #include "nut.h"
 
diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c
index 54d4b070f8..edcb2c7219 100644
--- a/libavformat/nutenc.c
+++ b/libavformat/nutenc.c
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/intreadwrite.h"
 #include "libavutil/tree.h"
 #include "libavcodec/mpegaudiodata.h"
 #include "nut.h"
diff --git a/libavformat/nuv.c b/libavformat/nuv.c
index 7a01e68074..747f2384c7 100644
--- a/libavformat/nuv.c
+++ b/libavformat/nuv.c
@@ -18,6 +18,8 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 #include "riff.h"
 
diff --git a/libavformat/psxstr.c b/libavformat/psxstr.c
index 469a2c40c5..583b87fa62 100644
--- a/libavformat/psxstr.c
+++ b/libavformat/psxstr.c
@@ -29,6 +29,7 @@
  * RIFF headers, followed by CD sectors.
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 #define RIFF_TAG MKTAG('R', 'I', 'F', 'F')
diff --git a/libavformat/rl2.c b/libavformat/rl2.c
index 5bab85b331..fd211bfabb 100644
--- a/libavformat/rl2.c
+++ b/libavformat/rl2.c
@@ -33,6 +33,7 @@
  * optional background_frame
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 #define EXTRADATA1_SIZE (6 + 256 * 3) ///< video base, clr, palette
diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c
index fc066dfa40..de81446f5c 100644
--- a/libavformat/rmdec.c
+++ b/libavformat/rmdec.c
@@ -20,6 +20,7 @@
  */
 
 #include "libavutil/avstring.h"
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 #include "rm.h"
 
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index 77ada043a7..82e025f7d7 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -23,6 +23,7 @@
 #define _SVID_SOURCE
 
 #include "libavutil/avstring.h"
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 #include <sys/time.h>
diff --git a/libavformat/segafilm.c b/libavformat/segafilm.c
index 1ec8c28685..462d658bf8 100644
--- a/libavformat/segafilm.c
+++ b/libavformat/segafilm.c
@@ -27,6 +27,7 @@
  *   http://www.pcisys.net/~melanson/codecs/
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 #define FILM_TAG MKBETAG('F', 'I', 'L', 'M')
diff --git a/libavformat/sierravmd.c b/libavformat/sierravmd.c
index 1e15a228c0..83262f8f1a 100644
--- a/libavformat/sierravmd.c
+++ b/libavformat/sierravmd.c
@@ -27,6 +27,7 @@
  *   http://www.pcisys.net/~melanson/codecs/
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 #define VMD_HEADER_SIZE 0x0330
diff --git a/libavformat/siff.c b/libavformat/siff.c
index 63fe80dadb..9e6c85da3e 100644
--- a/libavformat/siff.c
+++ b/libavformat/siff.c
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 enum SIFFTags{
diff --git a/libavformat/smacker.c b/libavformat/smacker.c
index 3aa08bda1a..eeab64f0b1 100644
--- a/libavformat/smacker.c
+++ b/libavformat/smacker.c
@@ -24,6 +24,7 @@
  */
 
 #include "libavutil/bswap.h"
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 #define SMACKER_PAL 0x01
diff --git a/libavformat/swfdec.c b/libavformat/swfdec.c
index d899b2d822..dc85c270e0 100644
--- a/libavformat/swfdec.c
+++ b/libavformat/swfdec.c
@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/intreadwrite.h"
 #include "swf.h"
 
 static int get_swf_tag(ByteIOContext *pb, int *len_ptr)
diff --git a/libavformat/thp.c b/libavformat/thp.c
index 434bc297a4..e25872002e 100644
--- a/libavformat/thp.c
+++ b/libavformat/thp.c
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 typedef struct ThpDemuxContext {
diff --git a/libavformat/txd.c b/libavformat/txd.c
index d2c399697b..3403938663 100644
--- a/libavformat/txd.c
+++ b/libavformat/txd.c
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 #define TXD_FILE            0x16
diff --git a/libavformat/vc1test.c b/libavformat/vc1test.c
index 7601ea9078..9c06f43345 100644
--- a/libavformat/vc1test.c
+++ b/libavformat/vc1test.c
@@ -26,6 +26,7 @@
  * Format specified in SMPTE standard 421 Annex L
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 #define VC1_EXTRADATA_SIZE 4
diff --git a/libavformat/vocdec.c b/libavformat/vocdec.c
index 8ad690929a..430f131bda 100644
--- a/libavformat/vocdec.c
+++ b/libavformat/vocdec.c
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/intreadwrite.h"
 #include "voc.h"
 
 
diff --git a/libavformat/wc3movie.c b/libavformat/wc3movie.c
index df207ef9d9..01fb617ac2 100644
--- a/libavformat/wc3movie.c
+++ b/libavformat/wc3movie.c
@@ -27,6 +27,7 @@
  *   http://www.pcisys.net/~melanson/codecs/
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 #define WC3_PREAMBLE_SIZE 8
diff --git a/libavformat/westwood.c b/libavformat/westwood.c
index d88199d690..1c769466de 100644
--- a/libavformat/westwood.c
+++ b/libavformat/westwood.c
@@ -33,6 +33,7 @@
  * qualify a file. Refer to wsaud_probe() for the precise parameters.
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 #define AUD_HEADER_SIZE 12
diff --git a/libavformat/wv.c b/libavformat/wv.c
index c9f71f95bd..a8c4db2df5 100644
--- a/libavformat/wv.c
+++ b/libavformat/wv.c
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavutil/bswap.h"
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 // specs say that maximum block size is 1Mb
diff --git a/libavformat/xa.c b/libavformat/xa.c
index 3ea2aaecc9..9c0df89c76 100644
--- a/libavformat/xa.c
+++ b/libavformat/xa.c
@@ -27,6 +27,7 @@
  *   http://wiki.multimedia.cx/index.php?title=Maxis_XA
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 #define XA00_TAG MKTAG('X', 'A', 0, 0)