diff options
| author | Ori Avtalion | 2011-04-24 11:34:27 +0300 |
|---|---|---|
| committer | Ori Avtalion | 2011-04-28 15:08:58 +0300 |
| commit | 9414d7a6e287ff8abfb5746b564e92c8f0e6de58 (patch) | |
| tree | 7abed9aac21437c04915b59a2abe1c187661b238 /engines | |
| parent | 845db59e088796df6628fcadb263ddc75f00f691 (diff) | |
| download | scummvm-rg350-9414d7a6e287ff8abfb5746b564e92c8f0e6de58.tar.gz scummvm-rg350-9414d7a6e287ff8abfb5746b564e92c8f0e6de58.tar.bz2 scummvm-rg350-9414d7a6e287ff8abfb5746b564e92c8f0e6de58.zip | |
JANITORIAL: Reduce header dependencies in shared code
Some backends may break as I only compiled SDL
Diffstat (limited to 'engines')
536 files changed, 869 insertions, 262 deletions
diff --git a/engines/advancedDetector.cpp b/engines/advancedDetector.cpp index bf152ce90a..d6f743640b 100644 --- a/engines/advancedDetector.cpp +++ b/engines/advancedDetector.cpp @@ -23,8 +23,6 @@ * */ -#include "base/plugins.h" - #include "common/debug.h" #include "common/util.h" #include "common/hash-str.h" @@ -32,6 +30,7 @@ #include "common/macresman.h" #include "common/md5.h" #include "common/config-manager.h" +#include "common/textconsole.h" #include "engines/advancedDetector.h" diff --git a/engines/advancedDetector.h b/engines/advancedDetector.h index 03d255ca21..757fb12f33 100644 --- a/engines/advancedDetector.h +++ b/engines/advancedDetector.h @@ -25,11 +25,13 @@ #ifndef ENGINES_ADVANCED_DETECTOR_H #define ENGINES_ADVANCED_DETECTOR_H -#include "common/fs.h" -#include "common/error.h" - #include "engines/metaengine.h" +namespace Common { +class Error; +class FSList; +} + struct ADGameFileDescription { const char *fileName; diff --git a/engines/agi/agi.cpp b/engines/agi/agi.cpp index 632587f7f7..a69d19f06c 100644 --- a/engines/agi/agi.cpp +++ b/engines/agi/agi.cpp @@ -32,6 +32,7 @@ #include "common/config-manager.h" #include "common/debug-channels.h" #include "common/random.h" +#include "common/textconsole.h" #include "engines/util.h" diff --git a/engines/agi/agi.h b/engines/agi/agi.h index 70ffbf1a8b..c71a0ebf64 100644 --- a/engines/agi/agi.h +++ b/engines/agi/agi.h @@ -27,9 +27,10 @@ #define AGI_H #include "common/scummsys.h" -#include "common/endian.h" +#include "common/error.h" #include "common/util.h" #include "common/file.h" +#include "common/rect.h" #include "common/stack.h" #include "common/system.h" @@ -695,7 +696,6 @@ public: class GfxMgr; class SpritesMgr; class Menu; -class SearchTree; // Image stack support struct ImageStackElement { diff --git a/engines/agi/detection.cpp b/engines/agi/detection.cpp index 0a53f0c4f4..5192505c79 100644 --- a/engines/agi/detection.cpp +++ b/engines/agi/detection.cpp @@ -29,6 +29,7 @@ #include "common/config-manager.h" #include "common/file.h" #include "common/savefile.h" +#include "common/textconsole.h" #include "graphics/thumbnail.h" #include "graphics/surface.h" diff --git a/engines/agi/graphics.cpp b/engines/agi/graphics.cpp index d0bc83d4c4..f0d38761d0 100644 --- a/engines/agi/graphics.cpp +++ b/engines/agi/graphics.cpp @@ -24,9 +24,10 @@ */ #include "common/file.h" - +#include "common/textconsole.h" #include "graphics/cursorman.h" +#include "graphics/palette.h" #include "agi/agi.h" #include "agi/graphics.h" diff --git a/engines/agi/loader_v2.cpp b/engines/agi/loader_v2.cpp index 8780e1dab8..0141a61065 100644 --- a/engines/agi/loader_v2.cpp +++ b/engines/agi/loader_v2.cpp @@ -23,6 +23,8 @@ * */ +#include "common/textconsole.h" + #include "agi/agi.h" namespace Agi { diff --git a/engines/agi/loader_v3.cpp b/engines/agi/loader_v3.cpp index 18ea4cae7d..025e755c8b 100644 --- a/engines/agi/loader_v3.cpp +++ b/engines/agi/loader_v3.cpp @@ -28,6 +28,7 @@ #include "common/config-manager.h" #include "common/fs.h" +#include "common/textconsole.h" namespace Agi { diff --git a/engines/agi/lzw.cpp b/engines/agi/lzw.cpp index f645cb16d3..495d6458da 100644 --- a/engines/agi/lzw.cpp +++ b/engines/agi/lzw.cpp @@ -36,6 +36,8 @@ #include "agi/agi.h" #include "agi/lzw.h" +#include "common/textconsole.h" + namespace Agi { diff --git a/engines/agi/objects.cpp b/engines/agi/objects.cpp index d942a2b538..bea53d7fa4 100644 --- a/engines/agi/objects.cpp +++ b/engines/agi/objects.cpp @@ -25,6 +25,8 @@ #include "agi/agi.h" +#include "common/textconsole.h" + namespace Agi { int AgiEngine::allocObjects(int n) { diff --git a/engines/agi/op_cmd.cpp b/engines/agi/op_cmd.cpp index 2ea53e57ad..e1f99456e8 100644 --- a/engines/agi/op_cmd.cpp +++ b/engines/agi/op_cmd.cpp @@ -32,6 +32,7 @@ #include "agi/menu.h" #include "common/random.h" +#include "common/textconsole.h" namespace Agi { diff --git a/engines/agi/picture.cpp b/engines/agi/picture.cpp index d17fe1d497..8951fc81df 100644 --- a/engines/agi/picture.cpp +++ b/engines/agi/picture.cpp @@ -26,6 +26,8 @@ #include "agi/agi.h" #include "agi/graphics.h" +#include "common/textconsole.h" + namespace Agi { PictureMgr::PictureMgr(AgiBase *agi, GfxMgr *gfx) { diff --git a/engines/agi/preagi.cpp b/engines/agi/preagi.cpp index 7457a317c2..c51c53e76e 100644 --- a/engines/agi/preagi.cpp +++ b/engines/agi/preagi.cpp @@ -26,6 +26,7 @@ #include "common/config-manager.h" #include "common/debug-channels.h" #include "common/random.h" +#include "common/textconsole.h" #include "audio/mididrv.h" diff --git a/engines/agi/preagi_mickey.cpp b/engines/agi/preagi_mickey.cpp index 10ca797587..64fc4e9ae5 100644 --- a/engines/agi/preagi_mickey.cpp +++ b/engines/agi/preagi_mickey.cpp @@ -25,6 +25,7 @@ #include "common/events.h" #include "common/savefile.h" +#include "common/textconsole.h" #include "graphics/cursorman.h" diff --git a/engines/agi/preagi_troll.cpp b/engines/agi/preagi_troll.cpp index 4e87c8063c..76849949c7 100644 --- a/engines/agi/preagi_troll.cpp +++ b/engines/agi/preagi_troll.cpp @@ -28,6 +28,7 @@ #include "agi/graphics.h" #include "common/events.h" +#include "common/textconsole.h" #include "graphics/cursorman.h" diff --git a/engines/agi/preagi_winnie.cpp b/engines/agi/preagi_winnie.cpp index e97c144872..c92434c15f 100644 --- a/engines/agi/preagi_winnie.cpp +++ b/engines/agi/preagi_winnie.cpp @@ -32,6 +32,7 @@ #include "common/events.h" #include "common/memstream.h" #include "common/savefile.h" +#include "common/textconsole.h" namespace Agi { diff --git a/engines/agi/predictive.cpp b/engines/agi/predictive.cpp index 0230b9bd74..96ad78ace5 100644 --- a/engines/agi/predictive.cpp +++ b/engines/agi/predictive.cpp @@ -28,6 +28,7 @@ #include "agi/keyboard.h" #include "common/config-manager.h" +#include "common/textconsole.h" #ifdef __DS__ #include "wordcompletion.h" diff --git a/engines/agi/saveload.cpp b/engines/agi/saveload.cpp index 13e7215180..c8df726fc7 100644 --- a/engines/agi/saveload.cpp +++ b/engines/agi/saveload.cpp @@ -31,6 +31,7 @@ #include "common/file.h" #include "common/config-manager.h" #include "common/savefile.h" +#include "common/textconsole.h" #include "graphics/thumbnail.h" #include "graphics/surface.h" diff --git a/engines/agi/sound.cpp b/engines/agi/sound.cpp index b215822917..b40cef67ef 100644 --- a/engines/agi/sound.cpp +++ b/engines/agi/sound.cpp @@ -31,6 +31,8 @@ #include "agi/sound_sarien.h" #include "agi/sound_pcjr.h" +#include "common/textconsole.h" + namespace Agi { // diff --git a/engines/agi/sound_2gs.cpp b/engines/agi/sound_2gs.cpp index 11bf5a9034..f5758ed140 100644 --- a/engines/agi/sound_2gs.cpp +++ b/engines/agi/sound_2gs.cpp @@ -28,6 +28,7 @@ #include "common/md5.h" #include "common/memstream.h" #include "common/str-array.h" +#include "common/textconsole.h" #include "agi/agi.h" #include "agi/sound_2gs.h" diff --git a/engines/agi/sound_midi.cpp b/engines/agi/sound_midi.cpp index 986715721f..997c1edd6b 100644 --- a/engines/agi/sound_midi.cpp +++ b/engines/agi/sound_midi.cpp @@ -49,6 +49,7 @@ #include "common/file.h" #include "common/memstream.h" #include "common/stream.h" +#include "common/textconsole.h" #include "agi/agi.h" diff --git a/engines/agi/sound_sarien.cpp b/engines/agi/sound_sarien.cpp index 4ed7f8d029..6f2f3c5ad3 100644 --- a/engines/agi/sound_sarien.cpp +++ b/engines/agi/sound_sarien.cpp @@ -23,11 +23,7 @@ * */ -#include "common/md5.h" -#include "common/config-manager.h" -#include "common/fs.h" #include "common/random.h" -#include "common/str-array.h" #include "audio/mididrv.h" diff --git a/engines/agi/wagparser.cpp b/engines/agi/wagparser.cpp index 22de66712d..fab3b5cf50 100644 --- a/engines/agi/wagparser.cpp +++ b/engines/agi/wagparser.cpp @@ -27,6 +27,7 @@ #include "common/util.h" #include "common/fs.h" #include "common/debug.h" +#include "common/textconsole.h" #include "agi/wagparser.h" diff --git a/engines/agi/words.cpp b/engines/agi/words.cpp index c48ed90ad8..d8596dec97 100644 --- a/engines/agi/words.cpp +++ b/engines/agi/words.cpp @@ -29,6 +29,8 @@ #include "agi/agi.h" +#include "common/textconsole.h" + namespace Agi { static uint8 *words; // words in the game diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp index 498c7e4961..94346e2f90 100644 --- a/engines/agos/agos.cpp +++ b/engines/agos/agos.cpp @@ -25,9 +25,9 @@ #include "common/config-manager.h" #include "common/EventRecorder.h" -#include "common/events.h" #include "common/file.h" #include "common/fs.h" +#include "common/textconsole.h" #include "common/system.h" #include "engines/util.h" @@ -35,14 +35,12 @@ #include "agos/debugger.h" #include "agos/intern.h" #include "agos/agos.h" -#include "agos/vga.h" #include "backends/audiocd/audiocd.h" #include "graphics/surface.h" #include "audio/mididrv.h" -#include "audio/mods/protracker.h" namespace AGOS { diff --git a/engines/agos/agos.h b/engines/agos/agos.h index 735920e427..aecf2437a7 100644 --- a/engines/agos/agos.h +++ b/engines/agos/agos.h @@ -29,6 +29,7 @@ #include "engines/engine.h" #include "common/array.h" +#include "common/error.h" #include "common/keyboard.h" #include "common/random.h" #include "common/rect.h" diff --git a/engines/agos/animation.cpp b/engines/agos/animation.cpp index acdc0084c4..ee47f62a58 100644 --- a/engines/agos/animation.cpp +++ b/engines/agos/animation.cpp @@ -31,8 +31,10 @@ #include "common/events.h" #include "common/file.h" #include "common/system.h" +#include "common/textconsole.h" #include "graphics/cursorman.h" +#include "graphics/palette.h" #include "graphics/surface.h" #include "agos/animation.h" diff --git a/engines/agos/charset-fontdata.cpp b/engines/agos/charset-fontdata.cpp index a477b3dedc..a131bb841b 100644 --- a/engines/agos/charset-fontdata.cpp +++ b/engines/agos/charset-fontdata.cpp @@ -26,6 +26,7 @@ #include "common/system.h" +#include "common/textconsole.h" #include "agos/agos.h" #include "agos/intern.h" diff --git a/engines/agos/debug.cpp b/engines/agos/debug.cpp index d0dc8cc42e..bb27557a6b 100644 --- a/engines/agos/debug.cpp +++ b/engines/agos/debug.cpp @@ -27,6 +27,7 @@ #include "common/file.h" +#include "common/textconsole.h" #include "agos/debug.h" #include "agos/agos.h" diff --git a/engines/agos/detection.cpp b/engines/agos/detection.cpp index 646e63dacf..c8c70c0ecc 100644 --- a/engines/agos/detection.cpp +++ b/engines/agos/detection.cpp @@ -29,6 +29,7 @@ #include "common/config-manager.h" #include "common/savefile.h" #include "common/system.h" +#include "common/textconsole.h" #include "agos/intern.h" #include "agos/agos.h" diff --git a/engines/agos/draw.cpp b/engines/agos/draw.cpp index 317c68d31a..6b9f65ee2b 100644 --- a/engines/agos/draw.cpp +++ b/engines/agos/draw.cpp @@ -28,6 +28,7 @@ #include "common/system.h" #include "graphics/surface.h" +#include "graphics/palette.h" #include "agos/agos.h" #include "agos/intern.h" diff --git a/engines/agos/event.cpp b/engines/agos/event.cpp index fc0b4f96cd..8799dbaa28 100644 --- a/engines/agos/event.cpp +++ b/engines/agos/event.cpp @@ -32,6 +32,7 @@ #include "common/events.h" #include "common/system.h" +#include "common/textconsole.h" #include "backends/audiocd/audiocd.h" diff --git a/engines/agos/gfx.cpp b/engines/agos/gfx.cpp index 710c9ddd7e..4c998dfa5f 100644 --- a/engines/agos/gfx.cpp +++ b/engines/agos/gfx.cpp @@ -26,6 +26,7 @@ #include "common/system.h" +#include "common/textconsole.h" #include "graphics/surface.h" diff --git a/engines/agos/icons.cpp b/engines/agos/icons.cpp index ca603db1fa..39a7705c54 100644 --- a/engines/agos/icons.cpp +++ b/engines/agos/icons.cpp @@ -25,9 +25,9 @@ -#include "common/system.h" - #include "common/file.h" +#include "common/system.h" +#include "common/textconsole.h" #include "graphics/surface.h" diff --git a/engines/agos/items.cpp b/engines/agos/items.cpp index 81da5264ba..5d1523bbd5 100644 --- a/engines/agos/items.cpp +++ b/engines/agos/items.cpp @@ -26,6 +26,7 @@ #include "common/file.h" +#include "common/textconsole.h" #include "agos/intern.h" #include "agos/agos.h" diff --git a/engines/agos/menus.cpp b/engines/agos/menus.cpp index 5629a1dca6..2b103a75cb 100644 --- a/engines/agos/menus.cpp +++ b/engines/agos/menus.cpp @@ -27,6 +27,7 @@ #include "common/file.h" #include "common/system.h" +#include "common/textconsole.h" #include "graphics/surface.h" diff --git a/engines/agos/midi.cpp b/engines/agos/midi.cpp index a37c96a787..26e2f2c736 100644 --- a/engines/agos/midi.cpp +++ b/engines/agos/midi.cpp @@ -28,6 +28,7 @@ #include "common/config-manager.h" #include "common/file.h" #include "common/system.h" +#include "common/textconsole.h" #include "agos/agos.h" diff --git a/engines/agos/midiparser_s1d.cpp b/engines/agos/midiparser_s1d.cpp index 156dc6ecaa..f96518b5e9 100644 --- a/engines/agos/midiparser_s1d.cpp +++ b/engines/agos/midiparser_s1d.cpp @@ -25,6 +25,7 @@ #include "common/debug.h" #include "common/util.h" +#include "common/textconsole.h" #include "audio/mididrv.h" #include "audio/midiparser.h" diff --git a/engines/agos/res.cpp b/engines/agos/res.cpp index b8409669ee..0e818963e2 100644 --- a/engines/agos/res.cpp +++ b/engines/agos/res.cpp @@ -28,6 +28,7 @@ #include "common/file.h" #include "common/memstream.h" +#include "common/textconsole.h" #include "common/util.h" #include "agos/agos.h" diff --git a/engines/agos/res_snd.cpp b/engines/agos/res_snd.cpp index fe09e746ff..34deff37ab 100644 --- a/engines/agos/res_snd.cpp +++ b/engines/agos/res_snd.cpp @@ -26,6 +26,7 @@ #include "common/config-manager.h" #include "common/file.h" #include "common/memstream.h" +#include "common/textconsole.h" #include "agos/intern.h" #include "agos/agos.h" diff --git a/engines/agos/rooms.cpp b/engines/agos/rooms.cpp index a2eff06fcc..0993197594 100644 --- a/engines/agos/rooms.cpp +++ b/engines/agos/rooms.cpp @@ -26,6 +26,7 @@ #include "common/file.h" +#include "common/textconsole.h" #include "agos/agos.h" #include "agos/intern.h" diff --git a/engines/agos/saveload.cpp b/engines/agos/saveload.cpp index eefa2460ec..d6f25814bb 100644 --- a/engines/agos/saveload.cpp +++ b/engines/agos/saveload.cpp @@ -26,6 +26,7 @@ #include "common/file.h" #include "common/savefile.h" #include "common/system.h" +#include "common/textconsole.h" #include "common/translation.h" #include "gui/about.h" diff --git a/engines/agos/script.cpp b/engines/agos/script.cpp index 90992b52fe..94a3f371cc 100644 --- a/engines/agos/script.cpp +++ b/engines/agos/script.cpp @@ -28,6 +28,7 @@ #include "common/system.h" +#include "common/textconsole.h" #include "agos/animation.h" #include "agos/agos.h" diff --git a/engines/agos/script_pn.cpp b/engines/agos/script_pn.cpp index 909c051362..b8ba7fb015 100644 --- a/engines/agos/script_pn.cpp +++ b/engines/agos/script_pn.cpp @@ -26,6 +26,8 @@ #include "agos/agos.h" #include "agos/vga.h" +#include "common/textconsole.h" + namespace AGOS { enum { diff --git a/engines/agos/script_s1.cpp b/engines/agos/script_s1.cpp index 05a725cb50..dab0302631 100644 --- a/engines/agos/script_s1.cpp +++ b/engines/agos/script_s1.cpp @@ -26,6 +26,8 @@ #include "common/system.h" +#include "graphics/palette.h" + #include "agos/agos.h" #ifdef _WIN32_WCE diff --git a/engines/agos/script_s2.cpp b/engines/agos/script_s2.cpp index dd525163c7..a0b14525f2 100644 --- a/engines/agos/script_s2.cpp +++ b/engines/agos/script_s2.cpp @@ -27,6 +27,8 @@ #include "agos/agos.h" +#include "common/textconsole.h" + namespace AGOS { #define OPCODE(x) _OPCODE(AGOSEngine_Simon2, x) diff --git a/engines/agos/sound.cpp b/engines/agos/sound.cpp index 35301793bf..25d861acb5 100644 --- a/engines/agos/sound.cpp +++ b/engines/agos/sound.cpp @@ -25,6 +25,7 @@ #include "common/file.h" #include "common/memstream.h" +#include "common/textconsole.h" #include "common/util.h" #include "agos/agos.h" diff --git a/engines/agos/string.cpp b/engines/agos/string.cpp index bda605a84a..1152d6ed04 100644 --- a/engines/agos/string.cpp +++ b/engines/agos/string.cpp @@ -26,6 +26,7 @@ #include "common/file.h" +#include "common/textconsole.h" #include "gui/about.h" #include "gui/message.h" diff --git a/engines/agos/string_pn.cpp b/engines/agos/string_pn.cpp index a4e40d8306..92d85ab96c 100644 --- a/engines/agos/string_pn.cpp +++ b/engines/agos/string_pn.cpp @@ -26,6 +26,8 @@ #include "agos/agos.h" #include "agos/intern.h" +#include "common/textconsole.h" + namespace AGOS { uint32 AGOSEngine_PN::ftext(uint32 base, int n) { diff --git a/engines/agos/subroutine.cpp b/engines/agos/subroutine.cpp index 733d40e52d..bd07596a46 100644 --- a/engines/agos/subroutine.cpp +++ b/engines/agos/subroutine.cpp @@ -26,6 +26,7 @@ #include "common/file.h" +#include "common/textconsole.h" #include "agos/agos.h" #include "agos/intern.h" diff --git a/engines/agos/vga.cpp b/engines/agos/vga.cpp index 83ee05036c..6c07db13c1 100644 --- a/engines/agos/vga.cpp +++ b/engines/agos/vga.cpp @@ -31,6 +31,7 @@ #include "agos/vga.h" #include "common/system.h" +#include "common/textconsole.h" #include "graphics/surface.h" diff --git a/engines/agos/vga_e2.cpp b/engines/agos/vga_e2.cpp index b0431db801..9e163ba91f 100644 --- a/engines/agos/vga_e2.cpp +++ b/engines/agos/vga_e2.cpp @@ -32,6 +32,7 @@ #include "common/system.h" #include "graphics/surface.h" +#include "graphics/palette.h" namespace AGOS { diff --git a/engines/agos/vga_ww.cpp b/engines/agos/vga_ww.cpp index 8aecd3448a..08b2cee303 100644 --- a/engines/agos/vga_ww.cpp +++ b/engines/agos/vga_ww.cpp @@ -32,6 +32,7 @@ #include "common/system.h" #include "graphics/surface.h" +#include "graphics/palette.h" namespace AGOS { diff --git a/engines/agos/window.cpp b/engines/agos/window.cpp index a03c7e178a..08680c9e45 100644 --- a/engines/agos/window.cpp +++ b/engines/agos/window.cpp @@ -26,6 +26,7 @@ #include "common/system.h" +#include "common/textconsole.h" #include "graphics/surface.h" diff --git a/engines/cine/anim.cpp b/engines/cine/anim.cpp index 14b8de9e39..6b4b29dcfe 100644 --- a/engines/cine/anim.cpp +++ b/engines/cine/anim.cpp @@ -29,6 +29,7 @@ #include "common/endian.h" #include "common/memstream.h" +#include "common/textconsole.h" #include "cine/cine.h" #include "cine/anim.h" diff --git a/engines/cine/bg.cpp b/engines/cine/bg.cpp index b3171de918..22fd28a99c 100644 --- a/engines/cine/bg.cpp +++ b/engines/cine/bg.cpp @@ -26,6 +26,7 @@ #include "common/endian.h" #include "common/memstream.h" +#include "common/textconsole.h" #include "cine/cine.h" #include "cine/various.h" diff --git a/engines/cine/cine.cpp b/engines/cine/cine.cpp index 54d113d69c..8104ad38cd 100644 --- a/engines/cine/cine.cpp +++ b/engines/cine/cine.cpp @@ -23,13 +23,9 @@ * */ -#include "common/events.h" #include "common/EventRecorder.h" -#include "common/file.h" -#include "common/savefile.h" #include "common/config-manager.h" #include "common/debug-channels.h" -#include "common/system.h" #include "engines/util.h" diff --git a/engines/cine/detection.cpp b/engines/cine/detection.cpp index 9dfa2f71ea..058c1a1140 100644 --- a/engines/cine/detection.cpp +++ b/engines/cine/detection.cpp @@ -27,6 +27,7 @@ #include "engines/advancedDetector.h" #include "common/system.h" +#include "common/textconsole.h" #include "cine/cine.h" #include "cine/various.h" diff --git a/engines/cine/gfx.cpp b/engines/cine/gfx.cpp index 3970d88117..18feacd08b 100644 --- a/engines/cine/gfx.cpp +++ b/engines/cine/gfx.cpp @@ -30,8 +30,9 @@ #include "cine/pal.h" #include "common/endian.h" -#include "common/system.h" #include "common/events.h" +#include "common/system.h" +#include "common/textconsole.h" #include "graphics/cursorman.h" diff --git a/engines/cine/msg.cpp b/engines/cine/msg.cpp index a01afd147b..3d58d6ddcd 100644 --- a/engines/cine/msg.cpp +++ b/engines/cine/msg.cpp @@ -25,6 +25,7 @@ #include "common/debug.h" #include "common/endian.h" +#include "common/textconsole.h" #include "cine/msg.h" #include "cine/various.h" diff --git a/engines/cine/pal.cpp b/engines/cine/pal.cpp index 3c8ffc295b..0f52600db5 100644 --- a/engines/cine/pal.cpp +++ b/engines/cine/pal.cpp @@ -27,6 +27,9 @@ #include "cine/various.h" #include "cine/pal.h" #include "common/system.h" // For g_system->getPaletteManager()->setPalette +#include "common/textconsole.h" + +#include "graphics/palette.h" namespace Cine { diff --git a/engines/cine/part.cpp b/engines/cine/part.cpp index f5c9402388..17ef01948c 100644 --- a/engines/cine/part.cpp +++ b/engines/cine/part.cpp @@ -25,6 +25,7 @@ #include "common/debug.h" #include "common/endian.h" +#include "common/textconsole.h" #include "cine/cine.h" #include "cine/unpack.h" diff --git a/engines/cine/saveload.cpp b/engines/cine/saveload.cpp index 4911f78da9..1fc2a8b2fd 100644 --- a/engines/cine/saveload.cpp +++ b/engines/cine/saveload.cpp @@ -25,6 +25,7 @@ #include "common/debug.h" #include "common/savefile.h" +#include "common/textconsole.h" #include "cine/cine.h" #include "cine/bg_list.h" diff --git a/engines/cine/script_fw.cpp b/engines/cine/script_fw.cpp index ffbee3d389..674bf4dd86 100644 --- a/engines/cine/script_fw.cpp +++ b/engines/cine/script_fw.cpp @@ -28,6 +28,7 @@ */ #include "common/endian.h" +#include "common/textconsole.h" #include "cine/cine.h" #include "cine/bg_list.h" diff --git a/engines/cine/script_os.cpp b/engines/cine/script_os.cpp index 9ee3a892a9..aa2c8c33ac 100644 --- a/engines/cine/script_os.cpp +++ b/engines/cine/script_os.cpp @@ -28,6 +28,7 @@ */ #include "common/endian.h" +#include "common/textconsole.h" #include "cine/cine.h" #include "cine/bg_list.h" diff --git a/engines/cine/sound.cpp b/engines/cine/sound.cpp index f0c0668e33..414761159b 100644 --- a/engines/cine/sound.cpp +++ b/engines/cine/sound.cpp @@ -26,6 +26,8 @@ #include "common/endian.h" #include "common/file.h" #include "common/memstream.h" +#include "common/system.h" +#include "common/textconsole.h" #include "cine/cine.h" #include "cine/sound.h" diff --git a/engines/cine/texte.cpp b/engines/cine/texte.cpp index 9dbfa315d9..fb6818d690 100644 --- a/engines/cine/texte.cpp +++ b/engines/cine/texte.cpp @@ -23,8 +23,10 @@ * */ -#include "cine/cine.h" #include "common/file.h" +#include "common/textconsole.h" + +#include "cine/cine.h" #include "cine/various.h" namespace Cine { diff --git a/engines/cine/various.cpp b/engines/cine/various.cpp index 5b8663606e..fdc7a28867 100644 --- a/engines/cine/various.cpp +++ b/engines/cine/various.cpp @@ -26,6 +26,7 @@ #include "common/endian.h" #include "common/events.h" +#include "common/textconsole.h" #include "graphics/cursorman.h" diff --git a/engines/cruise/actor.cpp b/engines/cruise/actor.cpp index 9cbc3dd9ae..2c83aff743 100644 --- a/engines/cruise/actor.cpp +++ b/engines/cruise/actor.cpp @@ -23,6 +23,8 @@ * */ +#include "common/textconsole.h" + #include "cruise/cruise.h" #include "cruise/staticres.h" diff --git a/engines/cruise/background.cpp b/engines/cruise/background.cpp index edd52d3b4a..7c63c155d3 100644 --- a/engines/cruise/background.cpp +++ b/engines/cruise/background.cpp @@ -23,6 +23,8 @@ * */ +#include "common/textconsole.h" + #include "cruise/cruise_main.h" namespace Cruise { diff --git a/engines/cruise/cruise.cpp b/engines/cruise/cruise.cpp index 2c5659c4d9..9712bd9439 100644 --- a/engines/cruise/cruise.cpp +++ b/engines/cruise/cruise.cpp @@ -23,13 +23,10 @@ * */ -#include "common/events.h" #include "common/EventRecorder.h" #include "common/file.h" -#include "common/savefile.h" -#include "common/config-manager.h" #include "common/debug-channels.h" -#include "common/system.h" +#include "common/textconsole.h" #include "engines/util.h" diff --git a/engines/cruise/cruise.h b/engines/cruise/cruise.h index ad3bb20ca1..8d03d47327 100644 --- a/engines/cruise/cruise.h +++ b/engines/cruise/cruise.h @@ -31,7 +31,6 @@ #include "common/random.h" #include "engines/engine.h" -#include "engines/game.h" #include "cruise/cruise_main.h" #include "cruise/debugger.h" diff --git a/engines/cruise/cruise_main.cpp b/engines/cruise/cruise_main.cpp index b1d7a594fe..e2f2d7468e 100644 --- a/engines/cruise/cruise_main.cpp +++ b/engines/cruise/cruise_main.cpp @@ -27,6 +27,7 @@ #include "common/endian.h" #include "common/events.h" #include "common/system.h" // for g_system->getEventManager() +#include "common/textconsole.h" #include "cruise/cruise.h" #include "cruise/cruise_main.h" diff --git a/engines/cruise/dataLoader.cpp b/engines/cruise/dataLoader.cpp index b9e4ca8bc9..3ccd1689b8 100644 --- a/engines/cruise/dataLoader.cpp +++ b/engines/cruise/dataLoader.cpp @@ -26,6 +26,7 @@ #include "cruise/cruise_main.h" #include "common/endian.h" #include "common/memstream.h" +#include "common/textconsole.h" namespace Cruise { diff --git a/engines/cruise/detection.cpp b/engines/cruise/detection.cpp index 66018fac2e..63d7328e78 100644 --- a/engines/cruise/detection.cpp +++ b/engines/cruise/detection.cpp @@ -27,6 +27,7 @@ #include "base/plugins.h" #include "common/savefile.h" +#include "common/system.h" #include "engines/advancedDetector.h" #include "cruise/cruise.h" diff --git a/engines/cruise/function.cpp b/engines/cruise/function.cpp index 0b25ee59c1..75b90f7ec8 100644 --- a/engines/cruise/function.cpp +++ b/engines/cruise/function.cpp @@ -28,6 +28,8 @@ #include "cruise/cell.h" #include "cruise/sound.h" #include "cruise/staticres.h" + +#include "common/textconsole.h" #include "common/util.h" namespace Cruise { diff --git a/engines/cruise/gfxModule.cpp b/engines/cruise/gfxModule.cpp index 1b6f3942de..4d48c2c466 100644 --- a/engines/cruise/gfxModule.cpp +++ b/engines/cruise/gfxModule.cpp @@ -29,6 +29,8 @@ #include "common/list.h" #include "common/rect.h" +#include "graphics/palette.h" + #include "cruise/cruise.h" #include "cruise/cruise_main.h" diff --git a/engines/cruise/menu.cpp b/engines/cruise/menu.cpp index a722b947ff..36689ca0e3 100644 --- a/engines/cruise/menu.cpp +++ b/engines/cruise/menu.cpp @@ -29,6 +29,7 @@ #include "engines/metaengine.h" #include "gui/saveload.h" +#include "common/system.h" #include "common/translation.h" namespace Cruise { diff --git a/engines/cruise/object.cpp b/engines/cruise/object.cpp index 864491605f..8e2be0cf13 100644 --- a/engines/cruise/object.cpp +++ b/engines/cruise/object.cpp @@ -23,6 +23,8 @@ * */ +#include "common/textconsole.h" + #include "cruise/cruise_main.h" namespace Cruise { diff --git a/engines/cruise/overlay.cpp b/engines/cruise/overlay.cpp index 9a77891deb..b7a0293f33 100644 --- a/engines/cruise/overlay.cpp +++ b/engines/cruise/overlay.cpp @@ -24,6 +24,7 @@ */ #include "common/memstream.h" +#include "common/textconsole.h" #include "cruise/cruise.h" #include "cruise/cruise_main.h" diff --git a/engines/cruise/saveload.cpp b/engines/cruise/saveload.cpp index a1a306705e..6e75088d45 100644 --- a/engines/cruise/saveload.cpp +++ b/engines/cruise/saveload.cpp @@ -30,6 +30,7 @@ #include "common/serializer.h" #include "common/savefile.h" #include "common/system.h" +#include "common/textconsole.h" #include "graphics/scaler.h" #include "graphics/thumbnail.h" diff --git a/engines/cruise/script.cpp b/engines/cruise/script.cpp index aae4dba475..d6ff784644 100644 --- a/engines/cruise/script.cpp +++ b/engines/cruise/script.cpp @@ -26,6 +26,7 @@ #include "cruise/cruise.h" #include "cruise/cruise_main.h" #include "common/endian.h" +#include "common/textconsole.h" namespace Cruise { diff --git a/engines/cruise/sound.cpp b/engines/cruise/sound.cpp index 2826a34351..322f808439 100644 --- a/engines/cruise/sound.cpp +++ b/engines/cruise/sound.cpp @@ -24,6 +24,8 @@ */ #include "common/endian.h" +#include "common/system.h" +#include "common/textconsole.h" #include "cruise/cruise.h" #include "cruise/cruise_main.h" diff --git a/engines/dialogs.cpp b/engines/dialogs.cpp index 18c184e568..7e1f29271e 100644 --- a/engines/dialogs.cpp +++ b/engines/dialogs.cpp @@ -25,21 +25,21 @@ #include "base/version.h" #include "common/config-manager.h" -#include "common/savefile.h" -#include "common/system.h" #include "common/events.h" +#include "common/str.h" +#include "common/system.h" #include "common/translation.h" -#include "graphics/scaler.h" - #include "gui/about.h" #include "gui/gui-manager.h" -#include "gui/launcher.h" -#include "gui/widgets/list.h" #include "gui/message.h" #include "gui/options.h" #include "gui/saveload.h" +#include "gui/ThemeEngine.h" #include "gui/ThemeEval.h" +#include "gui/widget.h" + +#include "graphics/font.h" #include "engines/dialogs.h" #include "engines/engine.h" diff --git a/engines/dialogs.h b/engines/dialogs.h index 885e86a91b..587e91a2bb 100644 --- a/engines/dialogs.h +++ b/engines/dialogs.h @@ -25,13 +25,13 @@ #ifndef GLOBAL_DIALOGS_H #define GLOBAL_DIALOGS_H -#include "common/str.h" #include "gui/dialog.h" class Engine; namespace GUI { class ButtonWidget; +class CommandSender; class GraphicsWidget; class SaveLoadChooser; } diff --git a/engines/draci/animation.cpp b/engines/draci/animation.cpp index bc38e84d72..f2f1727fdd 100644 --- a/engines/draci/animation.cpp +++ b/engines/draci/animation.cpp @@ -32,6 +32,7 @@ #include "draci/surface.h" #include "common/memstream.h" +#include "common/system.h" namespace Draci { diff --git a/engines/draci/music.cpp b/engines/draci/music.cpp index 750410b329..1d725ebb15 100644 --- a/engines/draci/music.cpp +++ b/engines/draci/music.cpp @@ -29,6 +29,7 @@ #include "audio/mididrv.h" #include "audio/midiparser.h" #include "common/config-manager.h" +#include "common/debug.h" #include "common/file.h" #include "draci/draci.h" diff --git a/engines/draci/screen.cpp b/engines/draci/screen.cpp index c04f0668bb..ab9c49c63a 100644 --- a/engines/draci/screen.cpp +++ b/engines/draci/screen.cpp @@ -26,6 +26,8 @@ #include "common/memstream.h" #include "common/system.h" +#include "graphics/palette.h" + #include "draci/draci.h" #include "draci/screen.h" #include "draci/surface.h" diff --git a/engines/draci/sound.cpp b/engines/draci/sound.cpp index 0df19794f7..ab2479f811 100644 --- a/engines/draci/sound.cpp +++ b/engines/draci/sound.cpp @@ -29,6 +29,7 @@ #include "common/file.h" #include "common/str.h" #include "common/substream.h" +#include "common/textconsole.h" #include "common/memstream.h" #include "common/unzip.h" diff --git a/engines/draci/surface.h b/engines/draci/surface.h index b00abcd943..cb15ecebe4 100644 --- a/engines/draci/surface.h +++ b/engines/draci/surface.h @@ -27,6 +27,7 @@ #define DRACI_SURFACE_H #include "common/list.h" +#include "common/rect.h" #include "graphics/surface.h" namespace Draci { diff --git a/engines/drascula/converse.cpp b/engines/drascula/converse.cpp index d0906fdf55..dcd93d84d7 100644 --- a/engines/drascula/converse.cpp +++ b/engines/drascula/converse.cpp @@ -23,6 +23,8 @@ * */ +#include "common/textconsole.h" + #include "drascula/drascula.h" namespace Drascula { diff --git a/engines/drascula/drascula.cpp b/engines/drascula/drascula.cpp index 19395dcd3f..470f28ccff 100644 --- a/engines/drascula/drascula.cpp +++ b/engines/drascula/drascula.cpp @@ -29,6 +29,7 @@ #include "common/file.h" #include "common/savefile.h" #include "common/config-manager.h" +#include "common/textconsole.h" #include "backends/audiocd/audiocd.h" diff --git a/engines/drascula/graphics.cpp b/engines/drascula/graphics.cpp index 9c5f3dc12a..4cd91e48a0 100644 --- a/engines/drascula/graphics.cpp +++ b/engines/drascula/graphics.cpp @@ -25,8 +25,9 @@ #include "drascula/drascula.h" #include "graphics/surface.h" -#include "common/stream.h" +#include "common/stream.h" +#include "common/textconsole.h" namespace Drascula { diff --git a/engines/drascula/objects.cpp b/engines/drascula/objects.cpp index 6b507abc65..630eb08d3c 100644 --- a/engines/drascula/objects.cpp +++ b/engines/drascula/objects.cpp @@ -23,6 +23,8 @@ * */ +#include "common/textconsole.h" + #include "drascula/drascula.h" namespace Drascula { diff --git a/engines/drascula/palette.cpp b/engines/drascula/palette.cpp index b521c0313b..a75e72e249 100644 --- a/engines/drascula/palette.cpp +++ b/engines/drascula/palette.cpp @@ -23,6 +23,8 @@ * */ +#include "graphics/palette.h" + #include "drascula/drascula.h" namespace Drascula { diff --git a/engines/drascula/rooms.cpp b/engines/drascula/rooms.cpp index d6774cbc65..35d4eedb5d 100644 --- a/engines/drascula/rooms.cpp +++ b/engines/drascula/rooms.cpp @@ -24,6 +24,7 @@ */ #include "common/array.h" +#include "common/textconsole.h" #include "drascula/drascula.h" diff --git a/engines/drascula/saveload.cpp b/engines/drascula/saveload.cpp index db67409890..eacbe6756d 100644 --- a/engines/drascula/saveload.cpp +++ b/engines/drascula/saveload.cpp @@ -23,6 +23,8 @@ * */ +#include "common/textconsole.h" + #include "drascula/drascula.h" namespace Drascula { diff --git a/engines/drascula/sound.cpp b/engines/drascula/sound.cpp index 48e7492b11..5cb1c4486a 100644 --- a/engines/drascula/sound.cpp +++ b/engines/drascula/sound.cpp @@ -29,6 +29,7 @@ #include "audio/decoders/voc.h" #include "common/config-manager.h" +#include "common/textconsole.h" #include "backends/audiocd/audiocd.h" diff --git a/engines/engine.cpp b/engines/engine.cpp index 71f9b68f44..d322097d6d 100644 --- a/engines/engine.cpp +++ b/engines/engine.cpp @@ -32,25 +32,25 @@ #include "engines/engine.h" #include "engines/dialogs.h" -#include "engines/metaengine.h" -#include "engines/util.h" #include "common/config-manager.h" -#include "common/debug.h" #include "common/events.h" -#include "common/file.h" -#include "common/timer.h" -#include "common/savefile.h" #include "common/system.h" #include "common/str.h" +#include "common/error.h" +#include "common/list.h" +#include "common/list_intern.h" +#include "common/scummsys.h" +#include "common/textconsole.h" #include "gui/debugger.h" +#include "gui/dialog.h" #include "gui/message.h" -#include "gui/gui-manager.h" #include "audio/mixer.h" #include "graphics/cursorman.h" +#include "graphics/pixelformat.h" #ifdef _WIN32_WCE extern bool isSmartphone(); diff --git a/engines/engine.h b/engines/engine.h index adec62beb6..b7afc0f09d 100644 --- a/engines/engine.h +++ b/engines/engine.h @@ -26,7 +26,6 @@ #define ENGINES_ENGINE_H #include "common/scummsys.h" -#include "common/error.h" #include "common/str.h" class OSystem; @@ -35,6 +34,7 @@ namespace Audio { class Mixer; } namespace Common { +class Error; class EventManager; class SaveFileManager; class TimerManager; diff --git a/engines/game.cpp b/engines/game.cpp index dea6d37485..a27080cbf8 100644 --- a/engines/game.cpp +++ b/engines/game.cpp @@ -24,7 +24,6 @@ */ #include "engines/game.h" -#include "base/plugins.h" const PlainGameDescriptor *findPlainGameDescriptor(const char *gameid, const PlainGameDescriptor *list) { diff --git a/engines/game.h b/engines/game.h index 3e5d7f262c..c9a3b25853 100644 --- a/engines/game.h +++ b/engines/game.h @@ -28,6 +28,8 @@ #include "common/array.h" #include "common/hash-str.h" +#include "common/str.h" +#include "common/util.h" /** * A simple structure used to map gameids (like "monkey", "sword1", ...) to diff --git a/engines/gob/databases.cpp b/engines/gob/databases.cpp index 66a711e46e..94f641db4e 100644 --- a/engines/gob/databases.cpp +++ b/engines/gob/databases.cpp @@ -24,6 +24,7 @@ */ #include "common/file.h" +#include "common/textconsole.h" #include "gob/databases.h" diff --git a/engines/gob/gob.cpp b/engines/gob/gob.cpp index 12914163c2..3d697d3693 100644 --- a/engines/gob/gob.cpp +++ b/engines/gob/gob.cpp @@ -24,14 +24,11 @@ */ #include "common/debug-channels.h" -#include "common/endian.h" -#include "common/events.h" #include "common/EventRecorder.h" #include "backends/audiocd/audiocd.h" #include "base/plugins.h" #include "common/config-manager.h" -#include "common/md5.h" #include "audio/mididrv.h" #include "gui/gui-manager.h" diff --git a/engines/gob/gob.h b/engines/gob/gob.h index 57ad11c54c..4a928747b0 100644 --- a/engines/gob/gob.h +++ b/engines/gob/gob.h @@ -30,6 +30,8 @@ #include "common/system.h" #include "common/savefile.h" +#include "graphics/pixelformat.h" + #include "engines/engine.h" #include "gob/console.h" diff --git a/engines/gob/inter_v1.cpp b/engines/gob/inter_v1.cpp index 262fdc8045..8f1ff4c73f 100644 --- a/engines/gob/inter_v1.cpp +++ b/engines/gob/inter_v1.cpp @@ -23,9 +23,7 @@ * */ -#include "common/endian.h" #include "common/str.h" -#include "common/file.h" #include "gob/gob.h" #include "gob/inter.h" diff --git a/engines/gob/inter_v4.cpp b/engines/gob/inter_v4.cpp index 778387e52d..1da92b3766 100644 --- a/engines/gob/inter_v4.cpp +++ b/engines/gob/inter_v4.cpp @@ -23,9 +23,7 @@ * */ -#include "common/endian.h" #include "common/str.h" -#include "common/file.h" #include "gob/gob.h" #include "gob/inter.h" diff --git a/engines/gob/inter_v5.cpp b/engines/gob/inter_v5.cpp index 85b213ae66..f5e87bb936 100644 --- a/engines/gob/inter_v5.cpp +++ b/engines/gob/inter_v5.cpp @@ -23,9 +23,6 @@ * */ -#include "common/endian.h" -#include "common/file.h" - #include "gui/message.h" #include "gob/gob.h" diff --git a/engines/gob/inter_v6.cpp b/engines/gob/inter_v6.cpp index 06a06f4fb6..53ebfe7513 100644 --- a/engines/gob/inter_v6.cpp +++ b/engines/gob/inter_v6.cpp @@ -23,9 +23,7 @@ * */ -#include "common/endian.h" #include "common/str.h" -#include "common/file.h" #include "graphics/dither.h" #include "gob/gob.h" diff --git a/engines/gob/save/saveload.cpp b/engines/gob/save/saveload.cpp index 3508e58f16..e490509914 100644 --- a/engines/gob/save/saveload.cpp +++ b/engines/gob/save/saveload.cpp @@ -23,9 +23,6 @@ * */ -#include "common/endian.h" -#include "common/savefile.h" - #include "gob/gob.h" #include "gob/save/saveload.h" #include "gob/global.h" diff --git a/engines/gob/sound/adlib.cpp b/engines/gob/sound/adlib.cpp index f070bf14fa..4244df68e5 100644 --- a/engines/gob/sound/adlib.cpp +++ b/engines/gob/sound/adlib.cpp @@ -23,8 +23,10 @@ * */ +#include "common/debug.h" #include "common/file.h" #include "common/endian.h" +#include "common/textconsole.h" #include "gob/gob.h" #include "gob/sound/adlib.h" diff --git a/engines/gob/sound/bgatmosphere.cpp b/engines/gob/sound/bgatmosphere.cpp index 8850a727d3..b351d92275 100644 --- a/engines/gob/sound/bgatmosphere.cpp +++ b/engines/gob/sound/bgatmosphere.cpp @@ -23,8 +23,6 @@ * */ -#include "common/system.h" -#include "common/events.h" #include "common/EventRecorder.h" #include "gob/sound/bgatmosphere.h" diff --git a/engines/gob/sound/cdrom.cpp b/engines/gob/sound/cdrom.cpp index 4f3d783046..217aa9c18e 100644 --- a/engines/gob/sound/cdrom.cpp +++ b/engines/gob/sound/cdrom.cpp @@ -25,6 +25,7 @@ #include "common/endian.h" #include "common/str.h" +#include "common/textconsole.h" #include "common/util.h" #include "backends/audiocd/audiocd.h" diff --git a/engines/gob/sound/infogrames.cpp b/engines/gob/sound/infogrames.cpp index 6377b4e798..9fb7410740 100644 --- a/engines/gob/sound/infogrames.cpp +++ b/engines/gob/sound/infogrames.cpp @@ -23,6 +23,8 @@ * */ +#include "common/textconsole.h" + #include "gob/sound/infogrames.h" namespace Gob { diff --git a/engines/gob/sound/sounddesc.cpp b/engines/gob/sound/sounddesc.cpp index d33ea89147..cc1c6b1f6b 100644 --- a/engines/gob/sound/sounddesc.cpp +++ b/engines/gob/sound/sounddesc.cpp @@ -25,6 +25,8 @@ #include "common/util.h" #include "common/memstream.h" +#include "common/textconsole.h" + #include "audio/mixer.h" #include "audio/decoders/raw.h" #include "audio/decoders/wave.h" diff --git a/engines/gob/sound/soundmixer.cpp b/engines/gob/sound/soundmixer.cpp index b6082c577c..3b6b2e5d52 100644 --- a/engines/gob/sound/soundmixer.cpp +++ b/engines/gob/sound/soundmixer.cpp @@ -23,6 +23,8 @@ * */ +#include "common/util.h" + #include "gob/sound/soundmixer.h" #include "gob/sound/sounddesc.h" diff --git a/engines/gob/surface.cpp b/engines/gob/surface.cpp index c3e8cd9ff5..7bd8aae597 100644 --- a/engines/gob/surface.cpp +++ b/engines/gob/surface.cpp @@ -31,6 +31,8 @@ #include "common/frac.h" #include "graphics/primitives.h" +#include "graphics/pixelformat.h" +#include "graphics/surface.h" namespace Gob { diff --git a/engines/gob/util.cpp b/engines/gob/util.cpp index 4d51b3d61f..787f85175a 100644 --- a/engines/gob/util.cpp +++ b/engines/gob/util.cpp @@ -36,6 +36,8 @@ #include "common/events.h" +#include "graphics/palette.h" + namespace Gob { Util::Util(GobEngine *vm) : _vm(vm) { diff --git a/engines/gob/video.cpp b/engines/gob/video.cpp index 444ff8ed9e..1d74a07bfc 100644 --- a/engines/gob/video.cpp +++ b/engines/gob/video.cpp @@ -29,6 +29,7 @@ #include "graphics/cursorman.h" #include "graphics/fontman.h" +#include "graphics/palette.h" #include "graphics/surface.h" #include "gob/gob.h" diff --git a/engines/groovie/cursor.cpp b/engines/groovie/cursor.cpp index db4134ccb0..8b62b829e1 100644 --- a/engines/groovie/cursor.cpp +++ b/engines/groovie/cursor.cpp @@ -26,8 +26,11 @@ #include "groovie/cursor.h" #include "groovie/groovie.h" +#include "common/debug.h" #include "common/archive.h" +#include "common/file.h" #include "common/macresman.h" +#include "common/textconsole.h" #include "graphics/cursorman.h" namespace Groovie { diff --git a/engines/groovie/debug.cpp b/engines/groovie/debug.cpp index bd4b671e11..0b70e4f83a 100644 --- a/engines/groovie/debug.cpp +++ b/engines/groovie/debug.cpp @@ -31,6 +31,8 @@ #include "common/debug-channels.h" #include "common/system.h" +#include "graphics/palette.h" + namespace Groovie { Debugger::Debugger(GroovieEngine *vm) : diff --git a/engines/groovie/font.cpp b/engines/groovie/font.cpp index 92ebcce298..13d0df0005 100644 --- a/engines/groovie/font.cpp +++ b/engines/groovie/font.cpp @@ -23,6 +23,10 @@ * */ +#include "common/array.h" +#include "common/textconsole.h" +#include "graphics/surface.h" + #include "groovie/font.h" namespace Groovie { diff --git a/engines/groovie/graphics.cpp b/engines/groovie/graphics.cpp index 3ceeeb6018..3eaadbe1c7 100644 --- a/engines/groovie/graphics.cpp +++ b/engines/groovie/graphics.cpp @@ -25,8 +25,12 @@ #include "groovie/graphics.h" #include "groovie/groovie.h" + +#include "common/rect.h" #include "common/system.h" +#include "graphics/palette.h" + namespace Groovie { GraphicsMan::GraphicsMan(GroovieEngine *vm) : diff --git a/engines/groovie/groovie.cpp b/engines/groovie/groovie.cpp index 67c8f3dbc7..795cd6feb9 100644 --- a/engines/groovie/groovie.cpp +++ b/engines/groovie/groovie.cpp @@ -35,7 +35,9 @@ #include "common/config-manager.h" #include "common/debug-channels.h" #include "common/events.h" +#include "common/file.h" #include "common/macresman.h" +#include "common/textconsole.h" #include "backends/audiocd/audiocd.h" #include "engines/util.h" diff --git a/engines/groovie/music.cpp b/engines/groovie/music.cpp index 45f9800211..b7078f4c9e 100644 --- a/engines/groovie/music.cpp +++ b/engines/groovie/music.cpp @@ -29,8 +29,11 @@ #include "backends/audiocd/audiocd.h" #include "common/config-manager.h" +#include "common/debug.h" +#include "common/file.h" #include "common/macresman.h" #include "common/memstream.h" +#include "common/textconsole.h" #include "audio/midiparser.h" namespace Groovie { diff --git a/engines/groovie/player.cpp b/engines/groovie/player.cpp index 8badd90012..3fee87d7bb 100644 --- a/engines/groovie/player.cpp +++ b/engines/groovie/player.cpp @@ -23,6 +23,8 @@ * */ +#include "common/debug.h" + #include "groovie/player.h" #include "groovie/groovie.h" diff --git a/engines/groovie/resource.cpp b/engines/groovie/resource.cpp index 9c4e6fb2fa..7670ab4315 100644 --- a/engines/groovie/resource.cpp +++ b/engines/groovie/resource.cpp @@ -24,8 +24,11 @@ */ #include "common/archive.h" +#include "common/debug.h" +#include "common/file.h" #include "common/macresman.h" #include "common/substream.h" +#include "common/textconsole.h" #include "groovie/resource.h" #include "groovie/groovie.h" diff --git a/engines/groovie/roq.cpp b/engines/groovie/roq.cpp index 4d7157c797..8b40fa8a1f 100644 --- a/engines/groovie/roq.cpp +++ b/engines/groovie/roq.cpp @@ -30,7 +30,11 @@ #include "groovie/graphics.h" #include "groovie/groovie.h" +#include "common/debug.h" +#include "common/textconsole.h" + #include "graphics/jpeg.h" +#include "graphics/palette.h" #ifdef USE_RGB_COLOR // Required for the YUV to RGB conversion diff --git a/engines/groovie/script.cpp b/engines/groovie/script.cpp index 8c7d3b0824..fabb70cca0 100644 --- a/engines/groovie/script.cpp +++ b/engines/groovie/script.cpp @@ -37,6 +37,7 @@ #include "common/config-manager.h" #include "common/debug-channels.h" #include "common/EventRecorder.h" +#include "common/file.h" #include "common/macresman.h" #include "gui/message.h" diff --git a/engines/groovie/vdx.cpp b/engines/groovie/vdx.cpp index 6643177328..432b17802c 100644 --- a/engines/groovie/vdx.cpp +++ b/engines/groovie/vdx.cpp @@ -28,9 +28,12 @@ #include "groovie/groovie.h" #include "groovie/lzss.h" +#include "common/debug.h" #include "common/debug-channels.h" +#include "common/textconsole.h" #include "audio/mixer.h" #include "audio/decoders/raw.h" +#include "graphics/palette.h" #define TILE_SIZE 4 // Size of each tile on the image: only ever seen 4 so far #define VDX_IDENT 0x9267 // 37479 diff --git a/engines/hugo/detection.cpp b/engines/hugo/detection.cpp index e862e339ce..95302c9235 100644 --- a/engines/hugo/detection.cpp +++ b/engines/hugo/detection.cpp @@ -26,6 +26,7 @@ #include "engines/advancedDetector.h" #include "common/system.h" #include "common/savefile.h" +#include "common/textconsole.h" #include "graphics/thumbnail.h" #include "graphics/surface.h" diff --git a/engines/hugo/display.cpp b/engines/hugo/display.cpp index 41e69401d0..af4d094ceb 100644 --- a/engines/hugo/display.cpp +++ b/engines/hugo/display.cpp @@ -32,8 +32,11 @@ // Display.c - DIB related code for HUGOWIN +#include "common/debug.h" #include "common/system.h" +#include "common/textconsole.h" #include "graphics/cursorman.h" +#include "graphics/palette.h" #include "hugo/hugo.h" #include "hugo/display.h" diff --git a/engines/hugo/file.cpp b/engines/hugo/file.cpp index 3a79ba1e7d..ba4e420111 100644 --- a/engines/hugo/file.cpp +++ b/engines/hugo/file.cpp @@ -30,8 +30,10 @@ * */ +#include "common/debug.h" #include "common/system.h" #include "common/savefile.h" +#include "common/textconsole.h" #include "common/config-manager.h" #include "graphics/thumbnail.h" #include "gui/saveload.h" diff --git a/engines/hugo/file_v1d.cpp b/engines/hugo/file_v1d.cpp index 48f274e88a..021969f306 100644 --- a/engines/hugo/file_v1d.cpp +++ b/engines/hugo/file_v1d.cpp @@ -30,7 +30,9 @@ * */ +#include "common/debug.h" #include "common/system.h" +#include "common/textconsole.h" #include "hugo/hugo.h" #include "hugo/file.h" diff --git a/engines/hugo/file_v1w.cpp b/engines/hugo/file_v1w.cpp index dbb093752a..4f327b3095 100644 --- a/engines/hugo/file_v1w.cpp +++ b/engines/hugo/file_v1w.cpp @@ -30,7 +30,9 @@ * */ +#include "common/debug.h" #include "common/system.h" +#include "common/textconsole.h" #include "hugo/hugo.h" #include "hugo/file.h" diff --git a/engines/hugo/file_v2d.cpp b/engines/hugo/file_v2d.cpp index d385157a11..0ad89e987e 100644 --- a/engines/hugo/file_v2d.cpp +++ b/engines/hugo/file_v2d.cpp @@ -30,7 +30,9 @@ * */ +#include "common/debug.h" #include "common/system.h" +#include "common/textconsole.h" #include "hugo/hugo.h" #include "hugo/file.h" diff --git a/engines/hugo/file_v3d.cpp b/engines/hugo/file_v3d.cpp index 2f3e5af3f0..6370fffa4d 100644 --- a/engines/hugo/file_v3d.cpp +++ b/engines/hugo/file_v3d.cpp @@ -30,7 +30,9 @@ * */ +#include "common/debug.h" #include "common/system.h" +#include "common/textconsole.h" #include "hugo/hugo.h" #include "hugo/file.h" diff --git a/engines/hugo/hugo.cpp b/engines/hugo/hugo.cpp index 7a42ca2ebe..a872a97bae 100644 --- a/engines/hugo/hugo.cpp +++ b/engines/hugo/hugo.cpp @@ -25,13 +25,14 @@ #include "common/system.h" #include "common/random.h" +#include "common/error.h" #include "common/events.h" #include "common/EventRecorder.h" #include "common/debug-channels.h" #include "common/config-manager.h" +#include "common/textconsole.h" #include "hugo/hugo.h" -#include "hugo/game.h" #include "hugo/file.h" #include "hugo/schedule.h" #include "hugo/display.h" diff --git a/engines/hugo/intro.cpp b/engines/hugo/intro.cpp index 63e81924c4..65dff78bb4 100644 --- a/engines/hugo/intro.cpp +++ b/engines/hugo/intro.cpp @@ -31,6 +31,7 @@ */ #include "common/system.h" +#include "common/textconsole.h" #include "hugo/hugo.h" #include "hugo/intro.h" diff --git a/engines/hugo/inventory.cpp b/engines/hugo/inventory.cpp index ab58e386ba..45893f6965 100644 --- a/engines/hugo/inventory.cpp +++ b/engines/hugo/inventory.cpp @@ -30,6 +30,7 @@ * */ +#include "common/debug.h" #include "common/system.h" #include "hugo/hugo.h" diff --git a/engines/hugo/mouse.cpp b/engines/hugo/mouse.cpp index e8926b17c4..c02908e579 100644 --- a/engines/hugo/mouse.cpp +++ b/engines/hugo/mouse.cpp @@ -32,6 +32,7 @@ // mouse.cpp : Handle all mouse activity +#include "common/debug.h" #include "common/system.h" #include "hugo/hugo.h" diff --git a/engines/hugo/object.cpp b/engines/hugo/object.cpp index 0a52a0f62d..acf9f6e50c 100644 --- a/engines/hugo/object.cpp +++ b/engines/hugo/object.cpp @@ -30,8 +30,7 @@ * */ -#include "common/system.h" -#include "common/random.h" +#include "common/debug.h" #include "hugo/hugo.h" #include "hugo/game.h" diff --git a/engines/hugo/object_v1d.cpp b/engines/hugo/object_v1d.cpp index a8edb45746..95bedf4fa2 100644 --- a/engines/hugo/object_v1d.cpp +++ b/engines/hugo/object_v1d.cpp @@ -30,6 +30,7 @@ * */ +#include "common/debug.h" #include "common/system.h" #include "common/random.h" diff --git a/engines/hugo/object_v1w.cpp b/engines/hugo/object_v1w.cpp index f3ba793a3b..54becd8234 100644 --- a/engines/hugo/object_v1w.cpp +++ b/engines/hugo/object_v1w.cpp @@ -30,6 +30,7 @@ * */ +#include "common/debug.h" #include "common/system.h" #include "common/random.h" diff --git a/engines/hugo/object_v2d.cpp b/engines/hugo/object_v2d.cpp index b3c49262ad..7c47bf4f92 100644 --- a/engines/hugo/object_v2d.cpp +++ b/engines/hugo/object_v2d.cpp @@ -30,6 +30,7 @@ * */ +#include "common/debug.h" #include "common/system.h" #include "common/random.h" diff --git a/engines/hugo/object_v3d.cpp b/engines/hugo/object_v3d.cpp index 2c6fc5d99d..3ff6c56ad3 100644 --- a/engines/hugo/object_v3d.cpp +++ b/engines/hugo/object_v3d.cpp @@ -30,6 +30,7 @@ * */ +#include "common/debug.h" #include "common/system.h" #include "common/random.h" diff --git a/engines/hugo/parser.cpp b/engines/hugo/parser.cpp index 19cd4a333c..29a1d5efa3 100644 --- a/engines/hugo/parser.cpp +++ b/engines/hugo/parser.cpp @@ -30,12 +30,8 @@ * */ -#include "common/system.h" #include "common/events.h" - -#include "common/random.h" -#include "common/EventRecorder.h" -#include "common/debug-channels.h" +#include "common/textconsole.h" #include "hugo/hugo.h" #include "hugo/display.h" diff --git a/engines/hugo/parser.h b/engines/hugo/parser.h index dd9244ba93..b00b8d5c43 100644 --- a/engines/hugo/parser.h +++ b/engines/hugo/parser.h @@ -32,6 +32,11 @@ #ifndef HUGO_PARSER_H #define HUGO_PARSER_H + +namespace Common { +struct Event; +} + namespace Hugo { enum seqTextParser { diff --git a/engines/hugo/parser_v1d.cpp b/engines/hugo/parser_v1d.cpp index de18427d93..b2e515fd42 100644 --- a/engines/hugo/parser_v1d.cpp +++ b/engines/hugo/parser_v1d.cpp @@ -32,6 +32,7 @@ // parser.c - handles all keyboard/command input +#include "common/debug.h" #include "common/system.h" #include "hugo/hugo.h" diff --git a/engines/hugo/parser_v1w.cpp b/engines/hugo/parser_v1w.cpp index 305fb995e1..a39063357b 100644 --- a/engines/hugo/parser_v1w.cpp +++ b/engines/hugo/parser_v1w.cpp @@ -32,8 +32,7 @@ // parser.c - handles all keyboard/command input -#include "common/system.h" -#include "common/events.h" +#include "common/debug.h" #include "hugo/hugo.h" #include "hugo/parser.h" diff --git a/engines/hugo/parser_v2d.cpp b/engines/hugo/parser_v2d.cpp index 19570eb44c..6233f11c29 100644 --- a/engines/hugo/parser_v2d.cpp +++ b/engines/hugo/parser_v2d.cpp @@ -32,6 +32,7 @@ // parser.c - handles all keyboard/command input +#include "common/debug.h" #include "common/system.h" #include "hugo/hugo.h" diff --git a/engines/hugo/parser_v3d.cpp b/engines/hugo/parser_v3d.cpp index e5575ab8b7..8c4946c534 100644 --- a/engines/hugo/parser_v3d.cpp +++ b/engines/hugo/parser_v3d.cpp @@ -32,6 +32,7 @@ // parser.c - handles all keyboard/command input +#include "common/debug.h" #include "common/system.h" #include "hugo/hugo.h" diff --git a/engines/hugo/route.cpp b/engines/hugo/route.cpp index 76ec583857..68b659cd3f 100644 --- a/engines/hugo/route.cpp +++ b/engines/hugo/route.cpp @@ -32,6 +32,7 @@ // Find shortest route from hero to destination +#include "common/debug.h" #include "common/system.h" #include "hugo/hugo.h" diff --git a/engines/hugo/schedule.cpp b/engines/hugo/schedule.cpp index 9782dbc0bd..0e91124a7e 100644 --- a/engines/hugo/schedule.cpp +++ b/engines/hugo/schedule.cpp @@ -32,7 +32,9 @@ // This module contains all the scheduling and timing stuff +#include "common/debug.h" #include "common/system.h" +#include "common/textconsole.h" #include "hugo/hugo.h" #include "hugo/schedule.h" diff --git a/engines/hugo/sound.cpp b/engines/hugo/sound.cpp index 24359a2c54..d657eb96a6 100644 --- a/engines/hugo/sound.cpp +++ b/engines/hugo/sound.cpp @@ -32,7 +32,9 @@ // sound.c - sound effects and music support +#include "common/debug.h" #include "common/system.h" +#include "common/textconsole.h" #include "common/config-manager.h" #include "audio/decoders/raw.h" diff --git a/engines/kyra/animator_hof.cpp b/engines/kyra/animator_hof.cpp index e1471239da..aa39ae6355 100644 --- a/engines/kyra/animator_hof.cpp +++ b/engines/kyra/animator_hof.cpp @@ -27,6 +27,7 @@ #include "kyra/wsamovie.h" #include "common/endian.h" +#include "common/system.h" namespace Kyra { diff --git a/engines/kyra/animator_lok.cpp b/engines/kyra/animator_lok.cpp index b906d3a724..3f09362c5e 100644 --- a/engines/kyra/animator_lok.cpp +++ b/engines/kyra/animator_lok.cpp @@ -24,14 +24,15 @@ */ #include "common/endian.h" +#include "common/error.h" +#include "common/rect.h" +#include "common/util.h" #include "kyra/kyra_lok.h" #include "kyra/screen.h" #include "kyra/animator_lok.h" #include "kyra/sprites.h" -#include "common/system.h" - namespace Kyra { Animator_LoK::Animator_LoK(KyraEngine_LoK *vm, OSystem *system) { _vm = vm; diff --git a/engines/kyra/animator_mr.cpp b/engines/kyra/animator_mr.cpp index e6daba7aeb..47c0e3b03a 100644 --- a/engines/kyra/animator_mr.cpp +++ b/engines/kyra/animator_mr.cpp @@ -27,6 +27,8 @@ #include "kyra/resource.h" #include "kyra/wsamovie.h" +#include "common/system.h" + namespace Kyra { void KyraEngine_MR::restorePage3() { diff --git a/engines/kyra/animator_v2.cpp b/engines/kyra/animator_v2.cpp index b06dffd36f..07ff4456e5 100644 --- a/engines/kyra/animator_v2.cpp +++ b/engines/kyra/animator_v2.cpp @@ -25,9 +25,6 @@ #include "kyra/kyra_v2.h" #include "kyra/screen_v2.h" -#include "kyra/wsamovie.h" - -#include "common/endian.h" namespace Kyra { diff --git a/engines/kyra/detection.cpp b/engines/kyra/detection.cpp index 6c111a6601..34d1834e0b 100644 --- a/engines/kyra/detection.cpp +++ b/engines/kyra/detection.cpp @@ -30,9 +30,11 @@ #include "common/config-manager.h" -#include "engines/advancedDetector.h" +#include "common/system.h" #include "common/savefile.h" +#include "engines/advancedDetector.h" + #include "base/plugins.h" struct KYRAGameDescription { diff --git a/engines/kyra/gui.cpp b/engines/kyra/gui.cpp index ff7bf233d2..8c1a8ab141 100644 --- a/engines/kyra/gui.cpp +++ b/engines/kyra/gui.cpp @@ -30,6 +30,7 @@ #include "kyra/wsamovie.h" #include "common/savefile.h" +#include "common/system.h" namespace Kyra { diff --git a/engines/kyra/gui_hof.cpp b/engines/kyra/gui_hof.cpp index 56971e563c..1a289807fa 100644 --- a/engines/kyra/gui_hof.cpp +++ b/engines/kyra/gui_hof.cpp @@ -31,7 +31,7 @@ #include "kyra/sound.h" #include "kyra/resource.h" -#include "common/savefile.h" +#include "common/system.h" #include "graphics/scaler.h" diff --git a/engines/kyra/gui_lok.cpp b/engines/kyra/gui_lok.cpp index 3560478a1b..a4bec82f84 100644 --- a/engines/kyra/gui_lok.cpp +++ b/engines/kyra/gui_lok.cpp @@ -34,7 +34,6 @@ #include "kyra/util.h" #include "kyra/item.h" -#include "common/config-manager.h" #include "common/savefile.h" #include "common/system.h" diff --git a/engines/kyra/gui_lol.cpp b/engines/kyra/gui_lol.cpp index 07fbf1664d..f52dd32c20 100644 --- a/engines/kyra/gui_lol.cpp +++ b/engines/kyra/gui_lol.cpp @@ -32,6 +32,7 @@ #include "kyra/util.h" #include "common/savefile.h" +#include "common/system.h" #include "common/config-manager.h" #include "graphics/scaler.h" diff --git a/engines/kyra/gui_mr.cpp b/engines/kyra/gui_mr.cpp index 6bdecfc3b8..b34ff6a554 100644 --- a/engines/kyra/gui_mr.cpp +++ b/engines/kyra/gui_mr.cpp @@ -31,7 +31,7 @@ #include "kyra/sound.h" #include "kyra/timer.h" -#include "common/savefile.h" +#include "common/system.h" #include "graphics/scaler.h" diff --git a/engines/kyra/gui_v2.cpp b/engines/kyra/gui_v2.cpp index 2247a0ca2e..9cce543302 100644 --- a/engines/kyra/gui_v2.cpp +++ b/engines/kyra/gui_v2.cpp @@ -30,6 +30,7 @@ #include "kyra/util.h" #include "common/savefile.h" +#include "common/system.h" namespace Kyra { diff --git a/engines/kyra/items_hof.cpp b/engines/kyra/items_hof.cpp index 6a78a77c23..d460698272 100644 --- a/engines/kyra/items_hof.cpp +++ b/engines/kyra/items_hof.cpp @@ -25,6 +25,8 @@ #include "kyra/kyra_hof.h" +#include "common/system.h" + namespace Kyra { int KyraEngine_HoF::checkItemCollision(int x, int y) { diff --git a/engines/kyra/items_lok.cpp b/engines/kyra/items_lok.cpp index 322314e3ad..f8271ad1e0 100644 --- a/engines/kyra/items_lok.cpp +++ b/engines/kyra/items_lok.cpp @@ -34,7 +34,6 @@ #include "kyra/text.h" #include "common/system.h" -#include "common/savefile.h" namespace Kyra { diff --git a/engines/kyra/items_mr.cpp b/engines/kyra/items_mr.cpp index 2bc268ace3..5659876307 100644 --- a/engines/kyra/items_mr.cpp +++ b/engines/kyra/items_mr.cpp @@ -26,6 +26,8 @@ #include "kyra/kyra_mr.h" #include "kyra/timer.h" +#include "common/system.h" + namespace Kyra { void KyraEngine_MR::removeTrashItems() { diff --git a/engines/kyra/kyra_lok.cpp b/engines/kyra/kyra_lok.cpp index d7ec6ada71..978a5a3209 100644 --- a/engines/kyra/kyra_lok.cpp +++ b/engines/kyra/kyra_lok.cpp @@ -25,9 +25,7 @@ #include "kyra/kyra_lok.h" -#include "common/file.h" #include "common/system.h" -#include "common/savefile.h" #include "common/config-manager.h" #include "common/debug-channels.h" diff --git a/engines/kyra/kyra_lok.h b/engines/kyra/kyra_lok.h index d1ff24ad85..cfa231e2d0 100644 --- a/engines/kyra/kyra_lok.h +++ b/engines/kyra/kyra_lok.h @@ -32,6 +32,10 @@ #include "kyra/gui_lok.h" #include "kyra/item.h" +namespace Graphics { +struct Surface; +} + namespace Kyra { class Movie; diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp index 3a5d21196b..506b262fa4 100644 --- a/engines/kyra/kyra_v1.cpp +++ b/engines/kyra/kyra_v1.cpp @@ -23,6 +23,7 @@ * */ +#include "common/error.h" #include "common/config-manager.h" #include "common/debug-channels.h" #include "common/EventRecorder.h" @@ -36,7 +37,6 @@ #include "kyra/screen.h" #include "kyra/text.h" #include "kyra/timer.h" -#include "kyra/script.h" #include "kyra/debugger.h" namespace Kyra { diff --git a/engines/kyra/kyra_v1.h b/engines/kyra/kyra_v1.h index 801d31d676..08dc831dd9 100644 --- a/engines/kyra/kyra_v1.h +++ b/engines/kyra/kyra_v1.h @@ -29,10 +29,10 @@ #include "engines/engine.h" #include "common/array.h" +#include "common/error.h" #include "common/events.h" #include "common/random.h" #include "common/hashmap.h" -#include "common/system.h" #include "audio/mixer.h" @@ -44,6 +44,10 @@ class SeekableReadStream; class WriteStream; } // End of namespace Common +namespace Graphics { +struct Surface; +} + class KyraMetaEngine; /** @@ -166,7 +170,6 @@ enum MusicDataID { class Screen; class Resource; class Sound; -class Movie; class TextDisplayer; class StaticResource; class TimerManager; diff --git a/engines/kyra/kyra_v2.cpp b/engines/kyra/kyra_v2.cpp index 804097c81d..38c176ead5 100644 --- a/engines/kyra/kyra_v2.cpp +++ b/engines/kyra/kyra_v2.cpp @@ -24,10 +24,11 @@ */ #include "common/config-manager.h" +#include "common/error.h" +#include "common/system.h" #include "kyra/kyra_v2.h" #include "kyra/screen_v2.h" -#include "kyra/debugger.h" namespace Kyra { diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp index 78c9ed260d..613d5b0b81 100644 --- a/engines/kyra/lol.cpp +++ b/engines/kyra/lol.cpp @@ -39,6 +39,7 @@ #include "common/config-manager.h" #include "common/endian.h" +#include "common/system.h" namespace Kyra { diff --git a/engines/kyra/resource.cpp b/engines/kyra/resource.cpp index 63b8072654..22786c1c7e 100644 --- a/engines/kyra/resource.cpp +++ b/engines/kyra/resource.cpp @@ -27,11 +27,7 @@ #include "kyra/resource_intern.h" #include "common/config-manager.h" -#include "common/endian.h" -#include "common/file.h" #include "common/fs.h" -#include "common/func.h" -#include "common/system.h" namespace Kyra { diff --git a/engines/kyra/saveload_lok.cpp b/engines/kyra/saveload_lok.cpp index 012ff138b5..77d6bb9502 100644 --- a/engines/kyra/saveload_lok.cpp +++ b/engines/kyra/saveload_lok.cpp @@ -23,9 +23,7 @@ * */ -#include "common/endian.h" #include "common/savefile.h" -#include "common/system.h" #include "kyra/kyra_lok.h" #include "kyra/animator_lok.h" diff --git a/engines/kyra/saveload_lol.cpp b/engines/kyra/saveload_lol.cpp index b6c0693a16..fdf8df3807 100644 --- a/engines/kyra/saveload_lol.cpp +++ b/engines/kyra/saveload_lol.cpp @@ -29,10 +29,8 @@ #include "kyra/screen_lol.h" #include "kyra/resource.h" -#include "common/endian.h" #include "common/savefile.h" #include "common/substream.h" -#include "common/system.h" #include "graphics/scaler.h" diff --git a/engines/kyra/scene_hof.cpp b/engines/kyra/scene_hof.cpp index 79827361a3..3797b70932 100644 --- a/engines/kyra/scene_hof.cpp +++ b/engines/kyra/scene_hof.cpp @@ -30,6 +30,7 @@ #include "kyra/resource.h" #include "common/func.h" +#include "common/system.h" namespace Kyra { diff --git a/engines/kyra/scene_lol.cpp b/engines/kyra/scene_lol.cpp index e070b91a44..053f549c82 100644 --- a/engines/kyra/scene_lol.cpp +++ b/engines/kyra/scene_lol.cpp @@ -32,6 +32,7 @@ #include "kyra/sound.h" #include "common/endian.h" +#include "common/system.h" namespace Kyra { diff --git a/engines/kyra/scene_mr.cpp b/engines/kyra/scene_mr.cpp index acb0710616..ccb77886a7 100644 --- a/engines/kyra/scene_mr.cpp +++ b/engines/kyra/scene_mr.cpp @@ -29,6 +29,8 @@ #include "kyra/sound.h" #include "kyra/resource.h" +#include "common/system.h" + namespace Kyra { void KyraEngine_MR::enterNewScene(uint16 sceneId, int facing, int unk1, int unk2, int unk3) { diff --git a/engines/kyra/scene_v2.cpp b/engines/kyra/scene_v2.cpp index fdfbceb521..8255fc5837 100644 --- a/engines/kyra/scene_v2.cpp +++ b/engines/kyra/scene_v2.cpp @@ -26,6 +26,8 @@ #include "kyra/kyra_v2.h" #include "kyra/screen.h" +#include "common/system.h" + namespace Kyra { void KyraEngine_v2::freeSceneAnims() { diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp index 58d8e7f3d4..9e25d2ea46 100644 --- a/engines/kyra/screen.cpp +++ b/engines/kyra/screen.cpp @@ -31,6 +31,7 @@ #include "engines/util.h" #include "graphics/cursorman.h" +#include "graphics/palette.h" #include "graphics/sjis.h" #include "kyra/screen.h" diff --git a/engines/kyra/screen_lok.cpp b/engines/kyra/screen_lok.cpp index 227349754f..1ce00f9b5b 100644 --- a/engines/kyra/screen_lok.cpp +++ b/engines/kyra/screen_lok.cpp @@ -26,7 +26,10 @@ #include "kyra/kyra_lok.h" #include "kyra/screen_lok.h" +#include "common/system.h" + #include "graphics/cursorman.h" +#include "graphics/palette.h" namespace Kyra { diff --git a/engines/kyra/screen_lol.cpp b/engines/kyra/screen_lol.cpp index ff35facbb5..d2bc72bd80 100644 --- a/engines/kyra/screen_lol.cpp +++ b/engines/kyra/screen_lol.cpp @@ -29,6 +29,10 @@ #include "kyra/lol.h" #include "kyra/resource.h" +#include "common/system.h" + +#include "graphics/palette.h" + namespace Kyra { Screen_LoL::Screen_LoL(LoLEngine *vm, OSystem *system) : Screen_v2(vm, system), _vm(vm) { diff --git a/engines/kyra/script_hof.cpp b/engines/kyra/script_hof.cpp index d57bb7efc5..ad13990cad 100644 --- a/engines/kyra/script_hof.cpp +++ b/engines/kyra/script_hof.cpp @@ -32,6 +32,7 @@ #include "kyra/resource.h" #include "common/endian.h" +#include "common/system.h" namespace Kyra { diff --git a/engines/kyra/script_lol.cpp b/engines/kyra/script_lol.cpp index c9fb8df1fb..29e0324fe3 100644 --- a/engines/kyra/script_lol.cpp +++ b/engines/kyra/script_lol.cpp @@ -31,6 +31,7 @@ #include "kyra/resource.h" #include "common/endian.h" +#include "common/system.h" namespace Kyra { diff --git a/engines/kyra/script_mr.cpp b/engines/kyra/script_mr.cpp index 18878b6543..c049a944dc 100644 --- a/engines/kyra/script_mr.cpp +++ b/engines/kyra/script_mr.cpp @@ -32,6 +32,7 @@ #include "kyra/resource.h" #include "common/endian.h" +#include "common/system.h" namespace Kyra { diff --git a/engines/kyra/script_tim.cpp b/engines/kyra/script_tim.cpp index 1e978caf15..b990b68900 100644 --- a/engines/kyra/script_tim.cpp +++ b/engines/kyra/script_tim.cpp @@ -36,6 +36,7 @@ #include "common/iff_container.h" #include "common/endian.h" +#include "common/system.h" namespace Kyra { diff --git a/engines/kyra/script_tim.h b/engines/kyra/script_tim.h index 91f2e8589e..7cf7d0a7dd 100644 --- a/engines/kyra/script_tim.h +++ b/engines/kyra/script_tim.h @@ -36,6 +36,7 @@ namespace Kyra { class WSAMovie_v2; class Screen_v2; +class Movie; class LoLEngine; class TimAnimator { diff --git a/engines/kyra/script_v1.cpp b/engines/kyra/script_v1.cpp index 12f26ec5f6..13fdcb7d97 100644 --- a/engines/kyra/script_v1.cpp +++ b/engines/kyra/script_v1.cpp @@ -26,6 +26,8 @@ #include "kyra/kyra_v1.h" #include "kyra/screen.h" +#include "common/system.h" + namespace Kyra { int KyraEngine_v1::o1_queryGameFlag(EMCState *script) { diff --git a/engines/kyra/script_v2.cpp b/engines/kyra/script_v2.cpp index 17e882398e..7779a153cb 100644 --- a/engines/kyra/script_v2.cpp +++ b/engines/kyra/script_v2.cpp @@ -28,6 +28,7 @@ #include "kyra/timer.h" #include "common/endian.h" +#include "common/system.h" namespace Kyra { diff --git a/engines/kyra/sequences_lol.cpp b/engines/kyra/sequences_lol.cpp index e8ea7a9dcb..35888421d0 100644 --- a/engines/kyra/sequences_lol.cpp +++ b/engines/kyra/sequences_lol.cpp @@ -31,6 +31,8 @@ #include "base/version.h" +#include "common/system.h" + namespace Kyra { #pragma mark - Intro diff --git a/engines/kyra/sequences_v2.cpp b/engines/kyra/sequences_v2.cpp index 3824676213..4d9cdf0d5d 100644 --- a/engines/kyra/sequences_v2.cpp +++ b/engines/kyra/sequences_v2.cpp @@ -26,6 +26,8 @@ #include "kyra/kyra_v2.h" #include "kyra/resource.h" +#include "common/system.h" + namespace Kyra { void KyraEngine_v2::runAnimationScript(const char *filename, int allowSkip, int resetChar, int newShapes, int shapeUnload) { diff --git a/engines/kyra/sound.cpp b/engines/kyra/sound.cpp index 9dd046e50b..c65523db79 100644 --- a/engines/kyra/sound.cpp +++ b/engines/kyra/sound.cpp @@ -24,9 +24,6 @@ */ -#include "common/system.h" -#include "common/config-manager.h" - #include "kyra/resource.h" #include "kyra/sound.h" diff --git a/engines/kyra/sound_amiga.cpp b/engines/kyra/sound_amiga.cpp index c5e9f6171d..7a50bb0808 100644 --- a/engines/kyra/sound_amiga.cpp +++ b/engines/kyra/sound_amiga.cpp @@ -23,8 +23,6 @@ * */ -#include "common/system.h" -#include "common/mutex.h" #include "kyra/resource.h" #include "kyra/sound_intern.h" diff --git a/engines/kyra/sound_lok.cpp b/engines/kyra/sound_lok.cpp index 40daa0b5bd..3b1ee50f2a 100644 --- a/engines/kyra/sound_lok.cpp +++ b/engines/kyra/sound_lok.cpp @@ -26,6 +26,8 @@ #include "kyra/sound.h" #include "kyra/kyra_lok.h" +#include "common/system.h" + namespace Kyra { void KyraEngine_LoK::snd_playSoundEffect(int track, int volume) { diff --git a/engines/kyra/sound_lol.cpp b/engines/kyra/sound_lol.cpp index 87679f5bfb..5c9dc8ccc6 100644 --- a/engines/kyra/sound_lol.cpp +++ b/engines/kyra/sound_lol.cpp @@ -29,6 +29,8 @@ #include "kyra/lol.h" #include "kyra/resource.h" +#include "common/system.h" + #include "audio/audiostream.h" namespace Kyra { diff --git a/engines/kyra/text_hof.cpp b/engines/kyra/text_hof.cpp index 4c292b70db..a1179b3605 100644 --- a/engines/kyra/text_hof.cpp +++ b/engines/kyra/text_hof.cpp @@ -29,6 +29,7 @@ #include "kyra/resource.h" #include "common/endian.h" +#include "common/system.h" namespace Kyra { diff --git a/engines/kyra/text_lok.cpp b/engines/kyra/text_lok.cpp index 40f2217a2b..4796d74955 100644 --- a/engines/kyra/text_lok.cpp +++ b/engines/kyra/text_lok.cpp @@ -30,6 +30,8 @@ #include "kyra/sprites.h" #include "kyra/timer.h" +#include "common/system.h" + namespace Kyra { void KyraEngine_LoK::waitForChatToFinish(int vocFile, int16 chatDuration, const char *chatStr, uint8 charNum, const bool printText) { diff --git a/engines/kyra/text_lol.cpp b/engines/kyra/text_lol.cpp index 9f98586303..98f93e24f8 100644 --- a/engines/kyra/text_lol.cpp +++ b/engines/kyra/text_lol.cpp @@ -30,6 +30,8 @@ #include "kyra/timer.h" #include "kyra/util.h" +#include "common/system.h" + namespace Kyra { TextDisplayer_LoL::TextDisplayer_LoL(LoLEngine *vm, Screen_LoL *screen) : _vm(vm), _screen(screen), diff --git a/engines/kyra/text_mr.cpp b/engines/kyra/text_mr.cpp index 001faab016..cc10273c87 100644 --- a/engines/kyra/text_mr.cpp +++ b/engines/kyra/text_mr.cpp @@ -27,6 +27,8 @@ #include "kyra/screen_mr.h" #include "kyra/resource.h" +#include "common/system.h" + namespace Kyra { TextDisplayer_MR::TextDisplayer_MR(KyraEngine_MR *vm, Screen_MR *screen) diff --git a/engines/kyra/timer.cpp b/engines/kyra/timer.cpp index 66b78d3c03..dbde3d30b7 100644 --- a/engines/kyra/timer.cpp +++ b/engines/kyra/timer.cpp @@ -28,6 +28,7 @@ #include "common/func.h" #include "common/stream.h" +#include "common/system.h" namespace Kyra { diff --git a/engines/kyra/timer_lol.cpp b/engines/kyra/timer_lol.cpp index 90cfc1af78..aa6688f917 100644 --- a/engines/kyra/timer_lol.cpp +++ b/engines/kyra/timer_lol.cpp @@ -29,6 +29,8 @@ #include "kyra/screen_lol.h" #include "kyra/timer.h" +#include "common/system.h" + namespace Kyra { #define TimerV2(x) new Common::Functor1Mem<int, void, LoLEngine>(this, &LoLEngine::x) diff --git a/engines/kyra/timer_mr.cpp b/engines/kyra/timer_mr.cpp index 0d89decf5a..97ce7c166d 100644 --- a/engines/kyra/timer_mr.cpp +++ b/engines/kyra/timer_mr.cpp @@ -26,6 +26,8 @@ #include "kyra/kyra_mr.h" #include "kyra/timer.h" +#include "common/system.h" + namespace Kyra { #define TimerV3(x) new Common::Functor1Mem<int, void, KyraEngine_MR>(this, &KyraEngine_MR::x) diff --git a/engines/lastexpress/data/animation.cpp b/engines/lastexpress/data/animation.cpp index 7288889f09..6e80d3d9d6 100644 --- a/engines/lastexpress/data/animation.cpp +++ b/engines/lastexpress/data/animation.cpp @@ -35,7 +35,10 @@ #include "common/events.h" #include "common/rational.h" +#include "common/rect.h" #include "common/stream.h" +#include "common/system.h" +#include "common/textconsole.h" #include "engines/engine.h" diff --git a/engines/lastexpress/data/archive.h b/engines/lastexpress/data/archive.h index 3860245bc5..17b1d661fa 100644 --- a/engines/lastexpress/data/archive.h +++ b/engines/lastexpress/data/archive.h @@ -39,6 +39,9 @@ */ #include "common/archive.h" +#include "common/hash-str.h" +#include "common/hashmap.h" +#include "common/str.h" namespace LastExpress { diff --git a/engines/lastexpress/data/background.cpp b/engines/lastexpress/data/background.cpp index 8b0d338f64..e8236bca86 100644 --- a/engines/lastexpress/data/background.cpp +++ b/engines/lastexpress/data/background.cpp @@ -31,6 +31,7 @@ #include "lastexpress/debug.h" +#include "common/rect.h" #include "common/stream.h" namespace LastExpress { diff --git a/engines/lastexpress/data/font.cpp b/engines/lastexpress/data/font.cpp index 99239606ab..d9acbb8382 100644 --- a/engines/lastexpress/data/font.cpp +++ b/engines/lastexpress/data/font.cpp @@ -25,8 +25,10 @@ #include "lastexpress/data/font.h" +#include "common/rect.h" #include "common/stream.h" #include "common/system.h" +#include "common/textconsole.h" namespace LastExpress { diff --git a/engines/lastexpress/data/font.h b/engines/lastexpress/data/font.h index d49db35ba5..7bcf03ed7d 100644 --- a/engines/lastexpress/data/font.h +++ b/engines/lastexpress/data/font.h @@ -39,10 +39,12 @@ byte {x} - Unknown data (probably just garbage) */ +#include "common/str.h" #include "graphics/surface.h" namespace Common { class SeekableReadStream; +struct Rect; } namespace LastExpress { diff --git a/engines/lastexpress/data/scene.cpp b/engines/lastexpress/data/scene.cpp index 5a943982c4..e893d641a5 100644 --- a/engines/lastexpress/data/scene.cpp +++ b/engines/lastexpress/data/scene.cpp @@ -31,6 +31,7 @@ #include "lastexpress/lastexpress.h" #include "lastexpress/resource.h" +#include "common/textconsole.h" #include "common/stream.h" namespace LastExpress { diff --git a/engines/lastexpress/data/scene.h b/engines/lastexpress/data/scene.h index 7fc9425f28..9ec1899402 100644 --- a/engines/lastexpress/data/scene.h +++ b/engines/lastexpress/data/scene.h @@ -72,9 +72,15 @@ #include "lastexpress/shared.h" #include "common/array.h" +#include "common/rect.h" namespace Common { class SeekableReadStream; +class String; +} + +namespace Graphics { +struct Surface; } namespace LastExpress { diff --git a/engines/lastexpress/data/sequence.cpp b/engines/lastexpress/data/sequence.cpp index 2308d70a2b..0e6df13995 100644 --- a/engines/lastexpress/data/sequence.cpp +++ b/engines/lastexpress/data/sequence.cpp @@ -30,6 +30,7 @@ #include "lastexpress/debug.h" #include "common/stream.h" +#include "common/textconsole.h" namespace LastExpress { diff --git a/engines/lastexpress/data/sequence.h b/engines/lastexpress/data/sequence.h index 7ad0a57254..cd16f26ab2 100644 --- a/engines/lastexpress/data/sequence.h +++ b/engines/lastexpress/data/sequence.h @@ -77,6 +77,8 @@ #include "lastexpress/shared.h" #include "common/array.h" +#include "common/rect.h" +#include "common/str.h" namespace Common { class SeekableReadStream; diff --git a/engines/lastexpress/data/snd.cpp b/engines/lastexpress/data/snd.cpp index 6389489abb..a50fa7be08 100644 --- a/engines/lastexpress/data/snd.cpp +++ b/engines/lastexpress/data/snd.cpp @@ -32,7 +32,10 @@ #include "audio/decoders/adpcm_intern.h" #include "audio/audiostream.h" +#include "common/debug.h" #include "common/memstream.h" +#include "common/system.h" +#include "common/textconsole.h" namespace LastExpress { diff --git a/engines/lastexpress/data/subtitle.cpp b/engines/lastexpress/data/subtitle.cpp index 953edd1d1a..2bc5d3c5ad 100644 --- a/engines/lastexpress/data/subtitle.cpp +++ b/engines/lastexpress/data/subtitle.cpp @@ -33,7 +33,9 @@ #include "lastexpress/debug.h" #include "common/debug.h" +#include "common/rect.h" #include "common/stream.h" +#include "common/textconsole.h" namespace LastExpress { diff --git a/engines/lastexpress/entities/entity.h b/engines/lastexpress/entities/entity.h index ccef312cd6..8c6cc2bafc 100644 --- a/engines/lastexpress/entities/entity.h +++ b/engines/lastexpress/entities/entity.h @@ -35,6 +35,7 @@ #include "common/array.h" #include "common/func.h" #include "common/serializer.h" +#include "common/textconsole.h" namespace LastExpress { diff --git a/engines/lastexpress/game/state.h b/engines/lastexpress/game/state.h index d97ebc1b55..4196bfe06a 100644 --- a/engines/lastexpress/game/state.h +++ b/engines/lastexpress/game/state.h @@ -28,8 +28,10 @@ #include "lastexpress/shared.h" +#include "common/rect.h" #include "common/serializer.h" #include "common/system.h" +#include "common/textconsole.h" namespace LastExpress { diff --git a/engines/lastexpress/graphics.cpp b/engines/lastexpress/graphics.cpp index e5a69d16ea..5c72fa76d8 100644 --- a/engines/lastexpress/graphics.cpp +++ b/engines/lastexpress/graphics.cpp @@ -25,7 +25,9 @@ #include "lastexpress/graphics.h" +#include "common/rect.h" #include "common/system.h" +#include "common/textconsole.h" namespace LastExpress { diff --git a/engines/lastexpress/resource.cpp b/engines/lastexpress/resource.cpp index 5a77b23602..dff686a503 100644 --- a/engines/lastexpress/resource.cpp +++ b/engines/lastexpress/resource.cpp @@ -34,6 +34,7 @@ #include "common/debug.h" #include "common/file.h" +#include "common/textconsole.h" namespace LastExpress { diff --git a/engines/lure/memory.cpp b/engines/lure/memory.cpp index f96b5015bc..d3d5067cce 100644 --- a/engines/lure/memory.cpp +++ b/engines/lure/memory.cpp @@ -25,6 +25,7 @@ #include "lure/memory.h" #include "common/file.h" +#include "common/textconsole.h" namespace Lure { diff --git a/engines/lure/res_struct.h b/engines/lure/res_struct.h index 6e2c11cb24..58ee3f4c02 100644 --- a/engines/lure/res_struct.h +++ b/engines/lure/res_struct.h @@ -27,9 +27,11 @@ #define LURE_RESSTRUCT_H #include "lure/luredefs.h" +#include "common/rect.h" #include "common/list.h" #include "common/file.h" #include "common/ptr.h" +#include "common/textconsole.h" namespace Lure { diff --git a/engines/lure/screen.cpp b/engines/lure/screen.cpp index b64ef6393b..e02f492ef2 100644 --- a/engines/lure/screen.cpp +++ b/engines/lure/screen.cpp @@ -30,6 +30,8 @@ #include "lure/decode.h" #include "lure/events.h" +#include "graphics/palette.h" + namespace Lure { static Screen *int_disk = NULL; diff --git a/engines/lure/sound.h b/engines/lure/sound.h index dd5538085c..7a894d814d 100644 --- a/engines/lure/sound.h +++ b/engines/lure/sound.h @@ -30,6 +30,7 @@ #include "lure/disk.h" #include "lure/memory.h" +#include "common/mutex.h" #include "common/singleton.h" #include "common/ptr.h" #include "audio/mididrv.h" diff --git a/engines/m4/actor.cpp b/engines/m4/actor.cpp index ce8574a134..c61c6fe7d8 100644 --- a/engines/m4/actor.cpp +++ b/engines/m4/actor.cpp @@ -25,6 +25,7 @@ #include "common/system.h" #include "common/array.h" +#include "common/textconsole.h" #include "m4/actor.h" #include "m4/m4_views.h" #include "m4/assets.h" diff --git a/engines/m4/animation.cpp b/engines/m4/animation.cpp index 26de121611..3fe050e604 100644 --- a/engines/m4/animation.cpp +++ b/engines/m4/animation.cpp @@ -23,6 +23,8 @@ * */ +#include "common/textconsole.h" + #include "m4/assets.h" #include "m4/animation.h" #include "m4/compression.h" diff --git a/engines/m4/compression.cpp b/engines/m4/compression.cpp index 9b1416945c..8fe4fbf1eb 100644 --- a/engines/m4/compression.cpp +++ b/engines/m4/compression.cpp @@ -27,6 +27,7 @@ #include "m4/m4.h" #include "common/memstream.h" +#include "common/textconsole.h" namespace M4 { diff --git a/engines/m4/console.cpp b/engines/m4/console.cpp index 88b4240901..cbcaa04669 100644 --- a/engines/m4/console.cpp +++ b/engines/m4/console.cpp @@ -23,6 +23,8 @@ * */ +#include "common/textconsole.h" + #include "m4/m4.h" #include "m4/console.h" #include "m4/dialogs.h" diff --git a/engines/m4/converse.cpp b/engines/m4/converse.cpp index f67291f0a6..46c4b35b79 100644 --- a/engines/m4/converse.cpp +++ b/engines/m4/converse.cpp @@ -26,6 +26,7 @@ #include "common/array.h" #include "common/hashmap.h" #include "common/substream.h" +#include "common/textconsole.h" #include "m4/converse.h" #include "m4/resource.h" diff --git a/engines/m4/dialogs.cpp b/engines/m4/dialogs.cpp index 7efbc523f8..0583d5f749 100644 --- a/engines/m4/dialogs.cpp +++ b/engines/m4/dialogs.cpp @@ -25,6 +25,7 @@ #include "m4/dialogs.h" #include "common/file.h" +#include "common/textconsole.h" namespace M4 { diff --git a/engines/m4/globals.cpp b/engines/m4/globals.cpp index d982ecad0e..3db9934cec 100644 --- a/engines/m4/globals.cpp +++ b/engines/m4/globals.cpp @@ -23,6 +23,8 @@ * */ +#include "common/textconsole.h" + #include "m4/m4.h" #include "m4/globals.h" #include "m4/graphics.h" diff --git a/engines/m4/graphics.cpp b/engines/m4/graphics.cpp index a3eca13e1e..a685b36a18 100644 --- a/engines/m4/graphics.cpp +++ b/engines/m4/graphics.cpp @@ -23,11 +23,12 @@ * */ -#include "common/file.h" -#include "common/endian.h" #include "common/system.h" #include "common/util.h" #include "common/ptr.h" +#include "common/textconsole.h" + +#include "graphics/palette.h" #include "m4/globals.h" #include "m4/graphics.h" diff --git a/engines/m4/gui.cpp b/engines/m4/gui.cpp index 6619b37707..56cf96b589 100644 --- a/engines/m4/gui.cpp +++ b/engines/m4/gui.cpp @@ -25,6 +25,7 @@ #include "common/events.h" #include "common/keyboard.h" +#include "common/textconsole.h" #include "m4/globals.h" #include "m4/events.h" diff --git a/engines/m4/m4.cpp b/engines/m4/m4.cpp index d9a1bf940f..1a484322fd 100644 --- a/engines/m4/m4.cpp +++ b/engines/m4/m4.cpp @@ -30,7 +30,6 @@ #include "m4/burger_data.h" #include "m4/m4.h" #include "m4/resource.h" -#include "m4/sprite.h" #include "m4/hotspot.h" #include "m4/font.h" #include "m4/rails.h" @@ -50,17 +49,15 @@ #include "m4/mads_anim.h" #include "m4/mads_menus.h" +#include "common/error.h" #include "common/file.h" #include "common/fs.h" -#include "common/events.h" #include "common/EventRecorder.h" -#include "common/endian.h" #include "common/system.h" #include "common/config-manager.h" #include "common/debug-channels.h" +#include "common/textconsole.h" #include "engines/util.h" -#include "graphics/surface.h" -#include "audio/mididrv.h" namespace M4 { diff --git a/engines/m4/m4_menus.cpp b/engines/m4/m4_menus.cpp index 118b09f50b..a20bb2660b 100644 --- a/engines/m4/m4_menus.cpp +++ b/engines/m4/m4_menus.cpp @@ -24,6 +24,7 @@ */ #include "common/algorithm.h" // for find() +#include "common/textconsole.h" #include "gui/dialog.h" #include "gui/message.h" diff --git a/engines/m4/m4_scene.cpp b/engines/m4/m4_scene.cpp index 0ace40bfc5..a0d8a503ab 100644 --- a/engines/m4/m4_scene.cpp +++ b/engines/m4/m4_scene.cpp @@ -24,6 +24,7 @@ */ #include "common/system.h" +#include "common/textconsole.h" #include "m4/m4_scene.h" #include "m4/dialogs.h" diff --git a/engines/m4/m4_views.cpp b/engines/m4/m4_views.cpp index f4345787df..83f23edd3d 100644 --- a/engines/m4/m4_views.cpp +++ b/engines/m4/m4_views.cpp @@ -23,6 +23,8 @@ * */ +#include "common/textconsole.h" + #include "m4/m4_views.h" #include "m4/events.h" #include "m4/font.h" diff --git a/engines/m4/mads_anim.cpp b/engines/m4/mads_anim.cpp index 571a6fa899..e7ca9cb14d 100644 --- a/engines/m4/mads_anim.cpp +++ b/engines/m4/mads_anim.cpp @@ -23,6 +23,8 @@ * */ +#include "common/textconsole.h" + #include "m4/mads_anim.h" #include "m4/m4.h" #include "m4/compression.h" diff --git a/engines/m4/mads_logic.cpp b/engines/m4/mads_logic.cpp index 878e86c573..98a0d06412 100644 --- a/engines/m4/mads_logic.cpp +++ b/engines/m4/mads_logic.cpp @@ -23,6 +23,8 @@ * */ +#include "common/textconsole.h" + #include "m4/m4.h" #include "m4/dialogs.h" #include "m4/mads_logic.h" diff --git a/engines/m4/mads_menus.cpp b/engines/m4/mads_menus.cpp index 4ca8154793..437e9d2a6b 100644 --- a/engines/m4/mads_menus.cpp +++ b/engines/m4/mads_menus.cpp @@ -23,6 +23,8 @@ * */ +#include "common/textconsole.h" + #include "m4/mads_menus.h" #include "m4/m4.h" diff --git a/engines/m4/mads_scene.cpp b/engines/m4/mads_scene.cpp index fd972cc6ea..7b82480ee2 100644 --- a/engines/m4/mads_scene.cpp +++ b/engines/m4/mads_scene.cpp @@ -24,6 +24,7 @@ */ #include "common/system.h" +#include "common/textconsole.h" #include "m4/mads_scene.h" #include "m4/dialogs.h" diff --git a/engines/m4/mads_views.cpp b/engines/m4/mads_views.cpp index b4385dbead..33c679c9bd 100644 --- a/engines/m4/mads_views.cpp +++ b/engines/m4/mads_views.cpp @@ -34,6 +34,7 @@ #include "m4/staticres.h" #include "common/algorithm.h" +#include "common/textconsole.h" namespace M4 { diff --git a/engines/m4/midi.cpp b/engines/m4/midi.cpp index e49dbfa2e7..24ac60c22e 100644 --- a/engines/m4/midi.cpp +++ b/engines/m4/midi.cpp @@ -31,6 +31,7 @@ #include "audio/midiparser.h" #include "common/config-manager.h" #include "common/memstream.h" +#include "common/textconsole.h" namespace M4 { diff --git a/engines/m4/resource.cpp b/engines/m4/resource.cpp index 192cab0c83..1946797f75 100644 --- a/engines/m4/resource.cpp +++ b/engines/m4/resource.cpp @@ -28,6 +28,7 @@ #include "m4/events.h" #include "common/substream.h" +#include "common/textconsole.h" namespace M4 { diff --git a/engines/m4/script.cpp b/engines/m4/script.cpp index 42d55c6dc7..cc60ec310d 100644 --- a/engines/m4/script.cpp +++ b/engines/m4/script.cpp @@ -24,6 +24,7 @@ */ #include "common/system.h" +#include "common/textconsole.h" #include "m4/m4.h" #include "m4/script.h" diff --git a/engines/m4/sound.cpp b/engines/m4/sound.cpp index 14c60c1c58..fb90cea5cc 100644 --- a/engines/m4/sound.cpp +++ b/engines/m4/sound.cpp @@ -28,6 +28,7 @@ #include "m4/compression.h" #include "common/stream.h" +#include "common/textconsole.h" #include "audio/audiostream.h" #include "audio/mixer.h" diff --git a/engines/m4/sprite.cpp b/engines/m4/sprite.cpp index 77528ec8a6..cef9917381 100644 --- a/engines/m4/sprite.cpp +++ b/engines/m4/sprite.cpp @@ -24,6 +24,7 @@ */ #include "common/rect.h" +#include "common/textconsole.h" #include "m4/globals.h" #include "m4/graphics.h" diff --git a/engines/m4/woodscript.cpp b/engines/m4/woodscript.cpp index 1b9d9859ef..dc24548f84 100644 --- a/engines/m4/woodscript.cpp +++ b/engines/m4/woodscript.cpp @@ -26,6 +26,7 @@ #include "m4/woodscript.h" #include "common/memstream.h" +#include "graphics/palette.h" namespace M4 { diff --git a/engines/made/database.cpp b/engines/made/database.cpp index 8d06aa0085..4e7a0467b1 100644 --- a/engines/made/database.cpp +++ b/engines/made/database.cpp @@ -27,6 +27,7 @@ #include "common/endian.h" #include "common/util.h" #include "common/savefile.h" +#include "common/textconsole.h" #include "made/database.h" diff --git a/engines/made/graphics.cpp b/engines/made/graphics.cpp index 7e8330d3f4..388ff60aa8 100644 --- a/engines/made/graphics.cpp +++ b/engines/made/graphics.cpp @@ -23,7 +23,9 @@ * */ +#include "common/debug.h" #include "common/endian.h" +#include "common/textconsole.h" #include "made/graphics.h" diff --git a/engines/made/made.cpp b/engines/made/made.cpp index c81fa3db25..c791b657e7 100644 --- a/engines/made/made.cpp +++ b/engines/made/made.cpp @@ -26,8 +26,6 @@ #include "common/events.h" #include "common/EventRecorder.h" #include "common/keyboard.h" -#include "common/file.h" -#include "common/savefile.h" #include "common/config-manager.h" #include "common/stream.h" diff --git a/engines/made/music.cpp b/engines/made/music.cpp index 2e06871e13..e5bbbc3b42 100644 --- a/engines/made/music.cpp +++ b/engines/made/music.cpp @@ -30,8 +30,6 @@ #include "audio/audiostream.h" #include "audio/mididrv.h" #include "audio/midiparser.h" -#include "common/config-manager.h" -#include "common/file.h" #include "made/music.h" diff --git a/engines/made/redreader.cpp b/engines/made/redreader.cpp index 3d36b69a28..2fcd7f43da 100644 --- a/engines/made/redreader.cpp +++ b/engines/made/redreader.cpp @@ -25,6 +25,7 @@ #include "made/redreader.h" #include "common/memstream.h" +#include "common/textconsole.h" namespace Made { diff --git a/engines/made/resource.cpp b/engines/made/resource.cpp index e556e4ab38..35a659aabb 100644 --- a/engines/made/resource.cpp +++ b/engines/made/resource.cpp @@ -23,6 +23,7 @@ * */ +#include "common/debug.h" #include "common/endian.h" #include "common/memstream.h" #include "audio/mixer.h" diff --git a/engines/made/resource.h b/engines/made/resource.h index ade6a23029..f1aeb7a87c 100644 --- a/engines/made/resource.h +++ b/engines/made/resource.h @@ -30,6 +30,7 @@ #include "common/file.h" #include "common/stream.h" #include "common/hashmap.h" +#include "common/textconsole.h" #include "graphics/surface.h" #include "audio/audiostream.h" diff --git a/engines/made/screen.cpp b/engines/made/screen.cpp index 2649e2bd37..a863906883 100644 --- a/engines/made/screen.cpp +++ b/engines/made/screen.cpp @@ -28,6 +28,8 @@ #include "made/resource.h" #include "made/database.h" +#include "graphics/palette.h" + namespace Made { Screen::Screen(MadeEngine *vm) : _vm(vm) { diff --git a/engines/made/script.h b/engines/made/script.h index 16c5ad604f..be719eba5f 100644 --- a/engines/made/script.h +++ b/engines/made/script.h @@ -29,6 +29,7 @@ #include "common/util.h" #include "common/file.h" #include "common/stream.h" +#include "common/textconsole.h" namespace Made { diff --git a/engines/made/scriptfuncs.cpp b/engines/made/scriptfuncs.cpp index 4f1937c057..c0a723438e 100644 --- a/engines/made/scriptfuncs.cpp +++ b/engines/made/scriptfuncs.cpp @@ -23,9 +23,7 @@ * */ -#include "common/endian.h" #include "common/util.h" -#include "common/events.h" #include "backends/audiocd/audiocd.h" #include "graphics/cursorman.h" diff --git a/engines/mohawk/bitmap.cpp b/engines/mohawk/bitmap.cpp index a6ec2cf85a..05284f8b2b 100644 --- a/engines/mohawk/bitmap.cpp +++ b/engines/mohawk/bitmap.cpp @@ -31,6 +31,7 @@ #include "common/memstream.h" #include "common/substream.h" #include "common/system.h" +#include "common/textconsole.h" namespace Mohawk { diff --git a/engines/mohawk/console.cpp b/engines/mohawk/console.cpp index ee67c9f23c..56d4a97554 100644 --- a/engines/mohawk/console.cpp +++ b/engines/mohawk/console.cpp @@ -29,6 +29,8 @@ #include "mohawk/sound.h" #include "mohawk/video.h" +#include "common/system.h" + #ifdef ENABLE_CSTIME #include "mohawk/cstime.h" #endif diff --git a/engines/mohawk/cstime.cpp b/engines/mohawk/cstime.cpp index 955e0e5af6..46faae08f5 100644 --- a/engines/mohawk/cstime.cpp +++ b/engines/mohawk/cstime.cpp @@ -30,15 +30,14 @@ #include "mohawk/cstime_view.h" #include "mohawk/resource.h" #include "mohawk/cursors.h" -#include "mohawk/sound.h" #include "mohawk/video.h" #include "common/config-manager.h" +#include "common/error.h" #include "common/events.h" #include "common/EventRecorder.h" #include "common/fs.h" - -#include "engines/util.h" +#include "common/textconsole.h" namespace Mohawk { diff --git a/engines/mohawk/cstime_cases.cpp b/engines/mohawk/cstime_cases.cpp index 408f1c9d9a..c4801f822c 100644 --- a/engines/mohawk/cstime_cases.cpp +++ b/engines/mohawk/cstime_cases.cpp @@ -26,6 +26,8 @@ #include "mohawk/cstime_cases.h" #include "mohawk/cstime_ui.h" +#include "common/textconsole.h" + namespace Mohawk { CSTimeCase1::CSTimeCase1(MohawkEngine_CSTime *vm) : CSTimeCase(vm, 1) { diff --git a/engines/mohawk/cstime_game.cpp b/engines/mohawk/cstime_game.cpp index 14e5d99e51..66dce1da92 100644 --- a/engines/mohawk/cstime_game.cpp +++ b/engines/mohawk/cstime_game.cpp @@ -29,6 +29,8 @@ #include "mohawk/resource.h" #include "mohawk/sound.h" #include "common/events.h" +#include "common/system.h" +#include "common/textconsole.h" namespace Mohawk { diff --git a/engines/mohawk/cstime_ui.cpp b/engines/mohawk/cstime_ui.cpp index 935b0321da..106f7ea319 100644 --- a/engines/mohawk/cstime_ui.cpp +++ b/engines/mohawk/cstime_ui.cpp @@ -29,6 +29,8 @@ #include "mohawk/resource.h" #include "common/algorithm.h" // find #include "common/events.h" +#include "common/system.h" +#include "common/textconsole.h" #include "graphics/fontman.h" namespace Mohawk { diff --git a/engines/mohawk/cstime_view.cpp b/engines/mohawk/cstime_view.cpp index 115b363b6e..12d641a9ff 100644 --- a/engines/mohawk/cstime_view.cpp +++ b/engines/mohawk/cstime_view.cpp @@ -30,6 +30,8 @@ #include "mohawk/cursors.h" #include "common/events.h" +#include "common/system.h" +#include "common/textconsole.h" namespace Mohawk { diff --git a/engines/mohawk/detection.cpp b/engines/mohawk/detection.cpp index 80f4c0f702..cd64cc9048 100644 --- a/engines/mohawk/detection.cpp +++ b/engines/mohawk/detection.cpp @@ -26,9 +26,8 @@ #include "base/plugins.h" #include "engines/advancedDetector.h" -#include "common/config-manager.h" -#include "common/file.h" #include "common/savefile.h" +#include "common/system.h" #include "mohawk/livingbooks.h" diff --git a/engines/mohawk/dialogs.cpp b/engines/mohawk/dialogs.cpp index c5a0c7e86d..4c7e52f02f 100644 --- a/engines/mohawk/dialogs.cpp +++ b/engines/mohawk/dialogs.cpp @@ -27,7 +27,9 @@ #include "mohawk/dialogs.h" #include "gui/gui-manager.h" -#include "common/savefile.h" +#include "gui/ThemeEngine.h" +#include "gui/widget.h" +#include "common/system.h" #include "common/translation.h" #ifdef ENABLE_MYST diff --git a/engines/mohawk/graphics.cpp b/engines/mohawk/graphics.cpp index 81d2b6f019..54dc85b8ff 100644 --- a/engines/mohawk/graphics.cpp +++ b/engines/mohawk/graphics.cpp @@ -28,7 +28,9 @@ #include "mohawk/livingbooks.h" #include "common/substream.h" +#include "common/system.h" #include "engines/util.h" +#include "graphics/palette.h" #include "graphics/primitives.h" #include "gui/message.h" diff --git a/engines/mohawk/installer_archive.cpp b/engines/mohawk/installer_archive.cpp index 4ea742dff6..5079375896 100644 --- a/engines/mohawk/installer_archive.cpp +++ b/engines/mohawk/installer_archive.cpp @@ -27,8 +27,6 @@ #include "common/dcl.h" #include "common/debug.h" -#include "common/substream.h" -#include "common/util.h" namespace Mohawk { diff --git a/engines/mohawk/installer_archive.h b/engines/mohawk/installer_archive.h index 565b363be3..d33fbe5bcd 100644 --- a/engines/mohawk/installer_archive.h +++ b/engines/mohawk/installer_archive.h @@ -27,6 +27,8 @@ #include "common/scummsys.h" #include "common/endian.h" #include "common/file.h" +#include "common/hash-str.h" +#include "common/hashmap.h" #include "common/str.h" #ifndef MOHAWK_INSTALLER_ARCHIVE_H diff --git a/engines/mohawk/livingbooks.cpp b/engines/mohawk/livingbooks.cpp index 22ea8d07a1..2475965812 100644 --- a/engines/mohawk/livingbooks.cpp +++ b/engines/mohawk/livingbooks.cpp @@ -26,13 +26,17 @@ #include "mohawk/livingbooks.h" #include "mohawk/resource.h" #include "mohawk/cursors.h" -#include "mohawk/sound.h" #include "mohawk/video.h" +#include "common/config-manager.h" +#include "common/error.h" #include "common/events.h" #include "common/EventRecorder.h" #include "common/fs.h" #include "common/archive.h" +#include "common/textconsole.h" + +#include "graphics/palette.h" #include "engines/util.h" diff --git a/engines/mohawk/livingbooks_code.cpp b/engines/mohawk/livingbooks_code.cpp index 84f69af2ac..4237c712d9 100644 --- a/engines/mohawk/livingbooks_code.cpp +++ b/engines/mohawk/livingbooks_code.cpp @@ -26,6 +26,9 @@ #include "mohawk/livingbooks.h" #include "mohawk/resource.h" +#include "common/system.h" +#include "common/textconsole.h" + namespace Mohawk { bool LBValue::operator==(const LBValue &x) const { diff --git a/engines/mohawk/mohawk.cpp b/engines/mohawk/mohawk.cpp index 015cbffb26..f63645f1ac 100644 --- a/engines/mohawk/mohawk.cpp +++ b/engines/mohawk/mohawk.cpp @@ -24,13 +24,9 @@ */ #include "common/scummsys.h" -#include "common/config-manager.h" -#include "common/file.h" -#include "common/events.h" -#include "common/keyboard.h" - -#include "base/plugins.h" -#include "base/version.h" +#include "common/error.h" +#include "common/system.h" +#include "common/textconsole.h" #include "mohawk/mohawk.h" #include "mohawk/cursors.h" diff --git a/engines/mohawk/myst.cpp b/engines/mohawk/myst.cpp index 1aba820fed..655a38b578 100644 --- a/engines/mohawk/myst.cpp +++ b/engines/mohawk/myst.cpp @@ -25,7 +25,9 @@ #include "common/config-manager.h" #include "common/debug-channels.h" +#include "common/system.h" #include "common/translation.h" +#include "common/textconsole.h" #include "mohawk/cursors.h" #include "mohawk/graphics.h" diff --git a/engines/mohawk/myst_areas.cpp b/engines/mohawk/myst_areas.cpp index 21f6627f60..dc00bff923 100644 --- a/engines/mohawk/myst_areas.cpp +++ b/engines/mohawk/myst_areas.cpp @@ -29,6 +29,10 @@ #include "mohawk/sound.h" #include "mohawk/video.h" +#include "common/events.h" +#include "common/system.h" +#include "common/textconsole.h" + namespace Mohawk { MystResource::MystResource(MohawkEngine_Myst *vm, Common::SeekableReadStream *rlstStream, MystResource *parent) { diff --git a/engines/mohawk/myst_scripts.cpp b/engines/mohawk/myst_scripts.cpp index 17a2c66091..71c408ed37 100644 --- a/engines/mohawk/myst_scripts.cpp +++ b/engines/mohawk/myst_scripts.cpp @@ -31,6 +31,8 @@ #include "mohawk/sound.h" #include "mohawk/video.h" +#include "common/system.h" +#include "common/textconsole.h" #include "gui/message.h" namespace Mohawk { diff --git a/engines/mohawk/myst_stacks/channelwood.cpp b/engines/mohawk/myst_stacks/channelwood.cpp index 26267cfbda..cba2583a50 100644 --- a/engines/mohawk/myst_stacks/channelwood.cpp +++ b/engines/mohawk/myst_stacks/channelwood.cpp @@ -32,7 +32,9 @@ #include "mohawk/video.h" #include "mohawk/myst_stacks/channelwood.h" -#include "gui/message.h" +#include "common/events.h" +#include "common/system.h" +#include "common/textconsole.h" namespace Mohawk { namespace MystStacks { diff --git a/engines/mohawk/myst_stacks/credits.cpp b/engines/mohawk/myst_stacks/credits.cpp index 61772eda4d..bb8397fd09 100644 --- a/engines/mohawk/myst_stacks/credits.cpp +++ b/engines/mohawk/myst_stacks/credits.cpp @@ -30,6 +30,7 @@ #include "mohawk/video.h" #include "mohawk/myst_stacks/credits.h" +#include "common/system.h" #include "gui/message.h" namespace Mohawk { diff --git a/engines/mohawk/myst_stacks/dni.cpp b/engines/mohawk/myst_stacks/dni.cpp index ffbf9c991f..e2a11eb94f 100644 --- a/engines/mohawk/myst_stacks/dni.cpp +++ b/engines/mohawk/myst_stacks/dni.cpp @@ -31,6 +31,8 @@ #include "mohawk/video.h" #include "mohawk/myst_stacks/dni.h" +#include "common/system.h" + namespace Mohawk { namespace MystStacks { diff --git a/engines/mohawk/myst_stacks/mechanical.cpp b/engines/mohawk/myst_stacks/mechanical.cpp index 3dab2f7939..c5c11026f5 100644 --- a/engines/mohawk/myst_stacks/mechanical.cpp +++ b/engines/mohawk/myst_stacks/mechanical.cpp @@ -32,7 +32,8 @@ #include "mohawk/video.h" #include "mohawk/myst_stacks/mechanical.h" -#include "gui/message.h" +#include "common/events.h" +#include "common/system.h" namespace Mohawk { namespace MystStacks { diff --git a/engines/mohawk/myst_stacks/myst.cpp b/engines/mohawk/myst_stacks/myst.cpp index 5d070322ca..2b8ef94442 100644 --- a/engines/mohawk/myst_stacks/myst.cpp +++ b/engines/mohawk/myst_stacks/myst.cpp @@ -33,6 +33,8 @@ #include "mohawk/myst_stacks/myst.h" #include "common/events.h" +#include "common/system.h" +#include "common/textconsole.h" #include "gui/message.h" diff --git a/engines/mohawk/myst_stacks/preview.cpp b/engines/mohawk/myst_stacks/preview.cpp index dc491c7573..fddf6290fb 100644 --- a/engines/mohawk/myst_stacks/preview.cpp +++ b/engines/mohawk/myst_stacks/preview.cpp @@ -30,6 +30,7 @@ #include "mohawk/video.h" #include "mohawk/myst_stacks/preview.h" +#include "common/system.h" #include "gui/message.h" namespace Mohawk { diff --git a/engines/mohawk/myst_stacks/selenitic.cpp b/engines/mohawk/myst_stacks/selenitic.cpp index a84cd0632d..c670cb6a48 100644 --- a/engines/mohawk/myst_stacks/selenitic.cpp +++ b/engines/mohawk/myst_stacks/selenitic.cpp @@ -32,6 +32,8 @@ #include "mohawk/video.h" #include "mohawk/myst_stacks/selenitic.h" +#include "common/system.h" +#include "common/textconsole.h" #include "gui/message.h" namespace Mohawk { diff --git a/engines/mohawk/myst_stacks/slides.cpp b/engines/mohawk/myst_stacks/slides.cpp index e664081c96..4057edd9c9 100644 --- a/engines/mohawk/myst_stacks/slides.cpp +++ b/engines/mohawk/myst_stacks/slides.cpp @@ -30,6 +30,7 @@ #include "mohawk/video.h" #include "mohawk/myst_stacks/slides.h" +#include "common/system.h" #include "gui/message.h" namespace Mohawk { diff --git a/engines/mohawk/myst_stacks/stoneship.cpp b/engines/mohawk/myst_stacks/stoneship.cpp index b5b403dad8..07701c273e 100644 --- a/engines/mohawk/myst_stacks/stoneship.cpp +++ b/engines/mohawk/myst_stacks/stoneship.cpp @@ -32,7 +32,9 @@ #include "mohawk/video.h" #include "mohawk/myst_stacks/stoneship.h" -#include "gui/message.h" +#include "common/events.h" +#include "common/system.h" +#include "common/textconsole.h" namespace Mohawk { namespace MystStacks { diff --git a/engines/mohawk/myst_state.cpp b/engines/mohawk/myst_state.cpp index 968bb422be..de71dcf382 100644 --- a/engines/mohawk/myst_state.cpp +++ b/engines/mohawk/myst_state.cpp @@ -27,7 +27,9 @@ #include "mohawk/myst.h" #include "mohawk/myst_state.h" +#include "common/debug.h" #include "common/serializer.h" +#include "common/textconsole.h" #include "common/util.h" namespace Mohawk { diff --git a/engines/mohawk/resource.cpp b/engines/mohawk/resource.cpp index de1513b237..62250b75f2 100644 --- a/engines/mohawk/resource.cpp +++ b/engines/mohawk/resource.cpp @@ -28,6 +28,7 @@ #include "common/debug.h" #include "common/substream.h" #include "common/util.h" +#include "common/textconsole.h" namespace Mohawk { diff --git a/engines/mohawk/riven.h b/engines/mohawk/riven.h index 88927884a2..3aba5643db 100644 --- a/engines/mohawk/riven.h +++ b/engines/mohawk/riven.h @@ -35,6 +35,7 @@ #include "common/hashmap.h" #include "common/hash-str.h" #include "common/random.h" +#include "common/rect.h" namespace Mohawk { diff --git a/engines/mohawk/riven_external.cpp b/engines/mohawk/riven_external.cpp index 7c453dec48..dc0d66f19b 100644 --- a/engines/mohawk/riven_external.cpp +++ b/engines/mohawk/riven_external.cpp @@ -32,6 +32,7 @@ #include "gui/message.h" #include "common/events.h" +#include "common/system.h" namespace Mohawk { diff --git a/engines/mohawk/riven_scripts.cpp b/engines/mohawk/riven_scripts.cpp index 35f38c4069..b8f86f993a 100644 --- a/engines/mohawk/riven_scripts.cpp +++ b/engines/mohawk/riven_scripts.cpp @@ -33,6 +33,7 @@ #include "common/memstream.h" #include "common/stream.h" +#include "common/system.h" namespace Mohawk { diff --git a/engines/mohawk/riven_scripts.h b/engines/mohawk/riven_scripts.h index 46cd965f40..2ac805c366 100644 --- a/engines/mohawk/riven_scripts.h +++ b/engines/mohawk/riven_scripts.h @@ -28,6 +28,7 @@ #include "common/str-array.h" #include "common/ptr.h" +#include "common/textconsole.h" class MohawkEngine_Riven; diff --git a/engines/mohawk/sound.cpp b/engines/mohawk/sound.cpp index 9759f14699..fba87808d2 100644 --- a/engines/mohawk/sound.cpp +++ b/engines/mohawk/sound.cpp @@ -25,7 +25,10 @@ #include "mohawk/sound.h" +#include "common/debug.h" +#include "common/system.h" #include "common/util.h" +#include "common/textconsole.h" #include "audio/musicplugin.h" #include "audio/audiostream.h" diff --git a/engines/mohawk/video.cpp b/engines/mohawk/video.cpp index f481b5ceb2..36b94558a7 100644 --- a/engines/mohawk/video.cpp +++ b/engines/mohawk/video.cpp @@ -27,9 +27,16 @@ #include "mohawk/resource.h" #include "mohawk/video.h" +#include "common/debug.h" #include "common/events.h" +#include "common/textconsole.h" +#include "common/system.h" + +#include "graphics/surface.h" + #include "video/qt_decoder.h" + namespace Mohawk { void VideoEntry::clear() { diff --git a/engines/mohawk/view.cpp b/engines/mohawk/view.cpp index 837d386b58..e5a44122ea 100644 --- a/engines/mohawk/view.cpp +++ b/engines/mohawk/view.cpp @@ -28,6 +28,8 @@ #include "mohawk/graphics.h" #include "common/stream.h" #include "common/system.h" +#include "common/textconsole.h" +#include "graphics/palette.h" namespace Mohawk { diff --git a/engines/parallaction/callables_br.cpp b/engines/parallaction/callables_br.cpp index 21703dc1dd..0bc6f6762c 100644 --- a/engines/parallaction/callables_br.cpp +++ b/engines/parallaction/callables_br.cpp @@ -25,6 +25,8 @@ #include "parallaction/parallaction.h" +#include "common/textconsole.h" + namespace Parallaction { void Parallaction_br::_c_null(void*) { diff --git a/engines/parallaction/detection.cpp b/engines/parallaction/detection.cpp index f67a77aa21..8e3c2cbeb8 100644 --- a/engines/parallaction/detection.cpp +++ b/engines/parallaction/detection.cpp @@ -28,6 +28,7 @@ #include "common/config-manager.h" #include "engines/advancedDetector.h" #include "common/system.h" +#include "common/textconsole.h" #include "parallaction/parallaction.h" diff --git a/engines/parallaction/dialogue.cpp b/engines/parallaction/dialogue.cpp index e3d02bac62..944d9f4b55 100644 --- a/engines/parallaction/dialogue.cpp +++ b/engines/parallaction/dialogue.cpp @@ -25,6 +25,7 @@ #include "common/events.h" #include "common/debug-channels.h" +#include "common/textconsole.h" #include "parallaction/exec.h" #include "parallaction/input.h" #include "parallaction/parallaction.h" diff --git a/engines/parallaction/disk.cpp b/engines/parallaction/disk.cpp index 6928c1eefc..a577b16d08 100644 --- a/engines/parallaction/disk.cpp +++ b/engines/parallaction/disk.cpp @@ -23,6 +23,9 @@ * */ +#include "common/iff_container.h" +#include "common/textconsole.h" + #include "parallaction/disk.h" #include "parallaction/graphics.h" diff --git a/engines/parallaction/disk.h b/engines/parallaction/disk.h index 69d3215d15..9af189af68 100644 --- a/engines/parallaction/disk.h +++ b/engines/parallaction/disk.h @@ -29,14 +29,20 @@ #define PATH_LEN 200 #include "common/archive.h" +#include "common/str.h" -#include "graphics/surface.h" #include "graphics/iff.h" namespace Common { class FSDirectory; +class ReadStream; +class SeekableReadStream; +struct IFFChunk; } +namespace Graphics { +struct Surface; +} namespace Parallaction { diff --git a/engines/parallaction/disk_br.cpp b/engines/parallaction/disk_br.cpp index 34b04cd00f..e0342f74f7 100644 --- a/engines/parallaction/disk_br.cpp +++ b/engines/parallaction/disk_br.cpp @@ -27,6 +27,7 @@ #include "common/config-manager.h" #include "common/fs.h" +#include "common/textconsole.h" #include "parallaction/parallaction.h" #include "parallaction/parser.h" diff --git a/engines/parallaction/disk_ns.cpp b/engines/parallaction/disk_ns.cpp index 133b7bef6c..7c14a31535 100644 --- a/engines/parallaction/disk_ns.cpp +++ b/engines/parallaction/disk_ns.cpp @@ -27,6 +27,7 @@ #include "common/fs.h" #include "common/memstream.h" #include "common/substream.h" +#include "common/textconsole.h" #include "parallaction/parser.h" #include "parallaction/parallaction.h" diff --git a/engines/parallaction/exec_br.cpp b/engines/parallaction/exec_br.cpp index 99aa27b30f..c879745f65 100644 --- a/engines/parallaction/exec_br.cpp +++ b/engines/parallaction/exec_br.cpp @@ -27,6 +27,8 @@ #include "parallaction/input.h" #include "parallaction/parallaction.h" +#include "common/textconsole.h" + namespace Parallaction { #define INST_ON 1 diff --git a/engines/parallaction/exec_ns.cpp b/engines/parallaction/exec_ns.cpp index c8a5ee1548..ee357576d2 100644 --- a/engines/parallaction/exec_ns.cpp +++ b/engines/parallaction/exec_ns.cpp @@ -28,6 +28,7 @@ #include "parallaction/parallaction.h" #include "parallaction/sound.h" +#include "common/textconsole.h" namespace Parallaction { diff --git a/engines/parallaction/font.cpp b/engines/parallaction/font.cpp index 18f469f0a2..a459e6a600 100644 --- a/engines/parallaction/font.cpp +++ b/engines/parallaction/font.cpp @@ -25,6 +25,7 @@ #include "common/endian.h" #include "common/memstream.h" +#include "common/textconsole.h" #include "parallaction/parallaction.h" diff --git a/engines/parallaction/gfxbase.cpp b/engines/parallaction/gfxbase.cpp index 6c39b2e696..ca99624ecd 100644 --- a/engines/parallaction/gfxbase.cpp +++ b/engines/parallaction/gfxbase.cpp @@ -28,6 +28,7 @@ #include "disk.h" #include "common/algorithm.h" +#include "common/textconsole.h" #include "parallaction/parallaction.h" namespace Parallaction { diff --git a/engines/parallaction/graphics.cpp b/engines/parallaction/graphics.cpp index 35441d7e3e..c9504f1898 100644 --- a/engines/parallaction/graphics.cpp +++ b/engines/parallaction/graphics.cpp @@ -26,6 +26,8 @@ #include "common/system.h" #include "common/file.h" +#include "common/textconsole.h" +#include "graphics/palette.h" #include "graphics/primitives.h" #include "engines/util.h" diff --git a/engines/parallaction/gui.cpp b/engines/parallaction/gui.cpp index c4a36e5362..db70ebb432 100644 --- a/engines/parallaction/gui.cpp +++ b/engines/parallaction/gui.cpp @@ -23,6 +23,8 @@ * */ +#include "common/textconsole.h" + #include "parallaction/gui.h" namespace Parallaction { diff --git a/engines/parallaction/gui_br.cpp b/engines/parallaction/gui_br.cpp index c80a9940a2..cfc7b12453 100644 --- a/engines/parallaction/gui_br.cpp +++ b/engines/parallaction/gui_br.cpp @@ -24,6 +24,7 @@ */ #include "common/system.h" +#include "common/textconsole.h" #include "parallaction/gui.h" #include "parallaction/input.h" diff --git a/engines/parallaction/gui_ns.cpp b/engines/parallaction/gui_ns.cpp index 51d3ba5799..eb94b076f1 100644 --- a/engines/parallaction/gui_ns.cpp +++ b/engines/parallaction/gui_ns.cpp @@ -25,6 +25,7 @@ #include "common/system.h" #include "common/hashmap.h" +#include "common/textconsole.h" #include "parallaction/gui.h" #include "parallaction/input.h" diff --git a/engines/parallaction/input.cpp b/engines/parallaction/input.cpp index e508668d80..95ea547b87 100644 --- a/engines/parallaction/input.cpp +++ b/engines/parallaction/input.cpp @@ -25,6 +25,7 @@ #include "common/events.h" #include "common/system.h" +#include "common/textconsole.h" #include "graphics/cursorman.h" #include "parallaction/exec.h" diff --git a/engines/parallaction/inventory.cpp b/engines/parallaction/inventory.cpp index 5ead55bbef..76c4e2ce36 100644 --- a/engines/parallaction/inventory.cpp +++ b/engines/parallaction/inventory.cpp @@ -26,7 +26,7 @@ #include "parallaction/input.h" #include "parallaction/parallaction.h" - +#include "common/textconsole.h" namespace Parallaction { diff --git a/engines/parallaction/objects.cpp b/engines/parallaction/objects.cpp index c345b92ffb..e1306dc956 100644 --- a/engines/parallaction/objects.cpp +++ b/engines/parallaction/objects.cpp @@ -23,6 +23,8 @@ * */ +#include "common/textconsole.h" + #include "parallaction/parallaction.h" #include "parallaction/objects.h" #include "parallaction/parser.h" diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp index 3055439e47..516d465671 100644 --- a/engines/parallaction/parallaction.cpp +++ b/engines/parallaction/parallaction.cpp @@ -23,13 +23,10 @@ * */ -#include "common/config-manager.h" #include "common/debug-channels.h" -#include "common/events.h" #include "common/EventRecorder.h" -#include "common/file.h" -#include "common/util.h" #include "common/system.h" +#include "common/textconsole.h" #include "parallaction/exec.h" #include "parallaction/input.h" diff --git a/engines/parallaction/parallaction_br.cpp b/engines/parallaction/parallaction_br.cpp index 619a4f7559..ca344792cf 100644 --- a/engines/parallaction/parallaction_br.cpp +++ b/engines/parallaction/parallaction_br.cpp @@ -25,6 +25,7 @@ #include "common/system.h" #include "common/util.h" +#include "common/textconsole.h" #include "parallaction/parallaction.h" #include "parallaction/exec.h" diff --git a/engines/parallaction/parallaction_ns.cpp b/engines/parallaction/parallaction_ns.cpp index ffac22e118..ffc0412b1d 100644 --- a/engines/parallaction/parallaction_ns.cpp +++ b/engines/parallaction/parallaction_ns.cpp @@ -25,6 +25,7 @@ #include "common/system.h" #include "common/config-manager.h" +#include "common/textconsole.h" #include "parallaction/parallaction.h" #include "parallaction/exec.h" diff --git a/engines/parallaction/parser.cpp b/engines/parallaction/parser.cpp index c964b74512..a7b926e485 100644 --- a/engines/parallaction/parser.cpp +++ b/engines/parallaction/parser.cpp @@ -23,6 +23,8 @@ * */ +#include "common/textconsole.h" + #include "parallaction/parallaction.h" #include "parallaction/parser.h" diff --git a/engines/parallaction/parser_br.cpp b/engines/parallaction/parser_br.cpp index 9748be0526..f8818def9a 100644 --- a/engines/parallaction/parser_br.cpp +++ b/engines/parallaction/parser_br.cpp @@ -23,6 +23,7 @@ * */ +#include "common/textconsole.h" #include "parallaction/parallaction.h" #include "parallaction/parser.h" diff --git a/engines/parallaction/parser_ns.cpp b/engines/parallaction/parser_ns.cpp index 5053a3d7a5..6c9afe3d85 100644 --- a/engines/parallaction/parser_ns.cpp +++ b/engines/parallaction/parser_ns.cpp @@ -23,6 +23,8 @@ * */ +#include "common/textconsole.h" + #include "parallaction/parallaction.h" #include "parallaction/parser.h" #include "parallaction/sound.h" diff --git a/engines/parallaction/saveload.cpp b/engines/parallaction/saveload.cpp index 50a777f7b8..4c77aa3e02 100644 --- a/engines/parallaction/saveload.cpp +++ b/engines/parallaction/saveload.cpp @@ -25,6 +25,7 @@ #include "common/savefile.h" #include "common/config-manager.h" +#include "common/textconsole.h" #include "gui/dialog.h" #include "gui/saveload.h" diff --git a/engines/parallaction/sound_br.cpp b/engines/parallaction/sound_br.cpp index ee53f9641e..abfaa4bf5d 100644 --- a/engines/parallaction/sound_br.cpp +++ b/engines/parallaction/sound_br.cpp @@ -24,6 +24,7 @@ */ #include "common/stream.h" +#include "common/textconsole.h" #include "common/util.h" #include "audio/mixer.h" diff --git a/engines/parallaction/sound_ns.cpp b/engines/parallaction/sound_ns.cpp index ba81314da6..5123695ebc 100644 --- a/engines/parallaction/sound_ns.cpp +++ b/engines/parallaction/sound_ns.cpp @@ -24,8 +24,8 @@ */ #include "common/file.h" - #include "common/stream.h" +#include "common/textconsole.h" #include "audio/mixer.h" #include "audio/midiparser.h" diff --git a/engines/queen/command.cpp b/engines/queen/command.cpp index 356856e940..87b24735a8 100644 --- a/engines/queen/command.cpp +++ b/engines/queen/command.cpp @@ -24,8 +24,6 @@ */ -#include "common/events.h" -#include "common/system.h" #include "queen/command.h" #include "queen/display.h" diff --git a/engines/queen/cutaway.cpp b/engines/queen/cutaway.cpp index 11a8704d60..6fb48c7fb0 100644 --- a/engines/queen/cutaway.cpp +++ b/engines/queen/cutaway.cpp @@ -23,6 +23,7 @@ * */ +#include "common/textconsole.h" #include "queen/cutaway.h" diff --git a/engines/queen/display.cpp b/engines/queen/display.cpp index b130b27a89..c78fd8ebcc 100644 --- a/engines/queen/display.cpp +++ b/engines/queen/display.cpp @@ -29,6 +29,7 @@ #include "common/events.h" #include "graphics/cursorman.h" +#include "graphics/palette.h" #include "queen/display.h" #include "queen/input.h" diff --git a/engines/queen/graphics.cpp b/engines/queen/graphics.cpp index 17e36b1d90..c86f679765 100644 --- a/engines/queen/graphics.cpp +++ b/engines/queen/graphics.cpp @@ -34,6 +34,9 @@ #include "queen/resource.h" #include "queen/sound.h" +#include "common/debug.h" +#include "common/textconsole.h" + namespace Queen { void BobSlot::curPos(int16 xx, int16 yy) { diff --git a/engines/queen/input.cpp b/engines/queen/input.cpp index 9518388b26..eac855a0cd 100644 --- a/engines/queen/input.cpp +++ b/engines/queen/input.cpp @@ -26,6 +26,7 @@ #include "common/events.h" #include "common/system.h" +#include "common/textconsole.h" #include "queen/queen.h" #include "queen/input.h" diff --git a/engines/queen/journal.cpp b/engines/queen/journal.cpp index aff24be22e..4200168f07 100644 --- a/engines/queen/journal.cpp +++ b/engines/queen/journal.cpp @@ -24,6 +24,7 @@ */ +#include "common/error.h" #include "common/events.h" #include "common/system.h" #include "queen/journal.h" diff --git a/engines/queen/logic.cpp b/engines/queen/logic.cpp index de254300b6..e99a739726 100644 --- a/engines/queen/logic.cpp +++ b/engines/queen/logic.cpp @@ -25,8 +25,7 @@ #include "common/config-manager.h" -#include "common/events.h" -#include "common/system.h" +#include "common/textconsole.h" #include "queen/logic.h" diff --git a/engines/queen/midiadlib.cpp b/engines/queen/midiadlib.cpp index b03c90f653..af52f7ed2b 100644 --- a/engines/queen/midiadlib.cpp +++ b/engines/queen/midiadlib.cpp @@ -24,6 +24,7 @@ */ #include "common/endian.h" +#include "common/textconsole.h" #include "audio/fmopl.h" #include "audio/softsynth/emumidi.h" diff --git a/engines/queen/queen.cpp b/engines/queen/queen.cpp index 519f028cda..0dde5c7b42 100644 --- a/engines/queen/queen.cpp +++ b/engines/queen/queen.cpp @@ -32,6 +32,7 @@ #include "common/system.h" #include "common/events.h" #include "common/EventRecorder.h" +#include "common/textconsole.h" #include "engines/util.h" diff --git a/engines/queen/resource.cpp b/engines/queen/resource.cpp index e8519ee68b..62b13e290c 100644 --- a/engines/queen/resource.cpp +++ b/engines/queen/resource.cpp @@ -27,6 +27,7 @@ #include "common/endian.h" #include "common/config-manager.h" #include "common/substream.h" +#include "common/textconsole.h" #include "queen/resource.h" namespace Queen { diff --git a/engines/queen/sound.cpp b/engines/queen/sound.cpp index a34af99ec3..afb77f3969 100644 --- a/engines/queen/sound.cpp +++ b/engines/queen/sound.cpp @@ -27,6 +27,7 @@ #include "common/config-manager.h" #include "common/endian.h" #include "common/memstream.h" +#include "common/textconsole.h" #include "queen/sound.h" #include "queen/input.h" diff --git a/engines/queen/talk.cpp b/engines/queen/talk.cpp index 106b0d6123..18c712b799 100644 --- a/engines/queen/talk.cpp +++ b/engines/queen/talk.cpp @@ -24,9 +24,8 @@ */ -#include "common/events.h" -#include "common/system.h" #include "common/rect.h" +#include "common/textconsole.h" #include "queen/talk.h" diff --git a/engines/queen/walk.cpp b/engines/queen/walk.cpp index 7765828bd7..a778ea5b05 100644 --- a/engines/queen/walk.cpp +++ b/engines/queen/walk.cpp @@ -23,6 +23,7 @@ * */ +#include "common/textconsole.h" #include "queen/walk.h" diff --git a/engines/saga/gfx.cpp b/engines/saga/gfx.cpp index 5fc2082178..0a438e45d3 100644 --- a/engines/saga/gfx.cpp +++ b/engines/saga/gfx.cpp @@ -34,6 +34,7 @@ #include "common/system.h" #include "graphics/cursorman.h" +#include "graphics/palette.h" #include "engines/util.h" namespace Saga { diff --git a/engines/saga/gfx.h b/engines/saga/gfx.h index 33fac10c63..56d9104371 100644 --- a/engines/saga/gfx.h +++ b/engines/saga/gfx.h @@ -28,6 +28,7 @@ #ifndef SAGA_GFX_H #define SAGA_GFX_H +#include "common/rect.h" #include "graphics/surface.h" namespace Saga { diff --git a/engines/saga/introproc_saga2.cpp b/engines/saga/introproc_saga2.cpp index 5ae80b14c9..7f04474c61 100644 --- a/engines/saga/introproc_saga2.cpp +++ b/engines/saga/introproc_saga2.cpp @@ -31,7 +31,10 @@ #include "saga/scene.h" #include "saga/gfx.h" -#include "audio/mixer.h" +#include "common/events.h" +#include "common/keyboard.h" +#include "common/system.h" +#include "common/textconsole.h" #include "graphics/surface.h" #include "video/smk_decoder.h" diff --git a/engines/saga/saga.h b/engines/saga/saga.h index 52c4b824e7..4df44a2e18 100644 --- a/engines/saga/saga.h +++ b/engines/saga/saga.h @@ -31,6 +31,7 @@ #include "common/array.h" #include "common/random.h" #include "common/memstream.h" +#include "common/textconsole.h" #include "audio/mididrv.h" #include "saga/gfx.h" diff --git a/engines/saga/saveload.cpp b/engines/saga/saveload.cpp index 6a6992fb5f..27300377e9 100644 --- a/engines/saga/saveload.cpp +++ b/engines/saga/saveload.cpp @@ -23,10 +23,8 @@ * */ -#include "common/config-manager.h" #include "common/savefile.h" #include "common/system.h" -#include "common/file.h" #include "graphics/thumbnail.h" #include "saga/saga.h" diff --git a/engines/saga/shorten.cpp b/engines/saga/shorten.cpp index 685cb26aa7..8f0baa9d53 100644 --- a/engines/saga/shorten.cpp +++ b/engines/saga/shorten.cpp @@ -24,6 +24,7 @@ */ #include "common/scummsys.h" +#include "common/textconsole.h" #include "saga/shorten.h" @@ -34,10 +35,8 @@ // FIXME: This doesn't work yet correctly -#include "common/endian.h" #include "common/util.h" -#include "audio/mixer.h" #include "audio/decoders/raw.h" namespace Saga { diff --git a/engines/savestate.cpp b/engines/savestate.cpp index 368f59ef51..bed19ba3e5 100644 --- a/engines/savestate.cpp +++ b/engines/savestate.cpp @@ -25,6 +25,7 @@ #include "engines/savestate.h" #include "graphics/surface.h" +#include "common/textconsole.h" void SaveStateDescriptor::setThumbnail(Graphics::Surface *t) { if (_thumbnail.get() == t) diff --git a/engines/sci/decompressor.cpp b/engines/sci/decompressor.cpp index 73d4ed4198..c122fceeb0 100644 --- a/engines/sci/decompressor.cpp +++ b/engines/sci/decompressor.cpp @@ -28,9 +28,8 @@ #include "common/dcl.h" #include "common/util.h" #include "common/endian.h" -#include "common/debug.h" -#include "common/debug-channels.h" #include "common/stream.h" +#include "common/textconsole.h" #include "sci/decompressor.h" #include "sci/sci.h" diff --git a/engines/sci/engine/kfile.cpp b/engines/sci/engine/kfile.cpp index 82522a6e77..0e2f64257a 100644 --- a/engines/sci/engine/kfile.cpp +++ b/engines/sci/engine/kfile.cpp @@ -28,6 +28,7 @@ #include "common/file.h" #include "common/str.h" #include "common/savefile.h" +#include "common/system.h" #include "common/translation.h" #include "gui/saveload.h" diff --git a/engines/sci/engine/ksound.cpp b/engines/sci/engine/ksound.cpp index 911713d0bd..7fb6ac296e 100644 --- a/engines/sci/engine/ksound.cpp +++ b/engines/sci/engine/ksound.cpp @@ -32,6 +32,7 @@ #include "sci/sound/soundcmd.h" #include "audio/mixer.h" +#include "common/system.h" namespace Sci { diff --git a/engines/sci/engine/kvideo.cpp b/engines/sci/engine/kvideo.cpp index 6a411d8e23..a8d4437148 100644 --- a/engines/sci/engine/kvideo.cpp +++ b/engines/sci/engine/kvideo.cpp @@ -29,7 +29,14 @@ #include "sci/graphics/cursor.h" #include "sci/graphics/palette.h" #include "sci/graphics/screen.h" -#include "graphics/cursorman.h" +#include "common/events.h" +#include "common/keyboard.h" +#include "common/str.h" +#include "common/system.h" +#include "common/textconsole.h" +#include "graphics/pixelformat.h" +#include "graphics/surface.h" +#include "video/video_decoder.h" #include "video/avi_decoder.h" #include "video/qt_decoder.h" #include "sci/video/seq_decoder.h" diff --git a/engines/sci/engine/object.h b/engines/sci/engine/object.h index 81d5b2c983..8ae06f2707 100644 --- a/engines/sci/engine/object.h +++ b/engines/sci/engine/object.h @@ -28,6 +28,7 @@ #include "common/array.h" #include "common/serializer.h" +#include "common/textconsole.h" #include "sci/sci.h" // for the SCI versions #include "sci/engine/vm_types.h" // for reg_t diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp index d209a0ca5b..b441815014 100644 --- a/engines/sci/engine/vm.cpp +++ b/engines/sci/engine/vm.cpp @@ -25,8 +25,6 @@ #include "common/debug.h" #include "common/debug-channels.h" -#include "common/stack.h" -#include "common/config-manager.h" #include "sci/sci.h" #include "sci/console.h" diff --git a/engines/sci/graphics/frameout.cpp b/engines/sci/graphics/frameout.cpp index dd55b3b060..7fafe843fd 100644 --- a/engines/sci/graphics/frameout.cpp +++ b/engines/sci/graphics/frameout.cpp @@ -23,9 +23,15 @@ * */ -#include "common/util.h" -#include "common/stack.h" -#include "graphics/primitives.h" +#include "common/algorithm.h" +#include "common/events.h" +#include "common/keyboard.h" +#include "common/list_intern.h" +#include "common/str.h" +#include "common/system.h" +#include "common/textconsole.h" +#include "engines/engine.h" +#include "graphics/surface.h" #include "sci/sci.h" #include "sci/engine/kernel.h" diff --git a/engines/sci/graphics/paint.cpp b/engines/sci/graphics/paint.cpp index c347da3c0f..27a0bdfc44 100644 --- a/engines/sci/graphics/paint.cpp +++ b/engines/sci/graphics/paint.cpp @@ -23,8 +23,6 @@ * */ -#include "common/util.h" -#include "common/stack.h" #include "graphics/primitives.h" #include "sci/sci.h" diff --git a/engines/sci/graphics/paint16.cpp b/engines/sci/graphics/paint16.cpp index ff738fc3b9..cba2868eeb 100644 --- a/engines/sci/graphics/paint16.cpp +++ b/engines/sci/graphics/paint16.cpp @@ -23,11 +23,6 @@ * */ -#include "common/util.h" -#include "common/stack.h" -#include "common/system.h" -#include "graphics/primitives.h" - #include "sci/sci.h" #include "sci/engine/features.h" #include "sci/engine/state.h" diff --git a/engines/sci/graphics/paint32.cpp b/engines/sci/graphics/paint32.cpp index 69a278eb8b..f277436631 100644 --- a/engines/sci/graphics/paint32.cpp +++ b/engines/sci/graphics/paint32.cpp @@ -23,11 +23,6 @@ * */ -#include "common/util.h" -#include "common/stack.h" - -#include "graphics/primitives.h" - #include "sci/sci.h" #include "sci/engine/state.h" #include "sci/engine/selector.h" diff --git a/engines/sci/graphics/palette.cpp b/engines/sci/graphics/palette.cpp index 0433479a09..42551e9369 100644 --- a/engines/sci/graphics/palette.cpp +++ b/engines/sci/graphics/palette.cpp @@ -28,6 +28,8 @@ #include "common/util.h" #include "common/system.h" +#include "graphics/palette.h" + #include "sci/sci.h" #include "sci/engine/state.h" #include "sci/graphics/cache.h" diff --git a/engines/sci/graphics/portrait.cpp b/engines/sci/graphics/portrait.cpp index 6e9df2f019..3f9ebaa07a 100644 --- a/engines/sci/graphics/portrait.cpp +++ b/engines/sci/graphics/portrait.cpp @@ -24,9 +24,7 @@ */ #include "common/archive.h" -#include "common/util.h" -#include "common/stack.h" -#include "graphics/primitives.h" +#include "common/system.h" #include "sci/sci.h" #include "sci/event.h" diff --git a/engines/sci/graphics/transitions.cpp b/engines/sci/graphics/transitions.cpp index fb124055d6..dde1be13ab 100644 --- a/engines/sci/graphics/transitions.cpp +++ b/engines/sci/graphics/transitions.cpp @@ -24,9 +24,8 @@ */ #include "common/events.h" -#include "common/util.h" -#include "common/stack.h" #include "common/system.h" +#include "graphics/palette.h" #include "graphics/surface.h" #include "sci/sci.h" diff --git a/engines/sci/parser/grammar.cpp b/engines/sci/parser/grammar.cpp index 77db56adba..b330a432e3 100644 --- a/engines/sci/parser/grammar.cpp +++ b/engines/sci/parser/grammar.cpp @@ -31,6 +31,7 @@ #include "sci/parser/vocabulary.h" #include "sci/console.h" #include "common/array.h" +#include "common/textconsole.h" namespace Sci { diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp index 2a7c646672..a48ae0fad7 100644 --- a/engines/sci/resource.cpp +++ b/engines/sci/resource.cpp @@ -28,6 +28,7 @@ #include "common/file.h" #include "common/fs.h" #include "common/macresman.h" +#include "common/textconsole.h" #include "sci/resource.h" #include "sci/resource_intern.h" diff --git a/engines/sci/resource_audio.cpp b/engines/sci/resource_audio.cpp index 6e74553f56..1e0b9c0ddf 100644 --- a/engines/sci/resource_audio.cpp +++ b/engines/sci/resource_audio.cpp @@ -27,6 +27,7 @@ #include "common/archive.h" #include "common/file.h" +#include "common/textconsole.h" #include "sci/resource.h" #include "sci/resource_intern.h" diff --git a/engines/sci/sound/drivers/adlib.cpp b/engines/sci/sound/drivers/adlib.cpp index 65a8e2e3da..f00c99d5b5 100644 --- a/engines/sci/sound/drivers/adlib.cpp +++ b/engines/sci/sound/drivers/adlib.cpp @@ -26,6 +26,8 @@ #include "sci/sci.h" #include "common/file.h" +#include "common/system.h" +#include "common/textconsole.h" #include "audio/fmopl.h" #include "audio/softsynth/emumidi.h" diff --git a/engines/sci/sound/drivers/amigamac.cpp b/engines/sci/sound/drivers/amigamac.cpp index 030b095cc9..7ee8d21f86 100644 --- a/engines/sci/sound/drivers/amigamac.cpp +++ b/engines/sci/sound/drivers/amigamac.cpp @@ -30,6 +30,8 @@ #include "common/file.h" #include "common/frac.h" #include "common/memstream.h" +#include "common/system.h" +#include "common/textconsole.h" #include "common/util.h" namespace Sci { diff --git a/engines/sci/sound/drivers/cms.cpp b/engines/sci/sound/drivers/cms.cpp index 051fa7f1fd..47c59a1e3d 100644 --- a/engines/sci/sound/drivers/cms.cpp +++ b/engines/sci/sound/drivers/cms.cpp @@ -29,6 +29,8 @@ #include "audio/softsynth/cms.h" #include "audio/mixer.h" +#include "common/system.h" + #include "sci/resource.h" namespace Sci { diff --git a/engines/sci/sound/drivers/fb01.cpp b/engines/sci/sound/drivers/fb01.cpp index 971c2ff92d..f217738bb2 100644 --- a/engines/sci/sound/drivers/fb01.cpp +++ b/engines/sci/sound/drivers/fb01.cpp @@ -30,6 +30,7 @@ #include "common/file.h" #include "common/system.h" +#include "common/textconsole.h" namespace Sci { diff --git a/engines/sci/sound/drivers/pcjr.cpp b/engines/sci/sound/drivers/pcjr.cpp index 063332577e..4b1efb3c87 100644 --- a/engines/sci/sound/drivers/pcjr.cpp +++ b/engines/sci/sound/drivers/pcjr.cpp @@ -27,6 +27,9 @@ #include "audio/softsynth/emumidi.h" +#include "common/debug.h" +#include "common/system.h" + namespace Sci { #define VOLUME_SHIFT 3 diff --git a/engines/sci/video/robot_decoder.cpp b/engines/sci/video/robot_decoder.cpp index ecdce3bd6b..9cb292c4e0 100644 --- a/engines/sci/video/robot_decoder.cpp +++ b/engines/sci/video/robot_decoder.cpp @@ -23,11 +23,10 @@ * */ -#include "common/debug.h" -#include "common/endian.h" #include "common/archive.h" #include "common/stream.h" #include "common/system.h" +#include "common/textconsole.h" #include "common/util.h" #include "graphics/surface.h" diff --git a/engines/sci/video/robot_decoder.h b/engines/sci/video/robot_decoder.h index 52bf0bad07..aeb638e019 100644 --- a/engines/sci/video/robot_decoder.h +++ b/engines/sci/video/robot_decoder.h @@ -32,6 +32,7 @@ #include "common/substream.h" #include "audio/audiostream.h" #include "audio/mixer.h" +#include "graphics/pixelformat.h" #include "video/video_decoder.h" namespace Sci { diff --git a/engines/sci/video/seq_decoder.cpp b/engines/sci/video/seq_decoder.cpp index 0e69a9a352..17d1f9afd0 100644 --- a/engines/sci/video/seq_decoder.cpp +++ b/engines/sci/video/seq_decoder.cpp @@ -23,12 +23,10 @@ * */ -#include "common/debug.h" #include "common/endian.h" -#include "common/archive.h" #include "common/stream.h" #include "common/system.h" -#include "common/util.h" +#include "common/textconsole.h" #include "graphics/surface.h" diff --git a/engines/sci/video/seq_decoder.h b/engines/sci/video/seq_decoder.h index 70aaa661ae..70d3985ec5 100644 --- a/engines/sci/video/seq_decoder.h +++ b/engines/sci/video/seq_decoder.h @@ -26,8 +26,18 @@ #ifndef SCI_VIDEO_SEQ_DECODER_H #define SCI_VIDEO_SEQ_DECODER_H +#include "common/rational.h" +#include "graphics/pixelformat.h" #include "video/video_decoder.h" +namespace Common { +class SeekableReadStream; +} + +namespace Graphics { +struct Surface; +} + namespace Sci { /** diff --git a/engines/scumm/debugger.cpp b/engines/scumm/debugger.cpp index 63188c1d7a..4c1942b865 100644 --- a/engines/scumm/debugger.cpp +++ b/engines/scumm/debugger.cpp @@ -23,7 +23,6 @@ * */ -#include "common/config-manager.h" #include "common/debug-channels.h" #include "common/file.h" #include "common/str.h" diff --git a/engines/scumm/file_nes.cpp b/engines/scumm/file_nes.cpp index d9d84f04ff..47704d6eaf 100644 --- a/engines/scumm/file_nes.cpp +++ b/engines/scumm/file_nes.cpp @@ -28,6 +28,7 @@ #include "common/endian.h" #include "common/md5.h" #include "common/memstream.h" +#include "common/textconsole.h" namespace Scumm { diff --git a/engines/scumm/he/cup_player_he.cpp b/engines/scumm/he/cup_player_he.cpp index a16af73135..5cd75a5c62 100644 --- a/engines/scumm/he/cup_player_he.cpp +++ b/engines/scumm/he/cup_player_he.cpp @@ -30,6 +30,7 @@ #include "audio/audiostream.h" #include "audio/mixer.h" #include "audio/decoders/raw.h" +#include "graphics/palette.h" #include "scumm/scumm.h" #include "scumm/util.h" #include "scumm/he/intern_he.h" diff --git a/engines/scumm/he/palette_he.cpp b/engines/scumm/he/palette_he.cpp index 7f517c56ed..49e43a040b 100644 --- a/engines/scumm/he/palette_he.cpp +++ b/engines/scumm/he/palette_he.cpp @@ -26,6 +26,7 @@ #ifdef ENABLE_HE #include "common/system.h" +#include "graphics/palette.h" #include "scumm/scumm.h" #include "scumm/he/intern_he.h" #include "scumm/resource.h" diff --git a/engines/scumm/imuse/imuse_part.cpp b/engines/scumm/imuse/imuse_part.cpp index 40889ec24f..487429c294 100644 --- a/engines/scumm/imuse/imuse_part.cpp +++ b/engines/scumm/imuse/imuse_part.cpp @@ -25,6 +25,8 @@ +#include "common/debug.h" +#include "common/textconsole.h" #include "common/util.h" #include "scumm/imuse/imuse_internal.h" #include "scumm/saveload.h" diff --git a/engines/scumm/imuse/sysex_scumm.cpp b/engines/scumm/imuse/sysex_scumm.cpp index c96b2f757b..78028c6056 100644 --- a/engines/scumm/imuse/sysex_scumm.cpp +++ b/engines/scumm/imuse/sysex_scumm.cpp @@ -24,6 +24,7 @@ #include "common/endian.h" +#include "common/textconsole.h" #include "common/util.h" /* diff --git a/engines/scumm/imuse_digi/dimuse.h b/engines/scumm/imuse_digi/dimuse.h index 236edb5a89..1e96aa8827 100644 --- a/engines/scumm/imuse_digi/dimuse.h +++ b/engines/scumm/imuse_digi/dimuse.h @@ -26,6 +26,8 @@ #define SCUMM_IMUSE_DIGI_H #include "common/scummsys.h" +#include "common/mutex.h" +#include "common/textconsole.h" #include "common/util.h" #include "scumm/imuse_digi/dimuse.h" diff --git a/engines/scumm/midiparser_ro.cpp b/engines/scumm/midiparser_ro.cpp index e737d747ac..be77e4fd66 100644 --- a/engines/scumm/midiparser_ro.cpp +++ b/engines/scumm/midiparser_ro.cpp @@ -26,6 +26,7 @@ #include "audio/midiparser.h" #include "audio/mididrv.h" +#include "common/textconsole.h" #include "common/util.h" namespace Scumm { diff --git a/engines/scumm/palette.cpp b/engines/scumm/palette.cpp index e81212fec8..b0786c924d 100644 --- a/engines/scumm/palette.cpp +++ b/engines/scumm/palette.cpp @@ -23,8 +23,11 @@ */ #include "common/system.h" +#include "common/textconsole.h" #include "common/util.h" +#include "graphics/palette.h" + #include "scumm/resource.h" #include "scumm/scumm.h" #include "scumm/scumm_v6.h" diff --git a/engines/scumm/player_pce.h b/engines/scumm/player_pce.h index 3f5033f724..42153e8abc 100644 --- a/engines/scumm/player_pce.h +++ b/engines/scumm/player_pce.h @@ -27,6 +27,7 @@ #define SCUMM_PLAYER_PCE_H #include "common/scummsys.h" +#include "common/mutex.h" #include "scumm/music.h" #include "audio/audiostream.h" #include "audio/mixer.h" diff --git a/engines/scumm/player_v4a.h b/engines/scumm/player_v4a.h index 108dbcf317..458a39b5fe 100644 --- a/engines/scumm/player_v4a.h +++ b/engines/scumm/player_v4a.h @@ -27,6 +27,7 @@ #define SCUMM_PLAYER_V4A_H #include "common/scummsys.h" +#include "common/util.h" #include "scumm/music.h" #include "audio/mixer.h" #include "audio/mods/tfmx.h" diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h index 59ff0f1fc3..62c6c70e5a 100644 --- a/engines/scumm/scumm.h +++ b/engines/scumm/scumm.h @@ -35,6 +35,7 @@ #include "common/random.h" #include "common/rect.h" #include "common/str.h" +#include "common/textconsole.h" #include "graphics/surface.h" #include "graphics/sjis.h" diff --git a/engines/scumm/smush/channel.cpp b/engines/scumm/smush/channel.cpp index 4389890994..95b7653262 100644 --- a/engines/scumm/smush/channel.cpp +++ b/engines/scumm/smush/channel.cpp @@ -24,6 +24,8 @@ */ +#include "common/textconsole.h" + #include "scumm/smush/channel.h" namespace Scumm { diff --git a/engines/scumm/smush/codec37.cpp b/engines/scumm/smush/codec37.cpp index 658d67c1b4..9dbbc6816f 100644 --- a/engines/scumm/smush/codec37.cpp +++ b/engines/scumm/smush/codec37.cpp @@ -25,6 +25,7 @@ #include "common/endian.h" +#include "common/textconsole.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 3a1639c35f..47286ba4fc 100644 --- a/engines/scumm/smush/codec47.cpp +++ b/engines/scumm/smush/codec47.cpp @@ -25,6 +25,7 @@ #include "common/endian.h" +#include "common/textconsole.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 04ed955224..f730acf804 100644 --- a/engines/scumm/smush/saud_channel.cpp +++ b/engines/scumm/smush/saud_channel.cpp @@ -26,6 +26,7 @@ #include "common/endian.h" #include "common/stream.h" +#include "common/textconsole.h" #include "scumm/util.h" #include "scumm/smush/channel.h" diff --git a/engines/scumm/smush/smush_mixer.h b/engines/scumm/smush/smush_mixer.h index c7a7354511..3d62fdc722 100644 --- a/engines/scumm/smush/smush_mixer.h +++ b/engines/scumm/smush/smush_mixer.h @@ -27,6 +27,8 @@ #define SCUMM_SMUSH_MIXER_H +#include "audio/mixer.h" +#include "common/mutex.h" #include "scumm/sound.h" namespace Scumm { diff --git a/engines/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp index 0e4f588593..2e39558372 100644 --- a/engines/scumm/smush/smush_player.cpp +++ b/engines/scumm/smush/smush_player.cpp @@ -31,6 +31,7 @@ #include "common/util.h" #include "graphics/cursorman.h" +#include "graphics/palette.h" #include "scumm/bomp.h" #include "scumm/file.h" diff --git a/engines/scumm/util.cpp b/engines/scumm/util.cpp index ccd0230efa..5c3e4c9d0c 100644 --- a/engines/scumm/util.cpp +++ b/engines/scumm/util.cpp @@ -25,6 +25,7 @@ #include "scumm/util.h" #include "common/util.h" +#include "common/textconsole.h" namespace Scumm { diff --git a/engines/sky/autoroute.cpp b/engines/sky/autoroute.cpp index dae4b94291..d6974837c6 100644 --- a/engines/sky/autoroute.cpp +++ b/engines/sky/autoroute.cpp @@ -25,6 +25,7 @@ #include "common/endian.h" +#include "common/textconsole.h" #include "common/util.h" #include "sky/autoroute.h" diff --git a/engines/sky/compact.cpp b/engines/sky/compact.cpp index 08184adcdb..672fb38ca9 100644 --- a/engines/sky/compact.cpp +++ b/engines/sky/compact.cpp @@ -24,9 +24,10 @@ */ +#include "common/debug.h" #include "common/endian.h" -#include "common/util.h" #include "common/file.h" +#include "common/textconsole.h" #include "sky/compact.h" #include "gui/message.h" #include <stddef.h> // for ptrdiff_t diff --git a/engines/sky/control.cpp b/engines/sky/control.cpp index 8a5409a488..f31f0f6ba9 100644 --- a/engines/sky/control.cpp +++ b/engines/sky/control.cpp @@ -26,11 +26,10 @@ #include "common/endian.h" #include "common/config-manager.h" -#include "common/file.h" #include "common/events.h" #include "common/system.h" #include "common/savefile.h" -#include "common/util.h" +#include "common/textconsole.h" #include "gui/message.h" #include "sky/compact.h" diff --git a/engines/sky/debug.cpp b/engines/sky/debug.cpp index 2839665ff8..df55966a9a 100644 --- a/engines/sky/debug.cpp +++ b/engines/sky/debug.cpp @@ -24,7 +24,7 @@ */ -#include "common/endian.h" +#include "common/debug.h" #include "common/util.h" #include "sky/debug.h" diff --git a/engines/sky/detection.cpp b/engines/sky/detection.cpp index e72875fa4e..6871fc9604 100644 --- a/engines/sky/detection.cpp +++ b/engines/sky/detection.cpp @@ -34,6 +34,7 @@ #include "common/file.h" #include "common/fs.h" #include "common/savefile.h" +#include "common/textconsole.h" #include "engines/metaengine.h" diff --git a/engines/sky/disk.cpp b/engines/sky/disk.cpp index 5ad0c3eb19..3795c4166d 100644 --- a/engines/sky/disk.cpp +++ b/engines/sky/disk.cpp @@ -24,12 +24,12 @@ */ +#include "common/debug.h" +#include "common/textconsole.h" #include "common/endian.h" #include "common/file.h" -#include "common/util.h" #include "sky/disk.h" -#include "sky/rnc_deco.h" #include "sky/sky.h" #include "sky/struc.h" diff --git a/engines/sky/disk.h b/engines/sky/disk.h index 9e260281c8..0cdcbb4d0f 100644 --- a/engines/sky/disk.h +++ b/engines/sky/disk.h @@ -28,7 +28,6 @@ #include "common/scummsys.h" -#include "common/str.h" #include "sky/rnc_deco.h" #define MAX_FILES_IN_LIST 60 diff --git a/engines/sky/intro.cpp b/engines/sky/intro.cpp index cf1910c5b1..506a6699c1 100644 --- a/engines/sky/intro.cpp +++ b/engines/sky/intro.cpp @@ -28,6 +28,7 @@ #include "common/util.h" #include "common/events.h" #include "common/system.h" +#include "common/textconsole.h" #include "sky/disk.h" #include "sky/intro.h" diff --git a/engines/sky/logic.cpp b/engines/sky/logic.cpp index b52e908455..f9ebd0fb64 100644 --- a/engines/sky/logic.cpp +++ b/engines/sky/logic.cpp @@ -25,9 +25,8 @@ #include "common/endian.h" #include "common/rect.h" -#include "common/events.h" #include "common/EventRecorder.h" -#include "common/system.h" +#include "common/textconsole.h" #include "sky/autoroute.h" #include "sky/compact.h" diff --git a/engines/sky/mouse.cpp b/engines/sky/mouse.cpp index ca0ebcc19c..611010fa46 100644 --- a/engines/sky/mouse.cpp +++ b/engines/sky/mouse.cpp @@ -26,6 +26,7 @@ #include "common/events.h" #include "common/system.h" +#include "common/textconsole.h" #include "graphics/cursorman.h" #include "sky/disk.h" #include "sky/logic.h" diff --git a/engines/sky/music/adlibchannel.cpp b/engines/sky/music/adlibchannel.cpp index e9c20de8c7..9b3c4338ab 100644 --- a/engines/sky/music/adlibchannel.cpp +++ b/engines/sky/music/adlibchannel.cpp @@ -25,6 +25,7 @@ #include "common/endian.h" +#include "common/textconsole.h" #include "common/util.h" #include "sky/music/adlibchannel.h" #include "sky/sky.h" diff --git a/engines/sky/music/gmchannel.cpp b/engines/sky/music/gmchannel.cpp index 3852a69068..be0afa8894 100644 --- a/engines/sky/music/gmchannel.cpp +++ b/engines/sky/music/gmchannel.cpp @@ -25,6 +25,7 @@ #include "gmchannel.h" #include "common/util.h" +#include "common/textconsole.h" #include "audio/mididrv.h" namespace Sky { diff --git a/engines/sky/music/gmmusic.cpp b/engines/sky/music/gmmusic.cpp index 8818c5b711..6a8529f287 100644 --- a/engines/sky/music/gmmusic.cpp +++ b/engines/sky/music/gmmusic.cpp @@ -28,6 +28,7 @@ #include "sky/sky.h" #include "common/util.h" #include "common/endian.h" +#include "common/textconsole.h" #include "audio/mididrv.h" namespace Sky { diff --git a/engines/sky/music/mt32music.cpp b/engines/sky/music/mt32music.cpp index 51df95e451..4f47e511c7 100644 --- a/engines/sky/music/mt32music.cpp +++ b/engines/sky/music/mt32music.cpp @@ -28,6 +28,7 @@ #include "common/util.h" #include "common/system.h" #include "common/endian.h" +#include "common/textconsole.h" #include "audio/mididrv.h" namespace Sky { diff --git a/engines/sky/music/musicbase.cpp b/engines/sky/music/musicbase.cpp index e1044a9505..748637f9d0 100644 --- a/engines/sky/music/musicbase.cpp +++ b/engines/sky/music/musicbase.cpp @@ -27,6 +27,7 @@ #include "sky/disk.h" #include "common/util.h" #include "common/endian.h" +#include "common/textconsole.h" namespace Sky { diff --git a/engines/sky/screen.cpp b/engines/sky/screen.cpp index 1b815b9c38..a209571b37 100644 --- a/engines/sky/screen.cpp +++ b/engines/sky/screen.cpp @@ -27,6 +27,9 @@ #include "common/endian.h" #include "common/events.h" #include "common/system.h" +#include "common/textconsole.h" + +#include "graphics/palette.h" #include "sky/disk.h" #include "sky/logic.h" diff --git a/engines/sky/sky.cpp b/engines/sky/sky.cpp index f3556c84b3..f10ec1083a 100644 --- a/engines/sky/sky.cpp +++ b/engines/sky/sky.cpp @@ -25,6 +25,7 @@ #include "common/config-manager.h" #include "common/system.h" +#include "common/textconsole.h" #include "sky/control.h" #include "sky/debug.h" diff --git a/engines/sky/sky.h b/engines/sky/sky.h index 378bba73ee..58ac3ed26e 100644 --- a/engines/sky/sky.h +++ b/engines/sky/sky.h @@ -27,7 +27,8 @@ #define SKY_H -#include "common/events.h" +#include "common/error.h" +#include "common/keyboard.h" #include "engines/engine.h" /** @@ -52,7 +53,6 @@ struct SystemVars { bool paused; }; -struct Compact; class Sound; class Disk; class Text; diff --git a/engines/sky/sound.cpp b/engines/sky/sound.cpp index 3d247ed334..7191f6cd00 100644 --- a/engines/sky/sound.cpp +++ b/engines/sky/sound.cpp @@ -24,7 +24,9 @@ */ +#include "common/debug.h" #include "common/endian.h" +#include "common/textconsole.h" #include "sky/disk.h" #include "sky/logic.h" diff --git a/engines/sky/text.cpp b/engines/sky/text.cpp index 548c9cb3c2..2464d93581 100644 --- a/engines/sky/text.cpp +++ b/engines/sky/text.cpp @@ -24,7 +24,9 @@ */ +#include "common/debug.h" #include "common/endian.h" +#include "common/textconsole.h" #include "sky/disk.h" #include "sky/logic.h" diff --git a/engines/sword1/animation.cpp b/engines/sword1/animation.cpp index 60176be1a9..7c17befcff 100644 --- a/engines/sword1/animation.cpp +++ b/engines/sword1/animation.cpp @@ -24,15 +24,16 @@ */ #include "common/file.h" +#include "common/events.h" +#include "common/keyboard.h" +#include "common/textconsole.h" #include "sword1/sword1.h" #include "sword1/animation.h" #include "sword1/text.h" -#include "audio/decoders/vorbis.h" -#include "common/config-manager.h" -#include "common/endian.h" #include "common/str.h" #include "common/system.h" +#include "graphics/palette.h" #include "graphics/surface.h" #include "gui/message.h" diff --git a/engines/sword1/control.cpp b/engines/sword1/control.cpp index d4f6bfd1fe..d8ddd53e2e 100644 --- a/engines/sword1/control.cpp +++ b/engines/sword1/control.cpp @@ -29,7 +29,9 @@ #include "common/events.h" #include "common/system.h" #include "common/config-manager.h" +#include "common/textconsole.h" +#include "graphics/palette.h" #include "graphics/thumbnail.h" #include "gui/message.h" diff --git a/engines/sword1/detection.cpp b/engines/sword1/detection.cpp index 855c7d1f83..fa8277033c 100644 --- a/engines/sword1/detection.cpp +++ b/engines/sword1/detection.cpp @@ -27,8 +27,6 @@ #include "sword1/control.h" #include "base/plugins.h" -#include "common/config-manager.h" -#include "common/file.h" #include "common/fs.h" #include "common/savefile.h" #include "common/system.h" diff --git a/engines/sword1/eventman.cpp b/engines/sword1/eventman.cpp index 55a438f506..9200e6a229 100644 --- a/engines/sword1/eventman.cpp +++ b/engines/sword1/eventman.cpp @@ -26,6 +26,7 @@ #include "sword1/eventman.h" #include "sword1/sworddefs.h" +#include "common/textconsole.h" #include "common/util.h" namespace Sword1 { diff --git a/engines/sword1/logic.cpp b/engines/sword1/logic.cpp index ef54167d41..3da3c457d0 100644 --- a/engines/sword1/logic.cpp +++ b/engines/sword1/logic.cpp @@ -25,9 +25,8 @@ #include "common/endian.h" #include "common/util.h" -#include "common/system.h" -#include "common/events.h" #include "common/EventRecorder.h" +#include "common/textconsole.h" #include "sword1/logic.h" #include "sword1/text.h" diff --git a/engines/sword1/memman.cpp b/engines/sword1/memman.cpp index b08631dfc8..f315895eb0 100644 --- a/engines/sword1/memman.cpp +++ b/engines/sword1/memman.cpp @@ -25,6 +25,7 @@ #include "sword1/memman.h" +#include "common/textconsole.h" #include "common/util.h" namespace Sword1 { diff --git a/engines/sword1/mouse.h b/engines/sword1/mouse.h index 1b4ca12183..3a7ea747fb 100644 --- a/engines/sword1/mouse.h +++ b/engines/sword1/mouse.h @@ -27,6 +27,7 @@ #define SWORD1_MOUSE_H #include "common/scummsys.h" +#include "common/rect.h" #include "sword1/sworddefs.h" #include "sword1/object.h" diff --git a/engines/sword1/music.cpp b/engines/sword1/music.cpp index 2b81ae1eb4..49f9f7271b 100644 --- a/engines/sword1/music.cpp +++ b/engines/sword1/music.cpp @@ -24,10 +24,9 @@ */ -#include "common/endian.h" #include "common/file.h" #include "common/util.h" -#include "common/system.h" +#include "common/textconsole.h" #include "sword1/sword1.h" #include "sword1/music.h" diff --git a/engines/sword1/objectman.cpp b/engines/sword1/objectman.cpp index 9ac2c7a255..dde1498591 100644 --- a/engines/sword1/objectman.cpp +++ b/engines/sword1/objectman.cpp @@ -24,6 +24,7 @@ */ +#include "common/textconsole.h" #include "common/util.h" #include "sword1/objectman.h" diff --git a/engines/sword1/resman.cpp b/engines/sword1/resman.cpp index 2bad8a79a7..f7b9eb8908 100644 --- a/engines/sword1/resman.cpp +++ b/engines/sword1/resman.cpp @@ -24,19 +24,14 @@ */ -#include "common/config-manager.h" -#include "common/util.h" -#include "common/str.h" - -#include "engines/engine.h" +#include "common/debug.h" +#include "common/textconsole.h" #include "sword1/memman.h" #include "sword1/resman.h" -#include "sword1/sworddefs.h" #include "sword1/swordres.h" #include "gui/message.h" -#include "gui/gui-manager.h" namespace Sword1 { void guiFatalError(char *msg) { diff --git a/engines/sword1/router.cpp b/engines/sword1/router.cpp index 9ff5ae0c8e..3694ed2459 100644 --- a/engines/sword1/router.cpp +++ b/engines/sword1/router.cpp @@ -24,6 +24,7 @@ */ #include "common/debug.h" +#include "common/textconsole.h" #include "common/util.h" #include "sword1/router.h" diff --git a/engines/sword1/screen.cpp b/engines/sword1/screen.cpp index 1906fcb7fd..de96f6e7b4 100644 --- a/engines/sword1/screen.cpp +++ b/engines/sword1/screen.cpp @@ -25,8 +25,11 @@ #include "common/system.h" +#include "common/textconsole.h" #include "common/util.h" +#include "graphics/palette.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 f8219eb21a..c970e72748 100644 --- a/engines/sword1/sound.cpp +++ b/engines/sword1/sound.cpp @@ -27,10 +27,9 @@ #include "common/endian.h" #include "common/util.h" -#include "common/events.h" #include "common/EventRecorder.h" #include "common/memstream.h" -#include "common/system.h" +#include "common/textconsole.h" #include "sword1/sound.h" #include "sword1/resman.h" diff --git a/engines/sword1/sword1.cpp b/engines/sword1/sword1.cpp index 8768e62457..3b3eaaf8b9 100644 --- a/engines/sword1/sword1.cpp +++ b/engines/sword1/sword1.cpp @@ -37,6 +37,7 @@ #include "sword1/control.h" #include "common/config-manager.h" +#include "common/textconsole.h" #include "engines/util.h" diff --git a/engines/sword1/sword1.h b/engines/sword1/sword1.h index 255299d33e..dbb683cd74 100644 --- a/engines/sword1/sword1.h +++ b/engines/sword1/sword1.h @@ -27,7 +27,9 @@ #define SWORD1_H #include "engines/engine.h" -#include "common/events.h" +#include "common/error.h" +#include "common/keyboard.h" +#include "common/rect.h" #include "common/util.h" #include "sword1/sworddefs.h" #include "sword1/console.h" diff --git a/engines/sword1/text.cpp b/engines/sword1/text.cpp index ef3e07fe74..7c65533067 100644 --- a/engines/sword1/text.cpp +++ b/engines/sword1/text.cpp @@ -24,8 +24,7 @@ */ -#include "common/endian.h" -#include "common/util.h" +#include "common/textconsole.h" #include "sword1/text.h" #include "sword1/resman.h" diff --git a/engines/sword2/animation.cpp b/engines/sword2/animation.cpp index 8d1a9836f4..a5a2499b01 100644 --- a/engines/sword2/animation.cpp +++ b/engines/sword2/animation.cpp @@ -26,7 +26,9 @@ */ #include "common/file.h" +#include "common/mutex.h" #include "common/system.h" +#include "common/textconsole.h" #include "sword2/sword2.h" #include "sword2/defs.h" diff --git a/engines/sword2/controls.cpp b/engines/sword2/controls.cpp index b488092007..4332f2811c 100644 --- a/engines/sword2/controls.cpp +++ b/engines/sword2/controls.cpp @@ -26,9 +26,7 @@ */ -#include "common/events.h" #include "common/rect.h" -#include "common/config-manager.h" #include "common/system.h" #include "sword2/sword2.h" diff --git a/engines/sword2/events.cpp b/engines/sword2/events.cpp index f0e0e567a4..24101e271c 100644 --- a/engines/sword2/events.cpp +++ b/engines/sword2/events.cpp @@ -26,6 +26,7 @@ */ +#include "common/textconsole.h" #include "sword2/sword2.h" #include "sword2/defs.h" diff --git a/engines/sword2/function.cpp b/engines/sword2/function.cpp index a968a5600d..e0990ea120 100644 --- a/engines/sword2/function.cpp +++ b/engines/sword2/function.cpp @@ -28,6 +28,7 @@ #include "common/system.h" #include "common/file.h" +#include "common/textconsole.h" #include "sword2/sword2.h" #include "sword2/defs.h" diff --git a/engines/sword2/interpreter.cpp b/engines/sword2/interpreter.cpp index e039ae3888..a3804366d4 100644 --- a/engines/sword2/interpreter.cpp +++ b/engines/sword2/interpreter.cpp @@ -28,6 +28,7 @@ #include "common/util.h" #include "common/stack.h" +#include "common/textconsole.h" #include "sword2/sword2.h" #include "sword2/header.h" diff --git a/engines/sword2/layers.cpp b/engines/sword2/layers.cpp index c5091a248f..47cc3ec232 100644 --- a/engines/sword2/layers.cpp +++ b/engines/sword2/layers.cpp @@ -35,6 +35,7 @@ #include "common/rect.h" +#include "common/textconsole.h" #include "sword2/sword2.h" #include "sword2/defs.h" diff --git a/engines/sword2/logic.cpp b/engines/sword2/logic.cpp index 511561c55a..c27bd76ff4 100644 --- a/engines/sword2/logic.cpp +++ b/engines/sword2/logic.cpp @@ -26,6 +26,7 @@ */ +#include "common/textconsole.h" #include "sword2/sword2.h" #include "sword2/defs.h" diff --git a/engines/sword2/maketext.cpp b/engines/sword2/maketext.cpp index 648d1d761b..fda30981c8 100644 --- a/engines/sword2/maketext.cpp +++ b/engines/sword2/maketext.cpp @@ -45,6 +45,7 @@ #include "common/system.h" +#include "common/textconsole.h" #include "sword2/sword2.h" #include "sword2/defs.h" diff --git a/engines/sword2/memory.cpp b/engines/sword2/memory.cpp index cd36f9a19b..2b3784164e 100644 --- a/engines/sword2/memory.cpp +++ b/engines/sword2/memory.cpp @@ -48,6 +48,7 @@ // // The number zero is used to represent the NULL pointer. +#include "common/textconsole.h" #include "sword2/sword2.h" #include "sword2/memory.h" diff --git a/engines/sword2/mouse.cpp b/engines/sword2/mouse.cpp index b6e9b169c3..3a26ab17b7 100644 --- a/engines/sword2/mouse.cpp +++ b/engines/sword2/mouse.cpp @@ -29,6 +29,7 @@ #include "common/system.h" #include "common/events.h" #include "common/memstream.h" +#include "common/textconsole.h" #include "graphics/cursorman.h" diff --git a/engines/sword2/music.cpp b/engines/sword2/music.cpp index aa91843432..233d9369d2 100644 --- a/engines/sword2/music.cpp +++ b/engines/sword2/music.cpp @@ -36,6 +36,7 @@ #include "common/memstream.h" #include "common/substream.h" #include "common/system.h" +#include "common/textconsole.h" #include "audio/decoders/mp3.h" #include "audio/decoders/vorbis.h" diff --git a/engines/sword2/palette.cpp b/engines/sword2/palette.cpp index f43efcaa7f..a52160db25 100644 --- a/engines/sword2/palette.cpp +++ b/engines/sword2/palette.cpp @@ -27,6 +27,9 @@ #include "common/system.h" +#include "common/textconsole.h" + +#include "graphics/palette.h" #include "sword2/sword2.h" #include "sword2/defs.h" diff --git a/engines/sword2/resman.cpp b/engines/sword2/resman.cpp index fa9c396ef3..36280cfda2 100644 --- a/engines/sword2/resman.cpp +++ b/engines/sword2/resman.cpp @@ -28,6 +28,7 @@ #include "common/file.h" #include "common/system.h" +#include "common/textconsole.h" #include "sword2/sword2.h" #include "sword2/defs.h" diff --git a/engines/sword2/router.cpp b/engines/sword2/router.cpp index 8f355151f4..c2b4d2e67f 100644 --- a/engines/sword2/router.cpp +++ b/engines/sword2/router.cpp @@ -27,6 +27,7 @@ #include "common/memstream.h" +#include "common/textconsole.h" #include "sword2/sword2.h" #include "sword2/defs.h" diff --git a/engines/sword2/saveload.cpp b/engines/sword2/saveload.cpp index fab360a8ac..94ef8975b4 100644 --- a/engines/sword2/saveload.cpp +++ b/engines/sword2/saveload.cpp @@ -37,6 +37,7 @@ #include "common/memstream.h" #include "common/savefile.h" +#include "common/textconsole.h" #include "sword2/sword2.h" #include "sword2/defs.h" diff --git a/engines/sword2/screen.cpp b/engines/sword2/screen.cpp index 74a23c8b2c..a83e581fd4 100644 --- a/engines/sword2/screen.cpp +++ b/engines/sword2/screen.cpp @@ -32,6 +32,7 @@ #include "common/system.h" #include "common/events.h" +#include "common/textconsole.h" #include "sword2/sword2.h" #include "sword2/defs.h" diff --git a/engines/sword2/sound.cpp b/engines/sword2/sound.cpp index 261c8293bd..3cf8523113 100644 --- a/engines/sword2/sound.cpp +++ b/engines/sword2/sound.cpp @@ -39,6 +39,7 @@ #include "common/file.h" #include "common/memstream.h" #include "common/system.h" +#include "common/textconsole.h" #include "sword2/sword2.h" #include "sword2/defs.h" diff --git a/engines/sword2/sound.h b/engines/sword2/sound.h index 2c4c8364c7..c37e006b76 100644 --- a/engines/sword2/sound.h +++ b/engines/sword2/sound.h @@ -39,6 +39,7 @@ #define SWORD2_SOUND_H #include "common/file.h" +#include "common/mutex.h" #include "audio/audiostream.h" #include "audio/mixer.h" diff --git a/engines/sword2/speech.cpp b/engines/sword2/speech.cpp index b67f079a83..ec8e198377 100644 --- a/engines/sword2/speech.cpp +++ b/engines/sword2/speech.cpp @@ -27,6 +27,7 @@ #include "common/file.h" +#include "common/textconsole.h" #include "sword2/sword2.h" #include "sword2/defs.h" diff --git a/engines/sword2/startup.cpp b/engines/sword2/startup.cpp index e4572d3c1a..ea1751eb5f 100644 --- a/engines/sword2/startup.cpp +++ b/engines/sword2/startup.cpp @@ -27,6 +27,7 @@ #include "common/file.h" +#include "common/textconsole.h" #include "sword2/sword2.h" #include "sword2/defs.h" diff --git a/engines/sword2/sword2.cpp b/engines/sword2/sword2.cpp index 7ad021b3a5..58f3547ff7 100644 --- a/engines/sword2/sword2.cpp +++ b/engines/sword2/sword2.cpp @@ -34,6 +34,7 @@ #include "common/EventRecorder.h" #include "common/savefile.h" #include "common/system.h" +#include "common/textconsole.h" #include "engines/metaengine.h" #include "engines/util.h" diff --git a/engines/sword2/sync.cpp b/engines/sword2/sync.cpp index 1adc652b75..ee4c6b2238 100644 --- a/engines/sword2/sync.cpp +++ b/engines/sword2/sync.cpp @@ -26,6 +26,7 @@ */ +#include "common/textconsole.h" #include "sword2/sword2.h" #include "sword2/defs.h" diff --git a/engines/sword25/detection.cpp b/engines/sword25/detection.cpp index 3900df2fcf..fe24675f8a 100644 --- a/engines/sword25/detection.cpp +++ b/engines/sword25/detection.cpp @@ -24,8 +24,6 @@ */ #include "base/plugins.h" -#include "common/savefile.h" -#include "common/system.h" #include "engines/advancedDetector.h" #include "sword25/sword25.h" diff --git a/engines/sword25/fmv/movieplayer.cpp b/engines/sword25/fmv/movieplayer.cpp index 177bd38303..919e669b68 100644 --- a/engines/sword25/fmv/movieplayer.cpp +++ b/engines/sword25/fmv/movieplayer.cpp @@ -32,13 +32,17 @@ * */ +#include "common/debug.h" +#include "common/system.h" +#include "common/textconsole.h" +#include "common/util.h" + #include "sword25/sword25.h" // for kDebugScript #include "sword25/fmv/movieplayer.h" #include "sword25/gfx/graphicengine.h" #include "sword25/gfx/panel.h" #include "sword25/kernel/kernel.h" #include "sword25/package/packagemanager.h" -#include "sword25/sfx/soundengine.h" namespace Sword25 { diff --git a/engines/sword25/fmv/theora_decoder.cpp b/engines/sword25/fmv/theora_decoder.cpp index e9901c04b0..2b09be74f5 100644 --- a/engines/sword25/fmv/theora_decoder.cpp +++ b/engines/sword25/fmv/theora_decoder.cpp @@ -41,6 +41,7 @@ #ifdef USE_THEORADEC #include "common/system.h" +#include "common/textconsole.h" #include "graphics/conversion.h" #include "audio/decoders/raw.h" #include "sword25/kernel/common.h" diff --git a/engines/sword25/fmv/theora_decoder.h b/engines/sword25/fmv/theora_decoder.h index a753bc58ac..4ed2af5f98 100644 --- a/engines/sword25/fmv/theora_decoder.h +++ b/engines/sword25/fmv/theora_decoder.h @@ -30,9 +30,12 @@ #ifdef USE_THEORADEC +#include "common/rational.h" #include "video/video_decoder.h" #include "audio/audiostream.h" #include "audio/mixer.h" +#include "graphics/pixelformat.h" +#include "graphics/surface.h" #include <theora/theoradec.h> #include <vorbis/codec.h> diff --git a/engines/sword25/gfx/screenshot.cpp b/engines/sword25/gfx/screenshot.cpp index 35e94976eb..ee664d6328 100644 --- a/engines/sword25/gfx/screenshot.cpp +++ b/engines/sword25/gfx/screenshot.cpp @@ -36,6 +36,7 @@ #define FORBIDDEN_SYMBOL_ALLOW_ALL #include "common/memstream.h" +#include "common/textconsole.h" #include "sword25/gfx/screenshot.h" #include "sword25/kernel/filesystemutil.h" #include <png.h> diff --git a/engines/sword25/kernel/filesystemutil.cpp b/engines/sword25/kernel/filesystemutil.cpp index b4d4b25f8d..e5ec6c15db 100644 --- a/engines/sword25/kernel/filesystemutil.cpp +++ b/engines/sword25/kernel/filesystemutil.cpp @@ -34,8 +34,7 @@ #include "common/config-manager.h" #include "common/fs.h" -#include "common/savefile.h" -#include "common/system.h" +#include "common/textconsole.h" #include "sword25/kernel/filesystemutil.h" #include "sword25/kernel/persistenceservice.h" diff --git a/engines/sword25/kernel/inputpersistenceblock.cpp b/engines/sword25/kernel/inputpersistenceblock.cpp index f3aebef203..26c924dc82 100644 --- a/engines/sword25/kernel/inputpersistenceblock.cpp +++ b/engines/sword25/kernel/inputpersistenceblock.cpp @@ -32,6 +32,8 @@ * */ +#include "common/textconsole.h" + #include "sword25/kernel/inputpersistenceblock.h" namespace Sword25 { diff --git a/engines/sword25/kernel/kernel.h b/engines/sword25/kernel/kernel.h index 9e7ee0fdd9..3abf43d239 100644 --- a/engines/sword25/kernel/kernel.h +++ b/engines/sword25/kernel/kernel.h @@ -48,6 +48,7 @@ #include "common/scummsys.h" #include "common/random.h" #include "common/stack.h" +#include "common/textconsole.h" #include "common/util.h" #include "engines/engine.h" diff --git a/engines/sword25/kernel/objectregistry.h b/engines/sword25/kernel/objectregistry.h index 8d0f4a314b..69d961ae91 100644 --- a/engines/sword25/kernel/objectregistry.h +++ b/engines/sword25/kernel/objectregistry.h @@ -37,6 +37,7 @@ #include "common/func.h" #include "common/hashmap.h" +#include "common/textconsole.h" #include "sword25/kernel/common.h" namespace Sword25 { diff --git a/engines/sword25/script/luacallback.cpp b/engines/sword25/script/luacallback.cpp index 137e37bf8d..809676796e 100644 --- a/engines/sword25/script/luacallback.cpp +++ b/engines/sword25/script/luacallback.cpp @@ -32,6 +32,8 @@ * */ +#include "common/textconsole.h" + #include "sword25/script/luacallback.h" #include "sword25/script/luabindhelper.h" diff --git a/engines/sword25/sfx/soundengine.cpp b/engines/sword25/sfx/soundengine.cpp index 03cdaf82b7..08f0f5b4ae 100644 --- a/engines/sword25/sfx/soundengine.cpp +++ b/engines/sword25/sfx/soundengine.cpp @@ -39,6 +39,8 @@ #include "audio/decoders/vorbis.h" +#include "common/system.h" + namespace Sword25 { class SoundResource : public Resource { diff --git a/engines/sword25/sword25.cpp b/engines/sword25/sword25.cpp index 8740e44e9c..38c1c89109 100644 --- a/engines/sword25/sword25.cpp +++ b/engines/sword25/sword25.cpp @@ -34,10 +34,18 @@ #include "common/config-manager.h" #include "common/debug-channels.h" +#include "common/algorithm.h" +#include "common/array.h" +#include "common/error.h" +#include "common/fs.h" +#include "common/singleton.h" +#include "common/str-array.h" +#include "common/str.h" +#include "common/system.h" +#include "common/textconsole.h" #include "engines/util.h" #include "sword25/sword25.h" -#include "sword25/kernel/filesystemutil.h" #include "sword25/kernel/kernel.h" #include "sword25/kernel/persistenceservice.h" #include "sword25/package/packagemanager.h" diff --git a/engines/sword25/sword25.h b/engines/sword25/sword25.h index 9e9679526b..5bd27b311f 100644 --- a/engines/sword25/sword25.h +++ b/engines/sword25/sword25.h @@ -27,12 +27,18 @@ #define SWORD25_H #include "common/scummsys.h" -#include "common/str-array.h" -#include "common/util.h" #include "engines/engine.h" #include "sword25/console.h" +namespace Common { +class Error; +} + +namespace GUI { +class Debugger; +} + struct ADGameDescription; /** diff --git a/engines/teenagent/actor.cpp b/engines/teenagent/actor.cpp index 1620aa700c..9dd30f43c3 100644 --- a/engines/teenagent/actor.cpp +++ b/engines/teenagent/actor.cpp @@ -27,6 +27,7 @@ #include "teenagent/resources.h" #include "common/random.h" +#include "common/textconsole.h" namespace TeenAgent { diff --git a/engines/teenagent/animation.cpp b/engines/teenagent/animation.cpp index 56812001e8..623966f265 100644 --- a/engines/teenagent/animation.cpp +++ b/engines/teenagent/animation.cpp @@ -24,6 +24,7 @@ #include "teenagent/animation.h" #include "common/endian.h" +#include "common/textconsole.h" namespace TeenAgent { diff --git a/engines/teenagent/callbacks.cpp b/engines/teenagent/callbacks.cpp index d0662a73d6..f4be917eac 100644 --- a/engines/teenagent/callbacks.cpp +++ b/engines/teenagent/callbacks.cpp @@ -27,6 +27,8 @@ #include "teenagent/resources.h" #include "teenagent/dialog.h" +#include "common/textconsole.h" + namespace TeenAgent { #define CHECK_FLAG(addr, v) (res->dseg.get_byte(addr) == (v)) diff --git a/engines/teenagent/font.cpp b/engines/teenagent/font.cpp index 7d252f59e8..2d98ae9de7 100644 --- a/engines/teenagent/font.cpp +++ b/engines/teenagent/font.cpp @@ -24,8 +24,12 @@ #include "teenagent/font.h" #include "teenagent/pack.h" +#include "common/debug.h" +#include "common/endian.h" #include "common/stream.h" +#include "common/textconsole.h" #include "common/ptr.h" +#include "graphics/surface.h" namespace TeenAgent { diff --git a/engines/teenagent/font.h b/engines/teenagent/font.h index e08a3513af..29a8121435 100644 --- a/engines/teenagent/font.h +++ b/engines/teenagent/font.h @@ -25,6 +25,7 @@ #ifndef TEENAGENT_FONT_H #define TEENAGENT_FONT_H +#include "common/str.h" #include "graphics/surface.h" namespace TeenAgent { diff --git a/engines/teenagent/inventory.cpp b/engines/teenagent/inventory.cpp index bc4ac24da4..4d18d68502 100644 --- a/engines/teenagent/inventory.cpp +++ b/engines/teenagent/inventory.cpp @@ -24,6 +24,7 @@ #include "common/memstream.h" #include "common/ptr.h" +#include "common/textconsole.h" #include "teenagent/inventory.h" #include "teenagent/resources.h" diff --git a/engines/teenagent/music.cpp b/engines/teenagent/music.cpp index 395b2546b9..f0be5165f6 100644 --- a/engines/teenagent/music.cpp +++ b/engines/teenagent/music.cpp @@ -25,7 +25,9 @@ #include "teenagent/music.h" #include "teenagent/resources.h" +#include "common/debug.h" #include "common/ptr.h" +#include "common/textconsole.h" namespace TeenAgent { diff --git a/engines/teenagent/resources.cpp b/engines/teenagent/resources.cpp index 9fe889fa41..69908239ab 100644 --- a/engines/teenagent/resources.cpp +++ b/engines/teenagent/resources.cpp @@ -24,6 +24,7 @@ #include "teenagent/resources.h" #include "teenagent/teenagent.h" +#include "common/textconsole.h" #include "common/zlib.h" namespace TeenAgent { diff --git a/engines/teenagent/scene.cpp b/engines/teenagent/scene.cpp index f9756b5b91..1c2c3113c7 100644 --- a/engines/teenagent/scene.cpp +++ b/engines/teenagent/scene.cpp @@ -26,6 +26,9 @@ #include "common/debug.h" #include "common/algorithm.h" #include "common/ptr.h" +#include "common/textconsole.h" + +#include "graphics/palette.h" #include "teenagent/scene.h" #include "teenagent/resources.h" diff --git a/engines/teenagent/scene.h b/engines/teenagent/scene.h index 2dc5bc9c83..2d7a5e942b 100644 --- a/engines/teenagent/scene.h +++ b/engines/teenagent/scene.h @@ -35,6 +35,10 @@ #include "common/array.h" #include "common/list.h" +namespace Common { +class Event; +} + namespace TeenAgent { class TeenAgentEngine; diff --git a/engines/teenagent/segment.cpp b/engines/teenagent/segment.cpp index 7ba680907b..829c84765d 100644 --- a/engines/teenagent/segment.cpp +++ b/engines/teenagent/segment.cpp @@ -23,6 +23,7 @@ */ #include "teenagent/segment.h" +#include "common/textconsole.h" #include "common/util.h" namespace TeenAgent { diff --git a/engines/teenagent/surface.h b/engines/teenagent/surface.h index b44fd3c21a..82c13c84bd 100644 --- a/engines/teenagent/surface.h +++ b/engines/teenagent/surface.h @@ -25,8 +25,12 @@ #ifndef TEENAGENT_SURFACE_H #define TEENAGENT_SURFACE_H +#include "common/rect.h" #include "graphics/surface.h" -#include "common/stream.h" + +namespace Common { + class SeekableReadStream; +} namespace TeenAgent { diff --git a/engines/teenagent/teenagent.cpp b/engines/teenagent/teenagent.cpp index e66de70079..ec1e945f8d 100644 --- a/engines/teenagent/teenagent.cpp +++ b/engines/teenagent/teenagent.cpp @@ -27,6 +27,7 @@ #include "common/events.h" #include "common/savefile.h" #include "common/system.h" +#include "common/textconsole.h" #include "backends/audiocd/audiocd.h" @@ -37,6 +38,7 @@ #include "audio/decoders/raw.h" #include "graphics/cursorman.h" +#include "graphics/palette.h" #include "graphics/thumbnail.h" #include "teenagent/console.h" diff --git a/engines/testbed/detection.cpp b/engines/testbed/detection.cpp index 734ed0c22a..b08cca291a 100644 --- a/engines/testbed/detection.cpp +++ b/engines/testbed/detection.cpp @@ -23,10 +23,8 @@ * */ -#include "common/config-manager.h" #include "engines/advancedDetector.h" #include "common/system.h" -#include "common/fs.h" #include "base/plugins.h" diff --git a/engines/testbed/events.cpp b/engines/testbed/events.cpp index b0a930172d..37b0a7ead4 100644 --- a/engines/testbed/events.cpp +++ b/engines/testbed/events.cpp @@ -24,10 +24,17 @@ #include "common/events.h" #include "common/keyboard.h" +#include "common/rect.h" +#include "common/str.h" +#include "common/system.h" +#include "common/util.h" #include "engines/engine.h" #include "graphics/cursorman.h" +#include "graphics/font.h" +#include "graphics/fontman.h" +#include "graphics/surface.h" #include "testbed/events.h" #include "testbed/graphics.h" diff --git a/engines/testbed/graphics.cpp b/engines/testbed/graphics.cpp index c0ce3fea32..c8558e30f4 100644 --- a/engines/testbed/graphics.cpp +++ b/engines/testbed/graphics.cpp @@ -33,6 +33,7 @@ #include "graphics/cursorman.h" #include "graphics/fontman.h" +#include "graphics/palette.h" #include "graphics/surface.h" #include "graphics/VectorRendererSpec.h" diff --git a/engines/testbed/sound.cpp b/engines/testbed/sound.cpp index 76f9e850c0..dca116368e 100644 --- a/engines/testbed/sound.cpp +++ b/engines/testbed/sound.cpp @@ -26,6 +26,8 @@ #include "backends/audiocd/audiocd.h" +#include "common/config-manager.h" + #include "testbed/sound.h" namespace Testbed { diff --git a/engines/testbed/testbed.cpp b/engines/testbed/testbed.cpp index 1ceecb8ebf..179be2bb8b 100644 --- a/engines/testbed/testbed.cpp +++ b/engines/testbed/testbed.cpp @@ -24,7 +24,12 @@ #include "common/debug-channels.h" #include "common/scummsys.h" -#include "common/system.h" +#include "common/archive.h" +#include "common/config-manager.h" +#include "common/error.h" +#include "common/fs.h" +#include "common/rect.h" +#include "common/str.h" #include "engines/util.h" diff --git a/engines/testbed/testbed.h b/engines/testbed/testbed.h index e0feb52ff5..ca803a4cec 100644 --- a/engines/testbed/testbed.h +++ b/engines/testbed/testbed.h @@ -25,9 +25,9 @@ #ifndef TESTBED_H #define TESTBED_H -#include "engines/engine.h" +#include "common/array.h" -#include "gui/options.h" +#include "engines/engine.h" #include "testbed/config.h" #include "testbed/testsuite.h" diff --git a/engines/testbed/testsuite.h b/engines/testbed/testsuite.h index a738f40764..94b3d70fd4 100644 --- a/engines/testbed/testsuite.h +++ b/engines/testbed/testsuite.h @@ -25,9 +25,12 @@ #ifndef TESTBED_TESTSUITE_H #define TESTBED_TESTSUITE_H +#include "common/array.h" +#include "common/rect.h" +#include "common/scummsys.h" #include "common/system.h" #include "common/str.h" -#include "common/array.h" +#include "graphics/font.h" #include "graphics/fontman.h" diff --git a/engines/tinsel/actors.cpp b/engines/tinsel/actors.cpp index 1d25723a35..9ec253e512 100644 --- a/engines/tinsel/actors.cpp +++ b/engines/tinsel/actors.cpp @@ -44,6 +44,7 @@ #include "tinsel/tinsel.h" #include "tinsel/token.h" +#include "common/textconsole.h" #include "common/util.h" namespace Tinsel { diff --git a/engines/tinsel/adpcm.cpp b/engines/tinsel/adpcm.cpp index 9f951e806a..530395d754 100644 --- a/engines/tinsel/adpcm.cpp +++ b/engines/tinsel/adpcm.cpp @@ -23,6 +23,9 @@ * */ +#include "common/stream.h" +#include "common/util.h" + #include "tinsel/adpcm.h" namespace Tinsel { diff --git a/engines/tinsel/anim.cpp b/engines/tinsel/anim.cpp index 37d8de925e..61c8b67624 100644 --- a/engines/tinsel/anim.cpp +++ b/engines/tinsel/anim.cpp @@ -31,6 +31,7 @@ #include "tinsel/sched.h" #include "tinsel/tinsel.h" +#include "common/textconsole.h" #include "common/util.h" namespace Tinsel { diff --git a/engines/tinsel/bg.cpp b/engines/tinsel/bg.cpp index 747fdfe93c..0e67c3a06e 100644 --- a/engines/tinsel/bg.cpp +++ b/engines/tinsel/bg.cpp @@ -40,6 +40,7 @@ #include "tinsel/tinlib.h" // For Control() #include "tinsel/tinsel.h" +#include "common/textconsole.h" #include "common/util.h" namespace Tinsel { diff --git a/engines/tinsel/bmv.cpp b/engines/tinsel/bmv.cpp index e3fbad678c..793febdc21 100644 --- a/engines/tinsel/bmv.cpp +++ b/engines/tinsel/bmv.cpp @@ -44,6 +44,8 @@ #include "audio/decoders/raw.h" +#include "common/textconsole.h" + namespace Tinsel { //----------------- LOCAL DEFINES ---------------------------- diff --git a/engines/tinsel/dialogs.cpp b/engines/tinsel/dialogs.cpp index ee9c9aed39..281dd2da55 100644 --- a/engines/tinsel/dialogs.cpp +++ b/engines/tinsel/dialogs.cpp @@ -62,6 +62,8 @@ #include "tinsel/tinsel.h" // For engine access #include "tinsel/token.h" +#include "common/textconsole.h" + namespace Tinsel { //----------------- EXTERNAL GLOBAL DATA -------------------- diff --git a/engines/tinsel/drives.cpp b/engines/tinsel/drives.cpp index ab606f3159..d252e45cf5 100644 --- a/engines/tinsel/drives.cpp +++ b/engines/tinsel/drives.cpp @@ -24,9 +24,7 @@ * CD/drive handling functions */ -#include "common/config-manager.h" -#include "common/substream.h" -#include "gui/message.h" +#include "common/textconsole.h" #include "tinsel/drives.h" #include "tinsel/scene.h" #include "tinsel/tinsel.h" diff --git a/engines/tinsel/graphics.cpp b/engines/tinsel/graphics.cpp index 0b550f50f3..bdcd3207f9 100644 --- a/engines/tinsel/graphics.cpp +++ b/engines/tinsel/graphics.cpp @@ -32,6 +32,8 @@ #include "tinsel/tinsel.h" #include "tinsel/scn.h" +#include "common/textconsole.h" + namespace Tinsel { //----------------- LOCAL DEFINES -------------------- diff --git a/engines/tinsel/handle.cpp b/engines/tinsel/handle.cpp index f2db42bede..6f5f92c969 100644 --- a/engines/tinsel/handle.cpp +++ b/engines/tinsel/handle.cpp @@ -27,6 +27,7 @@ #define BODGE #include "common/file.h" +#include "common/textconsole.h" #include "tinsel/drives.h" #include "tinsel/dw.h" diff --git a/engines/tinsel/mareels.cpp b/engines/tinsel/mareels.cpp index cf28749e76..5d9672972a 100644 --- a/engines/tinsel/mareels.cpp +++ b/engines/tinsel/mareels.cpp @@ -28,6 +28,7 @@ #include "tinsel/pcode.h" // For D_UP, D_DOWN #include "tinsel/rince.h" +#include "common/textconsole.h" #include "common/util.h" namespace Tinsel { diff --git a/engines/tinsel/object.cpp b/engines/tinsel/object.cpp index 1aac68c7f0..ad02a614a5 100644 --- a/engines/tinsel/object.cpp +++ b/engines/tinsel/object.cpp @@ -32,6 +32,8 @@ #include "tinsel/text.h" #include "tinsel/tinsel.h" +#include "common/textconsole.h" + #define OID_EFFECTS 0x2000 // generic special effects object id namespace Tinsel { diff --git a/engines/tinsel/palette.cpp b/engines/tinsel/palette.cpp index 2d2ebd6f60..0877337603 100644 --- a/engines/tinsel/palette.cpp +++ b/engines/tinsel/palette.cpp @@ -32,6 +32,8 @@ #include "tinsel/tinsel.h" #include "common/system.h" +#include "common/textconsole.h" +#include "graphics/palette.h" namespace Tinsel { diff --git a/engines/tinsel/pcode.cpp b/engines/tinsel/pcode.cpp index ccd86d7ed7..a1cc02a832 100644 --- a/engines/tinsel/pcode.cpp +++ b/engines/tinsel/pcode.cpp @@ -36,6 +36,7 @@ #include "tinsel/tinlib.h" // Library routines #include "tinsel/tinsel.h" +#include "common/textconsole.h" #include "common/util.h" namespace Tinsel { diff --git a/engines/tinsel/pdisplay.cpp b/engines/tinsel/pdisplay.cpp index 33eee8bc98..5022f4757a 100644 --- a/engines/tinsel/pdisplay.cpp +++ b/engines/tinsel/pdisplay.cpp @@ -44,6 +44,8 @@ #include "tinsel/text.h" #include "tinsel/tinsel.h" +#include "common/textconsole.h" + namespace Tinsel { //----------------- EXTERNAL GLOBAL DATA -------------------- diff --git a/engines/tinsel/polygons.cpp b/engines/tinsel/polygons.cpp index 0811dae079..f49dddeef4 100644 --- a/engines/tinsel/polygons.cpp +++ b/engines/tinsel/polygons.cpp @@ -34,6 +34,7 @@ #include "tinsel/tinsel.h" #include "tinsel/token.h" +#include "common/textconsole.h" #include "common/util.h" namespace Tinsel { diff --git a/engines/tinsel/rince.cpp b/engines/tinsel/rince.cpp index c0878b6849..38ac0a2ce6 100644 --- a/engines/tinsel/rince.cpp +++ b/engines/tinsel/rince.cpp @@ -47,6 +47,7 @@ #include "tinsel/tinsel.h" #include "tinsel/token.h" +#include "common/textconsole.h" #include "common/util.h" namespace Tinsel { diff --git a/engines/tinsel/saveload.cpp b/engines/tinsel/saveload.cpp index 7a6b5877e8..b6935d41ab 100644 --- a/engines/tinsel/saveload.cpp +++ b/engines/tinsel/saveload.cpp @@ -36,6 +36,7 @@ #include "common/serializer.h" #include "common/savefile.h" +#include "common/textconsole.h" #include "gui/message.h" diff --git a/engines/tinsel/savescn.cpp b/engines/tinsel/savescn.cpp index ef0f5cdc25..aa359d281f 100644 --- a/engines/tinsel/savescn.cpp +++ b/engines/tinsel/savescn.cpp @@ -48,6 +48,8 @@ #include "tinsel/tinlib.h" #include "tinsel/token.h" +#include "common/textconsole.h" + namespace Tinsel { //----------------- EXTERN FUNCTIONS -------------------- diff --git a/engines/tinsel/scene.cpp b/engines/tinsel/scene.cpp index 80f4c585a7..b82bac32cc 100644 --- a/engines/tinsel/scene.cpp +++ b/engines/tinsel/scene.cpp @@ -51,6 +51,7 @@ #include "tinsel/sysvar.h" #include "tinsel/token.h" +#include "common/textconsole.h" namespace Tinsel { diff --git a/engines/tinsel/sched.cpp b/engines/tinsel/sched.cpp index 427e28826f..37c04abd22 100644 --- a/engines/tinsel/sched.cpp +++ b/engines/tinsel/sched.cpp @@ -30,6 +30,7 @@ #include "tinsel/polygons.h" #include "tinsel/sched.h" +#include "common/textconsole.h" #include "common/util.h" namespace Tinsel { diff --git a/engines/tinsel/scn.cpp b/engines/tinsel/scn.cpp index 17ae7c8687..20d75b6b93 100644 --- a/engines/tinsel/scn.cpp +++ b/engines/tinsel/scn.cpp @@ -24,9 +24,6 @@ * A (some would say very) small collection of utility functions. */ -#include "common/endian.h" -#include "common/util.h" - #include "tinsel/dw.h" #include "tinsel/film.h" #include "tinsel/handle.h" diff --git a/engines/tinsel/sound.cpp b/engines/tinsel/sound.cpp index 304223ed61..ec42ca5da4 100644 --- a/engines/tinsel/sound.cpp +++ b/engines/tinsel/sound.cpp @@ -35,9 +35,7 @@ #include "tinsel/sysvar.h" #include "tinsel/background.h" -#include "common/config-manager.h" #include "common/endian.h" -#include "common/file.h" #include "common/memstream.h" #include "common/system.h" diff --git a/engines/tinsel/strres.cpp b/engines/tinsel/strres.cpp index aa303a5391..2dc0e833d1 100644 --- a/engines/tinsel/strres.cpp +++ b/engines/tinsel/strres.cpp @@ -31,6 +31,7 @@ #include "tinsel/scn.h" #include "common/file.h" #include "common/endian.h" +#include "common/textconsole.h" #include "gui/message.h" diff --git a/engines/tinsel/sysvar.cpp b/engines/tinsel/sysvar.cpp index ed4c99a560..ad795fd219 100644 --- a/engines/tinsel/sysvar.cpp +++ b/engines/tinsel/sysvar.cpp @@ -31,6 +31,8 @@ #include "tinsel/sysvar.h" #include "tinsel/tinsel.h" +#include "common/textconsole.h" + namespace Tinsel { // Return for SYS_Platform diff --git a/engines/tinsel/timers.cpp b/engines/tinsel/timers.cpp index 5f15cd9d3b..c1a4cd0ff5 100644 --- a/engines/tinsel/timers.cpp +++ b/engines/tinsel/timers.cpp @@ -31,7 +31,7 @@ #include "tinsel/timers.h" #include "tinsel/dw.h" #include "common/serializer.h" - +#include "common/textconsole.h" #include "common/system.h" namespace Tinsel { diff --git a/engines/tinsel/tinlib.cpp b/engines/tinsel/tinlib.cpp index 13b08a234c..afd409ce27 100644 --- a/engines/tinsel/tinlib.cpp +++ b/engines/tinsel/tinlib.cpp @@ -70,6 +70,7 @@ #include "tinsel/tinsel.h" #include "tinsel/token.h" +#include "common/textconsole.h" namespace Tinsel { diff --git a/engines/tinsel/tinsel.cpp b/engines/tinsel/tinsel.cpp index d78175d00c..748f1322ea 100644 --- a/engines/tinsel/tinsel.cpp +++ b/engines/tinsel/tinsel.cpp @@ -29,22 +29,14 @@ #include "common/events.h" #include "common/EventRecorder.h" #include "common/keyboard.h" -#include "common/file.h" #include "common/fs.h" -#include "common/savefile.h" #include "common/config-manager.h" #include "common/serializer.h" -#include "common/stream.h" #include "backends/audiocd/audiocd.h" #include "engines/util.h" -#include "graphics/cursorman.h" - -#include "base/plugins.h" -#include "base/version.h" - #include "tinsel/actors.h" #include "tinsel/background.h" #include "tinsel/bmv.h" diff --git a/engines/toon/anim.cpp b/engines/toon/anim.cpp index 6004aacead..856acbd986 100644 --- a/engines/toon/anim.cpp +++ b/engines/toon/anim.cpp @@ -23,6 +23,9 @@ * */ +#include "common/debug.h" +#include "common/rect.h" + #include "toon/anim.h" #include "toon/toon.h" #include "toon/tools.h" diff --git a/engines/toon/audio.cpp b/engines/toon/audio.cpp index c2e0bf7b20..026450d3c9 100644 --- a/engines/toon/audio.cpp +++ b/engines/toon/audio.cpp @@ -23,6 +23,8 @@ * */ +#include "common/debug.h" + #include "toon/audio.h" #include "common/memstream.h" #include "common/substream.h" diff --git a/engines/toon/character.cpp b/engines/toon/character.cpp index e63bc912c4..29a61ffd78 100644 --- a/engines/toon/character.cpp +++ b/engines/toon/character.cpp @@ -23,6 +23,9 @@ * */ +#include "common/debug.h" +#include "common/system.h" + #include "toon/character.h" #include "toon/drew.h" #include "toon/flux.h" diff --git a/engines/toon/drew.cpp b/engines/toon/drew.cpp index 4f8152833b..77333c4a9f 100644 --- a/engines/toon/drew.cpp +++ b/engines/toon/drew.cpp @@ -23,6 +23,8 @@ * */ +#include "common/debug.h" + #include "toon/drew.h" namespace Toon { diff --git a/engines/toon/flux.cpp b/engines/toon/flux.cpp index 034332af56..833fdbf5ce 100644 --- a/engines/toon/flux.cpp +++ b/engines/toon/flux.cpp @@ -23,6 +23,8 @@ * */ +#include "common/debug.h" + #include "toon/flux.h" namespace Toon { diff --git a/engines/toon/font.cpp b/engines/toon/font.cpp index 0e2d58ca83..9367d79036 100644 --- a/engines/toon/font.cpp +++ b/engines/toon/font.cpp @@ -23,6 +23,8 @@ * */ +#include "common/debug.h" + #include "toon/font.h" namespace Toon { diff --git a/engines/toon/hotspot.cpp b/engines/toon/hotspot.cpp index 0573e92fef..1c1e23e39e 100644 --- a/engines/toon/hotspot.cpp +++ b/engines/toon/hotspot.cpp @@ -23,6 +23,8 @@ * */ +#include "common/debug.h" + #include "toon/hotspot.h" #include "toon/tools.h" diff --git a/engines/toon/movie.cpp b/engines/toon/movie.cpp index 4305abb62b..19c85d132c 100644 --- a/engines/toon/movie.cpp +++ b/engines/toon/movie.cpp @@ -23,7 +23,16 @@ * */ +#include "common/debug.h" +#include "common/events.h" +#include "common/keyboard.h" +#include "common/stream.h" +#include "common/system.h" +#include "graphics/surface.h" + +#include "toon/audio.h" #include "toon/movie.h" +#include "toon/toon.h" namespace Toon { diff --git a/engines/toon/path.cpp b/engines/toon/path.cpp index e0cdf87502..677876fd8e 100644 --- a/engines/toon/path.cpp +++ b/engines/toon/path.cpp @@ -23,6 +23,8 @@ * */ +#include "common/debug.h" + #include "toon/path.h" namespace Toon { diff --git a/engines/toon/picture.cpp b/engines/toon/picture.cpp index 1945f0fe45..ce28f9c68b 100644 --- a/engines/toon/picture.cpp +++ b/engines/toon/picture.cpp @@ -25,6 +25,9 @@ #include "toon/picture.h" #include "toon/tools.h" + +#include "common/debug.h" +#include "common/rect.h" #include "common/stack.h" namespace Toon { diff --git a/engines/toon/resource.cpp b/engines/toon/resource.cpp index b29aa3b72d..f9f65b423b 100644 --- a/engines/toon/resource.cpp +++ b/engines/toon/resource.cpp @@ -24,6 +24,7 @@ */ #include "toon/resource.h" +#include "common/debug.h" #include "common/file.h" #include "common/memstream.h" #include "common/substream.h" diff --git a/engines/toon/script.cpp b/engines/toon/script.cpp index 0242ace7e3..8703666781 100644 --- a/engines/toon/script.cpp +++ b/engines/toon/script.cpp @@ -23,10 +23,9 @@ * */ +#include "common/debug.h" #include "common/endian.h" #include "common/stream.h" -#include "common/util.h" -#include "common/system.h" #include "toon/toon.h" #include "toon/script.h" diff --git a/engines/toon/script_func.cpp b/engines/toon/script_func.cpp index b181591bf0..8f75097bd4 100644 --- a/engines/toon/script_func.cpp +++ b/engines/toon/script_func.cpp @@ -23,6 +23,9 @@ * */ +#include "common/debug.h" +#include "common/system.h" + #include "toon/script_func.h" #include "toon/script.h" #include "toon/state.h" diff --git a/engines/toon/state.cpp b/engines/toon/state.cpp index 0d6977842d..af37ea9e68 100644 --- a/engines/toon/state.cpp +++ b/engines/toon/state.cpp @@ -23,6 +23,8 @@ * */ +#include "common/debug.h" + #include "toon/state.h" #include "toon/toon.h" diff --git a/engines/toon/text.cpp b/engines/toon/text.cpp index f0d17dd34e..94a3ea5aa7 100644 --- a/engines/toon/text.cpp +++ b/engines/toon/text.cpp @@ -23,6 +23,8 @@ * */ +#include "common/debug.h" + #include "toon/text.h" namespace Toon { diff --git a/engines/toon/tools.cpp b/engines/toon/tools.cpp index da6e0f712e..ff72e69543 100644 --- a/engines/toon/tools.cpp +++ b/engines/toon/tools.cpp @@ -23,6 +23,8 @@ * */ +#include "common/debug.h" + #include "toon/tools.h" #include "toon/toon.h" diff --git a/engines/toon/toon.cpp b/engines/toon/toon.cpp index 5c8ca77b8b..297390c19f 100644 --- a/engines/toon/toon.cpp +++ b/engines/toon/toon.cpp @@ -33,6 +33,7 @@ #include "common/memstream.h" #include "engines/util.h" +#include "graphics/palette.h" #include "graphics/surface.h" #include "graphics/thumbnail.h" #include "gui/saveload.h" diff --git a/engines/touche/resource.cpp b/engines/touche/resource.cpp index 3c108e2931..93406dcb8b 100644 --- a/engines/touche/resource.cpp +++ b/engines/touche/resource.cpp @@ -24,6 +24,7 @@ */ +#include "common/textconsole.h" #include "audio/decoders/flac.h" #include "audio/mixer.h" diff --git a/engines/touche/saveload.cpp b/engines/touche/saveload.cpp index 73817a5a1a..42b68d015c 100644 --- a/engines/touche/saveload.cpp +++ b/engines/touche/saveload.cpp @@ -24,6 +24,7 @@ */ +#include "common/textconsole.h" #include "common/savefile.h" #include "touche/graphics.h" diff --git a/engines/touche/touche.cpp b/engines/touche/touche.cpp index 6b47a7fc4d..15a2b1c53a 100644 --- a/engines/touche/touche.cpp +++ b/engines/touche/touche.cpp @@ -28,13 +28,18 @@ #include "common/debug-channels.h" #include "common/events.h" #include "common/EventRecorder.h" -#include "common/file.h" #include "common/fs.h" #include "common/system.h" +#include "common/archive.h" +#include "common/debug.h" +#include "common/error.h" +#include "common/keyboard.h" +#include "common/textconsole.h" #include "engines/util.h" #include "graphics/cursorman.h" -#include "audio/mididrv.h" +#include "graphics/palette.h" +#include "gui/debugger.h" #include "touche/midi.h" #include "touche/touche.h" diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp index 887994f9e2..770b091451 100644 --- a/engines/tsage/core.cpp +++ b/engines/tsage/core.cpp @@ -25,6 +25,7 @@ #include "common/system.h" #include "engines/engine.h" +#include "graphics/palette.h" #include "tsage/tsage.h" #include "tsage/core.h" #include "tsage/dialogs.h" diff --git a/engines/tsage/debugger.cpp b/engines/tsage/debugger.cpp index e8f0215e0e..c50a4f5c9c 100644 --- a/engines/tsage/debugger.cpp +++ b/engines/tsage/debugger.cpp @@ -24,8 +24,6 @@ */ #include "tsage/debugger.h" -#include "common/config-manager.h" -#include "common/endian.h" #include "tsage/globals.h" #include "tsage/graphics.h" #include "tsage/ringworld_logic.h" diff --git a/engines/tsage/dialogs.cpp b/engines/tsage/dialogs.cpp index be9200c0c7..7be1c8840a 100644 --- a/engines/tsage/dialogs.cpp +++ b/engines/tsage/dialogs.cpp @@ -24,11 +24,13 @@ */ #include "common/translation.h" + +#include "gui/dialog.h" +#include "gui/widget.h" + #include "tsage/tsage.h" #include "tsage/core.h" #include "tsage/dialogs.h" -#include "tsage/graphics.h" -#include "tsage/core.h" #include "tsage/staticres.h" #include "tsage/globals.h" #include "tsage/ringworld_logic.h" diff --git a/engines/tsage/graphics.cpp b/engines/tsage/graphics.cpp index f9f9e4b4ca..dce1b86401 100644 --- a/engines/tsage/graphics.cpp +++ b/engines/tsage/graphics.cpp @@ -29,6 +29,7 @@ #include "tsage/tsage.h" #include "tsage/core.h" #include "common/algorithm.h" +#include "graphics/palette.h" #include "graphics/surface.h" #include "tsage/globals.h" diff --git a/engines/tsage/resources.h b/engines/tsage/resources.h index b33cc37266..4ae41f6557 100644 --- a/engines/tsage/resources.h +++ b/engines/tsage/resources.h @@ -32,6 +32,7 @@ #include "common/list.h" #include "common/str.h" #include "common/str-array.h" +#include "common/textconsole.h" #include "common/util.h" #include "graphics/surface.h" diff --git a/engines/tsage/saveload.cpp b/engines/tsage/saveload.cpp index 8b07767f22..317bc4bbb7 100644 --- a/engines/tsage/saveload.cpp +++ b/engines/tsage/saveload.cpp @@ -24,6 +24,7 @@ */ #include "common/savefile.h" +#include "graphics/palette.h" #include "graphics/scaler.h" #include "graphics/thumbnail.h" #include "tsage/globals.h" diff --git a/engines/tsage/sound.cpp b/engines/tsage/sound.cpp index 7c8325d53e..63e753104e 100644 --- a/engines/tsage/sound.cpp +++ b/engines/tsage/sound.cpp @@ -23,8 +23,6 @@ * */ -#include "common/config-manager.h" -#include "common/endian.h" #include "tsage/core.h" #include "tsage/globals.h" #include "tsage/debugger.h" diff --git a/engines/tsage/tsage.cpp b/engines/tsage/tsage.cpp index 2d3f303d34..d6f07c999b 100644 --- a/engines/tsage/tsage.cpp +++ b/engines/tsage/tsage.cpp @@ -23,11 +23,7 @@ * */ -#include "common/config-manager.h" -#include "common/debug.h" #include "common/debug-channels.h" -#include "common/system.h" -#include "common/savefile.h" #include "engines/util.h" #include "tsage/tsage.h" diff --git a/engines/tucker/locations.cpp b/engines/tucker/locations.cpp index 108c6bcad5..ee117d233d 100644 --- a/engines/tucker/locations.cpp +++ b/engines/tucker/locations.cpp @@ -26,6 +26,7 @@ #include "tucker/tucker.h" #include "tucker/graphics.h" #include "common/system.h" +#include "graphics/palette.h" namespace Tucker { diff --git a/engines/tucker/resource.cpp b/engines/tucker/resource.cpp index c0f1baae99..aeb4399dee 100644 --- a/engines/tucker/resource.cpp +++ b/engines/tucker/resource.cpp @@ -24,6 +24,7 @@ */ #include "common/file.h" +#include "common/textconsole.h" #include "audio/audiostream.h" #include "audio/decoders/flac.h" diff --git a/engines/tucker/saveload.cpp b/engines/tucker/saveload.cpp index 83533a90c3..52c6bf19ce 100644 --- a/engines/tucker/saveload.cpp +++ b/engines/tucker/saveload.cpp @@ -24,6 +24,7 @@ */ #include "common/savefile.h" +#include "common/textconsole.h" #include "tucker/tucker.h" diff --git a/engines/tucker/sequences.cpp b/engines/tucker/sequences.cpp index 5e99e3ccef..d747b346ee 100644 --- a/engines/tucker/sequences.cpp +++ b/engines/tucker/sequences.cpp @@ -24,11 +24,14 @@ */ #include "common/system.h" +#include "common/textconsole.h" #include "audio/audiostream.h" #include "audio/decoders/raw.h" #include "audio/decoders/wave.h" +#include "graphics/palette.h" + #include "tucker/tucker.h" #include "tucker/graphics.h" diff --git a/engines/tucker/tucker.cpp b/engines/tucker/tucker.cpp index e41cbfbeef..ed3046867b 100644 --- a/engines/tucker/tucker.cpp +++ b/engines/tucker/tucker.cpp @@ -26,10 +26,17 @@ #include "common/config-manager.h" #include "common/events.h" #include "common/system.h" +#include "common/archive.h" +#include "common/debug.h" +#include "common/error.h" +#include "common/keyboard.h" +#include "common/textconsole.h" #include "engines/util.h" #include "graphics/cursorman.h" +#include "graphics/palette.h" +#include "gui/debugger.h" #include "tucker/tucker.h" #include "tucker/graphics.h" |