SCI: Add include guards for gui headers; don't include gui/gui.h from engine/state.h

svn-id: r44632

11 files changed, 54 insertions, 6 deletions

diff --git a/engines/sci/engine/state.h b/engines/sci/engine/state.h
index 4bc64b0a94..3f6fc0dbf1 100644
--- a/engines/sci/engine/state.h
+++ b/engines/sci/engine/state.h
@@ -49,6 +49,7 @@ namespace Common {
 namespace Sci {
 
 class Menubar;
+class SciGUI;
 
 struct GfxState;
 struct GfxPort;
diff --git a/engines/sci/gui/gui.h b/engines/sci/gui/gui.h
index f88df8b11e..fc50c4979a 100644
--- a/engines/sci/gui/gui.h
+++ b/engines/sci/gui/gui.h
@@ -23,6 +23,9 @@
  *
  */
 
+#ifndef SCI_GUI_GUI_H
+#define SCI_GUI_GUI_H
+
 #include "sci/gui/gui_helpers.h"
 
 namespace Sci {
@@ -94,3 +97,5 @@ private:
 };
 
 } // End of namespace Sci
+
+#endif
diff --git a/engines/sci/gui/gui_font.h b/engines/sci/gui/gui_font.h
index 732f74c6d3..f9a6d41dd1 100644
--- a/engines/sci/gui/gui_font.h
+++ b/engines/sci/gui/gui_font.h
@@ -23,6 +23,9 @@
  *
  */
 
+#ifndef SCI_GUI_FONT_H
+#define SCI_GUI_FONT_H
+
 namespace Sci {
 
 class SciGUIfont {
@@ -55,4 +58,6 @@ private:
 	charinfo* mChars;
 };
 
-} // end of namespace Sci
+} // End of namespace Sci
+
+#endif
diff --git a/engines/sci/gui/gui_gfx.h b/engines/sci/gui/gui_gfx.h
index 3d02ee017f..b1407eb00d 100644
--- a/engines/sci/gui/gui_gfx.h
+++ b/engines/sci/gui/gui_gfx.h
@@ -23,6 +23,9 @@
  *
  */
 
+#ifndef SCI_GUI_GFX_H
+#define SCI_GUI_GFX_H
+
 namespace Sci {
 
 #define SCI_PATTERN_CODE_RECTANGLE 0x10
@@ -162,4 +165,6 @@ private:
 	SciGUIfont *_font;
 };
 
-} // end of namespace Sci
+} // End of namespace Sci
+
+#endif
diff --git a/engines/sci/gui/gui_helpers.h b/engines/sci/gui/gui_helpers.h
index e94bbe8942..d7c5e91db9 100644
--- a/engines/sci/gui/gui_helpers.h
+++ b/engines/sci/gui/gui_helpers.h
@@ -23,6 +23,9 @@
  *
  */
 
+#ifndef SCI_GUI_HELPERS_H
+#define SCI_GUI_HELPERS_H
+
 #include "common/rect.h"
 #include "sci/engine/vm_types.h"
 
@@ -102,4 +105,6 @@ enum {
 	GFX_REMOVEVIEW = 0x80
 };
 
-}
+} // End of namespace Sci
+
+#endif
diff --git a/engines/sci/gui/gui_memmgr.h b/engines/sci/gui/gui_memmgr.h
index 4a1631cadf..3053d6a403 100644
--- a/engines/sci/gui/gui_memmgr.h
+++ b/engines/sci/gui/gui_memmgr.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef SCI_MEMMGR_H
-#define SCI_MEMMGR_H
+#ifndef SCI_GUI_MEMMGR_H
+#define SCI_GUI_MEMMGR_H
 
 #include "common/savefile.h"
 #include "common/endian.h"
@@ -118,6 +118,6 @@ void heapSetBlockNext(HEAPHANDLE ptr, SCIHANDLE next);
 bool saveMemState(Common::OutSaveFile *pFile);
 bool restoreMemState(Common::InSaveFile *pFile);
 
-} // end of namespace SCI
+} // End of namespace SCI
 
 #endif
diff --git a/engines/sci/gui/gui_picture.h b/engines/sci/gui/gui_picture.h
index 42a8ee7d1e..f6115ab4eb 100644
--- a/engines/sci/gui/gui_picture.h
+++ b/engines/sci/gui/gui_picture.h
@@ -23,6 +23,9 @@
  *
  */
 
+#ifndef SCI_GUI_PICTURE_H
+#define SCI_GUI_PICTURE_H
+
 namespace Sci {
 
 #define SCI_PAL_FORMAT_VARIABLE_FLAGS 0
@@ -67,3 +70,5 @@ private:
 };
 
 } // end of namespace Sci
+
+#endif
diff --git a/engines/sci/gui/gui_screen.h b/engines/sci/gui/gui_screen.h
index e27759f5f9..3f45a7171e 100644
--- a/engines/sci/gui/gui_screen.h
+++ b/engines/sci/gui/gui_screen.h
@@ -23,6 +23,9 @@
  *
  */
 
+#ifndef SCI_GUI_SCREEN_H
+#define SCI_GUI_SCREEN_H
+
 namespace Sci {
 
 #define SCI_SCREEN_MAXHEIGHT 400
@@ -86,3 +89,5 @@ private:
 };
 
 } // end of namespace Sci
+
+#endif
diff --git a/engines/sci/gui/gui_view.h b/engines/sci/gui/gui_view.h
index 22797fd180..51dea54cdb 100644
--- a/engines/sci/gui/gui_view.h
+++ b/engines/sci/gui/gui_view.h
@@ -23,6 +23,9 @@
  *
  */
 
+#ifndef SCI_GUI_VIEW_H
+#define SCI_GUI_VIEW_H
+
 namespace Sci {
 
 struct sciViewCellInfo {
@@ -76,3 +79,5 @@ private:
 };
 
 } // end of namespace Sci
+
+#endif
diff --git a/engines/sci/gui/gui_windowmgr.h b/engines/sci/gui/gui_windowmgr.h
index 10986d8791..7842d9d271 100644
--- a/engines/sci/gui/gui_windowmgr.h
+++ b/engines/sci/gui/gui_windowmgr.h
@@ -23,6 +23,9 @@
  *
  */
 
+#ifndef SCI_GUI_WINDOWMGR_H
+#define SCI_GUI_WINDOWMGR_H
+
 #include "common/list.h"
 
 namespace Sci {
@@ -55,3 +58,5 @@ private:
 };
 
 } // end of namespace Sci
+
+#endif
diff --git a/engines/sci/gui32/gui32.h b/engines/sci/gui32/gui32.h
index 0670c9afa9..27334b0d83 100644
--- a/engines/sci/gui32/gui32.h
+++ b/engines/sci/gui32/gui32.h
@@ -23,6 +23,11 @@
  *
  */
 
+#ifndef SCI_GUI32_GUI32_H
+#define SCI_GUI32_GUI32_H
+
+#include "sci/gui/gui.h"
+
 namespace Sci {
 
 class SciGUI32 : public SciGUI {
@@ -104,3 +109,5 @@ private:
 };
 
 } // End of namespace Sci
+
+#endif