Index: kernel/arch/sparc64/include/mm/sun4u/frame.h
===================================================================
--- kernel/arch/sparc64/include/mm/sun4u/frame.h	(revision 8c2214ebbaca05d616cb503d266debdcb2592c9f)
+++ 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 8c2214ebbaca05d616cb503d266debdcb2592c9f)
+++ 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 8c2214ebbaca05d616cb503d266debdcb2592c9f)
+++ 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 8c2214ebbaca05d616cb503d266debdcb2592c9f)
+++ 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 8c2214ebbaca05d616cb503d266debdcb2592c9f)
+++ 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 */