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

svn-id: r36143

12 files changed, 16 insertions, 8 deletions

diff --git a/engines/advancedDetector.cpp b/engines/advancedDetector.cpp
index e2886074a7..3f7928c403 100644
--- a/engines/advancedDetector.cpp
+++ b/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).
  */
diff --git a/engines/agi/wagparser.cpp b/engines/agi/wagparser.cpp
index 5ada824f3b..e6ed5345e0 100644
--- a/engines/agi/wagparser.cpp
+++ b/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"
 
diff --git a/engines/agos/midiparser_s1d.cpp b/engines/agos/midiparser_s1d.cpp
index 433056e59d..d77621cc7b 100644
--- a/engines/agos/midiparser_s1d.cpp
+++ b/engines/agos/midiparser_s1d.cpp
@@ -23,8 +23,7 @@
  *
  */
 
-
-
+#include "common/debug.h"
 #include "common/util.h"
 
 #include "sound/mididrv.h"
diff --git a/engines/cine/msg.cpp b/engines/cine/msg.cpp
index 08b16524fd..a7cccf03c7 100644
--- a/engines/cine/msg.cpp
+++ b/engines/cine/msg.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-
+#include "common/debug.h"
 #include "common/endian.h"
 
 #include "cine/msg.h"
diff --git a/engines/cine/part.cpp b/engines/cine/part.cpp
index 2cf9a52569..b1218ce676 100644
--- a/engines/cine/part.cpp
+++ b/engines/cine/part.cpp
@@ -23,6 +23,7 @@
  *
  */
 
+#include "common/debug.h"
 #include "common/endian.h"
 
 #include "cine/cine.h"
diff --git a/engines/cine/saveload.cpp b/engines/cine/saveload.cpp
index 2917ad6d1b..4a6ea321c8 100644
--- a/engines/cine/saveload.cpp
+++ b/engines/cine/saveload.cpp
@@ -23,6 +23,7 @@
  *
  */
 
+#include "common/debug.h"
 #include "common/savefile.h"
 
 #include "cine/cine.h"
diff --git a/engines/queen/bankman.cpp b/engines/queen/bankman.cpp
index a5b98eb35f..69329efa51 100644
--- a/engines/queen/bankman.cpp
+++ b/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)
diff --git a/engines/queen/grid.cpp b/engines/queen/grid.cpp
index b1191c3bde..306b32bc8b 100644
--- a/engines/queen/grid.cpp
+++ b/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)
diff --git a/engines/queen/resource.cpp b/engines/queen/resource.cpp
index 7c15d7884a..9fa62eee27 100644
--- a/engines/queen/resource.cpp
+++ b/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"
diff --git a/engines/scumm/file_nes.cpp b/engines/scumm/file_nes.cpp
index 306b6610d2..bfd9f3f6cd 100644
--- a/engines/scumm/file_nes.cpp
+++ b/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"
 
diff --git a/engines/sword1/debug.cpp b/engines/sword1/debug.cpp
index fd8c411504..39f280748c 100644
--- a/engines/sword1/debug.cpp
+++ b/engines/sword1/debug.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-
+#include "common/debug.h"
 #include "common/util.h"
 #include "sword1/debug.h"
 
diff --git a/engines/sword1/router.cpp b/engines/sword1/router.cpp
index d5620073a5..a0a990045c 100644
--- a/engines/sword1/router.cpp
+++ b/engines/sword1/router.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-
+#include "common/debug.h"
 #include "common/util.h"
 
 #include "sword1/router.h"