Index: uspace/drv/ns8250/ns8250.c
===================================================================
--- uspace/drv/ns8250/ns8250.c	(revision 400575c58f6b62c46b8baaa757924a9033c50a83)
+++ uspace/drv/ns8250/ns8250.c	(revision 17aca1c1f6f00b4b526e475b7eead4405501c16b)
@@ -256,5 +256,5 @@
 	
 	if (dev->parent_phone > 0) {
-		ipc_hangup(dev->parent_phone);
+		async_hangup(dev->parent_phone);
 		dev->parent_phone = 0;
 	}
@@ -888,5 +888,5 @@
 		ns8250_get_props(dev, &baud_rate, &parity, &word_length,
 		    &stop_bits);
-		ipc_answer_4(callid, EOK, baud_rate, parity, word_length,
+		async_answer_4(callid, EOK, baud_rate, parity, word_length,
 		    stop_bits);
 		break;
@@ -899,9 +899,9 @@
 		ret = ns8250_set_props(dev, baud_rate, parity, word_length,
 		    stop_bits);
-		ipc_answer_0(callid, ret);
+		async_answer_0(callid, ret);
 		break;
 		
 	default:
-		ipc_answer_0(callid, ENOTSUP);
+		async_answer_0(callid, ENOTSUP);
 	}
 }
Index: uspace/drv/pciintel/pci.c
===================================================================
--- uspace/drv/pciintel/pci.c	(revision 400575c58f6b62c46b8baaa757924a9033c50a83)
+++ uspace/drv/pciintel/pci.c	(revision 17aca1c1f6f00b4b526e475b7eead4405501c16b)
@@ -478,5 +478,5 @@
 		    "the device.\n");
 		delete_pci_bus_data(bus_data);
-		ipc_hangup(dev->parent_phone);
+		async_hangup(dev->parent_phone);
 		return rc;
 	}	
@@ -496,5 +496,5 @@
 		printf(NAME ": failed to enable configuration ports.\n");
 		delete_pci_bus_data(bus_data);
-		ipc_hangup(dev->parent_phone);
+		async_hangup(dev->parent_phone);
 		hw_res_clean_resource_list(&hw_resources);
 		return EADDRNOTAVAIL;
Index: uspace/drv/test2/test2.c
===================================================================
--- uspace/drv/test2/test2.c	(revision 400575c58f6b62c46b8baaa757924a9033c50a83)
+++ uspace/drv/test2/test2.c	(revision 17aca1c1f6f00b4b526e475b7eead4405501c16b)
@@ -103,4 +103,8 @@
 	if (dev->parent == NULL) {
 		fid_t postpone = fibril_create(postponed_birth, dev);
+		if (postpone == 0) {
+			printf(NAME ": fibril_create() error\n");
+			return ENOMEM;
+		}
 		fibril_add_ready(postpone);
 	} else {
Index: uspace/drv/uhci-hcd/pci.c
===================================================================
--- uspace/drv/uhci-hcd/pci.c	(revision 400575c58f6b62c46b8baaa757924a9033c50a83)
+++ uspace/drv/uhci-hcd/pci.c	(revision 17aca1c1f6f00b4b526e475b7eead4405501c16b)
@@ -117,5 +117,5 @@
 	rc = EOK;
 leave:
-	ipc_hangup(parent_phone);
+	async_hangup(parent_phone);
 
 	return rc;
Index: uspace/drv/usbhid/main.c
===================================================================
--- uspace/drv/usbhid/main.c	(revision 400575c58f6b62c46b8baaa757924a9033c50a83)
+++ uspace/drv/usbhid/main.c	(revision 17aca1c1f6f00b4b526e475b7eead4405501c16b)
@@ -83,14 +83,14 @@
 
 		if (console_callback_phone != -1) {
-			ipc_answer_0(icallid, ELIMIT);
+			async_answer_0(icallid, ELIMIT);
 			return;
 		}
 
 		console_callback_phone = callback;
-		ipc_answer_0(icallid, EOK);
+		async_answer_0(icallid, EOK);
 		return;
 	}
 
-	ipc_answer_0(icallid, EINVAL);
+	async_answer_0(icallid, EINVAL);
 }
 
Index: uspace/drv/usbhub/usbhub.c
===================================================================
--- uspace/drv/usbhub/usbhub.c	(revision 400575c58f6b62c46b8baaa757924a9033c50a83)
+++ uspace/drv/usbhub/usbhub.c	(revision 17aca1c1f6f00b4b526e475b7eead4405501c16b)
@@ -199,5 +199,5 @@
 	//ports powered, hub seems to be enabled
 
-	ipc_hangup(hc);
+	async_hangup(hc);
 
 	//add the hub to list
@@ -502,5 +502,5 @@
 		free(change_bitmap);
 
-		ipc_hangup(hc);
+		async_hangup(hc);
 		fibril_mutex_lock(&usb_hub_list_lock);
 	}
Index: uspace/drv/vhc/conndev.c
===================================================================
--- uspace/drv/vhc/conndev.c	(revision 400575c58f6b62c46b8baaa757924a9033c50a83)
+++ uspace/drv/vhc/conndev.c	(revision 17aca1c1f6f00b4b526e475b7eead4405501c16b)
@@ -90,9 +90,9 @@
 		    = virtdev_add_device(callback, (sysarg_t)fibril_get_id());
 		if (!dev) {
-			ipc_answer_0(icallid, EEXISTS);
-			ipc_hangup(callback);
+			async_answer_0(icallid, EEXISTS);
+			async_hangup(callback);
 			return;
 		}
-		ipc_answer_0(icallid, EOK);
+		async_answer_0(icallid, EOK);
 
 		char devname[DEVICE_NAME_MAXLENGTH + 1];
@@ -105,5 +105,5 @@
 	}
 
-	ipc_answer_0(icallid, EINVAL);
+	async_answer_0(icallid, EINVAL);
 }
 
Index: uspace/drv/vhc/devices.c
===================================================================
--- uspace/drv/vhc/devices.c	(revision 400575c58f6b62c46b8baaa757924a9033c50a83)
+++ uspace/drv/vhc/devices.c	(revision 17aca1c1f6f00b4b526e475b7eead4405501c16b)
@@ -34,5 +34,4 @@
  */
 
-#include <ipc/ipc.h>
 #include <adt/list.h>
 #include <bool.h>
Index: uspace/drv/vhc/hc.c
===================================================================
--- uspace/drv/vhc/hc.c	(revision 400575c58f6b62c46b8baaa757924a9033c50a83)
+++ uspace/drv/vhc/hc.c	(revision 17aca1c1f6f00b4b526e475b7eead4405501c16b)
@@ -34,5 +34,4 @@
  */
 
-#include <ipc/ipc.h>
 #include <adt/list.h>
 #include <bool.h>
Index: uspace/drv/vhc/hcd.c
===================================================================
--- uspace/drv/vhc/hcd.c	(revision 400575c58f6b62c46b8baaa757924a9033c50a83)
+++ uspace/drv/vhc/hcd.c	(revision 17aca1c1f6f00b4b526e475b7eead4405501c16b)
@@ -35,5 +35,4 @@
 
 #include <devmap.h>
-#include <ipc/ipc.h>
 #include <async.h>
 #include <unistd.h>