COMMON: Move all compression-related files to a separate directory

audio/decoders/wma.cpp

@@ -26,7 +26,7 @@
 #include "common/math.h"
 #include "common/error.h"
 #include "common/memstream.h"
-#include "common/huffman.h"
+#include "common/compression/huffman.h"
 
 #include "math/mdct.h"
 #include "math/sinewindows.h"

backends/networking/sdl_net/handlerutils.cpp

@@ -26,7 +26,7 @@
 #include "common/config-manager.h"
 #include "common/file.h"
 #include "common/translation.h"
-#include "common/unzip.h"
+#include "common/compression/unzip.h"
 
 namespace Networking {
 

backends/platform/dc/vmsave.cpp

@@ -28,7 +28,7 @@
 #include <common/savefile.h>
 #include <gui/gui-manager.h>
 #include <gui/message.h>
-#include <common/zlib.h>
+#include <common/compression/zlib.h>
 
 
 // Savegame can not be bigger than this

backends/platform/n64/framfs_save_manager.h

@@ -23,7 +23,7 @@
 #define __FRAMFS_SAVE_MANAGER__
 
 #include <common/savefile.h>
-#include <common/zlib.h>
+#include <common/compression/zlib.h>
 
 #include <framfs.h> // N64 FramFS library
 

backends/platform/n64/pakfs_save_manager.h

@@ -23,7 +23,7 @@
 #define __PAKFS_SAVE_MANAGER__
 
 #include <common/savefile.h>
-#include <common/zlib.h>
+#include <common/compression/zlib.h>
 
 #include <pakfs.h> // N64 PakFS library
 

backends/platform/psp/pspkeyboard.cpp

@@ -38,7 +38,7 @@
 #include "backends/platform/psp/input.h"
 #include "common/keyboard.h"
 #include "common/fs.h"
-#include "common/unzip.h"
+#include "common/compression/unzip.h"
 
 //#define __PSP_DEBUG_FUNCS__	/* For debugging the stack */
 //#define __PSP_DEBUG_PRINT__

backends/saves/default/default-saves.cpp

@@ -36,7 +36,7 @@
 #include "common/fs.h"
 #include "common/archive.h"
 #include "common/config-manager.h"
-#include "common/zlib.h"
+#include "common/compression/zlib.h"
 
 #include <errno.h>	// for removeSavefile()
 

backends/vkeybd/virtual-keyboard.cpp

@@ -33,7 +33,7 @@
 #include "backends/vkeybd/keycode-descriptions.h"
 #include "common/config-manager.h"
 #include "common/textconsole.h"
-#include "common/unzip.h"
+#include "common/compression/unzip.h"
 
 #define KEY_START_CHAR ('[')
 #define KEY_END_CHAR (']')

common/achievements.cpp

@@ -25,7 +25,7 @@
 #include "common/stream.h"
 #include "common/system.h"
 #include "common/translation.h"
-#include "common/unzip.h"
+#include "common/compression/unzip.h"
 
 namespace Common {
 
@@ -125,7 +125,7 @@ bool AchievementsManager::loadAchievementsData(const char *platform, const char
 		warning("%s is not found in achievements.dat. Achievements messages are unavailable", cfgFileName.c_str());
 		return false;
 	}
-	
+
 	INIFile cfgFile;
 	if (!cfgFile.loadFromStream(*stream)) {
 		delete stream;
@@ -158,7 +158,7 @@ bool AchievementsManager::loadAchievementsData(const char *platform, const char
 				_achievements[lang].push_back(desc);
 			}
 		}
-	} 
+	}
 
 	_stats.clear();
 	for (int i = 0; i < 256; i++) {

common/compression/clickteam.cpp

@@ -20,8 +20,8 @@
  */
 
 #include "common/array.h"
-#include "common/clickteam.h"
-#include "common/gzio.h"
+#include "common/compression/clickteam.h"
+#include "common/compression/gzio.h"
 #include "common/debug.h"
 #include "common/ptr.h"
 #include "common/substream.h"

common/compression/dcl.cpp

@@ -19,7 +19,7 @@
  *
  */
 
-#include "common/dcl.h"
+#include "common/compression/dcl.h"
 #include "common/debug.h"
 #include "common/memstream.h"
 #include "common/stream.h"

common/compression/gzio.cpp

@@ -38,7 +38,7 @@
 #include "common/stream.h"
 #include "common/ptr.h"
 #include "common/memstream.h"
-#include "gzio.h"
+#include "common/compression/gzio.h"
 
 
 /* Compression methods (see algorithm.doc) */
@@ -1025,7 +1025,7 @@ bool
 GzioReadStream::test_zlib_header ()
 {
   uint8 cmf, flg;
-  
+
   cmf = parentGetByte ();
   flg = parentGetByte ();
 

common/compression/installshield_cab.cpp

@@ -45,11 +45,11 @@
 #include "common/archive.h"
 #include "common/debug.h"
 #include "common/hash-str.h"
-#include "common/installshield_cab.h"
+#include "common/compression/installshield_cab.h"
 #include "common/memstream.h"
 #include "common/substream.h"
 #include "common/ptr.h"
-#include "common/zlib.h"
+#include "common/compression/zlib.h"
 
 namespace Common {
 

common/compression/installshieldv3_archive.cpp

@@ -19,9 +19,9 @@
  *
  */
 
-#include "common/installshieldv3_archive.h"
+#include "common/compression/installshieldv3_archive.h"
 
-#include "common/dcl.h"
+#include "common/compression/dcl.h"
 #include "common/debug.h"
 
 namespace Common {

common/compression/rnc_deco.cpp

@@ -21,7 +21,7 @@
 
 
 #include "common/endian.h"
-#include "common/rnc_deco.h"
+#include "common/compression/rnc_deco.h"
 
 namespace Common {
 

common/compression/stuffit.cpp

@@ -22,7 +22,7 @@
 // StuffIt parsing based on https://github.com/mietek/theunarchiver/wiki/StuffItFormat
 // Compression 14 based on libxad (http://sourceforge.net/projects/libxad/)
 
-#include "common/stuffit.h"
+#include "common/compression/stuffit.h"
 
 #include "common/archive.h"
 #include "common/bitstream.h"

common/compression/unarj.cpp

@@ -26,7 +26,7 @@
 #include "common/scummsys.h"
 #include "common/archive.h"
 #include "common/debug.h"
-#include "common/unarj.h"
+#include "common/compression/unarj.h"
 #include "common/file.h"
 #include "common/hash-str.h"
 #include "common/memstream.h"
@@ -754,7 +754,7 @@ ArjArchive::ArjArchive(const Array<String> &filenames) : _arjFilenames(filenames
 			arjFile.seek(header->compSize, SEEK_CUR);
 		}
 	}
-	
+
 	debug(0, "ArjArchive::ArjArchive(%d volume(s) starting with %s): Located %d files", filenames.size(), filenames.empty() ? "" : filenames[0].c_str(), _headers.size());
 }
 

common/compression/unzip.cpp

@@ -84,8 +84,8 @@ typedef Byte Bytef;
 
 #include "common/crc.h"
 #include "common/fs.h"
-#include "common/gzio.h"
-#include "common/unzip.h"
+#include "common/compression/gzio.h"
+#include "common/compression/unzip.h"
 #include "common/memstream.h"
 
 #include "common/hashmap.h"

common/compression/vise.cpp

@@ -19,11 +19,11 @@
  *
  */
 
-#include "common/vise.h"
+#include "common/compression/vise.h"
 
 #include "common/macresman.h"
 #include "common/memstream.h"
-#include "common/zlib.h"
+#include "common/compression/zlib.h"
 
 // Installer VISE archive loader.
 //

common/compression/zlib.cpp

@@ -22,7 +22,7 @@
 // Disable symbol overrides so that we can use zlib.h
 #define FORBIDDEN_SYMBOL_ALLOW_ALL
 
-#include "common/zlib.h"
+#include "common/compression/zlib.h"
 #include "common/ptr.h"
 #include "common/util.h"
 #include "common/stream.h"

common/module.mk

@@ -4,23 +4,18 @@ MODULE_OBJS := \
 	achievements.o \
 	archive.o \
 	base-str.o \
-	clickteam.o \
 	concatstream.o \
 	config-manager.o \
 	coroutines.o \
-	dcl.o \
 	debug.o \
 	error.o \
 	events.o \
 	file.o \
 	fs.o \
 	gui_options.o \
-	gzio.o \
 	hashmap.o \
 	iff_container.o \
 	ini-file.o \
-	installshield_cab.o \
-	installshieldv3_archive.o \
 	json.o \
 	language.o \
 	localization.o \
@@ -36,30 +31,35 @@ MODULE_OBJS := \
 	random.o \
 	rational.o \
 	rendermode.o \
-	rnc_deco.o \
 	str.o \
 	stream.o \
 	streamdebug.o \
 	str-enc.o \
 	encodings/singlebyte.o \
-	stuffit.o \
 	system.o \
 	textconsole.o \
 	text-to-speech.o \
 	tokenizer.o \
 	translation.o \
-	unarj.o \
 	unicode-bidi.o \
-	unzip.o \
 	ustr.o \
 	util.o \
-	vise.o \
 	winexe.o \
 	winexe_ne.o \
 	winexe_pe.o \
 	xmlparser.o \
 	xpfloat.o \
-	zlib.o
+	compression/clickteam.o \
+	compression/dcl.o \
+	compression/gzio.o \
+	compression/installshield_cab.o \
+	compression/installshieldv3_archive.o \
+	compression/rnc_deco.o \
+	compression/stuffit.o \
+	compression/unarj.o \
+	compression/unzip.o \
+	compression/vise.o \
+	compression/zlib.o
 
 ifdef ENABLE_EVENTRECORDER
 MODULE_OBJS += \

common/quicktime.cpp

@@ -34,7 +34,7 @@
 #include "common/quicktime.h"
 #include "common/textconsole.h"
 #include "common/util.h"
-#include "common/zlib.h"
+#include "common/compression/zlib.h"
 
 namespace Common {
 

engines/agos/detection.cpp

@@ -27,7 +27,7 @@
 #include "common/config-manager.h"
 #include "common/system.h"
 #include "common/textconsole.h"
-#include "common/installshield_cab.h"
+#include "common/compression/installshield_cab.h"
 
 #include "agos/detection.h"
 #include "agos/intern_detection.h"

engines/agos/metaengine.cpp

@@ -22,7 +22,7 @@
 #include "common/config-manager.h"
 #include "common/savefile.h"
 #include "common/system.h"
-#include "common/installshield_cab.h"
+#include "common/compression/installshield_cab.h"
 #include "common/translation.h"
 
 #include "engines/advancedDetector.h"

engines/agos/midi.cpp

@@ -40,7 +40,7 @@
 #include "audio/midiparser.h"
 
 // PKWARE data compression library decompressor required for Simon 2
-#include "common/dcl.h"
+#include "common/compression/dcl.h"
 #include "common/translation.h"
 
 #include "gui/message.h"
@@ -57,13 +57,13 @@ extern MidiParser *MidiParser_createS1D(uint8 source = 0, bool monophonicChords
 // instruments correspond to MT-32 instruments in other tracks (f.e. track 10-3
 // is similar to track 11).
 const byte MidiPlayer::SIMON2_TRACK10_GM_MT32_INSTRUMENT_REMAPPING[] {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x33, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5D, 0x00, 0x1D, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x54, 0x00, 0x56, 0x53, 0x4B, 0x00, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x33, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5D, 0x00, 0x1D, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x54, 0x00, 0x56, 0x53, 0x4B, 0x00, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
 
@@ -682,7 +682,7 @@ void MidiPlayer::play(int track, bool sfx, bool sfxUsesRhythm, bool queued) {
 		_parserSfxAccolade->play(track);
 		return;
 	}
-	
+
 	MidiParser *parser = sfx ? _parserSfx : _parserMusic;
 	if (!parser)
 		return;

engines/agos/res.cpp

@@ -31,7 +31,7 @@
 #include "agos/agos.h"
 #include "agos/intern.h"
 
-#include "common/zlib.h"
+#include "common/compression/zlib.h"
 
 namespace AGOS {
 

engines/ags/ags.cpp

@@ -27,7 +27,7 @@
 #include "ags/console.h"
 #include "common/scummsys.h"
 #include "common/config-manager.h"
-#include "common/clickteam.h"
+#include "common/compression/clickteam.h"
 #include "common/debug-channels.h"
 #include "common/events.h"
 #include "common/file.h"

engines/bladerunner/bladerunner.cpp

@@ -87,7 +87,7 @@
 #include "common/debug.h"
 #include "common/debug-channels.h"
 #include "common/translation.h"
-#include "common/unzip.h"
+#include "common/compression/unzip.h"
 
 #include "gui/message.h"
 

engines/buried/graphics.cpp

@@ -26,7 +26,7 @@
 #include "common/fs.h"
 #include "common/str-array.h"
 #include "common/system.h"
-#include "common/unzip.h"
+#include "common/compression/unzip.h"
 #include "graphics/cursorman.h"
 #include "graphics/font.h"
 #include "graphics/palette.h"

engines/composer/saveload.cpp

@@ -26,7 +26,7 @@
 #include "common/savefile.h"
 #include "common/serializer.h"
 #include "common/system.h"
-#include "common/zlib.h"
+#include "common/compression/zlib.h"
 #include "graphics/palette.h"
 
 #include "composer/composer.h"

engines/director/tests.cpp

@@ -21,7 +21,7 @@
 
 #include "common/config-manager.h"
 #include "common/system.h"
-#include "common/zlib.h"
+#include "common/compression/zlib.h"
 
 #include "common/memstream.h"
 #include "common/macresman.h"

engines/director/util.cpp

@@ -26,7 +26,7 @@
 #include "common/memstream.h"
 #include "common/punycode.h"
 #include "common/tokenizer.h"
-#include "common/zlib.h"
+#include "common/compression/zlib.h"
 
 #include "director/types.h"
 #include "graphics/macgui/macwindowmanager.h"

engines/draci/sound.cpp

@@ -27,7 +27,7 @@
 #include "common/substream.h"
 #include "common/textconsole.h"
 #include "common/memstream.h"
-#include "common/unzip.h"
+#include "common/compression/unzip.h"
 
 #include "draci/sound.h"
 #include "draci/draci.h"

engines/drascula/resource.cpp

@@ -20,7 +20,7 @@
  */
 
 #include "drascula/drascula.h"
-#include "common/unarj.h"
+#include "common/compression/unarj.h"
 
 namespace Drascula {
 

engines/dreamweb/rnca_archive.cpp

@@ -20,12 +20,12 @@
  */
 
 #include "common/array.h"
-#include "common/gzio.h"
+#include "common/compression/gzio.h"
 #include "common/debug.h"
 #include "common/ptr.h"
 #include "common/substream.h"
 #include "common/memstream.h"
-#include "common/rnc_deco.h"
+#include "common/compression/rnc_deco.h"
 #include "common/file.h"
 
 #include "dreamweb/rnca_archive.h"
@@ -118,7 +118,7 @@ Common::SharedArchiveContents RNCAArchive::readContentsForPath(const Common::Str
 	byte *uncompressedBuffer = new byte[unpackLen];
 
 	Common::RncDecoder rnc;
-	
+
 	if (rnc.unpackM1(compressedBuffer, packLen, uncompressedBuffer) != (int32) unpackLen) {
 		debug("Unpacking error for %s", desc._fileName.c_str());
 		return Common::SharedArchiveContents();

engines/freescape/freescape.cpp

@@ -22,7 +22,7 @@
 #include "common/config-manager.h"
 #include "common/events.h"
 #include "common/math.h"
-#include "common/unzip.h"
+#include "common/compression/unzip.h"
 #include "common/random.h"
 #include "common/timer.h"
 #include "graphics/cursorman.h"

engines/glk/adrift/sctaffil.cpp

@@ -23,7 +23,7 @@
 #include "glk/adrift/scprotos.h"
 #include "glk/adrift/detection.h"
 #include "common/algorithm.h"
-#include "common/zlib.h"
+#include "common/compression/zlib.h"
 #include "common/memstream.h"
 
 namespace Glk {

engines/glk/screen.cpp

@@ -21,7 +21,7 @@
 
 #include "glk/screen.h"
 #include "glk/conf.h"
-#include "common/unzip.h"
+#include "common/compression/unzip.h"
 #include "image/bmp.h"
 #include "graphics/fonts/ttf.h"
 #include "graphics/fontman.h"

engines/glk/zcode/glk_interface.cpp

@@ -25,7 +25,7 @@
 #include "glk/conf.h"
 #include "glk/screen.h"
 #include "common/config-manager.h"
-#include "common/unzip.h"
+#include "common/compression/unzip.h"
 
 namespace Glk {
 namespace ZCode {

engines/glk/zcode/sound_folder.cpp

@@ -21,7 +21,7 @@
 
 #include "glk/zcode/sound_folder.h"
 #include "common/file.h"
-#include "common/unzip.h"
+#include "common/compression/unzip.h"
 
 namespace Glk {
 namespace ZCode {

engines/gnap/datarchive.cpp

@@ -19,7 +19,7 @@
  *
  */
 
-#include "common/dcl.h"
+#include "common/compression/dcl.h"
 #include "common/file.h"
 #include "common/stream.h"
 #include "common/substream.h"

engines/grim/grim.cpp

@@ -31,7 +31,7 @@
 #include "common/foreach.h"
 #include "common/fs.h"
 #include "common/config-manager.h"
-#include "common/stuffit.h"
+#include "common/compression/stuffit.h"
 #include "common/translation.h"
 
 #include "backends/keymapper/action.h"

engines/grim/patchr.cpp

@@ -22,7 +22,7 @@
 #include "common/substream.h"
 #include "common/md5.h"
 #include "common/file.h"
-#include "common/zlib.h"
+#include "common/compression/zlib.h"
 #include "common/bufferedstream.h"
 
 #include "engines/grim/patchr.h"

engines/grim/resource.cpp

@@ -46,7 +46,7 @@
 #include "engines/grim/update/update.h"
 
 #include "common/algorithm.h"
-#include "common/zlib.h"
+#include "common/compression/zlib.h"
 #include "common/memstream.h"
 #include "common/file.h"
 #include "common/config-manager.h"

engines/grim/update/mscab.cpp

@@ -24,7 +24,7 @@
 #include "common/file.h"
 #include "common/archive.h"
 #include "common/memstream.h"
-#include "common/zlib.h"
+#include "common/compression/zlib.h"
 #include "common/str.h"
 
 namespace Grim {

engines/groovie/groovie.cpp

@@ -37,7 +37,7 @@
 #include "common/events.h"
 #include "common/file.h"
 #include "common/macresman.h"
-#include "common/stuffit.h"
+#include "common/compression/stuffit.h"
 #include "common/textconsole.h"
 
 #include "backends/audiocd/audiocd.h"

engines/hadesch/hadesch.cpp

@@ -31,7 +31,7 @@
 #include "common/keyboard.h"
 #include "common/macresman.h"
 #include "common/util.h"
-#include "common/gzio.h"
+#include "common/compression/gzio.h"
 #include "common/config-manager.h"
 
 #include "engines/advancedDetector.h"

engines/hdb/file-manager.cpp

@@ -21,7 +21,7 @@
 #include "common/debug.h"
 #include "common/file.h"
 #include "common/memstream.h"
-#include "common/zlib.h"
+#include "common/compression/zlib.h"
 
 #include "hdb/hdb.h"
 #include "hdb/file-manager.h"

engines/hypno/hypno.h

@@ -23,7 +23,7 @@
 #define HYPNO_H
 
 #include "common/array.h"
-#include "common/installshieldv3_archive.h"
+#include "common/compression/installshieldv3_archive.h"
 #include "common/random.h"
 #include "common/serializer.h"
 #include "common/str-array.h"
@@ -651,4 +651,3 @@ public:
 } // End of namespace Hypno
 
 #endif
-

engines/kyra/resource/resource_intern.cpp

@@ -26,7 +26,7 @@
 #include "common/memstream.h"
 #include "common/substream.h"
 #include "common/macresman.h"
-#include "common/stuffit.h"
+#include "common/compression/stuffit.h"
 
 namespace Kyra {
 

engines/kyra/sound/sound_mac_lok.cpp

@@ -27,7 +27,7 @@
 
 #include "common/config-manager.h"
 #include "common/macresman.h"
-#include "common/stuffit.h"
+#include "common/compression/stuffit.h"
 
 #include "audio/mixer.h"
 

engines/macventure/datafiles.cpp

@@ -33,7 +33,7 @@
 #include "macventure/macventure.h"
 #include "macventure/windows.h"
 
-#include "common/unzip.h"
+#include "common/compression/unzip.h"
 
 namespace MacVenture {
 

engines/macventure/macventure.h

@@ -36,7 +36,7 @@
 #include "common/debug.h"
 #include "common/random.h"
 #include "common/macresman.h"
-#include "common/huffman.h"
+#include "common/compression/huffman.h"
 #include "common/savefile.h"
 
 #include "gui/debugger.h"

engines/mads/mps_installer.cpp

@@ -25,8 +25,8 @@
 #include "common/file.h"
 #include "common/util.h"
 #include "common/memstream.h"
-#include "common/dcl.h"
-#include "mps_installer.h"
+#include "common/compression/dcl.h"
+#include "mads/mps_installer.h"
 
 namespace MADS {
 

engines/mohawk/installer_archive.cpp

@@ -21,7 +21,7 @@
 
 #include "mohawk/installer_archive.h"
 
-#include "common/dcl.h"
+#include "common/compression/dcl.h"
 #include "common/debug.h"
 
 namespace Mohawk {

engines/mtropolis/boot.cpp

@@ -23,10 +23,10 @@
 #include "common/file.h"
 #include "common/macresman.h"
 #include "common/memstream.h"
-#include "common/stuffit.h"
-#include "common/vise.h"
+#include "common/compression/stuffit.h"
+#include "common/compression/vise.h"
 #include "common/winexe.h"
-#include "common/zlib.h"
+#include "common/compression/zlib.h"
 
 #include "graphics/maccursor.h"
 #include "graphics/wincursor.h"

engines/mtropolis/mtropolis.cpp

@@ -25,7 +25,7 @@
 #include "common/file.h"
 #include "common/macresman.h"
 #include "common/ptr.h"
-#include "common/stuffit.h"
+#include "common/compression/stuffit.h"
 #include "common/system.h"
 #include "common/winexe.h"
 

engines/nancy/nancy.cpp

@@ -24,7 +24,7 @@
 #include "common/debug-channels.h"
 #include "common/config-manager.h"
 #include "common/memstream.h"
-#include "common/installshield_cab.h"
+#include "common/compression/installshield_cab.h"
 #include "common/serializer.h"
 
 #include "engines/nancy/nancy.h"
@@ -460,7 +460,7 @@ void NancyEngine::readBootSummary(const IFF &boot) {
 	if (ser.getVersion() == kGameTypeNancy3) {
 		readChunkList(boot, ser, "PLG"); // partner logos
 	}
-	
+
 	readChunkList(boot, ser, "OB"); // objects
 
 	ser.skip(0x28, kGameTypeVampire, kGameTypeVampire);

engines/neverhood/blbarchive.cpp

@@ -19,7 +19,7 @@
  *
  */
 
-#include "common/dcl.h"
+#include "common/compression/dcl.h"
 #include "neverhood/blbarchive.h"
 
 namespace Neverhood {

engines/pink/pink.cpp

@@ -22,7 +22,7 @@
 #include "common/debug-channels.h"
 #include "common/winexe_pe.h"
 #include "common/config-manager.h"
-#include "common/installshield_cab.h"
+#include "common/compression/installshield_cab.h"
 
 #include "engines/advancedDetector.h"
 #include "engines/util.h"

engines/private/private.h

@@ -22,7 +22,7 @@
 #ifndef PRIVATE_H
 #define PRIVATE_H
 
-#include "common/installshieldv3_archive.h"
+#include "common/compression/installshieldv3_archive.h"
 #include "common/random.h"
 #include "common/serializer.h"
 #include "engines/engine.h"

engines/saga/saga.cpp

@@ -25,7 +25,7 @@
 #include "common/system.h"
 #include "common/events.h"
 #include "common/translation.h"
-#include "common/unarj.h"
+#include "common/compression/unarj.h"
 
 #include "audio/mixer.h"
 

engines/sci/resource/decompressor.cpp

@@ -21,7 +21,7 @@
 
 // Resource library
 
-#include "common/dcl.h"
+#include "common/compression/dcl.h"
 #include "common/util.h"
 #include "common/endian.h"
 #include "common/stream.h"

engines/sci/resource/resource.cpp

@@ -28,7 +28,7 @@
 #include "common/textconsole.h"
 #include "common/translation.h"
 #ifdef ENABLE_SCI32
-#include "common/installshield_cab.h"
+#include "common/compression/installshield_cab.h"
 #include "common/memstream.h"
 #endif
 

engines/scumm/saveload.cpp

@@ -24,7 +24,7 @@
 #include "common/savefile.h"
 #include "common/serializer.h"
 #include "common/system.h"
-#include "common/zlib.h"
+#include "common/compression/zlib.h"
 
 #include "scumm/actor.h"
 #include "scumm/charset.h"

engines/scumm/smush/smush_player.cpp

@@ -48,7 +48,7 @@
 #include "audio/decoders/raw.h"
 #include "audio/decoders/vorbis.h"
 
-#include "common/zlib.h"
+#include "common/compression/zlib.h"
 
 namespace Scumm {
 

engines/sky/disk.h

@@ -24,7 +24,7 @@
 
 
 #include "common/scummsys.h"
-#include "common/rnc_deco.h"
+#include "common/compression/rnc_deco.h"
 
 #define MAX_FILES_IN_LIST 60
 

engines/stark/resources/textureset.cpp

@@ -35,7 +35,7 @@
 #include "engines/stark/services/settings.h"
 
 #include "common/file.h"
-#include "common/unzip.h"
+#include "common/compression/unzip.h"
 #include "image/png.h"
 
 namespace Stark {

engines/sword25/kernel/persistenceservice.cpp

@@ -30,7 +30,7 @@
 
 #include "common/fs.h"
 #include "common/savefile.h"
-#include "common/zlib.h"
+#include "common/compression/zlib.h"
 #include "sword25/kernel/kernel.h"
 #include "sword25/kernel/persistenceservice.h"
 #include "sword25/kernel/inputpersistenceblock.h"

engines/sword25/package/packagemanager.cpp

@@ -33,7 +33,7 @@
 #include "common/savefile.h"
 #include "common/str-array.h"
 #include "common/system.h"
-#include "common/unzip.h"
+#include "common/compression/unzip.h"
 #include "sword25/sword25.h"	// for kDebugScript
 #include "sword25/kernel/filesystemutil.h"
 #include "sword25/package/packagemanager.h"

engines/teenagent/resources.cpp

@@ -24,7 +24,7 @@
 #include "common/debug.h"
 #include "common/textconsole.h"
 #include "common/translation.h"
-#include "common/zlib.h"
+#include "common/compression/zlib.h"
 
 namespace TeenAgent {
 

engines/titanic/support/files_manager.cpp

@@ -21,7 +21,7 @@
 
 #include "common/file.h"
 #include "common/memstream.h"
-#include "common/zlib.h"
+#include "common/compression/zlib.h"
 #include "titanic/support/files_manager.h"
 #include "titanic/game_manager.h"
 #include "titanic/titanic.h"

engines/titanic/support/simple_file.h

@@ -26,7 +26,7 @@
 #include "titanic/support/rect.h"
 #include "common/savefile.h"
 #include "common/stream.h"
-#include "common/zlib.h"
+#include "common/compression/zlib.h"
 #include "titanic/support/string.h"
 
 namespace Titanic {

engines/tony/tony.cpp

@@ -25,7 +25,7 @@
 #include "common/debug-channels.h"
 #include "common/events.h"
 #include "common/file.h"
-#include "common/installshield_cab.h"
+#include "common/compression/installshield_cab.h"
 #include "common/translation.h"
 #include "tony/tony.h"
 #include "tony/custom.h"

engines/toon/hotspot.cpp

@@ -20,7 +20,7 @@
  */
 
 #include "common/debug.h"
-#include "common/rnc_deco.h"
+#include "common/compression/rnc_deco.h"
 
 #include "toon/hotspot.h"
 

engines/toon/picture.cpp

@@ -24,7 +24,7 @@
 
 #include "common/debug.h"
 #include "common/rect.h"
-#include "common/rnc_deco.h"
+#include "common/compression/rnc_deco.h"
 #include "common/stack.h"
 
 namespace Toon {

engines/ultima/nuvie/nuvie.cpp

@@ -39,7 +39,7 @@
 #include "ultima/nuvie/gui/widgets/msg_scroll.h"
 #include "common/config-manager.h"
 #include "common/translation.h"
-#include "common/unzip.h"
+#include "common/compression/unzip.h"
 
 namespace Ultima {
 namespace Nuvie {

engines/ultima/shared/engine/data_archive.cpp

@@ -23,7 +23,7 @@
 #include "common/config-manager.h"
 #include "common/file.h"
 #include "common/translation.h"
-#include "common/unzip.h"
+#include "common/compression/unzip.h"
 
 namespace Ultima {
 namespace Shared {

engines/wintermute/base/base_file_manager.cpp

@@ -45,7 +45,7 @@
 #include "common/file.h"
 #include "common/savefile.h"
 #include "common/fs.h"
-#include "common/unzip.h"
+#include "common/compression/unzip.h"
 
 namespace Wintermute {
 

engines/wintermute/base/file/base_disk_file.cpp

@@ -32,7 +32,7 @@
 #include "common/stream.h"
 #include "common/memstream.h"
 #include "common/file.h"
-#include "common/zlib.h"
+#include "common/compression/zlib.h"
 #include "common/archive.h"
 #include "common/tokenizer.h"
 #include "common/config-manager.h"

engines/wintermute/base/file/base_file_entry.cpp

@@ -29,7 +29,7 @@
 #include "engines/wintermute/base/file/base_package.h"
 #include "common/stream.h"
 #include "common/substream.h"
-#include "common/zlib.h"
+#include "common/compression/zlib.h"
 
 namespace Wintermute {
 

engines/wintermute/base/font/base_font_truetype.cpp

@@ -38,7 +38,7 @@
 #include "graphics/fonts/ttf.h"
 #include "graphics/fontman.h"
 #include "common/unicode-bidi.h"
-#include "common/unzip.h"
+#include "common/compression/unzip.h"
 
 namespace Wintermute {
 

engines/wintermute/base/gfx/xfile_loader.cpp

@@ -27,7 +27,7 @@
 #include "common/endian.h"
 #include "common/str.h"
 #include "common/util.h"
-#include "common/zlib.h"
+#include "common/compression/zlib.h"
 
 #include "wintermute/base/gfx/xfile_loader.h"
 

engines/wintermute/base/gfx/xmodel.cpp

@@ -25,7 +25,7 @@
  * Copyright (c) 2003-2013 Jan Nedoma and contributors
  */
 
-#include "common/zlib.h"
+#include "common/compression/zlib.h"
 
 #include "engines/wintermute/base/base_file_manager.h"
 #include "engines/wintermute/base/base_game.h"

engines/zvision/text/truetype_font.cpp

@@ -24,7 +24,7 @@
 #include "common/debug.h"
 #include "common/file.h"
 #include "common/system.h"
-#include "common/unzip.h"
+#include "common/compression/unzip.h"
 #include "common/ustr.h"
 #include "graphics/font.h"
 #include "graphics/fonts/ttf.h"

graphics/fonts/ttf.cpp

@@ -39,7 +39,7 @@
 #include "common/memstream.h"
 #include "common/hashmap.h"
 #include "common/ptr.h"
-#include "common/unzip.h"
+#include "common/compression/unzip.h"
 
 #include <ft2build.h>
 #include FT_FREETYPE_H

graphics/macgui/datafiles.cpp

@@ -30,7 +30,7 @@
 #include "graphics/macgui/macwindowmanager.h"
 
 #include "common/archive.h"
-#include "common/unzip.h"
+#include "common/compression/unzip.h"
 
 namespace Graphics {
 

graphics/macgui/macfontmanager.cpp

@@ -20,7 +20,7 @@
 
 #include "common/archive.h"
 #include "common/stream.h"
-#include "common/unzip.h"
+#include "common/compression/unzip.h"
 #include "common/macresman.h"
 #include "graphics/fonts/bdf.h"
 #include "graphics/fonts/macfont.h"