diff --git a/firmware/SOURCES b/firmware/SOURCES
index f13eba618f..23b5baea3e 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -116,14 +116,6 @@ libc/ctype.c
 libc/memchr.c
 libc/memcmp.c
 
-#if !defined(CPU_SH) && !defined(CPU_COLDFIRE) && !defined(CPU_ARM)
-#if !defined(CPU_MIPS)
-libc/memcpy.c
-libc/memset.c
-#endif /* CPU_MIPS */
-libc/memmove.c
-#endif /* CPU_* */
-
 libc/qsort.c
 libc/random.c
 libc/strcat.c
@@ -131,10 +123,6 @@ libc/strchr.c
 libc/strcmp.c
 libc/strcpy.c
 
-#if !defined(CPU_SH) && !defined(CPU_COLDFIRE)
-libc/strlen.c
-#endif
-
 libc/strncmp.c
 libc/strrchr.c
 libc/strstr.c
@@ -422,10 +410,6 @@ target/sh/adc-sh.c
 target/sh/bitswap.S
 target/sh/crt0.S
 target/sh/kernel-sh.c
-target/sh/memcpy-sh.S
-target/sh/memmove-sh.S
-target/sh/memset-sh.S
-target/sh/strlen-sh.S
 target/sh/system-sh.c
 target/sh/archos/descramble.S
 target/sh/archos/i2c-archos.c
@@ -438,14 +422,6 @@ target/coldfire/crt0.S
 common/ffs.c
 target/coldfire/ffs-coldfire.S
 #endif
-target/coldfire/memcpy-coldfire.S
-target/coldfire/memmove-coldfire.S
-target/coldfire/memset-coldfire.S
-target/coldfire/strlen-coldfire.S
-#if defined(HAVE_LCD_COLOR) || (LCD_PIXELFORMAT == VERTICAL_INTERLEAVED) \
- || defined(HAVE_REMOTE_LCD) && (LCD_REMOTE_PIXELFORMAT == VERTICAL_INTERLEAVED)
-target/coldfire/memset16-coldfire.S
-#endif
 target/coldfire/kernel-coldfire.c
 target/coldfire/system-coldfire.c
 target/coldfire/timer-coldfire.c
@@ -462,11 +438,6 @@ target/coldfire/ata-as-coldfire.S
 
 #elif defined(CPU_PP) || defined(CPU_ARM)
 /* CPU_PP => CPU_ARM, CPU_ARM !=> CPU_PP */
-target/arm/memcpy-arm.S
-target/arm/memmove-arm.S
-
-target/arm/memset-arm.S
-target/arm/memset16-arm.S
 
 # if ARM_ARCH < 6
 target/arm/bits-armv4.S
@@ -654,10 +625,7 @@ target/arm/crt0.S
 #endif /* defined(CPU_*) */
 
 #elif defined(CPU_MIPS)
-common/memset16.c
 target/mips/ffs-mips.S
-target/mips/memcpy-mips.S
-target/mips/memset-mips.S
 target/mips/mmu-mips.c
 #if CONFIG_CPU==JZ4732
 target/mips/ingenic_jz47xx/crt0.S
@@ -668,7 +636,6 @@ target/mips/ingenic_jz47xx/crt0.S
 #ifdef HAVE_PRIORITY_SCHEDULING
 common/ffs.c
 #endif
-common/memset16.c
 #if (CONFIG_PLATFORM & PLATFORM_NATIVE)
 crt0.S
 drivers/i2c.c
