Index: kernel/generic/src/cpu/cpu.c
===================================================================
--- kernel/generic/src/cpu/cpu.c	(revision 0373af921e46809be1f9f16e080f93fb2c354b2b)
+++ kernel/generic/src/cpu/cpu.c	(revision b1696194837e19c7e4d446880d20ede25043bad4)
@@ -45,5 +45,5 @@
 #include <config.h>
 #include <panic.h>
-#include <mem.h>
+#include <memw.h>
 #include <adt/list.h>
 #include <stdio.h>
Index: kernel/generic/src/ddi/ddi.c
===================================================================
--- kernel/generic/src/ddi/ddi.c	(revision 0373af921e46809be1f9f16e080f93fb2c354b2b)
+++ kernel/generic/src/ddi/ddi.c	(revision b1696194837e19c7e4d446880d20ede25043bad4)
@@ -54,5 +54,5 @@
 #include <align.h>
 #include <errno.h>
-#include <mem.h>
+#include <memw.h>
 #include <trace.h>
 #include <bitops.h>
Index: kernel/generic/src/ddi/irq.c
===================================================================
--- kernel/generic/src/ddi/irq.c	(revision 0373af921e46809be1f9f16e080f93fb2c354b2b)
+++ kernel/generic/src/ddi/irq.c	(revision b1696194837e19c7e4d446880d20ede25043bad4)
@@ -47,5 +47,5 @@
 #include <console/console.h>
 #include <interrupt.h>
-#include <mem.h>
+#include <memw.h>
 #include <arch.h>
 
Index: kernel/generic/src/ipc/ipc.c
===================================================================
--- kernel/generic/src/ipc/ipc.c	(revision 0373af921e46809be1f9f16e080f93fb2c354b2b)
+++ kernel/generic/src/ipc/ipc.c	(revision b1696194837e19c7e4d446880d20ede25043bad4)
@@ -54,5 +54,5 @@
 #include <arch.h>
 #include <proc/task.h>
-#include <mem.h>
+#include <memw.h>
 #include <stdio.h>
 #include <console/console.h>
Index: kernel/generic/src/ipc/sysipc.c
===================================================================
--- kernel/generic/src/ipc/sysipc.c	(revision 0373af921e46809be1f9f16e080f93fb2c354b2b)
+++ kernel/generic/src/ipc/sysipc.c	(revision b1696194837e19c7e4d446880d20ede25043bad4)
@@ -36,5 +36,5 @@
 #include <assert.h>
 #include <errno.h>
-#include <mem.h>
+#include <memw.h>
 #include <ipc/ipc.h>
 #include <abi/ipc/methods.h>
Index: kernel/generic/src/lib/gsort.c
===================================================================
--- kernel/generic/src/lib/gsort.c	(revision 0373af921e46809be1f9f16e080f93fb2c354b2b)
+++ kernel/generic/src/lib/gsort.c	(revision b1696194837e19c7e4d446880d20ede25043bad4)
@@ -41,5 +41,5 @@
 
 #include <gsort.h>
-#include <mem.h>
+#include <memw.h>
 #include <stdlib.h>
 
Index: kernel/generic/src/lib/mem.c
===================================================================
--- kernel/generic/src/lib/mem.c	(revision 0373af921e46809be1f9f16e080f93fb2c354b2b)
+++ kernel/generic/src/lib/mem.c	(revision b1696194837e19c7e4d446880d20ede25043bad4)
@@ -41,5 +41,5 @@
  */
 
-#include <mem.h>
+#include <memw.h>
 #include <typedefs.h>
 
@@ -77,49 +77,4 @@
 }
 
-/** Move memory block with possible overlapping.
- *
- * Copy cnt bytes from src address to dst address. The source
- * and destination memory areas may overlap.
- *
- * @param dst Destination address to copy to.
- * @param src Source address to copy from.
- * @param cnt Number of bytes to copy.
- *
- * @return Destination address.
- *
- */
-void *memmove(void *dst, const void *src, size_t cnt)
-{
-	/* Nothing to do? */
-	if (src == dst)
-		return dst;
-
-	/* Non-overlapping? */
-	if ((dst >= src + cnt) || (src >= dst + cnt))
-		return memcpy(dst, src, cnt);
-
-	uint8_t *dp;
-	const uint8_t *sp;
-
-	/* Which direction? */
-	if (src > dst) {
-		/* Forwards. */
-		dp = dst;
-		sp = src;
-
-		while (cnt-- != 0)
-			*dp++ = *sp++;
-	} else {
-		/* Backwards. */
-		dp = dst + (cnt - 1);
-		sp = src + (cnt - 1);
-
-		while (cnt-- != 0)
-			*dp-- = *sp--;
-	}
-
-	return dst;
-}
-
 /** @}
  */
