Index: kernel/arch/sparc64/src/mm/as.c
===================================================================
--- kernel/arch/sparc64/src/mm/as.c	(revision 8dbc18cf90da942617936d7574d4dfc13249644d)
+++ kernel/arch/sparc64/src/mm/as.c	(revision 3802fcddbc0b5f3740b4c514f4e79bfe4d256c27)
@@ -35,5 +35,5 @@
 #include <arch/mm/as.h>
 #include <arch/mm/tlb.h>
-#include <genarch/mm/as_ht.h>
+#include <genarch/mm/page_ht.h>
 #include <genarch/mm/asid_fifo.h>
 #include <debug.h>
Index: kernel/arch/sparc64/src/mm/memory_init.c
===================================================================
--- kernel/arch/sparc64/src/mm/memory_init.c	(revision 8dbc18cf90da942617936d7574d4dfc13249644d)
+++ kernel/arch/sparc64/src/mm/memory_init.c	(revision 3802fcddbc0b5f3740b4c514f4e79bfe4d256c27)
@@ -35,5 +35,4 @@
 #include <arch/mm/memory_init.h>
 #include <arch/boot/boot.h>
-#include <typedefs.h>
 
 /** Return total size of available memory in bytes.
Index: kernel/arch/sparc64/src/mm/tlb.c
===================================================================
--- kernel/arch/sparc64/src/mm/tlb.c	(revision 8dbc18cf90da942617936d7574d4dfc13249644d)
+++ kernel/arch/sparc64/src/mm/tlb.c	(revision 3802fcddbc0b5f3740b4c514f4e79bfe4d256c27)
@@ -45,5 +45,4 @@
 #include <print.h>
 #include <arch/types.h>
-#include <typedefs.h>
 #include <config.h>
 #include <arch/trap/trap.h>
Index: kernel/arch/sparc64/src/mm/tsb.c
===================================================================
--- kernel/arch/sparc64/src/mm/tsb.c	(revision 8dbc18cf90da942617936d7574d4dfc13249644d)
+++ kernel/arch/sparc64/src/mm/tsb.c	(revision 3802fcddbc0b5f3740b4c514f4e79bfe4d256c27)
@@ -38,5 +38,4 @@
 #include <mm/as.h>
 #include <arch/types.h>
-#include <typedefs.h>
 #include <macros.h>
 #include <debug.h>