JANITORIAL: Reduce header dependencies in shared code

Some backends may break as I only compiled SDL

11 files changed, 31 insertions, 0 deletions

diff --git a/engines/groovie/cursor.cpp b/engines/groovie/cursor.cpp
index db4134ccb0..8b62b829e1 100644
--- a/engines/groovie/cursor.cpp
+++ b/engines/groovie/cursor.cpp
@@ -26,8 +26,11 @@
 #include "groovie/cursor.h"
 #include "groovie/groovie.h"
 
+#include "common/debug.h"
 #include "common/archive.h"
+#include "common/file.h"
 #include "common/macresman.h"
+#include "common/textconsole.h"
 #include "graphics/cursorman.h"
 
 namespace Groovie {
diff --git a/engines/groovie/debug.cpp b/engines/groovie/debug.cpp
index bd4b671e11..0b70e4f83a 100644
--- a/engines/groovie/debug.cpp
+++ b/engines/groovie/debug.cpp
@@ -31,6 +31,8 @@
 #include "common/debug-channels.h"
 #include "common/system.h"
 
+#include "graphics/palette.h"
+
 namespace Groovie {
 
 Debugger::Debugger(GroovieEngine *vm) :
diff --git a/engines/groovie/font.cpp b/engines/groovie/font.cpp
index 92ebcce298..13d0df0005 100644
--- a/engines/groovie/font.cpp
+++ b/engines/groovie/font.cpp
@@ -23,6 +23,10 @@
  *
  */
 
+#include "common/array.h"
+#include "common/textconsole.h"
+#include "graphics/surface.h"
+
 #include "groovie/font.h"
 
 namespace Groovie {
diff --git a/engines/groovie/graphics.cpp b/engines/groovie/graphics.cpp
index 3ceeeb6018..3eaadbe1c7 100644
--- a/engines/groovie/graphics.cpp
+++ b/engines/groovie/graphics.cpp
@@ -25,8 +25,12 @@
 
 #include "groovie/graphics.h"
 #include "groovie/groovie.h"
+
+#include "common/rect.h"
 #include "common/system.h"
 
+#include "graphics/palette.h"
+
 namespace Groovie {
 
 GraphicsMan::GraphicsMan(GroovieEngine *vm) :
diff --git a/engines/groovie/groovie.cpp b/engines/groovie/groovie.cpp
index 67c8f3dbc7..795cd6feb9 100644
--- a/engines/groovie/groovie.cpp
+++ b/engines/groovie/groovie.cpp
@@ -35,7 +35,9 @@
 #include "common/config-manager.h"
 #include "common/debug-channels.h"
 #include "common/events.h"
+#include "common/file.h"
 #include "common/macresman.h"
+#include "common/textconsole.h"
 
 #include "backends/audiocd/audiocd.h"
 #include "engines/util.h"
diff --git a/engines/groovie/music.cpp b/engines/groovie/music.cpp
index 45f9800211..b7078f4c9e 100644
--- a/engines/groovie/music.cpp
+++ b/engines/groovie/music.cpp
@@ -29,8 +29,11 @@
 
 #include "backends/audiocd/audiocd.h"
 #include "common/config-manager.h"
+#include "common/debug.h"
+#include "common/file.h"
 #include "common/macresman.h"
 #include "common/memstream.h"
+#include "common/textconsole.h"
 #include "audio/midiparser.h"
 
 namespace Groovie {
diff --git a/engines/groovie/player.cpp b/engines/groovie/player.cpp
index 8badd90012..3fee87d7bb 100644
--- a/engines/groovie/player.cpp
+++ b/engines/groovie/player.cpp
@@ -23,6 +23,8 @@
  *
  */
 
+#include "common/debug.h"
+
 #include "groovie/player.h"
 #include "groovie/groovie.h"
 
diff --git a/engines/groovie/resource.cpp b/engines/groovie/resource.cpp
index 9c4e6fb2fa..7670ab4315 100644
--- a/engines/groovie/resource.cpp
+++ b/engines/groovie/resource.cpp
@@ -24,8 +24,11 @@
  */
 
 #include "common/archive.h"
+#include "common/debug.h"
+#include "common/file.h"
 #include "common/macresman.h"
 #include "common/substream.h"
+#include "common/textconsole.h"
 
 #include "groovie/resource.h"
 #include "groovie/groovie.h"
diff --git a/engines/groovie/roq.cpp b/engines/groovie/roq.cpp
index 4d7157c797..8b40fa8a1f 100644
--- a/engines/groovie/roq.cpp
+++ b/engines/groovie/roq.cpp
@@ -30,7 +30,11 @@
 #include "groovie/graphics.h"
 #include "groovie/groovie.h"
 
+#include "common/debug.h"
+#include "common/textconsole.h"
+
 #include "graphics/jpeg.h"
+#include "graphics/palette.h"
 
 #ifdef USE_RGB_COLOR
 // Required for the YUV to RGB conversion
diff --git a/engines/groovie/script.cpp b/engines/groovie/script.cpp
index 8c7d3b0824..fabb70cca0 100644
--- a/engines/groovie/script.cpp
+++ b/engines/groovie/script.cpp
@@ -37,6 +37,7 @@
 #include "common/config-manager.h"
 #include "common/debug-channels.h"
 #include "common/EventRecorder.h"
+#include "common/file.h"
 #include "common/macresman.h"
 
 #include "gui/message.h"
diff --git a/engines/groovie/vdx.cpp b/engines/groovie/vdx.cpp
index 6643177328..432b17802c 100644
--- a/engines/groovie/vdx.cpp
+++ b/engines/groovie/vdx.cpp
@@ -28,9 +28,12 @@
 #include "groovie/groovie.h"
 #include "groovie/lzss.h"
 
+#include "common/debug.h"
 #include "common/debug-channels.h"
+#include "common/textconsole.h"
 #include "audio/mixer.h"
 #include "audio/decoders/raw.h"
+#include "graphics/palette.h"
 
 #define TILE_SIZE 4			// Size of each tile on the image: only ever seen 4 so far
 #define VDX_IDENT 0x9267	// 37479