Index: kernel/arch/ia64/include/asm.h
===================================================================
--- kernel/arch/ia64/include/asm.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia64/include/asm.h	(revision d99c1d2ba8c7b2c687d430f2e9fd237046606545)
@@ -38,5 +38,5 @@
 #include <config.h>
 #include <typedefs.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/register.h>
 
Index: kernel/arch/ia64/include/bootinfo.h
===================================================================
--- kernel/arch/ia64/include/bootinfo.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia64/include/bootinfo.h	(revision d99c1d2ba8c7b2c687d430f2e9fd237046606545)
@@ -67,5 +67,5 @@
 	unsigned int memmap_items;
 
-	unsigned long * sapic;
+	unative_t *sapic;
 	unsigned long sys_freq;
 	unsigned long freq_scale;
Index: kernel/arch/ia64/include/context.h
===================================================================
--- kernel/arch/ia64/include/context.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia64/include/context.h	(revision d99c1d2ba8c7b2c687d430f2e9fd237046606545)
@@ -36,5 +36,5 @@
 #define KERN_ia64_CONTEXT_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/register.h>
 #include <align.h>
Index: kernel/arch/ia64/include/cpu.h
===================================================================
--- kernel/arch/ia64/include/cpu.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia64/include/cpu.h	(revision d99c1d2ba8c7b2c687d430f2e9fd237046606545)
@@ -36,5 +36,5 @@
 #define KERN_ia64_CPU_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/register.h>
 #include <arch/asm.h>
Index: kernel/arch/ia64/include/faddr.h
===================================================================
--- kernel/arch/ia64/include/faddr.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia64/include/faddr.h	(revision d99c1d2ba8c7b2c687d430f2e9fd237046606545)
@@ -36,5 +36,5 @@
 #define KERN_ia64_FADDR_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 /**
Index: kernel/arch/ia64/include/fpu_context.h
===================================================================
--- kernel/arch/ia64/include/fpu_context.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia64/include/fpu_context.h	(revision d99c1d2ba8c7b2c687d430f2e9fd237046606545)
@@ -38,5 +38,5 @@
 #define FPU_CONTEXT_ALIGN 16
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 #define FRS 96
Index: kernel/arch/ia64/include/interrupt.h
===================================================================
--- kernel/arch/ia64/include/interrupt.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia64/include/interrupt.h	(revision d99c1d2ba8c7b2c687d430f2e9fd237046606545)
@@ -36,5 +36,5 @@
 #define KERN_ia64_INTERRUPT_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/register.h>
 
Index: kernel/arch/ia64/include/mm/asid.h
===================================================================
--- kernel/arch/ia64/include/mm/asid.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia64/include/mm/asid.h	(revision d99c1d2ba8c7b2c687d430f2e9fd237046606545)
@@ -38,5 +38,5 @@
 #ifndef __ASM__
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 typedef uint16_t asid_t;
Index: kernel/arch/ia64/include/mm/frame.h
===================================================================
--- kernel/arch/ia64/include/mm/frame.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia64/include/mm/frame.h	(revision d99c1d2ba8c7b2c687d430f2e9fd237046606545)
@@ -42,5 +42,5 @@
 #ifndef __ASM__
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 extern uintptr_t last_frame;
Index: kernel/arch/ia64/include/mm/page.h
===================================================================
--- kernel/arch/ia64/include/mm/page.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia64/include/mm/page.h	(revision d99c1d2ba8c7b2c687d430f2e9fd237046606545)
@@ -108,5 +108,5 @@
 #include <arch/barrier.h>
 #include <arch/mm/asid.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <debug.h>
 
Index: kernel/arch/ia64/include/mm/tlb.h
===================================================================
--- kernel/arch/ia64/include/mm/tlb.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia64/include/mm/tlb.h	(revision d99c1d2ba8c7b2c687d430f2e9fd237046606545)
@@ -39,5 +39,5 @@
 #include <arch/mm/asid.h>
 #include <arch/interrupt.h>
-#include <arch/types.h>
+#include <typedefs.h>
 
 /** Data and instruction Translation Register indices. */
Index: kernel/arch/ia64/include/register.h
===================================================================
--- kernel/arch/ia64/include/register.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia64/include/register.h	(revision d99c1d2ba8c7b2c687d430f2e9fd237046606545)
@@ -142,5 +142,5 @@
 #ifndef __ASM__
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 /** Processor Status Register. */
Index: kernel/arch/ia64/include/types.h
===================================================================
--- kernel/arch/ia64/include/types.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia64/include/types.h	(revision d99c1d2ba8c7b2c687d430f2e9fd237046606545)
@@ -36,22 +36,4 @@
 #define KERN_ia64_TYPES_H_
 
-typedef signed char int8_t;
-typedef signed short int16_t;
-typedef signed int int32_t;
-typedef signed long int64_t;
-typedef struct {
-	int64_t lo;
-	int64_t hi;
-} int128_t;
-
-typedef unsigned char uint8_t;
-typedef unsigned short uint16_t;
-typedef unsigned int uint32_t;
-typedef unsigned long uint64_t;
-typedef struct {
-	uint64_t lo;
-	uint64_t hi;
-} uint128_t;
-
 typedef uint64_t size_t;
 
@@ -70,24 +52,24 @@
 } __attribute__((may_alias)) fncptr_t;
 
