aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--common/debug.h1
-rw-r--r--engines/draci/animation.h2
-rw-r--r--engines/draci/surface.h1
-rw-r--r--engines/gob/demos/scnplayer.h1
-rw-r--r--engines/groovie/vdx.cpp1
-rw-r--r--engines/kyra/kyra_v1.h1
-rw-r--r--engines/lure/res.h1
-rw-r--r--engines/m4/globals.h4
-rw-r--r--engines/parallaction/disk.h5
-rw-r--r--engines/parallaction/disk_br.cpp1
-rw-r--r--engines/parallaction/disk_ns.cpp1
-rw-r--r--engines/saga/events.h1
-rw-r--r--engines/saga/font.h1
-rw-r--r--engines/saga/resource.h1
-rw-r--r--engines/saga/saga.h1
-rw-r--r--engines/sword1/animation.h5
16 files changed, 22 insertions, 6 deletions
diff --git a/common/debug.h b/common/debug.h
index 784b3454b5..2068a1314a 100644
--- a/common/debug.h
+++ b/common/debug.h
@@ -26,7 +26,6 @@
#define COMMON_DEBUG_H
#include "common/scummsys.h"
-#include "common/debug-channels.h"
#include "common/textconsole.h"
namespace Common {
diff --git a/engines/draci/animation.h b/engines/draci/animation.h
index 1a7cb599cb..bbcf03b02f 100644
--- a/engines/draci/animation.h
+++ b/engines/draci/animation.h
@@ -26,6 +26,8 @@
#ifndef DRACI_ANIMATION_H
#define DRACI_ANIMATION_H
+#include "common/array.h"
+#include "common/list.h"
#include "common/rect.h"
#include "draci/sprite.h"
diff --git a/engines/draci/surface.h b/engines/draci/surface.h
index f3c0bd55e8..a5c9ddb597 100644
--- a/engines/draci/surface.h
+++ b/engines/draci/surface.h
@@ -26,6 +26,7 @@
#ifndef DRACI_SURFACE_H
#define DRACI_SURFACE_H
+#include "common/list.h"
#include "graphics/surface.h"
namespace Draci {
diff --git a/engines/gob/demos/scnplayer.h b/engines/gob/demos/scnplayer.h
index 9c6a211fc6..1eb0ae4ba8 100644
--- a/engines/gob/demos/scnplayer.h
+++ b/engines/gob/demos/scnplayer.h
@@ -28,6 +28,7 @@
#include "common/str.h"
#include "common/hashmap.h"
+#include "common/hash-str.h"
#include "gob/demos/demoplayer.h"
diff --git a/engines/groovie/vdx.cpp b/engines/groovie/vdx.cpp
index a8aba47ec6..bd32660621 100644
--- a/engines/groovie/vdx.cpp
+++ b/engines/groovie/vdx.cpp
@@ -27,6 +27,7 @@
#include "groovie/lzss.h"
#include "groovie/vdx.h"
+#include "common/debug-channels.h"
#include "sound/mixer.h"
#include "sound/decoders/raw.h"
diff --git a/engines/kyra/kyra_v1.h b/engines/kyra/kyra_v1.h
index a30f0e7a27..93c7ba2d22 100644
--- a/engines/kyra/kyra_v1.h
+++ b/engines/kyra/kyra_v1.h
@@ -31,6 +31,7 @@
#include "common/array.h"
#include "common/events.h"
#include "common/random.h"
+#include "common/hashmap.h"
#include "common/system.h"
#include "sound/mixer.h"
diff --git a/engines/lure/res.h b/engines/lure/res.h
index 203313acb4..cd6fcde201 100644
--- a/engines/lure/res.h
+++ b/engines/lure/res.h
@@ -32,6 +32,7 @@
#include "lure/hotspots.h"
#include "lure/palette.h"
+#include "common/array.h"
#include "common/file.h"
#include "common/list.h"
#include "common/random.h"
diff --git a/engines/m4/globals.h b/engines/m4/globals.h
index 92bc5e8242..a052a4c868 100644
--- a/engines/m4/globals.h
+++ b/engines/m4/globals.h
@@ -26,11 +26,11 @@
#ifndef M4_GLOBALS_H
#define M4_GLOBALS_H
+#include "common/scummsys.h"
#include "common/array.h"
#include "common/rect.h"
-#include "common/scummsys.h"
-
#include "common/file.h"
+#include "common/list.h"
#include "common/ptr.h"
namespace M4 {
diff --git a/engines/parallaction/disk.h b/engines/parallaction/disk.h
index 8f0768b09c..449e8ec774 100644
--- a/engines/parallaction/disk.h
+++ b/engines/parallaction/disk.h
@@ -29,12 +29,13 @@
#define PATH_LEN 200
#include "common/archive.h"
-#include "common/fs.h"
-#include "common/file.h"
#include "graphics/surface.h"
#include "graphics/iff.h"
+namespace Common {
+ class FSDirectory;
+}
namespace Parallaction {
diff --git a/engines/parallaction/disk_br.cpp b/engines/parallaction/disk_br.cpp
index 2506da52b8..12acf7ba60 100644
--- a/engines/parallaction/disk_br.cpp
+++ b/engines/parallaction/disk_br.cpp
@@ -26,6 +26,7 @@
#include "graphics/iff.h"
#include "common/config-manager.h"
+#include "common/fs.h"
#include "parallaction/parallaction.h"
#include "parallaction/parser.h"
diff --git a/engines/parallaction/disk_ns.cpp b/engines/parallaction/disk_ns.cpp
index c4bc8ab4f7..0b893fbe2c 100644
--- a/engines/parallaction/disk_ns.cpp
+++ b/engines/parallaction/disk_ns.cpp
@@ -24,6 +24,7 @@
*/
#include "common/config-manager.h"
+#include "common/fs.h"
#include "parallaction/parser.h"
#include "parallaction/parallaction.h"
diff --git a/engines/saga/events.h b/engines/saga/events.h
index 7492f01b60..d1530787c2 100644
--- a/engines/saga/events.h
+++ b/engines/saga/events.h
@@ -28,6 +28,7 @@
#ifndef SAGA_EVENT_H
#define SAGA_EVENT_H
+#include "common/list.h"
namespace Saga {
diff --git a/engines/saga/font.h b/engines/saga/font.h
index 074b56bf0d..f290384e87 100644
--- a/engines/saga/font.h
+++ b/engines/saga/font.h
@@ -28,6 +28,7 @@
#ifndef SAGA_FONT_H
#define SAGA_FONT_H
+#include "common/list.h"
#include "saga/gfx.h"
namespace Saga {
diff --git a/engines/saga/resource.h b/engines/saga/resource.h
index dd79b7ed24..2e473ae41d 100644
--- a/engines/saga/resource.h
+++ b/engines/saga/resource.h
@@ -29,6 +29,7 @@
#define SAGA_RESOURCE_H
#include "common/file.h"
+#include "common/list.h"
namespace Saga {
diff --git a/engines/saga/saga.h b/engines/saga/saga.h
index 9b97e54dc4..795b499ad8 100644
--- a/engines/saga/saga.h
+++ b/engines/saga/saga.h
@@ -28,6 +28,7 @@
#include "engines/engine.h"
+#include "common/array.h"
#include "common/random.h"
#include "common/stream.h"
#include "sound/mididrv.h"
diff --git a/engines/sword1/animation.h b/engines/sword1/animation.h
index 629198a63d..e97fc083f6 100644
--- a/engines/sword1/animation.h
+++ b/engines/sword1/animation.h
@@ -30,9 +30,12 @@
#include "graphics/video/smk_decoder.h"
#include "graphics/video/video_player.h"
+#include "common/array.h"
+
+#include "sound/audiostream.h"
+
#include "sword1/screen.h"
#include "sword1/sound.h"
-#include "sound/audiostream.h"
namespace Sword1 {