Index: uspace/app/tester/hw/misc/virtchar1.c
===================================================================
--- uspace/app/tester/hw/misc/virtchar1.c	(revision 2fd26bbb5577f592b70747a25fba122b01bb9559)
+++ uspace/app/tester/hw/misc/virtchar1.c	(revision d15797de77c0b69b5bef26ccf17a3c40947a75df)
@@ -60,5 +60,5 @@
 			    "have you compiled test drivers?)\n");
 		}
-		return "Failed opening devman driver device for reading";
+		return "Failed opening NULL device for reading";
 	}
 	
Index: uspace/app/usbinfo/usbinfo.h
===================================================================
--- uspace/app/usbinfo/usbinfo.h	(revision 2fd26bbb5577f592b70747a25fba122b01bb9559)
+++ uspace/app/usbinfo/usbinfo.h	(revision d15797de77c0b69b5bef26ccf17a3c40947a75df)
@@ -40,5 +40,4 @@
 #include <usb/dev/device.h>
 #include <usb/dev/dp.h>
-#include <ipc/devman.h>
 
 typedef struct {
Index: uspace/drv/audio/sb16/dsp.c
===================================================================
--- uspace/drv/audio/sb16/dsp.c	(revision 2fd26bbb5577f592b70747a25fba122b01bb9559)
+++ uspace/drv/audio/sb16/dsp.c	(revision d15797de77c0b69b5bef26ccf17a3c40947a75df)
@@ -35,6 +35,6 @@
 #include <as.h>
 #include <stdbool.h>
+#include <ddf/driver.h>
 #include <ddi.h>
-#include <devman.h>
 #include <device/hw_res.h>
 #include <libarch/ddi.h>
@@ -161,6 +161,5 @@
 static inline int setup_dma(sb_dsp_t *dsp, uintptr_t pa, size_t size)
 {
-	async_sess_t *sess = devman_parent_device_connect(
-	    ddf_dev_get_handle(dsp->sb_dev), IPC_FLAG_BLOCKING);
+	async_sess_t *sess = ddf_dev_parent_sess_get(dsp->sb_dev);
 
 	const int ret = hw_res_dma_channel_setup(sess,
@@ -304,6 +303,5 @@
 
 	assert(dsp->buffer.data);
-	async_sess_t *sess = devman_parent_device_connect(
-	    ddf_dev_get_handle(dsp->sb_dev), IPC_FLAG_BLOCKING);
+	async_sess_t *sess = ddf_dev_parent_sess_get(dsp->sb_dev);
 
 	// TODO: Assumes DMA 16
Index: uspace/drv/audio/sb16/main.c
===================================================================
--- uspace/drv/audio/sb16/main.c	(revision 2fd26bbb5577f592b70747a25fba122b01bb9559)
+++ uspace/drv/audio/sb16/main.c	(revision d15797de77c0b69b5bef26ccf17a3c40947a75df)
@@ -37,5 +37,4 @@
 #include <ddf/log.h>
 #include <device/hw_res_parsed.h>
-#include <devman.h>
 #include <assert.h>
 #include <stdio.h>
@@ -180,7 +179,6 @@
 	assert(device);
 
-	async_sess_t *parent_sess = devman_parent_device_connect(
-	    ddf_dev_get_handle(device), IPC_FLAG_BLOCKING);
-	if (!parent_sess)
+	async_sess_t *parent_sess = ddf_dev_parent_sess_get(device);
+	if (parent_sess == NULL)
 		return ENOMEM;
 
@@ -247,7 +245,6 @@
 int sb_enable_interrupts(ddf_dev_t *device)
 {
-	async_sess_t *parent_sess = devman_parent_device_connect(
-	    ddf_dev_get_handle(device), IPC_FLAG_BLOCKING);
-	if (!parent_sess)
+	async_sess_t *parent_sess = ddf_dev_parent_sess_get(device);
+	if (parent_sess == NULL)
 		return ENOMEM;
 
Index: uspace/drv/block/ahci/ahci.h
===================================================================
--- uspace/drv/block/ahci/ahci.h	(revision 2fd26bbb5577f592b70747a25fba122b01bb9559)
+++ uspace/drv/block/ahci/ahci.h	(revision d15797de77c0b69b5bef26ccf17a3c40947a75df)
@@ -35,5 +35,4 @@
 
 #include <async.h>
-#include <devman.h>
 #include <ddf/interrupt.h>
 #include <stdio.h>
@@ -92,7 +91,4 @@
 	ahci_port_is_t event_pxis;
 	
-	/** Block device service id. */
-	service_id_t service_id;
-	
 	/** Number of device data blocks. */
 	uint64_t blocks;
Index: uspace/drv/bus/usb/ehci/res.c
===================================================================
--- uspace/drv/bus/usb/ehci/res.c	(revision 2fd26bbb5577f592b70747a25fba122b01bb9559)
+++ uspace/drv/bus/usb/ehci/res.c	(revision d15797de77c0b69b5bef26ccf17a3c40947a75df)
@@ -39,5 +39,5 @@
 #include <str_error.h>
 #include <assert.h>
-#include <devman.h>
+#include <ddf/driver.h>
 #include <ddi.h>
 #include <usb/debug.h>
@@ -176,7 +176,6 @@
 	assert(device);
 
-	async_sess_t *parent_sess = devman_parent_device_connect(
-	    ddf_dev_get_handle(device), IPC_FLAG_BLOCKING);
-	if (!parent_sess)
+	async_sess_t *parent_sess = ddf_dev_parent_sess_get(device);
+	if (parent_sess == NULL)
 		return ENOMEM;
 
Index: uspace/drv/bus/usb/uhci/main.c
===================================================================
--- uspace/drv/bus/usb/uhci/main.c	(revision 2fd26bbb5577f592b70747a25fba122b01bb9559)
+++ uspace/drv/bus/usb/uhci/main.c	(revision d15797de77c0b69b5bef26ccf17a3c40947a75df)
@@ -36,5 +36,4 @@
 #include <assert.h>
 #include <ddf/driver.h>
-#include <devman.h>
 #include <errno.h>
 #include <io/log.h>
@@ -106,7 +105,6 @@
 	assert(device);
 
-	async_sess_t *parent_sess = devman_parent_device_connect(
-	    ddf_dev_get_handle(device), IPC_FLAG_BLOCKING);
-	if (!parent_sess)
+	async_sess_t *parent_sess = ddf_dev_parent_sess_get(device);
+	if (parent_sess == NULL)
 		return ENOMEM;
 
Index: uspace/drv/bus/usb/usbhub/usbhub.h
===================================================================
--- uspace/drv/bus/usb/usbhub/usbhub.h	(revision 2fd26bbb5577f592b70747a25fba122b01bb9559)
+++ uspace/drv/bus/usb/usbhub/usbhub.h	(revision d15797de77c0b69b5bef26ccf17a3c40947a75df)
@@ -38,5 +38,4 @@
 #define DRV_USBHUB_USBHUB_H
 
-#include <ipc/devman.h>
 #include <ddf/driver.h>
 
@@ -72,5 +71,5 @@
 	/** Condition variable for pending_ops_count. */
 	fibril_condvar_t pending_ops_cv;
-	/** Pointer to devman usbhub function. */
+	/** Pointer to usbhub function. */
 	ddf_fun_t *hub_fun;
 	/** Status indicator */
Index: uspace/drv/bus/usb/usbmid/explore.c
===================================================================
--- uspace/drv/bus/usb/usbmid/explore.c	(revision 2fd26bbb5577f592b70747a25fba122b01bb9559)
+++ uspace/drv/bus/usb/usbmid/explore.c	(revision d15797de77c0b69b5bef26ccf17a3c40947a75df)
@@ -132,5 +132,5 @@
  *
  * @param dev Device to be explored.
- * @return Whether to accept this device from devman.
+ * @return Whether to accept this device.
  */
 int usbmid_explore_device(usb_device_t *dev)
Index: uspace/drv/fb/amdm37x_dispc/main.c
===================================================================
--- uspace/drv/fb/amdm37x_dispc/main.c	(revision 2fd26bbb5577f592b70747a25fba122b01bb9559)
+++ uspace/drv/fb/amdm37x_dispc/main.c	(revision d15797de77c0b69b5bef26ccf17a3c40947a75df)
@@ -91,5 +91,5 @@
 	}
 
-	/* Report to devman */
+	/* Bind function */
 	ret = ddf_fun_bind(fun);
 	if (ret != EOK) {
Index: uspace/drv/test/test1/test1.c
===================================================================
--- uspace/drv/test/test1/test1.c	(revision 2fd26bbb5577f592b70747a25fba122b01bb9559)
+++ uspace/drv/test/test1/test1.c	(revision d15797de77c0b69b5bef26ccf17a3c40947a75df)
@@ -135,5 +135,5 @@
  * /virtual/test1/clone/child
  *
- * and devman shall not deadlock.
+ * and the DDF shall not deadlock.
  *
  *
