diff --git a/libmaxsi/error.cpp b/libmaxsi/error.cpp
index 49faec2c..a48ab409 100644
--- a/libmaxsi/error.cpp
+++ b/libmaxsi/error.cpp
@@ -36,7 +36,7 @@ namespace Maxsi
 		extern "C" { int errno = 0; }
 
 #ifndef SORTIX_KERNEL
-		DEFN_SYSCALL1(int, SysRegisterErrno, 28, int*);
+		DEFN_SYSCALL1(int, SysRegisterErrno, SYSCALL_REGISTER_ERRNO, int*);
 
 		extern "C" void init_error_functions()
 		{
diff --git a/libmaxsi/hsrc/syscall.h b/libmaxsi/hsrc/syscall.h
index 437a83ab..2235f496 100644
--- a/libmaxsi/hsrc/syscall.h
+++ b/libmaxsi/hsrc/syscall.h
@@ -31,6 +31,8 @@
 #ifndef LIBMAXSI_SYSCALL_H
 #define LIBMAXSI_SYSCALL_H
 
+#include <sortix/syscallnum.h>
+
 namespace Maxsi
 {
 	#define DECL_SYSCALL0(type,fn) type fn();
diff --git a/libmaxsi/io.cpp b/libmaxsi/io.cpp
index a7318240..8ed2eeb6 100644
--- a/libmaxsi/io.cpp
+++ b/libmaxsi/io.cpp
@@ -36,18 +36,18 @@
 
 namespace Maxsi
 {
-	DEFN_SYSCALL1(size_t, SysPrint, 4, const char*);
-	DEFN_SYSCALL3(ssize_t, SysRead, 18, int, void*, size_t);
-	DEFN_SYSCALL3(ssize_t, SysWrite, 19, int, const void*, size_t);
-	DEFN_SYSCALL1(int, SysPipe, 20, int*);
-	DEFN_SYSCALL1(int, SysClose, 21, int);
-	DEFN_SYSCALL1(int, SysDup, 22, int);
-	DEFN_SYSCALL3(int, SysOpen, 23, const char*, int, mode_t);
-	DEFN_SYSCALL3(int, SysReadDirEnts, 24, int, struct sortix_dirent*, size_t);
-	DEFN_SYSCALL1(int, SysChDir, 25, const char*);
-	DEFN_SYSCALL2(char*, SysGetCWD, 26, char*, size_t);
-	DEFN_SYSCALL1(int, SysUnlink, 27, const char*);
-	DEFN_SYSCALL1(int, SysIsATTY, 33, int);
+	DEFN_SYSCALL1(size_t, SysPrint, SYSCALL_PRINT_STRING, const char*);
+	DEFN_SYSCALL3(ssize_t, SysRead, SYSCALL_READ, int, void*, size_t);
+	DEFN_SYSCALL3(ssize_t, SysWrite, SYSCALL_WRITE, int, const void*, size_t);
+	DEFN_SYSCALL1(int, SysPipe, SYSCALL_PIPE, int*);
+	DEFN_SYSCALL1(int, SysClose, SYSCALL_CLOSE, int);
+	DEFN_SYSCALL1(int, SysDup, SYSCALL_DUP, int);
+	DEFN_SYSCALL3(int, SysOpen, SYSCALL_OPEN, const char*, int, mode_t);
+	DEFN_SYSCALL3(int, SysReadDirEnts, SYSCALL_READDIRENTS, int, struct sortix_dirent*, size_t);
+	DEFN_SYSCALL1(int, SysChDir, SYSCALL_CHDIR, const char*);
+	DEFN_SYSCALL2(char*, SysGetCWD, SYSCALL_GETCWD, char*, size_t);
+	DEFN_SYSCALL1(int, SysUnlink, SYSCALL_UNLINK, const char*);
+	DEFN_SYSCALL1(int, SysIsATTY, SYSCALL_ISATTY, int);
 
 	size_t Print(const char* string)
 	{
diff --git a/libmaxsi/memory.cpp b/libmaxsi/memory.cpp
index 4d763cf0..d2a2e47d 100644
--- a/libmaxsi/memory.cpp
+++ b/libmaxsi/memory.cpp
@@ -34,7 +34,7 @@ namespace Maxsi
 	namespace Memory
 	{
 #ifndef SORTIX_KERNEL
-		DEFN_SYSCALL2(int, SysMemStat, 32, size_t*, size_t*);
+		DEFN_SYSCALL2(int, SysMemStat, SYSCALL_MEMSTAT, size_t*, size_t*);
 
 		extern "C" int memstat(size_t* memused, size_t* memtotal)
 		{
diff --git a/libmaxsi/process.cpp b/libmaxsi/process.cpp
index 9d1315a1..4dd874a9 100644
--- a/libmaxsi/process.cpp
+++ b/libmaxsi/process.cpp
@@ -30,12 +30,12 @@ namespace Maxsi
 {
 	namespace Process
 	{
-		DEFN_SYSCALL1_VOID(SysExit, 1, int);
-		DEFN_SYSCALL4(int, SysExecVE, 10, const char*, int, char* const*, char* const*);
-		DEFN_SYSCALL0(pid_t, SysFork, 12);
-		DEFN_SYSCALL0(pid_t, SysGetPID, 13);
-		DEFN_SYSCALL0(pid_t, SysGetParentPID, 14);
-		DEFN_SYSCALL3(pid_t, SysWait, 17, pid_t, int*, int);
+		DEFN_SYSCALL1_VOID(SysExit, SYSCALL_EXIT, int);
+		DEFN_SYSCALL4(int, SysExecVE, SYSCALL_EXEC, const char*, int, char* const*, char* const*);
+		DEFN_SYSCALL0(pid_t, SysFork, SYSCALL_FORK);
+		DEFN_SYSCALL0(pid_t, SysGetPID, SYSCALL_GETPID);
+		DEFN_SYSCALL0(pid_t, SysGetParentPID, SYSCALL_GETPPID);
+		DEFN_SYSCALL3(pid_t, SysWait, SYSCALL_WAIT, pid_t, int*, int);
 
 		int Execute(const char* filepath, int argc, const char** argv)
 		{
diff --git a/libmaxsi/signal.cpp b/libmaxsi/signal.cpp
index 4c09889a..a482c312 100644
--- a/libmaxsi/signal.cpp
+++ b/libmaxsi/signal.cpp
@@ -93,9 +93,9 @@ namespace Maxsi
 			}
 		}
 
-		DEFN_SYSCALL1_VOID(SysRegisterSignalHandler, 29, sighandler_t);
-		DEFN_SYSCALL0_VOID(SysSigReturn, 30);
-		DEFN_SYSCALL2(int, SysKill, 31, pid_t, int);
+		DEFN_SYSCALL1_VOID(SysRegisterSignalHandler, SYSCALL_REGISTER_SIGNAL_HANDLER, sighandler_t);
+		DEFN_SYSCALL0_VOID(SysSigReturn, SYSCALL_SIGRETURN);
+		DEFN_SYSCALL2(int, SysKill, SYSCALL_KILL, pid_t, int);
 
 		void Init()
 		{
diff --git a/libmaxsi/sortix-keyboard.cpp b/libmaxsi/sortix-keyboard.cpp
index 619d0b0b..2b6d56db 100644
--- a/libmaxsi/sortix-keyboard.cpp
+++ b/libmaxsi/sortix-keyboard.cpp
@@ -30,7 +30,7 @@ namespace System
 {
 	namespace Keyboard
 	{
-		DEFN_SYSCALL1(uint32_t, SysReceiveKeystroke, 8, unsigned);
+		DEFN_SYSCALL1(uint32_t, SysReceiveKeystroke, SYSCALL_RECEIVE_KEYSTROKE, unsigned);
 
 		uint32_t ReceiveKeystroke(unsigned method)
 		{
diff --git a/libmaxsi/sortix-sound.cpp b/libmaxsi/sortix-sound.cpp
index b0b286d5..65f43e58 100644
--- a/libmaxsi/sortix-sound.cpp
+++ b/libmaxsi/sortix-sound.cpp
@@ -31,7 +31,7 @@ namespace System
 {
 	namespace Sound
 	{
-		DEFN_SYSCALL1_VOID(SysSetFrequency, 9, unsigned);
+		DEFN_SYSCALL1_VOID(SysSetFrequency, SYSCALL_SET_FREQUENCY, unsigned);
 
 		void SetFrequency(unsigned frequency)
 		{
diff --git a/libmaxsi/thread.cpp b/libmaxsi/thread.cpp
index 31e85c7b..c2ebdf43 100644
--- a/libmaxsi/thread.cpp
+++ b/libmaxsi/thread.cpp
@@ -39,9 +39,9 @@ namespace Maxsi
 	{
 		typedef void (*SysEntry)(size_t, Entry, void*);
 		DEFN_SYSCALL4(size_t, SysCreate, 0, SysEntry, Entry, const void*, size_t);
-		DEFN_SYSCALL1_VOID(SysExit, 1, const void*);
-		DEFN_SYSCALL1_VOID(SysSleep, 2, long);
-		DEFN_SYSCALL1_VOID(SysUSleep, 3, long);
+		DEFN_SYSCALL1_VOID(SysExit, SYSCALL_EXIT, const void*);
+		DEFN_SYSCALL1_VOID(SysSleep, SYSCALL_SLEEP, long);
+		DEFN_SYSCALL1_VOID(SysUSleep, SYSCALL_USLEEP, long);
 
 		void Exit(const void* Result)
 		{
diff --git a/libmaxsi/time.cpp b/libmaxsi/time.cpp
index 22249da2..e40c9cc9 100644
--- a/libmaxsi/time.cpp
+++ b/libmaxsi/time.cpp
@@ -31,7 +31,7 @@ namespace Maxsi
 {
 	namespace Time
 	{
-		DEFN_SYSCALL1(int, SysUptime, 34, uintmax_t*);
+		DEFN_SYSCALL1(int, SysUptime, SYSCALL_UPTIME, uintmax_t*);
 
 		extern "C" int uptime(uintmax_t* usecssinceboot)
 		{