Index: uspace/app/bdsh/cmds/modules/sleep/sleep.c
===================================================================
--- uspace/app/bdsh/cmds/modules/sleep/sleep.c	(revision 9912f492e2fb139a10c05399ed342a71bef48acf)
+++ uspace/app/bdsh/cmds/modules/sleep/sleep.c	(revision 5f97ef445e6e5648a8b8c902eb0f655d579336b4)
@@ -132,5 +132,5 @@
 	}
 
-	async_usleep(duration);
+	fibril_usleep(duration);
 
 	return CMD_SUCCESS;
Index: uspace/app/mkbd/main.c
===================================================================
--- uspace/app/mkbd/main.c	(revision 9912f492e2fb139a10c05399ed342a71bef48acf)
+++ uspace/app/mkbd/main.c	(revision 5f97ef445e6e5648a8b8c902eb0f655d579336b4)
@@ -295,5 +295,5 @@
 		}
 
-		async_usleep(10000);
+		fibril_usleep(10000);
 	}
 
Index: uspace/app/rcutest/rcutest.c
===================================================================
--- uspace/app/rcutest/rcutest.c	(revision 9912f492e2fb139a10c05399ed342a71bef48acf)
+++ uspace/app/rcutest/rcutest.c	(revision 5f97ef445e6e5648a8b8c902eb0f655d579336b4)
@@ -321,5 +321,5 @@
 	printf("r-sleep{");
 	/* 2 sec */
-	async_usleep(2 * USECS_PER_SEC);
+	fibril_usleep(2 * USECS_PER_SEC);
 	++arg->done_sleeps_cnt;
 	printf("}");
@@ -346,5 +346,5 @@
 
 	/* 1 sec, waits for the reader to enter its critical section and sleep. */
-	async_usleep(1 * USECS_PER_SEC);
+	fibril_usleep(1 * USECS_PER_SEC);
 
 	if (!info.entered_cs || info.exited_cs) {
@@ -369,5 +369,5 @@
 		 */
 		/* 1.5 sec */
-		async_usleep(1500 * 1000);
+		fibril_usleep(1500 * 1000);
 		return false;
 	} else {
@@ -402,5 +402,5 @@
 	/* Wait for rcu_sync() to start waiting for us. */
 	while (!arg->synching) {
-		async_usleep(WAIT_STEP_US);
+		fibril_usleep(WAIT_STEP_US);
 	}
 	printf(" }");
@@ -411,5 +411,5 @@
 	/* Wait for the new reader to enter its reader section. */
 	while (!arg->new_entered_cs) {
-		async_usleep(WAIT_STEP_US);
+		fibril_usleep(WAIT_STEP_US);
 	}
 	printf(" }");
@@ -437,5 +437,5 @@
 	/* Wait until rcu_sync() starts. */
 	while (!arg->synching) {
-		async_usleep(WAIT_STEP_US);
+		fibril_usleep(WAIT_STEP_US);
 	}
 
@@ -444,5 +444,5 @@
 	 * some more to make sure it really does start executing.
 	 */
-	async_usleep(WAIT_STEP_US);
+	fibril_usleep(WAIT_STEP_US);
 
 	printf("new-lock(");
@@ -452,5 +452,5 @@
 	/* Wait for rcu_sync() exit, ie stop waiting for the preexisting reader. */
 	while (!arg->synched) {
-		async_usleep(WAIT_STEP_US);
+		fibril_usleep(WAIT_STEP_US);
 	}
 
@@ -487,5 +487,5 @@
 	/* Waits for the preexisting_reader to enter its CS.*/
 	while (!info.old_entered_cs) {
-		async_usleep(WAIT_STEP_US);
+		fibril_usleep(WAIT_STEP_US);
 	}
 
@@ -533,5 +533,5 @@
 		 * are using it.
 		 */
-		async_usleep(WAIT_STEP_US);
+		fibril_usleep(WAIT_STEP_US);
 	}
 
@@ -565,5 +565,5 @@
 	/* Wait for rcu_sync() to start waiting for us. */
 	while (!arg->synching) {
-		async_usleep(WAIT_STEP_US);
+		fibril_usleep(WAIT_STEP_US);
 	}
 	printf(" }");
@@ -591,5 +591,5 @@
 	/* Waits for the preexisting_reader to enter its CS.*/
 	while (!info.entered_cs) {
-		async_usleep(WAIT_STEP_US);
+		fibril_usleep(WAIT_STEP_US);
 	}
 
