diff --git a/saga/actionmap.cpp b/saga/actionmap.cpp
index 9aa2759f92a..38611133fa7 100644
--- a/saga/actionmap.cpp
+++ b/saga/actionmap.cpp
@@ -22,13 +22,13 @@
  */
 
 /* Action map module */
-#include "saga.h"
+#include "saga/saga.h"
 
-#include "cvar_mod.h"
-#include "gfx.h"
-#include "console_mod.h"
+#include "saga/cvar_mod.h"
+#include "saga/gfx.h"
+#include "saga/console_mod.h"
 
-#include "actionmap.h"
+#include "saga/actionmap.h"
 
 namespace Saga {
 
diff --git a/saga/actor.cpp b/saga/actor.cpp
index bd3df6008bd..2d094ad8b2e 100644
--- a/saga/actor.cpp
+++ b/saga/actor.cpp
@@ -21,23 +21,23 @@
  *
  */
 
-#include "saga.h"
-#include "yslib.h"
-#include "gfx.h"
+#include "saga/saga.h"
+#include "saga/yslib.h"
+#include "saga/gfx.h"
 
-#include "game_mod.h"
-#include "cvar_mod.h"
-#include "console_mod.h"
-#include "rscfile_mod.h"
-#include "script_mod.h"
-#include "sndres.h"
-#include "sprite_mod.h"
-#include "font_mod.h"
-#include "text_mod.h"
-#include "sound.h"
+#include "saga/game_mod.h"
+#include "saga/cvar_mod.h"
+#include "saga/console_mod.h"
+#include "saga/rscfile_mod.h"
+#include "saga/script_mod.h"
+#include "saga/sndres.h"
+#include "saga/sprite_mod.h"
+#include "saga/font_mod.h"
+#include "saga/text_mod.h"
+#include "saga/sound.h"
 
-#include "actor.h"
-#include "actordata.h"
+#include "saga/actor.h"
+#include "saga/actordata.h"
 
 namespace Saga {
 
diff --git a/saga/actor.h b/saga/actor.h
index a9dc6f7d6c2..7b76eb14aa9 100644
--- a/saga/actor.h
+++ b/saga/actor.h
@@ -26,8 +26,8 @@
 #ifndef SAGA_ACTOR_H__
 #define SAGA_ACTOR_H__
 
-#include "yslib.h"
-#include "sprite_mod.h"
+#include "saga/yslib.h"
+#include "saga/sprite_mod.h"
 
 namespace Saga {
 
@@ -184,11 +184,6 @@ struct R_ACTIONTIMES {
 	int time;
 };
 
-struct R_ACTOR_MODULE {
-	int init;
-	const char *err_str;
-};
-
 class Actor {
  public:
 	int reg();
diff --git a/saga/actordata.cpp b/saga/actordata.cpp
index 3aedc303972..0fdd1fb5ef9 100644
--- a/saga/actordata.cpp
+++ b/saga/actordata.cpp
@@ -22,8 +22,8 @@
  */
 
 // Actor data table
-#include "saga.h"
-#include "actordata.h"
+#include "saga/saga.h"
+#include "saga/actordata.h"
 
 namespace Saga {
 
diff --git a/saga/animation.cpp b/saga/animation.cpp
index c1e2673850e..dbae4dc4d96 100644
--- a/saga/animation.cpp
+++ b/saga/animation.cpp
@@ -22,16 +22,16 @@
  */
 
 // Background animation management module
-#include "saga.h"
-#include "gfx.h"
+#include "saga/saga.h"
+#include "saga/gfx.h"
 
-#include "cvar_mod.h"
-#include "console_mod.h"
-#include "game_mod.h"
-#include "events_mod.h"
-#include "render.h"
+#include "saga/cvar_mod.h"
+#include "saga/console_mod.h"
+#include "saga/game_mod.h"
+#include "saga/events_mod.h"
+#include "saga/render.h"
 
-#include "animation.h"
+#include "saga/animation.h"
 
 namespace Saga {
 
diff --git a/saga/console.cpp b/saga/console.cpp
index 488d50aa636..088233bb716 100644
--- a/saga/console.cpp
+++ b/saga/console.cpp
@@ -23,14 +23,14 @@
 
 // Console module
 
-#include "saga.h"
-#include "gfx.h"
-#include "font_mod.h"
-#include "cvar_mod.h"
-#include "events_mod.h"
+#include "saga/saga.h"
+#include "saga/gfx.h"
+#include "saga/font_mod.h"
+#include "saga/cvar_mod.h"
+#include "saga/events_mod.h"
 
-#include "console_mod.h"
-#include "console.h"
+#include "saga/console_mod.h"
+#include "saga/console.h"
 
 namespace Saga {
 
diff --git a/saga/cvar.cpp b/saga/cvar.cpp
index a943c5eeccd..345f9e773dc 100644
--- a/saga/cvar.cpp
+++ b/saga/cvar.cpp
@@ -22,13 +22,13 @@
  */
 
 // Configuration Variable Module
-#include "saga.h"
-#include "gfx.h"
+#include "saga/saga.h"
+#include "saga/gfx.h"
 
-#include "console_mod.h"
+#include "saga/console_mod.h"
 
-#include "cvar_mod.h"
-#include "cvar.h"
+#include "saga/cvar_mod.h"
+#include "saga/cvar.h"
 
 namespace Saga {
 
diff --git a/saga/events.cpp b/saga/events.cpp
index d9fae5e385d..ad01f7c1cd0 100644
--- a/saga/events.cpp
+++ b/saga/events.cpp
@@ -24,24 +24,24 @@
 // Event management module
 
 
-#include "saga.h"
-#include "gfx.h"
+#include "saga/saga.h"
+#include "saga/gfx.h"
 
-#include "yslib.h"
+#include "saga/yslib.h"
 
-#include "animation.h"
-#include "console_mod.h"
-#include "scene_mod.h"
-#include "interface_mod.h"
-#include "text_mod.h"
-#include "palanim_mod.h"
-#include "render.h"
-#include "game_mod.h"
-#include "sndres.h"
-#include "music.h"
+#include "saga/animation.h"
+#include "saga/console_mod.h"
+#include "saga/scene_mod.h"
+#include "saga/interface_mod.h"
+#include "saga/text_mod.h"
+#include "saga/palanim_mod.h"
+#include "saga/render.h"
+#include "saga/game_mod.h"
+#include "saga/sndres.h"
+#include "saga/music.h"
 
-#include "events_mod.h"
-#include "events.h"
+#include "saga/events_mod.h"
+#include "saga/events.h"
 
 namespace Saga {
 
diff --git a/saga/expr.cpp b/saga/expr.cpp
index 47cf21982ec..3ecfc38e16d 100644
--- a/saga/expr.cpp
+++ b/saga/expr.cpp
@@ -25,9 +25,9 @@
 
 // EXPR_ParseArgs() lifted wholesale from SDL win32 initialization code by Sam Lantinga
 
-#include "saga.h"
-#include "cvar_mod.h"
-#include "expr.h"
+#include "saga/saga.h"
+#include "saga/cvar_mod.h"
+#include "saga/expr.h"
 
 namespace Saga {
 
diff --git a/saga/font.cpp b/saga/font.cpp
index fdbe54f0681..b17b57614bf 100644
--- a/saga/font.cpp
+++ b/saga/font.cpp
@@ -22,14 +22,14 @@
  */
 
 // Font management and font drawing module
-#include "saga.h"
-#include "gfx.h"
+#include "saga/saga.h"
+#include "saga/gfx.h"
 
-#include "rscfile_mod.h"
-#include "game_mod.h"
+#include "saga/rscfile_mod.h"
+#include "saga/game_mod.h"
 
-#include "font_mod.h"
-#include "font.h"
+#include "saga/font_mod.h"
+#include "saga/font.h"
 
 namespace Saga {
 
diff --git a/saga/game.cpp b/saga/game.cpp
index ec4ab314633..064727468fd 100644
--- a/saga/game.cpp
+++ b/saga/game.cpp
@@ -23,19 +23,19 @@
 
 // Game detection, general game parameters
 
-#include "saga.h"
+#include "saga/saga.h"
 #include "common/file.h"
 #include "base/gameDetector.h"
 #include "base/plugins.h"
 #include "backends/fs/fs.h"
 
-#include "rscfile_mod.h"
-#include "cvar_mod.h"
-#include "ite_introproc_mod.h"
-#include "interface_mod.h"
+#include "saga/rscfile_mod.h"
+#include "saga/cvar_mod.h"
+#include "saga/ite_introproc_mod.h"
+#include "saga/interface_mod.h"
 
-#include "game_mod.h"
-#include "game.h"
+#include "saga/game_mod.h"
+#include "saga/game.h"
 
 namespace Saga {
 
diff --git a/saga/ihnm_introproc.cpp b/saga/ihnm_introproc.cpp
index c1518e6876e..748ca56edd4 100644
--- a/saga/ihnm_introproc.cpp
+++ b/saga/ihnm_introproc.cpp
@@ -23,21 +23,21 @@
 
 // "I Have No Mouth" Intro sequence scene procedures
 
-#include "saga.h"
-#include "yslib.h"
-#include "gfx.h"
+#include "saga/saga.h"
+#include "saga/yslib.h"
+#include "saga/gfx.h"
 
-#include "animation.h"
-#include "cvar_mod.h"
-#include "events_mod.h"
-#include "font_mod.h"
-#include "rscfile_mod.h"
-#include "scene_mod.h"
-#include "text_mod.h"
-#include "palanim_mod.h"
+#include "saga/animation.h"
+#include "saga/cvar_mod.h"
+#include "saga/events_mod.h"
+#include "saga/font_mod.h"
+#include "saga/rscfile_mod.h"
+#include "saga/scene_mod.h"
+#include "saga/text_mod.h"
+#include "saga/palanim_mod.h"
 
-#include "scene.h"
-#include "ihnm_introproc.h"
+#include "saga/scene.h"
+#include "saga/ihnm_introproc.h"
 
 namespace Saga {
 
diff --git a/saga/image.cpp b/saga/image.cpp
index a3978c43d43..602545e2351 100644
--- a/saga/image.cpp
+++ b/saga/image.cpp
@@ -22,11 +22,11 @@
  */
 
 // SAGA Image resource management routines
-#include "saga.h"
+#include "saga/saga.h"
 
-#include "game_mod.h"
+#include "saga/game_mod.h"
 
-#include "image.h"
+#include "saga/image.h"
 
 namespace Saga {
 
diff --git a/saga/interface.cpp b/saga/interface.cpp
index 9704dbd6888..d15485f5d19 100644
--- a/saga/interface.cpp
+++ b/saga/interface.cpp
@@ -22,22 +22,22 @@
  */
 
 // Game interface module
-#include "saga.h"
+#include "saga/saga.h"
 
-#include "gfx.h"
-#include "game_mod.h"
-#include "cvar_mod.h"
-#include "actor.h"
-#include "console_mod.h"
-#include "font_mod.h"
-#include "objectmap.h"
-#include "rscfile_mod.h"
-#include "script_mod.h"
-#include "sprite_mod.h"
+#include "saga/gfx.h"
+#include "saga/game_mod.h"
+#include "saga/cvar_mod.h"
+#include "saga/actor.h"
+#include "saga/console_mod.h"
+#include "saga/font_mod.h"
+#include "saga/objectmap.h"
+#include "saga/rscfile_mod.h"
+#include "saga/script_mod.h"
+#include "saga/sprite_mod.h"
 
-#include "interface_mod.h"
-#include "interface.h"
-#include "sdata.h"
+#include "saga/interface_mod.h"
+#include "saga/interface.h"
+#include "saga/sdata.h"
 
 namespace Saga {
 
diff --git a/saga/isomap.cpp b/saga/isomap.cpp
index d5f29acb3e8..6cc3dc6a795 100644
--- a/saga/isomap.cpp
+++ b/saga/isomap.cpp
@@ -22,12 +22,12 @@
  */
 
 // Isometric level module
-#include "saga.h"
+#include "saga/saga.h"
 
-#include "game_mod.h"
-#include "gfx.h"
+#include "saga/game_mod.h"
+#include "saga/gfx.h"
 
-#include "isomap.h"
+#include "saga/isomap.h"
 
 namespace Saga {
 
diff --git a/saga/ite_introproc.cpp b/saga/ite_introproc.cpp
index b6783bbe388..cd6aa8389c8 100644
--- a/saga/ite_introproc.cpp
+++ b/saga/ite_introproc.cpp
@@ -24,24 +24,24 @@
 
 // Intro sequence scene procedures
 
-#include "saga.h"
-#include "gfx.h"
-#include "yslib.h"
+#include "saga/saga.h"
+#include "saga/gfx.h"
+#include "saga/yslib.h"
 
-#include "animation.h"
-#include "cvar_mod.h"
-#include "events_mod.h"
-#include "font_mod.h"
-#include "game_mod.h"
-#include "rscfile_mod.h"
-#include "scene_mod.h"
-#include "sndres.h"
-#include "text_mod.h"
-#include "palanim_mod.h"
-#include "music.h"
+#include "saga/animation.h"
+#include "saga/cvar_mod.h"
+#include "saga/events_mod.h"
+#include "saga/font_mod.h"
+#include "saga/game_mod.h"
+#include "saga/rscfile_mod.h"
+#include "saga/scene_mod.h"
+#include "saga/sndres.h"
+#include "saga/text_mod.h"
+#include "saga/palanim_mod.h"
+#include "saga/music.h"
 
-#include "scene.h"
-#include "ite_introproc.h"
+#include "saga/scene.h"
+#include "saga/ite_introproc.h"
 
 namespace Saga {
 
diff --git a/saga/music.cpp b/saga/music.cpp
index 81cf82a2276..19065430576 100644
--- a/saga/music.cpp
+++ b/saga/music.cpp
@@ -20,11 +20,11 @@
  * $Header$
  *
  */
-#include "saga.h"
+#include "saga/saga.h"
 
-#include "music.h"
-#include "rscfile_mod.h"
-#include "game_mod.h"
+#include "saga/music.h"
+#include "saga/rscfile_mod.h"
+#include "saga/game_mod.h"
 #include "sound/mididrv.h"
 #include "sound/midiparser.h"
 #include "common/config-manager.h"
diff --git a/saga/music.h b/saga/music.h
index bfaaa2d3662..ca7ad2b7831 100644
--- a/saga/music.h
+++ b/saga/music.h
@@ -26,8 +26,8 @@
 #ifndef SAGA_MUSIC_H_
 #define SAGA_MUSIC_H_
 
-#include "rscfile_mod.h"
-#include "game_mod.h"
+#include "saga/rscfile_mod.h"
+#include "saga/game_mod.h"
 #include "sound/mixer.h"
 #include "sound/mididrv.h"
 #include "sound/midiparser.h"
diff --git a/saga/objectmap.cpp b/saga/objectmap.cpp
index 2ecfea522b6..accd9fde9f3 100644
--- a/saga/objectmap.cpp
+++ b/saga/objectmap.cpp
@@ -26,13 +26,13 @@
 // Polygon Hit Test code ( HitTestPoly() ) adapted from code (C) Eric Haines
 // appearing in Graphics Gems IV, "Point in Polygon Strategies."
 // p. 24-46, code: p. 34-45
-#include "saga.h"
+#include "saga/saga.h"
 
-#include "gfx.h"
-#include "cvar_mod.h"
-#include "console_mod.h"
-#include "font_mod.h"
-#include "objectmap.h"
+#include "saga/gfx.h"
+#include "saga/cvar_mod.h"
+#include "saga/console_mod.h"
+#include "saga/font_mod.h"
+#include "saga/objectmap.h"
 
 namespace Saga {
 
diff --git a/saga/palanim.cpp b/saga/palanim.cpp
index 2dfa96b78c4..1f2747b5d65 100644
--- a/saga/palanim.cpp
+++ b/saga/palanim.cpp
@@ -22,14 +22,14 @@
  */
 
 // Palette animation module
-#include "saga.h"
-#include "gfx.h"
+#include "saga/saga.h"
+#include "saga/gfx.h"
 
-#include "events_mod.h"
-#include "game_mod.h"
+#include "saga/events_mod.h"
+#include "saga/game_mod.h"
 
-#include "palanim_mod.h"
-#include "palanim.h"
+#include "saga/palanim_mod.h"
+#include "saga/palanim.h"
 
 namespace Saga {
 
diff --git a/saga/render.cpp b/saga/render.cpp
index 2b8788da90a..829431ff3b9 100644
--- a/saga/render.cpp
+++ b/saga/render.cpp
@@ -22,23 +22,23 @@
  */
 
 // Main rendering loop
-#include "saga.h"
+#include "saga/saga.h"
 
-#include "gfx.h"
-#include "actor.h"
-#include "console_mod.h"
-#include "cvar_mod.h"
-#include "font_mod.h"
-#include "game_mod.h"
-#include "interface_mod.h"
-#include "scene_mod.h"
-#include "sprite_mod.h"
-#include "text_mod.h"
+#include "saga/gfx.h"
+#include "saga/actor.h"
+#include "saga/console_mod.h"
+#include "saga/cvar_mod.h"
+#include "saga/font_mod.h"
+#include "saga/game_mod.h"
+#include "saga/interface_mod.h"
+#include "saga/scene_mod.h"
+#include "saga/sprite_mod.h"
+#include "saga/text_mod.h"
 
-#include "actionmap.h"
-#include "objectmap.h"
+#include "saga/actionmap.h"
+#include "saga/objectmap.h"
 
-#include "render.h"
+#include "saga/render.h"
 #include <common/timer.h>
 
 namespace Saga {
diff --git a/saga/rscfile.cpp b/saga/rscfile.cpp
index f38aa9d3218..594232da996 100644
--- a/saga/rscfile.cpp
+++ b/saga/rscfile.cpp
@@ -22,10 +22,10 @@
  */
 
 // RSC Resource file management module
-#include "saga.h"
+#include "saga/saga.h"
 
-#include "rscfile_mod.h"
-#include "rscfile.h"
+#include "saga/rscfile_mod.h"
+#include "saga/rscfile.h"
 
 namespace Saga {
 
diff --git a/saga/rscfile_mod.h b/saga/rscfile_mod.h
index f3cb2de4858..c841f9f8c21 100644
--- a/saga/rscfile_mod.h
+++ b/saga/rscfile_mod.h
@@ -26,7 +26,7 @@
 #ifndef SAGA_RSCFILE_MOD_H__
 #define SAGA_RSCFILE_MOD_H__
 
-#include "resnames.h"
+#include "saga/resnames.h"
 
 namespace Saga {
 
diff --git a/saga/saga.cpp b/saga/saga.cpp
index 91d64f31483..8b4c7238822 100644
--- a/saga/saga.cpp
+++ b/saga/saga.cpp
@@ -30,33 +30,33 @@
 #include "common/file.h"
 #include "common/config-manager.h"
 
-#include "saga.h"
+#include "saga/saga.h"
 
-#include "gfx.h"
-#include "rscfile_mod.h"
-#include "render.h"
-#include "actor.h"
-#include "animation.h"
-#include "console_mod.h"
-#include "cvar_mod.h"
-#include "events_mod.h"
-#include "actionmap.h"
-#include "font_mod.h"
-#include "game_mod.h"
-#include "game.h"
-#include "interface_mod.h"
-#include "isomap.h"
-#include "script.h"
-#include "script_mod.h"
-#include "scene_mod.h"
-#include "sdata.h"
-#include "sndres.h"
-#include "sprite_mod.h"
-#include "text_mod.h"
-#include "objectmap.h"
-#include "sound.h"
-#include "music.h"
-#include "game_mod.h"
+#include "saga/gfx.h"
+#include "saga/rscfile_mod.h"
+#include "saga/render.h"
+#include "saga/actor.h"
+#include "saga/animation.h"
+#include "saga/console_mod.h"
+#include "saga/cvar_mod.h"
+#include "saga/events_mod.h"
+#include "saga/actionmap.h"
+#include "saga/font_mod.h"
+#include "saga/game_mod.h"
+#include "saga/game.h"
+#include "saga/interface_mod.h"
+#include "saga/isomap.h"
+#include "saga/script.h"
+#include "saga/script_mod.h"
+#include "saga/scene_mod.h"
+#include "saga/sdata.h"
+#include "saga/sndres.h"
+#include "saga/sprite_mod.h"
+#include "saga/text_mod.h"
+#include "saga/objectmap.h"
+#include "saga/sound.h"
+#include "saga/music.h"
+#include "saga/game_mod.h"
 
 GameList Engine_SAGA_gameList() {
 	return Saga::GAME_GameList();
diff --git a/saga/scene.cpp b/saga/scene.cpp
index ec67b2cedd2..4ec3d0ed5c8 100644
--- a/saga/scene.cpp
+++ b/saga/scene.cpp
@@ -22,29 +22,29 @@
  */
 
 // Scene management module
-#include "saga.h"
-#include "yslib.h"
+#include "saga/saga.h"
+#include "saga/yslib.h"
 
-#include "gfx.h"
-#include "game_mod.h"
-#include "animation.h"
-#include "console_mod.h"
-#include "cvar_mod.h"
-#include "events_mod.h"
-#include "actionmap.h"
-#include "isomap.h"
-#include "script_mod.h"
-#include "objectmap.h"
-#include "palanim_mod.h"
-#include "render.h"
-#include "rscfile_mod.h"
-#include "script.h"
-#include "text_mod.h"
-#include "sound.h"
-#include "music.h"
+#include "saga/gfx.h"
+#include "saga/game_mod.h"
+#include "saga/animation.h"
+#include "saga/console_mod.h"
+#include "saga/cvar_mod.h"
+#include "saga/events_mod.h"
+#include "saga/actionmap.h"
+#include "saga/isomap.h"
+#include "saga/script_mod.h"
+#include "saga/objectmap.h"
+#include "saga/palanim_mod.h"
+#include "saga/render.h"
+#include "saga/rscfile_mod.h"
+#include "saga/script.h"
+#include "saga/text_mod.h"
+#include "saga/sound.h"
+#include "saga/music.h"
 
-#include "scene_mod.h"
-#include "scene.h"
+#include "saga/scene_mod.h"
+#include "saga/scene.h"
 
 namespace Saga {
 
diff --git a/saga/scene_mod.h b/saga/scene_mod.h
index 84430c86796..0428e9d8be5 100644
--- a/saga/scene_mod.h
+++ b/saga/scene_mod.h
@@ -26,7 +26,7 @@
 #ifndef SAGA_SCENE_MOD_H__
 #define SAGA_SCENE_MOD_H__
 
-#include "text_mod.h"
+#include "saga/text_mod.h"
 
 namespace Saga {
 
diff --git a/saga/script.cpp b/saga/script.cpp
index 541f306b7bc..88d78b4b896 100644
--- a/saga/script.cpp
+++ b/saga/script.cpp
@@ -22,20 +22,20 @@
  */
 
 // Scripting module: Script resource handling functions
-#include "saga.h"
-#include "yslib.h"
+#include "saga/saga.h"
+#include "saga/yslib.h"
 
-#include "gfx.h"
-#include "rscfile_mod.h"
-#include "game_mod.h"
-#include "text_mod.h"
-#include "console_mod.h"
-#include "cvar_mod.h"
+#include "saga/gfx.h"
+#include "saga/rscfile_mod.h"
+#include "saga/game_mod.h"
+#include "saga/text_mod.h"
+#include "saga/console_mod.h"
+#include "saga/cvar_mod.h"
 
-#include "script_mod.h"
-#include "script.h"
-#include "sstack.h"
-#include "sthread.h"
+#include "saga/script_mod.h"
+#include "saga/script.h"
+#include "saga/sstack.h"
+#include "saga/sthread.h"
 
 namespace Saga {
 
diff --git a/saga/script.h b/saga/script.h
index 5df5f79587b..4478547d56d 100644
--- a/saga/script.h
+++ b/saga/script.h
@@ -26,10 +26,10 @@
 #ifndef SAGA_SCRIPT_H
 #define SAGA_SCRIPT_H
 
-#include "sstack.h"
-#include "sdata.h"
-#include "text_mod.h"
-#include "yslib.h"
+#include "saga/sstack.h"
+#include "saga/sdata.h"
+#include "saga/text_mod.h"
+#include "saga/yslib.h"
 
 namespace Saga {
 
diff --git a/saga/sdata.cpp b/saga/sdata.cpp
index 0e791d70632..76e746de5f9 100644
--- a/saga/sdata.cpp
+++ b/saga/sdata.cpp
@@ -21,13 +21,13 @@
  *
  */
 // Type SDataWord_T must be unpadded
-#include "saga.h"
+#include "saga/saga.h"
 
-#include "gfx.h"
-#include "text_mod.h"
-#include "script_mod.h"
-#include "script.h"
-#include "sdata.h"
+#include "saga/gfx.h"
+#include "saga/text_mod.h"
+#include "saga/script_mod.h"
+#include "saga/script.h"
+#include "saga/sdata.h"
 
 namespace Saga {
 
diff --git a/saga/sdebug.cpp b/saga/sdebug.cpp
index bbbe21ddf93..bfc9a14322d 100644
--- a/saga/sdebug.cpp
+++ b/saga/sdebug.cpp
@@ -22,16 +22,16 @@
  */
 
 // Scripting module simple thread debugging support
-#include "saga.h"
+#include "saga/saga.h"
 
-#include "gfx.h"
-#include "console_mod.h"
-#include "text_mod.h"
-#include "scene_mod.h"
-#include "font_mod.h"
+#include "saga/gfx.h"
+#include "saga/console_mod.h"
+#include "saga/text_mod.h"
+#include "saga/scene_mod.h"
+#include "saga/font_mod.h"
 
-#include "script.h"
-#include "sthread.h"
+#include "saga/script.h"
+#include "saga/sthread.h"
 
 namespace Saga {
 
diff --git a/saga/sfuncs.cpp b/saga/sfuncs.cpp
index d4246ee41c9..4f26c74dfa1 100644
--- a/saga/sfuncs.cpp
+++ b/saga/sfuncs.cpp
@@ -23,17 +23,17 @@
 
 // Scripting module script function component
 
-#include "saga.h"
+#include "saga/saga.h"
 
-#include "gfx.h"
-#include "actor.h"
-#include "animation.h"
-#include "console_mod.h"
-#include "interface_mod.h"
-#include "text_mod.h"
+#include "saga/gfx.h"
+#include "saga/actor.h"
+#include "saga/animation.h"
+#include "saga/console_mod.h"
+#include "saga/interface_mod.h"
+#include "saga/text_mod.h"
 
-#include "script.h"
-#include "sfuncs.h"
+#include "saga/script.h"
+#include "saga/sfuncs.h"
 
 namespace Saga {
 
diff --git a/saga/sfuncs.h b/saga/sfuncs.h
index ffa36f22215..bd9d75d3197 100644
--- a/saga/sfuncs.h
+++ b/saga/sfuncs.h
@@ -26,7 +26,7 @@
 #ifndef SAGA_SFUNCS_H
 #define SAGA_SFUNCS_H
 
-#include "sthread.h"
+#include "saga/sthread.h"
 
 namespace Saga {
 
diff --git a/saga/sndres.cpp b/saga/sndres.cpp
index d964ec738d2..5fef6afd231 100644
--- a/saga/sndres.cpp
+++ b/saga/sndres.cpp
@@ -23,13 +23,13 @@
 
 // Sound resource management class
 
-#include "saga.h"
+#include "saga/saga.h"
 
-#include "game_mod.h"
-#include "rscfile_mod.h"
+#include "saga/game_mod.h"
+#include "saga/rscfile_mod.h"
 
-#include "sndres.h"
-#include "sound.h"
+#include "saga/sndres.h"
+#include "saga/sound.h"
 
 #include "common/file.h"
 
diff --git a/saga/sndres.h b/saga/sndres.h
index 23b144b632f..49956c4fd38 100644
--- a/saga/sndres.h
+++ b/saga/sndres.h
@@ -26,9 +26,9 @@
 #ifndef SAGA_SNDRES_H_
 #define SAGA_SNDRES_H_
 
-#include "rscfile_mod.h"
-#include "game_mod.h"
-#include "sound.h"
+#include "saga/rscfile_mod.h"
+#include "saga/game_mod.h"
+#include "saga/sound.h"
 
 namespace Saga {
 
diff --git a/saga/sound.cpp b/saga/sound.cpp
index ff942634876..8fb38b1f197 100644
--- a/saga/sound.cpp
+++ b/saga/sound.cpp
@@ -20,10 +20,10 @@
  * $Header$
  *
  */
-#include "saga.h"
+#include "saga/saga.h"
 
-#include "sound.h"
-#include "game_mod.h"
+#include "saga/sound.h"
+#include "saga/game_mod.h"
 
 #include "sound/mixer.h"
 
diff --git a/saga/sound.h b/saga/sound.h
index 9f35a94e50c..819f82a1527 100644
--- a/saga/sound.h
+++ b/saga/sound.h
@@ -26,8 +26,8 @@
 #ifndef SAGA_SOUND_H_
 #define SAGA_SOUND_H_
 
-#include "rscfile_mod.h"
-#include "game_mod.h"
+#include "saga/rscfile_mod.h"
+#include "saga/game_mod.h"
 #include "sound/mixer.h"
 
 namespace Saga {
diff --git a/saga/sprite.cpp b/saga/sprite.cpp
index de18fed4939..ddb44d958f9 100644
--- a/saga/sprite.cpp
+++ b/saga/sprite.cpp
@@ -22,18 +22,18 @@
  */
 
 // Sprite management module
-#include "saga.h"
+#include "saga/saga.h"
 
-#include "game_mod.h"
-#include "gfx.h"
-#include "scene_mod.h"
-#include "rscfile_mod.h"
+#include "saga/game_mod.h"
+#include "saga/gfx.h"
+#include "saga/scene_mod.h"
+#include "saga/rscfile_mod.h"
 
-#include "text_mod.h"
-#include "font_mod.h"
+#include "saga/text_mod.h"
+#include "saga/font_mod.h"
 
-#include "sprite_mod.h"
-#include "sprite.h"
+#include "saga/sprite_mod.h"
+#include "saga/sprite.h"
 
 namespace Saga {
 
diff --git a/saga/sstack.cpp b/saga/sstack.cpp
index aa8c04474b8..4bba740473f 100644
--- a/saga/sstack.cpp
+++ b/saga/sstack.cpp
@@ -23,14 +23,14 @@
 
 // Scripting engine stack component
 
-#include "saga.h"
+#include "saga/saga.h"
 
-#include "gfx.h"
-#include "console_mod.h"
-#include "text_mod.h"
+#include "saga/gfx.h"
+#include "saga/console_mod.h"
+#include "saga/text_mod.h"
 
-#include "script.h"
-#include "sstack.h"
+#include "saga/script.h"
+#include "saga/sstack.h"
 
 namespace Saga {
 
diff --git a/saga/sstack.h b/saga/sstack.h
index f5b1c3181b7..f73888ac013 100644
--- a/saga/sstack.h
+++ b/saga/sstack.h
@@ -26,7 +26,7 @@
 #ifndef SAGA_SSTACK_H
 #define SAGA_SSTACK_H
 
-#include "script_mod.h"
+#include "saga/script_mod.h"
 
 namespace Saga {
 
diff --git a/saga/sthread.cpp b/saga/sthread.cpp
index 001bde2b1b1..5837b88e6fa 100644
--- a/saga/sthread.cpp
+++ b/saga/sthread.cpp
@@ -22,22 +22,21 @@
  */
 
 // Scripting module thread management component
-#include "saga.h"
+#include "saga/saga.h"
+#include "saga/yslib.h"
 
-#include "yslib.h"
+#include "saga/gfx.h"
+#include "saga/actor.h"
+#include "saga/console_mod.h"
+#include "saga/text_mod.h"
 
-#include "gfx.h"
-#include "actor.h"
-#include "console_mod.h"
-#include "text_mod.h"
+#include "saga/script.h"
+#include "saga/script_mod.h"
 
-#include "script.h"
-#include "script_mod.h"
-
-#include "sdata.h"
-#include "sstack.h"
-#include "sthread.h"
-#include "sfuncs.h"
+#include "saga/sdata.h"
+#include "saga/sstack.h"
+#include "saga/sthread.h"
+#include "saga/sfuncs.h"
 
 namespace Saga {
 
diff --git a/saga/sthread.h b/saga/sthread.h
index 80306503c13..c3ef69b1206 100644
--- a/saga/sthread.h
+++ b/saga/sthread.h
@@ -26,7 +26,7 @@
 #ifndef SAGA_STHREAD_H__
 #define SAGA_STHREAD_H__
 
-#include "sstack.h"
+#include "saga/sstack.h"
 
 namespace Saga {
 
diff --git a/saga/text.cpp b/saga/text.cpp
index 7131463d3f6..456b8ca0b9d 100644
--- a/saga/text.cpp
+++ b/saga/text.cpp
@@ -23,14 +23,14 @@
 
 // Text / dialogue display management module
 
-#include "saga.h"
-#include "yslib.h"
+#include "saga/saga.h"
+#include "saga/yslib.h"
 
-#include "gfx.h"
-#include "font_mod.h"
+#include "saga/gfx.h"
+#include "saga/font_mod.h"
 
-#include "text_mod.h"
-#include "text.h"
+#include "saga/text_mod.h"
+#include "saga/text.h"
 
 namespace Saga {
 
diff --git a/saga/transitions.cpp b/saga/transitions.cpp
index 23b9d074608..93daa18282c 100644
--- a/saga/transitions.cpp
+++ b/saga/transitions.cpp
@@ -22,7 +22,7 @@
  */
 
 //Background transition routines
-#include "saga.h"
+#include "saga/saga.h"
 
 namespace Saga {
 
diff --git a/saga/ys_dl_list.cpp b/saga/ys_dl_list.cpp
index 1df5fdb3760..db7adfe4ce1 100644
--- a/saga/ys_dl_list.cpp
+++ b/saga/ys_dl_list.cpp
@@ -20,8 +20,8 @@
  * $Header$
  *
  */
-#include "saga.h"
-#include "yslib.h"
+#include "saga/saga.h"
+#include "saga/yslib.h"
 
 namespace Saga {