Index: uspace/lib/libc/include/string.h
===================================================================
--- uspace/lib/libc/include/string.h	(revision ee369f328b8ba41006819001f0b3525418a97249)
+++ uspace/lib/libc/include/string.h	(revision e77994dd536e7f1760df4ee55468b443167ed601)
@@ -40,6 +40,6 @@
 #include <bool.h>
 
-#define U_SPECIAL      '?'
-#define U_BOM          0xfeff
+#define U_SPECIAL  '?'
+#define U_BOM      0xfeff
 
 /** No size limit constant */
@@ -55,12 +55,12 @@
 extern size_t wstr_size(const wchar_t *str);
 
-extern size_t str_lsize(const char *str, count_t max_len);
-extern size_t wstr_lsize(const wchar_t *str, count_t max_len);
+extern size_t str_lsize(const char *str, size_t max_len);
+extern size_t wstr_lsize(const wchar_t *str, size_t max_len);
 
-extern count_t str_length(const char *str);
-extern count_t wstr_length(const wchar_t *wstr);
+extern size_t str_length(const char *str);
+extern size_t wstr_length(const wchar_t *wstr);
 
-extern count_t str_nlength(const char *str, size_t size);
-extern count_t wstr_nlength(const wchar_t *str, size_t size);
+extern size_t str_nlength(const char *str, size_t size);
+extern size_t wstr_nlength(const wchar_t *str, size_t size);
 
 extern bool ascii_check(wchar_t ch);
@@ -68,5 +68,5 @@
 
 extern int str_cmp(const char *s1, const char *s2);
-extern int str_lcmp(const char *s1, const char *s2, count_t max_len);
+extern int str_lcmp(const char *s1, const char *s2, size_t max_len);
 
 extern void str_cpy(char *dest, size_t size, const char *src);
@@ -79,6 +79,6 @@
 extern const char *str_rchr(const char *str, wchar_t ch);
 
-extern bool wstr_linsert(wchar_t *str, wchar_t ch, count_t pos, count_t max_pos);
-extern bool wstr_remove(wchar_t *str, count_t pos);
+extern bool wstr_linsert(wchar_t *str, wchar_t ch, size_t pos, size_t max_pos);
+extern bool wstr_remove(wchar_t *str, size_t pos);
 
 extern char *str_dup(const char *);