diff --git a/drivers/sht1x/sht1x.c b/drivers/sht1x/sht1x.c
index 47b7edcfdf41..a76e189a3f6a 100644
--- a/drivers/sht1x/sht1x.c
+++ b/drivers/sht1x/sht1x.c
@@ -26,6 +26,7 @@
 #include "sht1x.h"
 #include "sht1x_defines.h"
 #include "bitarithm.h"
+#include "container.h"
 
 #define ENABLE_DEBUG 0
 #include "debug.h"
diff --git a/sys/include/auto_init_utils.h b/sys/include/auto_init_utils.h
index d150186e2c0c..f2633c0c5917 100644
--- a/sys/include/auto_init_utils.h
+++ b/sys/include/auto_init_utils.h
@@ -30,7 +30,7 @@
 #include <stdint.h>
 #include "xfa.h"
 #include "macros/xtstr.h"
-#include "kernel_defines.h"
+#include "modules.h"
 #if IS_USED(MODULE_PREPROCESSOR_SUCCESSOR)
 #include "preprocessor_successor.h"
 #endif
diff --git a/sys/include/crypto/ciphers.h b/sys/include/crypto/ciphers.h
index 3ae2845473fa..b9ae66fa479e 100644
--- a/sys/include/crypto/ciphers.h
+++ b/sys/include/crypto/ciphers.h
@@ -23,7 +23,7 @@
 #define CRYPTO_CIPHERS_H
 
 #include <stdint.h>
-#include "kernel_defines.h"
+#include "modules.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/sys/include/dbgpin.h b/sys/include/dbgpin.h
index 72aae108c017..192d73db5b12 100644
--- a/sys/include/dbgpin.h
+++ b/sys/include/dbgpin.h
@@ -23,7 +23,7 @@
 #ifndef DBGPIN_H
 #define DBGPIN_H
 
-#include "kernel_defines.h"
+#include "container.h"
 #include "periph/gpio.h"
 
 #ifdef __cplusplus
diff --git a/sys/include/embUnit.h b/sys/include/embUnit.h
index 43764abaafca..884bbaa0742b 100644
--- a/sys/include/embUnit.h
+++ b/sys/include/embUnit.h
@@ -23,7 +23,6 @@
 #define EMBUNIT_H
 
 #include "embUnit/embUnit.h"
-#include "kernel_defines.h"
 
 #ifdef OUTPUT
 #   define OUTPUT_XML       (1)
diff --git a/sys/include/evtimer.h b/sys/include/evtimer.h
index 86303ae1438b..66ff0a5d4b00 100644
--- a/sys/include/evtimer.h
+++ b/sys/include/evtimer.h
@@ -46,7 +46,7 @@
 #define EVTIMER_H
 
 #include <stdint.h>
-#include "kernel_defines.h"
+#include "modules.h"
 
 #if IS_USED(MODULE_EVTIMER_ON_ZTIMER)
 #include "ztimer.h"
diff --git a/sys/include/net/credman.h b/sys/include/net/credman.h
index 2f89e6de2a01..91f988d32832 100644
--- a/sys/include/net/credman.h
+++ b/sys/include/net/credman.h
@@ -29,7 +29,7 @@
 
 #include <unistd.h>
 #include <stdint.h>
-#include "kernel_defines.h"
+#include "modules.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/sys/include/net/dns.h b/sys/include/net/dns.h
index 7133bfa14f62..f5296895be82 100644
--- a/sys/include/net/dns.h
+++ b/sys/include/net/dns.h
@@ -20,7 +20,7 @@
 #ifndef NET_DNS_H
 #define NET_DNS_H
 
-#include "kernel_defines.h"
+#include "modules.h"
 #include "net/sock/dns.h"
 #include "net/sock/dodtls.h"
 #include "net/gcoap/dns.h"
