[Scummvm-git-logs] scummvm master -> fd123d667937f87d9cd4e6edb9635ba1e8efc5a0

[sev-]

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
0581301b24 COMMON: Move huffman.h back out of the compression directory
28d7b361ea COMMON: Move more file format code into common/formats
fd123d6679 COMMON: Split compression and formats into separate modules


Commit: 0581301b24e7ff17617c28628bf6e7c3f61e6799
    https://github.com/scummvm/scummvm/commit/0581301b24e7ff17617c28628bf6e7c3f61e6799
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2022-12-11T22:33:23+01:00

Commit Message:
COMMON: Move huffman.h back out of the compression directory

Changed paths:
  A common/huffman.h
  R common/compression/huffman.h
    audio/decoders/wma.cpp
    engines/macventure/macventure.h
    image/codecs/svq1.cpp
    test/common/huffman.h
    video/bink_decoder.cpp
    video/psx_decoder.cpp


diff --git a/audio/decoders/wma.cpp b/audio/decoders/wma.cpp
index 706ce0489df..bc76fdfd57c 100644
--- a/audio/decoders/wma.cpp
+++ b/audio/decoders/wma.cpp
@@ -26,7 +26,7 @@
 #include "common/math.h"
 #include "common/error.h"
 #include "common/memstream.h"
-#include "common/compression/huffman.h"
+#include "common/huffman.h"
 
 #include "math/mdct.h"
 #include "math/sinewindows.h"
diff --git a/common/compression/huffman.h b/common/huffman.h
similarity index 100%
rename from common/compression/huffman.h
rename to common/huffman.h
diff --git a/engines/macventure/macventure.h b/engines/macventure/macventure.h
index 078e3e28d5a..663a25c6f62 100644
--- a/engines/macventure/macventure.h
+++ b/engines/macventure/macventure.h
@@ -36,7 +36,7 @@
 #include "common/debug.h"
 #include "common/random.h"
 #include "common/macresman.h"
-#include "common/compression/huffman.h"
+#include "common/huffman.h"
 #include "common/savefile.h"
 
 #include "gui/debugger.h"
diff --git a/image/codecs/svq1.cpp b/image/codecs/svq1.cpp
index e0aee0b5deb..c02c5f22e09 100644
--- a/image/codecs/svq1.cpp
+++ b/image/codecs/svq1.cpp
@@ -32,7 +32,7 @@
 #include "common/system.h"
 #include "common/debug.h"
 #include "common/textconsole.h"
-#include "common/compression/huffman.h"
+#include "common/huffman.h"
 
 #include "graphics/yuv_to_rgb.h"
 
diff --git a/test/common/huffman.h b/test/common/huffman.h
index 1ebaa1f44fd..3e3956a3213 100644
--- a/test/common/huffman.h
+++ b/test/common/huffman.h
@@ -1,10 +1,10 @@
 #include <cxxtest/TestSuite.h>
