Index: uspace/lib/libc/generic/string.c
===================================================================
--- uspace/lib/libc/generic/string.c	(revision 7afb4a53710d7b78f26a51c1825abc447de3ea5b)
+++ uspace/lib/libc/generic/string.c	(revision f4b153529231867ef6c64403a465d1f66e1016ca)
@@ -41,4 +41,5 @@
 #include <errno.h>
 #include <align.h>
+#include <mem.h>
 #include <string.h>
 
@@ -807,13 +808,4 @@
 }
 
-char *strncpy(char *dest, const char *src, size_t n)
-{
-	char *orig = dest;
-	
-	while ((*(dest++) = *(src++)) && --n)
-		;
-	return orig;
-}
-
 char *strcat(char *dest, const char *src)
 {
@@ -827,13 +819,13 @@
 }
 
-char * strdup(const char *s1)
-{
-	size_t len = str_size(s1) + 1;
-	void *ret = malloc(len);
-
-	if (ret == NULL)
+char *str_dup(const char *src)
+{
+	size_t size = str_size(src);
+	void *dest = malloc(size + 1);
+
+	if (dest == NULL)
 		return (char *) NULL;
 
-	return (char *) memcpy(ret, s1, len);
+	return (char *) memcpy(dest, src, size + 1);
 }
 
Index: uspace/lib/libc/generic/vfs/vfs.c
===================================================================
--- uspace/lib/libc/generic/vfs/vfs.c	(revision 7afb4a53710d7b78f26a51c1825abc447de3ea5b)
+++ uspace/lib/libc/generic/vfs/vfs.c	(revision f4b153529231867ef6c64403a465d1f66e1016ca)
@@ -100,5 +100,5 @@
 	 * though they both point into the same dynamically allocated buffer.
 	 */
-	ncwd_path = strdup(ncwd_path);
+	ncwd_path = str_dup(ncwd_path);
 	free(ncwd_path_nc);
 	if (!ncwd_path) {
Index: uspace/lib/libc/include/string.h
===================================================================
--- uspace/lib/libc/include/string.h	(revision 7afb4a53710d7b78f26a51c1825abc447de3ea5b)
+++ uspace/lib/libc/include/string.h	(revision f4b153529231867ef6c64403a465d1f66e1016ca)
@@ -79,4 +79,6 @@
 extern bool wstr_remove(wchar_t *str, count_t pos);
 
+extern char *str_dup(const char *);
+
 /*
  * TODO: Get rid of this.
@@ -87,9 +89,5 @@
 
 extern char *strcpy(char *, const char *);
-extern char *strncpy(char *, const char *, size_t);
-
 extern char *strcat(char *, const char *);
-
-extern char *strdup(const char *);
 
 extern long int strtol(const char *, char **, int);