diff --git a/engines/sci/engine/kevent.cpp b/engines/sci/engine/kevent.cpp
index b8454ac70f7..475e3200cad 100644
--- a/engines/sci/engine/kevent.cpp
+++ b/engines/sci/engine/kevent.cpp
@@ -30,6 +30,7 @@
 #include "sci/gfx/gfx_state_internal.h"	// required for GfxPort, GfxVisual
 #include "sci/console.h"
 #include "sci/debug.h"	// for g_debug_simulated_key
+#include "sci/gui/gui.h"
 
 namespace Sci {
 
diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp
index b97d312e5dd..9090a0286c8 100644
--- a/engines/sci/engine/kgraphics.cpp
+++ b/engines/sci/engine/kgraphics.cpp
@@ -38,6 +38,7 @@
 #include "sci/gfx/gfx_widgets.h"
 #include "sci/gfx/gfx_state_internal.h"	// required for GfxContainer, GfxPort, GfxVisual
 #include "sci/gfx/seq_decoder.h"
+#include "sci/gui/gui.h"
 
 namespace Sci {
 
diff --git a/engines/sci/engine/kmisc.cpp b/engines/sci/engine/kmisc.cpp
index c075717dd66..6650810dc6d 100644
--- a/engines/sci/engine/kmisc.cpp
+++ b/engines/sci/engine/kmisc.cpp
@@ -32,6 +32,7 @@
 #include "sci/engine/state.h"
 #include "sci/engine/kernel.h"
 #include "sci/engine/gc.h"
+#include "sci/gui/gui.h"
 
 namespace Sci {
 
diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index 04fc2eef468..89809408c76 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -39,6 +39,7 @@
 #include "sci/sfx/iterator.h"
 #include "sci/engine/state.h"
 #include "sci/engine/savegame.h"
+#include "sci/gui/gui.h"
 
 namespace Sci {
 
diff --git a/engines/sci/engine/state.h b/engines/sci/engine/state.h
index 3f6fc0dbf10..7d06c2a0a90 100644
--- a/engines/sci/engine/state.h
+++ b/engines/sci/engine/state.h
@@ -44,7 +44,6 @@ namespace Common {
 #include "sci/engine/seg_manager.h"
 #include "sci/gfx/gfx_system.h"
 #include "sci/sfx/core.h"
-#include "sci/gui/gui.h"
 
 namespace Sci {
 
diff --git a/engines/sci/gui/gui.cpp b/engines/sci/gui/gui.cpp
index 016f749544a..633d8eb4366 100644
--- a/engines/sci/gui/gui.cpp
+++ b/engines/sci/gui/gui.cpp
@@ -28,6 +28,7 @@
 #include "sci/sci.h"
 #include "sci/engine/state.h"
 #include "sci/tools.h"
+#include "sci/gui/gui.h"
 #include "sci/gui/gui_screen.h"
 #include "sci/gui/gui_gfx.h"
 #include "sci/gui/gui_windowmgr.h"
diff --git a/engines/sci/gui/gui_font.h b/engines/sci/gui/gui_font.h
index c6f457b541b..dd20016a14a 100644
--- a/engines/sci/gui/gui_font.h
+++ b/engines/sci/gui/gui_font.h
@@ -26,6 +26,8 @@
 #ifndef SCI_GUI_FONT_H
 #define SCI_GUI_FONT_H
 
+#include "sci/gui/gui.h"
+
 namespace Sci {
 
 class SciGUIfont {
diff --git a/engines/sci/gui/gui_gfx.h b/engines/sci/gui/gui_gfx.h
index b1407eb00d4..3749de520e3 100644
--- a/engines/sci/gui/gui_gfx.h
+++ b/engines/sci/gui/gui_gfx.h
@@ -26,6 +26,8 @@
 #ifndef SCI_GUI_GFX_H
 #define SCI_GUI_GFX_H
 
+#include "sci/gui/gui.h"
+
 namespace Sci {
 
 #define SCI_PATTERN_CODE_RECTANGLE 0x10
diff --git a/engines/sci/gui/gui_screen.h b/engines/sci/gui/gui_screen.h
index fc82922c353..db054aa61b5 100644
--- a/engines/sci/gui/gui_screen.h
+++ b/engines/sci/gui/gui_screen.h
@@ -26,6 +26,8 @@
 #ifndef SCI_GUI_SCREEN_H
 #define SCI_GUI_SCREEN_H
 
+#include "sci/gui/gui.h"
+
 namespace Sci {
 
 #define SCI_SCREEN_MAXHEIGHT 400