diff --git a/Kernel/Arch/TrapFrame.h b/Kernel/Arch/TrapFrame.h
new file mode 100644
index 0000000000..03270d8528
--- /dev/null
+++ b/Kernel/Arch/TrapFrame.h
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2022, Gunnar Beutner <gbeutner@serenityos.org>
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
+ */
+
+#pragma once
+
+#include <AK/Platform.h>
+
+#if ARCH(X86_64) || ARCH(I386)
+#    include <Kernel/Arch/x86/TrapFrame.h>
+#elif ARCH(AARCH64)
+#    include <Kernel/Arch/aarch64/TrapFrame.h>
+#else
+#    error "Unknown architecture"
+#endif
diff --git a/Kernel/Arch/x86/common/Interrupts.cpp b/Kernel/Arch/x86/common/Interrupts.cpp
index 03660e02ac..1e31440cb3 100644
--- a/Kernel/Arch/x86/common/Interrupts.cpp
+++ b/Kernel/Arch/x86/common/Interrupts.cpp
@@ -30,8 +30,8 @@
 #include <Kernel/Arch/Processor.h>
 #include <Kernel/Arch/RegisterState.h>
 #include <Kernel/Arch/SafeMem.h>
+#include <Kernel/Arch/TrapFrame.h>
 #include <Kernel/Arch/x86/ISRStubs.h>
-#include <Kernel/Arch/x86/TrapFrame.h>
 
 extern FlatPtr start_of_unmap_after_init;
 extern FlatPtr end_of_unmap_after_init;
diff --git a/Kernel/Arch/x86/common/Processor.cpp b/Kernel/Arch/x86/common/Processor.cpp
index 8c51771131..c2ce340ab3 100644
--- a/Kernel/Arch/x86/common/Processor.cpp
+++ b/Kernel/Arch/x86/common/Processor.cpp
@@ -24,10 +24,10 @@
 #include <Kernel/Arch/Processor.h>
 #include <Kernel/Arch/SafeMem.h>
 #include <Kernel/Arch/ScopedCritical.h>
+#include <Kernel/Arch/TrapFrame.h>
 #include <Kernel/Arch/x86/CPUID.h>
 #include <Kernel/Arch/x86/MSR.h>
 #include <Kernel/Arch/x86/ProcessorInfo.h>
-#include <Kernel/Arch/x86/TrapFrame.h>
 
 #include <Kernel/Memory/PageDirectory.h>
 #include <Kernel/Memory/ScopedAddressSpaceSwitcher.h>
diff --git a/Kernel/Arch/x86/i386/InterruptEntry.cpp b/Kernel/Arch/x86/i386/InterruptEntry.cpp
index 156d0f71ad..be32d22c55 100644
--- a/Kernel/Arch/x86/i386/InterruptEntry.cpp
+++ b/Kernel/Arch/x86/i386/InterruptEntry.cpp
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
+#include <Kernel/Arch/TrapFrame.h>
 #include <Kernel/Arch/x86/DescriptorTable.h>
-#include <Kernel/Arch/x86/TrapFrame.h>
 
 // clang-format off
 asm(
diff --git a/Kernel/Arch/x86/i386/Processor.cpp b/Kernel/Arch/x86/i386/Processor.cpp
index b748bed21a..c9d49b28ae 100644
--- a/Kernel/Arch/x86/i386/Processor.cpp
+++ b/Kernel/Arch/x86/i386/Processor.cpp
@@ -6,7 +6,7 @@
 
 #include <AK/StdLibExtras.h>
 #include <Kernel/Arch/Processor.h>
-#include <Kernel/Arch/x86/TrapFrame.h>
+#include <Kernel/Arch/TrapFrame.h>
 #include <Kernel/Process.h>
 #include <Kernel/Random.h>
 #include <Kernel/Scheduler.h>
diff --git a/Kernel/Arch/x86/x86_64/SyscallEntry.cpp b/Kernel/Arch/x86/x86_64/SyscallEntry.cpp
index ab12809f49..c325cbd710 100644
--- a/Kernel/Arch/x86/x86_64/SyscallEntry.cpp
+++ b/Kernel/Arch/x86/x86_64/SyscallEntry.cpp
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
+#include <Kernel/Arch/TrapFrame.h>
 #include <Kernel/Arch/x86/DescriptorTable.h>
 #include <Kernel/Arch/x86/Processor.h>
-#include <Kernel/Arch/x86/TrapFrame.h>
 
 extern "C" void syscall_entry();
 extern "C" [[gnu::naked]] void syscall_entry()
diff --git a/Kernel/Scheduler.cpp b/Kernel/Scheduler.cpp
index 6335185662..aade6d8cf3 100644
--- a/Kernel/Scheduler.cpp
+++ b/Kernel/Scheduler.cpp
@@ -9,7 +9,7 @@
 #include <AK/Singleton.h>
 #include <AK/Time.h>
 #include <Kernel/Arch/InterruptDisabler.h>
-#include <Kernel/Arch/x86/TrapFrame.h>
+#include <Kernel/Arch/TrapFrame.h>
 #include <Kernel/Debug.h>
 #include <Kernel/Panic.h>
 #include <Kernel/PerformanceManager.h>
diff --git a/Kernel/Syscall.cpp b/Kernel/Syscall.cpp
index 96ca84d2b0..96631e0ac7 100644
--- a/Kernel/Syscall.cpp
+++ b/Kernel/Syscall.cpp
@@ -6,8 +6,8 @@
  */
 
 #include <Kernel/API/Syscall.h>
+#include <Kernel/Arch/TrapFrame.h>
 #include <Kernel/Arch/x86/Interrupts.h>
-#include <Kernel/Arch/x86/TrapFrame.h>
 #include <Kernel/Memory/MemoryManager.h>
 #include <Kernel/Panic.h>
 #include <Kernel/PerformanceManager.h>
diff --git a/Kernel/Thread.cpp b/Kernel/Thread.cpp
index d43b6796f3..57dfdb862f 100644
--- a/Kernel/Thread.cpp
+++ b/Kernel/Thread.cpp
@@ -11,7 +11,7 @@
 #include <AK/Time.h>
 #include <Kernel/Arch/InterruptDisabler.h>
 #include <Kernel/Arch/SmapDisabler.h>
-#include <Kernel/Arch/x86/TrapFrame.h>
+#include <Kernel/Arch/TrapFrame.h>
 #include <Kernel/Debug.h>
 #include <Kernel/Devices/KCOVDevice.h>
 #include <Kernel/FileSystem/OpenFileDescription.h>