Index: uspace/lib/c/include/async.h
===================================================================
--- uspace/lib/c/include/async.h	(revision 55b56f4f973ad09f0bdbf190d1197e8c4ed8ef6a)
+++ uspace/lib/c/include/async.h	(revision 7ce8f88458eea459468815602e6a2e7f77b39bac)
@@ -146,6 +146,6 @@
     sysarg_t, sysarg_t, sysarg_t, ipc_call_t *);
 
-extern void async_wait_for(aid_t, sysarg_t *);
-extern int async_wait_timeout(aid_t, sysarg_t *, suseconds_t);
+extern void async_wait_for(aid_t, int *);
+extern int async_wait_timeout(aid_t, int *, suseconds_t);
 extern void async_forget(aid_t);
 
@@ -198,12 +198,12 @@
  */
 
-extern sysarg_t async_answer_0(cap_handle_t, sysarg_t);
-extern sysarg_t async_answer_1(cap_handle_t, sysarg_t, sysarg_t);
-extern sysarg_t async_answer_2(cap_handle_t, sysarg_t, sysarg_t, sysarg_t);
-extern sysarg_t async_answer_3(cap_handle_t, sysarg_t, sysarg_t, sysarg_t,
+extern int async_answer_0(cap_handle_t, int);
+extern int async_answer_1(cap_handle_t, int, sysarg_t);
+extern int async_answer_2(cap_handle_t, int, sysarg_t, sysarg_t);
+extern int async_answer_3(cap_handle_t, int, sysarg_t, sysarg_t,
     sysarg_t);
-extern sysarg_t async_answer_4(cap_handle_t, sysarg_t, sysarg_t, sysarg_t,
+extern int async_answer_4(cap_handle_t, int, sysarg_t, sysarg_t,
     sysarg_t, sysarg_t);
-extern sysarg_t async_answer_5(cap_handle_t, sysarg_t, sysarg_t, sysarg_t,
+extern int async_answer_5(cap_handle_t, int, sysarg_t, sysarg_t,
     sysarg_t, sysarg_t, sysarg_t);
 
@@ -338,8 +338,8 @@
 	    rc3, rc4, rc5)
 
-extern sysarg_t async_req_fast(async_exch_t *, sysarg_t, sysarg_t, sysarg_t,
+extern int async_req_fast(async_exch_t *, sysarg_t, sysarg_t, sysarg_t,
     sysarg_t, sysarg_t, sysarg_t *, sysarg_t *, sysarg_t *, sysarg_t *,
     sysarg_t *);
-extern sysarg_t async_req_slow(async_exch_t *, sysarg_t, sysarg_t, sysarg_t,
+extern int async_req_slow(async_exch_t *, sysarg_t, sysarg_t, sysarg_t,
     sysarg_t, sysarg_t, sysarg_t, sysarg_t *, sysarg_t *, sysarg_t *,
     sysarg_t *, sysarg_t *);
@@ -468,5 +468,5 @@
 extern int async_data_write_accept(void **, const bool, const size_t,
     const size_t, const size_t, size_t *);
-extern void async_data_write_void(sysarg_t);
+extern void async_data_write_void(int);
 
 extern int async_data_write_forward_fast(async_exch_t *, sysarg_t, sysarg_t,
Index: uspace/lib/c/include/ipc/ipc.h
===================================================================
--- uspace/lib/c/include/ipc/ipc.h	(revision 55b56f4f973ad09f0bdbf190d1197e8c4ed8ef6a)
+++ uspace/lib/c/include/ipc/ipc.h	(revision 7ce8f88458eea459468815602e6a2e7f77b39bac)
@@ -78,7 +78,7 @@
 	    (arg5))
 
-extern sysarg_t ipc_answer_fast(cap_handle_t, sysarg_t, sysarg_t, sysarg_t,
+extern int ipc_answer_fast(cap_handle_t, int, sysarg_t, sysarg_t,
     sysarg_t, sysarg_t);
-extern sysarg_t ipc_answer_slow(cap_handle_t, sysarg_t, sysarg_t, sysarg_t,
+extern int ipc_answer_slow(cap_handle_t, int, sysarg_t, sysarg_t,
     sysarg_t, sysarg_t, sysarg_t);