Do not #include endian.h in scummsys.h (cuts down deps on endian.h from ~400 to ~250). Many greetings to eriktorbjorn, and have fun recompiling.

svn-id: r21500

87 files changed, 189 insertions, 24 deletions

diff --git a/engines/cine/anim.cpp b/engines/cine/anim.cpp
index 0566cbdef9..149794d6d2 100644
--- a/engines/cine/anim.cpp
+++ b/engines/cine/anim.cpp
@@ -22,6 +22,9 @@
  *
  */
 
+#include "common/stdafx.h"
+#include "common/endian.h"
+
 #include "cine/cine.h"
 #include "cine/anim.h"
 #include "cine/gfx.h"
diff --git a/engines/cine/bg.cpp b/engines/cine/bg.cpp
index 0867dc716d..fc7010d955 100644
--- a/engines/cine/bg.cpp
+++ b/engines/cine/bg.cpp
@@ -22,6 +22,9 @@
  *
  */
 
+#include "common/stdafx.h"
+#include "common/endian.h"
+
 #include "cine/cine.h"
 #include "cine/various.h"
 
diff --git a/engines/cine/msg.cpp b/engines/cine/msg.cpp
index 71e4ee323b..691c024259 100644
--- a/engines/cine/msg.cpp
+++ b/engines/cine/msg.cpp
@@ -23,7 +23,7 @@
  */
 
 #include "common/stdafx.h"
-#include "common/scummsys.h"
+#include "common/endian.h"
 
 #include "cine/msg.h"
 #include "cine/various.h"
diff --git a/engines/cine/object.cpp b/engines/cine/object.cpp
index 2ef2dc3a66..0c42646897 100644
--- a/engines/cine/object.cpp
+++ b/engines/cine/object.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "common/stdafx.h"
+#include "common/endian.h"
 #include "common/scummsys.h"
 #include "common/util.h"
 
diff --git a/engines/cine/prc.cpp b/engines/cine/prc.cpp
index 70b3daf9a0..8eaff59004 100644
--- a/engines/cine/prc.cpp
+++ b/engines/cine/prc.cpp
@@ -22,6 +22,9 @@
  *
  */
 
+#include "common/stdafx.h"
+#include "common/endian.h"
+
 #include "cine/cine.h"
 #include "cine/auto00.h"
 #include "cine/various.h"
diff --git a/engines/cine/rel.cpp b/engines/cine/rel.cpp
index 75ec5efe33..7cd2dcb894 100644
--- a/engines/cine/rel.cpp
+++ b/engines/cine/rel.cpp
@@ -22,6 +22,9 @@
  *
  */
 
+#include "common/stdafx.h"
+#include "common/endian.h"
+
 #include "cine/cine.h"
 #include "cine/various.h"
 
diff --git a/engines/cine/script.cpp b/engines/cine/script.cpp
index b5569f9900..60def8e2e6 100644
--- a/engines/cine/script.cpp
+++ b/engines/cine/script.cpp
@@ -22,6 +22,9 @@
  *
  */
 
+#include "common/stdafx.h"
+#include "common/endian.h"
+
 #include "cine/cine.h"
 #include "cine/bg_list.h"
 #include "cine/object.h"
diff --git a/engines/cine/sfx_player.cpp b/engines/cine/sfx_player.cpp
index 6ee9852255..dbe48155ad 100644
--- a/engines/cine/sfx_player.cpp
+++ b/engines/cine/sfx_player.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "common/stdafx.h"
+#include "common/endian.h"
 #include "common/system.h"
 
 #include "cine/cine.h"
diff --git a/engines/cine/sound_driver.cpp b/engines/cine/sound_driver.cpp
index 8973fdf445..d0398cb5b1 100644
--- a/engines/cine/sound_driver.cpp
+++ b/engines/cine/sound_driver.cpp
@@ -22,6 +22,9 @@
  *
  */
 
+#include "common/stdafx.h"
+#include "common/endian.h"
+
 #include "cine/cine.h"
 #include "cine/sound_driver.h"
 
diff --git a/engines/cine/unpack.cpp b/engines/cine/unpack.cpp
index cae9a2e1f2..597d412123 100644
--- a/engines/cine/unpack.cpp
+++ b/engines/cine/unpack.cpp
@@ -22,6 +22,9 @@
  *
  */
 
