diff --git a/Kernel/Arch/aarch64/mcontext.h b/Kernel/Arch/aarch64/mcontext.h
index c4ebbabab1..57e7182c84 100644
--- a/Kernel/Arch/aarch64/mcontext.h
+++ b/Kernel/Arch/aarch64/mcontext.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <AK/Platform.h>
 #include <Kernel/API/POSIX/sys/types.h>
 
 #ifdef __cplusplus
diff --git a/Kernel/Arch/mcontext.h b/Kernel/Arch/mcontext.h
index ff9aa4b5ae..95d35a0d7e 100644
--- a/Kernel/Arch/mcontext.h
+++ b/Kernel/Arch/mcontext.h
@@ -6,10 +6,8 @@
 
 #pragma once
 
-#include <AK/Platform.h>
-
-#if ARCH(X86_64) || ARCH(I386)
+#if defined(__i386__) || defined(__x86_64__)
 #    include <Kernel/Arch/x86/mcontext.h>
-#elif ARCH(AARCH64)
+#elif defined(__aarch64__)
 #    include <Kernel/Arch/aarch64/mcontext.h>
 #endif
diff --git a/Kernel/Arch/x86/mcontext.h b/Kernel/Arch/x86/mcontext.h
index a01376ef98..b2755dd431 100644
--- a/Kernel/Arch/x86/mcontext.h
+++ b/Kernel/Arch/x86/mcontext.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <AK/Platform.h>
 #include <Kernel/API/POSIX/sys/types.h>
 
 #ifdef __cplusplus
@@ -14,7 +13,7 @@ extern "C" {
 #endif
 
 struct __attribute__((packed)) __mcontext {
-#if ARCH(I386)
+#ifdef __i386__
     uint32_t eax;
     uint32_t ecx;
     uint32_t edx;