-#define PRIp "lx"	/**< Format for uintptr_t. */
-#define PRIs "lu"	/**< Format for size_t. */
+#define PRIp "lx"  /**< Format for uintptr_t. */
+#define PRIs "lu"  /**< Format for size_t. */
 
-#define PRId8 "d"	/**< Format for int8_t. */
-#define PRId16 "d"	/**< Format for int16_t. */
-#define PRId32 "d"	/**< Format for int32_t. */
-#define PRId64 "ld"	/**< Format for int64_t. */
-#define PRIdn "d"	/**< Format for native_t. */
+#define PRId8 "d"    /**< Format for int8_t. */
+#define PRId16 "d"   /**< Format for int16_t. */
+#define PRId32 "d"   /**< Format for int32_t. */
+#define PRId64 "ld"  /**< Format for int64_t. */
+#define PRIdn "d"    /**< Format for native_t. */
 
-#define PRIu8 "u"	/**< Format for uint8_t. */
-#define PRIu16 "u"	/**< Format for uint16_t. */
-#define PRIu32 "u"	/**< Format for uint32_t. */
-#define PRIu64 "lu"	/**< Format for uint64_t. */
-#define PRIun "u"	/**< Format for unative_t. */
+#define PRIu8 "u"    /**< Format for uint8_t. */
+#define PRIu16 "u"   /**< Format for uint16_t. */
+#define PRIu32 "u"   /**< Format for uint32_t. */
+#define PRIu64 "lu"  /**< Format for uint64_t. */
+#define PRIun "u"    /**< Format for unative_t. */
 
-#define PRIx8 "x"	/**< Format for hexadecimal (u)int8_t. */
-#define PRIx16 "x"	/**< Format for hexadecimal (u)int16_t. */
-#define PRIx32 "x"	/**< Format for hexadecimal (u)uint32_t. */
-#define PRIx64 "lx"	/**< Format for hexadecimal (u)int64_t. */
-#define PRIxn "x"	/**< Format for hexadecimal (u)native_t. */
+#define PRIx8 "x"    /**< Format for hexadecimal (u)int8_t. */
+#define PRIx16 "x"   /**< Format for hexadecimal (u)int16_t. */
+#define PRIx32 "x"   /**< Format for hexadecimal (u)uint32_t. */
+#define PRIx64 "lx"  /**< Format for hexadecimal (u)int64_t. */
+#define PRIxn "x"    /**< Format for hexadecimal (u)native_t. */
 
 #endif
Index: kernel/arch/ia64/src/ddi/ddi.c
===================================================================
--- kernel/arch/ia64/src/ddi/ddi.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia64/src/ddi/ddi.c	(revision d99c1d2ba8c7b2c687d430f2e9fd237046606545)
@@ -36,5 +36,5 @@
 #include <ddi/ddi.h>
 #include <proc/task.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <mm/slab.h>
 #include <errno.h>
Index: kernel/arch/ia64/src/debug/stacktrace.c
===================================================================
--- kernel/arch/ia64/src/debug/stacktrace.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia64/src/debug/stacktrace.c	(revision d99c1d2ba8c7b2c687d430f2e9fd237046606545)
@@ -35,5 +35,4 @@
 #include <stacktrace.h>
 #include <syscall/copy.h>
-#include <arch/types.h>
 #include <typedefs.h>
 
Index: kernel/arch/ia64/src/drivers/ski.c
===================================================================
--- kernel/arch/ia64/src/drivers/ski.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia64/src/drivers/ski.c	(revision d99c1d2ba8c7b2c687d430f2e9fd237046606545)
@@ -37,5 +37,5 @@
 #include <console/chardev.h>
 #include <sysinfo/sysinfo.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <proc/thread.h>
 #include <synch/spinlock.h>
Index: kernel/arch/ia64/src/ia64.c
===================================================================
--- kernel/arch/ia64/src/ia64.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia64/src/ia64.c	(revision d99c1d2ba8c7b2c687d430f2e9fd237046606545)
@@ -40,5 +40,5 @@
 #include <arch/asm.h>
 #include <arch/register.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/context.h>
 #include <arch/stack.h>
Index: kernel/arch/ia64/src/interrupt.c
===================================================================
--- kernel/arch/ia64/src/interrupt.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia64/src/interrupt.c	(revision d99c1d2ba8c7b2c687d430f2e9fd237046606545)
@@ -41,5 +41,5 @@
 #include <debug.h>
 #include <console/console.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/asm.h>
 #include <arch/barrier.h>
Index: kernel/arch/ia64/src/mm/page.c
===================================================================
--- kernel/arch/ia64/src/mm/page.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia64/src/mm/page.c	(revision d99c1d2ba8c7b2c687d430f2e9fd237046606545)
@@ -39,5 +39,5 @@
 #include <arch/mm/asid.h>
 #include <arch/mm/vhpt.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <print.h>
 #include <mm/page.h>
Index: kernel/arch/ia64/src/smp/smp.c
===================================================================
--- kernel/arch/ia64/src/smp/smp.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/ia64/src/smp/smp.c	(revision d99c1d2ba8c7b2c687d430f2e9fd237046606545)
@@ -40,5 +40,5 @@
 #include <arch/asm.h>
 #include <arch/register.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/context.h>
 #include <arch/stack.h>