Index: kernel/arch/amd64/include/arch/atomic.h
===================================================================
--- kernel/arch/amd64/include/arch/atomic.h	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/arch/amd64/include/arch/atomic.h	(revision 83dab11c929c1a48613d4dc70ed8ca9113463484)
@@ -37,5 +37,4 @@
 #define KERN_amd64_ATOMIC_H_
 
-#include <typedefs.h>
 #include <arch/barrier.h>
 #include <preemption.h>
Index: kernel/arch/amd64/include/arch/cpuid.h
===================================================================
--- kernel/arch/amd64/include/arch/cpuid.h	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/arch/amd64/include/arch/cpuid.h	(revision 83dab11c929c1a48613d4dc70ed8ca9113463484)
@@ -48,5 +48,5 @@
 #ifndef __ASM__
 
-#include <typedefs.h>
+#include <stdint.h>
 
 typedef struct {
Index: kernel/arch/amd64/include/arch/interrupt.h
===================================================================
--- kernel/arch/amd64/include/arch/interrupt.h	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/arch/amd64/include/arch/interrupt.h	(revision 83dab11c929c1a48613d4dc70ed8ca9113463484)
@@ -36,7 +36,7 @@
 #define KERN_amd64_INTERRUPT_H_
 
-#include <typedefs.h>
 #include <arch/istate.h>
 #include <arch/pm.h>
+#include <stdint.h>
 
 #define IVT_ITEMS  IDT_ITEMS
Index: kernel/arch/amd64/include/arch/mm/frame.h
===================================================================
--- kernel/arch/amd64/include/arch/mm/frame.h	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/arch/amd64/include/arch/mm/frame.h	(revision 83dab11c929c1a48613d4dc70ed8ca9113463484)
@@ -43,6 +43,4 @@
 #ifndef __ASM__
 
-#include <typedefs.h>
-
 extern void frame_low_arch_init(void);
 extern void frame_high_arch_init(void);
Index: kernel/arch/amd64/include/arch/proc/task.h
===================================================================
--- kernel/arch/amd64/include/arch/proc/task.h	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/arch/amd64/include/arch/proc/task.h	(revision 83dab11c929c1a48613d4dc70ed8ca9113463484)
@@ -36,6 +36,6 @@
 #define KERN_amd64_TASK_H_
 
-#include <typedefs.h>
 #include <adt/bitmap.h>
+#include <stddef.h>
 
 typedef struct {
Index: kernel/arch/amd64/include/arch/proc/thread.h
===================================================================
--- kernel/arch/amd64/include/arch/proc/thread.h	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/arch/amd64/include/arch/proc/thread.h	(revision 83dab11c929c1a48613d4dc70ed8ca9113463484)
@@ -36,5 +36,5 @@
 #define KERN_amd64_THREAD_H_
 
-#include <typedefs.h>
+#include <stdint.h>
 
 typedef struct {
Index: kernel/arch/amd64/include/arch/vreg.h
===================================================================
--- kernel/arch/amd64/include/arch/vreg.h	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/arch/amd64/include/arch/vreg.h	(revision 83dab11c929c1a48613d4dc70ed8ca9113463484)
@@ -40,5 +40,5 @@
 #ifndef __ASM__
 
-#include <typedefs.h>
+#include <stdint.h>
 
 extern uint64_t *vreg_ptr;
Index: kernel/arch/amd64/src/amd64.c
===================================================================
--- kernel/arch/amd64/src/amd64.c	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/arch/amd64/src/amd64.c	(revision 83dab11c929c1a48613d4dc70ed8ca9113463484)
@@ -35,5 +35,5 @@
 #include <arch.h>
 #include <arch/arch.h>
-#include <typedefs.h>
+#include <stdint.h>
 #include <errno.h>
 #include <mem.h>
Index: kernel/arch/amd64/src/cpu/cpu.c
===================================================================
--- kernel/arch/amd64/src/cpu/cpu.c	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/arch/amd64/src/cpu/cpu.c	(revision 83dab11c929c1a48613d4dc70ed8ca9113463484)
@@ -39,5 +39,4 @@
 
 #include <arch.h>
-#include <typedefs.h>
 #include <print.h>
 #include <fpu_context.h>
Index: kernel/arch/amd64/src/ddi/ddi.c
===================================================================
--- kernel/arch/amd64/src/ddi/ddi.c	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/arch/amd64/src/ddi/ddi.c	(revision 83dab11c929c1a48613d4dc70ed8ca9113463484)
@@ -36,5 +36,4 @@
 #include <arch/ddi/ddi.h>
 #include <proc/task.h>
-#include <typedefs.h>
 #include <adt/bitmap.h>
 #include <mm/slab.h>
@@ -45,4 +44,5 @@
 #include <arch.h>
 #include <align.h>
+#include <stdbool.h>
 
 /** Install I/O Permission bitmap.
Index: kernel/arch/amd64/src/kseg.c
===================================================================
--- kernel/arch/amd64/src/kseg.c	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/arch/amd64/src/kseg.c	(revision 83dab11c929c1a48613d4dc70ed8ca9113463484)
@@ -34,5 +34,4 @@
 
 #include <arch/kseg.h>
-#include <typedefs.h>
 #include <arch/asm.h>
 #include <panic.h>
Index: kernel/arch/amd64/src/mm/km.c
===================================================================
--- kernel/arch/amd64/src/mm/km.c	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/arch/amd64/src/mm/km.c	(revision 83dab11c929c1a48613d4dc70ed8ca9113463484)
@@ -34,6 +34,6 @@
 #include <mm/km.h>
 #include <config.h>
-#include <typedefs.h>
 #include <macros.h>
+#include <stdbool.h>
 
 void km_identity_arch_init(void)
Index: kernel/arch/amd64/src/proc/task.c
===================================================================
--- kernel/arch/amd64/src/proc/task.c	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/arch/amd64/src/proc/task.c	(revision 83dab11c929c1a48613d4dc70ed8ca9113463484)
@@ -34,5 +34,5 @@
 
 #include <proc/task.h>
-#include <typedefs.h>
+#include <stddef.h>
 #include <adt/bitmap.h>
 #include <mm/slab.h>
Index: kernel/arch/amd64/src/userspace.c
===================================================================
--- kernel/arch/amd64/src/userspace.c	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/arch/amd64/src/userspace.c	(revision 83dab11c929c1a48613d4dc70ed8ca9113463484)
@@ -36,5 +36,5 @@
 #include <arch/cpu.h>
 #include <arch/pm.h>
-#include <typedefs.h>
+#include <stdint.h>
 #include <arch.h>
 #include <abi/proc/uarg.h>