Index: uspace/drv/audio/hdaudio/hdactl.c
===================================================================
--- uspace/drv/audio/hdaudio/hdactl.c	(revision 984a9ba2fa05c490a7066737655ed19130c714e8)
+++ uspace/drv/audio/hdaudio/hdactl.c	(revision 5f97ef445e6e5648a8b8c902eb0f655d579336b4)
@@ -78,5 +78,5 @@
 			break;
 
-		async_usleep(1000);
+		fibril_usleep(1000);
 		--wcnt;
 	}
@@ -94,5 +94,5 @@
 			break;
 
-		async_usleep(1000);
+		fibril_usleep(1000);
 		--wcnt;
 	}
@@ -415,5 +415,5 @@
 			wcnt = corb_wait_max;
 			while (hda_corb_avail(hda) < 1 && wcnt > 0) {
-				async_usleep(100);
+				fibril_usleep(100);
 				--wcnt;
 			}
@@ -558,5 +558,5 @@
 
 		ddf_msg(LVL_NOTE, "Waiting for controller to initialize.");
-		async_usleep(100 * 1000);
+		fibril_usleep(100 * 1000);
 		--cnt;
 	}
@@ -579,5 +579,5 @@
 	    ctl->iss, ctl->oss, ctl->bss);
 	/* Give codecs enough time to enumerate themselves */
-	async_usleep(codec_enum_wait_us);
+	fibril_usleep(codec_enum_wait_us);
 
 	ddf_msg(LVL_NOTE, "STATESTS = 0x%x",
Index: uspace/drv/audio/hdaudio/stream.c
===================================================================
--- uspace/drv/audio/hdaudio/stream.c	(revision 984a9ba2fa05c490a7066737655ed19130c714e8)
+++ uspace/drv/audio/hdaudio/stream.c	(revision 5f97ef445e6e5648a8b8c902eb0f655d579336b4)
@@ -206,5 +206,5 @@
 	hda_reg8_write(&sdregs->ctl1, ctl);
 
-	async_usleep(100 * 1000);
+	fibril_usleep(100 * 1000);
 
 	ctl = hda_reg8_read(&sdregs->ctl1);
@@ -212,5 +212,5 @@
 	hda_reg8_write(&sdregs->ctl1, ctl);
 
-	async_usleep(100 * 1000);
+	fibril_usleep(100 * 1000);
 }
 
