diff --git a/ffmpeg.c b/ffmpeg.c
index b9309aed43d18c8e35d2845e6ba8a488f6f784f3..1a4d2a1204a92a9fceaa5af20b1024a599be0ec2 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -40,6 +40,7 @@
 #include "libavutil/fifo.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/dict.h"
+#include "libavutil/mathematics.h"
 #include "libavutil/pixdesc.h"
 #include "libavutil/avstring.h"
 #include "libavutil/libm.h"
diff --git a/ffplay.c b/ffplay.c
index 73b30c400bd65b3518f60d8a5b0fbbabf776d22d..706ee25d65a56b334a59b7fb9088ec05c47d88d9 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -25,6 +25,7 @@
 #include <limits.h>
 #include "libavutil/avstring.h"
 #include "libavutil/colorspace.h"
+#include "libavutil/mathematics.h"
 #include "libavutil/pixdesc.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/dict.h"
diff --git a/ffserver.c b/ffserver.c
index 65a97b20cc05d7ddd5d213c042a9331d57fab0af..f80ad972e587b87129a0d1cd69f3585268a0008c 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -37,6 +37,7 @@
 #include "libavutil/avstring.h"
 #include "libavutil/lfg.h"
 #include "libavutil/dict.h"
+#include "libavutil/mathematics.h"
 #include "libavutil/random_seed.h"
 #include "libavutil/parseutils.h"
 #include "libavutil/opt.h"
diff --git a/libavcodec/acelp_pitch_delay.c b/libavcodec/acelp_pitch_delay.c
index 4e44bc9122fe4e28dd6e2e96099c0bcb0d1d5565..2b791b5aa33f8d87704253d981f51dad07ee2bec 100644
--- a/libavcodec/acelp_pitch_delay.c
+++ b/libavcodec/acelp_pitch_delay.c
@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/mathematics.h"
 #include "avcodec.h"
 #include "dsputil.h"
 #include "acelp_pitch_delay.h"
diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c
index 0bb92da8338429f20e2b70551d1a3cd594c12b18..7071b845fc027459d7b53a758f92bc0695e17119 100644
--- a/libavcodec/ituh263dec.c
+++ b/libavcodec/ituh263dec.c
@@ -30,6 +30,7 @@
 //#define DEBUG
 #include <limits.h>
 
+#include "libavutil/mathematics.h"
 #include "dsputil.h"
 #include "avcodec.h"
 #include "mpegvideo.h"
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index cd13a5cd2b3e97d9db0a3bc4d0d6db7df688b632..73bcc5b229e6611f2562ea69af25e263e5758082 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -28,6 +28,7 @@
  */
 
 #include "libavutil/intmath.h"
+#include "libavutil/mathematics.h"
 #include "avcodec.h"
 #include "dsputil.h"
 #include "mpegvideo.h"
