Index: uspace/lib/c/include/ipc/common.h
===================================================================
--- uspace/lib/c/include/ipc/common.h	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
+++ uspace/lib/c/include/ipc/common.h	(revision 6deb2cdd4f9ffa23e068faa9b3d977ec3399c1ed)
@@ -52,4 +52,5 @@
 	unsigned flags;
 	struct async_call *label;
+	cap_handle_t cap_handle;
 } ipc_call_t;
 
Index: uspace/lib/c/include/ipc/ipc.h
===================================================================
--- uspace/lib/c/include/ipc/ipc.h	(revision 38d150e6238ab44c861f6486e46454e07caeb0f0)
+++ uspace/lib/c/include/ipc/ipc.h	(revision 6deb2cdd4f9ffa23e068faa9b3d977ec3399c1ed)
@@ -48,5 +48,5 @@
 typedef void (*ipc_async_callback_t)(void *, int, ipc_call_t *);
 
-extern cap_handle_t ipc_wait_cycle(ipc_call_t *, sysarg_t, unsigned int);
+extern int ipc_wait_cycle(ipc_call_t *, sysarg_t, unsigned int);
 extern void ipc_poke(void);
 
@@ -54,6 +54,6 @@
 	ipc_wait_for_call_timeout(data, SYNCH_NO_TIMEOUT);
 
-extern cap_handle_t ipc_wait_for_call_timeout(ipc_call_t *, sysarg_t);
-extern cap_handle_t ipc_trywait_for_call(ipc_call_t *);
+extern int ipc_wait_for_call_timeout(ipc_call_t *, sysarg_t);
+extern int ipc_trywait_for_call(ipc_call_t *);
 
 /*