diff --git a/Kernel/Arch/x86/ScopedCritical.cpp b/Kernel/Arch/x86/common/ScopedCritical.cpp
similarity index 100%
rename from Kernel/Arch/x86/ScopedCritical.cpp
rename to Kernel/Arch/x86/common/ScopedCritical.cpp
diff --git a/Kernel/Arch/x86/SmapDisabler.cpp b/Kernel/Arch/x86/common/SmapDisabler.cpp
similarity index 100%
rename from Kernel/Arch/x86/SmapDisabler.cpp
rename to Kernel/Arch/x86/common/SmapDisabler.cpp
diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt
index 319c433b32..5964dbc48a 100644
--- a/Kernel/CMakeLists.txt
+++ b/Kernel/CMakeLists.txt
@@ -289,8 +289,8 @@ set(KERNEL_SOURCES
 if ("${SERENITY_ARCH}" STREQUAL "i686" OR "${SERENITY_ARCH}" STREQUAL "x86_64")
     set(KERNEL_SOURCES
         ${KERNEL_SOURCES}
-        Arch/x86/ScopedCritical.cpp
-        Arch/x86/SmapDisabler.cpp
+        Arch/x86/common/ScopedCritical.cpp
+        Arch/x86/common/SmapDisabler.cpp
     )
 
     set(KERNEL_SOURCES