Index: generic/include/syscall/syscall.h
===================================================================
--- generic/include/syscall/syscall.h	(revision 204674ee3e573dfb433faf3ebf3f3faf43f34ed7)
+++ generic/include/syscall/syscall.h	(revision 25d77096d63abbb97d50a9cafaf9e3e5379a6f5d)
@@ -30,18 +30,23 @@
 #define __SYSCALL_H__
 
-#include <typedefs.h>
-
 typedef enum {
 	SYS_CTL = 0,
 	SYS_IO	= 1,
+	SYS_IPC_CALL = 2,
+	SYS_IPC_ANSWER = 3,
+	SYS_IPC_WAIT = 4,
 	SYSCALL_END
 } syscall_t;
 
-typedef int (*syshandler_t)();
+#ifdef KERNEL
 
-extern int sys_ctl(void);
-extern int sys_io(int fd, const void *buf, size_t count);
+#include <arch/types.h>
+#include <typedefs.h>
+
+typedef __native (*syshandler_t)();
 
 extern syshandler_t syscall_table[SYSCALL_END];
 
 #endif
+
+#endif