diff --git a/libavcodec/snow.c b/libavcodec/snow.c
index 4ab029de5c4067cdc3c72b98477f0fd416ddc6ad..6a63da7aa81fa0815a9a990549467af91ebdc80c 100644
--- a/libavcodec/snow.c
+++ b/libavcodec/snow.c
@@ -3697,6 +3697,7 @@ AVCodec ff_snow_encoder = {
 #undef printf
 
 #include "libavutil/lfg.h"
+#include "libavutil/mathematics.h"
 
 int main(void){
     int width=256;
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 44a6f8c232f56eec7989c36fd8081bd67158bb18..722f7582316f3ced9b7dd0d09b6202f7cd980328 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -27,6 +27,7 @@
 
 #include "libavutil/avstring.h"
 #include "libavutil/crc.h"
+#include "libavutil/mathematics.h"
 #include "libavutil/pixdesc.h"
 #include "libavutil/audioconvert.h"
 #include "libavutil/imgutils.h"
diff --git a/libavcodec/xsubdec.c b/libavcodec/xsubdec.c
index 097cbc6c1d80b9b6e995af019a1d785a9f39f49b..4afefac2c451f506a522b5e098b2c3ff5311f91f 100644
--- a/libavcodec/xsubdec.c
+++ b/libavcodec/xsubdec.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/mathematics.h"
 #include "libavutil/imgutils.h"
 #include "avcodec.h"
 #include "get_bits.h"
diff --git a/libavfilter/vf_aspect.c b/libavfilter/vf_aspect.c
index 2ede0fd95983c712f4f363faa18a643a32eada46..b43aa86bea4d97a6cf4106a7f3a2de66f40f613e 100644
--- a/libavfilter/vf_aspect.c
+++ b/libavfilter/vf_aspect.c
@@ -23,6 +23,7 @@
  * aspect ratio modification video filters
  */
 
+#include "libavutil/mathematics.h"
 #include "avfilter.h"
 
 typedef struct {
diff --git a/libavfilter/vf_crop.c b/libavfilter/vf_crop.c
index 69e5a520c873d31c4785e5f95b8a66ebfb5e3f1d..0880d4e5f91c81d53d175ed8a7f74577d11d9936 100644
--- a/libavfilter/vf_crop.c
+++ b/libavfilter/vf_crop.c
@@ -30,6 +30,7 @@
 #include "libavutil/avstring.h"
 #include "libavutil/libm.h"
 #include "libavutil/imgutils.h"
+#include "libavutil/mathematics.h"
 
 static const char *var_names[] = {
     "E",
diff --git a/libavfilter/vf_overlay.c b/libavfilter/vf_overlay.c
index c8bdf5164265a905a12ae87089854f68add1200e..39b237523587c30bf8cc5140e131eabb84ec8a12 100644
--- a/libavfilter/vf_overlay.c
+++ b/libavfilter/vf_overlay.c
@@ -30,6 +30,7 @@
 #include "libavutil/avstring.h"
 #include "libavutil/pixdesc.h"
 #include "libavutil/imgutils.h"
+#include "libavutil/mathematics.h"
 #include "internal.h"
 
 static const char *var_names[] = {
diff --git a/libavfilter/vf_pad.c b/libavfilter/vf_pad.c
index 18873b88379e9800e749b84f1fd4d4f8d793183d..851172c058fda05499288ce3c39026410c450123 100644
--- a/libavfilter/vf_pad.c
+++ b/libavfilter/vf_pad.c
@@ -32,6 +32,7 @@
 #include "libavutil/avassert.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/parseutils.h"
+#include "libavutil/mathematics.h"
 #include "drawutils.h"
 
 static const char *var_names[] = {
diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c
index 65fe01c9ae495538d93cc3dc892905f2a4d65ebe..9ec686f8f964a3060111b03826ad9a077b2bceed 100644
--- a/libavfilter/vf_scale.c
+++ b/libavfilter/vf_scale.c
@@ -26,6 +26,7 @@
 #include "avfilter.h"
 #include "libavutil/avstring.h"
 #include "libavutil/eval.h"
+#include "libavutil/mathematics.h"
 #include "libavutil/pixdesc.h"
 #include "libswscale/swscale.h"
 
diff --git a/libavfilter/vf_setpts.c b/libavfilter/vf_setpts.c
index bece3736b07fd6503e89086f526e98e8d1bfe77b..f2650923d0faf80b57780a638b58ac725c14a2f7 100644
--- a/libavfilter/vf_setpts.c
+++ b/libavfilter/vf_setpts.c
@@ -27,6 +27,7 @@
 /* #define DEBUG */
 
 #include "libavutil/eval.h"
+#include "libavutil/mathematics.h"
 #include "avfilter.h"
 
 static const char *var_names[] = {
diff --git a/libavfilter/vf_settb.c b/libavfilter/vf_settb.c
index 9575483c598285300b10451c45618301f0281849..eeb4353915fc0d4d094b3ea0a3a074f4974e2298 100644
--- a/libavfilter/vf_settb.c
+++ b/libavfilter/vf_settb.c
@@ -25,6 +25,7 @@
 
 #include "libavutil/avstring.h"
 #include "libavutil/eval.h"
+#include "libavutil/mathematics.h"
 #include "libavutil/rational.h"
 #include "avfilter.h"
 #include "internal.h"
diff --git a/libavfilter/vsrc_color.c b/libavfilter/vsrc_color.c
index 6d41c8ab71006981078f562b2b42c46ad399dbbe..0fb08d7dc6518bb1fdec60146a0218203e883de5 100644
--- a/libavfilter/vsrc_color.c
+++ b/libavfilter/vsrc_color.c
@@ -22,6 +22,7 @@
 #include "libavutil/pixdesc.h"
 #include "libavutil/colorspace.h"
 #include "libavutil/imgutils.h"
+#include "libavutil/mathematics.h"
 #include "libavutil/parseutils.h"
 #include "drawutils.h"
 
diff --git a/libavfilter/vsrc_nullsrc.c b/libavfilter/vsrc_nullsrc.c
index 629de78a1871214d1f39caf450a93b7107fd878e..dfd56fa4951123fe55606747374e479a8a243869 100644
--- a/libavfilter/vsrc_nullsrc.c
+++ b/libavfilter/vsrc_nullsrc.c
@@ -23,6 +23,7 @@
 
 #include "libavutil/avstring.h"
 #include "libavutil/eval.h"
+#include "libavutil/mathematics.h"
 #include "libavutil/parseutils.h"
 #include "avfilter.h"
 
diff --git a/libavformat/applehttp.c b/libavformat/applehttp.c
index 38f33a24f35e6f2460fe3a0b9364fa7e131982f4..7e0c930271019a9ab5d577edd2c945384e9db0d3 100644
--- a/libavformat/applehttp.c
+++ b/libavformat/applehttp.c
@@ -27,6 +27,7 @@
 
 #include "libavutil/avstring.h"
 #include "libavutil/intreadwrite.h"
+#include "libavutil/mathematics.h"
 #include "libavutil/opt.h"
 #include "libavutil/dict.h"
 #include "avformat.h"
diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c
index 38fe4f9fa2f070deaf97d4760b9d5234896f35f8..ac559a0edd3af3c48e5ad7cab852299d4e015295 100644
--- a/libavformat/asfdec.c
+++ b/libavformat/asfdec.c
@@ -25,6 +25,7 @@
 #include "libavutil/common.h"
 #include "libavutil/avstring.h"
 #include "libavutil/dict.h"
+#include "libavutil/mathematics.h"
 #include "libavcodec/mpegaudio.h"
 #include "avformat.h"
 #include "avio_internal.h"
diff --git a/libavformat/assdec.c b/libavformat/assdec.c
index b270200af2cba769f982029ca5ab688b96a78b6b..08b520e6563a6772e7808ba76243d1281c9fbcae 100644
--- a/libavformat/assdec.c
+++ b/libavformat/assdec.c
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/mathematics.h"
 #include "avformat.h"
 #include "internal.h"
 
diff --git a/libavformat/audiointerleave.c b/libavformat/audiointerleave.c
index e4cb1b8edcf5cedd3adcd96db3a2bb942e4d5904..e48f826e1466eaf163b2986e7d2e855cb86ade20 100644
--- a/libavformat/audiointerleave.c
+++ b/libavformat/audiointerleave.c
@@ -21,6 +21,7 @@
  */
 
 #include "libavutil/fifo.h"
+#include "libavutil/mathematics.h"
 #include "avformat.h"
 #include "audiointerleave.h"
 #include "internal.h"
diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index a00b9ced2db35d958d0ad6c7953aa5bc9dc667f7..2ea156e9ec70e08c0f006939da8d7a97b6a6ad14 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -21,6 +21,7 @@
 
 #include <strings.h>
 #include "libavutil/intreadwrite.h"
+#include "libavutil/mathematics.h"
 #include "libavutil/bswap.h"
 #include "libavutil/dict.h"
 #include "avformat.h"
diff --git a/libavformat/dv.c b/libavformat/dv.c
index 4b41e0aa8e78a318718d08924dcbd1705f11dc9e..f38b9546053e862012a8429870d097fea5973e18 100644
--- a/libavformat/dv.c
+++ b/libavformat/dv.c
@@ -32,6 +32,7 @@
 #include "avformat.h"
 #include "libavcodec/dvdata.h"
 #include "libavutil/intreadwrite.h"
+#include "libavutil/mathematics.h"
 #include "dv.h"
 
 struct DVDemuxContext {
diff --git a/libavformat/dvenc.c b/libavformat/dvenc.c
index 537581ac3a87b3384dae190d7bef5bb12c8a9ee5..504e3ee26f6104236f5ba171eae9dd576366c3ce 100644
--- a/libavformat/dvenc.c
+++ b/libavformat/dvenc.c
@@ -35,6 +35,7 @@
 #include "libavcodec/dvdata.h"
 #include "dv.h"
 #include "libavutil/fifo.h"
+#include "libavutil/mathematics.h"
 
 struct DVMuxContext {
     const DVprofile*  sys;           /* current DV profile, e.g.: 525/60, 625/50 */
diff --git a/libavformat/ffmetadec.c b/libavformat/ffmetadec.c
index e3d800d3c4272a41c263c5d7bea5c3b3153ef198..73d3b83ed7678a9bc8a786830f196b264898521e 100644
--- a/libavformat/ffmetadec.c
+++ b/libavformat/ffmetadec.c
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/mathematics.h"
 #include "avformat.h"
 #include "ffmeta.h"
 #include "internal.h"
diff --git a/libavformat/gxfenc.c b/libavformat/gxfenc.c
index ac8847598495548af2a918aab0d693962b610147..5a3ff39ab215517b68ee999147ebbf081d9f4d3c 100644
--- a/libavformat/gxfenc.c
+++ b/libavformat/gxfenc.c
@@ -20,6 +20,7 @@
  */
 
 #include "libavutil/intfloat_readwrite.h"
+#include "libavutil/mathematics.h"
 #include "avformat.h"
 #include "gxf.h"
 #include "riff.h"
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index 34c65d07a4e2dc2d661a58f01522c88ec2cf2a02..d132b65f5bb86f9c5a6e3727c0fe81fa7c496f81 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -29,6 +29,7 @@
 #include "libavutil/samplefmt.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/intfloat_readwrite.h"
+#include "libavutil/mathematics.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 f0b87dd84c1907129f49290f88497451883c04c5..acde35d97e357062f14ad05b9571c55e9f93ced2 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -27,6 +27,7 @@
 
 #include "libavutil/intreadwrite.h"
 #include "libavutil/intfloat_readwrite.h"
+#include "libavutil/mathematics.h"
 #include "libavutil/avstring.h"
 #include "libavutil/dict.h"
 #include "avformat.h"
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 2e2f86933856c7476215a86c2e887a08ac2a9363..0de7c4d44ded7ffa38bfc35c515d596ea9831b2f 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -33,6 +33,7 @@
 #include "internal.h"
 #include "libavutil/avstring.h"
 #include "libavutil/intfloat_readwrite.h"
+#include "libavutil/mathematics.h"
 #include "libavutil/opt.h"
 #include "libavutil/dict.h"
 #include "rtpenc.h"
diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c
index a1db2323ac88fd3b2be3091ed554b9b2016287f3..70ced02218f4cf40e05518eedd36bfe7e161b3f4 100644
--- a/libavformat/mp3dec.c
+++ b/libavformat/mp3dec.c
@@ -22,6 +22,7 @@
 #include "libavutil/avstring.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/dict.h"
+#include "libavutil/mathematics.h"
 #include "avformat.h"
 #include "id3v2.h"
 #include "id3v1.h"
diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c
index 820c5bd5e17ba71efc8b03d385d64f6c4d15b2b2..5859254492106975e62a14eaacb37e18b0a2c85b 100644
--- a/libavformat/mpegenc.c
+++ b/libavformat/mpegenc.c
@@ -20,6 +20,7 @@
  */
 
 #include "libavutil/fifo.h"
+#include "libavutil/mathematics.h"
 #include "libavcodec/put_bits.h"
 #include "avformat.h"
 #include "mpeg.h"
diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
index 26d2cb229fe2f605292d684775558288414f6d3d..83ede1d79b129dc82cd8e8c1d1e9c7ca5f3a459d 100644
--- a/libavformat/mpegtsenc.c
+++ b/libavformat/mpegtsenc.c
@@ -22,6 +22,7 @@
 #include "libavutil/bswap.h"
 #include "libavutil/crc.h"
 #include "libavutil/dict.h"
+#include "libavutil/mathematics.h"
 #include "libavutil/opt.h"
 #include "libavcodec/mpegvideo.h"
 #include "avformat.h"
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
index 82daa2a0028c6ca872d0efdc5f4fe1b69157719b..cf2bb6cc657d7ac3f63ea84b7367836982f007b6 100644
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@ -46,6 +46,7 @@
 //#define DEBUG
 
 #include "libavutil/aes.h"
+#include "libavutil/mathematics.h"
 #include "libavcodec/bytestream.h"
 #include "avformat.h"
 #include "mxf.h"
diff --git a/libavformat/nsvdec.c b/libavformat/nsvdec.c
index 6e9cfe3a84609da743ed1ad7cbf1e680bcea6144..4787331def1c1682fd4e8d54f9a2792c6e819feb 100644
--- a/libavformat/nsvdec.c
+++ b/libavformat/nsvdec.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/mathematics.h"
 #include "avformat.h"
 #include "riff.h"
 #include "libavutil/dict.h"
diff --git a/libavformat/nut.c b/libavformat/nut.c
index 9a2ee6b0b06711ebdbc34c29e0c725c2cd45ade5..1ce048d6450f39ad3d20da0117a7b6723ccc98f2 100644
--- a/libavformat/nut.c
+++ b/libavformat/nut.c
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/mathematics.h"
 #include "libavutil/tree.h"
 #include "nut.h"
 #include "internal.h"
diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index db1b999c90ff5cc29b03c76b9e06bc861699e042..93888a2bd6065ca4891ddb6c1b4d3b53d88e213c 100644
--- a/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@ -24,6 +24,7 @@
 #include "libavutil/avstring.h"
 #include "libavutil/bswap.h"
 #include "libavutil/dict.h"
+#include "libavutil/mathematics.h"
 #include "libavutil/tree.h"
 #include "avio_internal.h"
 #include "nut.h"
diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c
index 260a7607d81c134b05719261fc06f21e0f66db55..412c670387cf9dcf0968d06dba95d517a368e920 100644
--- a/libavformat/nutenc.c
+++ b/libavformat/nutenc.c
@@ -20,6 +20,7 @@
  */
 
 #include "libavutil/intreadwrite.h"
+#include "libavutil/mathematics.h"
 #include "libavutil/tree.h"
 #include "libavutil/dict.h"
 #include "libavcodec/mpegaudiodata.h"
diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c
index bc4b3c10b2fd2e1169153668abb661e5ddce7ec4..2b2189c10e31789edbdda4702c8d3fba79e58cc3 100644
--- a/libavformat/oggenc.c
+++ b/libavformat/oggenc.c
@@ -20,6 +20,7 @@
  */
 
 #include "libavutil/crc.h"
+#include "libavutil/mathematics.h"
 #include "libavutil/random_seed.h"
 #include "libavcodec/xiph.h"
 #include "libavcodec/bytestream.h"
diff --git a/libavformat/output-example.c b/libavformat/output-example.c
index 4453c03039cd05f6824cbc2ef28c0dbfa4d9506d..3b28b7c7c6364a2cd2374f0a1c78107295dc1127 100644
--- a/libavformat/output-example.c
+++ b/libavformat/output-example.c
@@ -34,6 +34,7 @@
 #include <string.h>
 #include <math.h>
 
+#include "libavutil/mathematics.h"
 #include "libavformat/avformat.h"
 #include "libswscale/swscale.h"
 
diff --git a/libavformat/pcm.c b/libavformat/pcm.c
index 26ab1424b2fe3ed497e8116a2fe89198855d8b92..7d5fed560124607602956cb9f730abb6e3f0bd8c 100644
--- a/libavformat/pcm.c
+++ b/libavformat/pcm.c
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/mathematics.h"
 #include "avformat.h"
 #include "pcm.h"
 
diff --git a/libavformat/r3d.c b/libavformat/r3d.c
index 619c6a7b6cd1703dc5b07f432807893fdf198134..5dd7f997e5b6a8f17d1b6fb79bc37f3554e9c91a 100644
--- a/libavformat/r3d.c
+++ b/libavformat/r3d.c
@@ -23,6 +23,7 @@
 
 #include "libavutil/intreadwrite.h"
 #include "libavutil/dict.h"
+#include "libavutil/mathematics.h"
 #include "avformat.h"
 
 typedef struct {
diff --git a/libavformat/riff.c b/libavformat/riff.c
index 817349cb82d19b48a5fca6395ae39a78993eeead..27f45b91d99a9460276b866730673059df939f62 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/mathematics.h"
 #include "libavcodec/avcodec.h"
 #include "avformat.h"
 #include "avio_internal.h"
diff --git a/libavformat/rl2.c b/libavformat/rl2.c
index b4172c284adb06c57a6a0f451e1c7654553c0fc0..12cb391ad812ca9dcf8acd21aa24f079ec165699 100644
--- a/libavformat/rl2.c
+++ b/libavformat/rl2.c
@@ -34,6 +34,7 @@
  */
 
 #include "libavutil/intreadwrite.h"
+#include "libavutil/mathematics.h"
 #include "avformat.h"
 
 #define EXTRADATA1_SIZE (6 + 256 * 3) ///< video base, clr, palette
diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c
index a910cf08bb0bcb73530c30a2de0b0b306844ff24..2c262d9bd3190d2a14586d4d5623ea0f8194a368 100644
--- a/libavformat/rtpdec.c
+++ b/libavformat/rtpdec.c
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/mathematics.h"
 #include "libavcodec/get_bits.h"
 #include "avformat.h"
 #include "mpegts.h"
diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c
index 3da6dfb3a9c708fbd14eab5fdb2e24673cb896cd..c41215877815ba3a95505a307ea9e10bb4498a9d 100644
--- a/libavformat/rtpenc.c
+++ b/libavformat/rtpenc.c
@@ -22,6 +22,7 @@
 #include "avformat.h"
 #include "mpegts.h"
 #include "internal.h"
+#include "libavutil/mathematics.h"
 #include "libavutil/random_seed.h"
 #include "libavutil/opt.h"
 
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index 80cd587144919c43395753df2b5e5873d910cd97..ce9bf1e1eb2e9c7d0782bf62a58d596291dd32cd 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -22,6 +22,7 @@
 #include "libavutil/base64.h"
 #include "libavutil/avstring.h"
 #include "libavutil/intreadwrite.h"
+#include "libavutil/mathematics.h"
 #include "libavutil/parseutils.h"
 #include "libavutil/random_seed.h"
 #include "libavutil/dict.h"
diff --git a/libavformat/rtspdec.c b/libavformat/rtspdec.c
index 9cd9be1d4bb6349a4ebe9504e833267f40d087b4..2dff46d1de48b0979ed91d05fc422a3866bf4495 100644
--- a/libavformat/rtspdec.c
+++ b/libavformat/rtspdec.c
@@ -21,6 +21,7 @@
 
 #include "libavutil/avstring.h"
 #include "libavutil/intreadwrite.h"
+#include "libavutil/mathematics.h"
 #include "libavutil/opt.h"
 #include "avformat.h"
 
diff --git a/libavformat/seek.c b/libavformat/seek.c
index 71e2f8a6b44593ac98ec6f12674c2cfbb71342a6..6c4286bb8e6727ea812fb5d6c14204b57a7790f8 100644
--- a/libavformat/seek.c
+++ b/libavformat/seek.c
@@ -21,6 +21,7 @@
  */
 
 #include "seek.h"
+#include "libavutil/mathematics.h"
 #include "libavutil/mem.h"
 #include "internal.h"
 
diff --git a/libavformat/utils.c b/libavformat/utils.c
index de26a1886eb79d41ea81b629813ae050349d371d..060e58e9b2cb0978c5eb293a4f77c8d54b73ad13 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -31,6 +31,7 @@
 #include "metadata.h"
 #include "id3v2.h"
 #include "libavutil/avstring.h"
+#include "libavutil/mathematics.h"
 #include "riff.h"
 #include "audiointerleave.h"
 #include "url.h"
diff --git a/libavformat/vqf.c b/libavformat/vqf.c
index 5be7dfea21855c778ea076a61cac729c75a23e04..dd02abd70ac85889d977062b254c3ca4877e7f8a 100644
--- a/libavformat/vqf.c
+++ b/libavformat/vqf.c
@@ -22,6 +22,7 @@
 #include "avformat.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/dict.h"
+#include "libavutil/mathematics.h"
 
 typedef struct VqfContext {
     int frame_bit_len;
diff --git a/libavformat/wav.c b/libavformat/wav.c
index 92c9bfcbc47c0c8f838851ece0732b3125805dac..391461044b3b11449cc63ee13726170f9c20161b 100644
--- a/libavformat/wav.c
+++ b/libavformat/wav.c
@@ -22,6 +22,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/mathematics.h"
 #include "avformat.h"
 #include "avio_internal.h"
 #include "pcm.h"
diff --git a/libavutil/avutil.h b/libavutil/avutil.h
index b8882a705ec101290aa136a89e7d68723eb22380..53dba004e7da0017b01da7f42d915a893997c8a7 100644
--- a/libavutil/avutil.h
+++ b/libavutil/avutil.h
@@ -121,7 +121,6 @@ char av_get_picture_type_char(enum AVPictureType pict_type);
 
 #include "common.h"
 #include "error.h"
-#include "mathematics.h"
 #include "rational.h"
 #include "log.h"
 #include "pixfmt.h"
diff --git a/tests/seek_test.c b/tests/seek_test.c
index 5d4f41c5286fff261f60d6b7c48f603e655436ca..71b2a2d6c03c7094621f715036e683221d0dd2fa 100644
--- a/tests/seek_test.c
+++ b/tests/seek_test.c
@@ -25,6 +25,7 @@
 #include <string.h>
 
 #include "libavutil/common.h"
+#include "libavutil/mathematics.h"
 #include "libavformat/avformat.h"
 
 #undef exit