Index: kernel/arch/sparc64/include/asm.h
===================================================================
--- kernel/arch/sparc64/include/asm.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/asm.h	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -37,5 +37,4 @@
 
 #include <arch/arch.h>
-#include <arch/types.h>
 #include <typedefs.h>
 #include <align.h>
Index: kernel/arch/sparc64/include/atomic.h
===================================================================
--- kernel/arch/sparc64/include/atomic.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/atomic.h	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -37,5 +37,5 @@
 
 #include <arch/barrier.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <preemption.h>
 
Index: kernel/arch/sparc64/include/boot/boot.h
===================================================================
--- kernel/arch/sparc64/include/boot/boot.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/boot/boot.h	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -43,5 +43,5 @@
 
 #include <config.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <genarch/ofw/ofw_tree.h>
 
Index: kernel/arch/sparc64/include/context.h
===================================================================
--- kernel/arch/sparc64/include/context.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/context.h	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -37,5 +37,5 @@
 
 #include <arch/stack.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <align.h>
 
Index: kernel/arch/sparc64/include/cpu.h
===================================================================
--- kernel/arch/sparc64/include/cpu.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/cpu.h	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -54,5 +54,4 @@
 #ifndef __ASM__
 
-#include <arch/types.h>
 #include <typedefs.h>
 #include <arch/register.h>
Index: kernel/arch/sparc64/include/drivers/fhc.h
===================================================================
--- kernel/arch/sparc64/include/drivers/fhc.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/drivers/fhc.h	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -36,5 +36,5 @@
 #define KERN_sparc64_FHC_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <genarch/ofw/ofw_tree.h>
 
Index: kernel/arch/sparc64/include/drivers/kbd.h
===================================================================
--- kernel/arch/sparc64/include/drivers/kbd.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/drivers/kbd.h	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -36,5 +36,5 @@
 #define KERN_sparc64_KBD_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <genarch/ofw/ofw_tree.h>
 
Index: kernel/arch/sparc64/include/drivers/pci.h
===================================================================
--- kernel/arch/sparc64/include/drivers/pci.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/drivers/pci.h	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -36,5 +36,5 @@
 #define KERN_sparc64_PCI_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <genarch/ofw/ofw_tree.h>
 #include <arch/arch.h>
Index: kernel/arch/sparc64/include/drivers/scr.h
===================================================================
--- kernel/arch/sparc64/include/drivers/scr.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/drivers/scr.h	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -36,5 +36,5 @@
 #define KERN_sparc64_SCR_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <genarch/ofw/ofw_tree.h>
 
Index: kernel/arch/sparc64/include/drivers/sgcn.h
===================================================================
--- kernel/arch/sparc64/include/drivers/sgcn.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/drivers/sgcn.h	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -36,5 +36,5 @@
 #define KERN_sparc64_SGCN_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <console/chardev.h>
 #include <proc/thread.h>
Index: kernel/arch/sparc64/include/faddr.h
===================================================================
--- kernel/arch/sparc64/include/faddr.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/faddr.h	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -36,5 +36,5 @@
 #define KERN_sparc64_FADDR_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 #define FADDR(fptr)		((uintptr_t) (fptr))
Index: kernel/arch/sparc64/include/fpu_context.h
===================================================================
--- kernel/arch/sparc64/include/fpu_context.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/fpu_context.h	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -36,5 +36,5 @@
 #define KERN_sparc64_FPU_CONTEXT_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 #define FPU_CONTEXT_ALIGN	8
Index: kernel/arch/sparc64/include/interrupt.h
===================================================================
--- kernel/arch/sparc64/include/interrupt.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/interrupt.h	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -37,5 +37,5 @@
 #define KERN_sparc64_INTERRUPT_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/regdef.h>
 
Index: kernel/arch/sparc64/include/mm/asid.h
===================================================================
--- kernel/arch/sparc64/include/mm/asid.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/mm/asid.h	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -36,5 +36,5 @@
 #define KERN_sparc64_ASID_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 /*
