diff --git a/app.h b/app.h
index 6428921..78ea601 100644
--- a/app.h
+++ b/app.h
@@ -23,9 +23,9 @@
 #include "encoding/name.h"
 #include "forwarding-strategy.h"
 
-#include <kernel_types.h>
 #include <xtimer.h>
 #include <net/gnrc/pktbuf.h>
+#include <sched.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/cs.h b/cs.h
index 36bf38d..01edf2b 100644
--- a/cs.h
+++ b/cs.h
@@ -22,7 +22,6 @@
 
 #include "encoding/shared-block.h"
 
-#include <kernel_types.h>
 //#include <xtimer.h>
 
 #ifdef __cplusplus
diff --git a/face-table.h b/face-table.h
index 28b44a5..ec3881d 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/fib.h b/fib.h
index 8d5f01a..d53871d 100644
--- a/fib.h
+++ b/fib.h
@@ -23,8 +23,8 @@
 #include "encoding/shared-block.h"
 #include "face-table.h"
 
-#include <kernel_types.h>
 #include <xtimer.h>
+#include <sched.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/forwarding-strategy.h b/forwarding-strategy.h
index 43ad66c..2092546 100644
--- a/forwarding-strategy.h
+++ b/forwarding-strategy.h
@@ -22,7 +22,7 @@
 
 #include "encoding/shared-block.h"
 
-#include <kernel_types.h>
+#include <sched.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/l2.h b/l2.h
index 2dc1dad..6cae94b 100644
--- a/l2.h
+++ b/l2.h
@@ -22,8 +22,8 @@
 
 #include "encoding/shared-block.h"
 
-#include <kernel_types.h>
 #include <net/gnrc/pktbuf.h>
+#include <sched.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/ndn.h b/ndn.h
index d8d148c..0a69cc8 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" {
diff --git a/netif.h b/netif.h
index 1e7fbdc..a737eb8 100644
--- a/netif.h
+++ b/netif.h
@@ -20,7 +20,7 @@
 #ifndef NDN_NETIF_H_
 #define NDN_NETIF_H_
 
-#include <kernel_types.h>
+#include <sched.h>
 
 #include "encoding/block.h"
 
diff --git a/pit.h b/pit.h
index dbe433e..cb8ebf2 100644
--- a/pit.h
+++ b/pit.h
@@ -23,7 +23,7 @@
 #include "encoding/shared-block.h"
 #include "face-table.h"
 
-#include <kernel_types.h>
+#include <sched.h>
 #include <xtimer.h>
 
 #ifdef __cplusplus