diff --git a/sys/include/net/dns/cache.h b/sys/include/net/dns/cache.h
index 91288a18ec84..91a43ff28feb 100644
--- a/sys/include/net/dns/cache.h
+++ b/sys/include/net/dns/cache.h
@@ -35,7 +35,7 @@
 
 #include <stdint.h>
 
-#include "kernel_defines.h"
+#include "modules.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/sys/include/net/gnrc/ipv6/nib/abr.h b/sys/include/net/gnrc/ipv6/nib/abr.h
index 8a68b5fabed6..32747c89ac25 100644
--- a/sys/include/net/gnrc/ipv6/nib/abr.h
+++ b/sys/include/net/gnrc/ipv6/nib/abr.h
@@ -21,7 +21,7 @@
 #ifndef NET_GNRC_IPV6_NIB_ABR_H
 #define NET_GNRC_IPV6_NIB_ABR_H
 
-#include <kernel_defines.h>
+#include "modules.h"
 
 /* prevent cascading include error to xtimer if it is not compiled in or not
  * supported by board */
diff --git a/sys/include/net/gnrc/ipv6/nib/conf.h b/sys/include/net/gnrc/ipv6/nib/conf.h
index 39e91c2ee93c..0f9563bc482d 100644
--- a/sys/include/net/gnrc/ipv6/nib/conf.h
+++ b/sys/include/net/gnrc/ipv6/nib/conf.h
@@ -21,7 +21,7 @@
 #ifndef NET_GNRC_IPV6_NIB_CONF_H
 #define NET_GNRC_IPV6_NIB_CONF_H
 
-#include <kernel_defines.h>
+#include "modules.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/sys/include/net/gnrc/ipv6/nib/pl.h b/sys/include/net/gnrc/ipv6/nib/pl.h
index 3de817c952b7..5ca899c64d4e 100644
--- a/sys/include/net/gnrc/ipv6/nib/pl.h
+++ b/sys/include/net/gnrc/ipv6/nib/pl.h
@@ -21,7 +21,7 @@
 #define NET_GNRC_IPV6_NIB_PL_H
 
 #include <stdint.h>
-#include <kernel_defines.h>
+#include "modules.h"
 
 #if IS_USED(MODULE_EVTIMER)
 #include "evtimer.h"
diff --git a/sys/include/net/gnrc/lorawan/region.h b/sys/include/net/gnrc/lorawan/region.h
index 633babb7f36b..6714e4b988d3 100644
--- a/sys/include/net/gnrc/lorawan/region.h
+++ b/sys/include/net/gnrc/lorawan/region.h
@@ -18,7 +18,7 @@
 #ifndef NET_GNRC_LORAWAN_REGION_H
 #define NET_GNRC_LORAWAN_REGION_H
 
-#include "kernel_defines.h"
+#include "modules.h"
 #include "net/gnrc/lorawan.h"
 
 #ifdef __cplusplus
diff --git a/sys/include/net/gnrc/mac/mac.h b/sys/include/net/gnrc/mac/mac.h
index cef40e317e08..807fecd898e1 100644
--- a/sys/include/net/gnrc/mac/mac.h
+++ b/sys/include/net/gnrc/mac/mac.h
@@ -21,7 +21,7 @@
  * @author      Shuguo Zhuo  <shuguo.zhuo@inria.fr>
  */
 
-#include "kernel_defines.h"
+#include "modules.h"
 
 #ifndef NET_GNRC_MAC_MAC_H
 #define NET_GNRC_MAC_MAC_H
diff --git a/sys/include/net/gnrc/netif/conf.h b/sys/include/net/gnrc/netif/conf.h
index 923fb6432f5e..f7af784e5887 100644
--- a/sys/include/net/gnrc/netif/conf.h
+++ b/sys/include/net/gnrc/netif/conf.h
@@ -20,7 +20,7 @@
 #ifndef NET_GNRC_NETIF_CONF_H
 #define NET_GNRC_NETIF_CONF_H
 
-#include <kernel_defines.h>
+#include "modules.h"
 
 #include "net/dhcpv6/client.h"
 #include "net/ieee802154.h"