Index: kernel/generic/src/lib/memfnc.c
===================================================================
--- kernel/generic/src/lib/memfnc.c	(revision 0373af921e46809be1f9f16e080f93fb2c354b2b)
+++ 	(revision )
@@ -1,117 +1,0 @@
-/*
- * Copyright (c) 2011 Martin Decky
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * - The name of the author may not be used to endorse or promote products
- *   derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/** @addtogroup kernel_generic
- * @{
- */
-
-/**
- * @file
- * @brief Memory string functions.
- *
- * This file provides architecture independent functions to manipulate blocks
- * of memory. These functions are optimized as much as generic functions of
- * this type can be.
- */
-
-#include <lib/memfnc.h>
-#include <typedefs.h>
-
-/** Fill block of memory.
- *
- * Fill cnt bytes at dst address with the value val.
- *
- * @param dst Destination address to fill.
- * @param val Value to fill.
- * @param cnt Number of bytes to fill.
- *
- * @return Destination address.
- *
- */
-void *memset(void *dst, int val, size_t cnt)
-{
-	uint8_t *dp = (uint8_t *) dst;
-
-	while (cnt-- != 0)
-		*dp++ = val;
-
-	return dst;
-}
-
-/** Move memory block without overlapping.
- *
- * Copy cnt bytes from src address to dst address. The source
- * and destination memory areas cannot overlap.
- *
- * @param dst Destination address to copy to.
- * @param src Source address to copy from.
- * @param cnt Number of bytes to copy.
- *
- * @return Destination address.
- *
- */
-void *memcpy(void *dst, const void *src, size_t cnt)
-{
-	uint8_t *dp = (uint8_t *) dst;
-	const uint8_t *sp = (uint8_t *) src;
-
-	while (cnt-- != 0)
-		*dp++ = *sp++;
-
-	return dst;
-}
-
-/** Compare two memory areas.
- *
- * @param s1  Pointer to the first area to compare.
- * @param s2  Pointer to the second area to compare.
- * @param len Size of the areas in bytes.
- *
- * @return Zero if areas have the same contents. If they differ,
- *	   the sign of the result is the same as the sign of the
- *	   difference of the first pair of different bytes.
- *
- */
-int memcmp(const void *s1, const void *s2, size_t len)
-{
-	uint8_t *u1 = (uint8_t *) s1;
-	uint8_t *u2 = (uint8_t *) s2;
-	size_t i;
-
-	for (i = 0; i < len; i++) {
-		if (*u1 != *u2)
-			return (int)(*u1) - (int)(*u2);
-		++u1;
-		++u2;
-	}
-
-	return 0;
-}
-
-/** @}
- */
Index: kernel/generic/src/lib/ubsan.c
===================================================================
--- kernel/generic/src/lib/ubsan.c	(revision 0373af921e46809be1f9f16e080f93fb2c354b2b)
+++ kernel/generic/src/lib/ubsan.c	(revision b1696194837e19c7e4d446880d20ede25043bad4)
@@ -10,5 +10,5 @@
 #include <stddef.h>
 #include <panic.h>
-#include <mem.h>
+#include <memw.h>
 
 #define PRINTF(...) printf(__VA_ARGS__)
Index: kernel/generic/src/main/kinit.c
===================================================================
--- kernel/generic/src/main/kinit.c	(revision 0373af921e46809be1f9f16e080f93fb2c354b2b)
+++ kernel/generic/src/main/kinit.c	(revision b1696194837e19c7e4d446880d20ede25043bad4)
@@ -61,5 +61,5 @@
 #include <stdio.h>
 #include <log.h>
-#include <mem.h>
+#include <memw.h>
 #include <console/console.h>
 #include <interrupt.h>
Index: kernel/generic/src/mm/as.c
===================================================================
--- kernel/generic/src/mm/as.c	(revision 0373af921e46809be1f9f16e080f93fb2c354b2b)
+++ kernel/generic/src/mm/as.c	(revision b1696194837e19c7e4d446880d20ede25043bad4)
@@ -69,5 +69,5 @@
 #include <assert.h>
 #include <stdio.h>
