Index: uspace/app/bdsh/cmds/builtin_cmds.c
===================================================================
--- uspace/app/bdsh/cmds/builtin_cmds.c	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ uspace/app/bdsh/cmds/builtin_cmds.c	(revision 8023571f81bf7a87989e87a43bc8f901ed55329a)
@@ -34,5 +34,5 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 #include "errors.h"
 #include "cmds.h"
Index: uspace/app/bdsh/cmds/builtins/cd/cd.c
===================================================================
--- uspace/app/bdsh/cmds/builtins/cd/cd.c	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ uspace/app/bdsh/cmds/builtins/cd/cd.c	(revision 8023571f81bf7a87989e87a43bc8f901ed55329a)
@@ -32,5 +32,5 @@
 #include <stdlib.h>
 #include <unistd.h>
-#include <string.h>
+#include <str.h>
 #include <errno.h>
 
Index: uspace/app/bdsh/cmds/mod_cmds.c
===================================================================
--- uspace/app/bdsh/cmds/mod_cmds.c	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ uspace/app/bdsh/cmds/mod_cmds.c	(revision 8023571f81bf7a87989e87a43bc8f901ed55329a)
@@ -47,5 +47,5 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 #include "errors.h"
 #include "cmds.h"
Index: uspace/app/bdsh/cmds/modules/bdd/bdd.c
===================================================================
--- uspace/app/bdsh/cmds/modules/bdd/bdd.c	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ uspace/app/bdsh/cmds/modules/bdd/bdd.c	(revision 8023571f81bf7a87989e87a43bc8f901ed55329a)
@@ -29,5 +29,5 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 #include "config.h"
 #include "util.h"
Index: uspace/app/bdsh/cmds/modules/cat/cat.c
===================================================================
--- uspace/app/bdsh/cmds/modules/cat/cat.c	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ uspace/app/bdsh/cmds/modules/cat/cat.c	(revision 8023571f81bf7a87989e87a43bc8f901ed55329a)
@@ -33,5 +33,5 @@
 #include <unistd.h>
 #include <getopt.h>
-#include <string.h>
+#include <str.h>
 #include <fcntl.h>
 
Index: uspace/app/bdsh/cmds/modules/cp/cp.c
===================================================================
--- uspace/app/bdsh/cmds/modules/cp/cp.c	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ uspace/app/bdsh/cmds/modules/cp/cp.c	(revision 8023571f81bf7a87989e87a43bc8f901ed55329a)
@@ -33,5 +33,5 @@
 #include <unistd.h>
 #include <getopt.h>
-#include <string.h>
+#include <str.h>
 #include <fcntl.h>
 #include "config.h"
Index: uspace/app/bdsh/cmds/modules/help/help.c
===================================================================
--- uspace/app/bdsh/cmds/modules/help/help.c	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ uspace/app/bdsh/cmds/modules/help/help.c	(revision 8023571f81bf7a87989e87a43bc8f901ed55329a)
@@ -31,5 +31,5 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 
 #include "config.h"
Index: uspace/app/bdsh/cmds/modules/ls/ls.c
===================================================================
--- uspace/app/bdsh/cmds/modules/ls/ls.c	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ uspace/app/bdsh/cmds/modules/ls/ls.c	(revision 8023571f81bf7a87989e87a43bc8f901ed55329a)
@@ -40,5 +40,5 @@
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <string.h>
+#include <str.h>
 
 #include "errors.h"
Index: uspace/app/bdsh/cmds/modules/mkdir/mkdir.c
===================================================================
--- uspace/app/bdsh/cmds/modules/mkdir/mkdir.c	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ uspace/app/bdsh/cmds/modules/mkdir/mkdir.c	(revision 8023571f81bf7a87989e87a43bc8f901ed55329a)
@@ -38,5 +38,5 @@
 #include <getopt.h>
 #include <stdarg.h>
-#include <string.h>
+#include <str.h>
 
 #include "config.h"
Index: uspace/app/bdsh/cmds/modules/mkfile/mkfile.c
===================================================================
--- uspace/app/bdsh/cmds/modules/mkfile/mkfile.c	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ uspace/app/bdsh/cmds/modules/mkfile/mkfile.c	(revision 8023571f81bf7a87989e87a43bc8f901ed55329a)
@@ -38,5 +38,5 @@
 #include <getopt.h>
 #include <stdarg.h>
-#include <string.h>
+#include <str.h>
 #include <ctype.h>
 
Index: uspace/app/bdsh/cmds/modules/rm/rm.c
===================================================================
--- uspace/app/bdsh/cmds/modules/rm/rm.c	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ uspace/app/bdsh/cmds/modules/rm/rm.c	(revision 8023571f81bf7a87989e87a43bc8f901ed55329a)
@@ -36,5 +36,5 @@
 #include <getopt.h>
 #include <mem.h>
-#include <string.h>
+#include <str.h>
 
 #include "config.h"
Index: uspace/app/bdsh/cmds/modules/touch/touch.c
===================================================================
--- uspace/app/bdsh/cmds/modules/touch/touch.c	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ uspace/app/bdsh/cmds/modules/touch/touch.c	(revision 8023571f81bf7a87989e87a43bc8f901ed55329a)
@@ -38,5 +38,5 @@
 #include <dirent.h>
 #include <sys/types.h>
-#include <string.h>
+#include <str.h>
 
 #include "config.h"