Index: kernel/arch/amd64/include/arch/atomic.h
===================================================================
--- kernel/arch/amd64/include/arch/atomic.h	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/amd64/include/arch/atomic.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -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 e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/amd64/include/arch/cpuid.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -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 e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/amd64/include/arch/interrupt.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -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 e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/amd64/include/arch/mm/frame.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -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 e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/amd64/include/arch/proc/task.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -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 e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/amd64/include/arch/proc/thread.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -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 e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/amd64/include/arch/vreg.h	(revision de1712e4e19c9ccc82703e05e5f4805fdb28a75b)
@@ -40,5 +40,5 @@
 #ifndef __ASM__
 
-#include <typedefs.h>
+#include <stdint.h>
 
 extern uint64_t *vreg_ptr;