SCI: Moved kernel.h and kdebug.h from include/ to engine/; untangled header deps some more

svn-id: r38833

22 files changed, 30 insertions, 10 deletions

diff --git a/engines/sci/engine/game.cpp b/engines/sci/engine/game.cpp
index a80c8fd57e..59e31a8cfd 100644
--- a/engines/sci/engine/game.cpp
+++ b/engines/sci/engine/game.cpp
@@ -29,7 +29,7 @@
 #include "sci/include/sciresource.h"
 #include "sci/include/engine.h"
 #include "sci/include/versions.h"
-#include "sci/include/kernel.h"
+#include "sci/engine/kernel.h"
 #include "sci/engine/kernel_types.h"
 #include "sci/gfx/gfx_widgets.h"
 #include "sci/gfx/menubar.h"
diff --git a/engines/sci/include/kdebug.h b/engines/sci/engine/kdebug.h
index c652c1952d..db0115ece9 100644
--- a/engines/sci/include/kdebug.h
+++ b/engines/sci/engine/kdebug.h
@@ -30,6 +30,8 @@
 
 namespace Sci {
 
+class EngineState;
+
 #define SCIk_DEBUG_MODES 17
 
 #define SCIkERROR_NR -2
diff --git a/engines/sci/engine/kernel.cpp b/engines/sci/engine/kernel.cpp
index 01c25fdf1b..396d415d35 100644
--- a/engines/sci/engine/kernel.cpp
+++ b/engines/sci/engine/kernel.cpp
@@ -36,6 +36,7 @@
 
 #include "sci/sci.h"
 #include "sci/engine/gc.h"
+#include "sci/engine/kernel.h"
 #include "sci/include/sciresource.h"
 #include "sci/include/engine.h"
 #include "sci/gfx/gfx_operations.h"
diff --git a/engines/sci/include/kernel.h b/engines/sci/engine/kernel.h
index 6221aaeaa9..f60f8564f6 100644
--- a/engines/sci/include/kernel.h
+++ b/engines/sci/engine/kernel.h
@@ -29,13 +29,15 @@
 #include "common/scummsys.h"
 #include "common/debug.h"
 
-#include "sci/include/kdebug.h"
+#include "sci/engine/kdebug.h"
 #include "sci/include/uinput.h"
-#include "sci/include/vm.h"
 #include "sci/include/sciconsole.h" /* sciprintf() */
 
 namespace Sci {
 
+struct node_t;	// from vm.h
+struct list_t;	// from vm.h
+
 extern int _kdebug_cheap_event_hack;
 extern int _kdebug_cheap_soundcue_hack;
 extern int stop_on_event;
diff --git a/engines/sci/engine/kevent.cpp b/engines/sci/engine/kevent.cpp
index b03ef45c19..083ecb18d6 100644
--- a/engines/sci/engine/kevent.cpp
+++ b/engines/sci/engine/kevent.cpp
@@ -25,6 +25,7 @@
 
 #include "sci/include/engine.h"
 #include "sci/gfx/gfx_widgets.h"
+#include "sci/engine/kernel.h"
 
 namespace Sci {
 
diff --git a/engines/sci/engine/kfile.cpp b/engines/sci/engine/kfile.cpp
index e018dc0420..8721fac7af 100644
--- a/engines/sci/engine/kfile.cpp
+++ b/engines/sci/engine/kfile.cpp
@@ -35,8 +35,9 @@
 #include "common/str.h"
 #include "common/savefile.h"
 
-#include "sci/include/engine.h"
 #include "sci/sci.h"
+#include "sci/include/engine.h"
+#include "sci/engine/kernel.h"
 
 #include <errno.h>
 #include <sys/stat.h>		// for S_IREAD/S_IWRITE
diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp
index 887053c8e8..2eb3372ea5 100644
--- a/engines/sci/engine/kgraphics.cpp
+++ b/engines/sci/engine/kgraphics.cpp
@@ -27,9 +27,10 @@
 
 #include "sci/include/sciresource.h"
 #include "sci/include/engine.h"
+#include "sci/include/sci_widgets.h"
 #include "sci/gfx/gfx_widgets.h"
 #include "sci/engine/sci_graphics.h"
-#include "sci/include/sci_widgets.h"
+#include "sci/engine/kernel.h"
 
 namespace Sci {
 
diff --git a/engines/sci/engine/klists.cpp b/engines/sci/engine/klists.cpp
index 7693e835a8..f56812a406 100644
--- a/engines/sci/engine/klists.cpp
+++ b/engines/sci/engine/klists.cpp
@@ -24,6 +24,7 @@
  */
 
 #include "sci/include/engine.h"
+#include "sci/engine/kernel.h"
 
 namespace Sci {
 
diff --git a/engines/sci/engine/kmath.cpp b/engines/sci/engine/kmath.cpp
index 2183b60eff..b1d6959992 100644
--- a/engines/sci/engine/kmath.cpp
+++ b/engines/sci/engine/kmath.cpp
@@ -24,6 +24,7 @@
  */
 
 #include "sci/include/engine.h"
+#include "sci/engine/kernel.h"
 
 namespace Sci {
 
diff --git a/engines/sci/engine/kmenu.cpp b/engines/sci/engine/kmenu.cpp
index 24e19bd3b2..8eac3fa270 100644
--- a/engines/sci/engine/kmenu.cpp
+++ b/engines/sci/engine/kmenu.cpp
@@ -27,6 +27,7 @@
 #include "sci/include/engine.h"
 #include "sci/include/sci_widgets.h"
 #include "sci/gfx/menubar.h"
+#include "sci/engine/kernel.h"
 
 namespace Sci {
 
diff --git a/engines/sci/engine/kmovement.cpp b/engines/sci/engine/kmovement.cpp
index 25161890c7..114ddaa1a2 100644
--- a/engines/sci/engine/kmovement.cpp
+++ b/engines/sci/engine/kmovement.cpp
@@ -25,6 +25,7 @@
 
 #include "sci/include/sciresource.h"
 #include "sci/include/engine.h"
+#include "sci/engine/kernel.h"
 
 namespace Sci {
 
diff --git a/engines/sci/engine/kpathing.cpp b/engines/sci/engine/kpathing.cpp
index 7a42f71ccc..f377a06c7f 100644
--- a/engines/sci/engine/kpathing.cpp
+++ b/engines/sci/engine/kpathing.cpp
@@ -30,6 +30,7 @@
 #include "sci/include/engine.h"
 #include "sci/engine/aatree.h"
 #include "sci/gfx/gfx_widgets.h"
+#include "sci/engine/kernel.h"
 
 #include "common/list.h"
 
diff --git a/engines/sci/engine/kscripts.cpp b/engines/sci/engine/kscripts.cpp
index ce1ffec63b..b6f2df2104 100644
--- a/engines/sci/engine/kscripts.cpp
+++ b/engines/sci/engine/kscripts.cpp
@@ -26,6 +26,7 @@
 #include "sci/include/sciresource.h"
 #include "sci/include/engine.h"
 #include "sci/engine/kernel_types.h"
+#include "sci/engine/kernel.h"
 
 namespace Sci {
 
diff --git a/engines/sci/engine/ksound.cpp b/engines/sci/engine/ksound.cpp
index 2f6f3e8eab..586aa1561d 100644
--- a/engines/sci/engine/ksound.cpp
+++ b/engines/sci/engine/ksound.cpp
@@ -25,6 +25,7 @@
 
 #include "sci/include/engine.h"
 #include "sci/sfx/sfx_player.h"
+#include "sci/engine/kernel.h"
 
 namespace Sci {
 
diff --git a/engines/sci/engine/kstring.cpp b/engines/sci/engine/kstring.cpp
index 0e48254026..242300cb21 100644
--- a/engines/sci/engine/kstring.cpp
+++ b/engines/sci/engine/kstring.cpp
@@ -28,6 +28,7 @@
 #include "sci/include/sciresource.h"
 #include "sci/include/engine.h"
 #include "sci/engine/message.h"
+#include "sci/engine/kernel.h"
 
 namespace Sci {
 
diff --git a/engines/sci/engine/scriptdebug.cpp b/engines/sci/engine/scriptdebug.cpp
index 6de049f84e..2fdc6d8d4b 100644
--- a/engines/sci/engine/scriptdebug.cpp
+++ b/engines/sci/engine/scriptdebug.cpp
@@ -29,8 +29,9 @@
 #include "sci/include/sciresource.h"
 #include "sci/include/engine.h"
 #include "sci/include/sciconsole.h"
-#include "sci/include/kdebug.h"
+#include "sci/engine/kdebug.h"
 #include "sci/include/vocabulary.h"
+#include "sci/engine/kernel.h"
 #include "sci/engine/kernel_types.h"
 #include "sci/include/sci_midi.h"
 #include "sci/include/sci_widgets.h"
diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp
index 8669178abf..8f418f0c34 100644
--- a/engines/sci/engine/vm.cpp
+++ b/engines/sci/engine/vm.cpp
@@ -28,7 +28,8 @@
 #include "sci/include/sciresource.h"
 #include "sci/include/engine.h"
 #include "sci/include/versions.h"
-#include "sci/include/kdebug.h"
+#include "sci/engine/kdebug.h"
+#include "sci/engine/kernel.h"
 #include "sci/engine/kernel_types.h"
 #include "sci/engine/seg_manager.h"
 #include "sci/engine/gc.h"
diff --git a/engines/sci/gfx/menubar.cpp b/engines/sci/gfx/menubar.cpp
index c81a8064dc..07b5e33e6e 100644
--- a/engines/sci/gfx/menubar.cpp
+++ b/engines/sci/gfx/menubar.cpp
@@ -31,6 +31,7 @@
 #include "sci/sci_memory.h"
 #include "sci/include/engine.h"
 #include "sci/gfx/menubar.h"
+#include "sci/engine/kernel.h"
 
 namespace Sci {
 
diff --git a/engines/sci/include/engine.h b/engines/sci/include/engine.h
index d959ec2160..c031ec77dc 100644
--- a/engines/sci/include/engine.h
+++ b/engines/sci/include/engine.h
@@ -38,9 +38,7 @@ namespace Common {
 #include "sci/include/sciresource.h"
 #include "sci/include/script.h"
 #include "sci/include/sciconsole.h"
-#include "sci/include/vm.h"
 #include "sci/include/versions.h"
-#include "sci/include/kernel.h"
 #include "sci/engine/seg_manager.h"
 #include "sci/gfx/gfx_state_internal.h"
 #include "sci/sfx/sfx_engine.h"
@@ -48,6 +46,7 @@ namespace Common {
 namespace Sci {
 
 struct menubar_t;
+struct kfunct_sig_pair_t;	// from kernel.h
 
 class DirSeeker;
 
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index 7ecc1addb3..a1df4a2894 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -31,6 +31,7 @@
 #include "sci/sci.h"
 #include "sci/console.h"
 #include "sci/include/engine.h"
+#include "sci/engine/kernel.h"
 
 #ifdef WIN32
 #  include <direct.h>
diff --git a/engines/sci/scicore/vocab.cpp b/engines/sci/scicore/vocab.cpp
index 6318c5922f..6ef1eacdb5 100644
--- a/engines/sci/scicore/vocab.cpp
+++ b/engines/sci/scicore/vocab.cpp
@@ -27,7 +27,7 @@
 
 #include "sci/include/sciresource.h"
 #include "sci/include/engine.h"
-#include "sci/include/kernel.h"
+#include "sci/engine/kernel.h"
 
 namespace Sci {
 
diff --git a/engines/sci/tools.cpp b/engines/sci/tools.cpp
index d29a9b141a..4eab6e627f 100644
--- a/engines/sci/tools.cpp
+++ b/engines/sci/tools.cpp
@@ -40,6 +40,7 @@
 #include "common/str.h"
 
 #include "sci/include/engine.h"
+#include "sci/engine/kernel.h"
 
 namespace Sci {