Index: uspace/lib/c/include/io/chardev_srv.h
===================================================================
--- uspace/lib/c/include/io/chardev_srv.h	(revision a35b458e9db1ca95e679799dc7c1b12c83359ca3)
+++ uspace/lib/c/include/io/chardev_srv.h	(revision 064e0fd3dd59d9aa7137ab66a590344cd891fddd)
@@ -61,10 +61,10 @@
 	errno_t (*read)(chardev_srv_t *, void *, size_t, size_t *);
 	errno_t (*write)(chardev_srv_t *, const void *, size_t, size_t *);
-	void (*def_handler)(chardev_srv_t *, ipc_callid_t, ipc_call_t *);
+	void (*def_handler)(chardev_srv_t *, cap_call_handle_t, ipc_call_t *);
 };
 
 extern void chardev_srvs_init(chardev_srvs_t *);
 
-extern errno_t chardev_conn(ipc_callid_t, ipc_call_t *, chardev_srvs_t *);
+extern errno_t chardev_conn(cap_call_handle_t, ipc_call_t *, chardev_srvs_t *);
 
 #endif
Index: uspace/lib/c/include/io/con_srv.h
===================================================================
--- uspace/lib/c/include/io/con_srv.h	(revision a35b458e9db1ca95e679799dc7c1b12c83359ca3)
+++ uspace/lib/c/include/io/con_srv.h	(revision 064e0fd3dd59d9aa7137ab66a590344cd891fddd)
@@ -87,5 +87,5 @@
 extern void con_srvs_init(con_srvs_t *);
 
-extern errno_t con_conn(ipc_callid_t, ipc_call_t *, con_srvs_t *);
+extern errno_t con_conn(cap_call_handle_t, ipc_call_t *, con_srvs_t *);
 
 #endif