[Scummvm-git-logs] scummvm master -> 1357bfe6723bb8fca83b3d2fa76987259c58d4d1
ccawley2011
noreply at scummvm.org
Thu Jun 20 19:16:02 UTC 2024
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
1357bfe672 COMMON: Avoid including engine headers in common code for DebugChannelDef
Commit: 1357bfe6723bb8fca83b3d2fa76987259c58d4d1
https://github.com/scummvm/scummvm/commit/1357bfe6723bb8fca83b3d2fa76987259c58d4d1
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2024-06-20T20:15:57+01:00
Commit Message:
COMMON: Avoid including engine headers in common code for DebugChannelDef
Changed paths:
audio/decoders/quicktime.h
backends/audiocd/win32/win32-audiocd.cpp
backends/graphics/opengl/opengl-graphics.h
backends/networking/curl/url.cpp
backends/networking/enet/socket.cpp
common/compression/gzio.cpp
common/compression/powerpacker.cpp
common/debug-channels.h
common/debug.h
common/events.h
engines/access/resources.h
engines/adl/console.h
engines/ags/lib/freetype-2.1.3/ftutil.cpp
engines/asylum/system/text.h
engines/bagel/dialogs/save_dialog.h
engines/chewy/chewy.cpp
engines/chewy/chewy.h
engines/chewy/detail.h
engines/crab/GameParam.h
engines/crab/TMX/TMXLayer.h
engines/crab/image/ImageManager.h
engines/crab/loaders.h
engines/cryomni3d/dialogs_manager.h
engines/cryomni3d/font_manager.h
engines/draci/font.h
engines/freescape/gfx.h
engines/hopkins/graphics.h
engines/hpl1/debug.h
engines/hypno/boyz/boyz.cpp
engines/hypno/wet/wet.cpp
engines/icb/fn_routines_ed.cpp
engines/macventure/windows.h
engines/mads/assets.h
engines/mads/msurface.h
engines/metaengine.h
engines/mm/shared/utils/strings_data.h
engines/mtropolis/runtime.h
engines/mutationofjb/font.h
engines/mutationofjb/widgets/labelwidget.h
engines/nancy/commontypes.h
engines/nancy/cursor.h
engines/nancy/enginedata.h
engines/nancy/graphics.h
engines/nancy/renderobject.h
engines/nancy/util.h
engines/petka/objects/object.h
engines/pink/gui.cpp
engines/playground3d/playground3d.cpp
engines/sherlock/tattoo/widget_credits.h
engines/stark/resources/anim.h
engines/stark/resources/image.h
engines/stark/ui/cursor.h
engines/stark/ui/menu/fmvmenu.h
engines/tetraedge/te/te_button_layout.h
engines/tetraedge/te/te_camera.h
engines/tetraedge/te/te_image.h
engines/tetraedge/te/te_pick_mesh.h
engines/tetraedge/te/te_xml_gui.h
engines/titanic/star_control/fvector.cpp
engines/twine/renderer/redraw.h
engines/ultima/shared/gfx/bitmap.h
engines/ultima/shared/gfx/sprites.h
engines/ultima/ultima8/gfx/fonts/font_manager.h
engines/ultima/ultima8/gfx/shape.h
engines/vcruise/script.h
engines/watchmaker/watchmaker.cpp
engines/zvision/scripting/actions.h
engines/zvision/scripting/controls/hotmov_control.h
engines/zvision/scripting/controls/lever_control.h
engines/zvision/scripting/controls/titler_control.h
engines/zvision/scripting/effects/animation_effect.h
graphics/fonts/amigafont.h
graphics/scaler/downscaler.cpp
graphics/tinygl/zbuffer.h
diff --git a/audio/decoders/quicktime.h b/audio/decoders/quicktime.h
index 3cc3391dac3..c00824a36c6 100644
--- a/audio/decoders/quicktime.h
+++ b/audio/decoders/quicktime.h
@@ -35,6 +35,7 @@
#include "common/types.h"
namespace Common {
+ class Path;
class SeekableReadStream;
class String;
}
diff --git a/backends/audiocd/win32/win32-audiocd.cpp b/backends/audiocd/win32/win32-audiocd.cpp
index 52c01ff078e..da03391b1b9 100644
--- a/backends/audiocd/win32/win32-audiocd.cpp
+++ b/backends/audiocd/win32/win32-audiocd.cpp
@@ -54,6 +54,7 @@
#include "common/array.h"
#include "common/config-manager.h"
#include "common/debug.h"
+#include "common/fs.h"
#include "common/mutex.h"
#include "common/queue.h"
#include "common/str.h"
diff --git a/backends/graphics/opengl/opengl-graphics.h b/backends/graphics/opengl/opengl-graphics.h
index 8ed70349843..b32f9b44535 100644
--- a/backends/graphics/opengl/opengl-graphics.h
+++ b/backends/graphics/opengl/opengl-graphics.h
@@ -25,6 +25,8 @@
#include "backends/graphics/opengl/framebuffer.h"
#include "backends/graphics/windowed.h"
+#include "base/plugins.h"
+
#include "common/frac.h"
#include "common/mutex.h"
#include "common/ustr.h"
diff --git a/backends/networking/curl/url.cpp b/backends/networking/curl/url.cpp
index 66efd553eef..646fd709f40 100644
--- a/backends/networking/curl/url.cpp
+++ b/backends/networking/curl/url.cpp
@@ -23,6 +23,7 @@
#include <curl/curl.h>
#include "backends/networking/curl/url.h"
#include "common/debug.h"
+#include "common/textconsole.h"
namespace Networking {
diff --git a/backends/networking/enet/socket.cpp b/backends/networking/enet/socket.cpp
index 07989dbc0df..20d394cf781 100644
--- a/backends/networking/enet/socket.cpp
+++ b/backends/networking/enet/socket.cpp
@@ -24,6 +24,7 @@
#include "backends/networking/enet/source/enet.h"
#include "backends/networking/enet/socket.h"
#include "common/debug.h"
+#include "common/textconsole.h"
namespace Networking {
diff --git a/common/compression/gzio.cpp b/common/compression/gzio.cpp
index a2efc718f28..d8f0d3d2e0c 100644
--- a/common/compression/gzio.cpp
+++ b/common/compression/gzio.cpp
@@ -39,6 +39,7 @@
#include "common/stream.h"
#include "common/ptr.h"
#include "common/memstream.h"
+#include "common/textconsole.h"
#include "common/compression/deflate.h"
diff --git a/common/compression/powerpacker.cpp b/common/compression/powerpacker.cpp
index e3b427003c7..61505fafaf6 100644
--- a/common/compression/powerpacker.cpp
+++ b/common/compression/powerpacker.cpp
@@ -22,6 +22,7 @@
#include "common/compression/powerpacker.h"
#include "common/memstream.h"
#include "common/debug.h"
+#include "common/textconsole.h"
namespace Common {
diff --git a/common/debug-channels.h b/common/debug-channels.h
index 239ef2cf777..479074f37f3 100644
--- a/common/debug-channels.h
+++ b/common/debug-channels.h
@@ -30,7 +30,21 @@
#include "common/singleton.h"
#include "common/str.h"
-#include "engines/metaengine.h"
+/**
+ * debug channels structure
+ */
+struct DebugChannelDef {
+ uint32 channel; /*!< enum value, channel id, e.g. kDebugGlobalDetection */
+ const char *name; /*!< name of debug channel, e.g. "detection" */
+ const char *description; /*!< description of debug channel, e.g. "track scripts" */
+};
+
+/**
+ * delimiter of the array of DebugChannelDef
+ */
+#define DEBUG_CHANNEL_END {0, NULL, NULL}
+
+extern const DebugChannelDef gDebugChannels[];
namespace Common {
diff --git a/common/debug.h b/common/debug.h
index b26dd07b07b..a2a69972344 100644
--- a/common/debug.h
+++ b/common/debug.h
@@ -24,8 +24,6 @@
#include "common/scummsys.h"
-#include "engines/metaengine.h"
-
#ifdef DISABLE_TEXT_CONSOLE
inline void debug(const char *s, ...) {}
@@ -167,8 +165,6 @@ enum GlobalDebugLevels {
kDebugLevelMacGUI,
};
-extern const DebugChannelDef gDebugChannels[];
-
/** @} */
#endif
diff --git a/common/events.h b/common/events.h
index cbb77fb7123..82ac0f0e098 100644
--- a/common/events.h
+++ b/common/events.h
@@ -23,6 +23,7 @@
#define COMMON_EVENTS_H
#include "common/keyboard.h"
+#include "common/path.h"
#include "common/queue.h"
#include "common/rect.h"
#include "common/noncopyable.h"
diff --git a/engines/access/resources.h b/engines/access/resources.h
index 40b22a70538..6b290b0b8ef 100644
--- a/engines/access/resources.h
+++ b/engines/access/resources.h
@@ -25,6 +25,7 @@
#include "common/scummsys.h"
#include "common/array.h"
#include "common/language.h"
+#include "common/path.h"
#include "common/rect.h"
#include "common/str-array.h"
#include "common/stream.h"
diff --git a/engines/adl/console.h b/engines/adl/console.h
index 0f0f8a19b30..b7e7d3846ce 100644
--- a/engines/adl/console.h
+++ b/engines/adl/console.h
@@ -25,6 +25,7 @@
#include "gui/debugger.h"
#include "common/hashmap.h"
+#include "common/path.h"
namespace Common {
class String;
diff --git a/engines/ags/lib/freetype-2.1.3/ftutil.cpp b/engines/ags/lib/freetype-2.1.3/ftutil.cpp
index 81d3258f012..afd1b0e6c6a 100644
--- a/engines/ags/lib/freetype-2.1.3/ftutil.cpp
+++ b/engines/ags/lib/freetype-2.1.3/ftutil.cpp
@@ -41,6 +41,7 @@
#include "ags/lib/freetype-2.1.3/ftmemory.h"
#include "common/debug.h"
+#include "common/textconsole.h"
namespace AGS3 {
diff --git a/engines/asylum/system/text.h b/engines/asylum/system/text.h
index af715bfd4d4..6df86994a09 100644
--- a/engines/asylum/system/text.h
+++ b/engines/asylum/system/text.h
@@ -22,6 +22,7 @@
#ifndef ASYLUM_SYSTEM_TEXT_H
#define ASYLUM_SYSTEM_TEXT_H
+#include "common/ptr.h"
#include "common/rect.h"
#include "common/scummsys.h"
#include "graphics/font.h"
diff --git a/engines/bagel/dialogs/save_dialog.h b/engines/bagel/dialogs/save_dialog.h
index 43bc128889b..f0a989d4687 100644
--- a/engines/bagel/dialogs/save_dialog.h
+++ b/engines/bagel/dialogs/save_dialog.h
@@ -29,6 +29,8 @@
#include "bagel/boflib/gui/button.h"
#include "bagel/boflib/gui/edit_text.h"
+#include "engines/savestate.h"
+
namespace Bagel {
#define NUM_BUTTONS 6
diff --git a/engines/chewy/chewy.cpp b/engines/chewy/chewy.cpp
index 91dd6ed661b..01fdc2dd4b0 100644
--- a/engines/chewy/chewy.cpp
+++ b/engines/chewy/chewy.cpp
@@ -22,6 +22,7 @@
#include "common/config-manager.h"
#include "common/fs.h"
#include "common/system.h"
+#include "engines/metaengine.h"
#include "engines/util.h"
#include "chewy/chewy.h"
#include "chewy/cursor.h"
diff --git a/engines/chewy/chewy.h b/engines/chewy/chewy.h
index 4517ed0f1a9..bc978288704 100644
--- a/engines/chewy/chewy.h
+++ b/engines/chewy/chewy.h
@@ -31,6 +31,7 @@
#include "common/memstream.h"
#include "common/random.h"
#include "engines/engine.h"
+#include "engines/savestate.h"
#include "graphics/screen.h"
namespace Chewy {
diff --git a/engines/chewy/detail.h b/engines/chewy/detail.h
index 57f4665a50e..2188669c14d 100644
--- a/engines/chewy/detail.h
+++ b/engines/chewy/detail.h
@@ -22,6 +22,7 @@
#ifndef CHEWY_DETAIL_H
#define CHEWY_DETAIL_H
+#include "common/path.h"
#include "common/scummsys.h"
#include "common/stream.h"
#include "chewy/ngstypes.h"
diff --git a/engines/crab/GameParam.h b/engines/crab/GameParam.h
index 51edfd70f10..e1bc138fcea 100644
--- a/engines/crab/GameParam.h
+++ b/engines/crab/GameParam.h
@@ -32,6 +32,8 @@
#define CRAB_GAMEPARAM_H
#include "common/hashmap.h"
+#include "common/hash-str.h"
+#include "common/list.h"
#include "common/rect.h"
#include "common/str.h"
#include "crab/loaders.h"
diff --git a/engines/crab/TMX/TMXLayer.h b/engines/crab/TMX/TMXLayer.h
index d0069b231cf..73f99372788 100644
--- a/engines/crab/TMX/TMXLayer.h
+++ b/engines/crab/TMX/TMXLayer.h
@@ -35,6 +35,8 @@
#include "crab/image/Image.h"
#include "crab/TMX/TileInfo.h"
+#include "common/list.h"
+
namespace Crab {
namespace TMX {
diff --git a/engines/crab/image/ImageManager.h b/engines/crab/image/ImageManager.h
index 699845a1c83..e4c0f76c638 100644
--- a/engines/crab/image/ImageManager.h
+++ b/engines/crab/image/ImageManager.h
@@ -38,6 +38,8 @@
#include "crab/image/Image.h"
#include "crab/TMX/TMXTileSet.h"
+#include "common/hashmap.h"
+
namespace Crab {
// We use this object as the key for all image assets
diff --git a/engines/crab/loaders.h b/engines/crab/loaders.h
index b0b3ed65f6a..7136c60f672 100644
--- a/engines/crab/loaders.h
+++ b/engines/crab/loaders.h
@@ -32,6 +32,7 @@
#define CRAB_LOADERS_H
#include "common/debug.h"
+#include "common/path.h"
#include "common/str.h"
#include "crab/color.h"
#include "crab/gametype.h"
diff --git a/engines/cryomni3d/dialogs_manager.h b/engines/cryomni3d/dialogs_manager.h
index a303ccf1a0a..b14af200823 100644
--- a/engines/cryomni3d/dialogs_manager.h
+++ b/engines/cryomni3d/dialogs_manager.h
@@ -25,6 +25,7 @@
#include "common/array.h"
#include "common/hash-str.h"
#include "common/hashmap.h"
+#include "common/path.h"
#include "common/rect.h"
#include "common/str.h"
#include "common/str-array.h"
diff --git a/engines/cryomni3d/font_manager.h b/engines/cryomni3d/font_manager.h
index 5a36c7163a7..2c125d01c42 100644
--- a/engines/cryomni3d/font_manager.h
+++ b/engines/cryomni3d/font_manager.h
@@ -23,6 +23,7 @@
#define CRYOMNI3D_FONT_MANAGER_H
#include "common/array.h"
+#include "common/path.h"
#include "common/str.h"
#include "common/str-enc.h"
#include "common/ustr.h"
diff --git a/engines/draci/font.h b/engines/draci/font.h
index 00c8702ea8c..a722e56a2b3 100644
--- a/engines/draci/font.h
+++ b/engines/draci/font.h
@@ -23,6 +23,7 @@
#define DRACI_FONT_H
#include "graphics/font.h"
+#include "common/path.h"
namespace Draci {
diff --git a/engines/freescape/gfx.h b/engines/freescape/gfx.h
index 772b1bf3176..7c4748d660d 100644
--- a/engines/freescape/gfx.h
+++ b/engines/freescape/gfx.h
@@ -22,6 +22,7 @@
#ifndef FREESCAPE_GFX_H
#define FREESCAPE_GFX_H
+#include "common/hashmap.h"
#include "common/rendermode.h"
#include "common/rect.h"
diff --git a/engines/hopkins/graphics.h b/engines/hopkins/graphics.h
index aa08394b177..9027abe8121 100644
--- a/engines/hopkins/graphics.h
+++ b/engines/hopkins/graphics.h
@@ -25,6 +25,7 @@
#include "common/scummsys.h"
#include "common/array.h"
#include "common/endian.h"
+#include "common/path.h"
#include "common/rect.h"
#include "graphics/surface.h"
diff --git a/engines/hpl1/debug.h b/engines/hpl1/debug.h
index f49e69f7bbd..1a3c1996466 100644
--- a/engines/hpl1/debug.h
+++ b/engines/hpl1/debug.h
@@ -23,6 +23,7 @@
#define HPL1_DEBUG_H
#include "common/debug.h"
+#include "common/textconsole.h"
#define HPL1_UNIMPLEMENTED(fnName) error("call to unimplemented function " #fnName)
diff --git a/engines/hypno/boyz/boyz.cpp b/engines/hypno/boyz/boyz.cpp
index b6a82b194d8..04927122ba4 100644
--- a/engines/hypno/boyz/boyz.cpp
+++ b/engines/hypno/boyz/boyz.cpp
@@ -24,6 +24,9 @@
#include "common/events.h"
+#include "engines/metaengine.h"
+#include "engines/savestate.h"
+
namespace Hypno {
static const chapterEntry rawChapterTable[] = {
diff --git a/engines/hypno/wet/wet.cpp b/engines/hypno/wet/wet.cpp
index 275d5c1400c..e833c376b9b 100644
--- a/engines/hypno/wet/wet.cpp
+++ b/engines/hypno/wet/wet.cpp
@@ -25,6 +25,9 @@
#include "hypno/hypno.h"
+#include "engines/metaengine.h"
+#include "engines/savestate.h"
+
namespace Hypno {
static const char *failedDetectionError = \
diff --git a/engines/icb/fn_routines_ed.cpp b/engines/icb/fn_routines_ed.cpp
index 8682e3bd287..c4835efb53a 100644
--- a/engines/icb/fn_routines_ed.cpp
+++ b/engines/icb/fn_routines_ed.cpp
@@ -26,6 +26,7 @@
#include "engines/icb/fn_routines.h"
#include "common/debug.h"
+#include "common/textconsole.h"
namespace ICB {
diff --git a/engines/macventure/windows.h b/engines/macventure/windows.h
index 00beab2a3cc..7791430d91d 100644
--- a/engines/macventure/windows.h
+++ b/engines/macventure/windows.h
@@ -31,6 +31,7 @@
#define MACVENTURE_WINDOWS_H
#include "common/rect.h"
+#include "common/str.h"
#include "common/array.h"
namespace MacVenture {
diff --git a/engines/mads/assets.h b/engines/mads/assets.h
index 936e17772f0..334cbe0e56b 100644
--- a/engines/mads/assets.h
+++ b/engines/mads/assets.h
@@ -23,6 +23,7 @@
#define MADS_ASSETS_H
#include "common/array.h"
+#include "common/path.h"
#include "mads/palette.h"
namespace MADS {
diff --git a/engines/mads/msurface.h b/engines/mads/msurface.h
index 86db234ba50..25f60dd7f8f 100644
--- a/engines/mads/msurface.h
+++ b/engines/mads/msurface.h
@@ -23,6 +23,7 @@
#define MADS_MSURFACE_H
#include "common/scummsys.h"
+#include "common/path.h"
#include "common/rect.h"
#include "graphics/screen.h"
#include "mads/palette.h"
diff --git a/engines/metaengine.h b/engines/metaengine.h
index c188601aa5a..cc07e9fe1d1 100644
--- a/engines/metaengine.h
+++ b/engines/metaengine.h
@@ -25,6 +25,7 @@
#include "common/scummsys.h"
#include "common/error.h"
#include "common/array.h"
+#include "common/debug-channels.h"
#include "engines/achievements.h"
#include "engines/game.h"
@@ -75,20 +76,6 @@ struct ExtraGuiOption {
byte groupLeaderId; /*!< When this checkbox is unchecked, disable all checkboxes in this group. One leader per group. */
};
-/**
- * debug channels structure
- */
-struct DebugChannelDef {
- uint32 channel; /*!< enum value, channel id, e.g. kDebugGlobalDetection */
- const char *name; /*!< name of debug channel, e.g. "detection" */
- const char *description; /*!< description of debug channel, e.g. "track scripts" */
-};
-
-/**
- * delimiter of the array of DebugChannelDef
- */
-#define DEBUG_CHANNEL_END {0, NULL, NULL}
-
/**
* Array of ExtraGuiOption structures.
*/
diff --git a/engines/mm/shared/utils/strings_data.h b/engines/mm/shared/utils/strings_data.h
index 4bd5a2c01b2..d2d1434a9fa 100644
--- a/engines/mm/shared/utils/strings_data.h
+++ b/engines/mm/shared/utils/strings_data.h
@@ -23,6 +23,7 @@
#define MM_UTILS_STRINGS_DATA_H
#include "common/hash-str.h"
+#include "common/path.h"
namespace MM {
diff --git a/engines/mtropolis/runtime.h b/engines/mtropolis/runtime.h
index 76f810e52e2..b2a5c267950 100644
--- a/engines/mtropolis/runtime.h
+++ b/engines/mtropolis/runtime.h
@@ -22,6 +22,7 @@
#ifndef MTROPOLIS_RUNTIME_H
#define MTROPOLIS_RUNTIME_H
+#include "common/archive.h"
#include "common/array.h"
#include "common/events.h"
#include "common/language.h"
diff --git a/engines/mutationofjb/font.h b/engines/mutationofjb/font.h
index 74355610c39..41a4ecfbb6d 100644
--- a/engines/mutationofjb/font.h
+++ b/engines/mutationofjb/font.h
@@ -24,6 +24,7 @@
#include "common/scummsys.h"
#include "common/hashmap.h"
+#include "common/path.h"
#include "graphics/font.h"
#include "graphics/managed_surface.h"
#include "graphics/surface.h"
diff --git a/engines/mutationofjb/widgets/labelwidget.h b/engines/mutationofjb/widgets/labelwidget.h
index e441c2c309b..0a93469e962 100644
--- a/engines/mutationofjb/widgets/labelwidget.h
+++ b/engines/mutationofjb/widgets/labelwidget.h
@@ -24,6 +24,8 @@
#include "mutationofjb/widgets/widget.h"
+#include "common/str.h"
+
namespace MutationOfJB {
class LabelWidget : public Widget {
diff --git a/engines/nancy/commontypes.h b/engines/nancy/commontypes.h
index 34b6ad43328..c118303ad74 100644
--- a/engines/nancy/commontypes.h
+++ b/engines/nancy/commontypes.h
@@ -24,6 +24,7 @@
#include "common/rect.h"
#include "common/array.h"
+#include "common/language.h"
#include "common/str.h"
#include "math/vector3d.h"
diff --git a/engines/nancy/cursor.h b/engines/nancy/cursor.h
index eb8808ed389..42622d6d1eb 100644
--- a/engines/nancy/cursor.h
+++ b/engines/nancy/cursor.h
@@ -23,6 +23,7 @@
#define NANCY_CURSOR_H
#include "common/array.h"
+#include "common/stream.h"
#include "graphics/managed_surface.h"
diff --git a/engines/nancy/enginedata.h b/engines/nancy/enginedata.h
index 2d083301d26..6e401197cb8 100644
--- a/engines/nancy/enginedata.h
+++ b/engines/nancy/enginedata.h
@@ -24,6 +24,9 @@
#include "engines/nancy/commontypes.h"
+#include "common/hash-str.h"
+#include "common/path.h"
+
namespace Nancy {
// Data types corresponding to chunks found inside BOOT
diff --git a/engines/nancy/graphics.h b/engines/nancy/graphics.h
index 0bb89559b34..b8838852522 100644
--- a/engines/nancy/graphics.h
+++ b/engines/nancy/graphics.h
@@ -22,6 +22,8 @@
#ifndef NANCY_GRAPHICS_H
#define NANCY_GRAPHICS_H
+#include "common/path.h"
+
#include "graphics/screen.h"
#include "engines/nancy/font.h"
diff --git a/engines/nancy/renderobject.h b/engines/nancy/renderobject.h
index 6cf5d2886cf..374842aaf0b 100644
--- a/engines/nancy/renderobject.h
+++ b/engines/nancy/renderobject.h
@@ -22,6 +22,7 @@
#ifndef NANCY_RENDEROBJECT_H
#define NANCY_RENDEROBJECT_H
+#include "common/path.h"
#include "graphics/managed_surface.h"
namespace Nancy {
diff --git a/engines/nancy/util.h b/engines/nancy/util.h
index 665cde67b2b..ef1e97b32d1 100644
--- a/engines/nancy/util.h
+++ b/engines/nancy/util.h
@@ -21,6 +21,8 @@
#ifndef NANCY_UTIL_H
#define NANCY_UTIL_H
+#include "common/array.h"
+#include "common/path.h"
#include "common/rect.h"
#include "common/serializer.h"
diff --git a/engines/petka/objects/object.h b/engines/petka/objects/object.h
index 115c6f64d18..204ec26c242 100644
--- a/engines/petka/objects/object.h
+++ b/engines/petka/objects/object.h
@@ -23,6 +23,7 @@
#define PETKA_OBJECT_H
#include "common/rect.h"
+#include "common/str.h"
#include "petka/base.h"
diff --git a/engines/pink/gui.cpp b/engines/pink/gui.cpp
index ba34a83204e..2fc1abad001 100644
--- a/engines/pink/gui.cpp
+++ b/engines/pink/gui.cpp
@@ -22,6 +22,8 @@
#include "common/config-manager.h"
#include "common/translation.h"
+#include "engines/metaengine.h"
+
#include "graphics/macgui/macwindowmanager.h"
#include "graphics/macgui/macmenu.h"
diff --git a/engines/playground3d/playground3d.cpp b/engines/playground3d/playground3d.cpp
index b28a5589f04..5b2fc3df7d4 100644
--- a/engines/playground3d/playground3d.cpp
+++ b/engines/playground3d/playground3d.cpp
@@ -21,6 +21,7 @@
#include "common/scummsys.h"
#include "common/config-manager.h"
+#include "common/error.h"
#include "common/events.h"
#include "graphics/renderer.h"
diff --git a/engines/sherlock/tattoo/widget_credits.h b/engines/sherlock/tattoo/widget_credits.h
index 85564cae01e..d50419ac7f3 100644
--- a/engines/sherlock/tattoo/widget_credits.h
+++ b/engines/sherlock/tattoo/widget_credits.h
@@ -24,6 +24,7 @@
#include "common/array.h"
#include "common/rect.h"
+#include "common/str.h"
namespace Sherlock {
diff --git a/engines/stark/resources/anim.h b/engines/stark/resources/anim.h
index c7010fa5899..9fb8a899c7e 100644
--- a/engines/stark/resources/anim.h
+++ b/engines/stark/resources/anim.h
@@ -22,6 +22,7 @@
#ifndef STARK_RESOURCES_ANIM_H
#define STARK_RESOURCES_ANIM_H
+#include "common/path.h"
#include "common/rect.h"
#include "common/str.h"
diff --git a/engines/stark/resources/image.h b/engines/stark/resources/image.h
index 41fb8ce67eb..9b3b7143f7a 100644
--- a/engines/stark/resources/image.h
+++ b/engines/stark/resources/image.h
@@ -22,6 +22,7 @@
#ifndef STARK_RESOURCES_IMAGE_H
#define STARK_RESOURCES_IMAGE_H
+#include "common/path.h"
#include "common/rect.h"
#include "common/str.h"
diff --git a/engines/stark/ui/cursor.h b/engines/stark/ui/cursor.h
index 513898ece56..8e660d33d56 100644
--- a/engines/stark/ui/cursor.h
+++ b/engines/stark/ui/cursor.h
@@ -23,6 +23,7 @@
#define STARK_UI_CURSOR_H
#include "common/rect.h"
+#include "common/str.h"
#include "common/scummsys.h"
namespace Stark {
diff --git a/engines/stark/ui/menu/fmvmenu.h b/engines/stark/ui/menu/fmvmenu.h
index 221a59abadd..98588636135 100644
--- a/engines/stark/ui/menu/fmvmenu.h
+++ b/engines/stark/ui/menu/fmvmenu.h
@@ -25,6 +25,8 @@
#include "engines/stark/ui/menu/locationscreen.h"
#include "engines/stark/visual/text.h"
+#include "common/path.h"
+
namespace Stark {
class FMVWidget;
diff --git a/engines/tetraedge/te/te_button_layout.h b/engines/tetraedge/te/te_button_layout.h
index 1eca3c98f31..66e46b9aa8a 100644
--- a/engines/tetraedge/te/te_button_layout.h
+++ b/engines/tetraedge/te/te_button_layout.h
@@ -27,6 +27,8 @@
#include "tetraedge/te/te_signal.h"
#include "tetraedge/te/te_timer.h"
+#include "common/path.h"
+
namespace Common {
struct Point;
}
diff --git a/engines/tetraedge/te/te_camera.h b/engines/tetraedge/te/te_camera.h
index b17a1e69fa7..fef3328597c 100644
--- a/engines/tetraedge/te/te_camera.h
+++ b/engines/tetraedge/te/te_camera.h
@@ -22,6 +22,7 @@
#ifndef TETRAEDGE_TE_TE_CAMERA_H
#define TETRAEDGE_TE_TE_CAMERA_H
+#include "common/path.h"
#include "common/str.h"
#include "math/ray.h"
diff --git a/engines/tetraedge/te/te_image.h b/engines/tetraedge/te/te_image.h
index 4b4d73b8e93..3ae7bd90af7 100644
--- a/engines/tetraedge/te/te_image.h
+++ b/engines/tetraedge/te/te_image.h
@@ -22,6 +22,7 @@
#ifndef TETRAEDGE_TE_TE_IMAGE_H
#define TETRAEDGE_TE_TE_IMAGE_H
+#include "common/fs.h"
#include "common/ptr.h"
#include "common/stream.h"
#include "common/types.h"
diff --git a/engines/tetraedge/te/te_pick_mesh.h b/engines/tetraedge/te/te_pick_mesh.h
index 11783130075..933d2201628 100644
--- a/engines/tetraedge/te/te_pick_mesh.h
+++ b/engines/tetraedge/te/te_pick_mesh.h
@@ -24,6 +24,8 @@
#include "tetraedge/te/te_vector3f32.h"
+#include "common/array.h"
+
namespace Tetraedge {
class TePickMesh {
diff --git a/engines/tetraedge/te/te_xml_gui.h b/engines/tetraedge/te/te_xml_gui.h
index 8324270fbbf..29fa920d7fd 100644
--- a/engines/tetraedge/te/te_xml_gui.h
+++ b/engines/tetraedge/te/te_xml_gui.h
@@ -22,6 +22,7 @@
#ifndef TETRAEDGE_TE_TE_XML_GUI_H
#define TETRAEDGE_TE_TE_XML_GUI_H
+#include "common/hash-str.h"
#include "common/str.h"
#include "common/path.h"
diff --git a/engines/titanic/star_control/fvector.cpp b/engines/titanic/star_control/fvector.cpp
index 5665bdec222..1a5cc4fa60d 100644
--- a/engines/titanic/star_control/fvector.cpp
+++ b/engines/titanic/star_control/fvector.cpp
@@ -22,6 +22,7 @@
#include "titanic/star_control/fvector.h"
#include "titanic/star_control/fpose.h"
+#include "common/str.h"
#include "common/math.h"
namespace Titanic {
diff --git a/engines/twine/renderer/redraw.h b/engines/twine/renderer/redraw.h
index c7636bdd001..05ba4c1fe53 100644
--- a/engines/twine/renderer/redraw.h
+++ b/engines/twine/renderer/redraw.h
@@ -24,6 +24,7 @@
#include "common/scummsys.h"
#include "common/rect.h"
+#include "common/str.h"
#include "twine/shared.h"
namespace TwinE {
diff --git a/engines/ultima/shared/gfx/bitmap.h b/engines/ultima/shared/gfx/bitmap.h
index 14c384c3018..42bb9067c58 100644
--- a/engines/ultima/shared/gfx/bitmap.h
+++ b/engines/ultima/shared/gfx/bitmap.h
@@ -23,6 +23,7 @@
#define ULTIMA_BITMAP_H
#include "ultima/shared/core/lzw.h"
+#include "common/path.h"
#include "common/stream.h"
#include "graphics/managed_surface.h"
diff --git a/engines/ultima/shared/gfx/sprites.h b/engines/ultima/shared/gfx/sprites.h
index beb5e4b828f..4f38a5934ca 100644
--- a/engines/ultima/shared/gfx/sprites.h
+++ b/engines/ultima/shared/gfx/sprites.h
@@ -23,6 +23,7 @@
#define ULTIMA_SPRITES_H
#include "common/array.h"
+#include "common/path.h"
#include "graphics/managed_surface.h"
#include "ultima/shared/core/rect.h"
diff --git a/engines/ultima/ultima8/gfx/fonts/font_manager.h b/engines/ultima/ultima8/gfx/fonts/font_manager.h
index c2e8f0b900d..2e87005a0ee 100644
--- a/engines/ultima/ultima8/gfx/fonts/font_manager.h
+++ b/engines/ultima/ultima8/gfx/fonts/font_manager.h
@@ -24,6 +24,7 @@
#include "ultima/shared/std/containers.h"
#include "ultima/shared/std/string.h"
+#include "common/path.h"
#include "graphics/font.h"
namespace Ultima {
diff --git a/engines/ultima/ultima8/gfx/shape.h b/engines/ultima/ultima8/gfx/shape.h
index 5cf97956996..5b57df58951 100644
--- a/engines/ultima/ultima8/gfx/shape.h
+++ b/engines/ultima/ultima8/gfx/shape.h
@@ -24,6 +24,8 @@
#include "ultima/shared/std/containers.h"
+#include "common/stream.h"
+
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/vcruise/script.h b/engines/vcruise/script.h
index 0d2070e6aa0..6afcd9fd19d 100644
--- a/engines/vcruise/script.h
+++ b/engines/vcruise/script.h
@@ -24,6 +24,7 @@
#include "common/array.h"
#include "common/hashmap.h"
+#include "common/path.h"
#include "common/ptr.h"
#include "common/types.h"
diff --git a/engines/watchmaker/watchmaker.cpp b/engines/watchmaker/watchmaker.cpp
index ef07764b2ff..5ac1805d8df 100644
--- a/engines/watchmaker/watchmaker.cpp
+++ b/engines/watchmaker/watchmaker.cpp
@@ -21,6 +21,7 @@
#include "watchmaker/watchmaker.h"
#include "watchmaker/console.h"
+#include "common/error.h"
#include "engines/util.h"
namespace Watchmaker {
diff --git a/engines/zvision/scripting/actions.h b/engines/zvision/scripting/actions.h
index deeba06ac5c..00313607d8c 100644
--- a/engines/zvision/scripting/actions.h
+++ b/engines/zvision/scripting/actions.h
@@ -22,6 +22,7 @@
#ifndef ZVISION_ACTIONS_H
#define ZVISION_ACTIONS_H
+#include "common/path.h"
#include "common/str.h"
#include "common/rect.h"
diff --git a/engines/zvision/scripting/controls/hotmov_control.h b/engines/zvision/scripting/controls/hotmov_control.h
index 06ad28d9ba6..cdc6fe85c24 100644
--- a/engines/zvision/scripting/controls/hotmov_control.h
+++ b/engines/zvision/scripting/controls/hotmov_control.h
@@ -25,6 +25,7 @@
#include "zvision/scripting/control.h"
#include "common/array.h"
+#include "common/path.h"
#include "common/rect.h"
namespace Video {
diff --git a/engines/zvision/scripting/controls/lever_control.h b/engines/zvision/scripting/controls/lever_control.h
index 9e19fd066b5..3abb2525866 100644
--- a/engines/zvision/scripting/controls/lever_control.h
+++ b/engines/zvision/scripting/controls/lever_control.h
@@ -25,6 +25,7 @@
#include "zvision/scripting/control.h"
#include "common/list.h"
+#include "common/path.h"
#include "common/rect.h"
namespace Video {
diff --git a/engines/zvision/scripting/controls/titler_control.h b/engines/zvision/scripting/controls/titler_control.h
index bc47819b1f1..254dfc0ddf4 100644
--- a/engines/zvision/scripting/controls/titler_control.h
+++ b/engines/zvision/scripting/controls/titler_control.h
@@ -26,6 +26,7 @@
#include "graphics/surface.h"
+#include "common/path.h"
#include "common/rect.h"
#include "common/array.h"
diff --git a/engines/zvision/scripting/effects/animation_effect.h b/engines/zvision/scripting/effects/animation_effect.h
index 47bd3ed5076..0124ed82e68 100644
--- a/engines/zvision/scripting/effects/animation_effect.h
+++ b/engines/zvision/scripting/effects/animation_effect.h
@@ -23,6 +23,7 @@
#define ZVISION_ANIMATION_NODE_H
#include "zvision/scripting/scripting_effect.h"
+#include "common/path.h"
#include "common/rect.h"
#include "common/list.h"
diff --git a/graphics/fonts/amigafont.h b/graphics/fonts/amigafont.h
index d64e87a385d..da917c8ce45 100644
--- a/graphics/fonts/amigafont.h
+++ b/graphics/fonts/amigafont.h
@@ -24,6 +24,10 @@
#include "graphics/font.h"
+namespace Common {
+class SeekableReadStream;
+}
+
namespace Graphics {
class AmigaFont : public Font {
diff --git a/graphics/scaler/downscaler.cpp b/graphics/scaler/downscaler.cpp
index 918b7fbb3ab..c6629d5eeb8 100644
--- a/graphics/scaler/downscaler.cpp
+++ b/graphics/scaler/downscaler.cpp
@@ -19,6 +19,7 @@
*
*/
#include "common/debug.h"
+#include "common/textconsole.h"
#include "graphics/scaler/downscaler.h"
#include "graphics/scaler/intern.h"
diff --git a/graphics/tinygl/zbuffer.h b/graphics/tinygl/zbuffer.h
index b421883b6e8..27389a936f6 100644
--- a/graphics/tinygl/zbuffer.h
+++ b/graphics/tinygl/zbuffer.h
@@ -33,6 +33,7 @@
#include "graphics/tinygl/gl.h"
#include "common/rect.h"
+#include "common/textconsole.h"
namespace TinyGL {
More information about the Scummvm-git-logs
mailing list