From 9414d7a6e287ff8abfb5746b564e92c8f0e6de58 Mon Sep 17 00:00:00 2001
From: Ori Avtalion
Date: Sun, 24 Apr 2011 11:34:27 +0300
Subject: JANITORIAL: Reduce header dependencies in shared code

Some backends may break as I only compiled SDL
---
 engines/gob/databases.cpp          | 1 +
 engines/gob/gob.cpp                | 3 ---
 engines/gob/gob.h                  | 2 ++
 engines/gob/inter_v1.cpp           | 2 --
 engines/gob/inter_v4.cpp           | 2 --
 engines/gob/inter_v5.cpp           | 3 ---
 engines/gob/inter_v6.cpp           | 2 --
 engines/gob/save/saveload.cpp      | 3 ---
 engines/gob/sound/adlib.cpp        | 2 ++
 engines/gob/sound/bgatmosphere.cpp | 2 --
 engines/gob/sound/cdrom.cpp        | 1 +
 engines/gob/sound/infogrames.cpp   | 2 ++
 engines/gob/sound/sounddesc.cpp    | 2 ++
 engines/gob/sound/soundmixer.cpp   | 2 ++
 engines/gob/surface.cpp            | 2 ++
 engines/gob/util.cpp               | 2 ++
 engines/gob/video.cpp              | 1 +
 17 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'engines/gob')

diff --git a/engines/gob/databases.cpp b/engines/gob/databases.cpp
index 66a711e46e..94f641db4e 100644
--- a/engines/gob/databases.cpp
+++ b/engines/gob/databases.cpp
@@ -24,6 +24,7 @@
  */
 
 #include "common/file.h"
+#include "common/textconsole.h"
 
 #include "gob/databases.h"
 
diff --git a/engines/gob/gob.cpp b/engines/gob/gob.cpp
index 12914163c2..3d697d3693 100644
--- a/engines/gob/gob.cpp
+++ b/engines/gob/gob.cpp
@@ -24,14 +24,11 @@
  */
 
 #include "common/debug-channels.h"
-#include "common/endian.h"
-#include "common/events.h"
 #include "common/EventRecorder.h"
 
 #include "backends/audiocd/audiocd.h"
 #include "base/plugins.h"
 #include "common/config-manager.h"
-#include "common/md5.h"
 #include "audio/mididrv.h"
 
 #include "gui/gui-manager.h"
diff --git a/engines/gob/gob.h b/engines/gob/gob.h
index 57ad11c54c..4a928747b0 100644
--- a/engines/gob/gob.h
+++ b/engines/gob/gob.h
@@ -30,6 +30,8 @@
 #include "common/system.h"
 #include "common/savefile.h"
 
+#include "graphics/pixelformat.h"
+
 #include "engines/engine.h"
 
 #include "gob/console.h"
diff --git a/engines/gob/inter_v1.cpp b/engines/gob/inter_v1.cpp
index 262fdc8045..8f1ff4c73f 100644
--- a/engines/gob/inter_v1.cpp
+++ b/engines/gob/inter_v1.cpp
@@ -23,9 +23,7 @@
  *
  */
 
-#include "common/endian.h"
 #include "common/str.h"
-#include "common/file.h"
 
 #include "gob/gob.h"
 #include "gob/inter.h"
diff --git a/engines/gob/inter_v4.cpp b/engines/gob/inter_v4.cpp
index 778387e52d..1da92b3766 100644
--- a/engines/gob/inter_v4.cpp
+++ b/engines/gob/inter_v4.cpp
@@ -23,9 +23,7 @@
  *
  */
 
-#include "common/endian.h"
 #include "common/str.h"
-#include "common/file.h"
 
 #include "gob/gob.h"
 #include "gob/inter.h"
diff --git a/engines/gob/inter_v5.cpp b/engines/gob/inter_v5.cpp
index 85b213ae66..f5e87bb936 100644
--- a/engines/gob/inter_v5.cpp
+++ b/engines/gob/inter_v5.cpp
@@ -23,9 +23,6 @@
  *
  */
 
-#include "common/endian.h"
-#include "common/file.h"
-
 #include "gui/message.h"
 
 #include "gob/gob.h"
diff --git a/engines/gob/inter_v6.cpp b/engines/gob/inter_v6.cpp
index 06a06f4fb6..53ebfe7513 100644
--- a/engines/gob/inter_v6.cpp
+++ b/engines/gob/inter_v6.cpp
@@ -23,9 +23,7 @@
  *
  */
 
-#include "common/endian.h"
 #include "common/str.h"
-#include "common/file.h"
 #include "graphics/dither.h"
 
 #include "gob/gob.h"
