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

backends/midi/morphos.cpp

@@ -31,6 +31,7 @@
 #include <proto/etude.h>
 
 #include "common/stdafx.h"
+#include "common/endian.h"
 #include "sound/mpu401.h"
 #include "common/util.h"
 #include "morphos.h"

backends/midi/quicktime.cpp

@@ -23,6 +23,7 @@
 
 
 #include "sound/mpu401.h"
+#include "common/endian.h"
 #include "common/util.h"
 
 #if defined(MACOSX)

common/md5.cpp

@@ -30,6 +30,7 @@
 #include "common/file.h"
 #include "common/md5.h"
 #include "common/util.h"
+#include "common/endian.h"
 
 namespace Common {
 

common/scummsys.h

@@ -398,7 +398,4 @@
 	typedef int16 OverlayColor;
 #endif
 
-
-#include "common/endian.h"
-
 #endif

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"

engines/cine/bg.cpp

@@ -22,6 +22,9 @@
  *
  */
 
+#include "common/stdafx.h"
+#include "common/endian.h"
+
 #include "cine/cine.h"
 #include "cine/various.h"
 

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"

engines/cine/object.cpp

@@ -23,6 +23,7 @@
  */
 
 #include "common/stdafx.h"
+#include "common/endian.h"
 #include "common/scummsys.h"
 #include "common/util.h"
 

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"

engines/cine/rel.cpp

@@ -22,6 +22,9 @@
  *
  */
 
+#include "common/stdafx.h"
+#include "common/endian.h"
+
 #include "cine/cine.h"
 #include "cine/various.h"
 

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"

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"

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"
 

engines/cine/unpack.cpp

@@ -22,6 +22,9 @@
  *
  */
 
+#include "common/stdafx.h"
+#include "common/endian.h"
+
 #include "cine/unpack.h"
 
 namespace Cine {

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"

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"

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"

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"
 

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"

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"

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"

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"

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"

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"

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"

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"

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"
 

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"

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"

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"

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"

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"

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"

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"

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 {

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"

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"

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"

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"

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"

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"

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 {
 

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 {
 

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"

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"

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

engines/queen/sound.cpp

@@ -21,6 +21,8 @@
  */
 
 #include "common/stdafx.h"
+#include "common/endian.h"
+
 #include "queen/sound.h"
 
 #include "queen/input.h"

engines/queen/structs.h

@@ -24,6 +24,7 @@
 #define QUEENSTRUCTS_H
 
 #include "queen/defs.h"
+#include "common/endian.h"
 
 namespace Queen {
 

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"
 

engines/scumm/file.cpp

@@ -21,6 +21,7 @@
  */
 
 #include "scumm/file.h"
+#include "common/endian.h"
 #include "common/util.h"
 #include "common/md5.h"
 

engines/scumm/imuse/sysex_samnmax.cpp

@@ -21,6 +21,7 @@
  */
 
 #include "common/stdafx.h"
+#include "common/endian.h"
 #include "common/util.h"
 
 /*

engines/scumm/imuse/sysex_scumm.cpp

@@ -21,6 +21,7 @@
  */
 
 #include "common/stdafx.h"
+#include "common/endian.h"
 #include "common/util.h"
 
 /*

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 {

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"

engines/scumm/smush/codec1.cpp

@@ -21,7 +21,7 @@
  */
 
 #include "common/stdafx.h"
-#include "common/scummsys.h"
+#include "common/endian.h"
 
 namespace Scumm {
 

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"

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"

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"

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"

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"

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"

engines/sky/debug.cpp

@@ -21,6 +21,7 @@
  */
 
 #include "common/stdafx.h"
+#include "common/endian.h"
 #include "common/util.h"
 #include "common/debugger.cpp"
 

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"

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"

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"

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"

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"

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 {

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"

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"

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"

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"

engines/sword1/credits.cpp

@@ -21,6 +21,7 @@
  */
 
 #include "common/stdafx.h"
+#include "common/endian.h"
 
 #include "sword1/credits.h"
 #include "sword1/screen.h"

engines/sword1/logic.cpp

@@ -21,6 +21,7 @@
  */
 
 #include "common/stdafx.h"
+#include "common/endian.h"
 #include "common/util.h"
 
 #include "sword1/logic.h"

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"
 

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"

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"

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"

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"

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"

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"

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"
 

engines/sword2/header.h

@@ -23,6 +23,7 @@
 #define	SWORD2_HEADER_H
 
 #include "common/stream.h"
+#include "common/endian.h"
 
 namespace Sword2 {
 

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

engines/sword2/logic.h

@@ -25,6 +25,7 @@
 #define SWORD2_LOGIC_H
 
 #include "sword2/memory.h"
+#include "common/endian.h"
 
 namespace Sword2 {
 

engines/sword2/object.h

@@ -23,6 +23,7 @@
 #define	SWORD2_OBJECT_H
 
 #include "common/stream.h"
+#include "common/endian.h"
 
 namespace Sword2 {
 

engines/sword2/render.cpp

@@ -20,6 +20,7 @@
  */
 
 #include "common/stdafx.h"
+#include "common/endian.h"
 #include "common/system.h"
 
 #include "graphics/primitives.h"

graphics/ilbm.cpp

@@ -20,6 +20,7 @@
  */
 
 #include "common/stdafx.h"
+#include "common/endian.h"
 #include "common/stream.h"
 #include "graphics/surface.h"
 

sound/adpcm.cpp

@@ -22,6 +22,8 @@
 
 #include "common/stdafx.h"
 
+#include "common/endian.h"
+
 #include "sound/adpcm.h"
 #include "sound/audiostream.h"
 

sound/audiostream.cpp

@@ -21,8 +21,10 @@
  */
 
 #include "common/stdafx.h"
+#include "common/endian.h"
 #include "common/file.h"
 #include "common/util.h"
+
 #include "sound/audiostream.h"
 #include "sound/mixer.h"
 #include "sound/mp3.h"

sound/midiparser.h

@@ -26,6 +26,7 @@
 #define INCLUDED_MIDIPARSER
 
 #include "common/scummsys.h"
+#include "common/endian.h"
 
 class MidiParser;
 class MidiDriver;

sound/voc.cpp

@@ -22,6 +22,7 @@
  */
 
 #include "common/stdafx.h"
+#include "common/endian.h"
 #include "common/util.h"
 #include "common/stream.h"