diff --git a/firmware/asm/SOURCES b/firmware/asm/SOURCES
index 8b13789179..805727ea93 100644
--- a/firmware/asm/SOURCES
+++ b/firmware/asm/SOURCES
@@ -1 +1,7 @@
-
+memset16.c
+#if (CONFIG_PLATFORM & PLATFORM_NATIVE) || defined(HAVE_ROCKBOX_C_LIBRARY)
+memcpy.c
+memmove.c
+memset.c
+strlen.c
+#endif
diff --git a/firmware/target/arm/memcpy-arm.S b/firmware/asm/arm/memcpy.S
similarity index 100%
rename from firmware/target/arm/memcpy-arm.S
rename to firmware/asm/arm/memcpy.S
diff --git a/firmware/target/arm/memmove-arm.S b/firmware/asm/arm/memmove.S
similarity index 100%
rename from firmware/target/arm/memmove-arm.S
rename to firmware/asm/arm/memmove.S
diff --git a/firmware/target/arm/memset-arm.S b/firmware/asm/arm/memset.S
similarity index 100%
rename from firmware/target/arm/memset-arm.S
rename to firmware/asm/arm/memset.S
diff --git a/firmware/target/arm/memset16-arm.S b/firmware/asm/arm/memset16.S
similarity index 100%
rename from firmware/target/arm/memset16-arm.S
rename to firmware/asm/arm/memset16.S
diff --git a/firmware/target/coldfire/memcpy-coldfire.S b/firmware/asm/m68k/memcpy.S
similarity index 100%
rename from firmware/target/coldfire/memcpy-coldfire.S
rename to firmware/asm/m68k/memcpy.S
diff --git a/firmware/target/coldfire/memmove-coldfire.S b/firmware/asm/m68k/memmove.S
similarity index 100%
rename from firmware/target/coldfire/memmove-coldfire.S
rename to firmware/asm/m68k/memmove.S
diff --git a/firmware/target/coldfire/memset-coldfire.S b/firmware/asm/m68k/memset.S
similarity index 100%
rename from firmware/target/coldfire/memset-coldfire.S
rename to firmware/asm/m68k/memset.S
diff --git a/firmware/target/coldfire/memset16-coldfire.S b/firmware/asm/m68k/memset16.S
similarity index 100%
rename from firmware/target/coldfire/memset16-coldfire.S
rename to firmware/asm/m68k/memset16.S
diff --git a/firmware/target/coldfire/strlen-coldfire.S b/firmware/asm/m68k/strlen.S
similarity index 100%
rename from firmware/target/coldfire/strlen-coldfire.S
rename to firmware/asm/m68k/strlen.S
diff --git a/firmware/libc/memcpy.c b/firmware/asm/memcpy.c
similarity index 100%
rename from firmware/libc/memcpy.c
rename to firmware/asm/memcpy.c
diff --git a/firmware/libc/memmove.c b/firmware/asm/memmove.c
similarity index 100%
rename from firmware/libc/memmove.c
rename to firmware/asm/memmove.c
diff --git a/firmware/libc/memset.c b/firmware/asm/memset.c
similarity index 100%
rename from firmware/libc/memset.c
rename to firmware/asm/memset.c
diff --git a/firmware/common/memset16.c b/firmware/asm/memset16.c
similarity index 100%
rename from firmware/common/memset16.c
rename to firmware/asm/memset16.c
diff --git a/firmware/target/mips/memcpy-mips.S b/firmware/asm/mips/memcpy.S
similarity index 100%
rename from firmware/target/mips/memcpy-mips.S
rename to firmware/asm/mips/memcpy.S
diff --git a/firmware/target/mips/memset-mips.S b/firmware/asm/mips/memset.S
similarity index 100%
rename from firmware/target/mips/memset-mips.S
rename to firmware/asm/mips/memset.S
diff --git a/firmware/target/sh/memcpy-sh.S b/firmware/asm/sh/memcpy.S
similarity index 100%
rename from firmware/target/sh/memcpy-sh.S
rename to firmware/asm/sh/memcpy.S
diff --git a/firmware/target/sh/memmove-sh.S b/firmware/asm/sh/memmove.S
similarity index 100%
rename from firmware/target/sh/memmove-sh.S
rename to firmware/asm/sh/memmove.S
diff --git a/firmware/target/sh/memset-sh.S b/firmware/asm/sh/memset.S
similarity index 100%
rename from firmware/target/sh/memset-sh.S
rename to firmware/asm/sh/memset.S
diff --git a/firmware/target/sh/strlen-sh.S b/firmware/asm/sh/strlen.S
similarity index 100%
rename from firmware/target/sh/strlen-sh.S
rename to firmware/asm/sh/strlen.S
diff --git a/firmware/libc/strlen.c b/firmware/asm/strlen.c
similarity index 100%
rename from firmware/libc/strlen.c
rename to firmware/asm/strlen.c