Index: uspace/drv/block/ata_bd/ata_bd.c
===================================================================
--- uspace/drv/block/ata_bd/ata_bd.c	(revision 984a9ba2fa05c490a7066737655ed19130c714e8)
+++ uspace/drv/block/ata_bd/ata_bd.c	(revision 5f97ef445e6e5648a8b8c902eb0f655d579336b4)
@@ -1272,5 +1272,5 @@
 	cnt = timeout;
 	while ((status & ~n_reset) != 0 || (status & set) != set) {
-		async_usleep(10000);
+		fibril_usleep(10000);
 		--cnt;
 		if (cnt <= 0)
Index: uspace/drv/bus/usb/ehci/ehci_rh.c
===================================================================
--- uspace/drv/bus/usb/ehci/ehci_rh.c	(revision 984a9ba2fa05c490a7066737655ed19130c714e8)
+++ uspace/drv/bus/usb/ehci/ehci_rh.c	(revision 5f97ef445e6e5648a8b8c902eb0f655d579336b4)
@@ -334,5 +334,5 @@
 {
 	ehci_rh_job_t *job = arg;
-	async_usleep(50000);
+	fibril_usleep(50000);
 	usb_log_debug("RH(%p-%u): Clearing reset", job->hub, job->port);
 	EHCI_CLR(job->hub->registers->portsc[job->port],
@@ -341,5 +341,5 @@
 	while (EHCI_RD(job->hub->registers->portsc[job->port]) &
 	    USB_PORTSC_PORT_RESET_FLAG) {
-		async_usleep(1);
+		fibril_usleep(1);
 	}
 	usb_log_debug("RH(%p-%u): Reset complete", job->hub, job->port);
@@ -365,5 +365,5 @@
 {
 	ehci_rh_job_t *job = arg;
-	async_usleep(20000);
+	fibril_usleep(20000);
 	usb_log_debug("RH(%p-%u): Stopping resume", job->hub, job->port);
 	EHCI_CLR(job->hub->registers->portsc[job->port],
Index: uspace/drv/bus/usb/ehci/hc.c
===================================================================
--- uspace/drv/bus/usb/ehci/hc.c	(revision 984a9ba2fa05c490a7066737655ed19130c714e8)
+++ uspace/drv/bus/usb/ehci/hc.c	(revision 5f97ef445e6e5648a8b8c902eb0f655d579336b4)
@@ -408,5 +408,5 @@
 		/* Wait until hc is halted */
 		while ((EHCI_RD(instance->registers->usbsts) & USB_STS_HC_HALTED_FLAG) == 0) {
-			async_usleep(1);
+			fibril_usleep(1);
 		}
 		usb_log_info("HC(%p): EHCI turned off.", instance);
@@ -419,5 +419,5 @@
 	usb_log_info("HC(%p): Waiting for HW reset.", instance);
 	while (EHCI_RD(instance->registers->usbcmd) & USB_CMD_HC_RESET_FLAG) {
-		async_usleep(1);
+		fibril_usleep(1);
 	}
 	usb_log_debug("HC(%p): HW reset OK.", instance);
Index: uspace/drv/bus/usb/ehci/res.c
===================================================================
--- uspace/drv/bus/usb/ehci/res.c	(revision 984a9ba2fa05c490a7066737655ed19130c714e8)
+++ uspace/drv/bus/usb/ehci/res.c	(revision 5f97ef445e6e5648a8b8c902eb0f655d579336b4)
@@ -99,5 +99,5 @@
 	while ((ret == EOK) && (wait < DEFAULT_WAIT) &&
 	    (usblegsup & USBLEGSUP_BIOS_CONTROL)) {
-		async_usleep(WAIT_STEP);
+		fibril_usleep(WAIT_STEP);
 		ret = pci_config_space_read_32(parent_sess,
 		    eecp + USBLEGSUP_OFFSET, &usblegsup);
Index: uspace/drv/bus/usb/ohci/hc.c
===================================================================
--- uspace/drv/bus/usb/ohci/hc.c	(revision 984a9ba2fa05c490a7066737655ed19130c714e8)
+++ uspace/drv/bus/usb/ohci/hc.c	(revision 5f97ef445e6e5648a8b8c902eb0f655d579336b4)
@@ -425,9 +425,9 @@
 		/* Hope that SMM actually knows its stuff or we can hang here */
 		while (OHCI_RD(instance->registers->control) & C_IR) {
-			async_usleep(1000);
+			fibril_usleep(1000);
 		}
 		usb_log_info("SMM driver: Ownership taken.");
 		C_HCFS_SET(instance->registers->control, C_HCFS_RESET);
-		async_usleep(50000);
+		fibril_usleep(50000);
 		return EOK;
 	}
@@ -443,5 +443,5 @@
 		/* HC is suspended assert resume for 20ms */
 		C_HCFS_SET(instance->registers->control, C_HCFS_RESUME);
-		async_usleep(20000);
+		fibril_usleep(20000);
 		usb_log_info("BIOS driver: HC resumed.");
 		return EOK;
@@ -453,5 +453,5 @@
 	 */
 	usb_log_debug("Host controller found in reset state.");
-	async_usleep(50000);
+	fibril_usleep(50000);
 	return EOK;
 }
@@ -479,5 +479,5 @@
 	OHCI_WR(instance->registers->command_status, CS_HCR);
 	while (OHCI_RD(instance->registers->command_status) & CS_HCR) {
-		async_usleep(10);
+		fibril_usleep(10);
 		time += 10;
 	}
Index: uspace/drv/bus/usb/uhci/hc.c
===================================================================
--- uspace/drv/bus/usb/uhci/hc.c	(revision 984a9ba2fa05c490a7066737655ed19130c714e8)
+++ uspace/drv/bus/usb/uhci/hc.c	(revision 5f97ef445e6e5648a8b8c902eb0f655d579336b4)
@@ -280,5 +280,5 @@
 	/* Reset everything, who knows what touched it before us */
 	pio_write_16(&registers->usbcmd, UHCI_CMD_GLOBAL_RESET);
-	async_usleep(50000); /* 50ms according to USB spec(root hub reset) */
+	fibril_usleep(50000); /* 50ms according to USB spec(root hub reset) */
 	pio_write_16(&registers->usbcmd, 0);
 
@@ -286,5 +286,5 @@
 	pio_write_16(&registers->usbcmd, UHCI_CMD_HCRESET);
 	do {
-		async_usleep(10);
+		fibril_usleep(10);
 	} while ((pio_read_16(&registers->usbcmd) & UHCI_CMD_HCRESET) != 0);
 
@@ -405,5 +405,5 @@
 	 * the buffers.
 	 */
-	async_usleep(20000);
+	fibril_usleep(20000);
 	batch->base.error = EINTR;
 	batch->base.transferred_size = 0;
@@ -660,5 +660,5 @@
 			    (void *) expected_pa, (void *) real_pa);
 		}
-		async_usleep(UHCI_DEBUGER_TIMEOUT);
+		fibril_usleep(UHCI_DEBUGER_TIMEOUT);
 	}
 	return EOK;
Index: uspace/drv/bus/usb/uhci/uhci_rh.c
===================================================================
--- uspace/drv/bus/usb/uhci/uhci_rh.c	(revision 984a9ba2fa05c490a7066737655ed19130c714e8)
+++ uspace/drv/bus/usb/uhci/uhci_rh.c	(revision 5f97ef445e6e5648a8b8c902eb0f655d579336b4)
@@ -110,5 +110,5 @@
 		    batch->dma_buffer.virt, batch->size, &batch->transferred_size);
 		if (batch->error == ENAK)
