aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/animation.cpp1
-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
-rw-r--r--sound/audiostream.h1
-rw-r--r--sound/rate.cpp1
-rw-r--r--sound/rate.h1
-rw-r--r--sound/softsynth/ym2612.cpp1
9 files changed, 6 insertions, 3 deletions
diff --git a/graphics/animation.cpp b/graphics/animation.cpp
index f54779ea2d..8337af4a37 100644
--- a/graphics/animation.cpp
+++ b/graphics/animation.cpp
@@ -25,6 +25,7 @@
#include "common/config-manager.h"
#include "common/file.h"
#include "common/system.h"
+#include "common/util.h"
namespace Graphics {
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 {
diff --git a/sound/audiostream.h b/sound/audiostream.h
index f6017c9698..12e1240f7e 100644
--- a/sound/audiostream.h
+++ b/sound/audiostream.h
@@ -24,7 +24,6 @@
#include "stdafx.h"
#include "common/scummsys.h"
-#include "common/util.h"
/**
diff --git a/sound/rate.cpp b/sound/rate.cpp
index b15071ac6d..b7ac1160d9 100644
--- a/sound/rate.cpp
+++ b/sound/rate.cpp
@@ -31,6 +31,7 @@
#include "sound/audiostream.h"
#include "sound/rate.h"
#include "sound/mixer.h"
+#include "common/util.h"
/**
* The precision of the fractional computations used by the rate converter.
diff --git a/sound/rate.h b/sound/rate.h
index 2cffd87702..4797cc61b5 100644
--- a/sound/rate.h
+++ b/sound/rate.h
@@ -24,7 +24,6 @@
#include "common/scummsys.h"
#include "base/engine.h"
-#include "common/util.h"
//#include "sound/audiostream.h"
class AudioStream;
diff --git a/sound/softsynth/ym2612.cpp b/sound/softsynth/ym2612.cpp
index 58710a586c..8d37ee8ec6 100644
--- a/sound/softsynth/ym2612.cpp
+++ b/sound/softsynth/ym2612.cpp
@@ -26,6 +26,7 @@
#include <math.h>
+#include "common/util.h"
////////////////////////////////////////
//