Index: kernel/arch/amd64/src/amd64.c
===================================================================
--- kernel/arch/amd64/src/amd64.c	(revision c89ae2562f477e91a8041f1bdff7ef9c6bec68b8)
+++ kernel/arch/amd64/src/amd64.c	(revision 40eab9fdcc5233a31ae07d23360a0b5fc2e5c701)
@@ -37,5 +37,5 @@
 #include <stdint.h>
 #include <errno.h>
-#include <mem.h>
+#include <memw.h>
 #include <interrupt.h>
 #include <console/console.h>
Index: kernel/arch/amd64/src/pm.c
===================================================================
--- kernel/arch/amd64/src/pm.c	(revision c89ae2562f477e91a8041f1bdff7ef9c6bec68b8)
+++ kernel/arch/amd64/src/pm.c	(revision 40eab9fdcc5233a31ae07d23360a0b5fc2e5c701)
@@ -39,5 +39,5 @@
 #include <mm/as.h>
 #include <mm/frame.h>
-#include <mem.h>
+#include <memw.h>
 #include <stdlib.h>
 
Index: kernel/arch/arm32/src/ras.c
===================================================================
--- kernel/arch/arm32/src/ras.c	(revision c89ae2562f477e91a8041f1bdff7ef9c6bec68b8)
+++ kernel/arch/arm32/src/ras.c	(revision 40eab9fdcc5233a31ae07d23360a0b5fc2e5c701)
@@ -44,5 +44,5 @@
 #include <arch/exception.h>
 #include <arch.h>
-#include <mem.h>
+#include <memw.h>
 #include <typedefs.h>
 
Index: kernel/arch/ia32/src/ia32.c
===================================================================
--- kernel/arch/ia32/src/ia32.c	(revision c89ae2562f477e91a8041f1bdff7ef9c6bec68b8)
+++ kernel/arch/ia32/src/ia32.c	(revision 40eab9fdcc5233a31ae07d23360a0b5fc2e5c701)
@@ -39,5 +39,5 @@
 #include <stdint.h>
 #include <errno.h>
-#include <mem.h>
+#include <memw.h>
 #include <interrupt.h>
 #include <console/console.h>
Index: kernel/arch/ia32/src/pm.c
===================================================================
--- kernel/arch/ia32/src/pm.c	(revision c89ae2562f477e91a8041f1bdff7ef9c6bec68b8)
+++ kernel/arch/ia32/src/pm.c	(revision 40eab9fdcc5233a31ae07d23360a0b5fc2e5c701)
@@ -44,5 +44,5 @@
 #include <mm/frame.h>
 #include <stdlib.h>
-#include <mem.h>
+#include <memw.h>
 #include <arch/boot/boot.h>
 #include <interrupt.h>
Index: kernel/arch/ia32/src/smp/smp.c
===================================================================
--- kernel/arch/ia32/src/smp/smp.c	(revision c89ae2562f477e91a8041f1bdff7ef9c6bec68b8)
+++ kernel/arch/ia32/src/smp/smp.c	(revision 40eab9fdcc5233a31ae07d23360a0b5fc2e5c701)
@@ -54,5 +54,5 @@
 #include <mm/as.h>
 #include <log.h>
-#include <mem.h>
+#include <memw.h>
 #include <genarch/drivers/i8259/i8259.h>
 #include <cpu.h>
Index: kernel/arch/ia64/src/cpu/cpu.c
===================================================================
--- kernel/arch/ia64/src/cpu/cpu.c	(revision c89ae2562f477e91a8041f1bdff7ef9c6bec68b8)
+++ kernel/arch/ia64/src/cpu/cpu.c	(revision 40eab9fdcc5233a31ae07d23360a0b5fc2e5c701)
@@ -37,5 +37,5 @@
 #include <arch/register.h>
 #include <stdio.h>
-#include <mem.h>
+#include <memw.h>
 
 void cpu_arch_init(void)
Index: kernel/arch/ia64/src/mm/vhpt.c
===================================================================
--- kernel/arch/ia64/src/mm/vhpt.c	(revision c89ae2562f477e91a8041f1bdff7ef9c6bec68b8)
+++ kernel/arch/ia64/src/mm/vhpt.c	(revision 40eab9fdcc5233a31ae07d23360a0b5fc2e5c701)
@@ -33,5 +33,5 @@
  */
 
-#include <mem.h>
+#include <memw.h>
 #include <arch/barrier.h>
 #include <arch/mm/vhpt.h>
Index: kernel/arch/mips32/src/mips32.c
===================================================================
--- kernel/arch/mips32/src/mips32.c	(revision c89ae2562f477e91a8041f1bdff7ef9c6bec68b8)
+++ kernel/arch/mips32/src/mips32.c	(revision 40eab9fdcc5233a31ae07d23360a0b5fc2e5c701)
@@ -40,5 +40,5 @@
 #include <macros.h>
 #include <str.h>
-#include <mem.h>
+#include <memw.h>
 #include <preemption.h>
 #include <userspace.h>
Index: kernel/arch/riscv64/src/riscv64.c
===================================================================
--- kernel/arch/riscv64/src/riscv64.c	(revision c89ae2562f477e91a8041f1bdff7ef9c6bec68b8)
+++ kernel/arch/riscv64/src/riscv64.c	(revision 40eab9fdcc5233a31ae07d23360a0b5fc2e5c701)
@@ -50,5 +50,5 @@
 #include <proc/thread.h>
 #include <console/console.h>
-#include <mem.h>
+#include <memw.h>
 #include <str.h>
 
Index: kernel/arch/sparc64/src/mm/sun4u/as.c
===================================================================
--- kernel/arch/sparc64/src/mm/sun4u/as.c	(revision c89ae2562f477e91a8041f1bdff7ef9c6bec68b8)
+++ kernel/arch/sparc64/src/mm/sun4u/as.c	(revision 40eab9fdcc5233a31ae07d23360a0b5fc2e5c701)
@@ -47,5 +47,5 @@
 #include <bitops.h>
 #include <macros.h>
-#include <mem.h>
+#include <memw.h>
 
 #endif /* CONFIG_TSB */
Index: kernel/arch/sparc64/src/mm/sun4v/as.c
===================================================================
--- kernel/arch/sparc64/src/mm/sun4v/as.c	(revision c89ae2562f477e91a8041f1bdff7ef9c6bec68b8)
+++ kernel/arch/sparc64/src/mm/sun4v/as.c	(revision 40eab9fdcc5233a31ae07d23360a0b5fc2e5c701)
@@ -50,5 +50,5 @@
 #include <bitops.h>
 #include <macros.h>
-#include <mem.h>
+#include <memw.h>
 
 #endif /* CONFIG_TSB */