Index: uspace/lib/libc/generic/console.c
===================================================================
--- uspace/lib/libc/generic/console.c	(revision a2c58f6642dae539243221fb1f2a71c8611327e6)
+++ uspace/lib/libc/generic/console.c	(revision 92fd52d7f8133beb8043e6bcd17498477fe735ea)
@@ -220,5 +220,5 @@
 	ssize_t rc;
 
-	len = strlen(s);
+	len = str_size(s);
 	while (len > 0) {
 		rc = console_write(s, len);
Index: uspace/lib/libc/generic/getopt.c
===================================================================
--- uspace/lib/libc/generic/getopt.c	(revision a2c58f6642dae539243221fb1f2a71c8611327e6)
+++ uspace/lib/libc/generic/getopt.c	(revision 92fd52d7f8133beb8043e6bcd17498477fe735ea)
@@ -383,5 +383,5 @@
 			has_equal++;
 		} else
-			current_argv_len = strlen(current_argv);
+			current_argv_len = str_size(current_argv);
 	    
 		for (i = 0; long_options[i].name; i++) {
@@ -391,5 +391,5 @@
 				continue;
 
-			if (strlen(long_options[i].name) ==
+			if (str_size(long_options[i].name) ==
 			    (unsigned)current_argv_len) {
 				/* exact match */
Index: uspace/lib/libc/generic/string.c
===================================================================
--- uspace/lib/libc/generic/string.c	(revision a2c58f6642dae539243221fb1f2a71c8611327e6)
+++ uspace/lib/libc/generic/string.c	(revision 92fd52d7f8133beb8043e6bcd17498477fe735ea)
@@ -607,29 +607,4 @@
 }
 
-/** Count the number of characters in the string, not including terminating 0.
- *
- * @param str		String.
- * @return		Number of characters in string.
- */
-size_t strlen(const char *str) 
-{
-	size_t counter = 0;
-
-	while (str[counter] != 0)
-		counter++;
-
-	return counter;
-}
-
-int strcmp(const char *a, const char *b)
-{
-	int c = 0;
-	
-	while (a[c] && b[c] && (!(a[c] - b[c])))
-		c++;
-	
-	return (a[c] - b[c]);
-}
-
 int strncmp(const char *a, const char *b, size_t n)
 {
@@ -871,5 +846,5 @@
 char * strdup(const char *s1)
 {
-	size_t len = strlen(s1) + 1;
+	size_t len = str_size(s1) + 1;
 	void *ret = malloc(len);
 
Index: uspace/lib/libc/include/stdio.h
===================================================================
--- uspace/lib/libc/include/stdio.h	(revision a2c58f6642dae539243221fb1f2a71c8611327e6)
+++ uspace/lib/libc/include/stdio.h	(revision 92fd52d7f8133beb8043e6bcd17498477fe735ea)
@@ -50,5 +50,5 @@
 	n = snprintf(buf, sizeof(buf), fmt, ##__VA_ARGS__); \
 	if (n > 0) \
-		(void) __SYSCALL3(SYS_KLOG, 1, (sysarg_t) buf, strlen(buf)); \
+		(void) __SYSCALL3(SYS_KLOG, 1, (sysarg_t) buf, str_size(buf)); \
 }
 
Index: uspace/lib/libc/include/string.h
===================================================================
--- uspace/lib/libc/include/string.h	(revision a2c58f6642dae539243221fb1f2a71c8611327e6)
+++ uspace/lib/libc/include/string.h	(revision 92fd52d7f8133beb8043e6bcd17498477fe735ea)
@@ -46,6 +46,6 @@
 #define STR_NO_LIMIT  ((size_t) -1)
 
-/**< Maximum size of a string containing cnt characters */
-#define STR_BOUNDS(cnt)  (cnt << 2)
+/**< Maximum size of a string containing @c length characters */
+#define STR_BOUNDS(length)  ((length) << 2)
 
 extern wchar_t str_decode(const char *str, size_t *offset, size_t sz);
@@ -82,5 +82,4 @@
  */
 
-extern int strcmp(const char *, const char *);
 extern int strncmp(const char *, const char *, size_t);
 extern int stricmp(const char *, const char *);
@@ -90,6 +89,4 @@
 
 extern char *strcat(char *, const char *);
-
-extern size_t strlen(const char *);
 
 extern char *strdup(const char *);