Index: kernel/arch/abs32le/src/abs32le.c
===================================================================
--- kernel/arch/abs32le/src/abs32le.c	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/abs32le/src/abs32le.c	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
@@ -40,14 +40,12 @@
 #include <func.h>
 #include <config.h>
+#include <console/console.h>
 #include <errno.h>
 #include <context.h>
 #include <fpu_context.h>
 #include <interrupt.h>
+#include <ddi/irq.h>
 #include <syscall/copy.h>
-#include <ddi/irq.h>
-#include <proc/thread.h>
 #include <syscall/syscall.h>
-#include <console/console.h>
-#include <memstr.h>
 
 static void abs32le_post_mm_init(void);
Index: kernel/arch/abs32le/src/mm/page.c
===================================================================
--- kernel/arch/abs32le/src/mm/page.c	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/abs32le/src/mm/page.c	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
@@ -46,5 +46,4 @@
 #include <arch/asm.h>
 #include <debug.h>
-#include <memstr.h>
 #include <print.h>
 #include <interrupt.h>
Index: kernel/arch/amd64/src/amd64.c
===================================================================
--- kernel/arch/amd64/src/amd64.c	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/amd64/src/amd64.c	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
@@ -37,5 +37,5 @@
 #include <typedefs.h>
 #include <errno.h>
-#include <memstr.h>
+#include <mem.h>
 #include <interrupt.h>
 #include <console/console.h>
Index: kernel/arch/amd64/src/mm/page.c
===================================================================
--- kernel/arch/amd64/src/mm/page.c	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/amd64/src/mm/page.c	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
@@ -41,5 +41,4 @@
 #include <arch/asm.h>
 #include <config.h>
-#include <memstr.h>
 #include <interrupt.h>
 #include <print.h>
Index: kernel/arch/amd64/src/pm.c
===================================================================
--- kernel/arch/amd64/src/pm.c	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/amd64/src/pm.c	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
@@ -39,5 +39,5 @@
 #include <mm/as.h>
 #include <mm/frame.h>
-#include <memstr.h>
+#include <mem.h>
 #include <mm/slab.h>
 
Index: kernel/arch/arm32/src/ras.c
===================================================================
--- kernel/arch/arm32/src/ras.c	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/arm32/src/ras.c	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
@@ -44,5 +44,5 @@
 #include <arch/exception.h>
 #include <arch.h>
-#include <memstr.h>
+#include <mem.h>
 #include <typedefs.h>
 
Index: kernel/arch/ia32/src/ia32.c
===================================================================
--- kernel/arch/ia32/src/ia32.c	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/ia32/src/ia32.c	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
@@ -39,5 +39,5 @@
 #include <typedefs.h>
 #include <errno.h>
-#include <memstr.h>
+#include <mem.h>
 #include <interrupt.h>
 #include <console/console.h>
Index: kernel/arch/ia32/src/mm/page.c
===================================================================
--- kernel/arch/ia32/src/mm/page.c	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/ia32/src/mm/page.c	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
@@ -46,5 +46,4 @@
 #include <arch/asm.h>
 #include <debug.h>
-#include <memstr.h>
 #include <print.h>
 #include <interrupt.h>
Index: kernel/arch/ia32/src/pm.c
===================================================================
--- kernel/arch/ia32/src/pm.c	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/ia32/src/pm.c	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
@@ -44,5 +44,5 @@
 #include <mm/frame.h>
 #include <mm/slab.h>
-#include <memstr.h>
+#include <mem.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 e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/ia32/src/smp/smp.c	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
@@ -53,5 +53,5 @@
 #include <mm/as.h>
 #include <log.h>
-#include <memstr.h>
+#include <mem.h>
 #include <arch/drivers/i8259.h>
 #include <cpu.h>
Index: kernel/arch/ia64/src/cpu/cpu.c
===================================================================
--- kernel/arch/ia64/src/cpu/cpu.c	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/ia64/src/cpu/cpu.c	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
@@ -37,5 +37,5 @@
 #include <arch/register.h>
 #include <print.h>