diff --git a/sys/include/net/gnrc/netif/internal.h b/sys/include/net/gnrc/netif/internal.h
index 353eb8a8412a..5e0de86c2b60 100644
--- a/sys/include/net/gnrc/netif/internal.h
+++ b/sys/include/net/gnrc/netif/internal.h
@@ -21,7 +21,7 @@
 #ifndef NET_GNRC_NETIF_INTERNAL_H
 #define NET_GNRC_NETIF_INTERNAL_H
 
-#include <kernel_defines.h>
+#include "modules.h"
 
 #include "net/gnrc/netif.h"
 #include "net/l2util.h"
diff --git a/sys/include/net/gnrc/netif/ipv6.h b/sys/include/net/gnrc/netif/ipv6.h
index 8bd2ec0ca251..d58c708017d8 100644
--- a/sys/include/net/gnrc/netif/ipv6.h
+++ b/sys/include/net/gnrc/netif/ipv6.h
@@ -18,7 +18,7 @@
 #ifndef NET_GNRC_NETIF_IPV6_H
 #define NET_GNRC_NETIF_IPV6_H
 
-#include <kernel_defines.h>
+#include "modules.h"
 
 #include "evtimer_msg.h"
 #include "net/ipv6/addr.h"
diff --git a/sys/include/net/gnrc/nettype.h b/sys/include/net/gnrc/nettype.h
index 3584ca4cd41e..34aea25fa4c1 100644
--- a/sys/include/net/gnrc/nettype.h
+++ b/sys/include/net/gnrc/nettype.h
@@ -35,7 +35,7 @@
 
 #include <inttypes.h>
 
-#include "kernel_defines.h"
+#include "modules.h"
 #include "net/ethertype.h"
 #include "net/protnum.h"
 
diff --git a/sys/include/net/gnrc/rpl.h b/sys/include/net/gnrc/rpl.h
index 8a494dd29ed3..d669b58abfcc 100644
--- a/sys/include/net/gnrc/rpl.h
+++ b/sys/include/net/gnrc/rpl.h
@@ -143,7 +143,7 @@
 
 #include <string.h>
 #include <stdint.h>
-#include "kernel_defines.h"
+#include "modules.h"
 #include "net/gnrc.h"
 #include "net/gnrc/ipv6.h"
 #include "net/ipv6/addr.h"
diff --git a/sys/include/net/gnrc/sixlowpan/config.h b/sys/include/net/gnrc/sixlowpan/config.h
index d7a0a025e6a4..67364552782b 100644
--- a/sys/include/net/gnrc/sixlowpan/config.h
+++ b/sys/include/net/gnrc/sixlowpan/config.h
@@ -21,7 +21,7 @@
 #ifndef NET_GNRC_SIXLOWPAN_CONFIG_H
 #define NET_GNRC_SIXLOWPAN_CONFIG_H
 
-#include "kernel_defines.h"
+#include "modules.h"
 #include "timex.h"
 
 #ifdef __cplusplus
diff --git a/sys/include/net/gnrc/sixlowpan/ctx.h b/sys/include/net/gnrc/sixlowpan/ctx.h
index af982efd7543..514872410236 100644
--- a/sys/include/net/gnrc/sixlowpan/ctx.h
+++ b/sys/include/net/gnrc/sixlowpan/ctx.h
@@ -31,7 +31,7 @@
 
 #include "net/ipv6/addr.h"
 #include "timex.h"
-#include <kernel_defines.h>
+#include "modules.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/sys/include/net/gnrc/sixlowpan/frag/sfr/congure.h b/sys/include/net/gnrc/sixlowpan/frag/sfr/congure.h
index 88627af58f54..068eaee12f00 100644
--- a/sys/include/net/gnrc/sixlowpan/frag/sfr/congure.h
+++ b/sys/include/net/gnrc/sixlowpan/frag/sfr/congure.h
@@ -30,7 +30,7 @@
 #include <stdlib.h>
 
 #include "congure.h"
