LibGfx: Move all image loaders and writers to a subdirectory

Ladybird/ImageCodecPluginLadybird.cpp

@@ -9,7 +9,7 @@
 
 #include "ImageCodecPluginLadybird.h"
 #include <LibGfx/Bitmap.h>
-#include <LibGfx/ImageDecoder.h>
+#include <LibGfx/ImageFormats/ImageDecoder.h>
 #include <QImage>
 
 namespace Ladybird {

Ladybird/WebContentView.cpp

@@ -29,7 +29,7 @@
 #include <LibCore/Timer.h>
 #include <LibGfx/Bitmap.h>
 #include <LibGfx/Font/FontDatabase.h>
-#include <LibGfx/PNGWriter.h>
+#include <LibGfx/ImageFormats/PNGWriter.h>
 #include <LibGfx/Painter.h>
 #include <LibGfx/Palette.h>
 #include <LibGfx/Rect.h>

Meta/Lagom/Fuzzers/FuzzBMPLoader.cpp

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <LibGfx/BMPLoader.h>
+#include <LibGfx/ImageFormats/BMPLoader.h>
 #include <stdio.h>
 
 extern "C" int LLVMFuzzerTestOneInput(uint8_t const* data, size_t size)

Meta/Lagom/Fuzzers/FuzzGIFLoader.cpp

@@ -7,7 +7,7 @@
 #include <AK/Debug.h>
 #include <AK/DeprecatedString.h>
 #include <AK/Format.h>
-#include <LibGfx/GIFLoader.h>
+#include <LibGfx/ImageFormats/GIFLoader.h>
 #include <stddef.h>
 #include <stdint.h>
 

Meta/Lagom/Fuzzers/FuzzICOLoader.cpp

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <LibGfx/ICOLoader.h>
+#include <LibGfx/ImageFormats/ICOLoader.h>
 #include <stddef.h>
 #include <stdint.h>
 

Meta/Lagom/Fuzzers/FuzzJPEGLoader.cpp

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <LibGfx/JPEGLoader.h>
+#include <LibGfx/ImageFormats/JPEGLoader.h>
 #include <stddef.h>
 #include <stdint.h>
 

Meta/Lagom/Fuzzers/FuzzPBMLoader.cpp

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <LibGfx/PBMLoader.h>
+#include <LibGfx/ImageFormats/PBMLoader.h>
 #include <stddef.h>
 #include <stdint.h>
 

Meta/Lagom/Fuzzers/FuzzPGMLoader.cpp

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <LibGfx/PGMLoader.h>
+#include <LibGfx/ImageFormats/PGMLoader.h>
 #include <stddef.h>
 #include <stdint.h>
 

Meta/Lagom/Fuzzers/FuzzPNGLoader.cpp

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <LibGfx/PNGLoader.h>
+#include <LibGfx/ImageFormats/PNGLoader.h>
 #include <stddef.h>
 #include <stdint.h>
 

Meta/Lagom/Fuzzers/FuzzPPMLoader.cpp

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <LibGfx/PPMLoader.h>
+#include <LibGfx/ImageFormats/PPMLoader.h>
 #include <stddef.h>
 #include <stdint.h>
 

Meta/Lagom/Fuzzers/FuzzQOILoader.cpp

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <LibGfx/QOILoader.h>
+#include <LibGfx/ImageFormats/QOILoader.h>
 #include <stddef.h>
 #include <stdint.h>
 

Meta/Lagom/Fuzzers/FuzzTGALoader.cpp

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <LibGfx/TGALoader.h>
+#include <LibGfx/ImageFormats/TGALoader.h>
 #include <stddef.h>
 #include <stdint.h>
 

Tests/LibGL/TestRender.cpp

@@ -11,7 +11,7 @@
 #include <LibGL/GL/gl.h>
 #include <LibGL/GLContext.h>
 #include <LibGfx/Bitmap.h>
-#include <LibGfx/QOIWriter.h>
+#include <LibGfx/ImageFormats/QOIWriter.h>
 #include <LibTest/TestCase.h>
 
 #ifdef AK_OS_SERENITY

Tests/LibGL/TestShaders.cpp

@@ -9,7 +9,7 @@
 #include <LibGL/GL/gl.h>
 #include <LibGL/GLContext.h>
 #include <LibGfx/Bitmap.h>
-#include <LibGfx/QOIWriter.h>
+#include <LibGfx/ImageFormats/QOIWriter.h>
 #include <LibTest/TestCase.h>
 
 static NonnullOwnPtr<GL::GLContext> create_testing_context(int width, int height)

Tests/LibGfx/TestICCProfile.cpp

@@ -9,9 +9,9 @@
 #include <LibGfx/ICC/BinaryWriter.h>
 #include <LibGfx/ICC/Profile.h>
 #include <LibGfx/ICC/WellKnownProfiles.h>
-#include <LibGfx/JPEGLoader.h>
-#include <LibGfx/PNGLoader.h>
-#include <LibGfx/WebPLoader.h>
+#include <LibGfx/ImageFormats/JPEGLoader.h>
+#include <LibGfx/ImageFormats/PNGLoader.h>
+#include <LibGfx/ImageFormats/WebPLoader.h>
 #include <LibTest/TestCase.h>
 
 #ifdef AK_OS_SERENITY

Tests/LibGfx/TestImageDecoder.cpp

@@ -7,17 +7,17 @@
 
 #include <AK/DeprecatedString.h>
 #include <LibCore/MappedFile.h>
-#include <LibGfx/BMPLoader.h>
-#include <LibGfx/GIFLoader.h>
-#include <LibGfx/ICOLoader.h>
-#include <LibGfx/ImageDecoder.h>
-#include <LibGfx/JPEGLoader.h>
-#include <LibGfx/PBMLoader.h>
-#include <LibGfx/PGMLoader.h>
-#include <LibGfx/PNGLoader.h>
-#include <LibGfx/PPMLoader.h>
-#include <LibGfx/TGALoader.h>
-#include <LibGfx/WebPLoader.h>
+#include <LibGfx/ImageFormats/BMPLoader.h>
+#include <LibGfx/ImageFormats/GIFLoader.h>
+#include <LibGfx/ImageFormats/ICOLoader.h>
+#include <LibGfx/ImageFormats/ImageDecoder.h>
+#include <LibGfx/ImageFormats/JPEGLoader.h>
+#include <LibGfx/ImageFormats/PBMLoader.h>
+#include <LibGfx/ImageFormats/PGMLoader.h>
+#include <LibGfx/ImageFormats/PNGLoader.h>
+#include <LibGfx/ImageFormats/PPMLoader.h>
+#include <LibGfx/ImageFormats/TGALoader.h>
+#include <LibGfx/ImageFormats/WebPLoader.h>
 #include <LibTest/TestCase.h>
 #include <stdio.h>
 #include <string.h>

Userland/Applications/Browser/BrowserWindow.cpp

@@ -32,7 +32,7 @@
 #include <LibGUI/TabWidget.h>
 #include <LibGUI/ToolbarContainer.h>
 #include <LibGUI/Widget.h>
-#include <LibGfx/PNGWriter.h>
+#include <LibGfx/ImageFormats/PNGWriter.h>
 #include <LibJS/Interpreter.h>
 #include <LibWeb/CSS/PreferredColorScheme.h>
 #include <LibWeb/Dump.h>

Userland/Applications/Magnifier/main.cpp

@@ -18,10 +18,10 @@
 #include <LibGUI/Menubar.h>
 #include <LibGUI/MessageBox.h>
 #include <LibGUI/Window.h>
-#include <LibGfx/BMPWriter.h>
 #include <LibGfx/Filters/ColorBlindnessFilter.h>
-#include <LibGfx/PNGWriter.h>
-#include <LibGfx/QOIWriter.h>
+#include <LibGfx/ImageFormats/BMPWriter.h>
+#include <LibGfx/ImageFormats/PNGWriter.h>
+#include <LibGfx/ImageFormats/QOIWriter.h>
 #include <LibMain/Main.h>
 
 static ErrorOr<ByteBuffer> dump_bitmap(RefPtr<Gfx::Bitmap> bitmap, AK::StringView extension)

Userland/Applications/PixelPaint/Image.cpp

@@ -12,10 +12,10 @@
 #include <AK/Base64.h>
 #include <AK/JsonObject.h>
 #include <LibGUI/Painter.h>
-#include <LibGfx/BMPWriter.h>
 #include <LibGfx/Bitmap.h>
-#include <LibGfx/PNGWriter.h>
-#include <LibGfx/QOIWriter.h>
+#include <LibGfx/ImageFormats/BMPWriter.h>
+#include <LibGfx/ImageFormats/PNGWriter.h>
+#include <LibGfx/ImageFormats/QOIWriter.h>
 #include <LibImageDecoderClient/Client.h>
 #include <stdio.h>
 

Userland/Demos/Mandelbrot/Mandelbrot.cpp

@@ -16,10 +16,10 @@
 #include <LibGUI/Painter.h>
 #include <LibGUI/Widget.h>
 #include <LibGUI/Window.h>
-#include <LibGfx/BMPWriter.h>
 #include <LibGfx/Bitmap.h>
-#include <LibGfx/PNGWriter.h>
-#include <LibGfx/QOIWriter.h>
+#include <LibGfx/ImageFormats/BMPWriter.h>
+#include <LibGfx/ImageFormats/PNGWriter.h>
+#include <LibGfx/ImageFormats/QOIWriter.h>
 #include <LibMain/Main.h>
 #include <unistd.h>
 

Userland/Libraries/LibGUI/FileIconProvider.cpp

@@ -17,7 +17,7 @@
 #include <LibGUI/Icon.h>
 #include <LibGUI/Painter.h>
 #include <LibGfx/Bitmap.h>
-#include <LibGfx/PNGLoader.h>
+#include <LibGfx/ImageFormats/PNGLoader.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>

Userland/Libraries/LibGUI/ImageWidget.cpp

@@ -10,7 +10,7 @@
 #include <LibGUI/ImageWidget.h>
 #include <LibGUI/Painter.h>
 #include <LibGfx/Bitmap.h>
-#include <LibGfx/ImageDecoder.h>
+#include <LibGfx/ImageFormats/ImageDecoder.h>
 
 REGISTER_WIDGET(GUI, ImageWidget)
 

Userland/Libraries/LibGUI/ImageWidget.h

@@ -9,7 +9,7 @@
 
 #include <LibCore/Timer.h>
 #include <LibGUI/Frame.h>
-#include <LibGfx/ImageDecoder.h>
+#include <LibGfx/ImageFormats/ImageDecoder.h>
 
 namespace GUI {
 

Userland/Libraries/LibGfx/Bitmap.cpp

@@ -20,7 +20,7 @@
 #include <LibCore/MimeData.h>
 #include <LibCore/System.h>
 #include <LibGfx/Bitmap.h>
-#include <LibGfx/ImageDecoder.h>
+#include <LibGfx/ImageFormats/ImageDecoder.h>
 #include <LibGfx/ShareableBitmap.h>
 #include <errno.h>
 #include <fcntl.h>

Userland/Libraries/LibGfx/CMakeLists.txt

@@ -1,15 +1,12 @@
 set(SOURCES
     AffineTransform.cpp
     AntiAliasingPainter.cpp
-    BMPLoader.cpp
-    BMPWriter.cpp
     Bitmap.cpp
     BitmapMixer.cpp
     ClassicStylePainter.cpp
     ClassicWindowTheme.cpp
     Color.cpp
     CursorParams.cpp
-    DDSLoader.cpp
     FillPathImplementation.cpp
     Filters/ColorBlindnessFilter.cpp
     Filters/FastBoxBlurFilter.cpp
@@ -28,27 +25,32 @@ set(SOURCES
     Font/Typeface.cpp
     Font/WOFF/Font.cpp
     GradientPainting.cpp
-    GIFLoader.cpp
     ICC/BinaryWriter.cpp
     ICC/Profile.cpp
     ICC/Tags.cpp
     ICC/TagTypes.cpp
     ICC/WellKnownProfiles.cpp
-    ICOLoader.cpp
-    ImageDecoder.cpp
-    JPEGLoader.cpp
-    PBMLoader.cpp
-    PGMLoader.cpp
-    PNGLoader.cpp
-    PNGWriter.cpp
-    PortableFormatWriter.cpp
-    PPMLoader.cpp
+    ImageFormats/BMPLoader.cpp
+    ImageFormats/BMPWriter.cpp
+    ImageFormats/DDSLoader.cpp
+    ImageFormats/GIFLoader.cpp
+    ImageFormats/ICOLoader.cpp
+    ImageFormats/ImageDecoder.cpp
+    ImageFormats/JPEGLoader.cpp
+    ImageFormats/PBMLoader.cpp
+    ImageFormats/PGMLoader.cpp
+    ImageFormats/PNGLoader.cpp
+    ImageFormats/PNGWriter.cpp
+    ImageFormats/PortableFormatWriter.cpp
+    ImageFormats/PPMLoader.cpp
+    ImageFormats/QOILoader.cpp
+    ImageFormats/QOIWriter.cpp
+    ImageFormats/TGALoader.cpp
+    ImageFormats/WebPLoader.cpp
     Painter.cpp
     Palette.cpp
     Path.cpp
     Point.cpp
-    QOILoader.cpp
-    QOIWriter.cpp
     Rect.cpp
     ShareableBitmap.cpp
     Size.cpp
@@ -56,9 +58,7 @@ set(SOURCES
     SystemTheme.cpp
     TextDirection.cpp
     TextLayout.cpp
-    TGALoader.cpp
     Triangle.cpp
-    WebPLoader.cpp
     WindowTheme.cpp
 )
 

Userland/Libraries/LibGfx/Font/OpenType/Font.cpp

@@ -17,7 +17,7 @@
 #include <LibGfx/Font/OpenType/Font.h>
 #include <LibGfx/Font/OpenType/Glyf.h>
 #include <LibGfx/Font/OpenType/Tables.h>
-#include <LibGfx/PNGLoader.h>
+#include <LibGfx/ImageFormats/PNGLoader.h>
 #include <LibTextCodec/Decoder.h>
 #include <math.h>
 #include <sys/mman.h>

Userland/Libraries/LibGfx/ImageFormats/BMPLoader.cpp

@@ -12,7 +12,7 @@
 #include <AK/Function.h>
 #include <AK/Try.h>
 #include <AK/Vector.h>
-#include <LibGfx/BMPLoader.h>
+#include <LibGfx/ImageFormats/BMPLoader.h>
 
 namespace Gfx {
 

Userland/Libraries/LibGfx/ImageFormats/BMPLoader.h

@@ -6,8 +6,8 @@
 
 #pragma once
 
-#include <LibGfx/ICOLoader.h>
-#include <LibGfx/ImageDecoder.h>
+#include <LibGfx/ImageFormats/ICOLoader.h>
+#include <LibGfx/ImageFormats/ImageDecoder.h>
 
 namespace Gfx {
 

Userland/Libraries/LibGfx/ImageFormats/BMPWriter.cpp

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <LibGfx/BMPWriter.h>
 #include <LibGfx/Bitmap.h>
+#include <LibGfx/ImageFormats/BMPWriter.h>
 
 namespace Gfx {
 

Userland/Libraries/LibGfx/ImageFormats/DDSLoader.cpp

@@ -12,7 +12,7 @@
 #include <AK/StringBuilder.h>
 #include <AK/Try.h>
 #include <AK/Vector.h>
-#include <LibGfx/DDSLoader.h>
+#include <LibGfx/ImageFormats/DDSLoader.h>
 #include <fcntl.h>
 #include <math.h>
 #include <stdio.h>

Userland/Libraries/LibGfx/ImageFormats/DDSLoader.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <LibGfx/ImageDecoder.h>
+#include <LibGfx/ImageFormats/ImageDecoder.h>
 
 namespace Gfx {
 

Userland/Libraries/LibGfx/ImageFormats/GIFLoader.cpp

@@ -13,7 +13,7 @@
 #include <AK/Memory.h>
 #include <AK/MemoryStream.h>
 #include <AK/Try.h>
-#include <LibGfx/GIFLoader.h>
+#include <LibGfx/ImageFormats/GIFLoader.h>
 #include <string.h>
 
 namespace Gfx {

Userland/Libraries/LibGfx/ImageFormats/GIFLoader.h

@@ -7,7 +7,7 @@
 #pragma once
 
 #include <LibGfx/Bitmap.h>
-#include <LibGfx/ImageDecoder.h>
+#include <LibGfx/ImageFormats/ImageDecoder.h>
 
 namespace Gfx {
 

Userland/Libraries/LibGfx/ImageFormats/ICOLoader.cpp

@@ -8,9 +8,9 @@
 #include <AK/Debug.h>
 #include <AK/MemoryStream.h>
 #include <AK/Types.h>
-#include <LibGfx/BMPLoader.h>
-#include <LibGfx/ICOLoader.h>
-#include <LibGfx/PNGLoader.h>
+#include <LibGfx/ImageFormats/BMPLoader.h>
+#include <LibGfx/ImageFormats/ICOLoader.h>
+#include <LibGfx/ImageFormats/PNGLoader.h>
 #include <string.h>
 
 namespace Gfx {

Userland/Libraries/LibGfx/ImageFormats/ICOLoader.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <LibGfx/ImageDecoder.h>
+#include <LibGfx/ImageFormats/ImageDecoder.h>
 
 namespace Gfx {
 

Userland/Libraries/LibGfx/ImageFormats/ImageDecoder.cpp

@@ -5,19 +5,19 @@
  */
 
 #include <AK/LexicalPath.h>
-#include <LibGfx/BMPLoader.h>
-#include <LibGfx/DDSLoader.h>
-#include <LibGfx/GIFLoader.h>
-#include <LibGfx/ICOLoader.h>
-#include <LibGfx/ImageDecoder.h>
-#include <LibGfx/JPEGLoader.h>
-#include <LibGfx/PBMLoader.h>
-#include <LibGfx/PGMLoader.h>
-#include <LibGfx/PNGLoader.h>
-#include <LibGfx/PPMLoader.h>
-#include <LibGfx/QOILoader.h>
-#include <LibGfx/TGALoader.h>
-#include <LibGfx/WebPLoader.h>
+#include <LibGfx/ImageFormats/BMPLoader.h>
+#include <LibGfx/ImageFormats/DDSLoader.h>
+#include <LibGfx/ImageFormats/GIFLoader.h>
+#include <LibGfx/ImageFormats/ICOLoader.h>
+#include <LibGfx/ImageFormats/ImageDecoder.h>
+#include <LibGfx/ImageFormats/JPEGLoader.h>
+#include <LibGfx/ImageFormats/PBMLoader.h>
+#include <LibGfx/ImageFormats/PGMLoader.h>
+#include <LibGfx/ImageFormats/PNGLoader.h>
+#include <LibGfx/ImageFormats/PPMLoader.h>
+#include <LibGfx/ImageFormats/QOILoader.h>
+#include <LibGfx/ImageFormats/TGALoader.h>
+#include <LibGfx/ImageFormats/WebPLoader.h>
 
 namespace Gfx {
 

Userland/Libraries/LibGfx/ImageFormats/JPEGLoader.cpp

@@ -14,7 +14,7 @@
 #include <AK/String.h>
 #include <AK/Try.h>
 #include <AK/Vector.h>
-#include <LibGfx/JPEGLoader.h>
+#include <LibGfx/ImageFormats/JPEGLoader.h>
 
 #define JPEG_INVALID 0X0000
 

Userland/Libraries/LibGfx/ImageFormats/JPEGLoader.h

@@ -7,7 +7,7 @@
 #pragma once
 
 #include <AK/MemoryStream.h>
-#include <LibGfx/ImageDecoder.h>
+#include <LibGfx/ImageFormats/ImageDecoder.h>
 
 namespace Gfx {
 

Userland/Libraries/LibGfx/ImageFormats/PBMLoader.cpp

@@ -6,9 +6,9 @@
  */
 
 #include "PBMLoader.h"
+#include "AK/Endian.h"
 #include "PortableImageLoaderCommon.h"
-#include "Streamer.h"
-#include <AK/Endian.h>
+#include "Userland/Libraries/LibGfx/Streamer.h"
 #include <string.h>
 
 namespace Gfx {

Userland/Libraries/LibGfx/ImageFormats/PBMLoader.h

@@ -8,8 +8,8 @@
 #pragma once
 
 #include <AK/StringView.h>
-#include <LibGfx/ImageDecoder.h>
-#include <LibGfx/PortableImageMapLoader.h>
+#include <LibGfx/ImageFormats/ImageDecoder.h>
+#include <LibGfx/ImageFormats/PortableImageMapLoader.h>
 
 namespace Gfx {
 

Userland/Libraries/LibGfx/ImageFormats/PGMLoader.cpp

@@ -5,10 +5,10 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include "PGMLoader.h"
-#include "PortableImageLoaderCommon.h"
-#include "Streamer.h"
 #include <AK/Endian.h>
+#include <LibGfx/ImageFormats/PGMLoader.h>
+#include <LibGfx/ImageFormats/PortableImageLoaderCommon.h>
+#include <LibGfx/Streamer.h>
 #include <string.h>
 
 namespace Gfx {

Userland/Libraries/LibGfx/ImageFormats/PGMLoader.h

@@ -8,8 +8,8 @@
 #pragma once
 
 #include <AK/StringView.h>
-#include <LibGfx/ImageDecoder.h>
-#include <LibGfx/PortableImageMapLoader.h>
+#include <LibGfx/ImageFormats/ImageDecoder.h>
+#include <LibGfx/ImageFormats/PortableImageMapLoader.h>
 
 namespace Gfx {
 

Userland/Libraries/LibGfx/ImageFormats/PNGLoader.cpp

@@ -9,8 +9,8 @@
 #include <AK/Endian.h>
 #include <AK/Vector.h>
 #include <LibCompress/Zlib.h>
-#include <LibGfx/PNGLoader.h>
-#include <LibGfx/PNGShared.h>
+#include <LibGfx/ImageFormats/PNGLoader.h>
+#include <LibGfx/ImageFormats/PNGShared.h>
 #include <string.h>
 
 namespace Gfx {

Userland/Libraries/LibGfx/ImageFormats/PNGLoader.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <LibGfx/ImageDecoder.h>
+#include <LibGfx/ImageFormats/ImageDecoder.h>
 
 namespace Gfx {
 

Userland/Libraries/LibGfx/ImageFormats/PNGWriter.cpp

@@ -13,7 +13,7 @@
 #include <LibCompress/Zlib.h>
 #include <LibCrypto/Checksum/CRC32.h>
 #include <LibGfx/Bitmap.h>
-#include <LibGfx/PNGWriter.h>
+#include <LibGfx/ImageFormats/PNGWriter.h>
 
 #pragma GCC diagnostic ignored "-Wpsabi"
 

Userland/Libraries/LibGfx/ImageFormats/PNGWriter.h

@@ -10,7 +10,7 @@
 #include <AK/Optional.h>
 #include <AK/Vector.h>
 #include <LibGfx/Forward.h>
-#include <LibGfx/PNGShared.h>
+#include <LibGfx/ImageFormats/PNGShared.h>
 
 namespace Gfx {
 

Userland/Libraries/LibGfx/ImageFormats/PPMLoader.cpp

@@ -7,11 +7,11 @@
 
 #include "PPMLoader.h"
 #include "PortableImageLoaderCommon.h"
-#include "Streamer.h"
 #include <AK/Endian.h>
 #include <AK/LexicalPath.h>
 #include <AK/ScopeGuard.h>
 #include <AK/StringBuilder.h>
+#include <LibGfx/Streamer.h>
 #include <string.h>
 
 namespace Gfx {

Userland/Libraries/LibGfx/ImageFormats/PPMLoader.h

@@ -8,8 +8,8 @@
 #pragma once
 
 #include <AK/StringView.h>
-#include <LibGfx/ImageDecoder.h>
-#include <LibGfx/PortableImageMapLoader.h>
+#include <LibGfx/ImageFormats/ImageDecoder.h>
+#include <LibGfx/ImageFormats/PortableImageMapLoader.h>
 
 namespace Gfx {
 

Userland/Libraries/LibGfx/ImageFormats/PortableImageLoaderCommon.h

@@ -16,7 +16,7 @@
 #include <AK/Vector.h>
 #include <LibGfx/Bitmap.h>
 #include <LibGfx/Color.h>
-#include <LibGfx/ImageDecoder.h>
+#include <LibGfx/ImageFormats/ImageDecoder.h>
 #include <LibGfx/Streamer.h>
 
 namespace Gfx {

Userland/Libraries/LibGfx/ImageFormats/PortableImageMapLoader.h

@@ -11,7 +11,7 @@
 #include <AK/StringView.h>
 #include <AK/Types.h>
 #include <LibGfx/Bitmap.h>
-#include <LibGfx/PortableImageLoaderCommon.h>
+#include <LibGfx/ImageFormats/PortableImageLoaderCommon.h>
 
 namespace Gfx {
 

Userland/Libraries/LibGfx/ImageFormats/QOILoader.cpp

@@ -7,7 +7,7 @@
 #include <AK/Endian.h>
 #include <AK/MemoryStream.h>
 #include <LibGfx/Bitmap.h>
-#include <LibGfx/QOILoader.h>
+#include <LibGfx/ImageFormats/QOILoader.h>
 
 namespace Gfx {
 

Userland/Libraries/LibGfx/ImageFormats/QOILoader.h

@@ -8,7 +8,7 @@
 
 #include <AK/Forward.h>
 #include <LibGfx/Forward.h>
-#include <LibGfx/ImageDecoder.h>
+#include <LibGfx/ImageFormats/ImageDecoder.h>
 
 namespace Gfx {
 

Userland/Libraries/LibGfx/ImageFormats/TGALoader.cpp

@@ -7,7 +7,7 @@
 #include <AK/Span.h>
 #include <AK/StdLibExtraDetails.h>
 #include <AK/String.h>
-#include <LibGfx/TGALoader.h>
+#include <LibGfx/ImageFormats/TGALoader.h>
 
 namespace Gfx {
 

Userland/Libraries/LibGfx/ImageFormats/TGALoader.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <LibGfx/ImageDecoder.h>
+#include <LibGfx/ImageFormats/ImageDecoder.h>
 
 namespace Gfx {
 

Userland/Libraries/LibGfx/ImageFormats/WebPLoader.cpp

@@ -8,7 +8,7 @@
 #include <AK/Endian.h>
 #include <AK/Format.h>
 #include <AK/Vector.h>
-#include <LibGfx/WebPLoader.h>
+#include <LibGfx/ImageFormats/WebPLoader.h>
 
 // Overview: https://developers.google.com/speed/webp/docs/compression
 // Container: https://developers.google.com/speed/webp/docs/riff_container

Userland/Libraries/LibGfx/ImageFormats/WebPLoader.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <LibGfx/ImageDecoder.h>
+#include <LibGfx/ImageFormats/ImageDecoder.h>
 
 namespace Gfx {
 

Userland/Libraries/LibPDF/Filter.cpp

@@ -6,7 +6,7 @@
 
 #include <AK/Hex.h>
 #include <LibCompress/Deflate.h>
-#include <LibGfx/JPEGLoader.h>
+#include <LibGfx/ImageFormats/JPEGLoader.h>
 #include <LibPDF/CommonNames.h>
 #include <LibPDF/Filter.h>
 

Userland/Libraries/LibWeb/HTML/HTMLCanvasElement.cpp

@@ -7,7 +7,7 @@
 #include <AK/Base64.h>
 #include <AK/Checked.h>
 #include <LibGfx/Bitmap.h>
-#include <LibGfx/PNGWriter.h>
+#include <LibGfx/ImageFormats/PNGWriter.h>
 #include <LibWeb/CSS/StyleComputer.h>
 #include <LibWeb/DOM/Document.h>
 #include <LibWeb/HTML/CanvasRenderingContext2D.h>

Userland/Libraries/LibWeb/Loader/FrameLoader.cpp

@@ -9,7 +9,7 @@
 #include <AK/LexicalPath.h>
 #include <AK/SourceGenerator.h>
 #include <LibGemini/Document.h>
-#include <LibGfx/ImageDecoder.h>
+#include <LibGfx/ImageFormats/ImageDecoder.h>
 #include <LibMarkdown/Document.h>
 #include <LibWeb/Bindings/MainThreadVM.h>
 #include <LibWeb/DOM/Document.h>

Userland/Services/ImageDecoder/ConnectionFromClient.cpp

@@ -8,7 +8,7 @@
 #include <ImageDecoder/ConnectionFromClient.h>
 #include <ImageDecoder/ImageDecoderClientEndpoint.h>
 #include <LibGfx/Bitmap.h>
-#include <LibGfx/ImageDecoder.h>
+#include <LibGfx/ImageFormats/ImageDecoder.h>
 
 namespace ImageDecoder {
 

Userland/Services/SpiceAgent/SpiceAgent.cpp

@@ -7,11 +7,11 @@
 #include "SpiceAgent.h"
 #include "ConnectionToClipboardServer.h"
 #include <AK/DeprecatedString.h>
-#include <LibGfx/BMPLoader.h>
 #include <LibGfx/Bitmap.h>
-#include <LibGfx/JPEGLoader.h>
-#include <LibGfx/PNGLoader.h>
-#include <LibGfx/PNGWriter.h>
+#include <LibGfx/ImageFormats/BMPLoader.h>
+#include <LibGfx/ImageFormats/JPEGLoader.h>
+#include <LibGfx/ImageFormats/PNGLoader.h>
+#include <LibGfx/ImageFormats/PNGWriter.h>
 #include <memory.h>
 #include <unistd.h>
 

Userland/Utilities/file.cpp

@@ -14,7 +14,7 @@
 #include <LibCore/System.h>
 #include <LibELF/Image.h>
 #include <LibELF/Validation.h>
-#include <LibGfx/ImageDecoder.h>
+#include <LibGfx/ImageFormats/ImageDecoder.h>
 #include <LibMain/Main.h>
 #include <stdio.h>
 #include <sys/stat.h>

Userland/Utilities/headless-browser.cpp

@@ -27,7 +27,7 @@
 #include <LibFileSystem/FileSystem.h>
 #include <LibGfx/Bitmap.h>
 #include <LibGfx/Font/FontDatabase.h>
-#include <LibGfx/PNGWriter.h>
+#include <LibGfx/ImageFormats/PNGWriter.h>
 #include <LibGfx/Point.h>
 #include <LibGfx/Rect.h>
 #include <LibGfx/ShareableBitmap.h>

Userland/Utilities/icc.cpp

@@ -14,7 +14,7 @@
 #include <LibGfx/ICC/Profile.h>
 #include <LibGfx/ICC/Tags.h>
 #include <LibGfx/ICC/WellKnownProfiles.h>
-#include <LibGfx/ImageDecoder.h>
+#include <LibGfx/ImageFormats/ImageDecoder.h>
 #include <LibVideo/Color/CodingIndependentCodePoints.h>
 
 template<class T>

Userland/Utilities/image.cpp

@@ -7,11 +7,11 @@
 #include <LibCore/ArgsParser.h>
 #include <LibCore/File.h>
 #include <LibCore/MappedFile.h>
-#include <LibGfx/BMPWriter.h>
-#include <LibGfx/ImageDecoder.h>
-#include <LibGfx/PNGWriter.h>
-#include <LibGfx/PortableFormatWriter.h>
-#include <LibGfx/QOIWriter.h>
+#include <LibGfx/ImageFormats/BMPWriter.h>
+#include <LibGfx/ImageFormats/ImageDecoder.h>
+#include <LibGfx/ImageFormats/PNGWriter.h>
+#include <LibGfx/ImageFormats/PortableFormatWriter.h>
+#include <LibGfx/ImageFormats/QOIWriter.h>
 
 ErrorOr<int> serenity_main(Main::Arguments arguments)
 {

Userland/Utilities/shot.cpp

@@ -19,7 +19,7 @@
 #include <LibGUI/Painter.h>
 #include <LibGUI/Widget.h>
 #include <LibGUI/Window.h>
-#include <LibGfx/PNGWriter.h>
+#include <LibGfx/ImageFormats/PNGWriter.h>
 #include <LibGfx/Palette.h>
 #include <LibMain/Main.h>
 #include <unistd.h>