Index: kernel/generic/include/adt/avl.h
===================================================================
--- kernel/generic/include/adt/avl.h	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ 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 44a7ee5373ccc121fce74799244a44867eed301d)
+++ 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 44a7ee5373ccc121fce74799244a44867eed301d)
+++ 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 44a7ee5373ccc121fce74799244a44867eed301d)
+++ 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>
 
Index: kernel/generic/include/byteorder.h
===================================================================
--- kernel/generic/include/byteorder.h	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/generic/include/byteorder.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -36,5 +36,5 @@
 #define KERN_BYTEORDER_H_
 
-#include <typedefs.h>
+#include <stdint.h>
 
 #if !(defined(__BE__) ^ defined(__LE__))
Index: kernel/generic/include/console/chardev.h
===================================================================
--- kernel/generic/include/console/chardev.h	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/generic/include/console/chardev.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -37,5 +37,6 @@
 
 #include <adt/list.h>
-#include <typedefs.h>
+#include <stdbool.h>
+#include <stddef.h>
 #include <synch/waitq.h>
 #include <synch/spinlock.h>
Index: kernel/generic/include/context.h
===================================================================
--- kernel/generic/include/context.h	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/generic/include/context.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -36,5 +36,4 @@
 #define KERN_CONTEXT_H_
 
-#include <typedefs.h>
 #include <trace.h>
 #include <arch/context.h>
Index: kernel/generic/include/func.h
===================================================================
--- kernel/generic/include/func.h	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/generic/include/func.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -36,5 +36,4 @@
 #define KERN_FUNC_H_
 
-#include <typedefs.h>
 #include <atomic.h>
 
Index: kernel/generic/include/gsort.h
===================================================================
--- kernel/generic/include/gsort.h	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/generic/include/gsort.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -37,5 +37,5 @@
 
 #include <stdbool.h>
-#include <typedefs.h>
+#include <stddef.h>
 
 typedef int (* sort_cmp_t)(void *, void *, void *);
Index: kernel/generic/include/lib/elf.h
===================================================================
--- kernel/generic/include/lib/elf.h	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/generic/include/lib/elf.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -36,5 +36,4 @@
 #define KERN_ELF_H_
 
-#include <typedefs.h>
 #include <abi/elf.h>
 #include <arch/elf.h>
Index: kernel/generic/include/lib/elf_load.h
===================================================================
--- kernel/generic/include/lib/elf_load.h	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/generic/include/lib/elf_load.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -37,5 +37,4 @@
 
 #include <arch/elf.h>
-#include <typedefs.h>
 
 /**
Index: kernel/generic/include/lib/memfnc.h
===================================================================
--- kernel/generic/include/lib/memfnc.h	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/generic/include/lib/memfnc.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -36,5 +36,5 @@
 #define KERN_LIB_MEMFNC_H_
 
-#include <typedefs.h>
+#include <stddef.h>
 #include <cc.h>
 
Index: kernel/generic/include/lib/rd.h
===================================================================
--- kernel/generic/include/lib/rd.h	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/generic/include/lib/rd.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -36,5 +36,5 @@
 #define KERN_RD_H_
 
-#include <typedefs.h>
+#include <stddef.h>
 
 extern void init_rd(void *, size_t);
Index: kernel/generic/include/log.h
===================================================================
--- kernel/generic/include/log.h	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/generic/include/log.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -36,6 +36,6 @@
 #define KERN_LOG_H_
 
-#include <typedefs.h>
 #include <stdarg.h>
+#include <stddef.h>
 #include <printf/verify.h>
 #include <abi/log.h>
Index: kernel/generic/include/macros.h
===================================================================
--- kernel/generic/include/macros.h	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/generic/include/macros.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -38,5 +38,5 @@
 #ifndef __ASM__
 
-#include <typedefs.h>
+#include <stdint.h>
 #include <trace.h>
 
Index: kernel/generic/include/mem.h
===================================================================
--- kernel/generic/include/mem.h	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/generic/include/mem.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -36,5 +36,6 @@
 #define KERN_MEM_H_
 
-#include <typedefs.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <cc.h>
 
Index: kernel/generic/include/mm/reserve.h
===================================================================
--- kernel/generic/include/mm/reserve.h	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/generic/include/mm/reserve.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -37,5 +37,5 @@
 
 #include <stdbool.h>
-#include <typedefs.h>
+#include <stddef.h>
 
 extern void reserve_init(void);
Index: kernel/generic/include/print.h
===================================================================
--- kernel/generic/include/print.h	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/generic/include/print.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -36,6 +36,6 @@
 #define KERN_PRINT_H_
 
-#include <typedefs.h>
 #include <stdarg.h>
+#include <stddef.h>
 #include <printf/verify.h>
 
Index: kernel/generic/include/printf/printf_core.h
===================================================================
--- kernel/generic/include/printf/printf_core.h	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/generic/include/printf/printf_core.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -36,6 +36,6 @@
 #define KERN_PRINTF_CORE_H_
 
-#include <typedefs.h>
 #include <stdarg.h>
+#include <stddef.h>
 
 /** Structure for specifying output methods for different printf clones. */