Index: uspace/app/tester/stdio/logger2.c
===================================================================
--- uspace/app/tester/stdio/logger2.c	(revision 9912f492e2fb139a10c05399ed342a71bef48acf)
+++ uspace/app/tester/stdio/logger2.c	(revision 5f97ef445e6e5648a8b8c902eb0f655d579336b4)
@@ -56,5 +56,5 @@
 			    "Printing level %d (%s) into bravo sub-log.",
 			    (int) level, log_level_str(level));
-			async_usleep(1000 * 100);
+			fibril_usleep(1000 * 100);
 		}
 	}
Index: uspace/app/vuhid/life.c
===================================================================
--- uspace/app/vuhid/life.c	(revision 9912f492e2fb139a10c05399ed342a71bef48acf)
+++ uspace/app/vuhid/life.c	(revision 5f97ef445e6e5648a8b8c902eb0f655d579336b4)
@@ -44,8 +44,8 @@
 	data->data_in_pos = 0;
 	data->data_in_last_pos = (size_t) -1;
-	async_usleep(1000 * 1000 * 5);
+	fibril_usleep(1000 * 1000 * 5);
 	usb_log_debug("%s", data->msg_born);
 	while (data->data_in_pos < data->data_in_count) {
-		async_usleep(1000 * data->data_in_pos_change_delay);
+		fibril_usleep(1000 * data->data_in_pos_change_delay);
 		// FIXME: proper locking
 		data->data_in_pos++;
Index: uspace/app/wavplay/dplay.c
===================================================================
--- uspace/app/wavplay/dplay.c	(revision 9912f492e2fb139a10c05399ed342a71bef48acf)
+++ uspace/app/wavplay/dplay.c	(revision 5f97ef445e6e5648a8b8c902eb0f655d579336b4)
@@ -312,5 +312,5 @@
 		    pos, usecs, real_delay, to_play);
 		if (real_delay)
-			async_usleep(real_delay);
+			fibril_usleep(real_delay);
 		/* update buffer position */
 		const errno_t ret = audio_pcm_get_buffer_pos(pb->device, &pos);
Index: uspace/app/wavplay/drec.c
===================================================================
--- uspace/app/wavplay/drec.c	(revision 9912f492e2fb139a10c05399ed342a71bef48acf)
+++ uspace/app/wavplay/drec.c	(revision 5f97ef445e6e5648a8b8c902eb0f655d579336b4)
@@ -167,5 +167,5 @@
 	/* XXX Control returns even before we can be sure callbacks finished */
 	printf("Delay before playback termination\n");
-	async_usleep(1000000);
+	fibril_usleep(1000000);
 	printf("Terminate playback\n");
 }
Index: uspace/app/wavplay/main.c
===================================================================
--- uspace/app/wavplay/main.c	(revision 9912f492e2fb139a10c05399ed342a71bef48acf)
+++ uspace/app/wavplay/main.c	(revision 5f97ef445e6e5648a8b8c902eb0f655d579336b4)
@@ -341,5 +341,5 @@
 	/* Wait for all fibrils to finish */
 	while (atomic_get(&playcount) > 0)
-		async_usleep(1000000);
+		fibril_usleep(1000000);
 
 	/* Destroy parallel playback context, if initialized */
