diff --git a/libavformat/4xm.c b/libavformat/4xm.c
index 93c90e8cbc66e60b314e518711354b30c8dd2a7d..32699da43922a87a5283676fee6237a9b726590e 100644
--- a/libavformat/4xm.c
+++ b/libavformat/4xm.c
@@ -28,6 +28,7 @@
  */
 
 #include "libavutil/intreadwrite.h"
+#include "libavutil/intfloat_readwrite.h"
 #include "avformat.h"
 
 #define     RIFF_TAG MKTAG('R', 'I', 'F', 'F')
diff --git a/libavformat/aiffenc.c b/libavformat/aiffenc.c
index 3bdb4f4f8cafee9c78babdc621d2c90afb26b5b8..5a64688483d618dea8cc08dcd7e394361f84d10e 100644
--- a/libavformat/aiffenc.c
+++ b/libavformat/aiffenc.c
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/intfloat_readwrite.h"
 #include "avformat.h"
 #include "aiff.h"
 #include "avio_internal.h"
diff --git a/libavformat/cafdec.c b/libavformat/cafdec.c
index dff3b4128117d61032fb3bcf3b2dc3ff683a4e37..68686cab97467c58e501839498faa0c09880ba33 100644
--- a/libavformat/cafdec.c
+++ b/libavformat/cafdec.c
@@ -29,6 +29,7 @@
 #include "riff.h"
 #include "isom.h"
 #include "libavutil/intreadwrite.h"
+#include "libavutil/intfloat_readwrite.h"
 #include "libavutil/dict.h"
 #include "caf.h"
 
diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c
index dfd86cb28ba1518f46e564f9db6b8b7e8833ab32..91ab2e4370ca7daf12b2a53d1545a4fcc672a4b6 100644
--- a/libavformat/ffmdec.c
+++ b/libavformat/ffmdec.c
@@ -20,6 +20,7 @@
  */
 
 #include "libavutil/intreadwrite.h"
+#include "libavutil/intfloat_readwrite.h"
 #include "avformat.h"
 #include "ffm.h"
 #if CONFIG_FFSERVER
diff --git a/libavformat/ffmenc.c b/libavformat/ffmenc.c
index 71d93e5c436ea3df9cb2f35f597f919327c68ba8..9a3eb40ad70aad12738cb15aa430e301892ac113 100644
--- a/libavformat/ffmenc.c
+++ b/libavformat/ffmenc.c
@@ -20,6 +20,7 @@
  */
 
 #include "libavutil/intreadwrite.h"
+#include "libavutil/intfloat_readwrite.h"
 #include "avformat.h"
 #include "ffm.h"
 
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index c6b386e28f5c7cc0f5de678175486ce229f00bba..3b7db0e6ca7f6bbe3d8df30189f274f294c4a3f9 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -26,6 +26,7 @@
 
 #include "libavutil/avstring.h"
 #include "libavutil/dict.h"
+#include "libavutil/intfloat_readwrite.h"
 #include "libavcodec/bytestream.h"
 #include "libavcodec/mpeg4audio.h"
 #include "avformat.h"
diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c
index 487993cd9a17319aa840abf14a913c78ce0ee949..a3e7e2569258130bf8f578b5c5808b9bac3fdad5 100644
--- a/libavformat/flvenc.c
+++ b/libavformat/flvenc.c
@@ -18,6 +18,8 @@
  * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavutil/intfloat_readwrite.h"
 #include "avformat.h"
 #include "flv.h"
 #include "internal.h"
diff --git a/libavformat/gxfenc.c b/libavformat/gxfenc.c
index 98126fa2c4d117bfce534d5a7ef1f3b515814bbe..ac8847598495548af2a918aab0d693962b610147 100644
--- a/libavformat/gxfenc.c
+++ b/libavformat/gxfenc.c
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/intfloat_readwrite.h"
 #include "avformat.h"
 #include "gxf.h"
 #include "riff.h"
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index e485539a26b9e1bf96f0ffcecbaf647de7247c9f..34c65d07a4e2dc2d661a58f01522c88ec2cf2a02 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -28,6 +28,7 @@
 #include "avlanguage.h"
 #include "libavutil/samplefmt.h"
 #include "libavutil/intreadwrite.h"
+#include "libavutil/intfloat_readwrite.h"
 #include "libavutil/random_seed.h"
 #include "libavutil/lfg.h"
 #include "libavutil/dict.h"
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 194c2f86dd4ddff19a219ccac074e5369663ddc1..f0b87dd84c1907129f49290f88497451883c04c5 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -26,6 +26,7 @@
 //#define MOV_EXPORT_ALL_METADATA
 
 #include "libavutil/intreadwrite.h"
