diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index 52f96ba9a21..5764a056e06 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -36,6 +36,7 @@
 #include "sci/engine/message.h"
 #include "sci/engine/savegame.h"
 #include "sci/engine/vm_types.h"
+#include "sci/engine/script.h"	// for SCI_OBJ_EXPORTS and SCI_OBJ_SYNONYMS
 #include "sci/graphics/gui.h"
 #include "sci/sound/audio.h"
 #ifdef USE_OLD_MUSIC_FUNCTIONS
@@ -702,6 +703,7 @@ static void load_script(EngineState *s, Script *scr) {
 	}
 }
 
+// TODO: Move thie function to a more appropriate place, such as vm.cpp or script.cpp
 void SegManager::reconstructScripts(EngineState *s) {
 	uint i;
 	SegmentObj *mobj;
diff --git a/engines/sci/engine/script.cpp b/engines/sci/engine/script.cpp
index a838758d1a6..1c898da4e54 100644
--- a/engines/sci/engine/script.cpp
+++ b/engines/sci/engine/script.cpp
@@ -26,6 +26,9 @@
 #include "sci/sci.h"
 #include "sci/resource.h"
 #include "sci/engine/state.h"
+#include "sci/engine/kernel.h"
+#include "sci/engine/script.h"
+
 #include "common/util.h"
 
 namespace Sci {
diff --git a/engines/sci/engine/scriptdebug.cpp b/engines/sci/engine/scriptdebug.cpp
index f950673dc31..b54e9cd35a9 100644
--- a/engines/sci/engine/scriptdebug.cpp
+++ b/engines/sci/engine/scriptdebug.cpp
@@ -29,6 +29,8 @@
 #include "sci/console.h"
 #include "sci/debug.h"
 #include "sci/engine/state.h"
+#include "sci/engine/kernel.h"
+#include "sci/engine/script.h"
 
 namespace Sci {
 
diff --git a/engines/sci/engine/selector.h b/engines/sci/engine/selector.h
index be777c0e72d..0cc09353773 100644
--- a/engines/sci/engine/selector.h
+++ b/engines/sci/engine/selector.h
@@ -30,6 +30,7 @@
 
 #include "sci/engine/vm_types.h"	// for reg_t
 #include "sci/engine/vm.h"
+#include "sci/engine/kernel.h"		// for Kernel::_selectorCache
 
 namespace Sci {
 
diff --git a/engines/sci/engine/state.h b/engines/sci/engine/state.h
index 98296fce91c..1882200b908 100644
--- a/engines/sci/engine/state.h
+++ b/engines/sci/engine/state.h
@@ -37,8 +37,6 @@ namespace Common {
 
 #include "sci/sci.h"
 #include "sci/resource.h"
-#include "sci/engine/kernel.h"	// for kfunct_sig_pair_t
-#include "sci/engine/script.h"
 #include "sci/engine/seg_manager.h"
 
 #include "sci/parser/vocabulary.h"
diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp
index 65577e72e3b..9e615084923 100644
--- a/engines/sci/engine/vm.cpp
+++ b/engines/sci/engine/vm.cpp
@@ -35,6 +35,7 @@
 #include "sci/engine/kernel.h"
 #include "sci/engine/kernel_types.h"
 #include "sci/engine/seg_manager.h"
+#include "sci/engine/script.h"
 #include "sci/engine/gc.h"
 
 namespace Sci {
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index 9db3b6a0613..1994fd2b6eb 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -35,6 +35,7 @@
 
 #include "sci/engine/state.h"
 #include "sci/engine/kernel.h"
+#include "sci/engine/script.h"	// for script_adjust_opcode_formats & script_free_breakpoints
 
 #include "sci/sound/audio.h"
 #include "sci/sound/soundcmd.h"