-#include "common/compression/huffman.h"
+#include "common/huffman.h"
 #include "common/bitstream.h"
 #include "common/memstream.h"
 
 /**
-* A test suite for the Huffman decoder in common/compression/huffman.h
+* A test suite for the Huffman decoder in common/huffman.h
 * The encoding used comes from the example on the Wikipedia page
 * for Huffman.
 * TODO: It could be improved by generating one at runtime.
diff --git a/video/bink_decoder.cpp b/video/bink_decoder.cpp
index fec8ae88cab..30de3d478dc 100644
--- a/video/bink_decoder.cpp
+++ b/video/bink_decoder.cpp
@@ -34,7 +34,7 @@
 #include "common/file.h"
 #include "common/str.h"
 #include "common/bitstream.h"
-#include "common/compression/huffman.h"
+#include "common/huffman.h"
 #include "common/system.h"
 
 #include "graphics/yuv_to_rgb.h"
diff --git a/video/psx_decoder.cpp b/video/psx_decoder.cpp
index 6c911f1ecdf..4658f0821d8 100644
--- a/video/psx_decoder.cpp
+++ b/video/psx_decoder.cpp
@@ -25,7 +25,7 @@
 #include "audio/audiostream.h"
 #include "audio/decoders/adpcm.h"
 #include "common/bitstream.h"
-#include "common/compression/huffman.h"
+#include "common/huffman.h"
 #include "common/stream.h"
 #include "common/system.h"
 #include "common/textconsole.h"


Commit: 28d7b361ea3b1144af79468bf20dfea660c163fd
    https://github.com/scummvm/scummvm/commit/28d7b361ea3b1144af79468bf20dfea660c163fd
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2022-12-11T22:33:23+01:00

Commit Message:
COMMON: Move more file format code into common/formats

Changed paths:
  A common/formats/iff_container.cpp
  A common/formats/iff_container.h
  A common/formats/ini-file.cpp
  A common/formats/ini-file.h
  A common/formats/json.cpp
  A common/formats/json.h
  A common/formats/quicktime.cpp
  A common/formats/quicktime.h
  A common/formats/winexe.cpp
  A common/formats/winexe.h
  A common/formats/winexe_ne.cpp
  A common/formats/winexe_ne.h
  A common/formats/winexe_pe.cpp
  A common/formats/winexe_pe.h
  A common/formats/xmlparser.cpp
  A common/formats/xmlparser.h
  R common/iff_container.cpp
  R common/iff_container.h
  R common/ini-file.cpp
  R common/ini-file.h
  R common/json.cpp
  R common/json.h
  R common/quicktime.cpp
  R common/quicktime.h
  R common/winexe.cpp
  R common/winexe.h
  R common/winexe_ne.cpp
  R common/winexe_ne.h
  R common/winexe_pe.cpp
  R common/winexe_pe.h
  R common/xmlparser.cpp
  R common/xmlparser.h
    audio/decoders/iff_sound.cpp
    audio/decoders/quicktime_intern.h
    audio/midiparser_qt.h
    backends/cloud/basestorage.cpp
    backends/cloud/box/boxlistdirectorybyidrequest.cpp
    backends/cloud/box/boxstorage.cpp
    backends/cloud/box/boxtokenrefresher.cpp
    backends/cloud/box/boxuploadrequest.cpp
    backends/cloud/dropbox/dropboxcreatedirectoryrequest.cpp
    backends/cloud/dropbox/dropboxinforequest.cpp
    backends/cloud/dropbox/dropboxlistdirectoryrequest.cpp
    backends/cloud/dropbox/dropboxstorage.cpp
    backends/cloud/dropbox/dropboxtokenrefresher.cpp
    backends/cloud/dropbox/dropboxuploadrequest.cpp
    backends/cloud/googledrive/googledrivelistdirectorybyidrequest.cpp
    backends/cloud/googledrive/googledrivestorage.cpp
    backends/cloud/googledrive/googledrivetokenrefresher.cpp
    backends/cloud/googledrive/googledriveuploadrequest.cpp
    backends/cloud/onedrive/onedrivecreatedirectoryrequest.cpp
    backends/cloud/onedrive/onedrivelistdirectoryrequest.cpp
    backends/cloud/onedrive/onedrivestorage.cpp
    backends/cloud/onedrive/onedrivetokenrefresher.cpp
    backends/cloud/onedrive/onedriveuploadrequest.cpp
    backends/cloud/savessyncrequest.cpp
    backends/networking/curl/curljsonrequest.cpp
    backends/networking/curl/curljsonrequest.h
    backends/networking/curl/postrequest.cpp
    backends/networking/curl/sessionrequest.cpp
    backends/networking/sdl_net/handlers/listajaxhandler.cpp
    backends/networking/sdl_net/handlers/listajaxhandler.h
    backends/vkeybd/virtual-keyboard-parser.h
    common/module.mk
    engines/achievements.h
    engines/agi/wagparser.cpp
    engines/buried/buried.cpp
    engines/composer/composer.h
    engines/director/detection.cpp
    engines/director/resource.cpp
    engines/gnap/gnap.cpp
    engines/gob/draw_v7.cpp
    engines/gob/iniconfig.h
    engines/gob/inter_v7.cpp
    engines/hadesch/hadesch.cpp
    engines/hadesch/persistent.cpp
    engines/icb/configfile.cpp
    engines/kyra/script/script.h
    engines/kyra/script/script_tim.cpp
    engines/kyra/sound/drivers/audiomaster2.cpp
    engines/mohawk/cursors.cpp
    engines/mohawk/livingbooks.h
    engines/mtropolis/boot.cpp
    engines/mtropolis/mtropolis.cpp
    engines/nancy/dialogs.cpp
    engines/nancy/iff.cpp
    engines/parallaction/disk_ns.cpp
    engines/petka/interfaces/main.cpp
    engines/petka/objects/object.cpp
    engines/petka/objects/object_bg.cpp
    engines/petka/objects/object_cursor.cpp
    engines/petka/petka.cpp
    engines/petka/q_system.cpp
    engines/pink/pink.cpp
    engines/scumm/he/moonbase/moonbase.cpp
    engines/scumm/he/moonbase/moonbase_fow.cpp
    engines/scumm/he/resource_he.cpp
    engines/scumm/he/script_v80he.cpp
    engines/stark/services/fontprovider.cpp
    engines/stark/services/gamechapter.cpp
    engines/stark/services/gamemessage.cpp
    engines/stark/ui/dialogbox.cpp
    engines/sword25/gfx/animationresource.h
    engines/sword25/gfx/fontresource.h
    engines/testbed/config.h
    engines/toon/script.h
    engines/ultima/ultima8/conf/config_file_manager.h
    graphics/fonts/winfont.cpp
    graphics/macgui/macmenu.cpp
    graphics/wincursor.h
    gui/MetadataParser.h
    gui/ThemeParser.h
    image/iff.cpp
    test/common/ini-file.h


diff --git a/audio/decoders/iff_sound.cpp b/audio/decoders/iff_sound.cpp
index 0f0bee83f45..516fe759fc9 100644
--- a/audio/decoders/iff_sound.cpp
+++ b/audio/decoders/iff_sound.cpp
@@ -22,7 +22,7 @@
 #include "audio/decoders/iff_sound.h"
 #include "audio/audiostream.h"
 #include "audio/decoders/raw.h"
-#include "common/iff_container.h"
+#include "common/formats/iff_container.h"
 #include "common/func.h"
 
 namespace Audio {
diff --git a/audio/decoders/quicktime_intern.h b/audio/decoders/quicktime_intern.h
index 6f5cbf16447..81d89542a83 100644
--- a/audio/decoders/quicktime_intern.h
+++ b/audio/decoders/quicktime_intern.h
@@ -29,7 +29,7 @@
 #ifndef AUDIO_QUICKTIME_INTERN_H
 #define AUDIO_QUICKTIME_INTERN_H
 
-#include "common/quicktime.h"
+#include "common/formats/quicktime.h"
 #include "common/scummsys.h"
 #include "common/types.h"
 
diff --git a/audio/midiparser_qt.h b/audio/midiparser_qt.h
index d305ac265ea..5edfc6543b5 100644
--- a/audio/midiparser_qt.h
+++ b/audio/midiparser_qt.h
@@ -26,7 +26,7 @@
 #include "common/array.h"
 #include "common/hashmap.h"
 #include "common/queue.h"
-#include "common/quicktime.h"
+#include "common/formats/quicktime.h"
 
 /**
  * @defgroup audio_midiparser_qt QT MIDI parser
diff --git a/backends/cloud/basestorage.cpp b/backends/cloud/basestorage.cpp
index 81e99329f7c..8c00d5eac32 100644
--- a/backends/cloud/basestorage.cpp
+++ b/backends/cloud/basestorage.cpp
@@ -25,7 +25,7 @@
 #include "backends/networking/curl/curljsonrequest.h"
 #include "common/config-manager.h"
 #include "common/debug.h"
-#include "common/json.h"
+#include "common/formats/json.h"
 
 namespace Cloud {
 
diff --git a/backends/cloud/box/boxlistdirectorybyidrequest.cpp b/backends/cloud/box/boxlistdirectorybyidrequest.cpp
index 230ba14dd45..902681780ac 100644
--- a/backends/cloud/box/boxlistdirectorybyidrequest.cpp
+++ b/backends/cloud/box/boxlistdirectorybyidrequest.cpp
@@ -27,7 +27,7 @@
 #include "backends/networking/curl/connectionmanager.h"
 #include "backends/networking/curl/curljsonrequest.h"
 #include "backends/networking/curl/networkreadstream.h"
-#include "common/json.h"
+#include "common/formats/json.h"
 
 namespace Cloud {
 namespace Box {
diff --git a/backends/cloud/box/boxstorage.cpp b/backends/cloud/box/boxstorage.cpp
index 0d1c228e888..8baee35c0b8 100644
--- a/backends/cloud/box/boxstorage.cpp
+++ b/backends/cloud/box/boxstorage.cpp
@@ -32,7 +32,7 @@
 #include "backends/networking/curl/networkreadstream.h"
 #include "common/config-manager.h"
 #include "common/debug.h"
-#include "common/json.h"
+#include "common/formats/json.h"
 
 namespace Cloud {
 namespace Box {
diff --git a/backends/cloud/box/boxtokenrefresher.cpp b/backends/cloud/box/boxtokenrefresher.cpp
index b1302aac783..0ba36e70447 100644
--- a/backends/cloud/box/boxtokenrefresher.cpp
+++ b/backends/cloud/box/boxtokenrefresher.cpp
@@ -26,7 +26,7 @@
 #include "backends/cloud/box/boxstorage.h"
 #include "backends/networking/curl/networkreadstream.h"
 #include "common/debug.h"
-#include "common/json.h"
+#include "common/formats/json.h"
 
 namespace Cloud {
 namespace Box {
diff --git a/backends/cloud/box/boxuploadrequest.cpp b/backends/cloud/box/boxuploadrequest.cpp
index 3d6699f0999..a1ddb4fa854 100644
--- a/backends/cloud/box/boxuploadrequest.cpp
+++ b/backends/cloud/box/boxuploadrequest.cpp
@@ -27,7 +27,7 @@
 #include "backends/networking/curl/connectionmanager.h"
 #include "backends/networking/curl/curljsonrequest.h"
 #include "backends/networking/curl/networkreadstream.h"
-#include "common/json.h"
+#include "common/formats/json.h"
 
 namespace Cloud {
 namespace Box {
diff --git a/backends/cloud/dropbox/dropboxcreatedirectoryrequest.cpp b/backends/cloud/dropbox/dropboxcreatedirectoryrequest.cpp
index e41f4bb1c5b..d0b1272221a 100644
--- a/backends/cloud/dropbox/dropboxcreatedirectoryrequest.cpp
+++ b/backends/cloud/dropbox/dropboxcreatedirectoryrequest.cpp
@@ -26,7 +26,7 @@
 #include "backends/networking/curl/connectionmanager.h"
 #include "backends/networking/curl/curljsonrequest.h"
 #include "backends/networking/curl/networkreadstream.h"
-#include "common/json.h"
+#include "common/formats/json.h"
 
 namespace Cloud {
 namespace Dropbox {
diff --git a/backends/cloud/dropbox/dropboxinforequest.cpp b/backends/cloud/dropbox/dropboxinforequest.cpp
index 755d5103f49..e025c8560e2 100644
--- a/backends/cloud/dropbox/dropboxinforequest.cpp
+++ b/backends/cloud/dropbox/dropboxinforequest.cpp
@@ -27,7 +27,7 @@
 #include "backends/networking/curl/connectionmanager.h"
 #include "backends/networking/curl/curljsonrequest.h"
 #include "backends/networking/curl/networkreadstream.h"
-#include "common/json.h"
+#include "common/formats/json.h"
 
 namespace Cloud {
 namespace Dropbox {
diff --git a/backends/cloud/dropbox/dropboxlistdirectoryrequest.cpp b/backends/cloud/dropbox/dropboxlistdirectoryrequest.cpp
index 1af8b2fcc5a..fcb00d82f06 100644
--- a/backends/cloud/dropbox/dropboxlistdirectoryrequest.cpp
+++ b/backends/cloud/dropbox/dropboxlistdirectoryrequest.cpp
@@ -27,7 +27,7 @@
 #include "backends/networking/curl/connectionmanager.h"
 #include "backends/networking/curl/curljsonrequest.h"
 #include "backends/networking/curl/networkreadstream.h"
-#include "common/json.h"
+#include "common/formats/json.h"
 #include "common/debug.h"
 
 namespace Cloud {
diff --git a/backends/cloud/dropbox/dropboxstorage.cpp b/backends/cloud/dropbox/dropboxstorage.cpp
index 25bec084f5a..d406eaf9d4b 100644
--- a/backends/cloud/dropbox/dropboxstorage.cpp
+++ b/backends/cloud/dropbox/dropboxstorage.cpp
@@ -32,7 +32,7 @@
 #include "backends/networking/curl/curljsonrequest.h"
 #include "common/config-manager.h"
 #include "common/debug.h"
-#include "common/json.h"
+#include "common/formats/json.h"
 
 namespace Cloud {
 namespace Dropbox {
diff --git a/backends/cloud/dropbox/dropboxtokenrefresher.cpp b/backends/cloud/dropbox/dropboxtokenrefresher.cpp
index 06fa0d0eaa5..fd645f88b1d 100644
--- a/backends/cloud/dropbox/dropboxtokenrefresher.cpp
+++ b/backends/cloud/dropbox/dropboxtokenrefresher.cpp
@@ -26,7 +26,7 @@
 #include "backends/cloud/dropbox/dropboxstorage.h"
 #include "backends/networking/curl/networkreadstream.h"
 #include "common/debug.h"
-#include "common/json.h"
+#include "common/formats/json.h"
 
 namespace Cloud {
 namespace Dropbox {
diff --git a/backends/cloud/dropbox/dropboxuploadrequest.cpp b/backends/cloud/dropbox/dropboxuploadrequest.cpp
index 980d2bc21a7..1fe6ac4324e 100644
--- a/backends/cloud/dropbox/dropboxuploadrequest.cpp
+++ b/backends/cloud/dropbox/dropboxuploadrequest.cpp
@@ -27,7 +27,7 @@
 #include "backends/networking/curl/connectionmanager.h"
 #include "backends/networking/curl/curljsonrequest.h"
 #include "backends/networking/curl/networkreadstream.h"
-#include "common/json.h"
+#include "common/formats/json.h"
 
 namespace Cloud {
 namespace Dropbox {
diff --git a/backends/cloud/googledrive/googledrivelistdirectorybyidrequest.cpp b/backends/cloud/googledrive/googledrivelistdirectorybyidrequest.cpp
index 47a9a4cb686..808357c3740 100644
--- a/backends/cloud/googledrive/googledrivelistdirectorybyidrequest.cpp
+++ b/backends/cloud/googledrive/googledrivelistdirectorybyidrequest.cpp
@@ -26,7 +26,7 @@
 #include "backends/networking/curl/connectionmanager.h"
 #include "backends/networking/curl/curljsonrequest.h"
 #include "backends/networking/curl/networkreadstream.h"
-#include "common/json.h"
+#include "common/formats/json.h"
 #include "googledrivetokenrefresher.h"
 
 namespace Cloud {
diff --git a/backends/cloud/googledrive/googledrivestorage.cpp b/backends/cloud/googledrive/googledrivestorage.cpp
index 4d721640634..5d5ddc3a292 100644
--- a/backends/cloud/googledrive/googledrivestorage.cpp
+++ b/backends/cloud/googledrive/googledrivestorage.cpp
@@ -32,7 +32,7 @@
 #include "backends/networking/curl/networkreadstream.h"
 #include "common/config-manager.h"
 #include "common/debug.h"
-#include "common/json.h"
+#include "common/formats/json.h"
 #include "common/debug.h"
 
 namespace Cloud {
diff --git a/backends/cloud/googledrive/googledrivetokenrefresher.cpp b/backends/cloud/googledrive/googledrivetokenrefresher.cpp
index 93186d8c2f7..f5e6868eb11 100644
--- a/backends/cloud/googledrive/googledrivetokenrefresher.cpp
+++ b/backends/cloud/googledrive/googledrivetokenrefresher.cpp
@@ -26,7 +26,7 @@
 #include "backends/cloud/googledrive/googledrivestorage.h"
 #include "backends/networking/curl/networkreadstream.h"
 #include "common/debug.h"
-#include "common/json.h"
+#include "common/formats/json.h"
 
 namespace Cloud {
 namespace GoogleDrive {
diff --git a/backends/cloud/googledrive/googledriveuploadrequest.cpp b/backends/cloud/googledrive/googledriveuploadrequest.cpp
index f3d2f8c7bb4..a67e32e4695 100644
--- a/backends/cloud/googledrive/googledriveuploadrequest.cpp
+++ b/backends/cloud/googledrive/googledriveuploadrequest.cpp
@@ -26,7 +26,7 @@
 #include "backends/networking/curl/connectionmanager.h"
 #include "backends/networking/curl/curljsonrequest.h"
 #include "backends/networking/curl/networkreadstream.h"
-#include "common/json.h"
+#include "common/formats/json.h"
 #include "googledrivetokenrefresher.h"
 
 namespace Cloud {
diff --git a/backends/cloud/onedrive/onedrivecreatedirectoryrequest.cpp b/backends/cloud/onedrive/onedrivecreatedirectoryrequest.cpp
index 500cd6f96d8..bab2a4f6192 100644
--- a/backends/cloud/onedrive/onedrivecreatedirectoryrequest.cpp
+++ b/backends/cloud/onedrive/onedrivecreatedirectoryrequest.cpp
@@ -25,7 +25,7 @@
 #include "backends/networking/curl/connectionmanager.h"
 #include "backends/networking/curl/curljsonrequest.h"
 #include "backends/networking/curl/networkreadstream.h"
-#include "common/json.h"
+#include "common/formats/json.h"
 
 namespace Cloud {
 namespace OneDrive {
diff --git a/backends/cloud/onedrive/onedrivelistdirectoryrequest.cpp b/backends/cloud/onedrive/onedrivelistdirectoryrequest.cpp
index f5d0de7acdf..43253d64501 100644
--- a/backends/cloud/onedrive/onedrivelistdirectoryrequest.cpp
+++ b/backends/cloud/onedrive/onedrivelistdirectoryrequest.cpp
@@ -25,7 +25,7 @@
 #include "backends/cloud/iso8601.h"
 #include "backends/networking/curl/connectionmanager.h"
 #include "backends/networking/curl/networkreadstream.h"
-#include "common/json.h"
+#include "common/formats/json.h"
 
 namespace Cloud {
 namespace OneDrive {
diff --git a/backends/cloud/onedrive/onedrivestorage.cpp b/backends/cloud/onedrive/onedrivestorage.cpp
index 8c44d873f08..ac800e45e05 100644
--- a/backends/cloud/onedrive/onedrivestorage.cpp
+++ b/backends/cloud/onedrive/onedrivestorage.cpp
@@ -33,7 +33,7 @@
 #include "backends/networking/curl/networkreadstream.h"
 #include "common/config-manager.h"
 #include "common/debug.h"
-#include "common/json.h"
+#include "common/formats/json.h"
 
 namespace Cloud {
 namespace OneDrive {
diff --git a/backends/cloud/onedrive/onedrivetokenrefresher.cpp b/backends/cloud/onedrive/onedrivetokenrefresher.cpp
index db6affd70b9..f5b39ff825b 100644
--- a/backends/cloud/onedrive/onedrivetokenrefresher.cpp
+++ b/backends/cloud/onedrive/onedrivetokenrefresher.cpp
@@ -26,7 +26,7 @@
 #include "backends/cloud/onedrive/onedrivestorage.h"
 #include "backends/networking/curl/networkreadstream.h"
 #include "common/debug.h"
-#include "common/json.h"
+#include "common/formats/json.h"
 
 namespace Cloud {
 namespace OneDrive {
diff --git a/backends/cloud/onedrive/onedriveuploadrequest.cpp b/backends/cloud/onedrive/onedriveuploadrequest.cpp
index 4f5355d4f1f..df890d8f740 100644
--- a/backends/cloud/onedrive/onedriveuploadrequest.cpp
+++ b/backends/cloud/onedrive/onedriveuploadrequest.cpp
@@ -26,7 +26,7 @@
 #include "backends/networking/curl/connectionmanager.h"
 #include "backends/networking/curl/curljsonrequest.h"
 #include "backends/networking/curl/networkreadstream.h"
-#include "common/json.h"
+#include "common/formats/json.h"
 #include "onedrivetokenrefresher.h"
 
 namespace Cloud {
diff --git a/backends/cloud/savessyncrequest.cpp b/backends/cloud/savessyncrequest.cpp
index 6f7646ea4e9..deb22376088 100644
--- a/backends/cloud/savessyncrequest.cpp
+++ b/backends/cloud/savessyncrequest.cpp
@@ -28,7 +28,7 @@
 #include "common/config-manager.h"
 #include "common/debug.h"
 #include "common/file.h"
-#include "common/json.h"
+#include "common/formats/json.h"
 #include "common/savefile.h"
 #include "common/system.h"
 #include "gui/saveload-dialog.h"
diff --git a/backends/networking/curl/curljsonrequest.cpp b/backends/networking/curl/curljsonrequest.cpp
index 8653151c9fb..6b56f9b2e84 100644
--- a/backends/networking/curl/curljsonrequest.cpp
+++ b/backends/networking/curl/curljsonrequest.cpp
@@ -26,7 +26,7 @@
 #include "backends/networking/curl/connectionmanager.h"
 #include "backends/networking/curl/networkreadstream.h"
 #include "common/debug.h"
-#include "common/json.h"
+#include "common/formats/json.h"
 
 namespace Networking {
 
diff --git a/backends/networking/curl/curljsonrequest.h b/backends/networking/curl/curljsonrequest.h
index 2e028d15c1d..5685481a6a8 100644
--- a/backends/networking/curl/curljsonrequest.h
+++ b/backends/networking/curl/curljsonrequest.h
@@ -24,7 +24,7 @@
 
 #include "backends/networking/curl/curlrequest.h"
 #include "common/memstream.h"
-#include "common/json.h"
+#include "common/formats/json.h"
 
 namespace Networking {
 
diff --git a/backends/networking/curl/postrequest.cpp b/backends/networking/curl/postrequest.cpp
index ba8e54b2b0c..0acf7f5162f 100644
--- a/backends/networking/curl/postrequest.cpp
+++ b/backends/networking/curl/postrequest.cpp
@@ -23,7 +23,7 @@
 #include "backends/networking/curl/connectionmanager.h"
 #include "backends/networking/curl/curljsonrequest.h"
 #include "backends/networking/curl/networkreadstream.h"
-#include "common/json.h"
+#include "common/formats/json.h"
 
 namespace Networking {
 
diff --git a/backends/networking/curl/sessionrequest.cpp b/backends/networking/curl/sessionrequest.cpp
index fd5c96e2bad..a0247480e68 100644
--- a/backends/networking/curl/sessionrequest.cpp
+++ b/backends/networking/curl/sessionrequest.cpp
@@ -27,7 +27,7 @@
 #include "backends/networking/curl/sessionrequest.h"
 #include "common/debug.h"
 #include "common/file.h"
-#include "common/json.h"
+#include "common/formats/json.h"
 
 namespace Networking {
 
diff --git a/backends/networking/sdl_net/handlers/listajaxhandler.cpp b/backends/networking/sdl_net/handlers/listajaxhandler.cpp
index e154929fcb9..486167dba38 100644
--- a/backends/networking/sdl_net/handlers/listajaxhandler.cpp
+++ b/backends/networking/sdl_net/handlers/listajaxhandler.cpp
@@ -23,7 +23,7 @@
 #include "backends/networking/sdl_net/handlerutils.h"
 #include "backends/networking/sdl_net/localwebserver.h"
 #include "common/config-manager.h"
-#include "common/json.h"
+#include "common/formats/json.h"
 #include "common/translation.h"
 
 namespace Networking {
diff --git a/backends/networking/sdl_net/handlers/listajaxhandler.h b/backends/networking/sdl_net/handlers/listajaxhandler.h
index d2ecdff28a3..79dcbcffa5a 100644
--- a/backends/networking/sdl_net/handlers/listajaxhandler.h
+++ b/backends/networking/sdl_net/handlers/listajaxhandler.h
@@ -23,7 +23,7 @@
 #define BACKENDS_NETWORKING_SDL_NET_LISTAJAXHANDLER_H
 
 #include "backends/networking/sdl_net/handlers/filesbasehandler.h"
-#include "common/json.h"
+#include "common/formats/json.h"
 
 namespace Networking {
 
diff --git a/backends/vkeybd/virtual-keyboard-parser.h b/backends/vkeybd/virtual-keyboard-parser.h
index dc270f21365..7f66f1ebbe5 100644
--- a/backends/vkeybd/virtual-keyboard-parser.h
+++ b/backends/vkeybd/virtual-keyboard-parser.h
@@ -26,7 +26,7 @@
 
 #ifdef ENABLE_VKEYBD
 
-#include "common/xmlparser.h"
+#include "common/formats/xmlparser.h"
 #include "backends/vkeybd/virtual-keyboard.h"
 
 /**
diff --git a/common/iff_container.cpp b/common/formats/iff_container.cpp
similarity index 98%
rename from common/iff_container.cpp
rename to common/formats/iff_container.cpp
index b932942a1f1..718fcfa7b76 100644
--- a/common/iff_container.cpp
+++ b/common/formats/iff_container.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "common/iff_container.h"
+#include "common/formats/iff_container.h"
 #include "common/substream.h"
 #include "common/util.h"
 
diff --git a/common/iff_container.h b/common/formats/iff_container.h
similarity index 100%
rename from common/iff_container.h
rename to common/formats/iff_container.h
diff --git a/common/ini-file.cpp b/common/formats/ini-file.cpp
similarity index 99%
rename from common/ini-file.cpp
rename to common/formats/ini-file.cpp
index 93f1a818bad..237306e5fbf 100644
--- a/common/ini-file.cpp
+++ b/common/formats/ini-file.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "common/ini-file.h"
+#include "common/formats/ini-file.h"
 #include "common/file.h"
 #include "common/savefile.h"
 #include "common/system.h"
diff --git a/common/ini-file.h b/common/formats/ini-file.h
similarity index 100%
rename from common/ini-file.h
rename to common/formats/ini-file.h
diff --git a/common/json.cpp b/common/formats/json.cpp
similarity index 99%
rename from common/json.cpp
rename to common/formats/json.cpp
index 76cf92f27af..a5e087e85aa 100644
--- a/common/json.cpp
+++ b/common/formats/json.cpp
@@ -43,7 +43,7 @@
  * THE SOFTWARE.
  */
 