-#include <memstr.h>
+#include <mem.h>
 
 void cpu_arch_init(void)
Index: kernel/arch/ia64/src/mm/page.c
===================================================================
--- kernel/arch/ia64/src/mm/page.c	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/ia64/src/mm/page.c	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
@@ -47,5 +47,4 @@
 #include <arch/asm.h>
 #include <arch/barrier.h>
-#include <memstr.h>
 #include <align.h>
 
Index: kernel/arch/ia64/src/mm/vhpt.c
===================================================================
--- kernel/arch/ia64/src/mm/vhpt.c	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/ia64/src/mm/vhpt.c	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
@@ -33,5 +33,5 @@
 */
 
-#include <memstr.h>
+#include <mem.h>
 #include <arch/mm/vhpt.h>
 #include <mm/frame.h>
Index: kernel/arch/mips32/src/debugger.c
===================================================================
--- kernel/arch/mips32/src/debugger.c	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/mips32/src/debugger.c	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
@@ -35,5 +35,4 @@
 #include <arch/debugger.h>
 #include <arch/barrier.h>
-#include <memstr.h>
 #include <console/kconsole.h>
 #include <console/cmd.h>
Index: kernel/arch/mips32/src/mips32.c
===================================================================
--- kernel/arch/mips32/src/mips32.c	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/mips32/src/mips32.c	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
@@ -40,5 +40,5 @@
 #include <macros.h>
 #include <str.h>
-#include <memstr.h>
+#include <mem.h>
 #include <userspace.h>
 #include <syscall/syscall.h>
Index: kernel/arch/riscv64/src/mm/page.c
===================================================================
--- kernel/arch/riscv64/src/mm/page.c	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/riscv64/src/mm/page.c	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
@@ -46,5 +46,4 @@
 #include <arch/asm.h>
 #include <debug.h>
-#include <memstr.h>
 #include <print.h>
 #include <interrupt.h>
Index: kernel/arch/riscv64/src/riscv64.c
===================================================================
--- kernel/arch/riscv64/src/riscv64.c	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/riscv64/src/riscv64.c	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
@@ -48,5 +48,5 @@
 #include <proc/thread.h>
 #include <console/console.h>
-#include <memstr.h>
+#include <mem.h>
 
 char memcpy_from_uspace_failover_address;
Index: kernel/arch/sparc64/src/mm/sun4u/as.c
===================================================================
--- kernel/arch/sparc64/src/mm/sun4u/as.c	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/sparc64/src/mm/sun4u/as.c	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
@@ -47,5 +47,5 @@
 #include <bitops.h>
 #include <macros.h>
-#include <memstr.h>
+#include <mem.h>
 
 #endif /* CONFIG_TSB */
Index: kernel/arch/sparc64/src/mm/sun4v/as.c
===================================================================
--- kernel/arch/sparc64/src/mm/sun4v/as.c	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/sparc64/src/mm/sun4v/as.c	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
@@ -50,5 +50,5 @@
 #include <bitops.h>
 #include <macros.h>
-#include <memstr.h>
+#include <mem.h>
 
 #endif /* CONFIG_TSB */
Index: kernel/arch/sparc64/src/trap/trap.c
===================================================================
--- kernel/arch/sparc64/src/trap/trap.c	(revision e29e44bfc60bad156c2207d4a15f29c1a1645d85)
+++ kernel/arch/sparc64/src/trap/trap.c	(revision 44a7ee5373ccc121fce74799244a44867eed301d)
@@ -35,14 +35,4 @@
 
 #include <arch/trap/trap.h>
-#include <arch/trap/trap_table.h>
-#include <arch/trap/regwin.h>
-#include <arch/trap/exception.h>
-#include <arch/trap/interrupt.h>
-#include <arch/trap/mmu.h>
-#include <arch/asm.h>
-#include <memstr.h>
-#include <debug.h>
-#include <typedefs.h>
-#include <arch/drivers/tick.h>
 
 /** Initialize trap table. */