diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt
index e0f4a050a2..e4525bc661 100644
--- a/Kernel/CMakeLists.txt
+++ b/Kernel/CMakeLists.txt
@@ -43,6 +43,7 @@ set(KERNEL_SOURCES
     CommandLine.cpp
     Coredump.cpp
     Devices/AsyncDeviceRequest.cpp
+    Devices/Audio/SB16.cpp
     Devices/BlockDevice.cpp
     Devices/CharacterDevice.cpp
     Devices/ConsoleDevice.cpp
@@ -56,7 +57,6 @@ set(KERNEL_SOURCES
     Devices/PCISerialDevice.cpp
     Devices/PCSpeaker.cpp
     Devices/RandomDevice.cpp
-    Devices/SB16.cpp
     Devices/SerialDevice.cpp
     Devices/VMWareBackdoor.cpp
     Devices/ZeroDevice.cpp
diff --git a/Kernel/Devices/SB16.cpp b/Kernel/Devices/Audio/SB16.cpp
similarity index 99%
rename from Kernel/Devices/SB16.cpp
rename to Kernel/Devices/Audio/SB16.cpp
index 027bde6595..b515d5053a 100644
--- a/Kernel/Devices/SB16.cpp
+++ b/Kernel/Devices/Audio/SB16.cpp
@@ -9,8 +9,8 @@
 #include <Kernel/Arch/x86/IO.h>
 #include <Kernel/Arch/x86/InterruptDisabler.h>
 #include <Kernel/Debug.h>
+#include <Kernel/Devices/Audio/SB16.h>
 #include <Kernel/Devices/DeviceManagement.h>
-#include <Kernel/Devices/SB16.h>
 #include <Kernel/Memory/AnonymousVMObject.h>
 #include <Kernel/Memory/MemoryManager.h>
 #include <Kernel/Sections.h>
diff --git a/Kernel/Devices/SB16.h b/Kernel/Devices/Audio/SB16.h
similarity index 100%
rename from Kernel/Devices/SB16.h
rename to Kernel/Devices/Audio/SB16.h
diff --git a/Kernel/Devices/DeviceManagement.h b/Kernel/Devices/DeviceManagement.h
index 680d72f811..cc4e163ab4 100644
--- a/Kernel/Devices/DeviceManagement.h
+++ b/Kernel/Devices/DeviceManagement.h
@@ -15,10 +15,10 @@
 #include <AK/Types.h>
 #include <Kernel/API/TimePage.h>
 #include <Kernel/Arch/RegisterState.h>
+#include <Kernel/Devices/Audio/SB16.h>
 #include <Kernel/Devices/ConsoleDevice.h>
 #include <Kernel/Devices/Device.h>
 #include <Kernel/Devices/NullDevice.h>
-#include <Kernel/Devices/SB16.h>
 #include <Kernel/UnixTypes.h>
 
 namespace Kernel {
diff --git a/Kernel/init.cpp b/Kernel/init.cpp
index 902da903b4..ddc2d7d86d 100644
--- a/Kernel/init.cpp
+++ b/Kernel/init.cpp
@@ -13,6 +13,7 @@
 #include <Kernel/Bus/VirtIO/Device.h>
 #include <Kernel/CMOS.h>
 #include <Kernel/CommandLine.h>
+#include <Kernel/Devices/Audio/SB16.h>
 #include <Kernel/Devices/DeviceManagement.h>
 #include <Kernel/Devices/FullDevice.h>
 #include <Kernel/Devices/HID/HIDManagement.h>
@@ -21,7 +22,6 @@
 #include <Kernel/Devices/NullDevice.h>
 #include <Kernel/Devices/PCISerialDevice.h>
 #include <Kernel/Devices/RandomDevice.h>
-#include <Kernel/Devices/SB16.h>
 #include <Kernel/Devices/SerialDevice.h>
 #include <Kernel/Devices/VMWareBackdoor.h>
 #include <Kernel/Devices/ZeroDevice.h>