diff --git a/libavcodec/cabac.c b/libavcodec/cabac.c
index dff0a91273dbacea17004970f3b7ca149295b95a..65579d8d3ba4834b9531c1c2ee07add56e592406 100644
--- a/libavcodec/cabac.c
+++ b/libavcodec/cabac.c
@@ -27,6 +27,7 @@
 #include <string.h>
 
 #include "libavutil/common.h"
+#include "libavutil/timer.h"
 #include "get_bits.h"
 #include "cabac.h"
 #include "cabac_functions.h"
diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c
index 42775dfd2b7a8a0eef771af969b772589f49e337..7040fc34b3d627ae20970d8fd64eeb3749ce753e 100644
--- a/libavcodec/dnxhddec.c
+++ b/libavcodec/dnxhddec.c
@@ -23,6 +23,7 @@
  */
 
 #include "libavutil/imgutils.h"
+#include "libavutil/timer.h"
 #include "avcodec.h"
 #include "get_bits.h"
 #include "dnxhddata.h"
diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c
index eaea242b6c505c9bc7923e7b4df15c1c503e706b..fb37a9d3e2b8764cba1111913a2c369a5aaad0a1 100644
--- a/libavcodec/dnxhdenc.c
+++ b/libavcodec/dnxhdenc.c
@@ -28,6 +28,7 @@
 #include "libavutil/attributes.h"
 #include "libavutil/internal.h"
 #include "libavutil/opt.h"
+#include "libavutil/timer.h"
 #include "avcodec.h"
 #include "dsputil.h"
 #include "internal.h"
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index e90f5712a517e1d6a77a8d6988722d6ac44753ae..3849d9b884896b5573624ec4f383900810d1f328 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -31,6 +31,7 @@
 #include "libavutil/imgutils.h"
 #include "libavutil/opt.h"
 #include "libavutil/stereo3d.h"
+#include "libavutil/timer.h"
 #include "internal.h"
 #include "cabac.h"
 #include "cabac_functions.h"
diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c
index d35c4087887a76148f871fa3d6228d8051668fe1..83aac22bbf0788a7f6b6ed411e0b194f80d8b116 100644
--- a/libavcodec/h264_cabac.c
+++ b/libavcodec/h264_cabac.c
@@ -29,6 +29,7 @@
 #define UNCHECKED_BITSTREAM_READER 1
 
 #include "libavutil/attributes.h"
+#include "libavutil/timer.h"
 #include "config.h"
 #include "cabac.h"
 #include "cabac_functions.h"
diff --git a/libavcodec/ivi_common.c b/libavcodec/ivi_common.c
index a4d24345a73b9ea526cda6cfa3bc642abb3ab027..b24d44fc40967c79162aa7b3ef8aaa49ffb69f03 100644
--- a/libavcodec/ivi_common.c
+++ b/libavcodec/ivi_common.c
@@ -28,6 +28,7 @@
 
 #define BITSTREAM_READER_LE
 #include "libavutil/attributes.h"
+#include "libavutil/timer.h"
 #include "avcodec.h"
 #include "get_bits.h"
 #include "internal.h"
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 2b3db2fb6f7d3466aaa7e89e26faa179952799f6..39f40cc0eeb3bf1fa55adaccb20ae6d35c2c0c49 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -31,6 +31,7 @@
 #include "libavutil/avassert.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/internal.h"
+#include "libavutil/timer.h"
 #include "avcodec.h"
 #include "dsputil.h"
 #include "h264chroma.h"
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index eb31814780d7c88ff329825509cd750b13e3f4e3..fa695ad20b962badbbff608d720f0b40fb6e1fcd 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -34,6 +34,7 @@
 #include "libavutil/mathematics.h"
 #include "libavutil/pixdesc.h"
 #include "libavutil/opt.h"
+#include "libavutil/timer.h"
 #include "avcodec.h"
 #include "dct.h"
 #include "dsputil.h"
diff --git a/libavutil/aes.c b/libavutil/aes.c
index a3eb295e24421d580913aa2e9c2c0fd0c2674d06..638fb81e8da6f7e3f0dbb528da8b5b3edb5ad01d 100644
--- a/libavutil/aes.c
+++ b/libavutil/aes.c
@@ -23,6 +23,7 @@
 #include "common.h"
 #include "aes.h"
 #include "intreadwrite.h"
+#include "timer.h"
 
 typedef union {
     uint64_t u64[2];
diff --git a/libavutil/base64.c b/libavutil/base64.c
index 348690d32e7969fb0d848f7023af5384bfea7baa..03ebce8b8034cd5e1da93e329ce3bc3e1c44e47f 100644
--- a/libavutil/base64.c
+++ b/libavutil/base64.c
@@ -27,6 +27,7 @@
 #include "common.h"
 #include "base64.h"
 #include "intreadwrite.h"
+#include "timer.h"
 
 /* ---------------- private code */
 static const uint8_t map2[256] =
diff --git a/libavutil/eval.c b/libavutil/eval.c
index 635e538af55d4600dca55662da804375bdc0ba1f..4a313bfad4d9fda30122eca5f845302488fbc0d2 100644
--- a/libavutil/eval.c
+++ b/libavutil/eval.c
@@ -35,6 +35,7 @@
 #include "mathematics.h"
 #include "time.h"
 #include "avstring.h"
+#include "timer.h"
 
 typedef struct Parser {
     const AVClass *class;
diff --git a/libavutil/internal.h b/libavutil/internal.h
index 9c5546f3b14fa003008c0196dabd1827b30ec3b5..4de5226d977a1aeca835f94505cd50d5f3ef4eef 100644
--- a/libavutil/internal.h
+++ b/libavutil/internal.h
@@ -36,7 +36,6 @@
 #include <assert.h>
 #include "config.h"
 #include "attributes.h"
-#include "timer.h"
 #include "cpu.h"
 #include "dict.h"
 #include "version.h"