diff options
| -rw-r--r-- | scumm/smush/channel.h | 2 | ||||
| -rw-r--r-- | scumm/smush/chunk.cpp | 2 | ||||
| -rw-r--r-- | scumm/smush/codec37.cpp | 5 | ||||
| -rw-r--r-- | scumm/smush/codec47.cpp | 5 | ||||
| -rw-r--r-- | simon/sound.cpp | 2 |
5 files changed, 7 insertions, 9 deletions
diff --git a/scumm/smush/channel.h b/scumm/smush/channel.h index b0821ef6dc..6b9390d300 100644 --- a/scumm/smush/channel.h +++ b/scumm/smush/channel.h @@ -22,7 +22,7 @@ #ifndef SMUSH_CHANNEL_H #define SMUSH_CHANNEL_H -#include "common/engine.h" +#include "common/util.h" class Chunk; class ContChunk; diff --git a/scumm/smush/chunk.cpp b/scumm/smush/chunk.cpp index bc0f95e42e..d737d41f49 100644 --- a/scumm/smush/chunk.cpp +++ b/scumm/smush/chunk.cpp @@ -22,9 +22,9 @@ #include "stdafx.h" #include "chunk.h" -#include "common/engine.h" #include "common/file.h" #include "common/str.h" +#include "common/util.h" class FilePtr : public File { ScummVM::String _filename; diff --git a/scumm/smush/codec37.cpp b/scumm/smush/codec37.cpp index 64154747ad..c2fa816045 100644 --- a/scumm/smush/codec37.cpp +++ b/scumm/smush/codec37.cpp @@ -20,10 +20,9 @@ */ #include "stdafx.h" -#include "codec37.h" +#include "common/util.h" #include "scumm/bomp.h" - -#include "common/engine.h" +#include "scumm/smush/codec37.h" void Codec37Decoder::init(int width, int height) { deinit(); diff --git a/scumm/smush/codec47.cpp b/scumm/smush/codec47.cpp index de97ee8cd1..869e156444 100644 --- a/scumm/smush/codec47.cpp +++ b/scumm/smush/codec47.cpp @@ -20,10 +20,9 @@ */ #include "stdafx.h" -#include "codec47.h" +#include "common/util.h" #include "scumm/bomp.h" - -#include "common/engine.h" +#include "scumm/smush/codec47.h" #if defined(SCUMM_NEED_ALIGNMENT) diff --git a/simon/sound.cpp b/simon/sound.cpp index d9c7c588f4..195b74cc32 100644 --- a/simon/sound.cpp +++ b/simon/sound.cpp @@ -19,7 +19,7 @@ #include "stdafx.h" #include "common/file.h" -#include "common/engine.h" +#include "common/util.h" #include "simon/sound.h" #include "sound/voc.h" |