7 files changed, 7 insertions, 15 deletions
diff --git a/arch/x86_64/lib/object.c b/arch/x86_64/lib/object.c
index 43d490f..f028454 100644
--- a/arch/x86_64/lib/object.c
+++ b/arch/x86_64/lib/object.c
@@ -1,5 +1,5 @@
 #include "object.h"
-#include "error.h"
+#include "api/error.h"
 #include "device/processor.h"
 #include "arch/x86_64/processor.h"
 #include "arch/x86_64/page.h"
diff --git a/arch/x86_64/memory/message.c b/arch/x86_64/memory/message.c
deleted file mode 100644
index d5bedb7..0000000
--- a/arch/x86_64/memory/message.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <object.h>
-#include <stddef.h>
-#include <error.h>
-#include <device/processor.h>
-#include "arch/x86_64/page.h"
-#include "arch/x86_64/page-mapping.h"
-#include "print.h"
-
diff --git a/arch/x86_64/memory/page-mapping.c b/arch/x86_64/memory/page-mapping.c
index bbf210a..58cf8fe 100644
--- a/arch/x86_64/memory/page-mapping.c
+++ b/arch/x86_64/memory/page-mapping.c
@@ -1,7 +1,7 @@
 #include "arch/x86_64/page-mapping.h"
 #include "arch/x86_64/page.h"
 #include "memory.h"
-#include "error.h"
+#include "api/error.h"
 #include <stddef.h>
 #include "print.h"
 
diff --git a/arch/x86_64/memory/pml4.c b/arch/x86_64/memory/pml4.c
index b22bcfb..d5fb56b 100644
--- a/arch/x86_64/memory/pml4.c
+++ b/arch/x86_64/memory/pml4.c
@@ -7,7 +7,7 @@
 #include "init.h"
 #include "string.h"
 #include "jove.h"
-#include "error.h"
+#include "api/error.h"
 #include <stdint.h>
 
 #define IDENTITY_BASE 0xFFFF800000000000
diff --git a/arch/x86_64/syscall/invoke-mapping.c b/arch/x86_64/syscall/invoke-mapping.c
index 5fde8be..186b420 100644
--- a/arch/x86_64/syscall/invoke-mapping.c
+++ b/arch/x86_64/syscall/invoke-mapping.c
@@ -2,7 +2,7 @@
 #include "arch/x86_64/syscall.h"
 #include "arch/x86_64/page.h"
 #include <stddef.h>
-#include "error.h"
+#include "api/error.h"
 #include "lock.h"
 #include "string.h"
 #include "memory.h"
diff --git a/arch/x86_64/syscall/invoke-untyped-retype.c b/arch/x86_64/syscall/invoke-untyped-retype.c
index 4db91b9..3057f25 100644
--- a/arch/x86_64/syscall/invoke-untyped-retype.c
+++ b/arch/x86_64/syscall/invoke-untyped-retype.c
@@ -1,5 +1,5 @@
 #include <object.h>
-#include <error.h>
+#include "api/error.h"
 
 int
 ko_untyped_retype_memory_mapping(
diff --git a/arch/x86_64/syscall/syscall.c b/arch/x86_64/syscall/syscall.c
index 5582336..7ddd179 100644
--- a/arch/x86_64/syscall/syscall.c
+++ b/arch/x86_64/syscall/syscall.c
@@ -2,7 +2,7 @@
 #include "syscall/handles.h"
 #include "print.h"
 #include "lock.h"
-#include "error.h"
+#include "api/error.h"
 #include <stddef.h>
 
 static inline int
@@ -27,7 +27,7 @@ _syscall_handler_arch(objdir_t *root_dir, objdir_entry_t *target, uint8_t *paylo
         default:
             klogf("Missing implementation of invoke for type %i\n", target->type);
             mtx_release(&target->lock);
-            return -KE_BADTYPE;
+            return KE_BADTYPE;
     }
 }