Index: generic/include/ipc/ipc.h
===================================================================
--- generic/include/ipc/ipc.h	(revision 84977110e48d0fb14137dbbd48504fcb1840984a)
+++ generic/include/ipc/ipc.h	(revision 125e9443d523f71aa23ce4cf31996b4c7a54ad2c)
@@ -45,7 +45,4 @@
 #define IPC_CALL_CONN_ME_TO     (1<<4) /* Identify connect_me_to */
 #define IPC_CALL_NOTIF          (1<<5) /* Interrupt notification */
-
-/* Flags for ipc_wait_for_call */
-#define IPC_WAIT_NONBLOCKING   1
 
 /* Flags of callid (the addresses are aligned at least to 4, 
@@ -201,5 +198,5 @@
 
 extern void ipc_init(void);
-extern call_t * ipc_wait_for_call(answerbox_t *box, int flags);
+extern call_t * ipc_wait_for_call(answerbox_t *box, __u32 usec, int nonblocking);
 extern void ipc_answer(answerbox_t *box, call_t *request);
 extern int ipc_call(phone_t *phone, call_t *call);
@@ -217,5 +214,4 @@
 extern void ipc_backsend_err(phone_t *phone, call_t *call, __native err);
 
-
 extern answerbox_t *ipc_phone_0;
 
Index: generic/include/ipc/sysipc.h
===================================================================
--- generic/include/ipc/sysipc.h	(revision 84977110e48d0fb14137dbbd48504fcb1840984a)
+++ generic/include/ipc/sysipc.h	(revision 125e9443d523f71aa23ce4cf31996b4c7a54ad2c)
@@ -32,4 +32,5 @@
 #include <ipc/ipc.h>
 #include <ipc/irq.h>
+#include <arch/types.h>
 
 __native sys_ipc_call_sync_fast(__native phoneid, __native method, 
@@ -43,5 +44,5 @@
 			     __native arg1, __native arg2);
 __native sys_ipc_answer(__native callid, ipc_data_t *data);
-__native sys_ipc_wait_for_call(ipc_data_t *calldata, __native flags);
+__native sys_ipc_wait_for_call(ipc_data_t *calldata, __u32 usec, int nonblocking);
 __native sys_ipc_forward_fast(__native callid, __native phoneid,
 			      __native method, __native arg1);