diff --git a/boards/weact-f411ce/board.c b/boards/weact-f411ce/board.c
index ebb75e3674..44005e77e5 100644
--- a/boards/weact-f411ce/board.c
+++ b/boards/weact-f411ce/board.c
@@ -21,6 +21,7 @@
 #include "board.h"
 #include "cpu.h"
 #include "mtd.h"
+#include "timex.h"
 #include "mtd_spi_nor.h"
 #include "periph/gpio.h"
 
diff --git a/boards/weact-f411ce/include/board.h b/boards/weact-f411ce/include/board.h
index efc1fce19e..1a66833fa7 100644
--- a/boards/weact-f411ce/include/board.h
+++ b/boards/weact-f411ce/include/board.h
@@ -27,7 +27,6 @@ extern "C" {
 
 #include "mtd.h"
 #include "periph_cpu.h"
-#include "timex.h"
 
 /**
  * @name    Xtimer configuration
diff --git a/cpu/esp_common/freertos/portable.c b/cpu/esp_common/freertos/portable.c
index b5b29a8808..edf4fe4c68 100644
--- a/cpu/esp_common/freertos/portable.c
+++ b/cpu/esp_common/freertos/portable.c
@@ -17,6 +17,7 @@
 
 #include "esp_common.h"
 #include "log.h"
+#include "timex.h"
 
 #include "freertos/FreeRTOS.h"
 
diff --git a/examples/dtls-echo/dtls-client.c b/examples/dtls-echo/dtls-client.c
index f8ab7e9221..b90b9e44f2 100644
--- a/examples/dtls-echo/dtls-client.c
+++ b/examples/dtls-echo/dtls-client.c
@@ -24,6 +24,7 @@
 #include <stdio.h>
 #include <inttypes.h>
 
+#include "timex.h"
 #include "net/sock/udp.h"
 #include "tinydtls_keys.h"
 
diff --git a/examples/dtls-echo/dtls-server.c b/examples/dtls-echo/dtls-server.c
index 8fed742a82..f527149b40 100644
--- a/examples/dtls-echo/dtls-server.c
+++ b/examples/dtls-echo/dtls-server.c
@@ -27,6 +27,7 @@
 
 #include "net/sock/udp.h"
 #include "msg.h"
+#include "timex.h"
 #include "tinydtls_keys.h"
 
 /* TinyDTLS */
diff --git a/examples/dtls-sock/dtls-server.c b/examples/dtls-sock/dtls-server.c
index 31e0c908fb..123a7ab5a2 100644
--- a/examples/dtls-sock/dtls-server.c
+++ b/examples/dtls-sock/dtls-server.c
@@ -23,6 +23,7 @@
 #include "net/credman.h"
 #include "msg.h"
 #include "thread.h"
+#include "timex.h"
 
 #include "tinydtls_keys.h"
 
diff --git a/examples/nimble_heart_rate_sensor/main.c b/examples/nimble_heart_rate_sensor/main.c
index d45492c639..4aff69759b 100644
--- a/examples/nimble_heart_rate_sensor/main.c
+++ b/examples/nimble_heart_rate_sensor/main.c
@@ -25,6 +25,7 @@
 #include "event/timeout.h"
 #include "nimble_riot.h"
 #include "net/bluetil/ad.h"
+#include "timex.h"
 
 #include "host/ble_hs.h"
 #include "host/ble_gatt.h"
diff --git a/pkg/wakaama/contrib/lwm2m_client.c b/pkg/wakaama/contrib/lwm2m_client.c
index 8b0e05b5ab..43ff906bd0 100644
--- a/pkg/wakaama/contrib/lwm2m_client.c
+++ b/pkg/wakaama/contrib/lwm2m_client.c
@@ -21,6 +21,8 @@
 
 #include <string.h>
 
+#include "timex.h"
+
 #include "liblwm2m.h"
 
 #include "lwm2m_platform.h"
diff --git a/sys/net/application_layer/asymcute/asymcute.c b/sys/net/application_layer/asymcute/asymcute.c
index ab6a7d7494..9cbbe39fd5 100644
--- a/sys/net/application_layer/asymcute/asymcute.c
+++ b/sys/net/application_layer/asymcute/asymcute.c
@@ -23,6 +23,7 @@
 #include "log.h"
 #include "random.h"
 #include "byteorder.h"
+#include "timex.h"
 
 #include "net/asymcute.h"
 
diff --git a/sys/net/application_layer/nanocoap/sock.c b/sys/net/application_layer/nanocoap/sock.c
index c090cb57b5..1860a292bc 100644
--- a/sys/net/application_layer/nanocoap/sock.c
+++ b/sys/net/application_layer/nanocoap/sock.c
@@ -26,6 +26,7 @@
 
 #include "net/nanocoap_sock.h"
 #include "net/sock/udp.h"
+#include "timex.h"
 
 #define ENABLE_DEBUG (0)
 #include "debug.h"
diff --git a/sys/net/gnrc/network_layer/ipv6/nib/_nib-internal.h b/sys/net/gnrc/network_layer/ipv6/nib/_nib-internal.h
index 1244e4747e..0abc44f52f 100644
--- a/sys/net/gnrc/network_layer/ipv6/nib/_nib-internal.h
+++ b/sys/net/gnrc/network_layer/ipv6/nib/_nib-internal.h
@@ -41,6 +41,7 @@
 #include "net/gnrc/sixlowpan/ctx.h"
 #include "net/ndp.h"
 #include "random.h"
+#include "timex.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/sys/net/gnrc/network_layer/ndp/gnrc_ndp.c b/sys/net/gnrc/network_layer/ndp/gnrc_ndp.c
index 2cec7ed1d6..a79207241a 100644
--- a/sys/net/gnrc/network_layer/ndp/gnrc_ndp.c
+++ b/sys/net/gnrc/network_layer/ndp/gnrc_ndp.c
@@ -25,6 +25,8 @@
 
 #include "net/gnrc/ndp.h"
 
+#include "timex.h"
+
 #define ENABLE_DEBUG    (0)
 #include "debug.h"
 
diff --git a/sys/shell/commands/sc_can.c b/sys/shell/commands/sc_can.c
index 5e3a1158b6..8628b0284a 100644
--- a/sys/shell/commands/sc_can.c
+++ b/sys/shell/commands/sc_can.c
@@ -27,6 +27,8 @@
 #include "can/conn/raw.h"
 #include "can/raw.h"
 
+#include "timex.h"
+
 #define SC_CAN_MAX_FILTERS  10
 #define xstr(a) str(a)
 #define str(a) #a
diff --git a/sys/shell/commands/sc_gnrc_ipv6_nib.c b/sys/shell/commands/sc_gnrc_ipv6_nib.c
index e37053d7a5..12a91876fc 100644
--- a/sys/shell/commands/sc_gnrc_ipv6_nib.c
+++ b/sys/shell/commands/sc_gnrc_ipv6_nib.c
@@ -20,6 +20,8 @@
 #include "net/gnrc/netif.h"
 #include "net/ipv6/addr.h"
 
+#include "timex.h"
+
 static void _usage(char **argv);
 static int _nib_neigh(int argc, char **argv);
 static int _nib_prefix(int argc, char **argv);
diff --git a/sys/shell/commands/sc_gnrc_rpl.c b/sys/shell/commands/sc_gnrc_rpl.c
index 93184417e8..beb90fb2ce 100644
--- a/sys/shell/commands/sc_gnrc_rpl.c
+++ b/sys/shell/commands/sc_gnrc_rpl.c
@@ -24,6 +24,7 @@
 #include "net/gnrc/rpl/dodag.h"
 #include "utlist.h"
 #include "trickle.h"
+#include "xtimer.h"
 #ifdef MODULE_GNRC_RPL_P2P
 #include "net/gnrc/rpl/p2p.h"
 #include "net/gnrc/rpl/p2p_dodag.h"
diff --git a/sys/suit/transport/coap.c b/sys/suit/transport/coap.c
index c3741d7675..02902ec255 100644
--- a/sys/suit/transport/coap.c
+++ b/sys/suit/transport/coap.c
@@ -31,6 +31,7 @@
 #include "net/nanocoap_sock.h"
 #include "thread.h"
 #include "periph/pm.h"
+#include "xtimer.h"
 
 #include "suit/transport/coap.h"
 #include "net/sock/util.h"
diff --git a/tests/events/main.c b/tests/events/main.c
index 44d4575fde..7b44ece504 100644
--- a/tests/events/main.c
+++ b/tests/events/main.c
@@ -27,6 +27,7 @@
 #include "event.h"
 #include "event/timeout.h"
 #include "event/callback.h"
+#include "xtimer.h"
 
 #define STACKSIZE               THREAD_STACKSIZE_DEFAULT
 #define PRIO                    (THREAD_PRIORITY_MAIN - 1)
diff --git a/tests/gnrc_ipv6_nib/main.c b/tests/gnrc_ipv6_nib/main.c
index a5d93d9a53..2694e6c0a0 100644
--- a/tests/gnrc_ipv6_nib/main.c
+++ b/tests/gnrc_ipv6_nib/main.c
@@ -32,6 +32,7 @@
 #include "net/gnrc/netif/internal.h"
 #include "net/ndp.h"
 #include "sched.h"
+#include "timex.h"
 
 #define _BUFFER_SIZE    (128)
 #define _CUR_HL         (155)
diff --git a/tests/gnrc_ipv6_nib_6ln/main.c b/tests/gnrc_ipv6_nib_6ln/main.c
index b0c77805f2..eaa13747ac 100644
--- a/tests/gnrc_ipv6_nib_6ln/main.c
+++ b/tests/gnrc_ipv6_nib_6ln/main.c
@@ -35,6 +35,7 @@
 #include "net/ndp.h"
 #include "net/sixlowpan/nd.h"
 #include "sched.h"
+#include "timex.h"
 
 #define _BUFFER_SIZE    (196)
 #define _ARO_LTIME      (4224)
diff --git a/tests/pkg_tinydtls_sock_async/dtls-client.c b/tests/pkg_tinydtls_sock_async/dtls-client.c
index 7831bd8ec9..2cafecc18d 100644
--- a/tests/pkg_tinydtls_sock_async/dtls-client.c
+++ b/tests/pkg_tinydtls_sock_async/dtls-client.c
@@ -26,6 +26,7 @@
 #include "net/sock/dtls.h"
 #include "net/ipv6/addr.h"
 #include "net/credman.h"
+#include "timex.h"
 
 #include "tinydtls_common.h"
 #include "tinydtls_keys.h"