do not include common/debug.h from common/util.h

svn-id: r36143

backends/platform/sdl/sdl.cpp

@@ -32,6 +32,7 @@
 #include "backends/platform/sdl/sdl.h"
 #include "common/archive.h"
 #include "common/config-manager.h"
+#include "common/debug.h"
 #include "common/events.h"
 #include "common/util.h"
 

base/main.cpp

@@ -39,6 +39,7 @@
 
 #include "common/archive.h"
 #include "common/config-manager.h"
+#include "common/debug.h"
 #include "common/events.h"
 #include "common/file.h"
 #include "common/fs.h"

base/plugins.cpp

@@ -26,6 +26,7 @@
 #include "base/plugins.h"
 
 #include "common/func.h"
+#include "common/debug.h"
 
 #ifdef DYNAMIC_MODULES
 #include "common/config-manager.h"

common/file.cpp

@@ -24,6 +24,7 @@
  */
 
 #include "common/archive.h"
+#include "common/debug.h"
 #include "common/file.h"
 #include "common/fs.h"
 #include "common/util.h"

common/mutex.cpp

@@ -23,6 +23,7 @@
  *
  */
 
+#include "common/debug.h"
 #include "common/mutex.h"
 #include "common/system.h"
 

common/rect.h

@@ -28,6 +28,7 @@
 
 #include "common/scummsys.h"
 #include "common/util.h"