Index: kernel/arch/sparc64/include/mm/sun4u/frame.h
===================================================================
--- kernel/arch/sparc64/include/mm/sun4u/frame.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/mm/sun4u/frame.h	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -55,5 +55,5 @@
 #ifndef __ASM__
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 union frame_address {
Index: kernel/arch/sparc64/include/mm/sun4u/mmu.h
===================================================================
--- kernel/arch/sparc64/include/mm/sun4u/mmu.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/mm/sun4u/mmu.h	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -91,5 +91,5 @@
 #include <arch/asm.h>
 #include <arch/barrier.h>
-#include <arch/types.h>
+#include <typedefs.h>
 
 #if defined(US)
Index: kernel/arch/sparc64/include/mm/sun4u/tlb.h
===================================================================
--- kernel/arch/sparc64/include/mm/sun4u/tlb.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/mm/sun4u/tlb.h	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -99,5 +99,5 @@
 #include <arch/asm.h>
 #include <arch/barrier.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/register.h>
 #include <arch/cpu.h>
Index: kernel/arch/sparc64/include/mm/sun4u/tsb.h
===================================================================
--- kernel/arch/sparc64/include/mm/sun4u/tsb.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/mm/sun4u/tsb.h	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -54,5 +54,5 @@
 #include <arch/mm/tte.h>
 #include <arch/mm/mmu.h>
-#include <arch/types.h>
+#include <typedefs.h>
 
 /** TSB Base register. */
Index: kernel/arch/sparc64/include/mm/sun4u/tte.h
===================================================================
--- kernel/arch/sparc64/include/mm/sun4u/tte.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/mm/sun4u/tte.h	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -49,5 +49,5 @@
 #ifndef __ASM__
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 /* TTE tag's VA_tag field contains bits <63:VA_TAG_PAGE_SHIFT> of the VA */
Index: kernel/arch/sparc64/include/mm/sun4v/frame.h
===================================================================
--- kernel/arch/sparc64/include/mm/sun4v/frame.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/mm/sun4v/frame.h	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -45,5 +45,5 @@
 #ifndef __ASM__
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 extern uintptr_t last_frame;
Index: kernel/arch/sparc64/include/mm/sun4v/tlb.h
===================================================================
--- kernel/arch/sparc64/include/mm/sun4v/tlb.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/mm/sun4v/tlb.h	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -48,5 +48,5 @@
 #include <arch/asm.h>
 #include <arch/barrier.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/register.h>
 #include <arch/cpu.h>
Index: kernel/arch/sparc64/include/mm/sun4v/tsb.h
===================================================================
--- kernel/arch/sparc64/include/mm/sun4v/tsb.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/mm/sun4v/tsb.h	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -53,5 +53,4 @@
 #include <arch/mm/tte.h>
 #include <arch/mm/mmu.h>
-#include <arch/types.h>
 
 /** TSB description, used in hypercalls */
Index: kernel/arch/sparc64/include/mm/sun4v/tte.h
===================================================================
--- kernel/arch/sparc64/include/mm/sun4v/tte.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/mm/sun4v/tte.h	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -50,5 +50,5 @@
 #ifndef __ASM__
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 /** Translation Table Entry - Data. */
Index: kernel/arch/sparc64/include/proc/thread.h
===================================================================
--- kernel/arch/sparc64/include/proc/thread.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/proc/thread.h	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -36,5 +36,5 @@
 #define KERN_sparc64_THREAD_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/arch.h>
 
Index: kernel/arch/sparc64/include/register.h
===================================================================
--- kernel/arch/sparc64/include/register.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/register.h	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -37,5 +37,5 @@
 
 #include <arch/regdef.h>
-#include <arch/types.h>
+#include <typedefs.h>
 
 /** Version Register. */
Index: kernel/arch/sparc64/include/sun4u/cpu.h
===================================================================
--- kernel/arch/sparc64/include/sun4u/cpu.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/sun4u/cpu.h	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -54,5 +54,4 @@
 #ifndef __ASM__
 
-#include <arch/types.h>
 #include <typedefs.h>
 #include <arch/register.h>
Index: kernel/arch/sparc64/include/sun4v/hypercall.h
===================================================================
--- kernel/arch/sparc64/include/sun4v/hypercall.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/sun4v/hypercall.h	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -120,5 +120,4 @@
 
 #include <typedefs.h>
-#include <arch/types.h>
 
 /*
Index: kernel/arch/sparc64/include/sun4v/ipi.h
===================================================================
--- kernel/arch/sparc64/include/sun4v/ipi.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/sun4v/ipi.h	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -38,5 +38,5 @@
 #define KERN_sparc64_sun4v_IPI_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 extern uint64_t ipi_brodcast_to(void (*)(void), uint16_t cpu_list[], uint64_t);
Index: kernel/arch/sparc64/include/sun4v/register.h
===================================================================
--- kernel/arch/sparc64/include/sun4v/register.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/sun4v/register.h	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -37,5 +37,5 @@
 
 #include <arch/regdef.h>
-#include <arch/types.h>
+#include <typedefs.h>
 
 /** Processor State Register. */
Index: kernel/arch/sparc64/include/trap/trap_table.h
===================================================================
--- kernel/arch/sparc64/include/trap/trap_table.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/trap/trap_table.h	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -44,5 +44,5 @@
 #ifndef __ASM__
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 struct trap_table_entry {
Index: kernel/arch/sparc64/include/types.h
===================================================================
--- kernel/arch/sparc64/include/types.h	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/include/types.h	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -36,14 +36,4 @@
 #define KERN_sparc64_TYPES_H_
 
-typedef signed char int8_t;
-typedef signed short int16_t;
-typedef signed int int32_t;
-typedef signed long int64_t;
-
-typedef unsigned char uint8_t;
-typedef unsigned short uint16_t;
-typedef unsigned int uint32_t;
-typedef unsigned long uint64_t;
-
 typedef uint64_t size_t;
 
@@ -60,28 +50,28 @@
 } fncptr_t;
 
+typedef uint8_t asi_t;
+
 /**< 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"
-
-typedef uint8_t asi_t;
+#define PRIx8   "x"
+#define PRIx16  "x"
+#define PRIx32  "x"
+#define PRIx64  "llx"
+#define PRIxn   "llx"
 
 #endif
Index: kernel/arch/sparc64/src/console.c
===================================================================
--- kernel/arch/sparc64/src/console.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/src/console.c	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -34,5 +34,5 @@
 
 #include <arch/console.h>
-#include <arch/types.h>
+#include <typedefs.h>
 
 #include <arch/drivers/scr.h>
Index: kernel/arch/sparc64/src/ddi/ddi.c
===================================================================
--- kernel/arch/sparc64/src/ddi/ddi.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/src/ddi/ddi.c	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -35,5 +35,5 @@
 #include <ddi/ddi.h>
 #include <proc/task.h>
-#include <arch/types.h>
+#include <typedefs.h>
 
 /** Enable I/O space range for task.
Index: kernel/arch/sparc64/src/debug/stacktrace.c
===================================================================
--- kernel/arch/sparc64/src/debug/stacktrace.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/src/debug/stacktrace.c	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -35,5 +35,4 @@
 #include <stacktrace.h>
 #include <syscall/copy.h>
-#include <arch/types.h>
 #include <typedefs.h>
 
Index: kernel/arch/sparc64/src/drivers/fhc.c
===================================================================
--- kernel/arch/sparc64/src/drivers/fhc.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/src/drivers/fhc.c	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -44,5 +44,5 @@
 #include <mm/page.h>
 #include <mm/slab.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <genarch/ofw/ofw_tree.h>
 #include <genarch/ofw/fhc.h>
Index: kernel/arch/sparc64/src/drivers/kbd.c
===================================================================
--- kernel/arch/sparc64/src/drivers/kbd.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/src/drivers/kbd.c	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -41,5 +41,5 @@
 #include <mm/page.h>
 #include <arch/mm/page.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <align.h>
 #include <str.h>
Index: kernel/arch/sparc64/src/drivers/pci.c
===================================================================
--- kernel/arch/sparc64/src/drivers/pci.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/src/drivers/pci.c	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -41,5 +41,5 @@
 #include <mm/page.h>
 #include <mm/slab.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <debug.h>
 #include <print.h>
Index: kernel/arch/sparc64/src/drivers/scr.c
===================================================================
--- kernel/arch/sparc64/src/drivers/scr.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/src/drivers/scr.c	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -42,5 +42,5 @@
 #include <console/chardev.h>
 #include <console/console.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <str.h>
 #include <align.h>
Index: kernel/arch/sparc64/src/mm/sun4u/frame.c
===================================================================
--- kernel/arch/sparc64/src/mm/sun4u/frame.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/src/mm/sun4u/frame.c	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -36,5 +36,5 @@
 #include <mm/frame.h>
 #include <arch/boot/boot.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <config.h>
 #include <align.h>
Index: kernel/arch/sparc64/src/mm/sun4u/tlb.c
===================================================================
--- kernel/arch/sparc64/src/mm/sun4u/tlb.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/src/mm/sun4u/tlb.c	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -44,5 +44,5 @@
 #include <arch.h>
 #include <print.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <config.h>
 #include <arch/trap/trap.h>
Index: kernel/arch/sparc64/src/mm/sun4u/tsb.c
===================================================================
--- kernel/arch/sparc64/src/mm/sun4u/tsb.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/src/mm/sun4u/tsb.c	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -38,5 +38,5 @@
 #include <arch/barrier.h>
 #include <mm/as.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <macros.h>
 #include <debug.h>
Index: kernel/arch/sparc64/src/mm/sun4v/frame.c
===================================================================
--- kernel/arch/sparc64/src/mm/sun4v/frame.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/src/mm/sun4v/frame.c	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -36,5 +36,5 @@
 #include <mm/frame.h>
 #include <arch/boot/boot.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <config.h>
 #include <align.h>
Index: kernel/arch/sparc64/src/mm/sun4v/tlb.c
===================================================================
--- kernel/arch/sparc64/src/mm/sun4v/tlb.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/src/mm/sun4v/tlb.c	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -46,5 +46,5 @@
 #include <arch.h>
 #include <print.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <config.h>
 #include <arch/trap/trap.h>
Index: kernel/arch/sparc64/src/mm/sun4v/tsb.c
===================================================================
--- kernel/arch/sparc64/src/mm/sun4v/tsb.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/src/mm/sun4v/tsb.c	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -40,5 +40,5 @@
 #include <arch/barrier.h>
 #include <mm/as.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <macros.h>
 #include <debug.h>
Index: kernel/arch/sparc64/src/smp/sun4u/smp.c
===================================================================
--- kernel/arch/sparc64/src/smp/sun4u/smp.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/src/smp/sun4u/smp.c	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -41,5 +41,5 @@
 #include <config.h>
 #include <macros.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <synch/synch.h>
 #include <synch/waitq.h>
Index: kernel/arch/sparc64/src/smp/sun4v/smp.c
===================================================================
--- kernel/arch/sparc64/src/smp/sun4v/smp.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/src/smp/sun4v/smp.c	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -44,5 +44,5 @@
 #include <macros.h>
 #include <func.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <synch/synch.h>
 #include <synch/waitq.h>
Index: kernel/arch/sparc64/src/trap/interrupt.c
===================================================================
--- kernel/arch/sparc64/src/trap/interrupt.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/src/trap/interrupt.c	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -39,5 +39,5 @@
 #include <interrupt.h>
 #include <ddi/irq.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <debug.h>
 #include <arch/asm.h>
Index: kernel/arch/sparc64/src/trap/sun4u/interrupt.c
===================================================================
--- kernel/arch/sparc64/src/trap/sun4u/interrupt.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/src/trap/sun4u/interrupt.c	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -38,5 +38,5 @@
 #include <interrupt.h>
 #include <ddi/irq.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <debug.h>
 #include <arch/asm.h>
Index: kernel/arch/sparc64/src/trap/sun4v/interrupt.c
===================================================================
--- kernel/arch/sparc64/src/trap/sun4v/interrupt.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/src/trap/sun4v/interrupt.c	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -38,5 +38,5 @@
 #include <interrupt.h>
 #include <ddi/irq.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <debug.h>
 #include <arch/asm.h>
Index: kernel/arch/sparc64/src/trap/trap.c
===================================================================
--- kernel/arch/sparc64/src/trap/trap.c	(revision 7c682dd18cb1e1cac93f7e180e1fc41df32f824c)
+++ kernel/arch/sparc64/src/trap/trap.c	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -43,5 +43,5 @@
 #include <memstr.h>
 #include <debug.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/drivers/tick.h>