Index: kernel/arch/sparc64/include/arch/cpu.h
===================================================================
--- kernel/arch/sparc64/include/arch/cpu.h	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/sparc64/include/arch/cpu.h	(revision d735e2e934b8d024cd14b4f088821f9d2649e913)
@@ -54,5 +54,4 @@
 #ifndef __ASM__
 
-#include <typedefs.h>
 #include <arch/register.h>
 #include <arch/regdef.h>
Index: kernel/arch/sparc64/include/arch/drivers/kbd.h
===================================================================
--- kernel/arch/sparc64/include/arch/drivers/kbd.h	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/sparc64/include/arch/drivers/kbd.h	(revision d735e2e934b8d024cd14b4f088821f9d2649e913)
@@ -36,5 +36,4 @@
 #define KERN_sparc64_KBD_H_
 
-#include <typedefs.h>
 #include <genarch/ofw/ofw_tree.h>
 
Index: kernel/arch/sparc64/include/arch/drivers/pci.h
===================================================================
--- kernel/arch/sparc64/include/arch/drivers/pci.h	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/sparc64/include/arch/drivers/pci.h	(revision d735e2e934b8d024cd14b4f088821f9d2649e913)
@@ -36,5 +36,5 @@
 #define KERN_sparc64_PCI_H_
 
-#include <typedefs.h>
+#include <stdint.h>
 #include <genarch/ofw/ofw_tree.h>
 #include <arch/arch.h>
Index: kernel/arch/sparc64/include/arch/drivers/scr.h
===================================================================
--- kernel/arch/sparc64/include/arch/drivers/scr.h	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/sparc64/include/arch/drivers/scr.h	(revision d735e2e934b8d024cd14b4f088821f9d2649e913)
@@ -36,5 +36,4 @@
 #define KERN_sparc64_SCR_H_
 
-#include <typedefs.h>
 #include <genarch/ofw/ofw_tree.h>
 
Index: kernel/arch/sparc64/include/arch/fpu_context.h
===================================================================
--- kernel/arch/sparc64/include/arch/fpu_context.h	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/sparc64/include/arch/fpu_context.h	(revision d735e2e934b8d024cd14b4f088821f9d2649e913)
@@ -36,5 +36,5 @@
 #define KERN_sparc64_FPU_CONTEXT_H_
 
-#include <typedefs.h>
+#include <stdint.h>
 
 #define FPU_CONTEXT_ALIGN	8
Index: kernel/arch/sparc64/include/arch/interrupt.h
===================================================================
--- kernel/arch/sparc64/include/arch/interrupt.h	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/sparc64/include/arch/interrupt.h	(revision d735e2e934b8d024cd14b4f088821f9d2649e913)
@@ -37,5 +37,4 @@
 #define KERN_sparc64_INTERRUPT_H_
 
-#include <typedefs.h>
 #include <arch/istate.h>
 
Index: kernel/arch/sparc64/include/arch/mm/asid.h
===================================================================
--- kernel/arch/sparc64/include/arch/mm/asid.h	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/sparc64/include/arch/mm/asid.h	(revision d735e2e934b8d024cd14b4f088821f9d2649e913)
@@ -36,5 +36,5 @@
 #define KERN_sparc64_ASID_H_
 
-#include <typedefs.h>
+#include <stdint.h>
 
 /*
Index: kernel/arch/sparc64/include/arch/mm/sun4u/mmu.h
===================================================================
--- kernel/arch/sparc64/include/arch/mm/sun4u/mmu.h	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/sparc64/include/arch/mm/sun4u/mmu.h	(revision d735e2e934b8d024cd14b4f088821f9d2649e913)
@@ -91,5 +91,5 @@
 #include <arch/asm.h>
 #include <arch/barrier.h>
-#include <typedefs.h>
+#include <stdint.h>
 
 #if defined(US)
Index: kernel/arch/sparc64/include/arch/mm/sun4u/tte.h
===================================================================
--- kernel/arch/sparc64/include/arch/mm/sun4u/tte.h	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/sparc64/include/arch/mm/sun4u/tte.h	(revision d735e2e934b8d024cd14b4f088821f9d2649e913)
@@ -49,5 +49,5 @@
 #ifndef __ASM__
 
-#include <typedefs.h>
+#include <stdint.h>
 
 /* TTE tag's VA_tag field contains bits <63:VA_TAG_PAGE_SHIFT> of the VA */
Index: kernel/arch/sparc64/include/arch/mm/sun4v/tte.h
===================================================================
--- kernel/arch/sparc64/include/arch/mm/sun4v/tte.h	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/sparc64/include/arch/mm/sun4v/tte.h	(revision d735e2e934b8d024cd14b4f088821f9d2649e913)
@@ -50,5 +50,5 @@
 #ifndef __ASM__
 
