2 files changed, 17 insertions, 14 deletions
diff --git a/src/sys/include/compat/unix/syscall.h b/src/sys/include/compat/unix/syscall.h
index a3e7257..88c86ba 100644
--- a/src/sys/include/compat/unix/syscall.h
+++ b/src/sys/include/compat/unix/syscall.h
@@ -35,17 +35,6 @@
 #include <sys/syscall.h>
 
 /*
- * Default syscall numbers
- *
- * Defines marked as (mandatory) must be implemented
- * between latches.
- */
-#define SYS_none    0x00
-#define SYS_exit    0x01
-#define SYS_write   0x02
-#define SYS_cross   0x03    /* cross a border (mandatory) */
-
-/*
  * Exit the current process - exit(2) syscall
  */
 scret_t sys_exit(struct syscall_args *scargs);
diff --git a/src/sys/include/sys/syscall.h b/src/sys/include/sys/syscall.h
index 9d9c765..3f8ab10 100644
--- a/src/sys/include/sys/syscall.h
+++ b/src/sys/include/sys/syscall.h
@@ -32,6 +32,23 @@
 
 #include <sys/types.h>
 #include <sys/limits.h>
+#if !defined(_KERNEL)
+#include <machine/syscall.h>
+#endif  /* _!KERNEL */
+
+/*
+ * Default syscall numbers
+ *
+ * Defines marked as (mandatory) must be implemented
+ * between latches.
+ */
+#define SYS_none    0x00
+#define SYS_exit    0x01
+#define SYS_write   0x02
+#define SYS_cross   0x03    /* cross a border (mandatory) */
+
+typedef __ssize_t scret_t;
+typedef __ssize_t scarg_t;
 
 #if defined(_KERNEL)
 /*
@@ -39,9 +56,6 @@
  */
 #define SCARG(SCARGS, TYPE, SYSNO) ((TYPE)(SCARGS)->arg[(SYSNO)])
 
-typedef ssize_t scret_t;
-typedef ssize_t scarg_t;
-
 struct syscall_args {
     scarg_t arg[6];
     struct trapframe *tf;