Index: uspace/drv/audio/hdaudio/hdactl.c
===================================================================
--- uspace/drv/audio/hdaudio/hdactl.c	(revision 9912f492e2fb139a10c05399ed342a71bef48acf)
+++ 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 9912f492e2fb139a10c05399ed342a71bef48acf)
+++ 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 9912f492e2fb139a10c05399ed342a71bef48acf)
+++ 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 9912f492e2fb139a10c05399ed342a71bef48acf)
+++ 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 9912f492e2fb139a10c05399ed342a71bef48acf)
+++ 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 9912f492e2fb139a10c05399ed342a71bef48acf)
+++ 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 9912f492e2fb139a10c05399ed342a71bef48acf)
+++ 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 9912f492e2fb139a10c05399ed342a71bef48acf)
+++ 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 9912f492e2fb139a10c05399ed342a71bef48acf)
+++ 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 9912f492e2fb139a10c05399ed342a71bef48acf)
+++ 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 9912f492e2fb139a10c05399ed342a71bef48acf)
+++ 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 9912f492e2fb139a10c05399ed342a71bef48acf)
+++ 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 9912f492e2fb139a10c05399ed342a71bef48acf)
+++ 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 9912f492e2fb139a10c05399ed342a71bef48acf)
+++ 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 9912f492e2fb139a10c05399ed342a71bef48acf)
+++ 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 9912f492e2fb139a10c05399ed342a71bef48acf)
+++ 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 9912f492e2fb139a10c05399ed342a71bef48acf)
+++ 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 9912f492e2fb139a10c05399ed342a71bef48acf)
+++ 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 9912f492e2fb139a10c05399ed342a71bef48acf)
+++ 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 9912f492e2fb139a10c05399ed342a71bef48acf)
+++ 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 9912f492e2fb139a10c05399ed342a71bef48acf)
+++ 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 9912f492e2fb139a10c05399ed342a71bef48acf)
+++ 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 9912f492e2fb139a10c05399ed342a71bef48acf)
+++ 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);
Index: uspace/lib/c/generic/async/client.c
===================================================================
--- uspace/lib/c/generic/async/client.c	(revision 9912f492e2fb139a10c05399ed342a71bef48acf)
+++ uspace/lib/c/generic/async/client.c	(revision 5f97ef445e6e5648a8b8c902eb0f655d579336b4)
@@ -515,5 +515,5 @@
  *
  */