-#include <typedefs.h>
+#include <stdint.h>
 
 /** Translation Table Entry - Data. */
Index: kernel/arch/sparc64/include/arch/proc/thread.h
===================================================================
--- kernel/arch/sparc64/include/arch/proc/thread.h	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/sparc64/include/arch/proc/thread.h	(revision d735e2e934b8d024cd14b4f088821f9d2649e913)
@@ -36,7 +36,7 @@
 #define KERN_sparc64_THREAD_H_
 
-#include <typedefs.h>
 #include <arch/arch.h>
 #include <mm/slab.h>
+#include <stdint.h>
 
 extern slab_cache_t *uwb_cache;
Index: kernel/arch/sparc64/include/arch/register.h
===================================================================
--- kernel/arch/sparc64/include/arch/register.h	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/sparc64/include/arch/register.h	(revision d735e2e934b8d024cd14b4f088821f9d2649e913)
@@ -37,5 +37,5 @@
 
 #include <arch/regdef.h>
-#include <typedefs.h>
+#include <stdint.h>
 
 /** Version Register. */
Index: kernel/arch/sparc64/include/arch/smp/sun4v/smp.h
===================================================================
--- kernel/arch/sparc64/include/arch/smp/sun4v/smp.h	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/sparc64/include/arch/smp/sun4v/smp.h	(revision d735e2e934b8d024cd14b4f088821f9d2649e913)
@@ -38,6 +38,6 @@
 #define KERN_sparc64_sun4v_SMP_H_
 
-#include <typedefs.h>
 #include <arch/sun4v/cpu.h>
+#include <stdint.h>
 
 extern bool calculate_optimal_nrdy(exec_unit_t *);
Index: kernel/arch/sparc64/include/arch/sun4u/cpu.h
===================================================================
--- kernel/arch/sparc64/include/arch/sun4u/cpu.h	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/sparc64/include/arch/sun4u/cpu.h	(revision d735e2e934b8d024cd14b4f088821f9d2649e913)
@@ -54,9 +54,9 @@
 #ifndef __ASM__
 
-#include <typedefs.h>
 #include <arch/register.h>
 #include <arch/regdef.h>
 #include <arch/asm.h>
 #include <arch/arch.h>
+#include <stdint.h>
 #include <trace.h>
 
Index: kernel/arch/sparc64/include/arch/sun4v/hypercall.h
===================================================================
--- kernel/arch/sparc64/include/arch/sun4v/hypercall.h	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/sparc64/include/arch/sun4v/hypercall.h	(revision d735e2e934b8d024cd14b4f088821f9d2649e913)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup sparc64	
+/** @addtogroup sparc64
  * @{
  */
@@ -119,5 +119,5 @@
 #ifndef __ASM__
 
-#include <typedefs.h>
+#include <stdint.h>
 
 /*
Index: kernel/arch/sparc64/include/arch/sun4v/ipi.h
===================================================================
--- kernel/arch/sparc64/include/arch/sun4v/ipi.h	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/sparc64/include/arch/sun4v/ipi.h	(revision d735e2e934b8d024cd14b4f088821f9d2649e913)
@@ -38,5 +38,5 @@
 #define KERN_sparc64_sun4v_IPI_H_
 
-#include <typedefs.h>
+#include <stdint.h>
 
 extern uint64_t ipi_brodcast_to(void (*)(void), uint16_t cpu_list[], uint64_t);
Index: kernel/arch/sparc64/include/arch/sun4v/md.h
===================================================================
--- kernel/arch/sparc64/include/arch/sun4v/md.h	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/sparc64/include/arch/sun4v/md.h	(revision d735e2e934b8d024cd14b4f088821f9d2649e913)
@@ -36,5 +36,5 @@
 #define KERN_sparc64_sun4v_MD_H_
 
-#include <typedefs.h>
+#include <stdbool.h>
 
 /**
Index: kernel/arch/sparc64/include/arch/sun4v/register.h
===================================================================
--- kernel/arch/sparc64/include/arch/sun4v/register.h	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/sparc64/include/arch/sun4v/register.h	(revision d735e2e934b8d024cd14b4f088821f9d2649e913)
@@ -37,5 +37,5 @@
 
 #include <arch/regdef.h>
-#include <typedefs.h>
+#include <stdint.h>
 
 /** Processor State Register. */
Index: kernel/arch/sparc64/include/arch/trap/trap_table.h
===================================================================
--- kernel/arch/sparc64/include/arch/trap/trap_table.h	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/sparc64/include/arch/trap/trap_table.h	(revision d735e2e934b8d024cd14b4f088821f9d2649e913)
@@ -45,5 +45,5 @@
 #ifndef __ASM__
 
-#include <typedefs.h>
+#include <stdint.h>
 
 struct trap_table_entry {