Index: uspace/lib/libc/include/libc.h
===================================================================
--- uspace/lib/libc/include/libc.h	(revision 0993087d21ce36c0447d19abc526a783b55a4242)
+++ uspace/lib/libc/include/libc.h	(revision 06d6505554331ae47f6a3959591e0b217bac938f)
@@ -40,12 +40,12 @@
 #include <libarch/syscall.h>
 
-#define __SYSCALL0(id) __syscall(0, 0, 0, 0, 0, 0, id)
-#define __SYSCALL1(id, p1) __syscall(p1, 0, 0, 0, 0, 0, id)
-#define __SYSCALL2(id, p1, p2) __syscall(p1, p2, 0, 0, 0, 0, id)
-#define __SYSCALL3(id, p1, p2, p3) __syscall(p1, p2, p3, 0, 0, 0, id)
-#define __SYSCALL4(id, p1, p2, p3, p4) __syscall(p1, p2, p3, p4, 0, 0, id)
-#define __SYSCALL5(id, p1, p2, p3, p4, p5) __syscall(p1, p2, p3, p4, p5, 0, id)
+#define __SYSCALL0(id) __syscall0(0, 0, 0, 0, 0, 0, id)
+#define __SYSCALL1(id, p1) __syscall1(p1, 0, 0, 0, 0, 0, id)
+#define __SYSCALL2(id, p1, p2) __syscall2(p1, p2, 0, 0, 0, 0, id)
+#define __SYSCALL3(id, p1, p2, p3) __syscall3(p1, p2, p3, 0, 0, 0, id)
+#define __SYSCALL4(id, p1, p2, p3, p4) __syscall4(p1, p2, p3, p4, 0, 0, id)
+#define __SYSCALL5(id, p1, p2, p3, p4, p5) __syscall5(p1, p2, p3, p4, p5, 0, id)
 #define __SYSCALL6(id, p1, p2, p3, p4, p5, p6) \
-    __syscall(p1, p2, p3, p4, p5, p6,id)
+    __syscall6(p1, p2, p3, p4, p5, p6, id)
 
 extern void __main(void *pcb_ptr);
Index: uspace/lib/libc/include/syscall.h
===================================================================
--- uspace/lib/libc/include/syscall.h	(revision 0993087d21ce36c0447d19abc526a783b55a4242)
+++ uspace/lib/libc/include/syscall.h	(revision 06d6505554331ae47f6a3959591e0b217bac938f)
@@ -33,5 +33,6 @@
  * @file
  * @brief	Syscall function declaration for architectures that don't
- *		inline syscalls.
+ *		inline syscalls or architectures that handle syscalls
+ *		according to the number of arguments.
  */
 
@@ -39,6 +40,18 @@
 #define LIBC_SYSCALL_H_
 
+#ifndef	LIBARCH_SYSCALL_GENERIC
+#error "You can't include this file directly."
+#endif
+
 #include <sys/types.h>
 #include <kernel/syscall/syscall.h>
+
+#define __syscall0	__syscall
+#define __syscall1	__syscall
+#define __syscall2	__syscall
+#define __syscall3	__syscall
+#define __syscall4	__syscall
+#define __syscall5	__syscall
+#define __syscall6	__syscall
 
 extern sysarg_t __syscall(const sysarg_t p1, const sysarg_t p2,