-			async_usleep(instance->base.endpoint_descriptor.poll_interval * 1000);
+			fibril_usleep(instance->base.endpoint_descriptor.poll_interval * 1000);
 		//TODO This is flimsy, but we can't exit early because
 		//ENAK is technically an error condition
@@ -147,5 +147,5 @@
 	port_status |= STATUS_IN_RESET;
 	pio_write_16(port, port_status);
-	async_usleep(50000);
+	fibril_usleep(50000);
 	port_status = pio_read_16(port);
 	port_status &= ~STATUS_IN_RESET;
Index: uspace/drv/bus/usb/vhc/hub/hub.c
===================================================================
--- uspace/drv/bus/usb/vhc/hub/hub.c	(revision 984a9ba2fa05c490a7066737655ed19130c714e8)
+++ uspace/drv/bus/usb/vhc/hub/hub.c	(revision 5f97ef445e6e5648a8b8c902eb0f655d579336b4)
@@ -465,5 +465,5 @@
 	    (struct delay_port_state_change *) arg;
 
-	async_usleep(change->delay);
+	fibril_usleep(change->delay);
 
 	hub_acquire(change->hub);
Index: uspace/drv/bus/usb/vhc/transfer.c
===================================================================
--- uspace/drv/bus/usb/vhc/transfer.c	(revision 984a9ba2fa05c490a7066737655ed19130c714e8)
+++ uspace/drv/bus/usb/vhc/transfer.c	(revision 5f97ef445e6e5648a8b8c902eb0f655d579336b4)
@@ -242,5 +242,5 @@
 		if (list_empty(&dev->transfer_queue)) {
 			fibril_mutex_unlock(&dev->guard);
-			async_usleep(10 * 1000);
+			fibril_usleep(10 * 1000);
 			fibril_mutex_lock(&dev->guard);
 			continue;
@@ -290,5 +290,5 @@
 		}
 
-		async_usleep(1000 * 100);
+		fibril_usleep(1000 * 100);
 		fibril_mutex_lock(&dev->guard);
 	}
Index: uspace/drv/bus/usb/xhci/hc.c
===================================================================
--- uspace/drv/bus/usb/xhci/hc.c	(revision 984a9ba2fa05c490a7066737655ed19130c714e8)
+++ uspace/drv/bus/usb/xhci/hc.c	(revision 5f97ef445e6e5648a8b8c902eb0f655d579336b4)
@@ -430,5 +430,5 @@
 			return XHCI_REG_RD(hc->legsup, XHCI_LEGSUP_SEM_OS) == 1 ? EOK : EIO;
 		}
-		async_usleep(XHCI_LEGSUP_POLLING_DELAY_1MS);
+		fibril_usleep(XHCI_LEGSUP_POLLING_DELAY_1MS);
 	}
 	usb_log_error("BIOS did not release XHCI legacy hold!");
