Index: kernel/generic/include/ipc/sysipc.h
===================================================================
--- kernel/generic/include/ipc/sysipc.h	(revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88)
+++ kernel/generic/include/ipc/sysipc.h	(revision 3ca343045c94c938e60da0bd8a09c6dd6aabb9cf)
@@ -40,26 +40,34 @@
 #include <typedefs.h>
 
-extern sysarg_t sys_ipc_call_sync_fast(sysarg_t phoneid, sysarg_t method, 
-    sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, ipc_data_t *data);
-extern sysarg_t sys_ipc_call_sync_slow(sysarg_t phoneid, ipc_data_t *question,
-    ipc_data_t *reply);
-extern sysarg_t sys_ipc_call_async_fast(sysarg_t phoneid, sysarg_t method, 
-    sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t arg4);
-extern sysarg_t sys_ipc_call_async_slow(sysarg_t phoneid, ipc_data_t *data);
-extern sysarg_t sys_ipc_answer_fast(sysarg_t callid, sysarg_t retval, 
-    sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t arg4);
-extern sysarg_t sys_ipc_answer_slow(sysarg_t callid, ipc_data_t *data);
-extern sysarg_t sys_ipc_wait_for_call(ipc_data_t *calldata, uint32_t usec,
-    unsigned int nonblocking);
+extern sysarg_t sys_ipc_call_sync_fast(sysarg_t, sysarg_t, sysarg_t,
+    sysarg_t, sysarg_t, ipc_data_t *);
+extern sysarg_t sys_ipc_call_sync_slow(sysarg_t, ipc_data_t *, ipc_data_t *);
+extern sysarg_t sys_ipc_call_async_fast(sysarg_t, sysarg_t, sysarg_t,
+    sysarg_t, sysarg_t, sysarg_t);
+extern sysarg_t sys_ipc_call_async_slow(sysarg_t, ipc_data_t *);
+extern sysarg_t sys_ipc_answer_fast(sysarg_t, sysarg_t, sysarg_t, sysarg_t,
+    sysarg_t, sysarg_t);
+extern sysarg_t sys_ipc_answer_slow(sysarg_t, ipc_data_t *);
+extern sysarg_t sys_ipc_wait_for_call(ipc_data_t *, uint32_t, unsigned int);
 extern sysarg_t sys_ipc_poke(void);
-extern sysarg_t sys_ipc_forward_fast(sysarg_t callid, sysarg_t phoneid,
-    sysarg_t method, sysarg_t arg1, sysarg_t arg2, unsigned int mode);
-extern sysarg_t sys_ipc_forward_slow(sysarg_t callid, sysarg_t phoneid,
-    ipc_data_t *data, unsigned int mode);
-extern sysarg_t sys_ipc_hangup(sysarg_t phoneid);
-extern sysarg_t sys_ipc_register_irq(inr_t inr, devno_t devno, sysarg_t method,
-    irq_code_t *ucode);
-extern sysarg_t sys_ipc_unregister_irq(inr_t inr, devno_t devno);
-extern sysarg_t sys_ipc_connect_kbox(sysarg64_t *task_id);
+extern sysarg_t sys_ipc_forward_fast(sysarg_t, sysarg_t, sysarg_t, sysarg_t,
+    sysarg_t, unsigned int);
+extern sysarg_t sys_ipc_forward_slow(sysarg_t, sysarg_t, ipc_data_t *,
+    unsigned int);
+extern sysarg_t sys_ipc_hangup(sysarg_t);
+extern sysarg_t sys_ipc_register_irq(inr_t, devno_t, sysarg_t, irq_code_t *);
+extern sysarg_t sys_ipc_unregister_irq(inr_t, devno_t);
+
+#ifdef __32_BITS__
+
+extern sysarg_t sys_ipc_connect_kbox(sysarg64_t *);
+
+#endif  /* __32_BITS__ */
+
+#ifdef __64_BITS__
+
+extern sysarg_t sys_ipc_connect_kbox(sysarg_t);
+
+#endif  /* __64_BITS__ */
 
 #endif