-void async_usleep(suseconds_t timeout)
+void fibril_usleep(suseconds_t timeout)
 {
 	awaiter_t awaiter;
@@ -538,5 +538,5 @@
  * @param sec Number of seconds to sleep
  */
-void async_sleep(unsigned int sec)
+void fibril_sleep(unsigned int sec)
 {
 	/*
@@ -548,5 +548,5 @@
 		unsigned int period = (sec > 1000) ? 1000 : sec;
 
-		async_usleep(period * 1000000);
+		fibril_usleep(period * 1000000);
 		sec -= period;
 	}
Index: uspace/lib/c/generic/irc.c
===================================================================
--- uspace/lib/c/generic/irc.c	(revision 9912f492e2fb139a10c05399ed342a71bef48acf)
+++ uspace/lib/c/generic/irc.c	(revision 5f97ef445e6e5648a8b8c902eb0f655d579336b4)
@@ -72,5 +72,5 @@
 
 		// XXX This is just a temporary hack
-		async_usleep(500 * 1000);
+		fibril_usleep(500 * 1000);
 	}
 
Index: uspace/lib/c/generic/rcu.c
===================================================================
--- uspace/lib/c/generic/rcu.c	(revision 9912f492e2fb139a10c05399ed342a71bef48acf)
+++ uspace/lib/c/generic/rcu.c	(revision 5f97ef445e6e5648a8b8c902eb0f655d579336b4)
@@ -423,5 +423,5 @@
 	 */
 	futex_unlock(&rcu.sync_lock.futex);
-	async_usleep(RCU_SLEEP_MS * 1000);
+	fibril_usleep(RCU_SLEEP_MS * 1000);
 	futex_lock(&rcu.sync_lock.futex);
 }
Index: uspace/lib/c/include/async.h
===================================================================
--- uspace/lib/c/include/async.h	(revision 9912f492e2fb139a10c05399ed342a71bef48acf)
+++ uspace/lib/c/include/async.h	(revision 5f97ef445e6e5648a8b8c902eb0f655d579336b4)
@@ -143,7 +143,4 @@
 extern errno_t async_wait_timeout(aid_t, errno_t *, suseconds_t);
 extern void async_forget(aid_t);
-
-extern void async_usleep(suseconds_t);
-extern void async_sleep(unsigned int);
 
 extern void async_create_manager(void);
Index: uspace/lib/c/include/fibril.h
===================================================================
--- uspace/lib/c/include/fibril.h	(revision 9912f492e2fb139a10c05399ed342a71bef48acf)
+++ uspace/lib/c/include/fibril.h	(revision 5f97ef445e6e5648a8b8c902eb0f655d579336b4)
@@ -37,4 +37,5 @@
 
 #include <types/common.h>
+#include <time.h>
 
 typedef struct fibril fibril_t;
@@ -57,4 +58,7 @@
 extern void fibril_yield(void);
 
+extern void fibril_usleep(suseconds_t);
+extern void fibril_sleep(unsigned int);
+
 static inline fid_t fibril_create(errno_t (*func)(void *), void *arg)
 {
Index: uspace/lib/c/test/fibril/timer.c
===================================================================
--- uspace/lib/c/test/fibril/timer.c	(revision 9912f492e2fb139a10c05399ed342a71bef48acf)
+++ uspace/lib/c/test/fibril/timer.c	(revision 5f97ef445e6e5648a8b8c902eb0f655d579336b4)
@@ -78,5 +78,5 @@
 
 	fibril_timer_set_locked(t, 100 * 1000 * 1000, test_timeout_fn, &cnt);
-	async_usleep(1000);
+	fibril_usleep(1000);
 	fts = fibril_timer_clear_locked(t);
 	PCUT_ASSERT_INT_EQUALS(fts_active, fts);
@@ -101,5 +101,5 @@
 	cnt = 0;
 	fibril_timer_set(t, 100 * 1000 * 1000, test_timeout_fn, &cnt);
-	async_usleep(1000);
+	fibril_usleep(1000);
 	fts = fibril_timer_clear(t);
 	PCUT_ASSERT_INT_EQUALS(fts_active, fts);
@@ -127,5 +127,5 @@
 	fibril_mutex_unlock(&lock);
 
-	async_usleep(1000);
+	fibril_usleep(1000);
 
 	fibril_mutex_lock(&lock);
Index: uspace/lib/cpp/include/__bits/thread/threading.hpp
===================================================================
--- uspace/lib/cpp/include/__bits/thread/threading.hpp	(revision 9912f492e2fb139a10c05399ed342a71bef48acf)
+++ uspace/lib/cpp/include/__bits/thread/threading.hpp	(revision 5f97ef445e6e5648a8b8c902eb0f655d579336b4)
@@ -158,5 +158,5 @@
             static void sleep(time_unit time)
             {
-                hel::async_usleep(time);
+                hel::fibril_usleep(time);
             }
         };
Index: uspace/lib/ieee80211/src/ieee80211.c
===================================================================
--- uspace/lib/ieee80211/src/ieee80211.c	(revision 9912f492e2fb139a10c05399ed342a71bef48acf)
+++ uspace/lib/ieee80211/src/ieee80211.c	(revision 5f97ef445e6e5648a8b8c902eb0f655d579336b4)
@@ -504,5 +504,5 @@
 	while (true) {
 		ieee80211_dev->ops->scan(ieee80211_dev);
-		async_usleep(SCAN_PERIOD_USEC);
+		fibril_usleep(SCAN_PERIOD_USEC);
 	}
 
Index: uspace/lib/ieee80211/src/ieee80211_impl.c
===================================================================
--- uspace/lib/ieee80211/src/ieee80211_impl.c	(revision 9912f492e2fb139a10c05399ed342a71bef48acf)
+++ uspace/lib/ieee80211/src/ieee80211_impl.c	(revision 5f97ef445e6e5648a8b8c902eb0f655d579336b4)
@@ -152,5 +152,5 @@
 
 			/* Wait for probe responses. */
-			async_usleep(SCAN_CHANNEL_WAIT_USEC);
+			fibril_usleep(SCAN_CHANNEL_WAIT_USEC);
 		}
 
Index: uspace/lib/nic/src/nic_driver.c
===================================================================
--- uspace/lib/nic/src/nic_driver.c	(revision 9912f492e2fb139a10c05399ed342a71bef48acf)
+++ uspace/lib/nic/src/nic_driver.c	(revision 5f97ef445e6e5648a8b8c902eb0f655d579336b4)
@@ -1083,5 +1083,5 @@
 				remaining.tv_usec -= wait;
 			}
-			async_usleep(wait);
+			fibril_usleep(wait);
 
 			/* Check if the period was not reset */
Index: uspace/lib/posix/src/time.c
===================================================================
--- uspace/lib/posix/src/time.c	(revision 9912f492e2fb139a10c05399ed342a71bef48acf)
+++ uspace/lib/posix/src/time.c	(revision 5f97ef445e6e5648a8b8c902eb0f655d579336b4)
@@ -297,8 +297,8 @@
 		// TODO: interruptible sleep
 		if (rqtp->tv_sec != 0) {
-			async_sleep(rqtp->tv_sec);
+			fibril_sleep(rqtp->tv_sec);
 		}
 		if (rqtp->tv_nsec != 0) {
-			async_usleep(rqtp->tv_nsec / 1000);
+			fibril_usleep(rqtp->tv_nsec / 1000);
 		}
 		return 0;