+#include "common/debug.h"
 
 namespace Common {
 

common/unarj.cpp

@@ -29,6 +29,7 @@
 
 #include "common/scummsys.h"
 #include "common/archive.h"
+#include "common/debug.h"
 #include "common/util.h"
 #include "common/unarj.h"
 

common/util.h

@@ -27,7 +27,6 @@
 
 #include "common/scummsys.h"
 #include "common/str.h"
-#include "common/debug.h"
 
 #ifdef MIN
 #undef MIN

common/xmlparser.h

@@ -29,6 +29,7 @@
 #include "common/scummsys.h"
 #include "common/stream.h"
 
+#include "common/list.h"
 #include "common/hashmap.h"
 #include "common/hash-str.h"
 #include "common/stack.h"

engines/advancedDetector.cpp

@@ -25,13 +25,15 @@
 
 #include "base/plugins.h"
 
+#include "common/debug.h"
 #include "common/util.h"
 #include "common/hash-str.h"
 #include "common/file.h"
 #include "common/md5.h"
-#include "engines/advancedDetector.h"
 #include "common/config-manager.h"
 
+#include "engines/advancedDetector.h"
+
 /**
  * A list of pointers to ADGameDescription structs (or subclasses thereof).
  */

engines/agi/wagparser.cpp

@@ -26,6 +26,7 @@
 #include "common/file.h"
 #include "common/util.h"
 #include "common/fs.h"
+#include "common/debug.h"
 
 #include "agi/wagparser.h"
 

engines/agos/midiparser_s1d.cpp

@@ -23,8 +23,7 @@
  *
  */
 
-
+#include "common/debug.h"
-
 #include "common/util.h"
 
 #include "sound/mididrv.h"

engines/cine/msg.cpp

@@ -23,7 +23,7 @@
  *
  */
 
-
+#include "common/debug.h"
 #include "common/endian.h"
 
 #include "cine/msg.h"

engines/cine/part.cpp

@@ -23,6 +23,7 @@
  *
  */
 
+#include "common/debug.h"
 #include "common/endian.h"
 
 #include "cine/cine.h"

engines/cine/saveload.cpp

@@ -23,6 +23,7 @@
  *
  */
 
+#include "common/debug.h"
 #include "common/savefile.h"
 
 #include "cine/cine.h"

engines/queen/bankman.cpp

@@ -25,9 +25,10 @@
 
 
 #include "queen/bankman.h"
-
 #include "queen/resource.h"
 
+#include "common/debug.h"
+
 namespace Queen {
 
 BankManager::BankManager(Resource *res)

engines/queen/grid.cpp

@@ -30,6 +30,8 @@
 #include "queen/logic.h"
 #include "queen/queen.h"
 
+#include "common/debug.h"
+
 namespace Queen {
 
 Grid::Grid(QueenEngine *vm)

engines/queen/resource.cpp

@@ -23,7 +23,7 @@
  *
  */
 
-
+#include "common/debug.h"
 #include "common/endian.h"
 #include "common/config-manager.h"
 #include "queen/resource.h"

engines/scumm/file_nes.cpp

@@ -24,6 +24,7 @@
  */
 
 #include "scumm/file_nes.h"
+#include "common/debug.h"
 #include "common/endian.h"
 #include "common/md5.h"
 

engines/sword1/debug.cpp

@@ -23,7 +23,7 @@
  *
  */
 
-
+#include "common/debug.h"
 #include "common/util.h"
 #include "sword1/debug.h"
 

engines/sword1/router.cpp

@@ -23,7 +23,7 @@
  *
  */
 
-
+#include "common/debug.h"
 #include "common/util.h"
 
 #include "sword1/router.h"

graphics/video/dxa_player.cpp

@@ -23,6 +23,7 @@
  *
  */
 
+#include "common/debug.h"
 #include "common/endian.h"
 #include "common/archive.h"
 #include "common/system.h"

graphics/video/video_player.cpp

@@ -24,6 +24,7 @@
  */
 
 #include "common/archive.h"
+#include "common/debug.h"
 #include "common/events.h"
 #include "common/system.h"
 #include "common/util.h"

gui/debugger.cpp

@@ -23,6 +23,7 @@
  *
  */
 
+#include "common/debug.h"
 #include "common/system.h"
 
 #include "gui/debugger.h"

sound/audiostream.cpp

@@ -23,6 +23,7 @@
  *
  */
 
+#include "common/debug.h"
 #include "common/endian.h"
 #include "common/file.h"
 #include "common/list.h"

sound/flac.cpp

@@ -27,6 +27,7 @@
 
 #ifdef USE_FLAC
 
+#include "common/debug.h"
 #include "common/stream.h"
 #include "common/util.h"
 

sound/mods/rjp1.cpp

@@ -23,6 +23,7 @@
  *
  */
 
+#include "common/debug.h"
 #include "common/endian.h"
 
 #include "sound/mods/paula.h"

sound/mp3.cpp

@@ -27,6 +27,7 @@
 
 #ifdef USE_MAD
 
+#include "common/debug.h"
 #include "common/stream.h"
 #include "common/util.h"
 

sound/musicplugin.h

@@ -27,6 +27,7 @@
 
 #include "base/plugins.h"
 #include "sound/mididrv.h"
+#include "common/list.h"
 
 /**
  * Music types that music drivers can implement and engines can rely on.

sound/softsynth/adlib.cpp

@@ -23,6 +23,7 @@
  */
 
 #include "sound/softsynth/emumidi.h"
+#include "common/debug.h"
 #include "common/util.h"
 #include "sound/fmopl.h"
 #include "sound/musicplugin.h"

sound/softsynth/mt32.cpp

@@ -33,6 +33,7 @@
 #include "sound/mpu401.h"
 
 #include "common/config-manager.h"
+#include "common/debug.h"
 #include "common/events.h"
 #include "common/file.h"
 #include "common/system.h"

sound/voc.cpp

@@ -23,6 +23,7 @@
  *
  */
 
+#include "common/debug.h"
 #include "common/endian.h"
 #include "common/util.h"
 #include "common/stream.h"

sound/vorbis.cpp

@@ -27,6 +27,7 @@
 
 #ifdef USE_VORBIS
 
+#include "common/debug.h"
 #include "common/stream.h"
 #include "common/util.h"
 

sound/wave.cpp

@@ -23,6 +23,7 @@
  *
  */
 
+#include "common/debug.h"
 #include "common/util.h"
 #include "common/stream.h"