Index: uspace/drv/bus/usb/xhci/hw_struct/common.h
===================================================================
--- uspace/drv/bus/usb/xhci/hw_struct/common.h	(revision 984a9ba2fa05c490a7066737655ed19130c714e8)
+++ uspace/drv/bus/usb/xhci/hw_struct/common.h	(revision 5f97ef445e6e5648a8b8c902eb0f655d579336b4)
@@ -103,5 +103,5 @@
 
 	for (; retries > 0 && value != expected; --retries) {
-		async_usleep(10000);
+		fibril_usleep(10000);
 		value = *reg & mask;
 	}
Index: uspace/drv/char/ski-con/ski-con.c
===================================================================
--- uspace/drv/char/ski-con/ski-con.c	(revision 984a9ba2fa05c490a7066737655ed19130c714e8)
+++ uspace/drv/char/ski-con/ski-con.c	(revision 5f97ef445e6e5648a8b8c902eb0f655d579336b4)
@@ -150,5 +150,5 @@
 		}
 
-		async_usleep(POLL_INTERVAL);
+		fibril_usleep(POLL_INTERVAL);
 	}
 
Index: uspace/drv/char/sun4v-con/sun4v-con.c
===================================================================
--- uspace/drv/char/sun4v-con/sun4v-con.c	(revision 984a9ba2fa05c490a7066737655ed19130c714e8)
+++ uspace/drv/char/sun4v-con/sun4v-con.c	(revision 5f97ef445e6e5648a8b8c902eb0f655d579336b4)
@@ -151,5 +151,5 @@
 
 	while (con->input_buffer->read_ptr == con->input_buffer->write_ptr)
-		async_usleep(POLL_INTERVAL);
+		fibril_usleep(POLL_INTERVAL);
 
 	p = 0;
Index: uspace/drv/hid/usbhid/kbd/kbddev.c
===================================================================
--- uspace/drv/hid/usbhid/kbd/kbddev.c	(revision 984a9ba2fa05c490a7066737655ed19130c714e8)
+++ uspace/drv/hid/usbhid/kbd/kbddev.c	(revision 5f97ef445e6e5648a8b8c902eb0f655d579336b4)
@@ -774,5 +774,5 @@
 			kbd_dev->initialized = USB_KBD_STATUS_TO_DESTROY;
 			/* Wait for autorepeat */
-			async_usleep(CHECK_DELAY);
+			fibril_usleep(CHECK_DELAY);
 		}
 		usb_kbd_destroy(kbd_dev);
Index: uspace/drv/hid/usbhid/kbd/kbdrepeat.c
===================================================================
--- uspace/drv/hid/usbhid/kbd/kbdrepeat.c	(revision 984a9ba2fa05c490a7066737655ed19130c714e8)
+++ uspace/drv/hid/usbhid/kbd/kbdrepeat.c	(revision 5f97ef445e6e5648a8b8c902eb0f655d579336b4)
@@ -102,5 +102,5 @@
 		}
 		fibril_mutex_unlock(&kbd->repeat_mtx);
-		async_usleep(delay);
+		fibril_usleep(delay);
 	}
 }
Index: uspace/drv/nic/ar9271/ar9271.c
===================================================================
--- uspace/drv/nic/ar9271/ar9271.c	(revision 984a9ba2fa05c490a7066737655ed19130c714e8)
+++ uspace/drv/nic/ar9271/ar9271.c	(revision 5f97ef445e6e5648a8b8c902eb0f655d579336b4)
@@ -829,5 +829,5 @@
 
 	/* Wait until firmware is ready - wait for 1 second to be sure. */
-	async_sleep(1);
+	fibril_sleep(1);
 
 	return rc;
Index: uspace/drv/nic/e1k/e1k.c
===================================================================
--- uspace/drv/nic/e1k/e1k.c	(revision 984a9ba2fa05c490a7066737655ed19130c714e8)
+++ uspace/drv/nic/e1k/e1k.c	(revision 5f97ef445e6e5648a8b8c902eb0f655d579336b4)
@@ -372,5 +372,5 @@
 		fibril_mutex_unlock(&e1000->ctrl_lock);
 
-		async_usleep(10);
+		fibril_usleep(10);
 
 		fibril_mutex_lock(&e1000->ctrl_lock);