+#include "common/stdafx.h"
+#include "common/endian.h"
+
 #include "cine/unpack.h"
 
 namespace Cine {
diff --git a/engines/cine/various.cpp b/engines/cine/various.cpp
index 35e634653d..8c2f3b9cdc 100644
--- a/engines/cine/various.cpp
+++ b/engines/cine/various.cpp
@@ -22,6 +22,9 @@
  *
  */
 
+#include "common/stdafx.h"
+#include "common/endian.h"
+
 #include "cine/cine.h"
 #include "cine/font.h"
 #include "cine/main_loop.h"
diff --git a/engines/gob/cdrom.cpp b/engines/gob/cdrom.cpp
index d5b3dde171..1a21cf0b67 100644
--- a/engines/gob/cdrom.cpp
+++ b/engines/gob/cdrom.cpp
@@ -19,6 +19,10 @@
  * $Id$
  *
  */
+
+#include "common/stdafx.h"
+#include "common/endian.h"
+
 #include "gob/gob.h"
 #include "gob/cdrom.h"
 #include "gob/dataio.h"
diff --git a/engines/gob/draw.cpp b/engines/gob/draw.cpp
index 62213b607e..caf4a73ce8 100644
--- a/engines/gob/draw.cpp
+++ b/engines/gob/draw.cpp
@@ -20,6 +20,10 @@
  * $Id$
  *
  */
+
+#include "common/stdafx.h"
+#include "common/endian.h"
+
 #include "gob/gob.h"
 #include "gob/draw.h"
 #include "gob/global.h"
diff --git a/engines/gob/driver_vga.cpp b/engines/gob/driver_vga.cpp
index 3a2f44bc11..b34ab14a66 100644
--- a/engines/gob/driver_vga.cpp
+++ b/engines/gob/driver_vga.cpp
@@ -20,6 +20,10 @@
  * $Id$
  *
  */
+
+#include "common/stdafx.h"
+#include "common/endian.h"
+
 #include "gob/driver_vga.h"
 #include "graphics/primitives.h"
 
diff --git a/engines/gob/game.cpp b/engines/gob/game.cpp
index 677c0cc5cd..32d3d9bce6 100644
--- a/engines/gob/game.cpp
+++ b/engines/gob/game.cpp
@@ -20,6 +20,10 @@
  * $Id$
  *
  */
+
+#include "common/stdafx.h"
+#include "common/endian.h"
+
 #include "gob/gob.h"
 #include "gob/global.h"
 #include "gob/game.h"
diff --git a/engines/gob/init.cpp b/engines/gob/init.cpp
index 43b6344499..a5ba883590 100644
--- a/engines/gob/init.cpp
+++ b/engines/gob/init.cpp
@@ -20,6 +20,10 @@
  * $Id$
  *
  */
+
+#include "common/stdafx.h"
+#include "common/endian.h"
+
 #include "gob/gob.h"
 #include "gob/dataio.h"
 #include "gob/global.h"
diff --git a/engines/gob/inter.cpp b/engines/gob/inter.cpp
index 895301e07a..72bbe3194e 100644
--- a/engines/gob/inter.cpp
+++ b/engines/gob/inter.cpp
@@ -20,6 +20,10 @@
  * $Id$
  *
  */
+
+#include "common/stdafx.h"
+#include "common/endian.h"
+
 #include "gob/gob.h"
 #include "gob/global.h"
 #include "gob/inter.h"
diff --git a/engines/gob/inter_v1.cpp b/engines/gob/inter_v1.cpp
index 04eba247f2..88cb5f2307 100644
--- a/engines/gob/inter_v1.cpp
+++ b/engines/gob/inter_v1.cpp
@@ -20,6 +20,10 @@
  * $Id$
  *
  */
+
+#include "common/stdafx.h"
+#include "common/endian.h"
+
 #include "gob/gob.h"
 #include "gob/global.h"
 #include "gob/inter.h"
diff --git a/engines/gob/map.cpp b/engines/gob/map.cpp
index ed08d1d401..4e90e5f232 100644
--- a/engines/gob/map.cpp
+++ b/engines/gob/map.cpp
@@ -20,6 +20,10 @@
  * $Id$
  *
  */
+
+#include "common/stdafx.h"
+#include "common/endian.h"
+
 #include "gob/gob.h"
 #include "gob/map.h"
 #include "gob/video.h"
diff --git a/engines/gob/mult.cpp b/engines/gob/mult.cpp
index 0ac2e115bc..b16e5d9739 100644
--- a/engines/gob/mult.cpp
+++ b/engines/gob/mult.cpp
@@ -20,6 +20,10 @@
  * $Id$
  *
  */
+
+#include "common/stdafx.h"
+#include "common/endian.h"
+
 #include "gob/gob.h"
 #include "gob/video.h"
 #include "gob/anim.h"
diff --git a/engines/gob/mult_v1.cpp b/engines/gob/mult_v1.cpp
index 72328c42cf..a35ca3f321 100644
--- a/engines/gob/mult_v1.cpp
+++ b/engines/gob/mult_v1.cpp
@@ -21,6 +21,9 @@
  *
  */
 
+#include "common/stdafx.h"
+#include "common/endian.h"
+
 #include "gob/gob.h"
 #include "gob/mult.h"
 #include "gob/game.h"
diff --git a/engines/gob/mult_v2.cpp b/engines/gob/mult_v2.cpp
index 635caa7528..3c105f8528 100644
--- a/engines/gob/mult_v2.cpp
+++ b/engines/gob/mult_v2.cpp
@@ -21,6 +21,9 @@
  *
  */
 
+#include "common/stdafx.h"
+#include "common/endian.h"
+
 #include "gob/gob.h"
 #include "gob/mult.h"
 #include "gob/game.h"
diff --git a/engines/gob/pack.cpp b/engines/gob/pack.cpp
index c255a70ace..60ba5deea4 100644
--- a/engines/gob/pack.cpp
+++ b/engines/gob/pack.cpp
@@ -20,6 +20,10 @@
  * $Id$
  *
  */
+
+#include "common/stdafx.h"
+#include "common/endian.h"
+
 #include "gob/gob.h"
 #include "gob/pack.h"
 
diff --git a/engines/gob/parse.cpp b/engines/gob/parse.cpp
index 947de49d79..d8373cf58f 100644
--- a/engines/gob/parse.cpp
+++ b/engines/gob/parse.cpp
@@ -20,6 +20,10 @@
  * $Id$
  *
  */
+
+#include "common/stdafx.h"
+#include "common/endian.h"
+
 #include "gob/gob.h"
 #include "gob/global.h"
 #include "gob/game.h"
diff --git a/engines/gob/parse_v1.cpp b/engines/gob/parse_v1.cpp
index b827a26943..74660223c4 100644
--- a/engines/gob/parse_v1.cpp
+++ b/engines/gob/parse_v1.cpp
@@ -21,6 +21,9 @@
  *
  */
 
+#include "common/stdafx.h"
+#include "common/endian.h"
+
 #include "gob/gob.h"
 #include "gob/parse.h"
 #include "gob/inter.h"
diff --git a/engines/gob/parse_v2.cpp b/engines/gob/parse_v2.cpp
index 8aae929459..dce5c37995 100644
--- a/engines/gob/parse_v2.cpp
+++ b/engines/gob/parse_v2.cpp
@@ -21,6 +21,9 @@
  *
  */
 
+#include "common/stdafx.h"
+#include "common/endian.h"
+
 #include "gob/gob.h"
 #include "gob/parse.h"
 #include "gob/inter.h"
diff --git a/engines/gob/scenery.cpp b/engines/gob/scenery.cpp
index 917c1995c5..0e65f9799a 100644
--- a/engines/gob/scenery.cpp
+++ b/engines/gob/scenery.cpp
@@ -20,6 +20,10 @@
  * $Id$
  *
  */
+
+#include "common/stdafx.h"
+#include "common/endian.h"
+
 #include "gob/gob.h"
 #include "gob/scenery.h"
 #include "gob/inter.h"
diff --git a/engines/gob/video.cpp b/engines/gob/video.cpp
index 1b52918a5b..5e0dcad185 100644
--- a/engines/gob/video.cpp
+++ b/engines/gob/video.cpp
@@ -20,6 +20,9 @@
  * $Id$
  *
  */
+#include "common/stdafx.h"
+#include "common/endian.h"
+
 #include "gob/gob.h"
 #include "gob/global.h"
 #include "gob/video.h"
diff --git a/engines/kyra/animator.cpp b/engines/kyra/animator.cpp
index e28860a435..e2b9403a28 100644
--- a/engines/kyra/animator.cpp
+++ b/engines/kyra/animator.cpp
@@ -20,6 +20,9 @@
  *
  */
 
+#include "common/stdafx.h"
+#include "common/endian.h"
+
 #include "kyra/kyra.h"
 #include "kyra/screen.h"
 #include "kyra/animator.h"
diff --git a/engines/kyra/resource.cpp b/engines/kyra/resource.cpp
index fe0f1850ab..42c8d3894f 100644
--- a/engines/kyra/resource.cpp
+++ b/engines/kyra/resource.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "common/stdafx.h"
+#include "common/endian.h"
 #include "common/file.h"
 #include "kyra/resource.h"
 #include "kyra/script.h"
diff --git a/engines/kyra/saveload.cpp b/engines/kyra/saveload.cpp
index e348898498..f56913fe86 100644
--- a/engines/kyra/saveload.cpp
+++ b/engines/kyra/saveload.cpp
@@ -20,14 +20,16 @@
  *
  */
 
+#include "common/stdafx.h"
+#include "common/endian.h"
+#include "common/savefile.h"
+#include "common/system.h"
+
 #include "kyra/kyra.h"
 #include "kyra/animator.h"
 #include "kyra/screen.h"
 #include "kyra/resource.h"
 
-#include "common/savefile.h"
-#include "common/system.h"
-
 #define CURRENT_VERSION 4
 
 namespace Kyra {
diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp
index 5b34dbaea8..31abb70746 100644
--- a/engines/kyra/screen.cpp
+++ b/engines/kyra/screen.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "common/stdafx.h"
+#include "common/endian.h"
 #include "common/system.h"
 #include "kyra/screen.h"
 #include "kyra/kyra.h"
diff --git a/engines/kyra/script.cpp b/engines/kyra/script.cpp
index 14a8c33d4d..70379a3827 100644
--- a/engines/kyra/script.cpp
+++ b/engines/kyra/script.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "common/stdafx.h"
+#include "common/endian.h"
 #include "common/stream.h"
 #include "common/util.h"
 #include "common/system.h"
diff --git a/engines/kyra/script_v1.cpp b/engines/kyra/script_v1.cpp
index bc09ba707a..269ed3a6fc 100644
--- a/engines/kyra/script_v1.cpp
+++ b/engines/kyra/script_v1.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "common/stdafx.h"
+#include "common/endian.h"
 #include "kyra/kyra.h"
 #include "kyra/script.h"
 #include "kyra/screen.h"
diff --git a/engines/kyra/sprites.cpp b/engines/kyra/sprites.cpp
index 620241964d..3d962d82c9 100644
--- a/engines/kyra/sprites.cpp
+++ b/engines/kyra/sprites.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "common/stdafx.h"
+#include "common/endian.h"
 #include "common/stream.h"
 #include "common/util.h"
 #include "common/system.h"
diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp
index ddbdbd5d93..0dc9fec636 100644
--- a/engines/kyra/staticres.cpp
+++ b/engines/kyra/staticres.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "common/stdafx.h"
+#include "common/endian.h"
 #include "kyra/kyra.h"
 #include "kyra/screen.h"
 #include "kyra/resource.h"
diff --git a/engines/kyra/wsamovie.cpp b/engines/kyra/wsamovie.cpp
index efde7918f7..ac9625efed 100644
--- a/engines/kyra/wsamovie.cpp
+++ b/engines/kyra/wsamovie.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "common/stdafx.h"
+#include "common/endian.h"
 #include "kyra/kyra.h"
 #include "kyra/screen.h"
 #include "kyra/wsamovie.h"
diff --git a/engines/lure/animseq.cpp b/engines/lure/animseq.cpp
index c5ca90afd1..5b13ae21d4 100644
--- a/engines/lure/animseq.cpp
+++ b/engines/lure/animseq.cpp
@@ -24,6 +24,7 @@
 #include "lure/palette.h"
 #include "lure/decode.h"
 #include "lure/events.h"
+#include "common/endian.h"
 
 namespace Lure {
 
diff --git a/engines/lure/decode.cpp b/engines/lure/decode.cpp
index c91cd97621..c32223edc3 100644
--- a/engines/lure/decode.cpp
+++ b/engines/lure/decode.cpp
@@ -23,6 +23,7 @@
 #include "lure/decode.h"
 #include "lure/memory.h"
 #include "lure/luredefs.h"
+#include "common/endian.h"
 
 namespace Lure {
 
diff --git a/engines/lure/disk.cpp b/engines/lure/disk.cpp
index e996ff6ecc..9638957443 100644
--- a/engines/lure/disk.cpp
+++ b/engines/lure/disk.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "common/stdafx.h"
+#include "common/endian.h"
 #include "common/file.h"
 #include "common/util.h"
 #include "common/scummsys.h"
diff --git a/engines/lure/lure.cpp b/engines/lure/lure.cpp
index 25a9a1a5c2..cdc3a31279 100644
--- a/engines/lure/lure.cpp
+++ b/engines/lure/lure.cpp
@@ -28,6 +28,7 @@
 #include "base/plugins.h"
 
 #include "common/config-manager.h"
+#include "common/endian.h"
 #include "common/file.h"
 #include "common/system.h"
 #include "common/md5.h"
diff --git a/engines/lure/res.cpp b/engines/lure/res.cpp
index cca901a334..c1a8fa82f1 100644
--- a/engines/lure/res.cpp
+++ b/engines/lure/res.cpp
@@ -24,6 +24,7 @@
 #include "lure/disk.h"
 #include "lure/scripts.h"
 #include "lure/screen.h"
+#include "common/endian.h"
 
 namespace Lure {
 
diff --git a/engines/lure/res_struct.cpp b/engines/lure/res_struct.cpp
index 4858f5e06b..587e25919f 100644
--- a/engines/lure/res_struct.cpp
+++ b/engines/lure/res_struct.cpp
@@ -24,6 +24,7 @@
 #include "lure/disk.h"
 #include "lure/scripts.h"
 #include "lure/system.h"
+#include "common/endian.h"
 
 namespace Lure {
 
diff --git a/engines/lure/scripts.cpp b/engines/lure/scripts.cpp
index 2cffae9fb1..4753b00399 100644
--- a/engines/lure/scripts.cpp
+++ b/engines/lure/scripts.cpp
@@ -24,6 +24,7 @@
 #include "lure/res.h"
 #include "lure/game.h"
 #include "common/stack.h"
+#include "common/endian.h"
 
 namespace Lure {
 
diff --git a/engines/lure/strings.cpp b/engines/lure/strings.cpp
index d509e3842d..2e453298d9 100644
--- a/engines/lure/strings.cpp
+++ b/engines/lure/strings.cpp
@@ -23,6 +23,7 @@
 #include "lure/strings.h"
 #include "lure/disk.h"
 #include "lure/room.h"
+#include "common/endian.h"
 
 namespace Lure {
 
diff --git a/engines/lure/surface.cpp b/engines/lure/surface.cpp
index 2205a7ea13..19ad9330da 100644
--- a/engines/lure/surface.cpp
+++ b/engines/lure/surface.cpp
@@ -27,6 +27,7 @@
 #include "lure/screen.h"
 #include "lure/room.h"
 #include "lure/strings.h"
+#include "common/endian.h"
 
 namespace Lure {
 
diff --git a/engines/queen/sound.cpp b/engines/queen/sound.cpp
index a5c756e366..6d68d6ac91 100644
--- a/engines/queen/sound.cpp
+++ b/engines/queen/sound.cpp
@@ -21,6 +21,8 @@
  */
 
 #include "common/stdafx.h"
+#include "common/endian.h"
+
 #include "queen/sound.h"
 
 #include "queen/input.h"
diff --git a/engines/queen/structs.h b/engines/queen/structs.h
index 4f43950fa4..65d373295a 100644
--- a/engines/queen/structs.h
+++ b/engines/queen/structs.h
@@ -24,6 +24,7 @@
 #define QUEENSTRUCTS_H
 
 #include "queen/defs.h"
+#include "common/endian.h"
 
 namespace Queen {
 
diff --git a/engines/saga/script.h b/engines/saga/script.h
index bc11013b3f..218d92c4c3 100644
--- a/engines/saga/script.h
+++ b/engines/saga/script.h
@@ -27,6 +27,8 @@
 #ifndef SAGA_SCRIPT_H
 #define SAGA_SCRIPT_H
 
+#include "common/endian.h"
+
 #include "saga/font.h"
 #include "saga/list.h"
 
diff --git a/engines/scumm/file.cpp b/engines/scumm/file.cpp
index bc213baa14..7a17d8c97b 100644
--- a/engines/scumm/file.cpp
+++ b/engines/scumm/file.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "scumm/file.h"
+#include "common/endian.h"
 #include "common/util.h"
 #include "common/md5.h"
 
diff --git a/engines/scumm/imuse/sysex_samnmax.cpp b/engines/scumm/imuse/sysex_samnmax.cpp
index 0a01eb5065..9cf1ec32a4 100644
--- a/engines/scumm/imuse/sysex_samnmax.cpp
+++ b/engines/scumm/imuse/sysex_samnmax.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "common/stdafx.h"
+#include "common/endian.h"
 #include "common/util.h"
 
 /*
diff --git a/engines/scumm/imuse/sysex_scumm.cpp b/engines/scumm/imuse/sysex_scumm.cpp
index 2b11878522..4d51cc4fba 100644
--- a/engines/scumm/imuse/sysex_scumm.cpp
+++ b/engines/scumm/imuse/sysex_scumm.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "common/stdafx.h"
+#include "common/endian.h"
 #include "common/util.h"
 
 /*
diff --git a/engines/scumm/imuse_digi/dimuse_codecs.cpp b/engines/scumm/imuse_digi/dimuse_codecs.cpp
index 116c78bf5c..6f695eab0d 100644
--- a/engines/scumm/imuse_digi/dimuse_codecs.cpp
+++ b/engines/scumm/imuse_digi/dimuse_codecs.cpp
@@ -21,6 +21,7 @@
 
 #include "common/stdafx.h"
 #include "common/scummsys.h"
+#include "common/endian.h"
 #include "common/util.h"
 
 namespace Scumm {
diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h
index c5998736aa..bd869d9868 100644
--- a/engines/scumm/scumm.h
+++ b/engines/scumm/scumm.h
@@ -25,6 +25,7 @@
 #define SCUMM_H
 
 #include "base/engine.h"
+#include "common/endian.h"
 #include "common/file.h"
 #include "common/rect.h"
 #include "common/str.h"
diff --git a/engines/scumm/smush/codec1.cpp b/engines/scumm/smush/codec1.cpp
index 04d55e2ed7..5b6a7b62f8 100644
--- a/engines/scumm/smush/codec1.cpp
+++ b/engines/scumm/smush/codec1.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "common/stdafx.h"
-#include "common/scummsys.h"
+#include "common/endian.h"
 
 namespace Scumm {
 
diff --git a/engines/scumm/smush/codec37.cpp b/engines/scumm/smush/codec37.cpp
index 732bffeeae..ba323c03f2 100644
--- a/engines/scumm/smush/codec37.cpp
+++ b/engines/scumm/smush/codec37.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "common/stdafx.h"
+#include "common/endian.h"
 #include "common/util.h"
 #include "scumm/bomp.h"
 #include "scumm/smush/codec37.h"
diff --git a/engines/scumm/smush/codec47.cpp b/engines/scumm/smush/codec47.cpp
index ef10a282a9..5e44492a8e 100644
--- a/engines/scumm/smush/codec47.cpp
+++ b/engines/scumm/smush/codec47.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "common/stdafx.h"
+#include "common/endian.h"
 #include "common/util.h"
 #include "scumm/bomp.h"
 #include "scumm/smush/codec47.h"
diff --git a/engines/scumm/smush/saud_channel.cpp b/engines/scumm/smush/saud_channel.cpp
index 2277336570..9969ac4bc9 100644
--- a/engines/scumm/smush/saud_channel.cpp
+++ b/engines/scumm/smush/saud_channel.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "common/stdafx.h"
+#include "common/endian.h"
 
 #include "scumm/smush/channel.h"
 #include "scumm/smush/chunk.h"
diff --git a/engines/sky/autoroute.cpp b/engines/sky/autoroute.cpp
index 15c00ff028..53c870f6f2 100644
--- a/engines/sky/autoroute.cpp
+++ b/engines/sky/autoroute.cpp
@@ -21,7 +21,9 @@
  */
 
 #include "common/stdafx.h"
+#include "common/endian.h"
 #include "common/util.h"
+
 #include "sky/autoroute.h"
 #include "sky/compact.h"
 #include "sky/grid.h"
diff --git a/engines/sky/compact.cpp b/engines/sky/compact.cpp
index 7807c64f95..057465c6e6 100644
--- a/engines/sky/compact.cpp
+++ b/engines/sky/compact.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "common/stdafx.h"
+#include "common/endian.h"
 #include "common/util.h"
 #include "common/file.h"
 #include "sky/compact.h"
diff --git a/engines/sky/control.cpp b/engines/sky/control.cpp
index 59e7aa0e5e..d5cdadd09f 100644
--- a/engines/sky/control.cpp
+++ b/engines/sky/control.cpp
@@ -21,11 +21,13 @@
  */
 
 #include "common/stdafx.h"
+#include "common/endian.h"
 #include "common/config-manager.h"
 #include "common/file.h"
 #include "common/system.h"
 #include "common/savefile.h"
 #include "common/util.h"
+
 #include "gui/message.h"
 #include "sky/compact.h"
 #include "sky/control.h"
diff --git a/engines/sky/debug.cpp b/engines/sky/debug.cpp
index cac1a53aba..d7e8f6694c 100644
--- a/engines/sky/debug.cpp
+++ b/engines/sky/debug.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "common/stdafx.h"
+#include "common/endian.h"
 #include "common/util.h"
 #include "common/debugger.cpp"
 
diff --git a/engines/sky/disk.cpp b/engines/sky/disk.cpp
index 3c39a287d0..451b4d9058 100644
--- a/engines/sky/disk.cpp
+++ b/engines/sky/disk.cpp
@@ -21,9 +21,10 @@
  */
 
 #include "common/stdafx.h"
+#include "common/endian.h"
 #include "common/file.h"
 #include "common/util.h"
-#include "common/scummsys.h"
+
 #include "sky/disk.h"
 #include "sky/rnc_deco.h"
 #include "sky/sky.h"
diff --git a/engines/sky/intro.cpp b/engines/sky/intro.cpp
index ce6849fbd0..9f8b56356e 100644
--- a/engines/sky/intro.cpp
+++ b/engines/sky/intro.cpp
@@ -21,8 +21,10 @@
  */
 
 #include "common/stdafx.h"
+#include "common/endian.h"
 #include "common/util.h"
 #include "common/system.h"
+
 #include "sky/disk.h"
 #include "sky/intro.h"
 #include "sky/music/musicbase.h"
diff --git a/engines/sky/logic.cpp b/engines/sky/logic.cpp
index 9ea560a5bf..5c63c22f85 100644
--- a/engines/sky/logic.cpp
+++ b/engines/sky/logic.cpp
@@ -21,6 +21,8 @@
  */
 
 #include "common/stdafx.h"
+#include "common/endian.h"
+
 #include "sky/autoroute.h"
 #include "sky/compact.h"
 #include "sky/control.h"
diff --git a/engines/sky/music/adlibchannel.cpp b/engines/sky/music/adlibchannel.cpp
index 9b28f832bb..1ea9a4a8c5 100644
--- a/engines/sky/music/adlibchannel.cpp
+++ b/engines/sky/music/adlibchannel.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "common/stdafx.h"
+#include "common/endian.h"
 #include "common/util.h"
 #include "sky/music/adlibchannel.h"
 #include "sky/sky.h"
diff --git a/engines/sky/music/adlibmusic.cpp b/engines/sky/music/adlibmusic.cpp
index e7ee4ecb6d..7df70e4a0f 100644
--- a/engines/sky/music/adlibmusic.cpp
+++ b/engines/sky/music/adlibmusic.cpp
@@ -20,6 +20,9 @@
  *
  */
 
+#include "common/stdafx.h"
+#include "common/endian.h"
+
 #include "sky/music/adlibmusic.h"
 #include "sky/music/adlibchannel.h"
 #include "sound/mixer.h"
diff --git a/engines/sky/rnc_deco.cpp b/engines/sky/rnc_deco.cpp
index 06b7721d74..6218c296c3 100644
--- a/engines/sky/rnc_deco.cpp
+++ b/engines/sky/rnc_deco.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "common/stdafx.h"
-#include "common/scummsys.h"
+#include "common/endian.h"
 #include "sky/rnc_deco.h"
 
 namespace Sky {
diff --git a/engines/sky/screen.cpp b/engines/sky/screen.cpp
index 8688969de5..1b262f5659 100644
--- a/engines/sky/screen.cpp
+++ b/engines/sky/screen.cpp
@@ -21,7 +21,9 @@
  */
 
 #include "common/stdafx.h"
+#include "common/endian.h"
 #include "common/system.h"
+
 #include "sky/disk.h"
 #include "sky/logic.h"
 #include "sky/screen.h"
diff --git a/engines/sky/sound.cpp b/engines/sky/sound.cpp
index 0cd015d49d..c74e6f9c99 100644
--- a/engines/sky/sound.cpp
+++ b/engines/sky/sound.cpp
@@ -21,6 +21,8 @@
  */
 
 #include "common/stdafx.h"
+#include "common/endian.h"
+
 #include "sky/disk.h"
 #include "sky/logic.h"
 #include "sky/sky.h"
diff --git a/engines/sky/text.cpp b/engines/sky/text.cpp
index 2c997340ab..d15bc554d1 100644
--- a/engines/sky/text.cpp
+++ b/engines/sky/text.cpp
@@ -20,6 +20,9 @@
  *
  */
 
+#include "common/stdafx.h"
+#include "common/endian.h"
+
 #include "sky/disk.h"
 #include "sky/logic.h"
 #include "sky/text.h"
diff --git a/engines/sword1/control.cpp b/engines/sword1/control.cpp
index bf101e9638..aa6b216b35 100644
--- a/engines/sword1/control.cpp
+++ b/engines/sword1/control.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "common/stdafx.h"
+#include "common/endian.h"
 #include "common/file.h"
 #include "common/util.h"
 #include "common/savefile.h"
diff --git a/engines/sword1/credits.cpp b/engines/sword1/credits.cpp
index 117430b96f..e5bda89e10 100644
--- a/engines/sword1/credits.cpp
+++ b/engines/sword1/credits.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "common/stdafx.h"
+#include "common/endian.h"
 
 #include "sword1/credits.h"
 #include "sword1/screen.h"
diff --git a/engines/sword1/logic.cpp b/engines/sword1/logic.cpp
index 0b789559e0..2c619d6dc9 100644
--- a/engines/sword1/logic.cpp
+++ b/engines/sword1/logic.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "common/stdafx.h"
+#include "common/endian.h"
 #include "common/util.h"
 
 #include "sword1/logic.h"
diff --git a/engines/sword1/mouse.cpp b/engines/sword1/mouse.cpp
index a84708c6b9..f925984984 100644
--- a/engines/sword1/mouse.cpp
+++ b/engines/sword1/mouse.cpp
@@ -21,6 +21,9 @@
  */
 
 #include "common/stdafx.h"
+#include "common/endian.h"
+#include "common/system.h"
+
 #include "sword1/mouse.h"
 #include "sword1/menu.h"
 #include "sword1/screen.h"
@@ -28,7 +31,6 @@
 #include "sword1/resman.h"
 #include "sword1/objectman.h"
 #include "sword1/sworddefs.h"
-#include "common/system.h"
 #include "sword1/swordres.h"
 #include "sword1/menu.h"
 
diff --git a/engines/sword1/music.cpp b/engines/sword1/music.cpp
index a5ed77d30d..6ea75da4c7 100644
--- a/engines/sword1/music.cpp
+++ b/engines/sword1/music.cpp
@@ -21,13 +21,12 @@
  */
 
 #include "common/stdafx.h"
-
-#include "sword1/music.h"
-
-#include "common/util.h"
+#include "common/endian.h"
 #include "common/file.h"
+#include "common/util.h"
 #include "common/system.h"
 
+#include "sword1/music.h"
 #include "sound/mixer.h"
 #include "sound/mp3.h"
 #include "sound/vorbis.h"
diff --git a/engines/sword1/objectman.cpp b/engines/sword1/objectman.cpp
index 330e5566ee..bb21f25b13 100644
--- a/engines/sword1/objectman.cpp
+++ b/engines/sword1/objectman.cpp
@@ -21,9 +21,10 @@
  */
 
 #include "common/stdafx.h"
-#include "sword1/objectman.h"
-#include "common/scummsys.h"
+#include "common/endian.h"
 #include "common/util.h"
+
+#include "sword1/objectman.h"
 #include "sword1/sworddefs.h"
 #include "sword1/swordres.h"
 #include "sword1/sword1.h"
diff --git a/engines/sword1/resman.cpp b/engines/sword1/resman.cpp
index fd86993dfa..c7fe6bf3ba 100644
--- a/engines/sword1/resman.cpp
+++ b/engines/sword1/resman.cpp
@@ -21,14 +21,16 @@
  */
 
 #include "common/stdafx.h"
-#include "common/scummsys.h"
-#include "sword1/memman.h"
-#include "sword1/resman.h"
-#include "sword1/sworddefs.h"
-#include "base/engine.h"
+#include "common/endian.h"
 #include "common/config-manager.h"
 #include "common/util.h"
 #include "common/str.h"
+
+#include "base/engine.h"
+
+#include "sword1/memman.h"
+#include "sword1/resman.h"
+#include "sword1/sworddefs.h"
 #include "sword1/swordres.h"
 
 #include "gui/message.h"
diff --git a/engines/sword1/router.cpp b/engines/sword1/router.cpp
index 68f8ca6756..57e72880f7 100644
--- a/engines/sword1/router.cpp
+++ b/engines/sword1/router.cpp
@@ -21,9 +21,10 @@
  */
 
 #include "common/stdafx.h"
-#include "sword1/router.h"
+#include "common/endian.h"
 #include "common/util.h"
-#include "common/scummsys.h"
+
+#include "sword1/router.h"
 #include "sword1/swordres.h"
 #include "sword1/sworddefs.h"
 #include "sword1/objectman.h"
diff --git a/engines/sword1/screen.cpp b/engines/sword1/screen.cpp
index 248f1d3227..26672b3a3c 100644
--- a/engines/sword1/screen.cpp
+++ b/engines/sword1/screen.cpp
@@ -21,9 +21,10 @@
  */
 
 #include "common/stdafx.h"
-#include "common/scummsys.h"
+#include "common/endian.h"
 #include "common/system.h"
 #include "common/util.h"
+
 #include "sword1/screen.h"
 #include "sword1/logic.h"
 #include "sword1/sworddefs.h"
diff --git a/engines/sword1/sound.cpp b/engines/sword1/sound.cpp
index 5275c5683e..63494a936b 100644
--- a/engines/sword1/sound.cpp
+++ b/engines/sword1/sound.cpp
@@ -21,8 +21,11 @@
  */
 
 #include "common/stdafx.h"
-#include "sword1/sound.h"
+#include "common/endian.h"
+
 #include "common/util.h"
+
+#include "sword1/sound.h"
 #include "sword1/resman.h"
 #include "sword1/logic.h"
 #include "sword1/sword1.h"
diff --git a/engines/sword1/text.cpp b/engines/sword1/text.cpp
index d7e14073e9..f227ca11f9 100644
--- a/engines/sword1/text.cpp
+++ b/engines/sword1/text.cpp
@@ -21,10 +21,12 @@
  */
 
 #include "common/stdafx.h"
+#include "common/endian.h"
+#include "common/util.h"
+
 #include "sword1/text.h"
 #include "sword1/resman.h"
 #include "sword1/objectman.h"
-#include "common/util.h"
 #include "sword1/swordres.h"
 #include "sword1/sworddefs.h"
 
diff --git a/engines/sword2/header.h b/engines/sword2/header.h
index f5cfec6416..278d98b0b9 100644
--- a/engines/sword2/header.h
+++ b/engines/sword2/header.h
@@ -23,6 +23,7 @@
 #define	SWORD2_HEADER_H
 
 #include "common/stream.h"
+#include "common/endian.h"
 
 namespace Sword2 {
 
diff --git a/engines/sword2/interpreter.h b/engines/sword2/interpreter.h
index 15a58331c7..c4f352dfa2 100644
--- a/engines/sword2/interpreter.h
+++ b/engines/sword2/interpreter.h
@@ -22,6 +22,8 @@
 #ifndef SWORD2_INTERPRETER_H
 #define SWORD2_INTERPRETER_H
 
+#include "common/endian.h"
+
 namespace Sword2 {
 
 // Interpreter return codes
diff --git a/engines/sword2/logic.h b/engines/sword2/logic.h
index c12ca73547..1e592f662e 100644
--- a/engines/sword2/logic.h
+++ b/engines/sword2/logic.h
@@ -25,6 +25,7 @@
 #define SWORD2_LOGIC_H
 
 #include "sword2/memory.h"
+#include "common/endian.h"
 
 namespace Sword2 {
 
diff --git a/engines/sword2/object.h b/engines/sword2/object.h
index 7d82bbcdec..829a3ab38e 100644
--- a/engines/sword2/object.h
+++ b/engines/sword2/object.h
@@ -23,6 +23,7 @@
 #define	SWORD2_OBJECT_H
 
 #include "common/stream.h"
+#include "common/endian.h"
 
 namespace Sword2 {
 
diff --git a/engines/sword2/render.cpp b/engines/sword2/render.cpp
index 261ba8b406..4231c49025 100644
--- a/engines/sword2/render.cpp
+++ b/engines/sword2/render.cpp
@@ -20,6 +20,7 @@
  */
 
 #include "common/stdafx.h"
+#include "common/endian.h"
 #include "common/system.h"
 
 #include "graphics/primitives.h"