-#include "kernel_defines.h"
+#include "modules.h"
 #include "net/gnrc/sixlowpan/frag/sfr.h"
 
 #ifdef __cplusplus
diff --git a/sys/include/net/gnrc/sixlowpan/frag/sfr_types.h b/sys/include/net/gnrc/sixlowpan/frag/sfr_types.h
index d2f417ddd45e..bbb18ded6295 100644
--- a/sys/include/net/gnrc/sixlowpan/frag/sfr_types.h
+++ b/sys/include/net/gnrc/sixlowpan/frag/sfr_types.h
@@ -24,7 +24,7 @@
 #include "clist.h"
 #include "congure.h"
 #include "evtimer_msg.h"
-#include "kernel_defines.h"
+#include "modules.h"
 #include "msg.h"
 #include "xtimer.h"
 
diff --git a/sys/include/net/gnrc/sixlowpan/frag/vrb.h b/sys/include/net/gnrc/sixlowpan/frag/vrb.h
index 58fe7838af7a..8ea59f5198aa 100644
--- a/sys/include/net/gnrc/sixlowpan/frag/vrb.h
+++ b/sys/include/net/gnrc/sixlowpan/frag/vrb.h
@@ -25,7 +25,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "kernel_defines.h"
+#include "modules.h"
 #include "net/gnrc/netif.h"
 #include "net/gnrc/sixlowpan/config.h"
 #ifdef MODULE_GNRC_SIXLOWPAN_FRAG
diff --git a/sys/include/net/ieee802154.h b/sys/include/net/ieee802154.h
index 64aab6fd879b..19f00125074b 100644
--- a/sys/include/net/ieee802154.h
+++ b/sys/include/net/ieee802154.h
@@ -26,7 +26,7 @@
 
 #include "byteorder.h"
 #include "net/eui64.h"
-#include "kernel_defines.h"
+#include "modules.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/sys/include/net/ieee802154_security.h b/sys/include/net/ieee802154_security.h
index 04bb4a243650..6d3d842ee258 100644
--- a/sys/include/net/ieee802154_security.h
+++ b/sys/include/net/ieee802154_security.h
@@ -31,7 +31,6 @@
 #define NET_IEEE802154_SECURITY_H
 
 #include <stdint.h>
-#include "kernel_defines.h"
 #include "ieee802154.h"
 #include "crypto/ciphers.h"
 
diff --git a/sys/include/net/lora.h b/sys/include/net/lora.h
index e73a6af63ce6..be61195db8fc 100644
--- a/sys/include/net/lora.h
+++ b/sys/include/net/lora.h
@@ -24,7 +24,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#include "kernel_defines.h"
+#include "modules.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/sys/include/net/loramac.h b/sys/include/net/loramac.h
index 52c94a1b7a34..396dc5925a91 100644
--- a/sys/include/net/loramac.h
+++ b/sys/include/net/loramac.h
@@ -26,7 +26,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#include "kernel_defines.h"
+#include "modules.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/sys/include/phydat.h b/sys/include/phydat.h
index db8036a06ccf..0425f96e2b66 100644
--- a/sys/include/phydat.h
+++ b/sys/include/phydat.h
@@ -37,7 +37,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
-#include "kernel_defines.h"
+#include "modules.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/sys/include/senml.h b/sys/include/senml.h
index 0b41122182d0..84b93dfc9465 100644
--- a/sys/include/senml.h
+++ b/sys/include/senml.h
@@ -40,7 +40,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "kernel_defines.h"
+#include "modules.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/sys/include/shell.h b/sys/include/shell.h
index 3d6e9c1b09af..dde5cb0b67e4 100644
--- a/sys/include/shell.h
+++ b/sys/include/shell.h
@@ -23,7 +23,7 @@
 #include <stdint.h>
 #include "periph/pm.h"
 
