diff --git a/Kernel/Arch/RegisterState.h b/Kernel/Arch/RegisterState.h
new file mode 100644
index 0000000000..c70db9a250
--- /dev/null
+++ b/Kernel/Arch/RegisterState.h
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2018-2021, James Mintram <me@jamesrm.com>
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
+ */
+
+#pragma once
+
+#include <AK/Platform.h>
+
+#if ARCH(X86_64) || ARCH(I386)
+#    include <Kernel/Arch/x86/RegisterState.h>
+#elif ARCH(AARCH64)
+#    include <Kernel/Arch/aarch64/RegisterState.h>
+#else
+#    error "Unknown architecture"
+#endif
diff --git a/Kernel/Arch/aarch64/RegisterState.h b/Kernel/Arch/aarch64/RegisterState.h
new file mode 100644
index 0000000000..d518b68903
--- /dev/null
+++ b/Kernel/Arch/aarch64/RegisterState.h
@@ -0,0 +1,10 @@
+/*
+ * Copyright (c) 2018-2021, James Mintram <me@jamesrm.com>
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
+ */
+
+#pragma once
+
+struct DebugRegisterState {
+};
diff --git a/Kernel/Arch/x86/common/Interrupts.cpp b/Kernel/Arch/x86/common/Interrupts.cpp
index 2dc3d6f200..879c65476b 100644
--- a/Kernel/Arch/x86/common/Interrupts.cpp
+++ b/Kernel/Arch/x86/common/Interrupts.cpp
@@ -22,8 +22,8 @@
 #include <LibC/mallocdefs.h>
 
 #include <Kernel/Arch/Processor.h>
+#include <Kernel/Arch/RegisterState.h>
 #include <Kernel/Arch/x86/ISRStubs.h>
-#include <Kernel/Arch/x86/RegisterState.h>
 #include <Kernel/Arch/x86/TrapFrame.h>
 #include <Kernel/KSyms.h>
 
diff --git a/Kernel/Arch/x86/common/SafeMem.cpp b/Kernel/Arch/x86/common/SafeMem.cpp
index 01e405a01d..6a93fef67d 100644
--- a/Kernel/Arch/x86/common/SafeMem.cpp
+++ b/Kernel/Arch/x86/common/SafeMem.cpp
@@ -5,7 +5,7 @@
  */
 
 #include <Kernel/Arch/Processor.h>
-#include <Kernel/Arch/x86/RegisterState.h>
+#include <Kernel/Arch/RegisterState.h>
 #include <Kernel/Arch/x86/SafeMem.h>
 
 #define CODE_SECTION(section_name) __attribute__((section(section_name)))
diff --git a/Kernel/Devices/DeviceManagement.h b/Kernel/Devices/DeviceManagement.h
index e61cebf6a5..50b263ee02 100644
--- a/Kernel/Devices/DeviceManagement.h
+++ b/Kernel/Devices/DeviceManagement.h
@@ -14,7 +14,7 @@
 #include <AK/Types.h>
 #include <Kernel/API/KResult.h>
 #include <Kernel/API/TimePage.h>
-#include <Kernel/Arch/x86/RegisterState.h>
+#include <Kernel/Arch/RegisterState.h>
 #include <Kernel/Devices/ConsoleDevice.h>
 #include <Kernel/Devices/Device.h>
 #include <Kernel/Devices/NullDevice.h>
diff --git a/Kernel/Interrupts/GenericInterruptHandler.h b/Kernel/Interrupts/GenericInterruptHandler.h
index 3572de6afb..109c378fee 100644
--- a/Kernel/Interrupts/GenericInterruptHandler.h
+++ b/Kernel/Interrupts/GenericInterruptHandler.h
@@ -8,7 +8,7 @@
 
 #include <AK/IntrusiveList.h>
 #include <AK/Types.h>
-#include <Kernel/Arch/x86/RegisterState.h>
+#include <Kernel/Arch/RegisterState.h>
 
 namespace Kernel {
 
diff --git a/Kernel/PerformanceEventBuffer.cpp b/Kernel/PerformanceEventBuffer.cpp
index 576a27b809..5aeca08000 100644
--- a/Kernel/PerformanceEventBuffer.cpp
+++ b/Kernel/PerformanceEventBuffer.cpp
@@ -7,8 +7,8 @@
 #include <AK/JsonArraySerializer.h>
 #include <AK/JsonObjectSerializer.h>
 #include <AK/ScopeGuard.h>
+#include <Kernel/Arch/RegisterState.h>
 #include <Kernel/Arch/SmapDisabler.h>
-#include <Kernel/Arch/x86/RegisterState.h>
 #include <Kernel/FileSystem/Custody.h>
 #include <Kernel/KBufferBuilder.h>
 #include <Kernel/PerformanceEventBuffer.h>
diff --git a/Kernel/ThreadTracer.cpp b/Kernel/ThreadTracer.cpp
index fc2c1f2e38..359e60e31a 100644
--- a/Kernel/ThreadTracer.cpp
+++ b/Kernel/ThreadTracer.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/Arch/x86/RegisterState.h>
+#include <Kernel/Arch/RegisterState.h>
 #include <Kernel/ThreadTracer.h>
 
 namespace Kernel {
diff --git a/Kernel/Time/TimeManagement.h b/Kernel/Time/TimeManagement.h
index 2da0491fc0..1165cf7084 100644
--- a/Kernel/Time/TimeManagement.h
+++ b/Kernel/Time/TimeManagement.h
@@ -13,7 +13,7 @@
 #include <AK/Types.h>
 #include <Kernel/API/KResult.h>
 #include <Kernel/API/TimePage.h>
-#include <Kernel/Arch/x86/RegisterState.h>
+#include <Kernel/Arch/RegisterState.h>
 #include <Kernel/UnixTypes.h>
 
 namespace Kernel {