Index: kernel/arch/sparc64/include/mm/asid.h
===================================================================
--- kernel/arch/sparc64/include/mm/asid.h	(revision 72bf0d24c385bb60c29d5035914d6402640fc6d2)
+++ 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 72bf0d24c385bb60c29d5035914d6402640fc6d2)
+++ 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 72bf0d24c385bb60c29d5035914d6402640fc6d2)
+++ 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 72bf0d24c385bb60c29d5035914d6402640fc6d2)
+++ 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 72bf0d24c385bb60c29d5035914d6402640fc6d2)
+++ 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 72bf0d24c385bb60c29d5035914d6402640fc6d2)
+++ 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 72bf0d24c385bb60c29d5035914d6402640fc6d2)
+++ 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 72bf0d24c385bb60c29d5035914d6402640fc6d2)
+++ 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 72bf0d24c385bb60c29d5035914d6402640fc6d2)
+++ 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 72bf0d24c385bb60c29d5035914d6402640fc6d2)
+++ 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. */