-#include "kernel_defines.h"
+#include "modules.h"
 #include "xfa.h"
 
 #ifdef __cplusplus
diff --git a/sys/include/stdio_base.h b/sys/include/stdio_base.h
index d9a972064fc8..a98ca1fd7fa4 100644
--- a/sys/include/stdio_base.h
+++ b/sys/include/stdio_base.h
@@ -25,7 +25,7 @@
 
 #include <unistd.h>
 
-#include "kernel_defines.h"
+#include "modules.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/sys/include/string_utils.h b/sys/include/string_utils.h
index 46bfb3def45c..5c7da82a8d45 100644
--- a/sys/include/string_utils.h
+++ b/sys/include/string_utils.h
@@ -30,7 +30,7 @@
 #include <strings.h>
 #include <sys/types.h>
 
-#include "kernel_defines.h"
+#include "modules.h"
 
 #ifndef STRING_UTILS_H
 #define STRING_UTILS_H
diff --git a/sys/include/tm.h b/sys/include/tm.h
index baabef94087d..f39f2b1b5a95 100644
--- a/sys/include/tm.h
+++ b/sys/include/tm.h
@@ -21,8 +21,6 @@
 #include <sys/time.h>
 #include <stdint.h>
 
-#include "kernel_defines.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/sys/include/usb/usbus.h b/sys/include/usb/usbus.h
index 7f2551deb44e..51b2043221d5 100644
--- a/sys/include/usb/usbus.h
+++ b/sys/include/usb/usbus.h
@@ -29,7 +29,7 @@
 #include "clist.h"
 #include "event.h"
 #include "sched.h"
-#include "kernel_defines.h"
+#include "modules.h"
 #include "msg.h"
 #include "thread.h"
 
diff --git a/sys/shell/cmds/gnrc_netif.c b/sys/shell/cmds/gnrc_netif.c
index 7472cd6e2603..35d7b443a9ca 100644
--- a/sys/shell/cmds/gnrc_netif.c
+++ b/sys/shell/cmds/gnrc_netif.c
@@ -33,6 +33,7 @@
 #include "net/loramac.h"
 #include "net/netif.h"
 #include "shell.h"
+#include "container.h"
 
 #ifdef MODULE_NETSTATS
 #include "net/netstats.h"
diff --git a/sys/shell/cmds/openwsn.c b/sys/shell/cmds/openwsn.c
index a0e636ac2f42..a2095fe409d1 100644
--- a/sys/shell/cmds/openwsn.c
+++ b/sys/shell/cmds/openwsn.c
@@ -27,6 +27,7 @@
 #include "net/ipv6/addr.h"
 #include "net/l2util.h"
 #include "net/netif.h"
+#include "container.h"
 
 #include "openwsn.h"
 #include "opendefs.h"
diff --git a/sys/shell/cmds/sht1x.c b/sys/shell/cmds/sht1x.c
index 26caf3652c50..fbaaf9c43134 100644
--- a/sys/shell/cmds/sht1x.c
+++ b/sys/shell/cmds/sht1x.c
@@ -27,6 +27,7 @@
 #include <string.h>
 
 #include "shell.h"
+#include "container.h"
 #include "sht1x.h"
 #include "sht1x_params.h"
 
diff --git a/tests/can_trx/main.c b/tests/can_trx/main.c
index d1ae11928105..89e211066f11 100644
--- a/tests/can_trx/main.c
+++ b/tests/can_trx/main.c
@@ -21,8 +21,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "kernel_defines.h"
 #include "can/can_trx.h"
-
 #include "shell.h"
 
 #ifdef MODULE_TJA1042
diff --git a/tests/driver_dynamixel/main.c b/tests/driver_dynamixel/main.c
index 12a808fd7bdb..5acbc786e1e7 100644
--- a/tests/driver_dynamixel/main.c
+++ b/tests/driver_dynamixel/main.c
@@ -11,6 +11,7 @@
 #include "stdio_uart.h"
 #include "board.h"
 #include "periph/gpio.h"
