Index: kernel/generic/include/adt/avl.h
===================================================================
--- kernel/generic/include/adt/avl.h	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/generic/include/adt/avl.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -38,5 +38,5 @@
 #include <stdbool.h>
 #include <stddef.h>
-#include <typedefs.h>
+#include <stdint.h>
 #include <trace.h>
 
Index: kernel/generic/include/adt/bitmap.h
===================================================================
--- kernel/generic/include/adt/bitmap.h	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/generic/include/adt/bitmap.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -36,5 +36,5 @@
 #define KERN_BITMAP_H_
 
-#include <typedefs.h>
+#include <stddef.h>
 
 #define BITMAP_ELEMENT   8
Index: kernel/generic/include/adt/btree.h
===================================================================
--- kernel/generic/include/adt/btree.h	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/generic/include/adt/btree.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -36,6 +36,6 @@
 #define KERN_BTREE_H_
 
-#include <typedefs.h>
 #include <adt/list.h>
+#include <stddef.h>
 
 #define BTREE_M		5
@@ -81,5 +81,5 @@
 	link_t leaf_link;
 
-	/* Variables needed by btree_print(). */	
+	/* Variables needed by btree_print(). */
 	link_t bfs_link;
 	int depth;
Index: kernel/generic/include/adt/list.h
===================================================================
--- kernel/generic/include/adt/list.h	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/generic/include/adt/list.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -38,5 +38,6 @@
 
 #include <debug.h>
-#include <typedefs.h>
+#include <stdbool.h>
+#include <stddef.h>
 #include <trace.h>