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>