+#include "container.h"
 
 #include <stdio.h>
 #include <string.h>
diff --git a/tests/driver_feetech/main.c b/tests/driver_feetech/main.c
index d0f04f46ef76..d7d3e0496e2f 100644
--- a/tests/driver_feetech/main.c
+++ b/tests/driver_feetech/main.c
@@ -9,6 +9,7 @@
 #include "feetech.h"
 #include "shell.h"
 #include "stdio_uart.h"
+#include "container.h"
 
 #include <stdio.h>
 #include <string.h>
diff --git a/tests/driver_sdcard_spi/main.c b/tests/driver_sdcard_spi/main.c
index dc495013563c..30b2fe52dcce 100644
--- a/tests/driver_sdcard_spi/main.c
+++ b/tests/driver_sdcard_spi/main.c
@@ -22,6 +22,7 @@
 #include "sdcard_spi_internal.h"
 #include "sdcard_spi_params.h"
 #include "fmt.h"
+#include "container.h"
 #include <inttypes.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/tests/driver_sht1x/main.c b/tests/driver_sht1x/main.c
index 9524469d1479..80cb0d90396b 100644
--- a/tests/driver_sht1x/main.c
+++ b/tests/driver_sht1x/main.c
@@ -20,9 +20,11 @@
  */
 
 #include <stdio.h>
+#include <stddef.h>
 
 #include "shell.h"
 #include "sht1x_params.h"
+#include "container.h"
 
 #define SHT1X_NUM     ARRAY_SIZE(sht1x_params)
 extern sht1x_dev_t sht1x_devs[SHT1X_NUM];
diff --git a/tests/gnrc_dhcpv6_client_6lbr/main.c b/tests/gnrc_dhcpv6_client_6lbr/main.c
index e0eeb3ec9102..8ca9ce4d1c24 100644
--- a/tests/gnrc_dhcpv6_client_6lbr/main.c
+++ b/tests/gnrc_dhcpv6_client_6lbr/main.c
@@ -13,6 +13,7 @@
  * @author  Martine Lenders <m.lenders@fu-berlin.de>
  */
 
+#include <stddef.h>
 #include "shell.h"
 
 int main(void)
diff --git a/tests/gnrc_dhcpv6_client_stateless/main.c b/tests/gnrc_dhcpv6_client_stateless/main.c
index e0eeb3ec9102..8ca9ce4d1c24 100644
--- a/tests/gnrc_dhcpv6_client_stateless/main.c
+++ b/tests/gnrc_dhcpv6_client_stateless/main.c
@@ -13,6 +13,7 @@
  * @author  Martine Lenders <m.lenders@fu-berlin.de>
  */
 
+#include <stddef.h>
 #include "shell.h"
 
 int main(void)
diff --git a/tests/gnrc_dhcpv6_relay/main.c b/tests/gnrc_dhcpv6_relay/main.c
index 6002f3a27230..45e8a481bda2 100644
--- a/tests/gnrc_dhcpv6_relay/main.c
+++ b/tests/gnrc_dhcpv6_relay/main.c
@@ -13,6 +13,7 @@
  * @author  Martine Lenders <m.lenders@fu-berlin.de>
  */
 
+#include <stddef.h>
 #include "shell.h"
 
 int main(void)
diff --git a/tests/periph_flashpage_unittest/main.c b/tests/periph_flashpage_unittest/main.c
index 380793e2870b..6e3d231e12f1 100644
--- a/tests/periph_flashpage_unittest/main.c
+++ b/tests/periph_flashpage_unittest/main.c
@@ -23,6 +23,7 @@
 #include "cpu.h"
 #include "embUnit.h"
 #include "embUnit/embUnit.h"
+#include "modules.h"
 
 /* need to define these values before including the header */
 #ifndef FLASHPAGE_SIZE