@@ -1726,5 +1726,5 @@
 
 	/* Wait for the reset */
-	async_usleep(20);
+	fibril_usleep(20);
 
 	/* check if RST_BIT cleared */
@@ -1814,5 +1814,5 @@
 	 * transfers to descriptors.
 	 */
-	async_usleep(100);
+	fibril_usleep(100);
 
 	return EOK;
@@ -2240,5 +2240,5 @@
 	uint32_t eerd = E1000_REG_READ(e1000, E1000_EERD);
 	while ((eerd & e1000->info.eerd_done) == 0) {
-		async_usleep(1);
+		fibril_usleep(1);
 		eerd = E1000_REG_READ(e1000, E1000_EERD);
 	}
Index: uspace/drv/nic/ne2k/dp8390.c
===================================================================
--- uspace/drv/nic/ne2k/dp8390.c	(revision 984a9ba2fa05c490a7066737655ed19130c714e8)
+++ uspace/drv/nic/ne2k/dp8390.c	(revision 5f97ef445e6e5648a8b8c902eb0f655d579336b4)
@@ -172,7 +172,7 @@
 	/* Reset the ethernet card */
 	uint8_t val = pio_read_8(ne2k->port + NE2K_RESET);
-	async_usleep(2000);
+	fibril_usleep(2000);
 	pio_write_8(ne2k->port + NE2K_RESET, val);
-	async_usleep(2000);
+	fibril_usleep(2000);
 
 	/* Reset the DP8390 */
Index: uspace/drv/nic/rtl8139/driver.c
===================================================================
--- uspace/drv/nic/rtl8139/driver.c	(revision 984a9ba2fa05c490a7066737655ed19130c714e8)
+++ uspace/drv/nic/rtl8139/driver.c	(revision 5f97ef445e6e5648a8b8c902eb0f655d579336b4)
@@ -440,5 +440,5 @@
 	memory_barrier();
 	while (pio_read_8(io_base + CR) & CR_RST) {
-		async_usleep(1);
+		fibril_usleep(1);
 		read_barrier();
 	}
Index: uspace/drv/nic/rtl8169/driver.c
===================================================================
--- uspace/drv/nic/rtl8169/driver.c	(revision 984a9ba2fa05c490a7066737655ed19130c714e8)
+++ uspace/drv/nic/rtl8169/driver.c	(revision 5f97ef445e6e5648a8b8c902eb0f655d579336b4)
@@ -767,5 +767,5 @@
 	memory_barrier();
 	while (pio_read_8(rtl8169->regs + CR) & CR_RST) {
-		async_usleep(1);
+		fibril_usleep(1);
 		read_barrier();
 	}
@@ -1180,5 +1180,5 @@
 	do {
 		phyar = pio_read_32(rtl8169->regs + PHYAR);
-		async_usleep(20);
+		fibril_usleep(20);
 	} while ((phyar & PHYAR_RW_WRITE) == 0);
 
@@ -1198,8 +1198,8 @@
 	do {
 		phyar = pio_read_32(rtl8169->regs + PHYAR);
-		async_usleep(20);
+		fibril_usleep(20);
 	} while ((phyar & PHYAR_RW_WRITE) != 0);
 
-	async_usleep(20);
+	fibril_usleep(20);
 }
 
Index: uspace/drv/test/test2/test2.c
===================================================================
--- uspace/drv/test/test2/test2.c	(revision 984a9ba2fa05c490a7066737655ed19130c714e8)
+++ uspace/drv/test/test2/test2.c	(revision 5f97ef445e6e5648a8b8c902eb0f655d579336b4)
@@ -125,5 +125,5 @@
 	errno_t rc;
 
-	async_usleep(1000);
+	fibril_usleep(1000);
 
 	(void) register_fun_verbose(test2->dev, "child driven by the same task",
@@ -147,9 +147,9 @@
 	test2->fun_a = fun_a;
 
-	async_usleep(10000000);
+	fibril_usleep(10000000);
 
 	ddf_msg(LVL_NOTE, "Unbinding function test1.");
 	ddf_fun_unbind(test2->test1);
-	async_usleep(1000000);
+	fibril_usleep(1000000);
 	ddf_msg(LVL_NOTE, "Unbinding function child.");
 	ddf_fun_unbind(test2->child);