aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorMax Horn2005-01-10 22:51:42 +0000
committerMax Horn2005-01-10 22:51:42 +0000
commitec79a9a7688b9573da46833a3fe7277d5f6d48d1 (patch)
treeac6ecd969aa350fa7129d9497476982aa83c6762 /scumm
parentdf7f9eb18299b9c68c3f5ec260ede991f5724dd9 (diff)
downloadscummvm-rg350-ec79a9a7688b9573da46833a3fe7277d5f6d48d1.tar.gz
scummvm-rg350-ec79a9a7688b9573da46833a3fe7277d5f6d48d1.tar.bz2
scummvm-rg350-ec79a9a7688b9573da46833a3fe7277d5f6d48d1.zip
A little more moving around #include's (last one for today ;-)
svn-id: r16534
Diffstat (limited to 'scumm')
-rw-r--r--scumm/imuse_digi/dimuse.h1
-rw-r--r--scumm/scumm.h1
-rw-r--r--scumm/util.cpp1
-rw-r--r--scumm/util.h1
4 files changed, 3 insertions, 1 deletions
diff --git a/scumm/imuse_digi/dimuse.h b/scumm/imuse_digi/dimuse.h
index dce27f3816..94d7877e83 100644
--- a/scumm/imuse_digi/dimuse.h
+++ b/scumm/imuse_digi/dimuse.h
@@ -22,6 +22,7 @@
#define IMUSE_DIGI_H
#include "common/scummsys.h"
+#include "common/util.h"
#include "scumm/imuse_digi/dimuse.h"
#include "scumm/imuse_digi/dimuse_bndmgr.h"
diff --git a/scumm/scumm.h b/scumm/scumm.h
index c065f12cef..897f090176 100644
--- a/scumm/scumm.h
+++ b/scumm/scumm.h
@@ -28,6 +28,7 @@
#include "common/map.h"
#include "common/rect.h"
#include "common/str.h"
+#include "common/util.h"
#include "scumm/gfx.h"
#include "scumm/script.h"
diff --git a/scumm/util.cpp b/scumm/util.cpp
index 0f3d5ed1c7..b092eb1c07 100644
--- a/scumm/util.cpp
+++ b/scumm/util.cpp
@@ -20,6 +20,7 @@
*/
#include "scumm/util.h"
+#include "common/util.h"
namespace Scumm {
diff --git a/scumm/util.h b/scumm/util.h
index 260a0884cf..2fcae2f4fd 100644
--- a/scumm/util.h
+++ b/scumm/util.h
@@ -23,7 +23,6 @@
#define SCUMM_UTIL_H
#include "common/file.h"
-#include "common/util.h"
namespace Scumm {