Index: kernel/arch/amd64/include/asm.h
===================================================================
--- kernel/arch/amd64/include/asm.h	(revision ba371e15eb85077a9be68f740a43f1ad373096de)
+++ kernel/arch/amd64/include/asm.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -37,5 +37,4 @@
 
 #include <config.h>
-#include <arch/types.h>
 #include <typedefs.h>
 
Index: kernel/arch/amd64/include/atomic.h
===================================================================
--- kernel/arch/amd64/include/atomic.h	(revision ba371e15eb85077a9be68f740a43f1ad373096de)
+++ kernel/arch/amd64/include/atomic.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -36,5 +36,5 @@
 #define KERN_amd64_ATOMIC_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/barrier.h>
 #include <preemption.h>
Index: kernel/arch/amd64/include/context.h
===================================================================
--- kernel/arch/amd64/include/context.h	(revision ba371e15eb85077a9be68f740a43f1ad373096de)
+++ kernel/arch/amd64/include/context.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -38,5 +38,5 @@
 #ifdef KERNEL
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 /* According to ABI the stack MUST be aligned on 
Index: kernel/arch/amd64/include/cpuid.h
===================================================================
--- kernel/arch/amd64/include/cpuid.h	(revision ba371e15eb85077a9be68f740a43f1ad373096de)
+++ kernel/arch/amd64/include/cpuid.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -48,5 +48,5 @@
 #ifndef __ASM__
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 typedef struct {
Index: kernel/arch/amd64/include/debugger.h
===================================================================
--- kernel/arch/amd64/include/debugger.h	(revision ba371e15eb85077a9be68f740a43f1ad373096de)
+++ kernel/arch/amd64/include/debugger.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -36,5 +36,5 @@
 #define KERN_amd64_DEBUGGER_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 #define BKPOINTS_MAX 4
Index: kernel/arch/amd64/include/faddr.h
===================================================================
--- kernel/arch/amd64/include/faddr.h	(revision ba371e15eb85077a9be68f740a43f1ad373096de)
+++ kernel/arch/amd64/include/faddr.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -36,5 +36,5 @@
 #define KERN_amd64_FADDR_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 #define FADDR(fptr)		((uintptr_t) (fptr))
Index: kernel/arch/amd64/include/interrupt.h
===================================================================
--- kernel/arch/amd64/include/interrupt.h	(revision ba371e15eb85077a9be68f740a43f1ad373096de)
+++ kernel/arch/amd64/include/interrupt.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -36,5 +36,5 @@
 #define KERN_amd64_INTERRUPT_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/pm.h>
 
Index: kernel/arch/amd64/include/mm/frame.h
===================================================================
--- kernel/arch/amd64/include/mm/frame.h	(revision ba371e15eb85077a9be68f740a43f1ad373096de)
+++ kernel/arch/amd64/include/mm/frame.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -37,5 +37,5 @@
 
 #ifndef __ASM__
-#include <arch/types.h>
+#include <typedefs.h>
 #endif /* __ASM__ */
 
Index: kernel/arch/amd64/include/mm/page.h
===================================================================
--- kernel/arch/amd64/include/mm/page.h	(revision ba371e15eb85077a9be68f740a43f1ad373096de)
+++ kernel/arch/amd64/include/mm/page.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -57,5 +57,5 @@
 #ifndef __ASM__
 #	include <mm/mm.h>
-#	include <arch/types.h>
+#	include <typedefs.h>
 #	include <arch/interrupt.h>
 
Index: kernel/arch/amd64/include/pm.h
===================================================================
--- kernel/arch/amd64/include/pm.h	(revision ba371e15eb85077a9be68f740a43f1ad373096de)
+++ kernel/arch/amd64/include/pm.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -37,5 +37,5 @@
 
 #ifndef __ASM__
-	#include <arch/types.h>
+	#include <typedefs.h>
 	#include <arch/context.h>
 #endif
Index: kernel/arch/amd64/include/proc/task.h
===================================================================
--- kernel/arch/amd64/include/proc/task.h	(revision ba371e15eb85077a9be68f740a43f1ad373096de)
+++ kernel/arch/amd64/include/proc/task.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -36,5 +36,5 @@
 #define KERN_amd64_TASK_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <adt/bitmap.h>
 
Index: kernel/arch/amd64/include/types.h
===================================================================
--- kernel/arch/amd64/include/types.h	(revision ba371e15eb85077a9be68f740a43f1ad373096de)
+++ kernel/arch/amd64/include/types.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -36,14 +36,4 @@
 #define KERN_amd64_TYPES_H_
 
-typedef signed char int8_t;
-typedef signed short int16_t;
-typedef signed int int32_t;
-typedef signed long long int64_t;
-
-typedef unsigned char uint8_t;
-typedef unsigned short uint16_t;
-typedef unsigned int uint32_t;
-typedef unsigned long long uint64_t;
-
 typedef uint64_t size_t;
 
@@ -61,25 +51,25 @@
 
 /**< Formats for uintptr_t, size_t */
-#define PRIp "llx"
-#define PRIs "llu"
+#define PRIp  "llx"
+#define PRIs  "llu"
 
 /**< Formats for (u)int8_t, (u)int16_t, (u)int32_t, (u)int64_t and (u)native_t */
-#define PRId8 "d"
-#define PRId16 "d"
-#define PRId32 "d"
-#define PRId64 "lld"
-#define PRIdn "lld"
+#define PRId8   "d"
+#define PRId16  "d"
+#define PRId32  "d"
+#define PRId64  "lld"
+#define PRIdn   "lld"
 
-#define PRIu8 "u"
-#define PRIu16 "u"
-#define PRIu32 "u"
-#define PRIu64 "llu"
-#define PRIun "llu"
+#define PRIu8   "u"
+#define PRIu16  "u"
+#define PRIu32  "u"
+#define PRIu64  "llu"
+#define PRIun   "llu"
 
-#define PRIx8 "x"
-#define PRIx16 "x"
-#define PRIx32 "x"
-#define PRIx64 "llx"
-#define PRIxn "llx"
+#define PRIx8   "x"
+#define PRIx16  "x"
+#define PRIx32  "x"
+#define PRIx64  "llx"
+#define PRIxn   "llx"
 
 #endif