diff --git a/Kernel/Devices/Audio/Channel.h b/Kernel/Devices/Audio/Channel.h
index 99e2fcd7bb..5af5524012 100644
--- a/Kernel/Devices/Audio/Channel.h
+++ b/Kernel/Devices/Audio/Channel.h
@@ -7,10 +7,6 @@
 #pragma once
 
 #include <Kernel/Devices/CharacterDevice.h>
-#include <Kernel/Interrupts/IRQHandler.h>
-#include <Kernel/Memory/PhysicalAddress.h>
-#include <Kernel/Memory/PhysicalPage.h>
-#include <Kernel/Tasks/WaitQueue.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Devices/Audio/Controller.h b/Kernel/Devices/Audio/Controller.h
index 8377f10abd..7600133435 100644
--- a/Kernel/Devices/Audio/Controller.h
+++ b/Kernel/Devices/Audio/Controller.h
@@ -6,18 +6,12 @@
 
 #pragma once
 
+#include <AK/Error.h>
 #include <AK/IntrusiveList.h>
-#include <AK/OwnPtr.h>
 #include <AK/RefPtr.h>
-#include <Kernel/Bus/PCI/Access.h>
-#include <Kernel/Bus/PCI/Device.h>
+#include <AK/Types.h>
 #include <Kernel/Devices/Audio/Channel.h>
-#include <Kernel/Devices/Device.h>
-#include <Kernel/Library/LockWeakable.h>
-#include <Kernel/Locking/Mutex.h>
-#include <Kernel/Memory/PhysicalAddress.h>
-#include <Kernel/Memory/PhysicalPage.h>
-#include <Kernel/Security/Random.h>
+#include <Kernel/Library/UserOrKernelBuffer.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Devices/Audio/Management.cpp b/Kernel/Devices/Audio/Management.cpp
index 74a1581c9f..187b8b3777 100644
--- a/Kernel/Devices/Audio/Management.cpp
+++ b/Kernel/Devices/Audio/Management.cpp
@@ -6,11 +6,10 @@
 
 #include <AK/Singleton.h>
 #include <Kernel/Bus/PCI/API.h>
-#include <Kernel/Bus/PCI/IDs.h>
+#include <Kernel/Bus/PCI/Access.h>
 #include <Kernel/Devices/Audio/AC97/AC97.h>
 #include <Kernel/Devices/Audio/IntelHDA/Controller.h>
 #include <Kernel/Devices/Audio/Management.h>
-#include <Kernel/Sections.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Devices/Audio/Management.h b/Kernel/Devices/Audio/Management.h
index 703bdb8c39..e479e66c77 100644
--- a/Kernel/Devices/Audio/Management.h
+++ b/Kernel/Devices/Audio/Management.h
@@ -6,12 +6,10 @@
 
 #pragma once
 
-#include <AK/Badge.h>
 #include <AK/Error.h>
 #include <AK/IntrusiveList.h>
 #include <AK/NonnullRefPtr.h>
-#include <AK/OwnPtr.h>
-#include <AK/Types.h>
+#include <Kernel/Bus/PCI/Definitions.h>
 #include <Kernel/Devices/Audio/Controller.h>
 
 namespace Kernel {