Index: uspace/drv/audio/sb16/mixer.c
===================================================================
--- uspace/drv/audio/sb16/mixer.c	(revision e141281aa239c549426ee31f8ac6de80704241b1)
+++ uspace/drv/audio/sb16/mixer.c	(revision fcb0d76a86a9f53c0496fdfc2f29958d5aa3fc3f)
@@ -32,5 +32,4 @@
 #include <libarch/ddi.h>
 #include <macros.h>
-#include <unistd.h>
 
 #include "ddf_log.h"
Index: uspace/drv/nic/ar9271/ar9271.c
===================================================================
--- uspace/drv/nic/ar9271/ar9271.c	(revision e141281aa239c549426ee31f8ac6de80704241b1)
+++ uspace/drv/nic/ar9271/ar9271.c	(revision fcb0d76a86a9f53c0496fdfc2f29958d5aa3fc3f)
@@ -43,4 +43,5 @@
 #include <nic.h>
 #include <macros.h>
+#include <thread.h>
 #include "ath_usb.h"
 #include "wmi.h"
@@ -817,5 +818,5 @@
 	
 	/* Wait until firmware is ready - wait for 1 second to be sure. */
-	sleep(1);
+	thread_sleep(1);
 	
 	return rc;
Index: uspace/drv/nic/ar9271/hw.c
===================================================================
--- uspace/drv/nic/ar9271/hw.c	(revision e141281aa239c549426ee31f8ac6de80704241b1)
+++ uspace/drv/nic/ar9271/hw.c	(revision fcb0d76a86a9f53c0496fdfc2f29958d5aa3fc3f)
@@ -35,5 +35,4 @@
 #include <macros.h>
 #include <usb/debug.h>
-#include <unistd.h>
 #include <errno.h>
 #include <nic.h>
Index: uspace/drv/nic/e1k/e1k.c
===================================================================
--- uspace/drv/nic/e1k/e1k.c	(revision e141281aa239c549426ee31f8ac6de80704241b1)
+++ uspace/drv/nic/e1k/e1k.c	(revision fcb0d76a86a9f53c0496fdfc2f29958d5aa3fc3f)
@@ -38,4 +38,5 @@
 #include <adt/list.h>
 #include <align.h>
+#include <thread.h>
 #include <byteorder.h>
 #include <irc.h>
@@ -365,5 +366,5 @@
 		ctrl &= ~(CTRL_SLU);
 		fibril_mutex_unlock(&e1000->ctrl_lock);
-		usleep(10);
+		thread_usleep(10);
 		fibril_mutex_lock(&e1000->ctrl_lock);
 		ctrl |= CTRL_SLU;
@@ -1717,5 +1718,5 @@
 	
 	/* Wait for the reset */
-	usleep(20);
+	thread_usleep(20);
 	
 	/* check if RST_BIT cleared */
@@ -1805,5 +1806,5 @@
 	 * transfers to descriptors.
 	 */
-	usleep(100);
+	thread_usleep(100);
 	
 	return EOK;
@@ -2223,5 +2224,5 @@
 	uint32_t eerd = E1000_REG_READ(e1000, E1000_EERD);
 	while ((eerd & e1000->info.eerd_done) == 0) {
-		usleep(1);
+		thread_usleep(1);
 		eerd = E1000_REG_READ(e1000, E1000_EERD);
 	}
Index: uspace/drv/nic/ne2k/dp8390.c
===================================================================
--- uspace/drv/nic/ne2k/dp8390.c	(revision e141281aa239c549426ee31f8ac6de80704241b1)
+++ uspace/drv/nic/ne2k/dp8390.c	(revision fcb0d76a86a9f53c0496fdfc2f29958d5aa3fc3f)
@@ -59,4 +59,5 @@
 #include <stdio.h>
 #include <ddi.h>
+#include <thread.h>
 #include "dp8390.h"
 
@@ -171,7 +172,7 @@
 	/* Reset the ethernet card */
 	uint8_t val = pio_read_8(ne2k->port + NE2K_RESET);
-	usleep(2000);
+	thread_usleep(2000);
 	pio_write_8(ne2k->port + NE2K_RESET, val);
-	usleep(2000);
+	thread_usleep(2000);
 	
 	/* Reset the DP8390 */
Index: uspace/drv/nic/rtl8139/driver.c
===================================================================
--- uspace/drv/nic/rtl8139/driver.c	(revision e141281aa239c549426ee31f8ac6de80704241b1)
+++ uspace/drv/nic/rtl8139/driver.c	(revision fcb0d76a86a9f53c0496fdfc2f29958d5aa3fc3f)
@@ -30,4 +30,5 @@
 #include <errno.h>
 #include <align.h>
+#include <thread.h>
 #include <byteorder.h>
 #include <libarch/barrier.h>
@@ -471,5 +472,5 @@
 	memory_barrier();
 	while(pio_read_8(io_base + CR) & CR_RST) {
-		usleep(1);
+		thread_usleep(1);
 		read_barrier();
 	}
Index: uspace/drv/nic/rtl8139/general.c
===================================================================
--- uspace/drv/nic/rtl8139/general.c	(revision e141281aa239c549426ee31f8ac6de80704241b1)
+++ uspace/drv/nic/rtl8139/general.c	(revision fcb0d76a86a9f53c0496fdfc2f29958d5aa3fc3f)
@@ -35,5 +35,4 @@
 
 #include <mem.h>
-#include <unistd.h>
 #include <errno.h>
 #include <stdint.h>
Index: uspace/drv/nic/rtl8139/general.h
===================================================================
--- uspace/drv/nic/rtl8139/general.h	(revision e141281aa239c549426ee31f8ac6de80704241b1)
+++ uspace/drv/nic/rtl8139/general.h	(revision fcb0d76a86a9f53c0496fdfc2f29958d5aa3fc3f)
@@ -35,5 +35,6 @@
 #define RTL8139_GENERAL_H_
 
-#include <unistd.h>
+#include <stddef.h>
+#include <time.h>
 
 /** Number of microseconds in second */
Index: uspace/drv/nic/rtl8169/driver.c
===================================================================
--- uspace/drv/nic/rtl8169/driver.c	(revision e141281aa239c549426ee31f8ac6de80704241b1)
+++ uspace/drv/nic/rtl8169/driver.c	(revision fcb0d76a86a9f53c0496fdfc2f29958d5aa3fc3f)
@@ -35,4 +35,5 @@
 
 #include <as.h>
+#include <thread.h>
 #include <ddf/log.h>
 #include <ddf/interrupt.h>
@@ -760,5 +761,5 @@
 	memory_barrier();
 	while (pio_read_8(rtl8169->regs + CR) & CR_RST) {
-		usleep(1);
+		thread_usleep(1);
 		read_barrier();
 	}
@@ -1174,5 +1175,5 @@
 	do {
 		phyar = pio_read_32(rtl8169->regs + PHYAR);
-		usleep(20);
+		thread_usleep(20);
 	} while ((phyar & PHYAR_RW_WRITE) == 0);
 
@@ -1192,8 +1193,8 @@
 	do {
 		phyar = pio_read_32(rtl8169->regs + PHYAR);
-		usleep(20);
+		thread_usleep(20);
 	} while ((phyar & PHYAR_RW_WRITE) != 0);
 
-	usleep(20);
+	thread_usleep(20);
 }