diff --git a/engines/sci/engine/grammar.cpp b/engines/sci/engine/grammar.cpp
index f3a3d2c33be..899defa3734 100644
--- a/engines/sci/engine/grammar.cpp
+++ b/engines/sci/engine/grammar.cpp
@@ -30,7 +30,7 @@
 
 #include "sci/tools.h"
 #include "sci/include/vocabulary.h"
-#include "sci/include/sciconsole.h"
+#include "sci/scicore/sciconsole.h"
 
 namespace Sci {
 
diff --git a/engines/sci/engine/heap.cpp b/engines/sci/engine/heap.cpp
index 7ea0f41c2bf..a68c12bcbc0 100644
--- a/engines/sci/engine/heap.cpp
+++ b/engines/sci/engine/heap.cpp
@@ -24,7 +24,7 @@
  */
 
 #include "sci/include/engine.h"
-#include "sci/include/sciconsole.h"
+#include "sci/scicore/sciconsole.h"
 #include "sci/engine/heap.h"
 
 namespace Sci {
diff --git a/engines/sci/engine/kernel.h b/engines/sci/engine/kernel.h
index f60f8564f61..e583d1c4cc3 100644
--- a/engines/sci/engine/kernel.h
+++ b/engines/sci/engine/kernel.h
@@ -31,7 +31,7 @@
 
 #include "sci/engine/kdebug.h"
 #include "sci/include/uinput.h"
-#include "sci/include/sciconsole.h" /* sciprintf() */
+#include "sci/scicore/sciconsole.h" /* sciprintf() */
 
 namespace Sci {
 
diff --git a/engines/sci/engine/scriptdebug.cpp b/engines/sci/engine/scriptdebug.cpp
index 2fdc6d8d4b6..ab9f088e594 100644
--- a/engines/sci/engine/scriptdebug.cpp
+++ b/engines/sci/engine/scriptdebug.cpp
@@ -28,7 +28,7 @@
 #include "sci/engine/gc.h"
 #include "sci/include/sciresource.h"
 #include "sci/include/engine.h"
-#include "sci/include/sciconsole.h"
+#include "sci/scicore/sciconsole.h"
 #include "sci/engine/kdebug.h"
 #include "sci/include/vocabulary.h"
 #include "sci/engine/kernel.h"
diff --git a/engines/sci/engine/seg_manager.h b/engines/sci/engine/seg_manager.h
index 56b6f550cb9..f77e6ebb775 100644
--- a/engines/sci/engine/seg_manager.h
+++ b/engines/sci/engine/seg_manager.h
@@ -26,7 +26,6 @@
 #ifndef _SCI_SEG_MANAGER_H
 #define _SCI_SEG_MANAGER_H
 
-#include "sci/engine/intmap.h"
 #include "sci/engine/vm.h"
 
 namespace Sci {
diff --git a/engines/sci/engine/sys_strings.cpp b/engines/sci/engine/sys_strings.cpp
index bcb7dd92192..7aba4b58d35 100644
--- a/engines/sci/engine/sys_strings.cpp
+++ b/engines/sci/engine/sys_strings.cpp
@@ -24,7 +24,7 @@
  */
 
 #include "sci/tools.h"
-#include "sci/include/sys_strings.h"
+#include "sci/engine/sys_strings.h"
 #include "sci/sci_memory.h"
 
 namespace Sci {
diff --git a/engines/sci/include/sys_strings.h b/engines/sci/engine/sys_strings.h
similarity index 100%
rename from engines/sci/include/sys_strings.h
rename to engines/sci/engine/sys_strings.h
diff --git a/engines/sci/engine/vm.h b/engines/sci/engine/vm.h
index d64b6e67e3e..a2a31240059 100644
--- a/engines/sci/engine/vm.h
+++ b/engines/sci/engine/vm.h
@@ -30,10 +30,10 @@
 
 #include "sci/include/versions.h"	// for sci_version_t
 #include "sci/include/vm_types.h"	// for reg_t
-#include "sci/include/sys_strings.h"
 #include "sci/include/heapmgr.h"
 
 #include "sci/engine/intmap.h"
+#include "sci/engine/sys_strings.h"
 
 namespace Sci {
 
diff --git a/engines/sci/include/engine.h b/engines/sci/include/engine.h
index c031ec77dc0..46a17142cf9 100644
--- a/engines/sci/include/engine.h
+++ b/engines/sci/include/engine.h
@@ -37,7 +37,7 @@ namespace Common {
 #include "sci/include/vocabulary.h"
 #include "sci/include/sciresource.h"
 #include "sci/include/script.h"
-#include "sci/include/sciconsole.h"
+#include "sci/scicore/sciconsole.h"
 #include "sci/include/versions.h"
 #include "sci/engine/seg_manager.h"
 #include "sci/gfx/gfx_state_internal.h"
diff --git a/engines/sci/include/sciconsole.h b/engines/sci/scicore/sciconsole.h
similarity index 100%
rename from engines/sci/include/sciconsole.h
rename to engines/sci/scicore/sciconsole.h