JANITORIAL: Reduce header dependencies in shared code

Some backends may break as I only compiled SDL

42 files changed, 89 insertions, 72 deletions

diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp
index e063e11674..3b62d6b667 100644
--- a/gui/ThemeEngine.cpp
+++ b/gui/ThemeEngine.cpp
@@ -24,7 +24,6 @@
  */
 
 #include "common/system.h"
-#include "common/events.h"
 #include "common/config-manager.h"
 #include "common/file.h"
 #include "common/fs.h"
@@ -32,14 +31,13 @@
 #include "common/tokenizer.h"
 #include "common/translation.h"
 
-#include "graphics/colormasks.h"
 #include "graphics/cursorman.h"
 #include "graphics/fontman.h"
 #include "graphics/imagedec.h"
 #include "graphics/surface.h"
 #include "graphics/VectorRenderer.h"
 
-#include "gui/launcher.h"
+#include "gui/widget.h"
 #include "gui/ThemeEngine.h"
 #include "gui/ThemeEval.h"
 #include "gui/ThemeParser.h"
diff --git a/gui/ThemeEngine.h b/gui/ThemeEngine.h
index 46065278d3..08560c8635 100644
--- a/gui/ThemeEngine.h
+++ b/gui/ThemeEngine.h
@@ -27,13 +27,25 @@
 #define GUI_THEME_ENGINE_H
 
 #include "common/scummsys.h"
-#include "common/system.h"
 #include "common/fs.h"
+#include "common/hash-str.h"
+#include "common/hashmap.h"
+#include "common/list.h"
+#include "common/str.h"
+
 #include "graphics/surface.h"
 #include "graphics/font.h"
+#include "graphics/pixelformat.h"
+
 
 #define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.8.3"
 