+#include "libavutil/intfloat_readwrite.h"
 #include "libavutil/avstring.h"
 #include "libavutil/dict.h"
 #include "avformat.h"
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index dcc55814434314c6b2a1f04326a3fa94bbe59e6b..2e2f86933856c7476215a86c2e887a08ac2a9363 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -32,6 +32,7 @@
 #include "libavcodec/put_bits.h"
 #include "internal.h"
 #include "libavutil/avstring.h"
+#include "libavutil/intfloat_readwrite.h"
 #include "libavutil/opt.h"
 #include "libavutil/dict.h"
 #include "rtpenc.h"
diff --git a/libavformat/nuv.c b/libavformat/nuv.c
index 4e1ee5702b0c699b28592f0234999bd647ea34a4..854aadd990bd96acede59b3d7147fd978d732c3f 100644
--- a/libavformat/nuv.c
+++ b/libavformat/nuv.c
@@ -20,6 +20,7 @@
  */
 
 #include "libavutil/intreadwrite.h"
+#include "libavutil/intfloat_readwrite.h"
 #include "avformat.h"
 #include "riff.h"
 
diff --git a/libavformat/rtmppkt.c b/libavformat/rtmppkt.c
index 35ef7fdaaebdf693e36b1d55e8cf0b95c789d114..6bf641a742a7698b9c62fd9f73890db3cca8ce80 100644
--- a/libavformat/rtmppkt.c
+++ b/libavformat/rtmppkt.c
@@ -21,6 +21,7 @@
 
 #include "libavcodec/bytestream.h"
 #include "libavutil/avstring.h"
+#include "libavutil/intfloat_readwrite.h"
 #include "avformat.h"
 
 #include "rtmppkt.h"
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
index e841f9b8d178dba862f3b7d571f40b78f93fd819..de4eb0fd23a77d196c16bfcb6497b50dac960553 100644
--- a/libavformat/rtmpproto.c
+++ b/libavformat/rtmpproto.c
@@ -26,6 +26,7 @@
 
 #include "libavcodec/bytestream.h"
 #include "libavutil/avstring.h"
+#include "libavutil/intfloat_readwrite.h"
 #include "libavutil/lfg.h"
 #include "libavutil/sha.h"
 #include "avformat.h"
diff --git a/libavformat/soxdec.c b/libavformat/soxdec.c
index fb7b063f8cff8951afba1ca2ed3b4e9e4257f651..b3b35b12fdbb7a1844772be6f0b4bb89022db3e1 100644
--- a/libavformat/soxdec.c
+++ b/libavformat/soxdec.c
@@ -30,6 +30,7 @@
  */
 
 #include "libavutil/intreadwrite.h"
+#include "libavutil/intfloat_readwrite.h"
 #include "libavutil/dict.h"
 #include "avformat.h"
 #include "pcm.h"
diff --git a/libavformat/soxenc.c b/libavformat/soxenc.c
index 01d0cda2cfd2cab083581f4462afae8162c71007..a0faa466df42cb59c1adc9386d8187759c77e6da 100644
--- a/libavformat/soxenc.c
+++ b/libavformat/soxenc.c
@@ -30,6 +30,7 @@
  */
 
 #include "libavutil/intreadwrite.h"
+#include "libavutil/intfloat_readwrite.h"
 #include "libavutil/dict.h"
 #include "avformat.h"
 #include "avio_internal.h"
diff --git a/libavformat/thp.c b/libavformat/thp.c
index 6cdcefd377c65941472e685234804007d7d110ad..51dbd810cd42c27bbccd053fe7fb2d1861978e50 100644
--- a/libavformat/thp.c
+++ b/libavformat/thp.c
@@ -20,6 +20,7 @@
  */
 
 #include "libavutil/intreadwrite.h"
+#include "libavutil/intfloat_readwrite.h"
 #include "avformat.h"
 
 typedef struct ThpDemuxContext {
diff --git a/libavutil/avutil.h b/libavutil/avutil.h
index d6e4668b88a3ebea84701c169664c26480f411bb..b8882a705ec101290aa136a89e7d68723eb22380 100644
--- a/libavutil/avutil.h
+++ b/libavutil/avutil.h
@@ -123,7 +123,6 @@ char av_get_picture_type_char(enum AVPictureType pict_type);
 #include "error.h"
 #include "mathematics.h"
 #include "rational.h"
-#include "intfloat_readwrite.h"
 #include "log.h"
 #include "pixfmt.h"