This is probably not the optimal fix, but at least ScummVM compiles again.

svn-id: r16538

common/system.h

@@ -25,6 +25,7 @@
 
 #include "common/scummsys.h"
 #include "common/mutex.h"
+#include "common/util.h"
 #include "common/rect.h"
 #include "common/singleton.h"
 

graphics/surface.h

@@ -22,6 +22,7 @@
 #define GRAPHICS_SURFACE_H
 
 #include "common/scummsys.h"
+#include "common/util.h"
 #include "common/rect.h"
 
 namespace Graphics {

scumm/charset.h

@@ -22,8 +22,8 @@
 #define CHARSET_H
 
 #include "common/scummsys.h"
-#include "common/rect.h"
 #include "common/util.h"
+#include "common/rect.h"
 #include "scumm/gfx.h"
 
 namespace Scumm {

scumm/player_v1.cpp

@@ -22,8 +22,8 @@
 
 #include "stdafx.h"
 #include "base/engine.h"
-#include "scumm/player_v1.h"
 #include "scumm/scumm.h"
+#include "scumm/player_v1.h"
 
 namespace Scumm {
 

scumm/scumm.h

@@ -26,9 +26,9 @@
 #include "base/engine.h"
 #include "common/file.h"
 #include "common/map.h"
+#include "common/util.h"
 #include "common/rect.h"
 #include "common/str.h"
-#include "common/util.h"
 
 #include "scumm/gfx.h"
 #include "scumm/script.h"

sound/audiostream.h

@@ -23,6 +23,7 @@
 #define AUDIOSTREAM_H
 
 #include "stdafx.h"
+#include "common/util.h"
 #include "common/scummsys.h"
 
 

sword2/controls.cpp

@@ -18,6 +18,7 @@
  */
 
 #include "common/stdafx.h"
+#include "common/util.h"
 #include "common/rect.h"
 #include "common/config-manager.h"
 #include "common/system.h"