Index: kernel/arch/arm32/src/mm/as.c
===================================================================
--- kernel/arch/arm32/src/mm/as.c	(revision 4774a32c4567b1ea6bd0337ce00e4bb335b21a0f)
+++ kernel/arch/arm32/src/mm/as.c	(revision eae4e8fa7dfec64f319138584d0480c91f7579ca)
@@ -36,4 +36,5 @@
 #include <arch/mm/as.h>
 #include <genarch/mm/as_pt.h>
+#include <genarch/mm/page_pt.h>
 #include <genarch/mm/asid_fifo.h>
 #include <mm/as.h>
Index: kernel/arch/ia32/src/ia32.c
===================================================================
--- kernel/arch/ia32/src/ia32.c	(revision 4774a32c4567b1ea6bd0337ce00e4bb335b21a0f)
+++ kernel/arch/ia32/src/ia32.c	(revision eae4e8fa7dfec64f319138584d0480c91f7579ca)
@@ -68,4 +68,5 @@
 #include <sysinfo/sysinfo.h>
 #include <arch/boot/boot.h>
+#include <memstr.h>
 
 #ifdef CONFIG_SMP
Index: kernel/arch/ia64/src/cpu/cpu.c
===================================================================
--- kernel/arch/ia64/src/cpu/cpu.c	(revision 4774a32c4567b1ea6bd0337ce00e4bb335b21a0f)
+++ kernel/arch/ia64/src/cpu/cpu.c	(revision eae4e8fa7dfec64f319138584d0480c91f7579ca)
@@ -37,4 +37,5 @@
 #include <arch/register.h>
 #include <print.h>
+#include <memstr.h>
 
 void cpu_arch_init(void)
Index: kernel/arch/ppc32/src/mm/as.c
===================================================================
--- kernel/arch/ppc32/src/mm/as.c	(revision 4774a32c4567b1ea6bd0337ce00e4bb335b21a0f)
+++ kernel/arch/ppc32/src/mm/as.c	(revision eae4e8fa7dfec64f319138584d0480c91f7579ca)
@@ -35,4 +35,5 @@
 #include <arch/mm/as.h>
 #include <genarch/mm/as_pt.h>
+#include <genarch/mm/page_pt.h>
 #include <genarch/mm/asid_fifo.h>
 #include <arch.h>
Index: kernel/arch/ppc32/src/mm/tlb.c
===================================================================
--- kernel/arch/ppc32/src/mm/tlb.c	(revision 4774a32c4567b1ea6bd0337ce00e4bb335b21a0f)
+++ kernel/arch/ppc32/src/mm/tlb.c	(revision eae4e8fa7dfec64f319138584d0480c91f7579ca)
@@ -38,4 +38,5 @@
 #include <interrupt.h>
 #include <mm/as.h>
+#include <mm/page.h>
 #include <arch.h>
 #include <print.h>
Index: kernel/arch/ppc32/src/ppc32.c
===================================================================
--- kernel/arch/ppc32/src/ppc32.c	(revision 4774a32c4567b1ea6bd0337ce00e4bb335b21a0f)
+++ kernel/arch/ppc32/src/ppc32.c	(revision eae4e8fa7dfec64f319138584d0480c91f7579ca)
@@ -44,4 +44,5 @@
 #include <genarch/ofw/pci.h>
 #include <userspace.h>
+#include <mm/page.h>
 #include <proc/uarg.h>
 #include <console/console.h>
Index: kernel/arch/sparc64/src/mm/tlb.c
===================================================================
--- kernel/arch/sparc64/src/mm/tlb.c	(revision 4774a32c4567b1ea6bd0337ce00e4bb335b21a0f)
+++ kernel/arch/sparc64/src/mm/tlb.c	(revision eae4e8fa7dfec64f319138584d0480c91f7579ca)
@@ -37,4 +37,5 @@
 #include <mm/as.h>
 #include <mm/asid.h>
+#include <genarch/mm/page_ht.h>
 #include <arch/mm/frame.h>
 #include <arch/mm/page.h>
Index: kernel/genarch/src/drivers/via-cuda/cuda.c
===================================================================
--- kernel/genarch/src/drivers/via-cuda/cuda.c	(revision 4774a32c4567b1ea6bd0337ce00e4bb335b21a0f)
+++ kernel/genarch/src/drivers/via-cuda/cuda.c	(revision eae4e8fa7dfec64f319138584d0480c91f7579ca)
@@ -41,4 +41,5 @@
 #include <ddi/device.h>
 #include <synch/spinlock.h>
+#include <memstr.h>
 
 static irq_ownership_t cuda_claim(irq_t *irq);