-#include "common/json.h"
+#include "common/formats/json.h"
 
 #ifdef __MINGW32__
 #define wcsncasecmp wcsnicmp
diff --git a/common/json.h b/common/formats/json.h
similarity index 100%
rename from common/json.h
rename to common/formats/json.h
diff --git a/common/quicktime.cpp b/common/formats/quicktime.cpp
similarity index 99%
rename from common/quicktime.cpp
rename to common/formats/quicktime.cpp
index 87b5ec95e18..7b03529917c 100644
--- a/common/quicktime.cpp
+++ b/common/formats/quicktime.cpp
@@ -31,7 +31,7 @@
 #include "common/endian.h"
 #include "common/macresman.h"
 #include "common/memstream.h"
-#include "common/quicktime.h"
+#include "common/formats/quicktime.h"
 #include "common/textconsole.h"
 #include "common/util.h"
 #include "common/compression/zlib.h"
diff --git a/common/quicktime.h b/common/formats/quicktime.h
similarity index 100%
rename from common/quicktime.h
rename to common/formats/quicktime.h
diff --git a/common/winexe.cpp b/common/formats/winexe.cpp
similarity index 98%
rename from common/winexe.cpp
rename to common/formats/winexe.cpp
index b23a3bb53de..510ef615856 100644
--- a/common/winexe.cpp
+++ b/common/formats/winexe.cpp
@@ -23,9 +23,9 @@
 #include "common/memstream.h"
 #include "common/str.h"
 #include "common/ustr.h"
