Index: kernel/arch/ia64/include/arch/cpu.h
===================================================================
--- kernel/arch/ia64/include/arch/cpu.h	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/arch/ia64/include/arch/cpu.h	(revision 4646710d9ea7943ec02c77020e7b60258fd30d8b)
@@ -36,8 +36,8 @@
 #define KERN_ia64_CPU_H_
 
-#include <typedefs.h>
 #include <arch/register.h>
 #include <arch/asm.h>
 #include <arch/bootinfo.h>
+#include <stdint.h>
 #include <trace.h>
 
Index: kernel/arch/ia64/include/arch/fpu_context.h
===================================================================
--- kernel/arch/ia64/include/arch/fpu_context.h	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/arch/ia64/include/arch/fpu_context.h	(revision 4646710d9ea7943ec02c77020e7b60258fd30d8b)
@@ -38,5 +38,5 @@
 #define FPU_CONTEXT_ALIGN 16
 
-#include <typedefs.h>
+#include <stdint.h>
 
 #define FRS 96
Index: kernel/arch/ia64/include/arch/interrupt.h
===================================================================
--- kernel/arch/ia64/include/arch/interrupt.h	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/arch/ia64/include/arch/interrupt.h	(revision 4646710d9ea7943ec02c77020e7b60258fd30d8b)
@@ -37,6 +37,6 @@
 
 #ifndef __ASM__
-#include <typedefs.h>
 #include <arch/istate.h>
+#include <stdint.h>
 #endif
 
Index: kernel/arch/ia64/include/arch/mm/asid.h
===================================================================
--- kernel/arch/ia64/include/arch/mm/asid.h	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/arch/ia64/include/arch/mm/asid.h	(revision 4646710d9ea7943ec02c77020e7b60258fd30d8b)
@@ -38,5 +38,5 @@
 #ifndef __ASM__
 
-#include <typedefs.h>
+#include <stdint.h>
 
 typedef uint16_t asid_t;
Index: kernel/arch/ia64/src/debug/stacktrace.c
===================================================================
--- kernel/arch/ia64/src/debug/stacktrace.c	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/arch/ia64/src/debug/stacktrace.c	(revision 4646710d9ea7943ec02c77020e7b60258fd30d8b)
@@ -34,4 +34,5 @@
 
 #include <stacktrace.h>
+#include <stdbool.h>
 #include <syscall/copy.h>
 #include <typedefs.h>
Index: kernel/arch/ia64/src/drivers/ski.c
===================================================================
--- kernel/arch/ia64/src/drivers/ski.c	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
+++ kernel/arch/ia64/src/drivers/ski.c	(revision 4646710d9ea7943ec02c77020e7b60258fd30d8b)
@@ -37,5 +37,5 @@
 #include <console/chardev.h>
 #include <sysinfo/sysinfo.h>
-#include <typedefs.h>
+#include <stdint.h>
 #include <proc/thread.h>
 #include <synch/spinlock.h>