On Fingolfin's suggestion I put back the inclusion of util.h into Rect, for

MIN() and MAX(). I then removed util.h from a bunch of files which I don't
think need it any more. (Please let me know if I got too blood-thirsty!)

This reverts some of the changes I made this morning.

svn-id: r16541

backends/null/null.cpp

@@ -25,7 +25,6 @@
 
 #if defined(USE_NULL_DRIVER)
 
-#include "common/util.h"
 #include "common/rect.h"
 #include "common/savefile.h"
 

common/rect.h

@@ -23,6 +23,7 @@
 #define COMMON_RECT_H
 
 #include "common/scummsys.h"
+#include "common/util.h"
 
 namespace Common {
 

common/system.h

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

graphics/surface.h

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

saga/saga.h

@@ -29,7 +29,6 @@
 #include "base/engine.h"
 #include "base/gameDetector.h"
 
-#include "common/util.h"
 #include "common/stream.h"
 #include "common/rect.h"
 

scumm/charset.h

@@ -22,7 +22,6 @@
 #define CHARSET_H
 
 #include "common/scummsys.h"
-#include "common/util.h"
 #include "common/rect.h"
 #include "scumm/gfx.h"
 

scumm/gfx.h

@@ -23,7 +23,6 @@
 #ifndef GFX_H
 #define GFX_H
 
-#include "common/rect.h"
 #include "graphics/surface.h"
 
 namespace Scumm {

scumm/player_v1.cpp

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

scumm/scumm.h

@@ -26,7 +26,6 @@
 #include "base/engine.h"
 #include "common/file.h"
 #include "common/map.h"
-#include "common/util.h"
 #include "common/rect.h"
 #include "common/str.h"
 

sword2/controls.cpp

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