SCI: Reduce header interdepencies once again. Rule of thumb: Never include a header file from another header file unless you absolutely *must* do it; if possible, try to use class forwards instead, and include the headers from source files only

svn-id: r44767

6 files changed, 12 insertions, 9 deletions

diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp
index b74e338d1b..63c4b3fab2 100644
--- a/engines/sci/console.cpp
+++ b/engines/sci/console.cpp
@@ -41,6 +41,7 @@
 #include "sci/sfx/iterator.h"	// for SCI_SONG_ITERATOR_TYPE_SCI0
 #include "sci/sfx/sci_midi.h"
 #include "sci/vocabulary.h"
+#include "sci/gui/gui.h"
 
 #include "common/savefile.h"
 
diff --git a/engines/sci/gfx/gfx_driver.h b/engines/sci/gfx/gfx_driver.h
index 19cd2f314f..8983111b5b 100644
--- a/engines/sci/gfx/gfx_driver.h
+++ b/engines/sci/gfx/gfx_driver.h
@@ -37,6 +37,8 @@ enum gfx_buffer_t {
 	GFX_BUFFER_STATIC = 2
 };
 
+class SciGuiScreen;
+
 
 /**
  * Graphics driver.
diff --git a/engines/sci/gfx/gfx_resmgr.h b/engines/sci/gfx/gfx_resmgr.h
index 851ba642b5..f1faa929b3 100644
--- a/engines/sci/gfx/gfx_resmgr.h
+++ b/engines/sci/gfx/gfx_resmgr.h
@@ -23,24 +23,25 @@
  *
  */
 
-#ifndef SCI_GFX_GFX_resMan_H
-#define SCI_GFX_GFX_resMan_H
+#ifndef SCI_GFX_GFX_RESMAN_H
+#define SCI_GFX_GFX_RESMAN_H
+
+#include "common/hashmap.h"
+#include "common/rect.h"
 
 // FIXME/TODO: The name "(Graphics) resource manager", and the associated
 // filenames, are misleading. This should be renamed to "Graphics manager"
 // or something like that.
 
 #include "sci/gfx/gfx_resource.h"
-#include "sci/gui/gui_palette.h"
-#include "sci/resource.h"
 
-#include "common/hashmap.h"
-#include "common/rect.h"
+#include "sci/resource.h"
 
 namespace Sci {
 
 struct gfx_bitmap_font_t;
 class ResourceManager;
+class SciGuiPalette;
 
 enum gfx_resource_type_t {
 	GFX_RESOURCE_TYPE_VIEW = 0,
@@ -310,4 +311,4 @@ private:
 
 } // End of namespace Sci
 
-#endif // SCI_GFX_GFX_RSMGR_H
+#endif // SCI_GFX_GFX_RESMAN_H
diff --git a/engines/sci/gfx/gfx_resource.h b/engines/sci/gfx/gfx_resource.h
index 63d43b6f74..7d1f279103 100644
--- a/engines/sci/gfx/gfx_resource.h
+++ b/engines/sci/gfx/gfx_resource.h
@@ -31,7 +31,6 @@
 #define SCI_GFX_GFX_RESOURCE_H
 
 #include "sci/gfx/gfx_system.h"
-#include "sci/gui/gui_screen.h"
 #include "sci/gfx/gfx_driver.h"
 
 #include "common/rect.h"
diff --git a/engines/sci/gfx/gfx_tools.h b/engines/sci/gfx/gfx_tools.h
index 99f338cf06..5e615d650a 100644
--- a/engines/sci/gfx/gfx_tools.h
+++ b/engines/sci/gfx/gfx_tools.h
@@ -29,7 +29,6 @@
 #include "graphics/pixelformat.h"
 
 #include "sci/gfx/gfx_system.h"
-#include "sci/gui/gui_screen.h"
 #include "sci/gfx/gfx_driver.h"
 
 namespace Sci {
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index 28172f1915..8ebc947e23 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -39,6 +39,7 @@
 #include "sci/gui32/gui32.h"
 #include "sci/gui/gui_palette.h"
 #include "sci/gui/gui_cursor.h"
+#include "sci/gui/gui_screen.h"
 
 #include "sci/gfx/gfx_resource.h"
 #include "sci/gfx/gfx_tools.h"