Index: uspace/app/bdsh/cmds/modules/sleep/sleep.c
===================================================================
--- uspace/app/bdsh/cmds/modules/sleep/sleep.c	(revision 48b77edd5f5ef05aade2e97fa826d2d21a4a51c9)
+++ uspace/app/bdsh/cmds/modules/sleep/sleep.c	(revision f30052384594e837924dcd017e96ea8752aa676f)
@@ -27,8 +27,8 @@
  */
 
+#include <async.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <thread.h>
 #include "config.h"
 #include "util.h"
@@ -131,5 +131,5 @@
 	}
 
-	(void) thread_usleep(duration);
+	async_usleep(duration);
 
 	return CMD_SUCCESS;
Index: uspace/app/tester/hw/serial/serial1.c
===================================================================
--- uspace/app/tester/hw/serial/serial1.c	(revision 48b77edd5f5ef05aade2e97fa826d2d21a4a51c9)
+++ uspace/app/tester/hw/serial/serial1.c	(revision f30052384594e837924dcd017e96ea8752aa676f)
@@ -45,5 +45,4 @@
 #include <stddef.h>
 #include <str.h>
-#include <thread.h>
 #include "../../tester.h"
 
@@ -162,38 +161,34 @@
 		TPRINTF("Read %zd bytes\n", nread);
 		
-		if (nread == 0)
-			thread_usleep(DEFAULT_SLEEP);
-		else {
-			buf[nread] = 0;
-			
-			/*
-			 * Write data back to the device to test the opposite
-			 * direction of data transfer.
-			 */
-			rc = chardev_write(chardev, buf, nread, &nwritten);
-			if (rc != EOK) {
-				(void) serial_set_comm_props(serial, old_baud,
-				    old_par, old_word_size, old_stop);
-				
-				free(buf);
-				chardev_close(chardev);
-				serial_close(serial);
-				async_hangup(sess);
-				return "Failed writing to serial device";
-			}
-			
-			if (nwritten != nread) {
-				(void) serial_set_comm_props(serial, old_baud,
-				    old_par, old_word_size, old_stop);
-				
-				free(buf);
-				chardev_close(chardev);
-				serial_close(serial);
-				async_hangup(sess);
-				return "Written less data than read from serial device";
-			}
-			
-			TPRINTF("Written %zd bytes\n", nwritten);
-		}
+		buf[nread] = 0;
+		
+		/*
+		 * Write data back to the device to test the opposite
+		 * direction of data transfer.
+		 */
+		rc = chardev_write(chardev, buf, nread, &nwritten);
+		if (rc != EOK) {
+			(void) serial_set_comm_props(serial, old_baud,
+			    old_par, old_word_size, old_stop);
+			
+			free(buf);
+			chardev_close(chardev);
+			serial_close(serial);
+			async_hangup(sess);
+			return "Failed writing to serial device";
+		}
+		
+		if (nwritten != nread) {
+			(void) serial_set_comm_props(serial, old_baud,
+			    old_par, old_word_size, old_stop);
+			
+			free(buf);
+			chardev_close(chardev);
+			serial_close(serial);
+			async_hangup(sess);
+			return "Written less data than read from serial device";
+		}
+		
+		TPRINTF("Written %zd bytes\n", nwritten);
 		
 		total += nread;
Index: uspace/drv/nic/e1k/e1k.c
===================================================================
--- uspace/drv/nic/e1k/e1k.c	(revision 48b77edd5f5ef05aade2e97fa826d2d21a4a51c9)
+++ uspace/drv/nic/e1k/e1k.c	(revision f30052384594e837924dcd017e96ea8752aa676f)
@@ -33,4 +33,5 @@
  */
 
+#include <async.h>
 #include <assert.h>
 #include <stdio.h>
@@ -38,5 +39,4 @@
 #include <adt/list.h>
 #include <align.h>
-#include <thread.h>
 #include <byteorder.h>
 #include <as.h>
@@ -372,5 +372,5 @@
 		fibril_mutex_unlock(&e1000->ctrl_lock);
 		
-		thread_usleep(10);
+		async_usleep(10);
 		
 		fibril_mutex_lock(&e1000->ctrl_lock);
@@ -1724,5 +1724,5 @@
 	
 	/* Wait for the reset */
-	thread_usleep(20);
+	async_usleep(20);
 	
 	/* check if RST_BIT cleared */
@@ -1812,5 +1812,5 @@
 	 * transfers to descriptors.
 	 */
-	thread_usleep(100);
+	async_usleep(100);
 	
 	return EOK;
