A little more moving around #include's (last one for today ;-)

svn-id: r16534

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 {
 

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"

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"

scumm/util.cpp

@@ -20,6 +20,7 @@
  */
 
 #include "scumm/util.h"
+#include "common/util.h"
 
 namespace Scumm {
 

scumm/util.h

@@ -23,7 +23,6 @@
 #define SCUMM_UTIL_H
 
 #include "common/file.h"
-#include "common/util.h"
 
 namespace Scumm {
 

sound/audiostream.h

@@ -24,7 +24,6 @@
 
 #include "stdafx.h"
 #include "common/scummsys.h"
-#include "common/util.h"
 
 
 /**

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.

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;

sound/softsynth/ym2612.cpp

@@ -26,6 +26,7 @@
 
 #include <math.h>
 
+#include "common/util.h"
 
 ////////////////////////////////////////
 //