LibMedia: Clean up #include directives

This change aims to improve the speed of incremental builds.

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>
 

Libraries/LibMedia/Audio/FFmpegLoader.cpp

@@ -5,7 +5,6 @@
  */
 
 #include "FFmpegLoader.h"
-#include <AK/BitStream.h>
 #include <AK/NumericLimits.h>
 #include <LibCore/System.h>
 

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 {

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"

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 <LibCore/ThreadedPromise.h>
-#include <LibThreading/MutexProtected.h>
-#include <LibThreading/Thread.h>
 
 namespace Audio {
 

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 {
 

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>

Libraries/LibMedia/Audio/SampleFormats.cpp

@@ -5,6 +5,7 @@
  */
 
 #include "SampleFormats.h"
+#include <AK/Assertions.h>
 
 namespace Audio {
 

Libraries/LibMedia/Audio/SampleFormats.h

@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <AK/ByteString.h>
 #include <AK/Types.h>
 
 namespace Audio {

Libraries/LibMedia/Color/ColorConverter.cpp

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <AK/Math.h>
+#include <LibGfx/Matrix.h>
-#include <AK/StdLibExtras.h>
+#include <LibGfx/Matrix3x3.h>
 #include <LibGfx/Matrix4x4.h>
 #include <LibMedia/Color/ColorPrimaries.h>
 #include <LibMedia/Color/TransferCharacteristics.h>

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>

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>
 

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>

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"

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>