-#include "common/winexe.h"
-#include "common/winexe_ne.h"
-#include "common/winexe_pe.h"
+#include "common/formats/winexe.h"
+#include "common/formats/winexe_ne.h"
+#include "common/formats/winexe_pe.h"
 
 namespace Common {
 
diff --git a/common/winexe.h b/common/formats/winexe.h
similarity index 100%
rename from common/winexe.h
rename to common/formats/winexe.h
diff --git a/common/winexe_ne.cpp b/common/formats/winexe_ne.cpp
similarity index 99%
rename from common/winexe_ne.cpp
rename to common/formats/winexe_ne.cpp
index ec5b6205b75..fb44eee2fed 100644
--- a/common/winexe_ne.cpp
+++ b/common/formats/winexe_ne.cpp
@@ -22,7 +22,7 @@
 #include "common/debug.h"
 #include "common/str.h"
 #include "common/stream.h"
-#include "common/winexe_ne.h"
+#include "common/formats/winexe_ne.h"
 
 namespace Common {
 
diff --git a/common/winexe_ne.h b/common/formats/winexe_ne.h
similarity index 98%
rename from common/winexe_ne.h
rename to common/formats/winexe_ne.h
index 4aea3da64c3..0bbdebbe3a8 100644
--- a/common/winexe_ne.h
+++ b/common/formats/winexe_ne.h
@@ -24,7 +24,7 @@
 
 #include "common/list.h"
 #include "common/str.h"
-#include "common/winexe.h"
+#include "common/formats/winexe.h"
 
 namespace Common {
 
diff --git a/common/winexe_pe.cpp b/common/formats/winexe_pe.cpp
similarity index 99%
rename from common/winexe_pe.cpp
rename to common/formats/winexe_pe.cpp
index 5fd1e9487bb..af8ac645ec9 100644
--- a/common/winexe_pe.cpp
+++ b/common/formats/winexe_pe.cpp
@@ -24,7 +24,7 @@
 #include "common/endian.h"
 #include "common/str.h"
 #include "common/stream.h"
-#include "common/winexe_pe.h"
+#include "common/formats/winexe_pe.h"
 
 namespace Common {
 
diff --git a/common/winexe_pe.h b/common/formats/winexe_pe.h
similarity index 98%
rename from common/winexe_pe.h
rename to common/formats/winexe_pe.h
index 14ada33c47c..c67f346c245 100644
--- a/common/winexe_pe.h
+++ b/common/formats/winexe_pe.h
@@ -25,7 +25,7 @@
 #include "common/hash-str.h"
 #include "common/hashmap.h"
 #include "common/str.h"
-#include "common/winexe.h"
+#include "common/formats/winexe.h"
 
 namespace Common {
 
diff --git a/common/xmlparser.cpp b/common/formats/xmlparser.cpp
similarity index 99%
rename from common/xmlparser.cpp
rename to common/formats/xmlparser.cpp
index aa7471e6878..e834edfd8fa 100644
--- a/common/xmlparser.cpp
+++ b/common/formats/xmlparser.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "common/xmlparser.h"
+#include "common/formats/xmlparser.h"
 #include "common/archive.h"
 #include "common/fs.h"
 #include "common/memstream.h"
diff --git a/common/xmlparser.h b/common/formats/xmlparser.h
similarity index 100%
rename from common/xmlparser.h
rename to common/formats/xmlparser.h
diff --git a/common/module.mk b/common/module.mk
index fe270afd910..95de5bb49ce 100644
--- a/common/module.mk
+++ b/common/module.mk
@@ -13,9 +13,6 @@ MODULE_OBJS := \
 	fs.o \
 	gui_options.o \
 	hashmap.o \
-	iff_container.o \
-	ini-file.o \
-	json.o \
 	language.o \
 	localization.o \
 	macresman.o \
@@ -26,7 +23,6 @@ MODULE_OBJS := \
 	path.o \
 	platform.o \
 	punycode.o \
-	quicktime.o \
 	random.o \
 	rational.o \
 	rendermode.o \
@@ -43,10 +39,6 @@ MODULE_OBJS := \
 	unicode-bidi.o \
 	ustr.o \
 	util.o \
-	winexe.o \
-	winexe_ne.o \
-	winexe_pe.o \
-	xmlparser.o \
 	xpfloat.o \
 	compression/clickteam.o \
 	compression/dcl.o \
@@ -59,7 +51,15 @@ MODULE_OBJS := \
 	compression/unarj.o \
 	compression/unzip.o \
 	compression/vise.o \
-	compression/zlib.o
+	compression/zlib.o \
+	formats/iff_container.o \
+	formats/ini-file.o \
+	formats/json.o \
+	formats/quicktime.o \
+	formats/winexe.o \
+	formats/winexe_ne.o \
+	formats/winexe_pe.o \
+	formats/xmlparser.o
 
 ifdef ENABLE_EVENTRECORDER
 MODULE_OBJS += \
diff --git a/engines/achievements.h b/engines/achievements.h
index 1a1adbb9eff..627a49dbce9 100644
--- a/engines/achievements.h
+++ b/engines/achievements.h
@@ -23,7 +23,7 @@
 #define COMMON_ACHIEVEMENTS_H
 
 #include "common/array.h"
-#include "common/ini-file.h"
+#include "common/formats/ini-file.h"
 #include "common/hashmap.h"
 #include "common/singleton.h"
 #include "common/str.h"
diff --git a/engines/agi/wagparser.cpp b/engines/agi/wagparser.cpp
index 04c01fe5aa6..efd488a1148 100644
--- a/engines/agi/wagparser.cpp
+++ b/engines/agi/wagparser.cpp
@@ -24,7 +24,7 @@
 #include "common/fs.h"
 #include "common/debug.h"
 #include "common/textconsole.h"
-#include "common/ini-file.h"
+#include "common/formats/ini-file.h"
 
 #include "agi/wagparser.h"
 
diff --git a/engines/buried/buried.cpp b/engines/buried/buried.cpp
index b5143ca2fb8..1b051c682fe 100644
--- a/engines/buried/buried.cpp
+++ b/engines/buried/buried.cpp
@@ -31,8 +31,8 @@
 #include "common/system.h"
 #include "common/textconsole.h"
 #include "common/translation.h"
-#include "common/winexe_ne.h"
-#include "common/winexe_pe.h"
+#include "common/formats/winexe_ne.h"
+#include "common/formats/winexe_pe.h"
 #include "engines/util.h"
 #include "graphics/wincursor.h"
 #include "gui/message.h"
diff --git a/engines/composer/composer.h b/engines/composer/composer.h
index f612537ce2f..47cc1b2ea71 100644
--- a/engines/composer/composer.h
+++ b/engines/composer/composer.h
@@ -22,7 +22,7 @@
 #ifndef COMPOSER_COMPOSER_H
 #define COMPOSER_COMPOSER_H
 
-#include "common/ini-file.h"
+#include "common/formats/ini-file.h"
 #include "common/random.h"
 #include "common/system.h"
 #include "common/debug.h"
diff --git a/engines/director/detection.cpp b/engines/director/detection.cpp
index 7a5f50c08cd..bf81703e257 100644
--- a/engines/director/detection.cpp
+++ b/engines/director/detection.cpp
@@ -24,7 +24,7 @@
 #include "engines/advancedDetector.h"
 
 #include "common/file.h"
-#include "common/winexe.h"
+#include "common/formats/winexe.h"
 
 #include "director/detection.h"
 #include "director/director.h"
diff --git a/engines/director/resource.cpp b/engines/director/resource.cpp
index b774b646740..70b379f18ea 100644
--- a/engines/director/resource.cpp
+++ b/engines/director/resource.cpp
@@ -24,7 +24,7 @@
 #include "common/file.h"
 #include "common/macresman.h"
 #include "common/substream.h"
-#include "common/winexe.h"
+#include "common/formats/winexe.h"
 #include "graphics/wincursor.h"
 
 #include "director/director.h"
diff --git a/engines/gnap/gnap.cpp b/engines/gnap/gnap.cpp
index e57439249e1..78a38f5bf64 100644
--- a/engines/gnap/gnap.cpp
+++ b/engines/gnap/gnap.cpp
@@ -29,7 +29,7 @@
 #include "common/config-manager.h"
 #include "common/debug-channels.h"
 #include "common/timer.h"
-#include "common/winexe_pe.h"
+#include "common/formats/winexe_pe.h"
 
 #include "graphics/wincursor.h"
 
diff --git a/engines/gob/draw_v7.cpp b/engines/gob/draw_v7.cpp
index e045657899d..762ab1e01ca 100644
--- a/engines/gob/draw_v7.cpp
+++ b/engines/gob/draw_v7.cpp
@@ -19,8 +19,8 @@
 *
 */
 
-#include "common/winexe_ne.h"
-#include "common/winexe_pe.h"
+#include "common/formats/winexe_ne.h"
+#include "common/formats/winexe_pe.h"
 #include "graphics/cursorman.h"
 #include "graphics/wincursor.h"
 
diff --git a/engines/gob/iniconfig.h b/engines/gob/iniconfig.h
index 4083900cee0..f6a026bbb7e 100644
--- a/engines/gob/iniconfig.h
+++ b/engines/gob/iniconfig.h
@@ -23,7 +23,7 @@
 #define GOB_INICONFIG_H
 
 #include "common/str.h"
-#include "common/ini-file.h"
+#include "common/formats/ini-file.h"
 #include "common/hashmap.h"
 
 namespace Gob {
diff --git a/engines/gob/inter_v7.cpp b/engines/gob/inter_v7.cpp
index 3b05e23b0af..c4ff100f538 100644
--- a/engines/gob/inter_v7.cpp
+++ b/engines/gob/inter_v7.cpp
@@ -23,8 +23,8 @@
 #include "common/endian.h"
 #include "common/archive.h"
 #include "common/translation.h"
-#include "common/winexe_pe.h"
-#include "common/winexe_ne.h"
+#include "common/formats/winexe_pe.h"
+#include "common/formats/winexe_ne.h"
 
 #include "graphics/cursorman.h"
 #include "graphics/wincursor.h"
diff --git a/engines/hadesch/hadesch.cpp b/engines/hadesch/hadesch.cpp
index d9a5452e0e6..d7bf26ded24 100644
--- a/engines/hadesch/hadesch.cpp
+++ b/engines/hadesch/hadesch.cpp
@@ -24,7 +24,7 @@
 #include "common/debug-channels.h"
 #include "common/error.h"
 #include "common/events.h"
-#include "common/ini-file.h"
+#include "common/formats/ini-file.h"
 #include "common/stream.h"
 #include "common/system.h"
 #include "common/file.h"
@@ -48,7 +48,7 @@
 
 #include "graphics/palette.h"
 #include "common/memstream.h"
-#include "common/winexe_pe.h"
+#include "common/formats/winexe_pe.h"
 #include "common/substream.h"
 #include "common/md5.h"
 #include "graphics/wincursor.h"
diff --git a/engines/hadesch/persistent.cpp b/engines/hadesch/persistent.cpp
index 03f0b2e23d4..20baf276455 100644
--- a/engines/hadesch/persistent.cpp
+++ b/engines/hadesch/persistent.cpp
@@ -23,7 +23,7 @@
 #include "common/debug-channels.h"
 #include "common/error.h"
 #include "common/events.h"
-#include "common/ini-file.h"
+#include "common/formats/ini-file.h"
 #include "common/stream.h"
 #include "common/system.h"
 #include "common/file.h"
diff --git a/engines/icb/configfile.cpp b/engines/icb/configfile.cpp
index a47657b9c78..0f2540d8925 100644
--- a/engines/icb/configfile.cpp
+++ b/engines/icb/configfile.cpp
@@ -27,7 +27,7 @@
 #include "engines/icb/configfile.h"
 
 #include "common/textconsole.h"
-#include "common/ini-file.h"
+#include "common/formats/ini-file.h"
 
 namespace ICB {
 
diff --git a/engines/kyra/script/script.h b/engines/kyra/script/script.h
index fd4000f1f5e..9594bc32e99 100644
--- a/engines/kyra/script/script.h
+++ b/engines/kyra/script/script.h
@@ -25,7 +25,7 @@
 #include "common/stream.h"
 #include "common/array.h"
 #include "common/func.h"
-#include "common/iff_container.h"
+#include "common/formats/iff_container.h"
 
 namespace Kyra {
 
diff --git a/engines/kyra/script/script_tim.cpp b/engines/kyra/script/script_tim.cpp
index 5d7f34cd692..186aa4ac781 100644
--- a/engines/kyra/script/script_tim.cpp
+++ b/engines/kyra/script/script_tim.cpp
@@ -28,7 +28,7 @@
 #include "kyra/graphics/screen_lol.h"
 #endif // ENABLE_LOL
 
-#include "common/iff_container.h"
+#include "common/formats/iff_container.h"
 #include "common/system.h"
 
 namespace Kyra {
diff --git a/engines/kyra/sound/drivers/audiomaster2.cpp b/engines/kyra/sound/drivers/audiomaster2.cpp
index a635e0f1c4f..ab2d5547746 100644
--- a/engines/kyra/sound/drivers/audiomaster2.cpp
+++ b/engines/kyra/sound/drivers/audiomaster2.cpp
@@ -26,7 +26,7 @@
 
 #include "audio/mods/paula.h"
 
-#include "common/iff_container.h"
+#include "common/formats/iff_container.h"
 
 namespace Kyra {
 
@@ -334,7 +334,7 @@ public:
 private:
 	void initResource();
 
-	// define only additional chunk types which aren't already defined in common/iff_container.h
+	// define only additional chunk types which aren't already defined in common/formats/iff_container.h
 	enum ChunkTypes {
 		ID_INST = MKTAG('I', 'N', 'S', 'T'),
 		ID_PTCH = MKTAG('P', 'T', 'C', 'H'),
diff --git a/engines/mohawk/cursors.cpp b/engines/mohawk/cursors.cpp
index 82898baeab8..b1c7f6a9c7d 100644
--- a/engines/mohawk/cursors.cpp
+++ b/engines/mohawk/cursors.cpp
@@ -26,8 +26,8 @@
 #include "common/macresman.h"
 #include "common/system.h"
 #include "common/textconsole.h"
-#include "common/winexe_ne.h"
-#include "common/winexe_pe.h"
+#include "common/formats/winexe_ne.h"
+#include "common/formats/winexe_pe.h"
 #include "graphics/cursorman.h"
 #include "graphics/maccursor.h"
 #include "graphics/wincursor.h"
diff --git a/engines/mohawk/livingbooks.h b/engines/mohawk/livingbooks.h
index 3dcdc22ab37..64d7d41dac0 100644
--- a/engines/mohawk/livingbooks.h
+++ b/engines/mohawk/livingbooks.h
@@ -28,7 +28,7 @@
 #include "mohawk/sound.h"
 #include "mohawk/video.h"
 
-#include "common/ini-file.h"
+#include "common/formats/ini-file.h"
 #include "common/rect.h"
 #include "common/queue.h"
 #include "common/random.h"
diff --git a/engines/mtropolis/boot.cpp b/engines/mtropolis/boot.cpp
index cdfa3d4762e..49df74ed964 100644
--- a/engines/mtropolis/boot.cpp
+++ b/engines/mtropolis/boot.cpp
@@ -25,7 +25,7 @@
 #include "common/memstream.h"
 #include "common/compression/stuffit.h"
 #include "common/compression/vise.h"
-#include "common/winexe.h"
+#include "common/formats/winexe.h"
 #include "common/compression/zlib.h"
 
 #include "graphics/maccursor.h"
diff --git a/engines/mtropolis/mtropolis.cpp b/engines/mtropolis/mtropolis.cpp
index 5e7168645dc..8d16472caaf 100644
--- a/engines/mtropolis/mtropolis.cpp
+++ b/engines/mtropolis/mtropolis.cpp
@@ -27,7 +27,7 @@
 #include "common/ptr.h"
 #include "common/compression/stuffit.h"
 #include "common/system.h"
-#include "common/winexe.h"
+#include "common/formats/winexe.h"
 
 #include "engines/util.h"
 
diff --git a/engines/nancy/dialogs.cpp b/engines/nancy/dialogs.cpp
index 42cb33bdbad..5a4bdaf4fd8 100644
--- a/engines/nancy/dialogs.cpp
+++ b/engines/nancy/dialogs.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "common/winexe.h"
+#include "common/formats/winexe.h"
 #include "common/translation.h"
 #include "common/stream.h"
 
diff --git a/engines/nancy/iff.cpp b/engines/nancy/iff.cpp
index dc794c9e478..939b0410fdd 100644
--- a/engines/nancy/iff.cpp
+++ b/engines/nancy/iff.cpp
@@ -20,7 +20,7 @@
  */
 
 #include "common/memstream.h"
-#include "common/iff_container.h"
+#include "common/formats/iff_container.h"
 
 #include "engines/nancy/nancy.h"
 #include "engines/nancy/iff.h"
diff --git a/engines/parallaction/disk_ns.cpp b/engines/parallaction/disk_ns.cpp
index b06ec595c2e..c5dd0077ca0 100644
--- a/engines/parallaction/disk_ns.cpp
+++ b/engines/parallaction/disk_ns.cpp
@@ -21,7 +21,7 @@
 
 #include "common/config-manager.h"
 #include "common/fs.h"
-#include "common/iff_container.h"
+#include "common/formats/iff_container.h"
 #include "common/memstream.h"
 #include "common/substream.h"
 #include "common/textconsole.h"
diff --git a/engines/petka/interfaces/main.cpp b/engines/petka/interfaces/main.cpp
index af1e6e89b37..e77a15c7f5e 100644
--- a/engines/petka/interfaces/main.cpp
+++ b/engines/petka/interfaces/main.cpp
@@ -22,7 +22,7 @@
 #include "common/system.h"
 #include "common/stream.h"
 #include "common/events.h"
-#include "common/ini-file.h"
+#include "common/formats/ini-file.h"
 
 #include "petka/flc.h"
 #include "petka/objects/object_case.h"
diff --git a/engines/petka/objects/object.cpp b/engines/petka/objects/object.cpp
index 3240b7f1c8c..c8cac11e620 100644
--- a/engines/petka/objects/object.cpp
+++ b/engines/petka/objects/object.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "common/ini-file.h"
+#include "common/formats/ini-file.h"
 #include "common/stream.h"
 #include "common/system.h"
 #include "common/events.h"
diff --git a/engines/petka/objects/object_bg.cpp b/engines/petka/objects/object_bg.cpp
index badad38ff87..235e375f1de 100644
--- a/engines/petka/objects/object_bg.cpp
+++ b/engines/petka/objects/object_bg.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "common/ini-file.h"
+#include "common/formats/ini-file.h"
 #include "common/stream.h"
 #include "common/system.h"
 #include "common/events.h"
diff --git a/engines/petka/objects/object_cursor.cpp b/engines/petka/objects/object_cursor.cpp
index cfbcbdb6434..32d0728310d 100644
--- a/engines/petka/objects/object_cursor.cpp
+++ b/engines/petka/objects/object_cursor.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "common/ini-file.h"
+#include "common/formats/ini-file.h"
 #include "common/stream.h"
 #include "common/system.h"
 #include "common/events.h"
diff --git a/engines/petka/petka.cpp b/engines/petka/petka.cpp
index 1c9fb5c6872..3569eea99ec 100644
--- a/engines/petka/petka.cpp
+++ b/engines/petka/petka.cpp
@@ -24,7 +24,7 @@
 #include "common/debug-channels.h"
 #include "common/error.h"
 #include "common/events.h"
-#include "common/ini-file.h"
+#include "common/formats/ini-file.h"
 #include "common/system.h"
 #include "common/file.h"
 
diff --git a/engines/petka/q_system.cpp b/engines/petka/q_system.cpp
index fdc023a2885..90dbcfed2f6 100644
--- a/engines/petka/q_system.cpp
+++ b/engines/petka/q_system.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "common/ini-file.h"
+#include "common/formats/ini-file.h"
 #include "common/substream.h"
 #include "common/system.h"
 
diff --git a/engines/pink/pink.cpp b/engines/pink/pink.cpp
index 2f16e26ff90..fd55e15c6fd 100644
--- a/engines/pink/pink.cpp
+++ b/engines/pink/pink.cpp
@@ -20,7 +20,7 @@
  */
 
 #include "common/debug-channels.h"
-#include "common/winexe_pe.h"
+#include "common/formats/winexe_pe.h"
 #include "common/config-manager.h"
 #include "common/compression/installshield_cab.h"
 
diff --git a/engines/scumm/he/moonbase/moonbase.cpp b/engines/scumm/he/moonbase/moonbase.cpp
index 600f086ae17..16f44298ab7 100644
--- a/engines/scumm/he/moonbase/moonbase.cpp
+++ b/engines/scumm/he/moonbase/moonbase.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "common/winexe_pe.h"
+#include "common/formats/winexe_pe.h"
 
 #include "scumm/he/intern_he.h"
 #include "scumm/he/moonbase/moonbase.h"
diff --git a/engines/scumm/he/moonbase/moonbase_fow.cpp b/engines/scumm/he/moonbase/moonbase_fow.cpp
index 1bfe547733d..96eab50e4d8 100644
--- a/engines/scumm/he/moonbase/moonbase_fow.cpp
+++ b/engines/scumm/he/moonbase/moonbase_fow.cpp
@@ -20,7 +20,7 @@
  */
 
 #include "common/config-manager.h"
-#include "common/winexe_pe.h"
+#include "common/formats/winexe_pe.h"
 
 #include "scumm/he/intern_he.h"
 #include "scumm/he/moonbase/moonbase.h"
diff --git a/engines/scumm/he/resource_he.cpp b/engines/scumm/he/resource_he.cpp
index 8d78f8932d3..ba3ea020a18 100644
--- a/engines/scumm/he/resource_he.cpp
+++ b/engines/scumm/he/resource_he.cpp
@@ -34,7 +34,7 @@
 #include "common/archive.h"
 #include "common/memstream.h"
 #include "common/system.h"
-#include "common/winexe_pe.h"
+#include "common/formats/winexe_pe.h"
 
 namespace Scumm {
 
diff --git a/engines/scumm/he/script_v80he.cpp b/engines/scumm/he/script_v80he.cpp
index 7a8d8c3123c..9513db62095 100644
--- a/engines/scumm/he/script_v80he.cpp
+++ b/engines/scumm/he/script_v80he.cpp
@@ -22,7 +22,7 @@
 #ifdef ENABLE_HE
 
 #include "common/archive.h"
-#include "common/ini-file.h"
+#include "common/formats/ini-file.h"
 #include "common/config-manager.h"
 #include "common/macresman.h"
 #include "common/savefile.h"
diff --git a/engines/stark/services/fontprovider.cpp b/engines/stark/services/fontprovider.cpp
index 1927975a46c..d063c156806 100644
--- a/engines/stark/services/fontprovider.cpp
+++ b/engines/stark/services/fontprovider.cpp
@@ -26,7 +26,7 @@
 #include "engines/stark/gfx/driver.h"
 
 #include "common/archive.h"
-#include "common/ini-file.h"
+#include "common/formats/ini-file.h"
 
 #include "graphics/font.h"
 #include "graphics/fontman.h"
diff --git a/engines/stark/services/gamechapter.cpp b/engines/stark/services/gamechapter.cpp
index efce866a621..644a4177284 100644
--- a/engines/stark/services/gamechapter.cpp
+++ b/engines/stark/services/gamechapter.cpp
@@ -24,7 +24,7 @@
 #include "engines/stark/services/global.h"
 
 #include "common/tokenizer.h"
-#include "common/ini-file.h"
+#include "common/formats/ini-file.h"
 
 namespace Stark {
 
diff --git a/engines/stark/services/gamemessage.cpp b/engines/stark/services/gamemessage.cpp
index e0fb0c41a65..20548d6d69a 100644
--- a/engines/stark/services/gamemessage.cpp
+++ b/engines/stark/services/gamemessage.cpp
@@ -22,7 +22,7 @@
 #include "engines/stark/services/gamemessage.h"
 
 #include "common/file.h"
-#include "common/ini-file.h"
+#include "common/formats/ini-file.h"
 
 #include "gui/message.h"
 
diff --git a/engines/stark/ui/dialogbox.cpp b/engines/stark/ui/dialogbox.cpp
index 2f8ded3385e..d682c1afb16 100644
--- a/engines/stark/ui/dialogbox.cpp
+++ b/engines/stark/ui/dialogbox.cpp
@@ -30,7 +30,7 @@
 
 #include "common/memstream.h"
 #include "common/stream.h"
-#include "common/winexe_pe.h"
+#include "common/formats/winexe_pe.h"
 
 #include "graphics/surface.h"
 
diff --git a/engines/sword25/gfx/animationresource.h b/engines/sword25/gfx/animationresource.h
index 5fcefba430d..1de5c4d4194 100644
--- a/engines/sword25/gfx/animationresource.h
+++ b/engines/sword25/gfx/animationresource.h
@@ -31,7 +31,7 @@
 #ifndef SWORD25_ANIMATIONRESOURCE_H
 #define SWORD25_ANIMATIONRESOURCE_H
 
-#include "common/xmlparser.h"
+#include "common/formats/xmlparser.h"
 #include "sword25/kernel/common.h"
 #include "sword25/kernel/resource.h"
 #include "sword25/gfx/animationdescription.h"
diff --git a/engines/sword25/gfx/fontresource.h b/engines/sword25/gfx/fontresource.h
index 8ba3f4a39a7..f980e04aa7c 100644
--- a/engines/sword25/gfx/fontresource.h
+++ b/engines/sword25/gfx/fontresource.h
@@ -33,7 +33,7 @@
 
 #include "common/scummsys.h"
 #include "common/rect.h"
-#include "common/xmlparser.h"
+#include "common/formats/xmlparser.h"
 #include "sword25/kernel/common.h"
 #include "sword25/kernel/resource.h"
 
diff --git a/engines/testbed/config.h b/engines/testbed/config.h
index e2d2a2ba120..b28b51adfad 100644
--- a/engines/testbed/config.h
+++ b/engines/testbed/config.h
@@ -24,7 +24,7 @@
 
 
 #include "common/array.h"
-#include "common/ini-file.h"
+#include "common/formats/ini-file.h"
 #include "common/str-array.h"
 #include "common/tokenizer.h"
 
diff --git a/engines/toon/script.h b/engines/toon/script.h
index 68a9da0a04a..6612868c814 100644
--- a/engines/toon/script.h
+++ b/engines/toon/script.h
@@ -25,7 +25,7 @@
 #include "common/stream.h"
 #include "common/array.h"
 #include "common/func.h"
-#include "common/iff_container.h"
+#include "common/formats/iff_container.h"
 
 // Based on Kyra script interpretor
 namespace Toon {
diff --git a/engines/ultima/ultima8/conf/config_file_manager.h b/engines/ultima/ultima8/conf/config_file_manager.h
index 5b5b93bdd79..dddb32cb793 100644
--- a/engines/ultima/ultima8/conf/config_file_manager.h
+++ b/engines/ultima/ultima8/conf/config_file_manager.h
@@ -22,7 +22,7 @@
 #ifndef ULTIMA8_CONF_CONFIGFILEMANAGER_H
 #define ULTIMA8_CONF_CONFIGFILEMANAGER_H
 
-#include "common/ini-file.h"
+#include "common/formats/ini-file.h"
 #include "ultima/shared/std/string.h"
 #include "ultima/ultima8/misc/istring.h"
 #include "ultima/shared/std/containers.h"
diff --git a/graphics/fonts/winfont.cpp b/graphics/fonts/winfont.cpp
index d8ab0074948..6861a01893d 100644
--- a/graphics/fonts/winfont.cpp
+++ b/graphics/fonts/winfont.cpp
@@ -23,8 +23,8 @@
 #include "common/str.h"
 #include "common/stream.h"
 #include "common/textconsole.h"
-#include "common/winexe_ne.h"
-#include "common/winexe_pe.h"
+#include "common/formats/winexe_ne.h"
+#include "common/formats/winexe_pe.h"
 #include "graphics/surface.h"
 #include "graphics/fonts/winfont.h"
 
diff --git a/graphics/macgui/macmenu.cpp b/graphics/macgui/macmenu.cpp
index 70ec88b48e5..86c96a4d8ef 100644
--- a/graphics/macgui/macmenu.cpp
+++ b/graphics/macgui/macmenu.cpp
@@ -23,7 +23,7 @@
 #include "common/stack.h"
 #include "common/keyboard.h"
 #include "common/macresman.h"
-#include "common/winexe_pe.h"
+#include "common/formats/winexe_pe.h"
 #include "common/unicode-bidi.h"
 
 #include "graphics/primitives.h"
diff --git a/graphics/wincursor.h b/graphics/wincursor.h
index 376b12f76aa..92e6479575e 100644
--- a/graphics/wincursor.h
+++ b/graphics/wincursor.h
@@ -23,7 +23,7 @@
 #define GRAPHICS_WINCURSOR_H
 
 #include "common/array.h"
-#include "common/winexe.h"
+#include "common/formats/winexe.h"
 
 #include "graphics/cursor.h"
 
diff --git a/gui/MetadataParser.h b/gui/MetadataParser.h
index 4506b195102..4a0407aa4b5 100644
--- a/gui/MetadataParser.h
+++ b/gui/MetadataParser.h
@@ -22,7 +22,7 @@
 #ifndef GUI_METADATA_PARSER_H
 #define GUI_METADATA_PARSER_H
 
-#include "common/xmlparser.h"
+#include "common/formats/xmlparser.h"
 
 namespace GUI {
 
diff --git a/gui/ThemeParser.h b/gui/ThemeParser.h
index abff8d72b5a..a117966d94e 100644
--- a/gui/ThemeParser.h
+++ b/gui/ThemeParser.h
@@ -23,7 +23,7 @@
 #define THEME_PARSER_H
 
 #include "common/scummsys.h"
-#include "common/xmlparser.h"
+#include "common/formats/xmlparser.h"
 
 namespace GUI {
 
diff --git a/image/iff.cpp b/image/iff.cpp
index 5df7b12276f..38fbc8f24c1 100644
--- a/image/iff.cpp
+++ b/image/iff.cpp
@@ -21,7 +21,7 @@
 
 #include "image/iff.h"
 
-#include "common/iff_container.h"
+#include "common/formats/iff_container.h"
 #include "common/stream.h"
 #include "common/util.h"
 
diff --git a/test/common/ini-file.h b/test/common/ini-file.h
index 80331aa92fe..17eca67132d 100644
--- a/test/common/ini-file.h
+++ b/test/common/ini-file.h
@@ -1,6 +1,6 @@
 #include <cxxtest/TestSuite.h>
 
-#include "common/ini-file.h"
+#include "common/formats/ini-file.h"
 #include "common/memstream.h"
 
 


Commit: fd123d667937f87d9cd4e6edb9635ba1e8efc5a0
    https://github.com/scummvm/scummvm/commit/fd123d667937f87d9cd4e6edb9635ba1e8efc5a0
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2022-12-11T22:33:23+01:00

Commit Message:
COMMON: Split compression and formats into separate modules

Changed paths:
  A common/compression/module.mk
  A common/formats/module.mk
    Makefile.common
    common/module.mk
    devtools/create_project/create_project.cpp
    test/module.mk


diff --git a/Makefile.common b/Makefile.common
index c20e08cfc6a..bfcafac18c5 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -36,6 +36,8 @@ MODULES += \
 	audio \
 	math \
 	common \
+	common/compression \
+	common/formats \
 	po \
 	doc
 
diff --git a/common/compression/module.mk b/common/compression/module.mk
new file mode 100644
index 00000000000..a9a2a4f4f02
--- /dev/null
+++ b/common/compression/module.mk
@@ -0,0 +1,18 @@
+MODULE := common/compression
+
+MODULE_OBJS := \
+	clickteam.o \
+	dcl.o \
+	gzio.o \
+	installshield_cab.o \
+	installshieldv3_archive.o \
+	powerpacker.o \
+	rnc_deco.o \
+	stuffit.o \
+	unarj.o \
+	unzip.o \
+	vise.o \
+	zlib.o
+
+# Include common rules
+include $(srcdir)/rules.mk
diff --git a/common/formats/module.mk b/common/formats/module.mk
new file mode 100644
index 00000000000..e68397c5b5c
--- /dev/null
+++ b/common/formats/module.mk
@@ -0,0 +1,14 @@
+MODULE := common/formats
+
+MODULE_OBJS := \
+	iff_container.o \
+	ini-file.o \
+	json.o \
+	quicktime.o \
+	winexe.o \
+	winexe_ne.o \
+	winexe_pe.o \
+	xmlparser.o
+
+# Include common rules
+include $(srcdir)/rules.mk
diff --git a/common/module.mk b/common/module.mk
index 95de5bb49ce..f26be66280f 100644
--- a/common/module.mk
+++ b/common/module.mk
@@ -39,27 +39,7 @@ MODULE_OBJS := \
 	unicode-bidi.o \
 	ustr.o \
 	util.o \
-	xpfloat.o \
-	compression/clickteam.o \
-	compression/dcl.o \
-	compression/gzio.o \
-	compression/installshield_cab.o \
-	compression/installshieldv3_archive.o \
-	compression/powerpacker.o \
-	compression/rnc_deco.o \
-	compression/stuffit.o \
-	compression/unarj.o \
-	compression/unzip.o \
-	compression/vise.o \
-	compression/zlib.o \
-	formats/iff_container.o \
-	formats/ini-file.o \
-	formats/json.o \
-	formats/quicktime.o \
-	formats/winexe.o \
-	formats/winexe_ne.o \
-	formats/winexe_pe.o \
-	formats/xmlparser.o
+	xpfloat.o
 
 ifdef ENABLE_EVENTRECORDER
 MODULE_OBJS += \
diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
index 7387d0239f9..c76e31d50b3 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -1608,6 +1608,8 @@ void ProjectProvider::createProject(BuildSetup &setup) {
 		createModuleList(setup.srcDir + "/backends/platform/sdl", setup.defines, setup.testDirs, in, ex);
 		createModuleList(setup.srcDir + "/base", setup.defines, setup.testDirs, in, ex);
 		createModuleList(setup.srcDir + "/common", setup.defines, setup.testDirs, in, ex);
+		createModuleList(setup.srcDir + "/common/compression", setup.defines, setup.testDirs, in, ex);
+		createModuleList(setup.srcDir + "/common/formats", setup.defines, setup.testDirs, in, ex);
 		createModuleList(setup.srcDir + "/common/lua", setup.defines, setup.testDirs, in, ex);
 		createModuleList(setup.srcDir + "/engines", setup.defines, setup.testDirs, in, ex);
 		createModuleList(setup.srcDir + "/graphics", setup.defines, setup.testDirs, in, ex);
diff --git a/test/module.mk b/test/module.mk
index d1fc45452c2..6116d3ef6e9 100644
--- a/test/module.mk
+++ b/test/module.mk
@@ -28,7 +28,7 @@ TEST_LIBS += test/null_osystem.o \
 	backends/platform/sdl/win32/win32_wrapper.o
 endif
 
-TEST_LIBS +=	audio/libaudio.a math/libmath.a common/libcommon.a image/libimage.a graphics/libgraphics.a
+TEST_LIBS +=	audio/libaudio.a math/libmath.a common/formats/libformats.a common/compression/libcompression.a common/libcommon.a image/libimage.a graphics/libgraphics.a
 
 ifeq ($(ENABLE_WINTERMUTE), STATIC_PLUGIN)
 	TESTS += $(srcdir)/test/engines/wintermute/*.h