Index: uspace/lib/c/generic/str.c
===================================================================
--- uspace/lib/c/generic/str.c	(revision a5454cf04b49a17e1f4df38ba73a1a79aec7b22f)
+++ uspace/lib/c/generic/str.c	(revision 980311e2f77982344ba9fdf128d259dd42acc99c)
@@ -873,21 +873,4 @@
 	
 	return (char *) res;
-}
-
-/** Find first occurence of character in wide string.
- *
- * @param wstr String to search.
- * @param ch  Character to look for.
- *
- * @return Pointer to character in @a wstr or NULL if not found.
- */
-wchar_t *wstr_chr(const wchar_t *wstr, wchar_t ch)
-{
-	while (*wstr && *wstr != ch)
-		wstr++;
-	if (*wstr)
-		return (wchar_t *) wstr;
-	else
-		return NULL;
 }
 
Index: uspace/lib/c/include/str.h
===================================================================
--- uspace/lib/c/include/str.h	(revision a5454cf04b49a17e1f4df38ba73a1a79aec7b22f)
+++ uspace/lib/c/include/str.h	(revision 980311e2f77982344ba9fdf128d259dd42acc99c)
@@ -90,5 +90,4 @@
 extern char *str_chr(const char *str, wchar_t ch);
 extern char *str_rchr(const char *str, wchar_t ch);
-extern wchar_t *wstr_chr(const wchar_t *wstr, wchar_t ch);
 
 extern bool wstr_linsert(wchar_t *str, wchar_t ch, size_t pos, size_t max_pos);
Index: uspace/srv/fs/fat/fat_dentry.c
===================================================================
--- uspace/srv/fs/fat/fat_dentry.c	(revision a5454cf04b49a17e1f4df38ba73a1a79aec7b22f)
+++ uspace/srv/fs/fat/fat_dentry.c	(revision 980311e2f77982344ba9fdf128d259dd42acc99c)
@@ -356,5 +356,5 @@
 	
 	while ((ch = str_decode(name, &offset, STR_NO_LIMIT)) != 0) {
-		if (wstr_chr(FAT_STOP_CHARS, ch) != NULL) {
+		if (str_chr(FAT_STOP_CHARS, ch) != NULL) {
 			result = false;
 			break;
Index: uspace/srv/fs/fat/fat_dentry.h
===================================================================
--- uspace/srv/fs/fat/fat_dentry.h	(revision a5454cf04b49a17e1f4df38ba73a1a79aec7b22f)
+++ uspace/srv/fs/fat/fat_dentry.h	(revision 980311e2f77982344ba9fdf128d259dd42acc99c)
@@ -39,5 +39,5 @@
 
 #define IS_D_CHAR(ch) (isalnum(ch) || ch == '_')
-#define FAT_STOP_CHARS L"*?/\\\n\t|'"
+#define FAT_STOP_CHARS "*?/\\\n\t|'"
 
 #define FAT_NAME_LEN		8