diff --git a/libavcodec/arm/dca.h b/libavcodec/arm/dca.h
index 3b341cf3da..2cfd18a837 100644
--- a/libavcodec/arm/dca.h
+++ b/libavcodec/arm/dca.h
@@ -22,8 +22,9 @@
 #define AVCODEC_ARM_DCA_H
 
 #include <stdint.h>
+
 #include "config.h"
-#include "libavutil/intmath.h"
+#include "libavcodec/mathops.h"
 
 #if HAVE_ARMV6_INLINE && AV_GCC_VERSION_AT_LEAST(4,4) && !CONFIG_THUMB
 
diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c
index e2f37328aa..1b955e4e7b 100644
--- a/libavcodec/dcadec.c
+++ b/libavcodec/dcadec.c
@@ -30,7 +30,6 @@
 #include "libavutil/common.h"
 #include "libavutil/float_dsp.h"
 #include "libavutil/internal.h"
-#include "libavutil/intmath.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/mathematics.h"
 #include "libavutil/samplefmt.h"
@@ -42,6 +41,7 @@
 #include "dcahuff.h"
 #include "dca.h"
 #include "dca_parser.h"
+#include "mathops.h"
 #include "synth_filter.h"
 #include "dcadsp.h"
 #include "fmtconvert.h"
diff --git a/libavcodec/fft-internal.h b/libavcodec/fft-internal.h
index 61066bb18b..d66731fb48 100644
--- a/libavcodec/fft-internal.h
+++ b/libavcodec/fft-internal.h
@@ -36,7 +36,7 @@
 
 #else
 
-#include "libavutil/intmath.h"
+#include "fft.h"
 #include "mathops.h"
 
 void ff_mdct_calcw_c(FFTContext *s, FFTDouble *output, const FFTSample *input);
diff --git a/libavcodec/ra144dec.c b/libavcodec/ra144dec.c
index 61b182eb8c..f12954b2f7 100644
--- a/libavcodec/ra144dec.c
+++ b/libavcodec/ra144dec.c
@@ -23,7 +23,6 @@
  */
 
 #include "libavutil/channel_layout.h"
-#include "libavutil/intmath.h"
 #include "avcodec.h"
 #include "get_bits.h"
 #include "internal.h"
diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c
index 7a89293347..9f2bcb27c2 100644
--- a/libavcodec/ratecontrol.c
+++ b/libavcodec/ratecontrol.c
@@ -25,7 +25,6 @@
  * Rate control for video encoders.
  */
 
-#include "libavutil/intmath.h"
 #include "avcodec.h"
 #include "dsputil.h"
 #include "ratecontrol.h"