+class OSystem;
+
+namespace Common {
+struct Rect;
+}
+
 namespace Graphics {
 struct DrawStep;
 class VectorRenderer;
@@ -42,8 +54,6 @@ class VectorRenderer;
 namespace GUI {
 
 struct WidgetDrawData;
-struct DrawDataInfo;
-struct TextDataInfo;
 struct TextDrawData;
 struct TextColorData;
 class Dialog;
diff --git a/gui/ThemeEval.cpp b/gui/ThemeEval.cpp
index 017d47fd29..64e18f93a3 100644
--- a/gui/ThemeEval.cpp
+++ b/gui/ThemeEval.cpp
@@ -24,10 +24,10 @@
  */
 
 #include "gui/ThemeEval.h"
-#include "gui/widget.h"
 
 #include "graphics/scaler.h"
 
+#include "common/system.h"
 #include "common/tokenizer.h"
 
 namespace GUI {
diff --git a/gui/ThemeEval.h b/gui/ThemeEval.h
index ac867512da..65bed3e271 100644
--- a/gui/ThemeEval.h
+++ b/gui/ThemeEval.h
@@ -30,6 +30,8 @@
 #include "common/hashmap.h"
 #include "common/hash-str.h"
 #include "common/stack.h"
+#include "common/str.h"
+#include "common/textconsole.h"
 #include "graphics/font.h"
 
 #include "gui/ThemeLayout.h"
diff --git a/gui/ThemeLayout.cpp b/gui/ThemeLayout.cpp
index 3c930db73c..fbfc498bcb 100644
--- a/gui/ThemeLayout.cpp
+++ b/gui/ThemeLayout.cpp
@@ -25,14 +25,12 @@
 
 #include "common/util.h"
 #include "common/system.h"
-#include "common/events.h"
-#include "common/xmlparser.h"
 
-#include "gui/ThemeEval.h"
 #include "gui/ThemeLayout.h"
 
-#ifdef LAYOUT_DEBUG_DIALOG
 #include "graphics/font.h"
+
+#ifdef LAYOUT_DEBUG_DIALOG
 #include "graphics/surface.h"
 #endif
 
diff --git a/gui/ThemeLayout.h b/gui/ThemeLayout.h
index 372b007847..76d3f7d380 100644
--- a/gui/ThemeLayout.h
+++ b/gui/ThemeLayout.h
@@ -26,11 +26,12 @@
 #ifndef THEME_LAYOUT_H
 #define THEME_LAYOUT_H
 
+#include "common/array.h"
 #include "common/rect.h"
+#include "graphics/font.h"
 
 #ifdef LAYOUT_DEBUG_DIALOG
 namespace Graphics {
-class Font;
 class Surface;
 }
 #endif
diff --git a/gui/ThemeParser.cpp b/gui/ThemeParser.cpp
index e3523d11e8..230dad8cc5 100644
--- a/gui/ThemeParser.cpp
+++ b/gui/ThemeParser.cpp
@@ -26,10 +26,10 @@
 #include "gui/ThemeEngine.h"
 #include "gui/ThemeEval.h"
 #include "gui/ThemeParser.h"
-#include "gui/gui-manager.h"
 
 #include "graphics/VectorRenderer.h"
 
+#include "common/system.h"
 #include "common/tokenizer.h"
 
 namespace GUI {
diff --git a/gui/Tooltip.cpp b/gui/Tooltip.cpp
index 7dec12d522..a7cb0610e7 100644
--- a/gui/Tooltip.cpp
+++ b/gui/Tooltip.cpp
@@ -23,7 +23,6 @@
  */
 
 #include "common/util.h"
-#include "graphics/fontman.h"
 #include "gui/widget.h"
 #include "gui/dialog.h"
 #include "gui/gui-manager.h"
diff --git a/gui/Tooltip.h b/gui/Tooltip.h
index d228ca8a49..f5e2bb08a8 100644
--- a/gui/Tooltip.h
+++ b/gui/Tooltip.h
@@ -25,11 +25,14 @@
 #ifndef GUI_TOOLTIP_H
 #define GUI_TOOLTIP_H
 
+#include "common/keyboard.h"
+#include "common/str-array.h"
 #include "gui/dialog.h"
-#include "gui/widget.h"
 
 namespace GUI {
 
+class Widget;
+
 class Tooltip : public Dialog {
 public:
 	Tooltip();
diff --git a/gui/about.cpp b/gui/about.cpp
index c2d9a3f983..0389f4c8da 100644
--- a/gui/about.cpp
+++ b/gui/about.cpp
@@ -31,8 +31,6 @@
 #include "common/util.h"
 #include "gui/about.h"
 #include "gui/gui-manager.h"
-#include "gui/widget.h"
-
 #include "gui/ThemeEval.h"
 
 namespace GUI {
diff --git a/gui/about.h b/gui/about.h
index fc216a78dc..b49365c5e5 100644
--- a/gui/about.h
+++ b/gui/about.h
@@ -27,7 +27,8 @@
 
 #include "gui/dialog.h"
 #include "common/str.h"
-#include "graphics/surface.h"
+#include "common/array.h"
+#include "common/keyboard.h"
 
 namespace GUI {
 
diff --git a/gui/browser.cpp b/gui/browser.cpp
index 4ee6bafdde..2c7459623f 100644
--- a/gui/browser.cpp
+++ b/gui/browser.cpp
@@ -23,7 +23,6 @@
  */
 
 #include "gui/browser.h"
-#include "gui/gui-manager.h"
 #include "gui/widgets/list.h"
 
 #include "common/config-manager.h"
diff --git a/gui/browser.h b/gui/browser.h
index 1fef041a5a..eb3498e654 100644
--- a/gui/browser.h
+++ b/gui/browser.h
@@ -26,13 +26,13 @@
 #define BROWSER_DIALOG_H
 
 #include "gui/dialog.h"
-#include "common/str.h"
 #include "common/fs.h"
 
 namespace GUI {
 
 class ListWidget;
 class StaticTextWidget;
+class CommandSender;
 
 class BrowserDialog : public Dialog {
 public:
diff --git a/gui/chooser.cpp b/gui/chooser.cpp
index f5e7d26a32..ecc8ebd894 100644
--- a/gui/chooser.cpp
+++ b/gui/chooser.cpp
@@ -22,10 +22,9 @@
  * $Id$
  */
 
-#include "common/system.h"
 #include "common/translation.h"
 #include "gui/chooser.h"
-#include "gui/gui-manager.h"
+#include "gui/widget.h"
 #include "gui/widgets/list.h"
 
 namespace GUI {
diff --git a/gui/chooser.h b/gui/chooser.h
index ce67c008df..79a20383c5 100644
--- a/gui/chooser.h
+++ b/gui/chooser.h
@@ -25,12 +25,14 @@
 #ifndef CHOOSER_DIALOG_H
 #define CHOOSER_DIALOG_H
 
+#include "common/array.h"
 #include "common/str.h"
 #include "gui/dialog.h"
 
 namespace GUI {
 
 class ButtonWidget;
+class CommandSender;
 class ListWidget;
 
 /*
diff --git a/gui/console.cpp b/gui/console.cpp
index cb3319063d..cbab1b212e 100644
--- a/gui/console.cpp
+++ b/gui/console.cpp
@@ -27,10 +27,8 @@
 #include "gui/ThemeEval.h"
 #include "gui/gui-manager.h"
 
-#include "engines/engine.h"
 #include "base/version.h"
 
-#include "common/events.h"
 #include "common/system.h"
 
 #include "graphics/fontman.h"
diff --git a/gui/debugger.cpp b/gui/debugger.cpp
index f113206ea1..2282bc3a1c 100644
--- a/gui/debugger.cpp
+++ b/gui/debugger.cpp
@@ -26,7 +26,6 @@
 // NB: This is really only necessary if USE_READLINE is defined
 #define FORBIDDEN_SYMBOL_ALLOW_ALL
 
-#include "common/debug.h"
 #include "common/debug-channels.h"
 #include "common/system.h"
 
diff --git a/gui/dialog.cpp b/gui/dialog.cpp
index 2c2b0603d6..15e47141c8 100644
--- a/gui/dialog.cpp
+++ b/gui/dialog.cpp
@@ -22,14 +22,11 @@
  * $Id$
  */
 
-#include "common/events.h"
+#include "common/rect.h"
 
 #include "gui/gui-manager.h"
 #include "gui/dialog.h"
 #include "gui/widget.h"
-#include "gui/widgets/popup.h"
-
-#include "common/system.h"
 
 namespace GUI {
 
diff --git a/gui/dialog.h b/gui/dialog.h
index 1845786044..c298ef107b 100644
--- a/gui/dialog.h
+++ b/gui/dialog.h
@@ -27,14 +27,14 @@
 
 #include "common/scummsys.h"
 #include "common/str.h"
+#include "common/keyboard.h"
 
 #include "gui/object.h"
-#include "gui/widget.h"
+#include "gui/ThemeEngine.h"
 
 namespace GUI {
 
-class GuiManager;
-class PopUpWidget;
+class Widget;
 
 // Some "common" commands sent to handleCommand()
 enum {
diff --git a/gui/gui-manager.cpp b/gui/gui-manager.cpp
index 0cb06458ef..19ca66b7b1 100644
--- a/gui/gui-manager.cpp
+++ b/gui/gui-manager.cpp
@@ -27,7 +27,8 @@
 #include "common/util.h"
 #include "common/config-manager.h"
 #include "common/algorithm.h"
-#include "common/timer.h"
+#include "common/rect.h"
+#include "common/textconsole.h"
 #include "common/translation.h"
 
 #include "backends/keymapper/keymapper.h"
@@ -37,6 +38,7 @@
 #include "gui/ThemeEngine.h"
 #include "gui/ThemeEval.h"
 #include "gui/Tooltip.h"
+#include "gui/widget.h"
 
 #include "graphics/cursorman.h"
 
diff --git a/gui/gui-manager.h b/gui/gui-manager.h
index a6c90bfe8d..ac4118bb06 100644
--- a/gui/gui-manager.h
+++ b/gui/gui-manager.h
@@ -30,13 +30,14 @@
 #include "common/stack.h"
 #include "common/str.h"
 
-#include "graphics/font.h"
-
-#include "gui/widget.h"
 #include "gui/ThemeEngine.h"
 
 class OSystem;
 
+namespace Graphics {
+class Font;
+}
+
 namespace GUI {
 
 class Dialog;
diff --git a/gui/launcher.cpp b/gui/launcher.cpp
index 1d209ce71a..aed57decd3 100644
--- a/gui/launcher.cpp
+++ b/gui/launcher.cpp
@@ -28,7 +28,6 @@
 #include "common/events.h"
 #include "common/fs.h"
 #include "common/util.h"
-#include "common/savefile.h"
 #include "common/system.h"
 #include "common/translation.h"
 
@@ -49,9 +48,6 @@
 
 #include "graphics/cursorman.h"
 
-#include "audio/mididrv.h"
-
-
 using Common::ConfigManager;
 
 namespace GUI {
diff --git a/gui/launcher.h b/gui/launcher.h
index df9a6fb639..274fc45bb4 100644
--- a/gui/launcher.h
+++ b/gui/launcher.h
@@ -31,10 +31,13 @@
 namespace GUI {
 
 class BrowserDialog;
+class CommandSender;
 class ListWidget;
+class ButtonWidget;
 class GraphicsWidget;
-class SaveLoadChooser;
+class StaticTextWidget;
 class EditTextWidget;
+class SaveLoadChooser;
 
 Common::String addGameToConf(const GameDescriptor &result);
 
diff --git a/gui/massadd.cpp b/gui/massadd.cpp
index 197caae675..c5af6c6bb4 100644
--- a/gui/massadd.cpp
+++ b/gui/massadd.cpp
@@ -24,14 +24,13 @@
 
 #include "engines/metaengine.h"
 #include "common/algorithm.h"
-#include "common/events.h"
-#include "common/func.h"
 #include "common/config-manager.h"
+#include "common/debug.h"
+#include "common/system.h"
 #include "common/translation.h"
 
 #include "gui/launcher.h"	// For addGameToConf()
 #include "gui/massadd.h"
-#include "gui/gui-manager.h"
 #include "gui/widget.h"
 #include "gui/widgets/list.h"
 
diff --git a/gui/massadd.h b/gui/massadd.h
index 31a8821a26..3dbab43df1 100644
--- a/gui/massadd.h
+++ b/gui/massadd.h
@@ -30,7 +30,6 @@
 #include "common/hashmap.h"
 #include "common/stack.h"
 #include "common/str.h"
-#include "common/hash-str.h"
 
 namespace GUI {
 
diff --git a/gui/message.cpp b/gui/message.cpp
index 2d097a75a9..5cb4cec3d3 100644
--- a/gui/message.cpp
+++ b/gui/message.cpp
@@ -22,7 +22,6 @@
  * $Id$
  */
 
-#include "common/events.h"
 #include "common/str.h"
 #include "common/system.h"
 #include "gui/message.h"
diff --git a/gui/message.h b/gui/message.h
index 912e3b0785..5c3308e425 100644
--- a/gui/message.h
+++ b/gui/message.h
@@ -30,6 +30,8 @@
 
 namespace GUI {
 
+class CommandSender;
+
 enum {
 	kMessageOK = 1,
 	kMessageCancel = 0
diff --git a/gui/object.cpp b/gui/object.cpp
index bf8e7a8642..6564fe2b68 100644
--- a/gui/object.cpp
+++ b/gui/object.cpp
@@ -22,7 +22,8 @@
  * $Id$
  */
 
-#include "common/system.h"
+#include "common/textconsole.h"
+
 #include "gui/object.h"
 #include "gui/widget.h"
 #include "gui/gui-manager.h"
diff --git a/gui/object.h b/gui/object.h
index fb5ff18290..3b181fd8a3 100644
--- a/gui/object.h
+++ b/gui/object.h
@@ -25,9 +25,11 @@
 #ifndef GUI_OBJECT_H
 #define GUI_OBJECT_H
 
+#include "common/scummsys.h"
+#include "common/str.h"
+
 namespace GUI {
 
-class CommandReceiver;
 class CommandSender;
 
 class CommandReceiver {
diff --git a/gui/options.cpp b/gui/options.cpp
index a12630a0e7..547ab0f3c6 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -24,10 +24,8 @@
 
 #include "gui/browser.h"
 #include "gui/themebrowser.h"
-#include "gui/chooser.h"
 #include "gui/message.h"
 #include "gui/gui-manager.h"
-#include "gui/ThemeEval.h"
 #include "gui/options.h"
 #include "gui/widgets/popup.h"
 #include "gui/widgets/tab.h"
@@ -35,10 +33,9 @@
 #include "common/fs.h"
 #include "common/config-manager.h"
 #include "common/system.h"
+#include "common/textconsole.h"
 #include "common/translation.h"
 
-#include "graphics/scaler.h"
-
 #include "audio/mididrv.h"
 #include "audio/musicplugin.h"
 #include "audio/mixer.h"
diff --git a/gui/options.h b/gui/options.h
index 5cc13b5cf6..c097a3a9e9 100644
--- a/gui/options.h
+++ b/gui/options.h
@@ -27,7 +27,7 @@
 
 #include "gui/dialog.h"
 #include "common/str.h"
-#include "audio/musicplugin.h"
+#include "audio/mididrv.h"
 
 #ifdef SMALL_SCREEN_DEVICE
 #include "gui/KeysDialog.h"
@@ -35,13 +35,16 @@
 
 namespace GUI {
 
-class BrowserDialog;
 class CheckboxWidget;
 class PopUpWidget;
 class SliderWidget;
 class StaticTextWidget;
-class ListWidget;
 class TabWidget;
+class ButtonWidget;
+class CommandSender;
+class GuiObject;
+class RadiobuttonGroup;
+class RadiobuttonWidget;
 
 class OptionsDialog : public Dialog {
 public:
diff --git a/gui/saveload.h b/gui/saveload.h
index b3622c1f13..06f1251e11 100644
--- a/gui/saveload.h
+++ b/gui/saveload.h
@@ -32,6 +32,10 @@ namespace GUI {
 
 class ListWidget;
 class GraphicsWidget;
+class ButtonWidget;
+class CommandSender;
+class ContainerWidget;
+class StaticTextWidget;
 
 class SaveLoadChooser : GUI::Dialog {
 	typedef Common::String String;
diff --git a/gui/themebrowser.h b/gui/themebrowser.h
index aba519886d..bd6b11fb46 100644
--- a/gui/themebrowser.h
+++ b/gui/themebrowser.h
@@ -33,8 +33,8 @@
 
 namespace GUI {
 
+class CommandSender;
 class ListWidget;
-class StaticTextWidget;
 
 class ThemeBrowser : public Dialog {
 public:
diff --git a/gui/widget.cpp b/gui/widget.cpp
index 61f4a0e249..f0e91718eb 100644
--- a/gui/widget.cpp
+++ b/gui/widget.cpp
@@ -22,10 +22,12 @@
  * $Id$
  */
 
-#include "common/util.h"
-#include "graphics/fontman.h"
+#include "common/scummsys.h"
+#include "common/system.h"
+#include "common/rect.h"
+#include "common/textconsole.h"
+#include "graphics/pixelformat.h"
 #include "gui/widget.h"
-#include "gui/dialog.h"
 #include "gui/gui-manager.h"
 
 #include "gui/ThemeEval.h"
diff --git a/gui/widget.h b/gui/widget.h
index 1bb9823fdf..9acccd9684 100644
--- a/gui/widget.h
+++ b/gui/widget.h
@@ -26,17 +26,16 @@
 #define GUI_WIDGET_H
 
 #include "common/scummsys.h"
+#include "common/array.h"
 #include "common/str.h"
-#include "common/str-array.h"
 #include "common/keyboard.h"
+#include "graphics/font.h"
 #include "graphics/surface.h"
 #include "gui/object.h"
 #include "gui/ThemeEngine.h"
 
 namespace GUI {
 
-class Dialog;
-
 enum {
 	WIDGET_ENABLED		= 1 <<  0,
 	WIDGET_INVISIBLE	= 1 <<  1,
diff --git a/gui/widgets/editable.cpp b/gui/widgets/editable.cpp
index 7d6e0fae01..2ee3575bc6 100644
--- a/gui/widgets/editable.cpp
+++ b/gui/widgets/editable.cpp
@@ -22,9 +22,11 @@
  * $Id$
  */
 
-#include "common/events.h"
+#include "common/rect.h"
+#include "common/system.h"
 #include "gui/widgets/editable.h"
 #include "gui/gui-manager.h"
+#include "graphics/font.h"
 
 namespace GUI {
 
diff --git a/gui/widgets/editable.h b/gui/widgets/editable.h
index b394e105d1..e0b6375919 100644
--- a/gui/widgets/editable.h
+++ b/gui/widgets/editable.h
@@ -25,9 +25,15 @@
 #ifndef GUI_WIDGETS_EDITABLE_H
 #define GUI_WIDGETS_EDITABLE_H
 
+#include "common/keyboard.h"
 #include "common/str.h"
-#include "common/rect.h"
 #include "gui/widget.h"
+#include "gui/ThemeEngine.h"
+#include "gui/object.h"
+
+namespace Common {
+struct Rect;
+}
 
 namespace GUI {
 
diff --git a/gui/widgets/edittext.cpp b/gui/widgets/edittext.cpp
index 159943fcdd..106262bafe 100644
--- a/gui/widgets/edittext.cpp
+++ b/gui/widgets/edittext.cpp
@@ -23,7 +23,6 @@
  */
 
 #include "gui/widgets/edittext.h"
-#include "gui/dialog.h"
 #include "gui/gui-manager.h"
 
 #include "gui/ThemeEval.h"
diff --git a/gui/widgets/list.cpp b/gui/widgets/list.cpp
index 1e13226d61..1f7846c503 100644
--- a/gui/widgets/list.cpp
+++ b/gui/widgets/list.cpp
@@ -23,7 +23,6 @@
  */
 
 #include "common/system.h"
-#include "common/events.h"
 #include "common/frac.h"
 #include "common/tokenizer.h"
 
diff --git a/gui/widgets/popup.cpp b/gui/widgets/popup.cpp
index 02cbd940b2..cab556065f 100644
--- a/gui/widgets/popup.cpp
+++ b/gui/widgets/popup.cpp
@@ -23,11 +23,9 @@
  */
 
 #include "common/system.h"
-#include "common/events.h"
 #include "gui/dialog.h"
 #include "gui/gui-manager.h"
 #include "gui/widgets/popup.h"
-#include "engines/engine.h"
 
 #include "gui/ThemeEval.h"
 
diff --git a/gui/widgets/scrollbar.cpp b/gui/widgets/scrollbar.cpp
index 5e963e04fe..38383c0e55 100644
--- a/gui/widgets/scrollbar.cpp
+++ b/gui/widgets/scrollbar.cpp
@@ -22,11 +22,12 @@
  * $Id$
  */
 
+#include "common/rect.h"
+#include "common/system.h"
+#include "common/timer.h"
 #include "gui/widgets/scrollbar.h"
-#include "gui/dialog.h"
 #include "gui/gui-manager.h"
-
-#include "common/timer.h"
+#include "gui/ThemeEngine.h"
 
 namespace GUI {
 
diff --git a/gui/widgets/tab.cpp b/gui/widgets/tab.cpp
index 10baeac901..721fb88cf8 100644
--- a/gui/widgets/tab.cpp
+++ b/gui/widgets/tab.cpp
@@ -24,7 +24,6 @@
 
 #include "common/util.h"
 #include "gui/widgets/tab.h"
-#include "gui/dialog.h"
 #include "gui/gui-manager.h"
 
 #include "gui/ThemeEval.h"