SCI: Moved almost all files from include/ to other dirs; only include/engine.h remains

svn-id: r38920

52 files changed, 86 insertions, 89 deletions

diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp
index 30ae55f801..558121f133 100644
--- a/engines/sci/console.cpp
+++ b/engines/sci/console.cpp
@@ -27,8 +27,8 @@
 
 #include "sci/sci.h"
 #include "sci/console.h"
-#include "sci/include/sciresource.h"
-#include "sci/include/versions.h"
+#include "sci/scicore/resource.h"
+#include "sci/scicore/versions.h"
 
 namespace Sci {
 
diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp
index 375d999c28..8112d8a446 100644
--- a/engines/sci/detection.cpp
+++ b/engines/sci/detection.cpp
@@ -28,7 +28,7 @@
 
 #include "sci/sci.h"
 #include "sci/exereader.h"
-#include "sci/include/versions.h"
+#include "sci/scicore/versions.h"
 
 namespace Sci {
 
diff --git a/engines/sci/engine/game.cpp b/engines/sci/engine/game.cpp
index 2252573ccb..68e86b48f6 100644
--- a/engines/sci/engine/game.cpp
+++ b/engines/sci/engine/game.cpp
@@ -26,9 +26,9 @@
 #include "common/system.h"
 #include "common/file.h"
 
-#include "sci/include/sciresource.h"
+#include "sci/scicore/resource.h"
 #include "sci/include/engine.h"
-#include "sci/include/versions.h"
+#include "sci/scicore/versions.h"
 #include "sci/engine/kernel.h"
 #include "sci/engine/kernel_types.h"
 #include "sci/gfx/gfx_widgets.h"
diff --git a/engines/sci/engine/gc.h b/engines/sci/engine/gc.h
index 094d4669d9..c0d9c1cfe2 100644
--- a/engines/sci/engine/gc.h
+++ b/engines/sci/engine/gc.h
@@ -28,7 +28,7 @@
 #define SCI_ENGINE_GC_H
 
 #include "common/hashmap.h"
-#include "sci/include/vm_types.h"
+#include "sci/engine/vm_types.h"
 #include "sci/include/engine.h"
 
 namespace Sci {
diff --git a/engines/sci/engine/grammar.cpp b/engines/sci/engine/grammar.cpp
index 899defa373..ceab5df8e6 100644
--- a/engines/sci/engine/grammar.cpp
+++ b/engines/sci/engine/grammar.cpp
@@ -29,7 +29,7 @@
 */
 
 #include "sci/tools.h"
-#include "sci/include/vocabulary.h"
+#include "sci/scicore/vocabulary.h"
 #include "sci/scicore/sciconsole.h"
 
 namespace Sci {
diff --git a/engines/sci/include/heapmgr.h b/engines/sci/engine/heapmgr.h
index 074dfc695e..70e963ce80 100644
--- a/engines/sci/include/heapmgr.h
+++ b/engines/sci/engine/heapmgr.h
@@ -25,8 +25,8 @@
 
 /* Heap-like managed structure */
 
-#ifndef SCI_INCLUDE_HEAPMGR_H
-#define SCI_INCLUDE_HEAPMGR_H
+#ifndef SCI_ENGINE_HEAPMGR_H
+#define SCI_ENGINE_HEAPMGR_H
 
 #include "sci/tools.h"
 #include "sci/sci_memory.h"
@@ -110,4 +110,4 @@ int	alloc_##ENTRY##_entry(ENTRY##_table_t *table) {										\
 
 } // End of namespace Sci
 
-#endif // SCI_INCLUDE_HEAPMGR_H
+#endif // SCI_ENGINE_HEAPMGR_H
diff --git a/engines/sci/engine/kernel.cpp b/engines/sci/engine/kernel.cpp
index d163b2c48c..55b593ed7b 100644
--- a/engines/sci/engine/kernel.cpp
+++ b/engines/sci/engine/kernel.cpp
@@ -31,7 +31,7 @@
 #include "sci/engine/intmap.h"
 #include "sci/engine/gc.h"
 #include "sci/engine/kernel.h"
-#include "sci/include/sciresource.h"
+#include "sci/scicore/resource.h"
 #include "sci/include/engine.h"
 #include "sci/gfx/operations.h"
 #include "sci/engine/kernel_types.h"
diff --git a/engines/sci/engine/kernel.h b/engines/sci/engine/kernel.h
index e3cb8ad1c9..a9f21dfa18 100644
--- a/engines/sci/engine/kernel.h
+++ b/engines/sci/engine/kernel.h
@@ -30,7 +30,7 @@
 #include "common/debug.h"
 
 #include "sci/engine/kdebug.h"
-#include "sci/include/uinput.h"
+#include "sci/uinput.h"
 #include "sci/scicore/sciconsole.h" /* sciprintf() */
 
 namespace Sci {
diff --git a/engines/sci/engine/kernel_types.h b/engines/sci/engine/kernel_types.h
index 576ba37d3a..24478c9119 100644
--- a/engines/sci/engine/kernel_types.h
+++ b/engines/sci/engine/kernel_types.h
@@ -26,7 +26,7 @@
 #ifndef SCI_ENGINE_KERNEL_TYPES_H
 #define SCI_ENGINE_KERNEL_TYPES_H
 
-#include "sci/include/vm_types.h"
+#include "sci/engine/vm_types.h"
 
 namespace Sci {
 
diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp
index f062ac78b9..e210e20158 100644
--- a/engines/sci/engine/kgraphics.cpp
+++ b/engines/sci/engine/kgraphics.cpp
@@ -25,7 +25,7 @@
 
 #include "common/system.h"
 
-#include "sci/include/sciresource.h"
+#include "sci/scicore/resource.h"
 #include "sci/include/engine.h"
 #include "sci/gfx/sci_widgets.h"
 #include "sci/gfx/gfx_widgets.h"
diff --git a/engines/sci/engine/kmenu.cpp b/engines/sci/engine/kmenu.cpp
index 061c90e18c..88458bfaa4 100644
--- a/engines/sci/engine/kmenu.cpp
+++ b/engines/sci/engine/kmenu.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "sci/include/sciresource.h"
+#include "sci/scicore/resource.h"
 #include "sci/include/engine.h"
 #include "sci/gfx/sci_widgets.h"
 #include "sci/gfx/menubar.h"
diff --git a/engines/sci/engine/kmovement.cpp b/engines/sci/engine/kmovement.cpp
index 114ddaa1a2..3b175e4592 100644
--- a/engines/sci/engine/kmovement.cpp
+++ b/engines/sci/engine/kmovement.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "sci/include/sciresource.h"
+#include "sci/scicore/resource.h"
 #include "sci/include/engine.h"
 #include "sci/engine/kernel.h"
 
diff --git a/engines/sci/engine/kscripts.cpp b/engines/sci/engine/kscripts.cpp
index b6f2df2104..88b3dbbc9d 100644
--- a/engines/sci/engine/kscripts.cpp
+++ b/engines/sci/engine/kscripts.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "sci/include/sciresource.h"
+#include "sci/scicore/resource.h"
 #include "sci/include/engine.h"
 #include "sci/engine/kernel_types.h"
 #include "sci/engine/kernel.h"
diff --git a/engines/sci/engine/kstring.cpp b/engines/sci/engine/kstring.cpp
index 242300cb21..8327eef539 100644
--- a/engines/sci/engine/kstring.cpp
+++ b/engines/sci/engine/kstring.cpp
@@ -25,7 +25,7 @@
 
 /* String and parser handling */
 
-#include "sci/include/sciresource.h"
+#include "sci/scicore/resource.h"
 #include "sci/include/engine.h"
 #include "sci/engine/message.h"
 #include "sci/engine/kernel.h"
diff --git a/engines/sci/engine/message.h b/engines/sci/engine/message.h
index f63575f5ab..dd41b5a7f9 100644
--- a/engines/sci/engine/message.h
+++ b/engines/sci/engine/message.h
@@ -26,7 +26,7 @@
 #ifndef SCI_ENGINE_MESSAGE_H
 #define SCI_ENGINE_MESSAGE_H
 
-#include "sci/include/sciresource.h"
+#include "sci/scicore/resource.h"
 
 namespace Sci {
 
diff --git a/engines/sci/include/script.h b/engines/sci/engine/script.h
index 51b535b903..d30a0cd41b 100644
--- a/engines/sci/include/script.h
+++ b/engines/sci/engine/script.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef SCI_INCLUDE_SCRIPT_H
-#define SCI_INCLUDE_SCRIPT_H
+#ifndef SCI_ENGINE_SCRIPT_H
+#define SCI_ENGINE_SCRIPT_H
 
 #include "common/str.h"
 
@@ -221,4 +221,4 @@ void script_free_breakpoints(EngineState *s);
 
 } // End of namespace Sci
 
-#endif // SCI_INCLUDE_SCRIPT_H
+#endif // SCI_ENGINE_SCRIPT_H
diff --git a/engines/sci/engine/scriptdebug.cpp b/engines/sci/engine/scriptdebug.cpp
index 6e89868db2..1551edab59 100644
--- a/engines/sci/engine/scriptdebug.cpp
+++ b/engines/sci/engine/scriptdebug.cpp
@@ -25,18 +25,18 @@
 
 // Script debugger functionality. Absolutely not threadsafe.
 
-#include "sci/engine/gc.h"
-#include "sci/include/sciresource.h"
+#include "sci/sci.h"
 #include "sci/include/engine.h"
-#include "sci/scicore/sciconsole.h"
+#include "sci/engine/gc.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/gfx/sci_widgets.h"
-#include "sci/sci.h"
+#include "sci/engine/kernel.h"
 #include "sci/gfx/gfx_widgets.h"
+#include "sci/gfx/sci_widgets.h"
+#include "sci/scicore/resource.h"
+#include "sci/scicore/sciconsole.h"
+#include "sci/scicore/vocabulary.h"
+#include "sci/sfx/sci_midi.h"
 
 #include "common/util.h"
 #include "common/savefile.h"
diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp
index d6f1afc45d..250f78f2cc 100644
--- a/engines/sci/engine/vm.cpp
+++ b/engines/sci/engine/vm.cpp
@@ -25,9 +25,9 @@
 
 #include "common/debug.h"
 
-#include "sci/include/sciresource.h"
+#include "sci/scicore/resource.h"
 #include "sci/include/engine.h"
-#include "sci/include/versions.h"
+#include "sci/scicore/versions.h"
 #include "sci/engine/intmap.h"
 #include "sci/engine/kdebug.h"
 #include "sci/engine/kernel.h"
diff --git a/engines/sci/engine/vm.h b/engines/sci/engine/vm.h
index 50d2032b44..bd71dc6438 100644
--- a/engines/sci/engine/vm.h
+++ b/engines/sci/engine/vm.h
@@ -28,9 +28,9 @@
 
 /* VM and kernel declarations */
 
-#include "sci/include/versions.h"	// for sci_version_t
-#include "sci/include/vm_types.h"	// for reg_t
-#include "sci/include/heapmgr.h"
+#include "sci/scicore/versions.h"	// for sci_version_t
+#include "sci/engine/vm_types.h"	// for reg_t
+#include "sci/engine/heapmgr.h"
 
 namespace Sci {
 
diff --git a/engines/sci/include/vm_types.h b/engines/sci/engine/vm_types.h
index 60de6a3108..016ab7504a 100644
--- a/engines/sci/include/vm_types.h
+++ b/engines/sci/engine/vm_types.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef SCI_INCLUDE_VM_TYPES_H
-#define SCI_INCLUDE_VM_TYPES_H
+#ifndef SCI_ENGINE_VM_TYPES_H
+#define SCI_ENGINE_VM_TYPES_H
 
 #include "common/scummsys.h"
 
@@ -61,4 +61,4 @@ extern reg_t NULL_REG;
 
 } // End of namespace Sci
 
-#endif // SCI_INCLUDE_VM_TYPES_H
+#endif // SCI_ENGINE_VM_TYPES_H
diff --git a/engines/sci/exereader.cpp b/engines/sci/exereader.cpp
index 61f0e556dc..773c6a377c 100644
--- a/engines/sci/exereader.cpp
+++ b/engines/sci/exereader.cpp
@@ -26,7 +26,7 @@
 #include "common/endian.h"
 
 #include "sci/exereader.h"
-#include "sci/include/versions.h"
+#include "sci/scicore/versions.h"
 
 namespace Sci {
 
diff --git a/engines/sci/gfx/gfx_driver.h b/engines/sci/gfx/gfx_driver.h
index 343d0199d0..38451ad3ef 100644
--- a/engines/sci/gfx/gfx_driver.h
+++ b/engines/sci/gfx/gfx_driver.h
@@ -27,7 +27,7 @@
 #define SCI_GFX_GFX_DRIVER_H
 
 #include "sci/gfx/gfx_system.h"
-#include "sci/include/uinput.h"
+#include "sci/uinput.h"
 
 namespace Sci {
 
diff --git a/engines/sci/gfx/menubar.h b/engines/sci/gfx/menubar.h
index 5255ccb96a..2ccd6f8a5e 100644
--- a/engines/sci/gfx/menubar.h
+++ b/engines/sci/gfx/menubar.h
@@ -28,7 +28,7 @@
 #ifndef SCI_GFX_SCI_MENUBAR_H
 #define SCI_GFX_SCI_MENUBAR_H
 
-#include "sci/include/vm_types.h"
+#include "sci/engine/vm_types.h"
 #include "sci/gfx/operations.h"
 #include "sci/gfx/gfx_widgets.h"
 
diff --git a/engines/sci/gfx/operations.h b/engines/sci/gfx/operations.h
index decd90e077..1928baf3a3 100644
--- a/engines/sci/gfx/operations.h
+++ b/engines/sci/gfx/operations.h
@@ -32,7 +32,7 @@
 #include "sci/gfx/gfx_tools.h"
 #include "sci/gfx/gfx_options.h"
 #include "sci/gfx/gfx_system.h"
-#include "sci/include/uinput.h"
+#include "sci/uinput.h"
 
 #include "common/list.h"
 
diff --git a/engines/sci/gfx/resource/sci_resmgr.cpp b/engines/sci/gfx/resource/sci_resmgr.cpp
index 4e2b1e2410..a3817a4947 100644
--- a/engines/sci/gfx/resource/sci_resmgr.cpp
+++ b/engines/sci/gfx/resource/sci_resmgr.cpp
@@ -26,7 +26,7 @@
 // The interpreter-specific part of the resource manager, for SCI
 
 #include "sci/sci_memory.h"
-#include "sci/include/sciresource.h"
+#include "sci/scicore/resource.h"
 #include "sci/gfx/gfx_widgets.h"
 #include "sci/gfx/gfx_resmgr.h"
 #include "sci/gfx/gfx_options.h"
diff --git a/engines/sci/include/engine.h b/engines/sci/include/engine.h
index 8035b16025..8d49b0b184 100644
--- a/engines/sci/include/engine.h
+++ b/engines/sci/include/engine.h
@@ -34,11 +34,11 @@ namespace Common {
 	class WriteStream;
 }
 
-#include "sci/include/vocabulary.h"
-#include "sci/include/sciresource.h"
-#include "sci/include/script.h"
+#include "sci/scicore/vocabulary.h"
+#include "sci/scicore/resource.h"
+#include "sci/engine/script.h"
 #include "sci/scicore/sciconsole.h"
-#include "sci/include/versions.h"
+#include "sci/scicore/versions.h"
 #include "sci/engine/seg_manager.h"
 #include "sci/gfx/gfx_state_internal.h"
 #include "sci/sfx/sfx_engine.h"
diff --git a/engines/sci/sci.h b/engines/sci/sci.h
index 4d4ad53fb6..1764d9dfab 100644
--- a/engines/sci/sci.h
+++ b/engines/sci/sci.h
@@ -30,7 +30,7 @@
 #include "engines/advancedDetector.h"
 
 #include "sci/console.h"
-#include "sci/include/sciresource.h"
+#include "sci/scicore/resource.h"
 
 namespace Sci {
 
diff --git a/engines/sci/scicore/decompress0.cpp b/engines/sci/scicore/decompress0.cpp
index 2f6bcd117f..bed2fab7cb 100644
--- a/engines/sci/scicore/decompress0.cpp
+++ b/engines/sci/scicore/decompress0.cpp
@@ -31,7 +31,7 @@
 #include "common/endian.h"
 
 #include "sci/sci_memory.h"
-#include "sci/include/sciresource.h"
+#include "sci/scicore/resource.h"
 
 namespace Sci {
 
diff --git a/engines/sci/scicore/decompress01.cpp b/engines/sci/scicore/decompress01.cpp
index f318d7b197..effbec7e89 100644
--- a/engines/sci/scicore/decompress01.cpp
+++ b/engines/sci/scicore/decompress01.cpp
@@ -29,7 +29,7 @@
 #include "common/endian.h"
 
 #include "sci/sci_memory.h"
-#include "sci/include/sciresource.h"
+#include "sci/scicore/resource.h"
 
 namespace Sci {
 
diff --git a/engines/sci/scicore/decompress1.cpp b/engines/sci/scicore/decompress1.cpp
index 7b9924f9ec..0b156272ba 100644
--- a/engines/sci/scicore/decompress1.cpp
+++ b/engines/sci/scicore/decompress1.cpp
@@ -29,7 +29,7 @@
 #include "common/util.h"
 
 #include "sci/sci_memory.h"
-#include "sci/include/sciresource.h"
+#include "sci/scicore/resource.h"
 
 namespace Sci {
 
diff --git a/engines/sci/scicore/decompress11.cpp b/engines/sci/scicore/decompress11.cpp
index 13364be262..b7515d1aa2 100644
--- a/engines/sci/scicore/decompress11.cpp
+++ b/engines/sci/scicore/decompress11.cpp
@@ -28,7 +28,7 @@
 #include "common/stream.h"
 
 #include "sci/sci_memory.h"
-#include "sci/include/sciresource.h"
+#include "sci/scicore/resource.h"
 
 namespace Sci {
 
diff --git a/engines/sci/scicore/resource.cpp b/engines/sci/scicore/resource.cpp
index dc58db5a5e..0081926311 100644
--- a/engines/sci/scicore/resource.cpp
+++ b/engines/sci/scicore/resource.cpp
@@ -31,8 +31,8 @@
 
 #include "sci/tools.h"
 #include "sci/sci_memory.h"
-#include "sci/include/sciresource.h"
-#include "sci/include/vocabulary.h"
+#include "sci/scicore/resource.h"
+#include "sci/scicore/vocabulary.h"
 
 namespace Sci {
 
diff --git a/engines/sci/include/sciresource.h b/engines/sci/scicore/resource.h
index f7efc4c50c..2b6c4b0474 100644
--- a/engines/sci/include/sciresource.h
+++ b/engines/sci/scicore/resource.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef SCI_INCLUDE_SCIRESOURCE_H
-#define SCI_INCLUDE_SCIRESOURCE_H
+#ifndef SCI_SCICORE_RESOURCE_H
+#define SCI_SCICORE_RESOURCE_H
 
 #include "common/str.h"
 
@@ -420,4 +420,4 @@ void _scir_add_altsource(resource_t *res, ResourceSource *source, unsigned int f
 
 } // End of namespace Sci
 
-#endif // SCI_INCLUDE_SCIRESOURCE_H
+#endif // SCI_SCICORE_RESOURCE_H
diff --git a/engines/sci/scicore/resource_map.cpp b/engines/sci/scicore/resource_map.cpp
index e06fe11578..aa0932f8c9 100644
--- a/engines/sci/scicore/resource_map.cpp
+++ b/engines/sci/scicore/resource_map.cpp
@@ -24,7 +24,7 @@
  */
 
 #include "sci/sci_memory.h"
-#include "sci/include/sciresource.h"
+#include "sci/scicore/resource.h"
 #include "sci/tools.h"
 
 #include "common/file.h"
diff --git a/engines/sci/scicore/resource_patch.cpp b/engines/sci/scicore/resource_patch.cpp
index c062a2f782..25a36deb41 100644
--- a/engines/sci/scicore/resource_patch.cpp
+++ b/engines/sci/scicore/resource_patch.cpp
@@ -26,7 +26,7 @@
 #include "common/archive.h"
 #include "common/file.h"
 
-#include "sci/include/sciresource.h"
+#include "sci/scicore/resource.h"
 #include "sci/sci_memory.h"
 
 namespace Sci {
diff --git a/engines/sci/scicore/sciconsole.h b/engines/sci/scicore/sciconsole.h
index 8ea75cc053..25b8907a50 100644
--- a/engines/sci/scicore/sciconsole.h
+++ b/engines/sci/scicore/sciconsole.h
@@ -36,7 +36,7 @@
 
 #include "sci/sci_memory.h"
 #include "sci/tools.h"
-#include "sci/include/vm_types.h"
+#include "sci/engine/vm_types.h"
 
 #define SCI_CONSOLE
 #include "sci/gfx/operations.h"
diff --git a/engines/sci/scicore/script.cpp b/engines/sci/scicore/script.cpp
index 8f8aee23bd..879a0a7aff 100644
--- a/engines/sci/scicore/script.cpp
+++ b/engines/sci/scicore/script.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "sci/include/sciresource.h"
+#include "sci/scicore/resource.h"
 #include "sci/include/engine.h"
 #include "common/util.h"
 
diff --git a/engines/sci/scicore/versions.cpp b/engines/sci/scicore/versions.cpp
index 54bcc5acff..6d58c62147 100644
--- a/engines/sci/scicore/versions.cpp
+++ b/engines/sci/scicore/versions.cpp
@@ -28,7 +28,7 @@
 #include "common/system.h"
 #include "common/config-manager.h"
 
-#include "sci/include/versions.h"
+#include "sci/scicore/versions.h"
 #include "sci/include/engine.h"
 #include "sci/tools.h"
 
diff --git a/engines/sci/include/versions.h b/engines/sci/scicore/versions.h
index 716135577e..fe11160449 100644
--- a/engines/sci/include/versions.h
+++ b/engines/sci/scicore/versions.h
@@ -25,8 +25,8 @@
 
 /* Versions management */
 
-#ifndef SCI_INCLUDE_VERSIONS_H
-#define SCI_INCLUDE_VERSIONS_H
+#ifndef SCI_SCICORE_VERSIONS_H
+#define SCI_SCICORE_VERSIONS_H
 
 namespace Sci {
 
@@ -144,4 +144,4 @@ int version_parse(const char *vn, sci_version_t *result);
 
 } // End of namespace Sci
 
-#endif // SCI_INCLUDE_VERSIONS_H
+#endif // SCI_SCICORE_VERSIONS_H
diff --git a/engines/sci/scicore/vocab.cpp b/engines/sci/scicore/vocab.cpp
index 6ef1eacdb5..d3ad53832d 100644
--- a/engines/sci/scicore/vocab.cpp
+++ b/engines/sci/scicore/vocab.cpp
@@ -25,7 +25,8 @@
 
 // Main vocabulary support functions and word lookup
 
-#include "sci/include/sciresource.h"
+#include "sci/scicore/vocabulary.h"
+#include "sci/scicore/resource.h"
 #include "sci/include/engine.h"
 #include "sci/engine/kernel.h"
 
diff --git a/engines/sci/scicore/vocab_debug.cpp b/engines/sci/scicore/vocab_debug.cpp
index 81b8a19928..e7b81d2ba5 100644
--- a/engines/sci/scicore/vocab_debug.cpp
+++ b/engines/sci/scicore/vocab_debug.cpp
@@ -25,7 +25,7 @@
 
 
 #include "sci/include/engine.h"
-#include "sci/include/sciresource.h"
+#include "sci/scicore/resource.h"
 
 namespace Sci {
 
diff --git a/engines/sci/include/vocabulary.h b/engines/sci/scicore/vocabulary.h
index 5af4487b74..ec785a9c30 100644
--- a/engines/sci/include/vocabulary.h
+++ b/engines/sci/scicore/vocabulary.h
@@ -23,12 +23,12 @@
  *
  */
 
-#ifndef SCI_INCLUDE_VOCABULARY_H
-#define SCI_INCLUDE_VOCABULARY_H
+#ifndef SCI_SCICORE_VOCABULARY_H
+#define SCI_SCICORE_VOCABULARY_H
 
 #include "common/str.h"
 
-#include "sci/include/versions.h"
+#include "sci/scicore/versions.h"
 
 namespace Sci {
 
@@ -191,7 +191,6 @@ struct parse_tree_node_t {
 
 
 
-
 /*FIXME: These need freeing functions...*/
 
 int *vocabulary_get_classes(ResourceManager *resmgr, int *count);
@@ -396,4 +395,4 @@ void vocab_gnf_dump(parse_tree_branch_t *branches, int branches_nr);
 
 } // End of namespace Sci
 
-#endif // SCI_INCLUDE_VOCABULARY_H
+#endif // SCI_SCICORE_VOCABULARY_H
diff --git a/engines/sci/sfx/core.cpp b/engines/sci/sfx/core.cpp
index fba63c6722..77f0a0c17a 100644
--- a/engines/sci/sfx/core.cpp
+++ b/engines/sci/sfx/core.cpp
@@ -30,7 +30,7 @@
 #include "sci/sfx/sfx_iterator_internal.h"
 #include "sci/sfx/sfx_player.h"
 #include "sci/sfx/mixer.h"
-#include "sci/include/sci_midi.h"
+#include "sci/sfx/sci_midi.h"
 
 #include "common/mutex.h"
 #include "common/system.h"
diff --git a/engines/sci/include/sci_midi.h b/engines/sci/sfx/sci_midi.h
index 6996cd29b3..68650f738a 100644
--- a/engines/sci/include/sci_midi.h
+++ b/engines/sci/sfx/sci_midi.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef SCI_INCLUDE_MIDI_H
-#define SCI_INCLUDE_MIDI_H
+#ifndef SCI_SFX_MIDI_H
+#define SCI_SFX_MIDI_H
 
 namespace Sci {
 
@@ -52,4 +52,4 @@ namespace Sci {
 
 } // End of namespace Sci
 
-#endif // SCI_INCLUDE_MIDI_H
+#endif // SCI_SFX_MIDI_H
diff --git a/engines/sci/sfx/seq/instrument-map.cpp b/engines/sci/sfx/seq/instrument-map.cpp
index b24a8c2e0f..07179fbaeb 100644
--- a/engines/sci/sfx/seq/instrument-map.cpp
+++ b/engines/sci/sfx/seq/instrument-map.cpp
@@ -24,7 +24,7 @@
  */
 
 #include "common/scummsys.h"
-#include "sci/include/sci_midi.h"
+#include "sci/sfx/sci_midi.h"
 #include "sci/sci_memory.h"
 #include "sci/sfx/seq/instrument-map.h"
 #include "sci/sfx/sfx_engine.h"
diff --git a/engines/sci/sfx/seq/map-mt32-to-gm.cpp b/engines/sci/sfx/seq/map-mt32-to-gm.cpp
index 83bfd444f9..c6b66491e9 100644
--- a/engines/sci/sfx/seq/map-mt32-to-gm.cpp
+++ b/engines/sci/sfx/seq/map-mt32-to-gm.cpp
@@ -24,7 +24,7 @@
  */
 
 #include "common/scummsys.h"
-#include "sci/include/sciresource.h"
+#include "sci/scicore/resource.h"
 #include "sci/include/engine.h"
 #include "sci/sfx/seq/instrument-map.h"
 
diff --git a/engines/sci/sfx/sfx_engine.h b/engines/sci/sfx/sfx_engine.h
index 642c84c068..02db4152b8 100644
--- a/engines/sci/sfx/sfx_engine.h
+++ b/engines/sci/sfx/sfx_engine.h
@@ -30,7 +30,7 @@
 #include "sci/sfx/sfx_core.h"
 #include "sci/sfx/sfx_songlib.h"
 #include "sci/sfx/sfx_iterator.h"
-#include "sci/include/sciresource.h"
+#include "sci/scicore/resource.h"
 
 namespace Sci {
 
diff --git a/engines/sci/sfx/sfx_iterator_internal.h b/engines/sci/sfx/sfx_iterator_internal.h
index c0b59a7822..1f5733f79c 100644
--- a/engines/sci/sfx/sfx_iterator_internal.h
+++ b/engines/sci/sfx/sfx_iterator_internal.h
@@ -27,7 +27,7 @@
 #define SCI_SFX_SFX_ITERATOR_INTERNAL
 
 #include "sci/sfx/sfx_iterator.h"
-#include "sci/include/sci_midi.h"
+#include "sci/sfx/sci_midi.h"
 
 namespace Sci {
 
diff --git a/engines/sci/sfx/sfx_player.h b/engines/sci/sfx/sfx_player.h
index 8718622428..8aee0d0979 100644
--- a/engines/sci/sfx/sfx_player.h
+++ b/engines/sci/sfx/sfx_player.h
@@ -30,7 +30,7 @@
 
 #include "sci/sfx/sfx_engine.h"
 #include "sci/sfx/sfx_iterator.h"
-#include "sci/include/sciresource.h"
+#include "sci/scicore/resource.h"
 
 #include "common/scummsys.h"
 
diff --git a/engines/sci/sfx/softseq/SN76496.cpp b/engines/sci/sfx/softseq/SN76496.cpp
index f9ecd12aaf..d4a2a05da3 100644
--- a/engines/sci/sfx/softseq/SN76496.cpp
+++ b/engines/sci/sfx/softseq/SN76496.cpp
@@ -26,7 +26,7 @@
 /* Tandy/PCJr sequencer for FreeSCI */
 
 #include "sci/sfx/softseq.h"
-#include "sci/include/sci_midi.h"
+#include "sci/sfx/sci_midi.h"
 
 namespace Sci {
 
diff --git a/engines/sci/sfx/softseq/pcspeaker.cpp b/engines/sci/sfx/softseq/pcspeaker.cpp
index 82486c28a1..6b6da1f001 100644
--- a/engines/sci/sfx/softseq/pcspeaker.cpp
+++ b/engines/sci/sfx/softseq/pcspeaker.cpp
@@ -26,7 +26,7 @@
 /* PC speaker software sequencer for FreeSCI */
 
 #include "sci/sfx/softseq.h"
-#include "sci/include/sci_midi.h"
+#include "sci/sfx/sci_midi.h"
 
 namespace Sci {
 
diff --git a/engines/sci/include/uinput.h b/engines/sci/uinput.h
index 5c003f3c06..165396a889 100644
--- a/engines/sci/include/uinput.h
+++ b/engines/sci/uinput.h
@@ -23,11 +23,8 @@
  *
  */
 
-/* unified input header file */
-
-#ifndef SCI_INCLUDE_UINPUT_H
-#define SCI_INCLUDE_UINPUT_H
-
+#ifndef SCI_UINPUT_H
+#define SCI_UINPUT_H
 
 namespace Sci {
 
@@ -124,4 +121,4 @@ struct sci_event_t {
 
 } // End of namespace Sci
 
-#endif // SCI_INCLUDE_UINPUT_H
+#endif // SCI_UINPUT_H