diff --git a/engines/gob/save/saveload.cpp b/engines/gob/save/saveload.cpp
index 3508e58f16..e490509914 100644
--- a/engines/gob/save/saveload.cpp
+++ b/engines/gob/save/saveload.cpp
@@ -23,9 +23,6 @@
  *
  */
 
-#include "common/endian.h"
-#include "common/savefile.h"
-
 #include "gob/gob.h"
 #include "gob/save/saveload.h"
 #include "gob/global.h"
diff --git a/engines/gob/sound/adlib.cpp b/engines/gob/sound/adlib.cpp
index f070bf14fa..4244df68e5 100644
--- a/engines/gob/sound/adlib.cpp
+++ b/engines/gob/sound/adlib.cpp
@@ -23,8 +23,10 @@
  *
  */
 
+#include "common/debug.h"
 #include "common/file.h"
 #include "common/endian.h"
+#include "common/textconsole.h"
 
 #include "gob/gob.h"
 #include "gob/sound/adlib.h"
diff --git a/engines/gob/sound/bgatmosphere.cpp b/engines/gob/sound/bgatmosphere.cpp
index 8850a727d3..b351d92275 100644
--- a/engines/gob/sound/bgatmosphere.cpp
+++ b/engines/gob/sound/bgatmosphere.cpp
@@ -23,8 +23,6 @@
  *
  */
 
-#include "common/system.h"
-#include "common/events.h"
 #include "common/EventRecorder.h"
 
 #include "gob/sound/bgatmosphere.h"
diff --git a/engines/gob/sound/cdrom.cpp b/engines/gob/sound/cdrom.cpp
index 4f3d783046..217aa9c18e 100644
--- a/engines/gob/sound/cdrom.cpp
+++ b/engines/gob/sound/cdrom.cpp
@@ -25,6 +25,7 @@
 
 #include "common/endian.h"
 #include "common/str.h"
+#include "common/textconsole.h"
 #include "common/util.h"
 
 #include "backends/audiocd/audiocd.h"
diff --git a/engines/gob/sound/infogrames.cpp b/engines/gob/sound/infogrames.cpp
index 6377b4e798..9fb7410740 100644
--- a/engines/gob/sound/infogrames.cpp
+++ b/engines/gob/sound/infogrames.cpp
@@ -23,6 +23,8 @@
  *
  */
 
+#include "common/textconsole.h"
+
 #include "gob/sound/infogrames.h"
 
 namespace Gob {
diff --git a/engines/gob/sound/sounddesc.cpp b/engines/gob/sound/sounddesc.cpp
index d33ea89147..cc1c6b1f6b 100644
--- a/engines/gob/sound/sounddesc.cpp
+++ b/engines/gob/sound/sounddesc.cpp
@@ -25,6 +25,8 @@
 
 #include "common/util.h"
 #include "common/memstream.h"
+#include "common/textconsole.h"
+
 #include "audio/mixer.h"
 #include "audio/decoders/raw.h"
 #include "audio/decoders/wave.h"
diff --git a/engines/gob/sound/soundmixer.cpp b/engines/gob/sound/soundmixer.cpp
index b6082c577c..3b6b2e5d52 100644
--- a/engines/gob/sound/soundmixer.cpp
+++ b/engines/gob/sound/soundmixer.cpp
@@ -23,6 +23,8 @@
  *
  */
 
+#include "common/util.h"
+
 #include "gob/sound/soundmixer.h"
 #include "gob/sound/sounddesc.h"
 
diff --git a/engines/gob/surface.cpp b/engines/gob/surface.cpp
index c3e8cd9ff5..7bd8aae597 100644
--- a/engines/gob/surface.cpp
+++ b/engines/gob/surface.cpp
@@ -31,6 +31,8 @@
 #include "common/frac.h"
 
 #include "graphics/primitives.h"
+#include "graphics/pixelformat.h"
+#include "graphics/surface.h"
 
 namespace Gob {
 
diff --git a/engines/gob/util.cpp b/engines/gob/util.cpp
index 4d51b3d61f..787f85175a 100644
--- a/engines/gob/util.cpp
+++ b/engines/gob/util.cpp
@@ -36,6 +36,8 @@
 
 #include "common/events.h"
 
+#include "graphics/palette.h"
+
 namespace Gob {
 
 Util::Util(GobEngine *vm) : _vm(vm) {
diff --git a/engines/gob/video.cpp b/engines/gob/video.cpp
index 444ff8ed9e..1d74a07bfc 100644
--- a/engines/gob/video.cpp
+++ b/engines/gob/video.cpp
@@ -29,6 +29,7 @@
 
 #include "graphics/cursorman.h"
 #include "graphics/fontman.h"
+#include "graphics/palette.h"
 #include "graphics/surface.h"
 
 #include "gob/gob.h"
-- 
cgit v1.2.3