-#include <mem.h>
+#include <memw.h>
 #include <macros.h>
 #include <bitops.h>
Index: kernel/generic/src/mm/backend_anon.c
===================================================================
--- kernel/generic/src/mm/backend_anon.c	(revision 0373af921e46809be1f9f16e080f93fb2c354b2b)
+++ kernel/generic/src/mm/backend_anon.c	(revision b1696194837e19c7e4d446880d20ede25043bad4)
@@ -51,5 +51,5 @@
 #include <typedefs.h>
 #include <align.h>
-#include <mem.h>
+#include <memw.h>
 #include <arch.h>
 
Index: kernel/generic/src/mm/backend_elf.c
===================================================================
--- kernel/generic/src/mm/backend_elf.c	(revision 0373af921e46809be1f9f16e080f93fb2c354b2b)
+++ kernel/generic/src/mm/backend_elf.c	(revision b1696194837e19c7e4d446880d20ede25043bad4)
@@ -48,5 +48,5 @@
 #include <genarch/mm/page_ht.h>
 #include <align.h>
-#include <mem.h>
+#include <memw.h>
 #include <macros.h>
 #include <arch.h>
Index: kernel/generic/src/mm/malloc.c
===================================================================
--- kernel/generic/src/mm/malloc.c	(revision 0373af921e46809be1f9f16e080f93fb2c354b2b)
+++ kernel/generic/src/mm/malloc.c	(revision b1696194837e19c7e4d446880d20ede25043bad4)
@@ -34,5 +34,5 @@
 #include <bitops.h>
 #include <mm/slab.h>
-#include <mem.h>
+#include <memw.h>
 #include <main/main.h> // malloc_init()
 #include <macros.h>
Index: kernel/generic/src/mm/slab.c
===================================================================
--- kernel/generic/src/mm/slab.c	(revision 0373af921e46809be1f9f16e080f93fb2c354b2b)
+++ kernel/generic/src/mm/slab.c	(revision b1696194837e19c7e4d446880d20ede25043bad4)
@@ -106,5 +106,5 @@
 #include <mm/slab.h>
 #include <adt/list.h>
-#include <mem.h>
+#include <memw.h>
 #include <align.h>
 #include <mm/frame.h>
Index: kernel/generic/src/printf/vsnprintf.c
===================================================================
--- kernel/generic/src/printf/vsnprintf.c	(revision 0373af921e46809be1f9f16e080f93fb2c354b2b)
+++ kernel/generic/src/printf/vsnprintf.c	(revision b1696194837e19c7e4d446880d20ede25043bad4)
@@ -36,5 +36,5 @@
 #include <printf/printf_core.h>
 #include <str.h>
-#include <mem.h>
+#include <memw.h>
 #include <errno.h>
 
Index: kernel/generic/src/proc/thread.c
===================================================================
--- kernel/generic/src/proc/thread.c	(revision 0373af921e46809be1f9f16e080f93fb2c354b2b)
+++ kernel/generic/src/proc/thread.c	(revision b1696194837e19c7e4d446880d20ede25043bad4)
@@ -62,5 +62,5 @@
 #include <arch/faddr.h>
 #include <atomic.h>
-#include <mem.h>
+#include <memw.h>
 #include <stdio.h>
 #include <stdlib.h>
Index: kernel/generic/src/synch/waitq.c
===================================================================
--- kernel/generic/src/synch/waitq.c	(revision 0373af921e46809be1f9f16e080f93fb2c354b2b)
+++ kernel/generic/src/synch/waitq.c	(revision b1696194837e19c7e4d446880d20ede25043bad4)
@@ -59,5 +59,5 @@
 #include <adt/list.h>
 #include <arch/cycle.h>
-#include <mem.h>
+#include <memw.h>
 
 /** Initialize wait queue
Index: kernel/generic/src/udebug/udebug_ops.c
===================================================================
--- kernel/generic/src/udebug/udebug_ops.c	(revision 0373af921e46809be1f9f16e080f93fb2c354b2b)
+++ kernel/generic/src/udebug/udebug_ops.c	(revision b1696194837e19c7e4d446880d20ede25043bad4)
@@ -51,5 +51,5 @@
 #include <udebug/udebug.h>
 #include <udebug/udebug_ops.h>
-#include <mem.h>
+#include <memw.h>
 #include <stdlib.h>