diff --git a/tests/phydat_dump/main.c b/tests/phydat_dump/main.c
index 8ce6d1ff22fb..f4225b78c76a 100644
--- a/tests/phydat_dump/main.c
+++ b/tests/phydat_dump/main.c
@@ -19,6 +19,7 @@
 #include <stdio.h>
 
 #include "phydat.h"
+#include "container.h"
 
 typedef struct {
     phydat_t dat;
diff --git a/tests/pkg_fatfs/main.c b/tests/pkg_fatfs/main.c
index 90eeb452a141..9c35925aa99a 100644
--- a/tests/pkg_fatfs/main.c
+++ b/tests/pkg_fatfs/main.c
@@ -24,6 +24,7 @@
 #include "mtd.h"
 #include "fatfs_diskio_mtd.h"
 #include "shell.h"
+#include "container.h"
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/tests/pkg_tinycbor/main.c b/tests/pkg_tinycbor/main.c
index 546d701fdf70..bd198001a421 100644
--- a/tests/pkg_tinycbor/main.c
+++ b/tests/pkg_tinycbor/main.c
@@ -25,6 +25,7 @@
 #include "embUnit/embUnit.h"
 #include "fmt.h"
 #include "cbor.h"
+#include "container.h"
 
 const char *tests[] = {
     "00",                  /* 0                       */
diff --git a/tests/unittests/tests-clif/tests-clif.c b/tests/unittests/tests-clif/tests-clif.c
index f2e7177916bc..105ec5e5928e 100644
--- a/tests/unittests/tests-clif/tests-clif.c
+++ b/tests/unittests/tests-clif/tests-clif.c
@@ -9,6 +9,7 @@
 #include <string.h>
 #include "embUnit.h"
 #include "tests-clif.h"
+#include "container.h"
 
 #include "clif.h"
 
diff --git a/tests/unittests/tests-core/tests-core-macros.c b/tests/unittests/tests-core/tests-core-macros.c
index 1170d6b9b8be..76b5b4554f98 100644
--- a/tests/unittests/tests-core/tests-core-macros.c
+++ b/tests/unittests/tests-core/tests-core-macros.c
@@ -6,6 +6,7 @@
  * directory for more details.
  */
 
+#include <stddef.h>
 #include <stdint.h>
 #include <limits.h>
 #include "embUnit.h"
diff --git a/tests/unittests/tests-core/tests-core-priority-queue.c b/tests/unittests/tests-core/tests-core-priority-queue.c
index f13bc5435439..481a67f3ee10 100644
--- a/tests/unittests/tests-core/tests-core-priority-queue.c
+++ b/tests/unittests/tests-core/tests-core-priority-queue.c
@@ -7,6 +7,8 @@
  */
 #include <string.h>
 
+#include "container.h"
+
 #include "embUnit.h"
 
 #include "priority_queue.h"
diff --git a/tests/unittests/tests-sht1x/tests-sht1x.c b/tests/unittests/tests-sht1x/tests-sht1x.c
index 9b45db0801e7..8eccf5068573 100644
--- a/tests/unittests/tests-sht1x/tests-sht1x.c
+++ b/tests/unittests/tests-sht1x/tests-sht1x.c
@@ -8,6 +8,7 @@
 
 #include <sht1x.h>
 #include <stdlib.h>
+#include "container.h"
 #include "embUnit/embUnit.h"
 #include "tests-sht1x.h"
 
diff --git a/tests/unittests/tests-uri_parser/tests-uri_parser.c b/tests/unittests/tests-uri_parser/tests-uri_parser.c
index 77e58e7a7bfa..3b2761848db9 100644
--- a/tests/unittests/tests-uri_parser/tests-uri_parser.c
+++ b/tests/unittests/tests-uri_parser/tests-uri_parser.c
@@ -14,6 +14,7 @@
 
 #include <stdio.h>
 #include <stdbool.h>
+#include "container.h"
 #include "embUnit.h"
 
 #include "uri_parser.h"