Index: uspace/app/bdsh/cmds/builtin_cmds.c
===================================================================
--- uspace/app/bdsh/cmds/builtin_cmds.c	(revision b14d9f9e108f8cacda71d80e4c69fc82509d9824)
+++ uspace/app/bdsh/cmds/builtin_cmds.c	(revision 81dd2edaddd4f5ceb84c52eabccc844c4c1a5661)
@@ -32,4 +32,5 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stddef.h>
 #include <str.h>
 #include "errors.h"
Index: uspace/app/bdsh/cmds/builtins/batch/batch.c
===================================================================
--- uspace/app/bdsh/cmds/builtins/batch/batch.c	(revision b14d9f9e108f8cacda71d80e4c69fc82509d9824)
+++ uspace/app/bdsh/cmds/builtins/batch/batch.c	(revision 81dd2edaddd4f5ceb84c52eabccc844c4c1a5661)
@@ -30,4 +30,5 @@
 #include <stdlib.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include <errno.h>
 #include "config.h"
Index: uspace/app/bdsh/cmds/mod_cmds.c
===================================================================
--- uspace/app/bdsh/cmds/mod_cmds.c	(revision b14d9f9e108f8cacda71d80e4c69fc82509d9824)
+++ uspace/app/bdsh/cmds/mod_cmds.c	(revision 81dd2edaddd4f5ceb84c52eabccc844c4c1a5661)
@@ -45,4 +45,5 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stddef.h>
 #include <str.h>
 #include "errors.h"
Index: uspace/app/bdsh/cmds/modules/cat/cat.c
===================================================================
--- uspace/app/bdsh/cmds/modules/cat/cat.c	(revision b14d9f9e108f8cacda71d80e4c69fc82509d9824)
+++ uspace/app/bdsh/cmds/modules/cat/cat.c	(revision 81dd2edaddd4f5ceb84c52eabccc844c4c1a5661)
@@ -30,5 +30,4 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <getopt.h>
 #include <str.h>
Index: uspace/app/bdsh/cmds/modules/cmp/cmp.c
===================================================================
--- uspace/app/bdsh/cmds/modules/cmp/cmp.c	(revision b14d9f9e108f8cacda71d80e4c69fc82509d9824)
+++ uspace/app/bdsh/cmds/modules/cmp/cmp.c	(revision 81dd2edaddd4f5ceb84c52eabccc844c4c1a5661)
@@ -32,5 +32,4 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <vfs/vfs.h>
 
Index: uspace/app/bdsh/cmds/modules/cp/cp.c
===================================================================
--- uspace/app/bdsh/cmds/modules/cp/cp.c	(revision b14d9f9e108f8cacda71d80e4c69fc82509d9824)
+++ uspace/app/bdsh/cmds/modules/cp/cp.c	(revision 81dd2edaddd4f5ceb84c52eabccc844c4c1a5661)
@@ -30,5 +30,4 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <io/console.h>
 #include <io/keycode.h>
Index: uspace/app/bdsh/cmds/modules/echo/echo.c
===================================================================
--- uspace/app/bdsh/cmds/modules/echo/echo.c	(revision b14d9f9e108f8cacda71d80e4c69fc82509d9824)
+++ uspace/app/bdsh/cmds/modules/echo/echo.c	(revision 81dd2edaddd4f5ceb84c52eabccc844c4c1a5661)
@@ -29,4 +29,5 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stddef.h>
 #include "config.h"
 #include "util.h"
Index: uspace/app/bdsh/cmds/modules/help/help.c
===================================================================
--- uspace/app/bdsh/cmds/modules/help/help.c	(revision b14d9f9e108f8cacda71d80e4c69fc82509d9824)
+++ uspace/app/bdsh/cmds/modules/help/help.c	(revision 81dd2edaddd4f5ceb84c52eabccc844c4c1a5661)
@@ -30,4 +30,5 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stddef.h>
 #include <str.h>
 #include <fmtutil.h>
Index: uspace/app/bdsh/cmds/modules/printf/printf.c
===================================================================
--- uspace/app/bdsh/cmds/modules/printf/printf.c	(revision b14d9f9e108f8cacda71d80e4c69fc82509d9824)
+++ uspace/app/bdsh/cmds/modules/printf/printf.c	(revision 81dd2edaddd4f5ceb84c52eabccc844c4c1a5661)
@@ -29,4 +29,5 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stddef.h>
 #include "config.h"
 #include "util.h"
Index: uspace/app/bdsh/cmds/modules/sleep/sleep.c
===================================================================
--- uspace/app/bdsh/cmds/modules/sleep/sleep.c	(revision b14d9f9e108f8cacda71d80e4c69fc82509d9824)
+++ uspace/app/bdsh/cmds/modules/sleep/sleep.c	(revision 81dd2edaddd4f5ceb84c52eabccc844c4c1a5661)
@@ -30,5 +30,5 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
+#include <thread.h>
 #include "config.h"
 #include "util.h"
@@ -131,5 +131,5 @@
 	}
 
-	(void) usleep(duration);
+	(void) thread_usleep(duration);
 
 	return CMD_SUCCESS;
Index: uspace/app/bdsh/cmds/modules/touch/touch.c
===================================================================
--- uspace/app/bdsh/cmds/modules/touch/touch.c	(revision b14d9f9e108f8cacda71d80e4c69fc82509d9824)
+++ uspace/app/bdsh/cmds/modules/touch/touch.c	(revision 81dd2edaddd4f5ceb84c52eabccc844c4c1a5661)
@@ -34,5 +34,4 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <dirent.h>
 #include <sys/types.h>