diff --git a/backends/platform/PalmOS/Src/prefixes/native_kyra.h b/backends/platform/PalmOS/Src/prefixes/native_kyra.h index c89b0a5b935..3b09c63a6f0 100644 --- a/backends/platform/PalmOS/Src/prefixes/native_kyra.h +++ b/backends/platform/PalmOS/Src/prefixes/native_kyra.h @@ -2,6 +2,6 @@ #define PREFIX_H #include "native_common.h" -#define ENABLE_KYRA +#define ENABLE_KYRA STATIC_PLUGIN #endif diff --git a/backends/platform/PalmOS/Src/prefixes/native_sword1.h b/backends/platform/PalmOS/Src/prefixes/native_sword1.h index aaae4c9b86f..6ae7bb90509 100644 --- a/backends/platform/PalmOS/Src/prefixes/native_sword1.h +++ b/backends/platform/PalmOS/Src/prefixes/native_sword1.h @@ -2,7 +2,7 @@ #define PREFIX_H #include "native_common.h" -#define ENABLE_SWORD1 +#define ENABLE_SWORD1 STATIC_PLUGIN #define USE_MPEG2 #define USE_VORBIS diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp index a79b84843c4..51619bd3cb0 100644 --- a/engines/agos/agos.cpp +++ b/engines/agos/agos.cpp @@ -23,7 +23,7 @@ * */ - +#include // for AGOSEngine::getTime() #include "common/config-manager.h" #include "common/file.h" @@ -38,8 +38,6 @@ #include "sound/mididrv.h" #include "sound/mods/protracker.h" -#include // for AGOSEngine::getTime() - using Common::File; namespace AGOS { diff --git a/engines/gob/inter.cpp b/engines/gob/inter.cpp index dd3fdf36841..9e5005f443f 100644 --- a/engines/gob/inter.cpp +++ b/engines/gob/inter.cpp @@ -23,6 +23,8 @@ * */ +#include // FIXME: for Inter::renewTimeInVars() + #include "common/endian.h" #include "gob/gob.h" @@ -35,8 +37,6 @@ #include "gob/scenery.h" #include "gob/sound/sound.h" -#include // FIXME: for Inter::renewTimeInVars() - namespace Gob { Inter::Inter(GobEngine *vm) : _vm(vm) { diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp index a8ef26c4842..36b82519e92 100644 --- a/engines/scumm/saveload.cpp +++ b/engines/scumm/saveload.cpp @@ -23,6 +23,8 @@ * */ +#include // for ScummEngine::saveInfos / ScummEngine::loadInfos + #include "common/config-manager.h" #include "common/savefile.h" #include "common/system.h" @@ -44,8 +46,6 @@ #include "sound/audiocd.h" #include "sound/mixer.h" -#include // for ScummEngine::saveInfos / ScummEngine::loadInfos - namespace Scumm { struct SaveGameHeader { diff --git a/engines/scumm/script_v6.cpp b/engines/scumm/script_v6.cpp index faae72b6dd6..04ea53137b5 100644 --- a/engines/scumm/script_v6.cpp +++ b/engines/scumm/script_v6.cpp @@ -23,6 +23,8 @@ * */ +#include // for ScummEngine_v6::o6_getDateTime() + #include "common/config-manager.h" #include "common/system.h" @@ -44,8 +46,6 @@ #include "sound/mididrv.h" #include "sound/mixer.h" -#include // for ScummEngine_v6::o6_getDateTime() - namespace Scumm { #define OPCODE(x) _OPCODE(ScummEngine_v6, x)