diff --git a/Libraries/LibGfx/Matrix.h b/Libraries/LibGfx/Matrix.h
index 2ed0273e497..22e2eb4fcc9 100644
--- a/Libraries/LibGfx/Matrix.h
+++ b/Libraries/LibGfx/Matrix.h
@@ -6,6 +6,8 @@
 
 #pragma once
 
+#include <AK/Assertions.h>
+#include <AK/StdLibExtras.h>
 #include <AK/Types.h>
 #include <initializer_list>
 
diff --git a/Libraries/LibMedia/Audio/FFmpegLoader.cpp b/Libraries/LibMedia/Audio/FFmpegLoader.cpp
index ce38a961c78..bd0b55d6c10 100644
--- a/Libraries/LibMedia/Audio/FFmpegLoader.cpp
+++ b/Libraries/LibMedia/Audio/FFmpegLoader.cpp
@@ -5,7 +5,6 @@
  */
 
 #include "FFmpegLoader.h"
-#include <AK/BitStream.h>
 #include <AK/NumericLimits.h>
 #include <LibCore/System.h>
 
diff --git a/Libraries/LibMedia/Audio/FFmpegLoader.h b/Libraries/LibMedia/Audio/FFmpegLoader.h
index 684eceea4b5..652d3dd56e0 100644
--- a/Libraries/LibMedia/Audio/FFmpegLoader.h
+++ b/Libraries/LibMedia/Audio/FFmpegLoader.h
@@ -13,7 +13,6 @@
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
-#include <libavutil/samplefmt.h>
 }
 
 namespace Audio {
diff --git a/Libraries/LibMedia/Audio/PlaybackStream.cpp b/Libraries/LibMedia/Audio/PlaybackStream.cpp
index 1e4cf7ac568..42c60e73d7d 100644
--- a/Libraries/LibMedia/Audio/PlaybackStream.cpp
+++ b/Libraries/LibMedia/Audio/PlaybackStream.cpp
@@ -7,7 +7,6 @@
 #include "PlaybackStream.h"
 
 #include <AK/Platform.h>
-#include <LibCore/ThreadedPromise.h>
 
 #if defined(HAVE_PULSEAUDIO)
 #    include "PlaybackStreamPulseAudio.h"
diff --git a/Libraries/LibMedia/Audio/PlaybackStream.h b/Libraries/LibMedia/Audio/PlaybackStream.h
index 464a842aa96..54686bca128 100644
--- a/Libraries/LibMedia/Audio/PlaybackStream.h
+++ b/Libraries/LibMedia/Audio/PlaybackStream.h
@@ -9,12 +9,9 @@
 #include "SampleFormats.h"
 #include <AK/AtomicRefCounted.h>
 #include <AK/Function.h>
-#include <AK/Queue.h>
 #include <AK/Time.h>
 #include <LibCore/Forward.h>
-#include <LibThreading/ConditionVariable.h>
-#include <LibThreading/MutexProtected.h>
-#include <LibThreading/Thread.h>
+#include <LibCore/ThreadedPromise.h>
 
 namespace Audio {
 
diff --git a/Libraries/LibMedia/Audio/PlaybackStreamPulseAudio.h b/Libraries/LibMedia/Audio/PlaybackStreamPulseAudio.h
index f9d7ceff0a8..1d537558566 100644
--- a/Libraries/LibMedia/Audio/PlaybackStreamPulseAudio.h
+++ b/Libraries/LibMedia/Audio/PlaybackStreamPulseAudio.h
@@ -8,6 +8,9 @@
 
 #include "PlaybackStream.h"
 #include "PulseAudioWrappers.h"
+#include <AK/Queue.h>
+#include <LibThreading/ConditionVariable.h>
+#include <LibThreading/Mutex.h>
 
 namespace Audio {
 
diff --git a/Libraries/LibMedia/Audio/PulseAudioWrappers.h b/Libraries/LibMedia/Audio/PulseAudioWrappers.h
index 4bf0f43912a..c31752b9a72 100644
--- a/Libraries/LibMedia/Audio/PulseAudioWrappers.h
+++ b/Libraries/LibMedia/Audio/PulseAudioWrappers.h
@@ -8,7 +8,6 @@
 
 #include "Forward.h"
 #include "PlaybackStream.h"
-#include "SampleFormats.h"
 #include <AK/AtomicRefCounted.h>
 #include <AK/Error.h>
 #include <AK/NonnullRefPtr.h>
diff --git a/Libraries/LibMedia/Audio/SampleFormats.cpp b/Libraries/LibMedia/Audio/SampleFormats.cpp
index f346e33e3fd..8b2133d004f 100644
--- a/Libraries/LibMedia/Audio/SampleFormats.cpp
+++ b/Libraries/LibMedia/Audio/SampleFormats.cpp
@@ -5,6 +5,7 @@
  */
 
 #include "SampleFormats.h"
+#include <AK/Assertions.h>
 
 namespace Audio {
 
diff --git a/Libraries/LibMedia/Audio/SampleFormats.h b/Libraries/LibMedia/Audio/SampleFormats.h
index a6801a5727e..be57ca67c6c 100644
--- a/Libraries/LibMedia/Audio/SampleFormats.h
+++ b/Libraries/LibMedia/Audio/SampleFormats.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <AK/ByteString.h>
 #include <AK/Types.h>
 
 namespace Audio {
diff --git a/Libraries/LibMedia/Color/ColorConverter.cpp b/Libraries/LibMedia/Color/ColorConverter.cpp
index 99da5c49612..df63e0ce02e 100644
--- a/Libraries/LibMedia/Color/ColorConverter.cpp
+++ b/Libraries/LibMedia/Color/ColorConverter.cpp
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <AK/Math.h>
-#include <AK/StdLibExtras.h>
+#include <LibGfx/Matrix.h>
+#include <LibGfx/Matrix3x3.h>
 #include <LibGfx/Matrix4x4.h>
 #include <LibMedia/Color/ColorPrimaries.h>
 #include <LibMedia/Color/TransferCharacteristics.h>
diff --git a/Libraries/LibMedia/Containers/Matroska/Reader.cpp b/Libraries/LibMedia/Containers/Matroska/Reader.cpp
index 5bb2a78af5e..51db215908b 100644
--- a/Libraries/LibMedia/Containers/Matroska/Reader.cpp
+++ b/Libraries/LibMedia/Containers/Matroska/Reader.cpp
@@ -7,6 +7,7 @@
 
 #include <AK/Debug.h>
 #include <AK/Function.h>
+#include <AK/IntegralMath.h>
 #include <AK/Math.h>
 #include <AK/Optional.h>
 #include <AK/Time.h>
diff --git a/Libraries/LibMedia/Containers/Matroska/Reader.h b/Libraries/LibMedia/Containers/Matroska/Reader.h
index 60b8b49d158..eabdfbdce50 100644
--- a/Libraries/LibMedia/Containers/Matroska/Reader.h
+++ b/Libraries/LibMedia/Containers/Matroska/Reader.h
@@ -7,9 +7,9 @@
 
 #pragma once
 
-#include <AK/IntegralMath.h>
+#include <AK/NonnullOwnPtr.h>
+#include <AK/NonnullRefPtr.h>
 #include <AK/Optional.h>
-#include <AK/OwnPtr.h>
 #include <LibCore/MappedFile.h>
 #include <LibMedia/DecoderError.h>
 
diff --git a/Libraries/LibMedia/PlaybackManager.h b/Libraries/LibMedia/PlaybackManager.h
index 9fd52401c17..a99cbbbdfe0 100644
--- a/Libraries/LibMedia/PlaybackManager.h
+++ b/Libraries/LibMedia/PlaybackManager.h
@@ -13,7 +13,6 @@
 #include <AK/Time.h>
 #include <LibCore/SharedCircularQueue.h>
 #include <LibGfx/Bitmap.h>
-#include <LibMedia/Containers/Matroska/Document.h>
 #include <LibMedia/Demuxer.h>
 #include <LibThreading/ConditionVariable.h>
 #include <LibThreading/Mutex.h>
diff --git a/Libraries/LibMedia/VideoFrame.cpp b/Libraries/LibMedia/VideoFrame.cpp
index c44628a2bdd..c27a81c42a0 100644
--- a/Libraries/LibMedia/VideoFrame.cpp
+++ b/Libraries/LibMedia/VideoFrame.cpp
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
+#include <AK/FixedArray.h>
 #include <AK/NonnullOwnPtr.h>
-#include <AK/OwnPtr.h>
 #include <LibMedia/Color/ColorConverter.h>
 
 #include "VideoFrame.h"
diff --git a/Libraries/LibMedia/VideoFrame.h b/Libraries/LibMedia/VideoFrame.h
index db1ef6813d5..e6b6d8ff82e 100644
--- a/Libraries/LibMedia/VideoFrame.h
+++ b/Libraries/LibMedia/VideoFrame.h
@@ -6,8 +6,6 @@
 
 #pragma once
 
-#include <AK/ByteBuffer.h>
-#include <AK/FixedArray.h>
 #include <AK/Time.h>
 #include <LibGfx/Bitmap.h>
 #include <LibGfx/Size.h>