Index: kernel/generic/include/proc/scheduler.h
===================================================================
--- kernel/generic/include/proc/scheduler.h	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/generic/include/proc/scheduler.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -36,7 +36,7 @@
 #define KERN_SCHEDULER_H_
 
+#include <stddef.h>
 #include <synch/spinlock.h>
 #include <time/clock.h>
-#include <typedefs.h>
 #include <atomic.h>
 #include <adt/list.h>
Index: kernel/generic/include/stdint.h
===================================================================
--- kernel/generic/include/stdint.h	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/generic/include/stdint.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -36,4 +36,6 @@
 #define KERN_STDINT_H_
 
+#include <arch/common.h>
+
 #define INT8_MIN  INT8_C(0x80)
 #define INT8_MAX  INT8_C(0x7F)
Index: kernel/generic/include/str.h
===================================================================
--- kernel/generic/include/str.h	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/generic/include/str.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -37,5 +37,6 @@
 
 #include <stdbool.h>
-#include <typedefs.h>
+#include <stddef.h>
+#include <stdint.h>
 
 /**< Common Unicode characters */
Index: kernel/generic/include/synch/condvar.h
===================================================================
--- kernel/generic/include/synch/condvar.h	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/generic/include/synch/condvar.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -36,5 +36,5 @@
 #define KERN_CONDVAR_H_
 
-#include <typedefs.h>
+#include <stdint.h>
 #include <synch/waitq.h>
 #include <synch/mutex.h>
Index: kernel/generic/include/synch/mutex.h
===================================================================
--- kernel/generic/include/synch/mutex.h	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/generic/include/synch/mutex.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -36,5 +36,6 @@
 #define KERN_MUTEX_H_
 
-#include <typedefs.h>
+#include <stdbool.h>
+#include <stdint.h>
 #include <synch/semaphore.h>
 #include <abi/synch.h>
Index: kernel/generic/include/synch/semaphore.h
===================================================================
--- kernel/generic/include/synch/semaphore.h	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/generic/include/synch/semaphore.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -36,5 +36,5 @@
 #define KERN_SEMAPHORE_H_
 
-#include <typedefs.h>
+#include <stdint.h>
 #include <synch/waitq.h>
 #include <abi/synch.h>
Index: kernel/generic/include/synch/spinlock.h
===================================================================
--- kernel/generic/include/synch/spinlock.h	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/generic/include/synch/spinlock.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -36,5 +36,5 @@
 #define KERN_SPINLOCK_H_
 
-#include <typedefs.h>
+#include <stdbool.h>
 #include <arch/barrier.h>
 #include <preemption.h>
Index: kernel/generic/include/syscall/copy.h
===================================================================
--- kernel/generic/include/syscall/copy.h	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/generic/include/syscall/copy.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -36,5 +36,5 @@
 #define KERN_COPY_H_
 
-#include <typedefs.h>
+#include <stddef.h>
 
 /** Label within memcpy_from_uspace() that contains return -1. */
Index: kernel/generic/include/time/delay.h
===================================================================
--- kernel/generic/include/time/delay.h	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/generic/include/time/delay.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -36,5 +36,5 @@
 #define KERN_DELAY_H_
 
-#include <typedefs.h>
+#include <stdint.h>
 
 extern void delay(uint32_t microseconds);
Index: kernel/generic/include/time/timeout.h
===================================================================
--- kernel/generic/include/time/timeout.h	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/generic/include/time/timeout.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -36,7 +36,7 @@
 #define KERN_TIMEOUT_H_
 
-#include <typedefs.h>
 #include <adt/list.h>
 #include <cpu.h>
+#include <stdint.h>
 
 typedef void (* timeout_handler_t)(void *arg);