Index: uspace/lib/usbdev/src/devpoll.c
===================================================================
--- uspace/lib/usbdev/src/devpoll.c	(revision 9912f492e2fb139a10c05399ed342a71bef48acf)
+++ uspace/lib/usbdev/src/devpoll.c	(revision 5f97ef445e6e5648a8b8c902eb0f655d579336b4)
@@ -190,5 +190,5 @@
 		// but first we need to fix drivers to actually stop using this,
 		// since polling delay should be implemented in HC schedule
-		async_usleep(polling->delay);
+		fibril_usleep(polling->delay);
 	}
 
Index: uspace/lib/usbhost/src/hcd.c
===================================================================
--- uspace/lib/usbhost/src/hcd.c	(revision 9912f492e2fb139a10c05399ed342a71bef48acf)
+++ uspace/lib/usbhost/src/hcd.c	(revision 5f97ef445e6e5648a8b8c902eb0f655d579336b4)
@@ -125,5 +125,5 @@
 		 * good enough for emergency mode
 		 */
-		async_usleep(10000);
+		fibril_usleep(10000);
 	}
 	return EOK;
Index: uspace/srv/hid/input/port/chardev.c
===================================================================
--- uspace/srv/hid/input/port/chardev.c	(revision 9912f492e2fb139a10c05399ed342a71bef48acf)
+++ uspace/srv/hid/input/port/chardev.c	(revision 5f97ef445e6e5648a8b8c902eb0f655d579336b4)
@@ -87,5 +87,5 @@
 		/* XXX This is just a hack. */
 		printf("%s: No input device found, sleep for retry.\n", NAME);
-		async_usleep(1000 * 1000);
+		fibril_usleep(1000 * 1000);
 		goto again;
 	}
Index: uspace/srv/hid/isdv4_tablet/isdv4.c
===================================================================
--- uspace/srv/hid/isdv4_tablet/isdv4.c	(revision 9912f492e2fb139a10c05399ed342a71bef48acf)
+++ uspace/srv/hid/isdv4_tablet/isdv4.c	(revision 5f97ef445e6e5648a8b8c902eb0f655d579336b4)
@@ -391,5 +391,5 @@
 		return EIO;
 
-	async_usleep(250000); /* 250 ms */
+	fibril_usleep(250000); /* 250 ms */
 
 	// FIXME: Read all possible garbage before sending commands
Index: uspace/srv/net/tcp/test.c
===================================================================
--- uspace/srv/net/tcp/test.c	(revision 9912f492e2fb139a10c05399ed342a71bef48acf)
+++ uspace/srv/net/tcp/test.c	(revision 5f97ef445e6e5648a8b8c902eb0f655d579336b4)
@@ -79,8 +79,8 @@
 		printf("S: User received %zu bytes '%s'.\n", rcvd, rcv_buf);
 
-		async_usleep(1000 * 1000 * 2);
+		fibril_usleep(1000 * 1000 * 2);
 	}
 
-	async_usleep(/*10**/1000 * 1000);
+	fibril_usleep(/*10**/1000 * 1000);
 
 	printf("S: User close...\n");
@@ -107,14 +107,14 @@
 	epp.remote.port = 80;
 
-	async_usleep(1000 * 1000 * 3);
+	fibril_usleep(1000 * 1000 * 3);
 	printf("C: User open...\n");
 	tcp_uc_open(&epp, ap_active, 0, &conn);
 	conn->name = (char *) "C";
 
-	async_usleep(1000 * 1000 * 10);
+	fibril_usleep(1000 * 1000 * 10);
 	printf("C: User send...\n");
 	tcp_uc_send(conn, (void *)msg, str_size(msg), 0);
 
-	async_usleep(1000 * 1000 * 20/**20*2*/);
+	fibril_usleep(1000 * 1000 * 20/**20*2*/);
 	printf("C: User close...\n");
 	tcp_uc_close(conn);
@@ -130,5 +130,5 @@
 	printf("tcp_test()\n");
 
-	async_usleep(1000 * 1000);
+	fibril_usleep(1000 * 1000);
 
 	if (0) {