@@ -2238,5 +2238,5 @@
 	uint32_t eerd = E1000_REG_READ(e1000, E1000_EERD);
 	while ((eerd & e1000->info.eerd_done) == 0) {
-		thread_usleep(1);
+		async_usleep(1);
 		eerd = E1000_REG_READ(e1000, E1000_EERD);
 	}
Index: uspace/drv/nic/ne2k/dp8390.c
===================================================================
--- uspace/drv/nic/ne2k/dp8390.c	(revision 48b77edd5f5ef05aade2e97fa826d2d21a4a51c9)
+++ uspace/drv/nic/ne2k/dp8390.c	(revision f30052384594e837924dcd017e96ea8752aa676f)
@@ -55,9 +55,9 @@
 
 #include <assert.h>
+#include <async.h>
 #include <byteorder.h>
 #include <errno.h>
 #include <stdio.h>
 #include <ddi.h>
-#include <thread.h>
 #include "dp8390.h"
 
@@ -172,7 +172,7 @@
 	/* Reset the ethernet card */
 	uint8_t val = pio_read_8(ne2k->port + NE2K_RESET);
-	thread_usleep(2000);
+	async_usleep(2000);
 	pio_write_8(ne2k->port + NE2K_RESET, val);
-	thread_usleep(2000);
+	async_usleep(2000);
 	
 	/* Reset the DP8390 */
Index: uspace/drv/nic/rtl8139/driver.c
===================================================================
--- uspace/drv/nic/rtl8139/driver.c	(revision 48b77edd5f5ef05aade2e97fa826d2d21a4a51c9)
+++ uspace/drv/nic/rtl8139/driver.c	(revision f30052384594e837924dcd017e96ea8752aa676f)
@@ -28,7 +28,7 @@
 
 #include <assert.h>
+#include <async.h>
 #include <errno.h>
 #include <align.h>
-#include <thread.h>
 #include <byteorder.h>
 #include <libarch/barrier.h>
@@ -435,5 +435,5 @@
 	memory_barrier();
 	while(pio_read_8(io_base + CR) & CR_RST) {
-		thread_usleep(1);
+		async_usleep(1);
 		read_barrier();
 	}
Index: uspace/drv/nic/rtl8169/driver.c
===================================================================
--- uspace/drv/nic/rtl8169/driver.c	(revision 48b77edd5f5ef05aade2e97fa826d2d21a4a51c9)
+++ uspace/drv/nic/rtl8169/driver.c	(revision f30052384594e837924dcd017e96ea8752aa676f)
@@ -28,4 +28,5 @@
 
 #include <assert.h>
+#include <async.h>
 #include <errno.h>
 #include <align.h>
@@ -34,5 +35,4 @@
 
 #include <as.h>
-#include <thread.h>
 #include <ddf/log.h>
 #include <ddf/interrupt.h>
@@ -763,5 +763,5 @@
 	memory_barrier();
 	while (pio_read_8(rtl8169->regs + CR) & CR_RST) {
-		thread_usleep(1);
+		async_usleep(1);
 		read_barrier();
 	}
@@ -1176,5 +1176,5 @@
 	do {
 		phyar = pio_read_32(rtl8169->regs + PHYAR);
-		thread_usleep(20);
+		async_usleep(20);
 	} while ((phyar & PHYAR_RW_WRITE) == 0);
 
@@ -1194,8 +1194,8 @@
 	do {
 		phyar = pio_read_32(rtl8169->regs + PHYAR);
-		thread_usleep(20);
+		async_usleep(20);
 	} while ((phyar & PHYAR_RW_WRITE) != 0);
 
-	thread_usleep(20);
+	async_usleep(20);
 }
 
Index: uspace/srv/hid/isdv4_tablet/isdv4.c
===================================================================
--- uspace/srv/hid/isdv4_tablet/isdv4.c	(revision 48b77edd5f5ef05aade2e97fa826d2d21a4a51c9)
+++ uspace/srv/hid/isdv4_tablet/isdv4.c	(revision f30052384594e837924dcd017e96ea8752aa676f)
@@ -27,4 +27,5 @@
  */
 
+#include <async.h>
 #include <errno.h>
 #include <io/chardev.h>
@@ -33,5 +34,4 @@
 #include <stdint.h>
 #include <stdlib.h>
-#include <thread.h>
 
 #include "isdv4.h"
@@ -401,5 +401,5 @@
 		return EIO;
 
-	thread_usleep(250000); /* 250 ms */
+	async_usleep(250000); /* 250 ms */
 
 	// FIXME: Read all possible garbage before sending commands