Index: uspace/drv/block/ata_bd/main.c
===================================================================
--- uspace/drv/block/ata_bd/main.c	(revision eadaeae8dacc68cf558028f23cc96b90a08b7361)
+++ uspace/drv/block/ata_bd/main.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
@@ -47,5 +47,5 @@
 static errno_t ata_fun_offline(ddf_fun_t *fun);
 
-static void ata_bd_connection(ipc_callid_t, ipc_call_t *, void *);
+static void ata_bd_connection(cap_call_handle_t, ipc_call_t *, void *);
 
 static driver_ops_t driver_ops = {
@@ -313,5 +313,5 @@
 
 /** Block device connection handler */
-static void ata_bd_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+static void ata_bd_connection(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
 {
 	ata_fun_t *afun;
Index: uspace/drv/block/ddisk/ddisk.c
===================================================================
--- uspace/drv/block/ddisk/ddisk.c	(revision eadaeae8dacc68cf558028f23cc96b90a08b7361)
+++ uspace/drv/block/ddisk/ddisk.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
@@ -62,5 +62,5 @@
 static errno_t ddisk_fun_offline(ddf_fun_t *);
 
-static void ddisk_bd_connection(ipc_callid_t, ipc_call_t *, void *);
+static void ddisk_bd_connection(cap_call_handle_t, ipc_call_t *, void *);
 
 static void ddisk_irq_handler(ipc_call_t *, ddf_dev_t *);
@@ -587,5 +587,5 @@
 
 /** Block device connection handler */
-static void ddisk_bd_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+static void ddisk_bd_connection(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
 {
 	ddisk_t *ddisk;
Index: uspace/drv/block/usbmast/main.c
===================================================================
--- uspace/drv/block/usbmast/main.c	(revision eadaeae8dacc68cf558028f23cc96b90a08b7361)
+++ uspace/drv/block/usbmast/main.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
@@ -79,5 +79,5 @@
 
 static errno_t usbmast_fun_create(usbmast_dev_t *mdev, unsigned lun);
-static void usbmast_bd_connection(ipc_callid_t iid, ipc_call_t *icall,
+static void usbmast_bd_connection(cap_call_handle_t iid, ipc_call_t *icall,
     void *arg);
 
@@ -317,5 +317,5 @@
 
 /** Blockdev client connection handler. */
-static void usbmast_bd_connection(ipc_callid_t iid, ipc_call_t *icall,
+static void usbmast_bd_connection(cap_call_handle_t iid, ipc_call_t *icall,
     void *arg)
 {
Index: uspace/drv/bus/adb/cuda_adb/cuda_adb.c
===================================================================
--- uspace/drv/bus/adb/cuda_adb/cuda_adb.c	(revision eadaeae8dacc68cf558028f23cc96b90a08b7361)
+++ uspace/drv/bus/adb/cuda_adb/cuda_adb.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
@@ -55,5 +55,5 @@
 #define NAME  "cuda_adb"
 
-static void cuda_dev_connection(ipc_callid_t, ipc_call_t *, void *);
+static void cuda_dev_connection(cap_call_handle_t, ipc_call_t *, void *);
 static errno_t cuda_init(cuda_t *);
 static void cuda_irq_handler(ipc_call_t *, void *);
@@ -198,8 +198,8 @@
 
 /** Device connection handler */
-static void cuda_dev_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+static void cuda_dev_connection(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
 {
 	adb_dev_t *dev = (adb_dev_t *) ddf_fun_data_get((ddf_fun_t *) arg);
-	ipc_callid_t callid;
+	cap_call_handle_t callid;
 	ipc_call_t call;
 	sysarg_t method;
Index: uspace/drv/bus/usb/vhc/conndev.c
===================================================================
--- uspace/drv/bus/usb/vhc/conndev.c	(revision eadaeae8dacc68cf558028f23cc96b90a08b7361)
+++ uspace/drv/bus/usb/vhc/conndev.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
@@ -93,5 +93,5 @@
  * @param icall Call data.
  */
-void default_connection_handler(ddf_fun_t *fun, ipc_callid_t icallid,
+void default_connection_handler(ddf_fun_t *fun, cap_call_handle_t icallid,
     ipc_call_t *icall)
 {
Index: uspace/drv/bus/usb/vhc/vhcd.h
===================================================================
--- uspace/drv/bus/usb/vhc/vhcd.h	(revision eadaeae8dacc68cf558028f23cc96b90a08b7361)
+++ uspace/drv/bus/usb/vhc/vhcd.h	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
@@ -88,5 +88,5 @@
 
 void on_client_close(ddf_fun_t *fun);
-void default_connection_handler(ddf_fun_t *fun, ipc_callid_t icallid,
+void default_connection_handler(ddf_fun_t *fun, cap_call_handle_t icallid,
     ipc_call_t *icall);
 
Index: uspace/drv/char/i8042/i8042.c
===================================================================
--- uspace/drv/char/i8042/i8042.c	(revision eadaeae8dacc68cf558028f23cc96b90a08b7361)
+++ uspace/drv/char/i8042/i8042.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
@@ -67,5 +67,5 @@
 #define i8042_KBD_TRANSLATE  0x40  /* Use this to switch to XT scancodes */
 
-static void i8042_char_conn(ipc_callid_t, ipc_call_t *, void *);
+static void i8042_char_conn(cap_call_handle_t, ipc_call_t *, void *);
 static errno_t i8042_read(chardev_srv_t *, void *, size_t, size_t *);
 static errno_t i8042_write(chardev_srv_t *, const void *, size_t, size_t *);
@@ -418,5 +418,5 @@
  * @param arg  ddf_fun_t function.
  */
-void i8042_char_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+void i8042_char_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
 {
 	i8042_port_t *port = ddf_fun_data_get((ddf_fun_t *)arg);
Index: uspace/drv/char/msim-con/msim-con.c
===================================================================
--- uspace/drv/char/msim-con/msim-con.c	(revision eadaeae8dacc68cf558028f23cc96b90a08b7361)
+++ uspace/drv/char/msim-con/msim-con.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
@@ -41,5 +41,5 @@
 #include "msim-con.h"
 
-static void msim_con_connection(ipc_callid_t, ipc_call_t *, void *);
+static void msim_con_connection(cap_call_handle_t, ipc_call_t *, void *);
 
 static errno_t msim_con_read(chardev_srv_t *, void *, size_t, size_t *);
@@ -217,5 +217,5 @@
 
 /** Character device connection handler. */
-static void msim_con_connection(ipc_callid_t iid, ipc_call_t *icall,
+static void msim_con_connection(cap_call_handle_t iid, ipc_call_t *icall,
     void *arg)
 {
Index: uspace/drv/char/ns8250/ns8250.c
===================================================================
--- uspace/drv/char/ns8250/ns8250.c	(revision eadaeae8dacc68cf558028f23cc96b90a08b7361)
+++ uspace/drv/char/ns8250/ns8250.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
@@ -311,5 +311,5 @@
 static errno_t ns8250_open(chardev_srvs_t *, chardev_srv_t *);
 static errno_t ns8250_close(chardev_srv_t *);
-static void ns8250_default_handler(chardev_srv_t *, ipc_callid_t, ipc_call_t *);
+static void ns8250_default_handler(chardev_srv_t *, cap_call_handle_t, ipc_call_t *);
 
 /** The character interface's callbacks. */
@@ -322,5 +322,5 @@
 };
 
-static void ns8250_char_conn(ipc_callid_t, ipc_call_t *, void *);
+static void ns8250_char_conn(cap_call_handle_t, ipc_call_t *, void *);
 
 static errno_t ns8250_dev_add(ddf_dev_t *dev);
@@ -1068,5 +1068,5 @@
  * Configure the parameters of the serial communication.
  */
-static void ns8250_default_handler(chardev_srv_t *srv, ipc_callid_t callid,
+static void ns8250_default_handler(chardev_srv_t *srv, cap_call_handle_t callid,
     ipc_call_t *call)
 {
@@ -1099,5 +1099,5 @@
 }
 
-void ns8250_char_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+void ns8250_char_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
 {
 	ns8250_t *ns8250 = fun_ns8250((ddf_fun_t *)arg);
Index: uspace/drv/char/pl050/pl050.c
===================================================================
--- uspace/drv/char/pl050/pl050.c	(revision eadaeae8dacc68cf558028f23cc96b90a08b7361)
+++ uspace/drv/char/pl050/pl050.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
@@ -54,5 +54,5 @@
 static errno_t pl050_fun_online(ddf_fun_t *);
 static errno_t pl050_fun_offline(ddf_fun_t *);
-static void pl050_char_conn(ipc_callid_t, ipc_call_t *, void *);
+static void pl050_char_conn(cap_call_handle_t, ipc_call_t *, void *);
 static errno_t pl050_read(chardev_srv_t *, void *, size_t, size_t *);
 static errno_t pl050_write(chardev_srv_t *, const void *, size_t, size_t *);
@@ -286,5 +286,5 @@
 }
 
-void pl050_char_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+void pl050_char_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
 {
 	pl050_t *pl050 = pl050_from_fun((ddf_fun_t *)arg);
Index: uspace/drv/char/ski-con/ski-con.c
===================================================================
--- uspace/drv/char/ski-con/ski-con.c	(revision eadaeae8dacc68cf558028f23cc96b90a08b7361)
+++ uspace/drv/char/ski-con/ski-con.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
@@ -50,5 +50,5 @@
 static errno_t ski_con_fibril(void *arg);
 static int32_t ski_con_getchar(void);
-static void ski_con_connection(ipc_callid_t, ipc_call_t *, void *);
+static void ski_con_connection(cap_call_handle_t, ipc_call_t *, void *);
 
 static errno_t ski_con_read(chardev_srv_t *, void *, size_t, size_t *);
@@ -255,5 +255,5 @@
 
 /** Character device connection handler. */
-static void ski_con_connection(ipc_callid_t iid, ipc_call_t *icall,
+static void ski_con_connection(cap_call_handle_t iid, ipc_call_t *icall,
     void *arg)
 {
Index: uspace/drv/char/sun4v-con/sun4v-con.c
===================================================================
--- uspace/drv/char/sun4v-con/sun4v-con.c	(revision eadaeae8dacc68cf558028f23cc96b90a08b7361)
+++ uspace/drv/char/sun4v-con/sun4v-con.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
@@ -42,5 +42,5 @@
 #include "sun4v-con.h"
 
-static void sun4v_con_connection(ipc_callid_t, ipc_call_t *, void *);
+static void sun4v_con_connection(cap_call_handle_t, ipc_call_t *, void *);
 
 #define POLL_INTERVAL  10000
@@ -180,5 +180,5 @@
 
 /** Character device connection handler. */
-static void sun4v_con_connection(ipc_callid_t iid, ipc_call_t *icall,
+static void sun4v_con_connection(cap_call_handle_t iid, ipc_call_t *icall,
     void *arg)
 {
Index: uspace/drv/fb/amdm37x_dispc/main.c
===================================================================
--- uspace/drv/fb/amdm37x_dispc/main.c	(revision eadaeae8dacc68cf558028f23cc96b90a08b7361)
+++ uspace/drv/fb/amdm37x_dispc/main.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
@@ -46,5 +46,5 @@
 #define NAME  "amdm37x_dispc"
 
-static void graph_vsl_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+static void graph_vsl_connection(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
 {
 	visualizer_t *vsl;
Index: uspace/drv/fb/kfb/port.c
===================================================================
--- uspace/drv/fb/kfb/port.c	(revision eadaeae8dacc68cf558028f23cc96b90a08b7361)
+++ uspace/drv/fb/kfb/port.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
@@ -162,5 +162,5 @@
 };
 
-static void graph_vsl_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+static void graph_vsl_connection(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
 {
 	visualizer_t *vsl;
Index: uspace/drv/hid/adb-kbd/adb-kbd.c
===================================================================
--- uspace/drv/hid/adb-kbd/adb-kbd.c	(revision eadaeae8dacc68cf558028f23cc96b90a08b7361)
+++ uspace/drv/hid/adb-kbd/adb-kbd.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
@@ -43,7 +43,7 @@
 #include "ctl.h"
 
-static void adb_kbd_events(ipc_callid_t, ipc_call_t *, void *);
+static void adb_kbd_events(cap_call_handle_t, ipc_call_t *, void *);
 static void adb_kbd_reg0_data(adb_kbd_t *, uint16_t);
-static void adb_kbd_conn(ipc_callid_t, ipc_call_t *, void *);
+static void adb_kbd_conn(cap_call_handle_t, ipc_call_t *, void *);
 
 /** Add ADB keyboard device */
@@ -130,5 +130,5 @@
 }
 
-static void adb_kbd_events(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+static void adb_kbd_events(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
 {
 	adb_kbd_t *kbd = (adb_kbd_t *) arg;
@@ -138,5 +138,5 @@
 
 		ipc_call_t call;
-		ipc_callid_t callid = async_get_call(&call);
+		cap_call_handle_t callid = async_get_call(&call);
 
 		errno_t retval = EOK;
@@ -190,7 +190,7 @@
 
 /** Handle client connection */
-static void adb_kbd_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
-{
-	ipc_callid_t callid;
+static void adb_kbd_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
+{
+	cap_call_handle_t callid;
 	ipc_call_t call;
 	sysarg_t method;
Index: uspace/drv/hid/adb-mouse/adb-mouse.c
===================================================================
--- uspace/drv/hid/adb-mouse/adb-mouse.c	(revision eadaeae8dacc68cf558028f23cc96b90a08b7361)
+++ uspace/drv/hid/adb-mouse/adb-mouse.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
@@ -41,5 +41,5 @@
 #include "adb-mouse.h"
 
-static void adb_mouse_conn(ipc_callid_t, ipc_call_t *, void *);
+static void adb_mouse_conn(cap_call_handle_t, ipc_call_t *, void *);
 
 static void adb_mouse_event_button(adb_mouse_t *mouse, int bnum, int bpress)
@@ -88,5 +88,5 @@
 }
 
-static void adb_mouse_events(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+static void adb_mouse_events(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
 {
 	adb_mouse_t *mouse = (adb_mouse_t *) arg;
@@ -95,5 +95,5 @@
 	while (true) {
 		ipc_call_t call;
-		ipc_callid_t callid = async_get_call(&call);
+		cap_call_handle_t callid = async_get_call(&call);
 
 		errno_t retval = EOK;
@@ -200,7 +200,7 @@
 
 /** Handle client connection */
-static void adb_mouse_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
-{
-	ipc_callid_t callid;
+static void adb_mouse_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
+{
+	cap_call_handle_t callid;
 	ipc_call_t call;
 	sysarg_t method;
Index: uspace/drv/hid/atkbd/atkbd.c
===================================================================
--- uspace/drv/hid/atkbd/atkbd.c	(revision eadaeae8dacc68cf558028f23cc96b90a08b7361)
+++ uspace/drv/hid/atkbd/atkbd.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
@@ -298,5 +298,5 @@
  */
 static void default_connection_handler(ddf_fun_t *fun,
-    ipc_callid_t icallid, ipc_call_t *icall)
+    cap_call_handle_t icallid, ipc_call_t *icall)
 {
 	const sysarg_t method = IPC_GET_IMETHOD(*icall);
Index: uspace/drv/hid/ps2mouse/ps2mouse.c
===================================================================
--- uspace/drv/hid/ps2mouse/ps2mouse.c	(revision eadaeae8dacc68cf558028f23cc96b90a08b7361)
+++ uspace/drv/hid/ps2mouse/ps2mouse.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
@@ -104,5 +104,5 @@
 static errno_t polling_intellimouse(void *);
 static errno_t probe_intellimouse(ps2_mouse_t *, bool);
-static void default_connection_handler(ddf_fun_t *, ipc_callid_t, ipc_call_t *);
+static void default_connection_handler(ddf_fun_t *, cap_call_handle_t, ipc_call_t *);
 
 /** ps/2 mouse driver ops. */
@@ -404,5 +404,5 @@
  */
 void default_connection_handler(ddf_fun_t *fun,
-    ipc_callid_t icallid, ipc_call_t *icall)
+    cap_call_handle_t icallid, ipc_call_t *icall)
 {
 	const sysarg_t method = IPC_GET_IMETHOD(*icall);
Index: uspace/drv/hid/usbhid/kbd/kbddev.c
===================================================================
--- uspace/drv/hid/usbhid/kbd/kbddev.c	(revision eadaeae8dacc68cf558028f23cc96b90a08b7361)
+++ uspace/drv/hid/usbhid/kbd/kbddev.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
@@ -72,5 +72,5 @@
 #include "../usbhid.h"
 
-static void default_connection_handler(ddf_fun_t *, ipc_callid_t, ipc_call_t *);
+static void default_connection_handler(ddf_fun_t *, cap_call_handle_t, ipc_call_t *);
 static ddf_dev_ops_t kbdops = { .default_handler = default_connection_handler };
 
@@ -161,5 +161,5 @@
  */
 static void default_connection_handler(ddf_fun_t *fun,
-    ipc_callid_t icallid, ipc_call_t *icall)
+    cap_call_handle_t icallid, ipc_call_t *icall)
 {
 	const sysarg_t method = IPC_GET_IMETHOD(*icall);
Index: uspace/drv/hid/usbhid/mouse/mousedev.c
===================================================================
--- uspace/drv/hid/usbhid/mouse/mousedev.c	(revision eadaeae8dacc68cf558028f23cc96b90a08b7361)
+++ uspace/drv/hid/usbhid/mouse/mousedev.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
@@ -55,5 +55,5 @@
 #define NAME "mouse"
 
-static void default_connection_handler(ddf_fun_t *, ipc_callid_t, ipc_call_t *);
+static void default_connection_handler(ddf_fun_t *, cap_call_handle_t, ipc_call_t *);
 
 static ddf_dev_ops_t ops = { .default_handler = default_connection_handler };
@@ -114,5 +114,5 @@
  */
 static void default_connection_handler(ddf_fun_t *fun,
-    ipc_callid_t icallid, ipc_call_t *icall)
+    cap_call_handle_t icallid, ipc_call_t *icall)
 {
 	usb_mouse_t *mouse_dev = ddf_fun_data_get(fun);
Index: uspace/drv/hid/usbhid/multimedia/multimedia.c
===================================================================
--- uspace/drv/hid/usbhid/multimedia/multimedia.c	(revision eadaeae8dacc68cf558028f23cc96b90a08b7361)
+++ uspace/drv/hid/usbhid/multimedia/multimedia.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
@@ -85,5 +85,5 @@
  */
 static void default_connection_handler(ddf_fun_t *fun,
-    ipc_callid_t icallid, ipc_call_t *icall)
+    cap_call_handle_t icallid, ipc_call_t *icall)
 {
 	usb_log_debug(NAME " default_connection_handler()");
Index: uspace/drv/hid/xtkbd/xtkbd.c
===================================================================
--- uspace/drv/hid/xtkbd/xtkbd.c	(revision eadaeae8dacc68cf558028f23cc96b90a08b7361)
+++ uspace/drv/hid/xtkbd/xtkbd.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
@@ -334,5 +334,5 @@
  */
 static void default_connection_handler(ddf_fun_t *fun,
-    ipc_callid_t icallid, ipc_call_t *icall)
+    cap_call_handle_t icallid, ipc_call_t *icall)
 {
 	const sysarg_t method = IPC_GET_IMETHOD(*icall);
Index: uspace/drv/intctl/apic/apic.c
===================================================================
--- uspace/drv/intctl/apic/apic.c	(revision eadaeae8dacc68cf558028f23cc96b90a08b7361)
+++ uspace/drv/intctl/apic/apic.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
@@ -164,7 +164,7 @@
  * @param arg	Local argument.
  */
-static void apic_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
-{
-	ipc_callid_t callid;
+static void apic_connection(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
+{
+	cap_call_handle_t callid;
 	ipc_call_t call;
 	apic_t *apic;
Index: uspace/drv/intctl/i8259/i8259.c
===================================================================
--- uspace/drv/intctl/i8259/i8259.c	(revision eadaeae8dacc68cf558028f23cc96b90a08b7361)
+++ uspace/drv/intctl/i8259/i8259.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
@@ -93,7 +93,7 @@
  * @param arg	Local argument.
  */
-static void i8259_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
-{
-	ipc_callid_t callid;
+static void i8259_connection(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
+{
+	cap_call_handle_t callid;
 	ipc_call_t call;
 	i8259_t *i8259 = NULL /* XXX */;
Index: uspace/drv/intctl/icp-ic/icp-ic.c
===================================================================
--- uspace/drv/intctl/icp-ic/icp-ic.c	(revision eadaeae8dacc68cf558028f23cc96b90a08b7361)
+++ uspace/drv/intctl/icp-ic/icp-ic.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
@@ -69,7 +69,7 @@
  * @param arg	Local argument.
  */
-static void icpic_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+static void icpic_connection(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
 {
-	ipc_callid_t callid;
+	cap_call_handle_t callid;
 	ipc_call_t call;
 	icpic_t *icpic;
Index: uspace/drv/intctl/obio/obio.c
===================================================================
--- uspace/drv/intctl/obio/obio.c	(revision eadaeae8dacc68cf558028f23cc96b90a08b7361)
+++ uspace/drv/intctl/obio/obio.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
@@ -73,7 +73,7 @@
  * @param arg		Local argument.
  */
-static void obio_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+static void obio_connection(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
 {
-	ipc_callid_t callid;
+	cap_call_handle_t callid;
 	ipc_call_t call;
 	obio_t *obio;