diff --git a/core/include/kernel_types.h b/core/include/kernel_types.h
index 858035314d..42bb52591c 100644
--- a/core/include/kernel_types.h
+++ b/core/include/kernel_types.h
@@ -49,51 +49,6 @@ typedef signed ssize_t;
 extern "C" {
 #endif
 
-/**
- * @def MAXTHREADS
- * @brief The maximum number of threads to be scheduled
- */
-#ifndef MAXTHREADS
-#define MAXTHREADS 32
-#endif
-
-/**
- * Canonical identifier for an invalid PID.
- */
-#define KERNEL_PID_UNDEF 0
-
-/**
- * The first valid PID (inclusive).
- */
-#define KERNEL_PID_FIRST (KERNEL_PID_UNDEF + 1)
-
-/**
- * The last valid PID (inclusive).
- */
-#define KERNEL_PID_LAST (KERNEL_PID_FIRST + MAXTHREADS - 1)
-
-/**
- * Macro for printing formatter
- */
-#define PRIkernel_pid PRIi16
-
-/**
- * Unique process identifier
- */
-typedef int16_t kernel_pid_t;
-
-/**
- * @brief   Determine if the given pid is valid
- *
- * @param[in]   pid     The pid to check
- *
- * @return      true if the pid is valid, false otherwise
- */
-static inline int pid_is_valid(kernel_pid_t pid)
-{
-    return ((KERNEL_PID_FIRST <= pid) && (pid <= KERNEL_PID_LAST));
-}
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/core/include/msg.h b/core/include/msg.h
index 5b598470a7..7ce01161a2 100644
--- a/core/include/msg.h
+++ b/core/include/msg.h
@@ -167,7 +167,8 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include "kernel_types.h"
+
+#include "sched.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/core/include/rmutex.h b/core/include/rmutex.h
index 67f664f549..3fc6585782 100644
--- a/core/include/rmutex.h
+++ b/core/include/rmutex.h
@@ -31,7 +31,7 @@
 #endif
 
 #include "mutex.h"
-#include "kernel_types.h"
+#include "sched.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/core/include/sched.h b/core/include/sched.h
index 214d7af327..ceea4771ba 100644
--- a/core/include/sched.h
+++ b/core/include/sched.h
@@ -81,8 +81,9 @@
 #define SCHED_H
 
 #include <stddef.h>
+#include <inttypes.h>
+
 #include "kernel_defines.h"
-#include "kernel_types.h"
 #include "native_sched.h"
 #include "clist.h"
 
@@ -90,6 +91,50 @@
 extern "C" {
 #endif
 
+/**
+ * @def MAXTHREADS
+ * @brief The maximum number of threads to be scheduled
+ */
+#ifndef MAXTHREADS
+#define MAXTHREADS 32
+#endif
+
+/**
+ * Canonical identifier for an invalid PID.
+ */
+#define KERNEL_PID_UNDEF 0
+
+/**
+ * The first valid PID (inclusive).
+ */
+#define KERNEL_PID_FIRST (KERNEL_PID_UNDEF + 1)
+
+/**
+ * The last valid PID (inclusive).
+ */
+#define KERNEL_PID_LAST (KERNEL_PID_FIRST + MAXTHREADS - 1)
+
+/**
+ * Macro for printing formatter
+ */
+#define PRIkernel_pid PRIi16
+
+/**
+ * Unique process identifier
+ */
+typedef int16_t kernel_pid_t;
+
+/**
+ * @brief   Determine if the given pid is valid
+ *
+ * @param[in]   pid     The pid to check
+ *
+ * @return      true if the pid is valid, false otherwise
+ */
+static inline int pid_is_valid(kernel_pid_t pid)
+{
+    return ((KERNEL_PID_FIRST <= pid) && (pid <= KERNEL_PID_LAST));
+}
 /**
  * @brief forward declaration for thread_t, defined in thread.h
  */
diff --git a/cpu/esp_common/include/freertos/task.h b/cpu/esp_common/include/freertos/task.h
index 7d99e2209d..1eeca9550a 100644
--- a/cpu/esp_common/include/freertos/task.h
+++ b/cpu/esp_common/include/freertos/task.h
@@ -13,6 +13,8 @@
 
 #ifndef DOXYGEN
 
+#include <limits.h> /* for INT_MAX */
+
 #include "thread.h"
 #include "freertos/FreeRTOS.h"
 
diff --git a/cpu/stm32/include/periph_cpu.h b/cpu/stm32/include/periph_cpu.h
index 817ddfdd44..5ca6def479 100644
--- a/cpu/stm32/include/periph_cpu.h
+++ b/cpu/stm32/include/periph_cpu.h
@@ -21,6 +21,8 @@
 #ifndef PERIPH_CPU_H
 #define PERIPH_CPU_H
 
+#include <limits.h>
+
 #include "cpu.h"
 #include "macros/units.h"
 
diff --git a/drivers/include/pir.h b/drivers/include/pir.h
index 7e2343112f..b46989c1af 100644
--- a/drivers/include/pir.h
+++ b/drivers/include/pir.h
@@ -22,7 +22,7 @@
 #ifndef PIR_H
 #define PIR_H
 
-#include "kernel_types.h"
+#include "sched.h"
 #include "periph/gpio.h"
 #include "stdbool.h"
 
diff --git a/pkg/lwip/include/arch/sys_arch.h b/pkg/lwip/include/arch/sys_arch.h
index 7ac430a30b..d90b8e7b1a 100644
--- a/pkg/lwip/include/arch/sys_arch.h
+++ b/pkg/lwip/include/arch/sys_arch.h
@@ -25,7 +25,7 @@
 #include <stdint.h>
 
 #include "cib.h"
-#include "kernel_types.h"
+#include "sched.h"
 #include "mbox.h"
 #include "mutex.h"
 #include "random.h"
diff --git a/pkg/ndn-riot/patches/0003-adapt-to-moved-kernel_pid_t-location.patch b/pkg/ndn-riot/patches/0003-adapt-to-moved-kernel_pid_t-location.patch
new file mode 100644
index 0000000000..76231a7648
--- /dev/null
+++ b/pkg/ndn-riot/patches/0003-adapt-to-moved-kernel_pid_t-location.patch
@@ -0,0 +1,39 @@
+From 51d973f2a0a04a716af8260c62fb5045356a30a5 Mon Sep 17 00:00:00 2001
+From: Kaspar Schleiser <kaspar@schleiser.de>
+Date: Mon, 23 Nov 2020 12:44:54 +0100
+Subject: [PATCH] adapt to moved kernel_pid_t location
+
+---
+ face-table.h | 2 +-
+ ndn.h        | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/face-table.h b/face-table.h
+index 28b44a5c02..fb0c39b083 100644
+--- a/face-table.h
++++ b/face-table.h
+@@ -20,7 +20,7 @@
+ #ifndef NDN_FACE_TABLE_H_
+ #define NDN_FACE_TABLE_H_
+ 
+-#include <kernel_types.h>
++#include "sched.h"
+ 
+ #ifdef __cplusplus
+ extern "C" {
+diff --git a/ndn.h b/ndn.h
+index d8d148c7f7..47d2032301 100644
+--- a/ndn.h
++++ b/ndn.h
+@@ -20,7 +20,7 @@
+ #ifndef NDN_H_
+ #define NDN_H_
+ 
+-#include <kernel_types.h>
++#include "sched.h"
+ 
+ #ifdef __cplusplus
+ extern "C" {
+-- 
+2.29.2
+
diff --git a/pkg/uwb-core/include/dpl/dpl_tasks.h b/pkg/uwb-core/include/dpl/dpl_tasks.h
index 29591396b2..62b2139aaf 100644
--- a/pkg/uwb-core/include/dpl/dpl_tasks.h
+++ b/pkg/uwb-core/include/dpl/dpl_tasks.h
@@ -22,7 +22,7 @@
 
 #include "dpl_types.h"
 
-#include "kernel_types.h"
+#include "sched.h"
 #include "thread.h"
 
 #ifdef __cplusplus
diff --git a/sys/include/can/device.h b/sys/include/can/device.h
index 7a484ae03f..f0dbaa041e 100644
--- a/sys/include/can/device.h
+++ b/sys/include/can/device.h
@@ -25,7 +25,7 @@ extern "C" {
 #endif
 
 #include "can/candev.h"
-#include "kernel_types.h"
+#include "sched.h"
 
 #ifdef MODULE_CAN_PM
 #include "xtimer.h"
diff --git a/sys/include/can/raw.h b/sys/include/can/raw.h
index 27aa881338..49a7040488 100644
--- a/sys/include/can/raw.h
+++ b/sys/include/can/raw.h
@@ -28,7 +28,7 @@
 extern "C" {
 #endif
 
-#include "kernel_types.h"
+#include "sched.h"
 #include "can/can.h"
 #include "can/common.h"
 #include "can/device.h"
diff --git a/sys/include/net/fib.h b/sys/include/net/fib.h
index ef33af7fbc..6e73cb39eb 100644
--- a/sys/include/net/fib.h
+++ b/sys/include/net/fib.h
@@ -28,7 +28,7 @@
 #include <stdint.h>
 
 #include "net/fib/table.h"
-#include "kernel_types.h"
+#include "sched.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/sys/include/net/fib/table.h b/sys/include/net/fib/table.h
index d6e7e7704b..9cbe50dbe0 100644
--- a/sys/include/net/fib/table.h
+++ b/sys/include/net/fib/table.h
@@ -21,7 +21,7 @@
 
 #include <stdint.h>
 
-#include "kernel_types.h"
+#include "sched.h"
 #include "universal_address.h"
 #include "mutex.h"
 
diff --git a/sys/include/net/gnrc/ipv6.h b/sys/include/net/gnrc/ipv6.h
index e230824a03..65dc661b70 100644
--- a/sys/include/net/gnrc/ipv6.h
+++ b/sys/include/net/gnrc/ipv6.h
@@ -99,7 +99,7 @@
 #ifndef NET_GNRC_IPV6_H
 #define NET_GNRC_IPV6_H
 
-#include "kernel_types.h"
+#include "sched.h"
 #include "net/gnrc.h"
 #include "thread.h"
 
diff --git a/sys/include/net/gnrc/netif.h b/sys/include/net/gnrc/netif.h
index 62aa4e7c2d..aa79a6597d 100644
--- a/sys/include/net/gnrc/netif.h
+++ b/sys/include/net/gnrc/netif.h
@@ -33,7 +33,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include "kernel_types.h"
+#include "sched.h"
 #include "msg.h"
 #ifdef MODULE_GNRC_NETIF_BUS
 #include "msg_bus.h"
diff --git a/sys/include/net/gnrc/netreg.h b/sys/include/net/gnrc/netreg.h
index a31782483e..321c0a7ef4 100644
--- a/sys/include/net/gnrc/netreg.h
+++ b/sys/include/net/gnrc/netreg.h
@@ -23,7 +23,7 @@
 
 #include <inttypes.h>
 
-#include "kernel_types.h"
+#include "sched.h"
 #include "net/gnrc/nettype.h"
 #include "net/gnrc/pkt.h"
 
diff --git a/sys/include/net/gnrc/pkt.h b/sys/include/net/gnrc/pkt.h
index c704d90931..6f8b371d8a 100644
--- a/sys/include/net/gnrc/pkt.h
+++ b/sys/include/net/gnrc/pkt.h
@@ -25,7 +25,7 @@
 #include <inttypes.h>
 #include <stdlib.h>
 
-#include "kernel_types.h"
+#include "sched.h"
 #include "net/gnrc/nettype.h"
 #include "list.h"
 
diff --git a/sys/include/net/gnrc/pktdump.h b/sys/include/net/gnrc/pktdump.h
index 4448dbee06..bac76cd0e4 100644
--- a/sys/include/net/gnrc/pktdump.h
+++ b/sys/include/net/gnrc/pktdump.h
@@ -22,7 +22,7 @@
 #ifndef NET_GNRC_PKTDUMP_H
 #define NET_GNRC_PKTDUMP_H
 
-#include "kernel_types.h"
+#include "sched.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/sys/include/net/gnrc/sixlowpan.h b/sys/include/net/gnrc/sixlowpan.h
index e7c0c81357..caca204c16 100644
--- a/sys/include/net/gnrc/sixlowpan.h
+++ b/sys/include/net/gnrc/sixlowpan.h
@@ -137,7 +137,7 @@
 
 #include <stdbool.h>
 
-#include "kernel_types.h"
+#include "sched.h"
 
 #include "net/gnrc/sixlowpan/config.h"
 #include "net/gnrc/sixlowpan/frag.h"
diff --git a/sys/include/net/gnrc/sixlowpan/frag/fb.h b/sys/include/net/gnrc/sixlowpan/frag/fb.h
index 4bcef54626..1181c497a6 100644
--- a/sys/include/net/gnrc/sixlowpan/frag/fb.h
+++ b/sys/include/net/gnrc/sixlowpan/frag/fb.h
@@ -88,7 +88,7 @@ gnrc_sixlowpan_frag_fb_t *gnrc_sixlowpan_frag_fb_get_by_tag(uint16_t tag);
 uint16_t gnrc_sixlowpan_frag_fb_next_tag(void);
 
 #if defined(TEST_SUITES) && !defined(DOXYGEN)
-#include "kernel_types.h"
+#include "sched.h"
 
 /* can't include `net/sixlowpan.h` as this would create a cyclical include */
 extern kernel_pid_t gnrc_sixlowpan_get_pid(void);
diff --git a/sys/include/usb/usbus.h b/sys/include/usb/usbus.h
index 8be56c1a10..1e5a8c727f 100644
--- a/sys/include/usb/usbus.h
+++ b/sys/include/usb/usbus.h
@@ -28,7 +28,7 @@
 
 #include "clist.h"
 #include "event.h"
-#include "kernel_types.h"
+#include "sched.h"
 #include "kernel_defines.h"
 #include "msg.h"
 #include "thread.h"
diff --git a/sys/include/vfs.h b/sys/include/vfs.h
index e0a96b0036..1c44cd75cd 100644
--- a/sys/include/vfs.h
+++ b/sys/include/vfs.h
@@ -66,7 +66,7 @@
 #include <sys/types.h> /* for off_t etc. */
 #include <sys/statvfs.h> /* for struct statvfs */
 
-#include "kernel_types.h"
+#include "sched.h"
 #include "clist.h"
 
 #ifdef __cplusplus
diff --git a/sys/include/xtimer.h b/sys/include/xtimer.h
index fd732abe05..1e09cb129c 100644
--- a/sys/include/xtimer.h
+++ b/sys/include/xtimer.h
@@ -36,7 +36,7 @@
 #include "msg.h"
 #endif /* MODULE_CORE_MSG */
 #include "mutex.h"
-#include "kernel_types.h"
+#include "sched.h"
 #include "rmutex.h"
 
 #ifdef MODULE_ZTIMER_XTIMER_COMPAT
diff --git a/sys/include/ztimer.h b/sys/include/ztimer.h
index b5182088ed..df27ede996 100644
--- a/sys/include/ztimer.h
+++ b/sys/include/ztimer.h
@@ -234,7 +234,7 @@
 
 #include <stdint.h>
 
-#include "kernel_types.h"
+#include "sched.h"
 #include "msg.h"
 
 #ifdef __cplusplus
diff --git a/sys/include/ztimer/xtimer_compat.h b/sys/include/ztimer/xtimer_compat.h
index 6f4bddb69c..b6549bd778 100644
--- a/sys/include/ztimer/xtimer_compat.h
+++ b/sys/include/ztimer/xtimer_compat.h
@@ -28,7 +28,7 @@
 #include "msg.h"
 #endif /* MODULE_CORE_MSG */
 #include "mutex.h"
-#include "kernel_types.h"
+#include "sched.h"
 
 #include "ztimer.h"
 
diff --git a/sys/net/gnrc/network_layer/ipv6/gnrc_ipv6.c b/sys/net/gnrc/network_layer/ipv6/gnrc_ipv6.c
index c6ba081b0c..2de00e89ae 100644
--- a/sys/net/gnrc/network_layer/ipv6/gnrc_ipv6.c
+++ b/sys/net/gnrc/network_layer/ipv6/gnrc_ipv6.c
@@ -19,7 +19,7 @@
 
 #include "byteorder.h"
 #include "cpu_conf.h"
-#include "kernel_types.h"
+#include "sched.h"
 #include "net/gnrc.h"
 #include "net/gnrc/icmpv6.h"
 #include "net/gnrc/sixlowpan/ctx.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 0abc44f52f..cc3e62a863 100644
--- a/sys/net/gnrc/network_layer/ipv6/nib/_nib-internal.h
+++ b/sys/net/gnrc/network_layer/ipv6/nib/_nib-internal.h
@@ -27,7 +27,7 @@
 
 #include "bitfield.h"
 #include "evtimer_msg.h"
-#include "kernel_types.h"
+#include "sched.h"
 #include "mutex.h"
 #include "net/eui64.h"
 #include "net/ipv6/addr.h"
diff --git a/sys/net/gnrc/network_layer/sixlowpan/gnrc_sixlowpan.c b/sys/net/gnrc/network_layer/sixlowpan/gnrc_sixlowpan.c
index adb0c69b5e..3863c01619 100644
--- a/sys/net/gnrc/network_layer/sixlowpan/gnrc_sixlowpan.c
+++ b/sys/net/gnrc/network_layer/sixlowpan/gnrc_sixlowpan.c
@@ -14,7 +14,7 @@
 
 #include <assert.h>
 
-#include "kernel_types.h"
+#include "sched.h"
 #include "net/gnrc.h"
 #include "thread.h"
 #include "utlist.h"
diff --git a/sys/ps/ps.c b/sys/ps/ps.c
index 0f175fdfbf..808945346a 100644
--- a/sys/ps/ps.c
+++ b/sys/ps/ps.c
@@ -21,7 +21,7 @@
 #include "thread.h"
 #include "sched.h"
 #include "thread.h"
-#include "kernel_types.h"
+#include "sched.h"
 
 #ifdef MODULE_SCHEDSTATISTICS
 #include "schedstatistics.h"
diff --git a/sys/sema/sema.c b/sys/sema/sema.c
index c3696be8df..035c007c8b 100644
--- a/sys/sema/sema.c
+++ b/sys/sema/sema.c
@@ -16,6 +16,8 @@
  */
 
 #include <errno.h>
+#include <limits.h>
+
 #include "irq.h"
 #include "assert.h"
 #include "sema.h"
diff --git a/sys/shell/commands/sc_gnrc_icmpv6_echo.c b/sys/shell/commands/sc_gnrc_icmpv6_echo.c
index 2f241a1986..654f2483eb 100644
--- a/sys/shell/commands/sc_gnrc_icmpv6_echo.c
+++ b/sys/shell/commands/sc_gnrc_icmpv6_echo.c
@@ -26,7 +26,7 @@
 
 #include "bitfield.h"
 #include "byteorder.h"
-#include "kernel_types.h"
+#include "sched.h"
 #ifdef MODULE_LUID
 #include "luid.h"
 #endif
diff --git a/sys/vfs/vfs.c b/sys/vfs/vfs.c
index b0dd00b62d..a312e98474 100644
--- a/sys/vfs/vfs.c
+++ b/sys/vfs/vfs.c
@@ -26,7 +26,7 @@
 #include "vfs.h"
 #include "mutex.h"
 #include "thread.h"
-#include "kernel_types.h"
+#include "sched.h"
 #include "clist.h"
 
 #define ENABLE_DEBUG 0
diff --git a/tests/bench_sizeof_coretypes/main.c b/tests/bench_sizeof_coretypes/main.c
index 76ac94fbcb..b8cce4f193 100644
--- a/tests/bench_sizeof_coretypes/main.c
+++ b/tests/bench_sizeof_coretypes/main.c
@@ -25,7 +25,7 @@
 #include "cib.h"
 #include "clist.h"
 #include "panic.h"
-#include "kernel_types.h"
+#include "sched.h"
 #include "list.h"
 #include "mbox.h"
 #include "msg.h"
diff --git a/tests/bitarithm_timings/main.c b/tests/bitarithm_timings/main.c
index a3f91b83f2..cbf824ed61 100644
--- a/tests/bitarithm_timings/main.c
+++ b/tests/bitarithm_timings/main.c
@@ -33,6 +33,7 @@
 #include <stdint.h>
 #include <stdatomic.h>
 #include <stdio.h>
+#include <limits.h>
 
 #include "bitarithm.h"
 #include "xtimer.h"
diff --git a/tests/thread_flood/main.c b/tests/thread_flood/main.c
index 4ee83d2c29..0ba61374ab 100644
--- a/tests/thread_flood/main.c
+++ b/tests/thread_flood/main.c
@@ -25,7 +25,7 @@
 #include <stdio.h>
 
 #include "thread.h"
-#include "kernel_types.h"
+#include "sched.h"
 
 /* One stack for all threads. DON'T TRY THIS AT HOME!! */
 static char dummy_stack[THREAD_STACKSIZE_IDLE];