Index: uspace/srv/hid/input/input.c
===================================================================
--- uspace/srv/hid/input/input.c	(revision b19e892c22afbf67aa5988554dd3f003efeadc04)
+++ uspace/srv/hid/input/input.c	(revision d2c8533502ff5b2f8ab86192d66ca356e4b9a813)
@@ -44,5 +44,4 @@
 #include <config.h>
 #include <stdio.h>
-#include <unistd.h>
 #include <stdlib.h>
 #include <ns.h>
Index: uspace/srv/hid/input/port/niagara.c
===================================================================
--- uspace/srv/hid/input/port/niagara.c	(revision b19e892c22afbf67aa5988554dd3f003efeadc04)
+++ uspace/srv/hid/input/port/niagara.c	(revision d2c8533502ff5b2f8ab86192d66ca356e4b9a813)
@@ -135,5 +135,5 @@
 	while (1) {
 		niagara_key_pressed();
-		usleep(POLL_INTERVAL);
+		thread_usleep(POLL_INTERVAL);
 	}
 }
Index: uspace/srv/hid/input/port/ski.c
===================================================================
--- uspace/srv/hid/input/port/ski.c	(revision b19e892c22afbf67aa5988554dd3f003efeadc04)
+++ uspace/srv/hid/input/port/ski.c	(revision d2c8533502ff5b2f8ab86192d66ca356e4b9a813)
@@ -37,5 +37,4 @@
 
 #include <stdlib.h>
-#include <unistd.h>
 #include <sys/types.h>
 #include <thread.h>
@@ -97,5 +96,5 @@
 		}
 
-		usleep(POLL_INTERVAL);
+		thread_usleep(POLL_INTERVAL);
 	}
 }
Index: uspace/srv/hid/isdv4_tablet/isdv4.c
===================================================================
--- uspace/srv/hid/isdv4_tablet/isdv4.c	(revision b19e892c22afbf67aa5988554dd3f003efeadc04)
+++ uspace/srv/hid/isdv4_tablet/isdv4.c	(revision d2c8533502ff5b2f8ab86192d66ca356e4b9a813)
@@ -31,4 +31,5 @@
 #include <stdlib.h>
 #include <mem.h>
+#include <thread.h>
 
 #include "isdv4.h"
@@ -377,5 +378,5 @@
 		return EIO;
 
-	usleep(250000); /* 250 ms */
+	thread_usleep(250000); /* 250 ms */
 
 	// FIXME: Read all possible garbage before sending commands
Index: uspace/srv/hid/output/proto/vt100.c
===================================================================
--- uspace/srv/hid/output/proto/vt100.c	(revision b19e892c22afbf67aa5988554dd3f003efeadc04)
+++ uspace/srv/hid/output/proto/vt100.c	(revision d2c8533502ff5b2f8ab86192d66ca356e4b9a813)
@@ -34,5 +34,5 @@
 #include <errno.h>
 #include <stdio.h>
-#include <unistd.h>
+#include <stddef.h>
 #include <malloc.h>
 #include <io/color.h>
Index: uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c
===================================================================
--- uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c	(revision b19e892c22afbf67aa5988554dd3f003efeadc04)
+++ uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c	(revision d2c8533502ff5b2f8ab86192d66ca356e4b9a813)
@@ -43,5 +43,4 @@
 #include <ipc/mouseev.h>
 #include <async.h>
-#include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>