SWORD25: Fixed rest of the include paths

svn-id: r53181

97 files changed, 482 insertions, 482 deletions

diff --git a/engines/sword25/gfx/animation.cpp b/engines/sword25/gfx/animation.cpp
index a4511454ed..8335fc49d7 100755
--- a/engines/sword25/gfx/animation.cpp
+++ b/engines/sword25/gfx/animation.cpp
@@ -19,21 +19,21 @@
 
 #include <memory>
 
-#include "animation.h"
-
-#include "kernel/kernel.h"
-#include "kernel/resmanager.h"
-#include "kernel/inputpersistenceblock.h"
-#include "kernel/outputpersistenceblock.h"
-#include "kernel/callbackregistry.h"
-#include "package/packagemanager.h"
-#include "util/tinyxml/tinyxml.h"
-#include "image/image.h"
-#include "animationtemplate.h"
-#include "animationtemplateregistry.h"
-#include "animationresource.h"
-#include "bitmapresource.h"
-#include "graphicengine.h"
+#include "sword25/gfx/animation.h"
+
+#include "sword25/kernel/kernel.h"
+#include "sword25/kernel/resmanager.h"
+#include "sword25/kernel/inputpersistenceblock.h"
+#include "sword25/kernel/outputpersistenceblock.h"
+#include "sword25/kernel/callbackregistry.h"
+#include "sword25/package/packagemanager.h"
+#include <tinyxml.h>
+#include "sword25/image/image.h"
+#include "sword25/gfx/animationtemplate.h"
+#include "sword25/gfx/animationtemplateregistry.h"
+#include "sword25/gfx/animationresource.h"
+#include "sword25/gfx/bitmapresource.h"
+#include "sword25/gfx/graphicengine.h"
 
 #define BS_LOG_PREFIX "ANIMATION"
 
diff --git a/engines/sword25/gfx/animation.h b/engines/sword25/gfx/animation.h
index 37380f27a9..8be252e0a0 100755
--- a/engines/sword25/gfx/animation.h
+++ b/engines/sword25/gfx/animation.h
@@ -17,16 +17,16 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_ANIMATION_H
-#define BS_ANIMATION_H
+#ifndef SWORD25_ANIMATION_H
+#define SWORD25_ANIMATION_H
 
 // Includes
-#include "kernel/common.h"
-#include "timedrenderobject.h"
+#include "sword25/kernel/common.h"
+#include "sword25/gfx/timedrenderobject.h"
 
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
 #include <vector>
-#include "kernel/memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
 
 // Forward declarations
 class BS_Kernel;
diff --git a/engines/sword25/gfx/animationdescription.cpp b/engines/sword25/gfx/animationdescription.cpp
index 3bd5c05c0b..9f52f6638d 100755
--- a/engines/sword25/gfx/animationdescription.cpp
+++ b/engines/sword25/gfx/animationdescription.cpp
@@ -21,9 +21,9 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/outputpersistenceblock.h"
-#include "kernel/inputpersistenceblock.h"
-#include "animationdescription.h"
+#include "sword25/kernel/outputpersistenceblock.h"
+#include "sword25/kernel/inputpersistenceblock.h"
+#include "sword25/gfx/animationdescription.h"
 
 // -----------------------------------------------------------------------------
 // Persistenz
diff --git a/engines/sword25/gfx/animationdescription.h b/engines/sword25/gfx/animationdescription.h
index 16bde6d101..ab46deb05b 100755
--- a/engines/sword25/gfx/animationdescription.h
+++ b/engines/sword25/gfx/animationdescription.h
@@ -17,16 +17,16 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_ANIMATIONDESCRIPTION_H
-#define BS_ANIMATIONDESCRIPTION_H
+#ifndef SWORD25_ANIMATIONDESCRIPTION_H
+#define SWORD25_ANIMATIONDESCRIPTION_H
 
 // -----------------------------------------------------------------------------
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/common.h"
-#include "kernel/persistable.h"
-#include "animation.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/persistable.h"
+#include "sword25/gfx/animation.h"
 
 // -----------------------------------------------------------------------------
 // Klassendefinition
diff --git a/engines/sword25/gfx/animationresource.cpp b/engines/sword25/gfx/animationresource.cpp
index f1f88eaf2f..03047abcb2 100755
--- a/engines/sword25/gfx/animationresource.cpp
+++ b/engines/sword25/gfx/animationresource.cpp
@@ -21,13 +21,13 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "animationresource.h"
+#include "sword25/gfx/animationresource.h"
 
-#include "kernel/kernel.h"
-#include "kernel/string.h"
-#include "package/packagemanager.h"
-#include "util/tinyxml/tinyxml.h"
-#include "bitmapresource.h"
+#include "sword25/kernel/kernel.h"
+#include "sword25/kernel/string.h"
+#include "sword25/package/packagemanager.h"
+#include <tinyxml.h>
+#include "sword25/gfx/bitmapresource.h"
 
 // -----------------------------------------------------------------------------
 
diff --git a/engines/sword25/gfx/animationresource.h b/engines/sword25/gfx/animationresource.h
index ebb374f87a..f357113460 100755
--- a/engines/sword25/gfx/animationresource.h
+++ b/engines/sword25/gfx/animationresource.h
@@ -17,21 +17,21 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_ANIMATIONRESOURCE_H
-#define BS_ANIMATIONRESOURCE_H
+#ifndef SWORD25_ANIMATIONRESOURCE_H
+#define SWORD25_ANIMATIONRESOURCE_H
 
 // -----------------------------------------------------------------------------
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/common.h"
-#include "kernel/resource.h"
-#include "animationdescription.h"
-#include "animation.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/resource.h"
+#include "sword25/gfx/animationdescription.h"
+#include "sword25/gfx/animation.h"
 
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
 #include <vector>
-#include "kernel/memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
 
 // -----------------------------------------------------------------------------
 // Forward Declarations
diff --git a/engines/sword25/gfx/animationtemplate.cpp b/engines/sword25/gfx/animationtemplate.cpp
index 72b1e9282b..e63cd28a44 100755
--- a/engines/sword25/gfx/animationtemplate.cpp
+++ b/engines/sword25/gfx/animationtemplate.cpp
@@ -23,14 +23,14 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/kernel.h"
-#include "kernel/resource.h"
-#include "kernel/outputpersistenceblock.h"
-#include "kernel/inputpersistenceblock.h"
-
-#include "animationresource.h"
-#include "animationtemplate.h"
-#include "animationtemplateregistry.h"
+#include "sword25/kernel/kernel.h"
+#include "sword25/kernel/resource.h"
+#include "sword25/kernel/outputpersistenceblock.h"
+#include "sword25/kernel/inputpersistenceblock.h"
+
+#include "sword25/gfx/animationresource.h"
+#include "sword25/gfx/animationtemplate.h"
+#include "sword25/gfx/animationtemplateregistry.h"
 
 // -----------------------------------------------------------------------------
 // Konstruktion / Destruktion
diff --git a/engines/sword25/gfx/animationtemplate.h b/engines/sword25/gfx/animationtemplate.h
index df63735b2e..8f60984f43 100755
--- a/engines/sword25/gfx/animationtemplate.h
+++ b/engines/sword25/gfx/animationtemplate.h
@@ -17,20 +17,20 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_ANIMATION_TEMPLATE_H
-#define BS_ANIMATION_TEMPLATE_H
+#ifndef SWORD25_ANIMATION_TEMPLATE_H
+#define SWORD25_ANIMATION_TEMPLATE_H
 
 // -----------------------------------------------------------------------------
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/common.h"
-#include "kernel/persistable.h"
-#include "animationdescription.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/persistable.h"
+#include "sword25/gfx/animationdescription.h"
 
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
 #include <vector>
-#include "kernel/memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
 
 // -----------------------------------------------------------------------------
 // Forward declarations
diff --git a/engines/sword25/gfx/animationtemplateregistry.cpp b/engines/sword25/gfx/animationtemplateregistry.cpp
index aabea41417..5165f5387a 100755
--- a/engines/sword25/gfx/animationtemplateregistry.cpp
+++ b/engines/sword25/gfx/animationtemplateregistry.cpp
@@ -27,10 +27,10 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/outputpersistenceblock.h"
-#include "kernel/inputpersistenceblock.h"
-#include "animationtemplateregistry.h"
-#include "animationtemplate.h"
+#include "sword25/kernel/outputpersistenceblock.h"
+#include "sword25/kernel/inputpersistenceblock.h"
+#include "sword25/gfx/animationtemplateregistry.h"
+#include "sword25/gfx/animationtemplate.h"
 
 // -----------------------------------------------------------------------------
 // Implementation
diff --git a/engines/sword25/gfx/animationtemplateregistry.h b/engines/sword25/gfx/animationtemplateregistry.h
index 78c83fd2bb..ddc242789f 100755
--- a/engines/sword25/gfx/animationtemplateregistry.h
+++ b/engines/sword25/gfx/animationtemplateregistry.h
@@ -17,20 +17,20 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_ANIMATIONTEMPLATEREGISTRY_H
-#define BS_ANIMATIONTEMPLATEREGISTRY_H
+#ifndef SWORD25_ANIMATIONTEMPLATEREGISTRY_H
+#define SWORD25_ANIMATIONTEMPLATEREGISTRY_H
 
 // -----------------------------------------------------------------------------
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/common.h"
-#include "kernel/persistable.h"
-#include "kernel/objectregistry.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/persistable.h"
+#include "sword25/kernel/objectregistry.h"
 
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
 #include <memory>
-#include "kernel/memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
 
 // -----------------------------------------------------------------------------
 // Forward Deklarationen
diff --git a/engines/sword25/gfx/bitmap.cpp b/engines/sword25/gfx/bitmap.cpp
index 85442a835a..966cabdbe8 100755
--- a/engines/sword25/gfx/bitmap.cpp
+++ b/engines/sword25/gfx/bitmap.cpp
@@ -21,9 +21,9 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "bitmap.h"
-#include "kernel/outputpersistenceblock.h"
-#include "kernel/inputpersistenceblock.h"
+#include "sword25/gfx/bitmap.h"
+#include "sword25/kernel/outputpersistenceblock.h"
+#include "sword25/kernel/inputpersistenceblock.h"
 
 // -----------------------------------------------------------------------------
 // Logging
diff --git a/engines/sword25/gfx/bitmap.h b/engines/sword25/gfx/bitmap.h
index 053dc8b9a1..fb1db9683e 100755
--- a/engines/sword25/gfx/bitmap.h
+++ b/engines/sword25/gfx/bitmap.h
@@ -17,15 +17,15 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_BITMAP_H
-#define BS_BITMAP_H
+#ifndef SWORD25_BITMAP_H
+#define SWORD25_BITMAP_H
 
 // -----------------------------------------------------------------------------
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/common.h"
-#include "renderobject.h"
+#include "sword25/kernel/common.h"
+#include "sword25/gfx/renderobject.h"
 
 // -----------------------------------------------------------------------------
 // Klassendeklaration
diff --git a/engines/sword25/gfx/bitmapresource.cpp b/engines/sword25/gfx/bitmapresource.cpp
index af1638333e..d2f61b3080 100755
--- a/engines/sword25/gfx/bitmapresource.cpp
+++ b/engines/sword25/gfx/bitmapresource.cpp
@@ -19,11 +19,11 @@
 
 #include <memory>
 
-#include "bitmapresource.h"
-#include "kernel/kernel.h"
-#include "graphicengine.h"
-#include "image/imageloader.h"
-#include "package/packagemanager.h"
+#include "sword25/gfx/bitmapresource.h"
+#include "sword25/kernel/kernel.h"
+#include "sword25/gfx/graphicengine.h"
+#include "sword25/image/imageloader.h"
+#include "sword25/package/packagemanager.h"
 
 #define BS_LOG_PREFIX "BITMAP"
 
diff --git a/engines/sword25/gfx/bitmapresource.h b/engines/sword25/gfx/bitmapresource.h
index 0b0ea6db99..bdcc0f2f66 100755
--- a/engines/sword25/gfx/bitmapresource.h
+++ b/engines/sword25/gfx/bitmapresource.h
@@ -17,13 +17,13 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_BITMAP_RESOURCE_H
-#define BS_BITMAP_RESOURCE_H
+#ifndef SWORD25_BITMAP_RESOURCE_H
+#define SWORD25_BITMAP_RESOURCE_H
 
 // Includes
-#include "kernel/common.h"
-#include "kernel/resource.h"
-#include "image/image.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/resource.h"
+#include "sword25/image/image.h"
 
 // -----------------------------------------------------------------------------
 // Forward Declarations
diff --git a/engines/sword25/gfx/dynamicbitmap.cpp b/engines/sword25/gfx/dynamicbitmap.cpp
index 6e2c258641..d3e5a05326 100755
--- a/engines/sword25/gfx/dynamicbitmap.cpp
+++ b/engines/sword25/gfx/dynamicbitmap.cpp
@@ -21,10 +21,10 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "dynamicbitmap.h"
-#include "bitmapresource.h"
-#include "package/packagemanager.h"
-#include "kernel/inputpersistenceblock.h"
+#include "sword25/gfx/dynamicbitmap.h"
+#include "sword25/gfx/bitmapresource.h"
+#include "sword25/package/packagemanager.h"
+#include "sword25/kernel/inputpersistenceblock.h"
 
 #include <vector>
 
diff --git a/engines/sword25/gfx/dynamicbitmap.h b/engines/sword25/gfx/dynamicbitmap.h
index 0eb856ce81..3cf6db0585 100755
--- a/engines/sword25/gfx/dynamicbitmap.h
+++ b/engines/sword25/gfx/dynamicbitmap.h
@@ -17,21 +17,21 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_DYNAMIC_BITMAP_H
-#define BS_DYNAMIC_BITMAP_H
+#ifndef SWORD25_DYNAMIC_BITMAP_H
+#define SWORD25_DYNAMIC_BITMAP_H
 
 
 // -----------------------------------------------------------------------------
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
 #include <memory>
-#include "kernel/memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
 
-#include "kernel/common.h"
-#include "bitmap.h"
-#include "opengl/glimage.h"
+#include "sword25/kernel/common.h"
+#include "sword25/gfx/bitmap.h"
+#include "sword25/gfx/opengl/glimage.h"
 
 // -----------------------------------------------------------------------------
 // Klassendeklaration
diff --git a/engines/sword25/gfx/fontresource.cpp b/engines/sword25/gfx/fontresource.cpp
index 3d2d12e992..2663b9f788 100755
--- a/engines/sword25/gfx/fontresource.cpp
+++ b/engines/sword25/gfx/fontresource.cpp
@@ -25,12 +25,12 @@
 
 #include <memory>
 
-#include "kernel/kernel.h"
-#include "kernel/string.h"
-#include "package/packagemanager.h"
-#include "util/tinyxml/tinyxml.h"
+#include "sword25/kernel/kernel.h"
+#include "sword25/kernel/string.h"
+#include "sword25/package/packagemanager.h"
+#include <tinyxml.h>
 
-#include "fontresource.h"
+#include "sword25/gfx/fontresource.h"
 
 // -----------------------------------------------------------------------------
 // Konstanten
diff --git a/engines/sword25/gfx/fontresource.h b/engines/sword25/gfx/fontresource.h
index adb790be6b..497e5ad687 100755
--- a/engines/sword25/gfx/fontresource.h
+++ b/engines/sword25/gfx/fontresource.h
@@ -17,16 +17,16 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_FONTRESOURCE_H
-#define BS_FONTRESOURCE_H
+#ifndef SWORD25_FONTRESOURCE_H
+#define SWORD25_FONTRESOURCE_H
 
 // -----------------------------------------------------------------------------
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/common.h"
-#include "kernel/resource.h"
-#include "math/rect.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/resource.h"
+#include "sword25/math/rect.h"
 
 // -----------------------------------------------------------------------------
 // Forward declarations
diff --git a/engines/sword25/gfx/framecounter.cpp b/engines/sword25/gfx/framecounter.cpp
index 54c844967d..ae7cacaedb 100755
--- a/engines/sword25/gfx/framecounter.cpp
+++ b/engines/sword25/gfx/framecounter.cpp
@@ -17,8 +17,8 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#include "framecounter.h"
-#include "kernel/timer.h"
+#include "sword25/gfx/framecounter.h"
+#include "sword25/kernel/timer.h"
 
 BS_Framecounter::BS_Framecounter(int UpdateFrequency) :
 	m_FPS(0),
diff --git a/engines/sword25/gfx/framecounter.h b/engines/sword25/gfx/framecounter.h
index 79a2b04df6..650a2e9068 100755
--- a/engines/sword25/gfx/framecounter.h
+++ b/engines/sword25/gfx/framecounter.h
@@ -17,12 +17,12 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef _BS_FRAMECOUNTER_H
-#define _BS_FRAMECOUNTER_H
+#ifndef SWORD25_FRAMECOUNTER_H
+#define SWORD25_FRAMECOUNTER_H
 
 // Includes
-#include "kernel/common.h"
-#include "kernel/bs_stdint.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/bs_stdint.h"
 
 /**
 	@brief Eine einfache Klasse die einen Framecounter implementiert.
diff --git a/engines/sword25/gfx/graphicengine.cpp b/engines/sword25/gfx/graphicengine.cpp
index b8ad3a04bd..ea03e7f652 100755
--- a/engines/sword25/gfx/graphicengine.cpp
+++ b/engines/sword25/gfx/graphicengine.cpp
@@ -19,19 +19,19 @@
 
 #define BS_LOG_PREFIX "GRAPHICENGINE"
 
-#include "image/image.h"
-#include "screenshot.h"
-#include "kernel/memlog_off.h"
+#include "sword25/image/image.h"
+#include "sword25/gfx/screenshot.h"
+#include "sword25/kernel/memlog_off.h"
 #include <memory>
 #include <vector>
-#include "kernel/memlog_on.h"
-#include "kernel/inputpersistenceblock.h"
-#include "kernel/outputpersistenceblock.h"
+#include "sword25/kernel/memlog_on.h"
+#include "sword25/kernel/inputpersistenceblock.h"
+#include "sword25/kernel/outputpersistenceblock.h"
 
 extern "C"
 {
-#include <lua.h>
-#include <lauxlib.h>
+#include "sword25/util/lua/lua.h"
+#include "sword25/util/lua/lauxlib.h"
 }
 
 using namespace std;
@@ -45,7 +45,7 @@ static const unsigned int FRAMETIME_SAMPLE_COUNT = 5;		// Anzahl der Framezeiten
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "graphicengine.h"
+#include "sword25/gfx/graphicengine.h"
 
 // -----------------------------------------------------------------------------
 
diff --git a/engines/sword25/gfx/graphicengine.h b/engines/sword25/gfx/graphicengine.h
index 9fe8fd93fd..6272df4d14 100755
--- a/engines/sword25/gfx/graphicengine.h
+++ b/engines/sword25/gfx/graphicengine.h
@@ -26,21 +26,21 @@
 	Autor: Malte Thiesen
 */
 
-#ifndef _BS_GRAPHICENGINE_H
-#define _BS_GRAPHICENGINE_H
+#ifndef SWORD25_GRAPHICENGINE_H
+#define SWORD25_GRAPHICENGINE_H
 
 // Includes
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
 #include <vector>
-#include "kernel/memlog_on.h"
-
-#include "kernel/common.h"
-#include "kernel/bs_stdint.h"
-#include "kernel/resservice.h"
-#include "kernel/persistable.h"
-#include "math/rect.h"
-#include "framecounter.h"
-#include "renderobjectptr.h"
+#include "sword25/kernel/memlog_on.h"
+
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/bs_stdint.h"
+#include "sword25/kernel/resservice.h"
+#include "sword25/kernel/persistable.h"
+#include "sword25/math/rect.h"
+#include "sword25/gfx/framecounter.h"
+#include "sword25/gfx/renderobjectptr.h"
 
 class BS_Kernel;
 class BS_Image;
diff --git a/engines/sword25/gfx/graphicengine_script.cpp b/engines/sword25/gfx/graphicengine_script.cpp
index 5419f09f2c..13189e1efb 100755
--- a/engines/sword25/gfx/graphicengine_script.cpp
+++ b/engines/sword25/gfx/graphicengine_script.cpp
@@ -24,22 +24,22 @@
 #include <algorithm>
 #include <string>
 
-#include "kernel/common.h"
-#include "kernel/kernel.h"
-#include "kernel/callbackregistry.h"
-#include "script/script.h"
-#include "script/luabindhelper.h"
-#include "script/luacallback.h"
-#include "math/vertex.h"
-
-#include "graphicengine.h"
-#include "renderobject.h"
-#include "bitmap.h"
-#include "animation.h"
-#include "panel.h"
-#include "text.h"
-#include "animationtemplate.h"
-#include "animationtemplateregistry.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/kernel.h"
+#include "sword25/kernel/callbackregistry.h"
+#include "sword25/script/script.h"
+#include "sword25/script/luabindhelper.h"
+#include "sword25/script/luacallback.h"
+#include "sword25/math/vertex.h"
+
+#include "sword25/gfx/graphicengine.h"
+#include "sword25/gfx/renderobject.h"
+#include "sword25/gfx/bitmap.h"
+#include "sword25/gfx/animation.h"
+#include "sword25/gfx/panel.h"
+#include "sword25/gfx/text.h"
+#include "sword25/gfx/animationtemplate.h"
+#include "sword25/gfx/animationtemplateregistry.h"
 
 #define BS_LOG_PREFIX "GRAPHICENGINE"
 
diff --git a/engines/sword25/gfx/image/b25sloader.cpp b/engines/sword25/gfx/image/b25sloader.cpp
index 55aaf7a2c5..a4e3ad1235 100755
--- a/engines/sword25/gfx/image/b25sloader.cpp
+++ b/engines/sword25/gfx/image/b25sloader.cpp
@@ -26,8 +26,8 @@
 #include <algorithm>
 using namespace std;
 
-#include "b25sloader.h"
-#include "pngloader.h"
+#include "sword25/gfx/image/b25sloader.h"
+#include "sword25/gfx/image/pngloader.h"
 
 #define BS_LOG_PREFIX "B25SLOADER"
 
diff --git a/engines/sword25/gfx/image/b25sloader.h b/engines/sword25/gfx/image/b25sloader.h
index bafea87365..f562d3c6c7 100755
--- a/engines/sword25/gfx/image/b25sloader.h
+++ b/engines/sword25/gfx/image/b25sloader.h
@@ -17,15 +17,15 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_B25SLOADER_H
-#define BS_B25SLOADER_H
+#ifndef SWORD25_B25SLOADER_H
+#define SWORD25_B25SLOADER_H
 
 // -----------------------------------------------------------------------------
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/common.h"
-#include "imageloader.h"
+#include "sword25/kernel/common.h"
+#include "sword25/gfx/image/imageloader.h"
 
 // -----------------------------------------------------------------------------
 // Klassendeklaration
@@ -36,9 +36,9 @@ class BS_B25SLoader : public BS_ImageLoader
 public:
 	static BS_ImageLoader * CreateInstance() 
 	{ 
-		#include "kernel/memlog_off.h"
+		#include "sword25/kernel/memlog_off.h"
 		return static_cast<BS_ImageLoader *>(new BS_B25SLoader());
-		#include "kernel/memlog_on.h"
+		#include "sword25/kernel/memlog_on.h"
 	}
 
 protected:
diff --git a/engines/sword25/gfx/image/image.h b/engines/sword25/gfx/image/image.h
index 8f6fe9cab9..a022150bf6 100755
--- a/engines/sword25/gfx/image/image.h
+++ b/engines/sword25/gfx/image/image.h
@@ -24,16 +24,16 @@
 	Autor: Malte Thiesen
 */
 
-#ifndef BS_IMAGE_H
-#define BS_IMAGE_H
+#ifndef SWORD25_IMAGE_H
+#define SWORD25_IMAGE_H
 
 // Includes
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
 #include <vector>
-#include "kernel/memlog_on.h"
-#include "kernel/common.h"
-#include "math/rect.h"
-#include "gfx/graphicengine.h"
+#include "sword25/kernel/memlog_on.h"
+#include "sword25/kernel/common.h"
+#include "sword25/math/rect.h"
+#include "sword25/gfx/graphicengine.h"
 
 class BS_Image
 {
diff --git a/engines/sword25/gfx/image/imageloader.cpp b/engines/sword25/gfx/image/imageloader.cpp
index 18d94a4e21..ace05b9812 100755
--- a/engines/sword25/gfx/image/imageloader.cpp
+++ b/engines/sword25/gfx/image/imageloader.cpp
@@ -17,8 +17,8 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#include "imageloader.h"
-#include "imageloader_ids.h"
+#include "sword25/gfx/image/imageloader.h"
+#include "sword25/gfx/image/imageloader_ids.h"
 
 #define BS_LOG_PREFIX "IMAGELOADER"
 
diff --git a/engines/sword25/gfx/image/imageloader.h b/engines/sword25/gfx/image/imageloader.h
index 952c36b093..a8a4fd899f 100755
--- a/engines/sword25/gfx/image/imageloader.h
+++ b/engines/sword25/gfx/image/imageloader.h
@@ -24,18 +24,18 @@
 	Autor: Malte Thiesen
 */
 
-#ifndef BS_IMAGELOADER_H
-#define BS_IMAGELOADER_H
+#ifndef SWORD25_IMAGELOADER_H
+#define SWORD25_IMAGELOADER_H
 
 // Includes
-#include "kernel/bs_stdint.h"
-#include "kernel/common.h"
-#include "../graphicengine.h"
+#include "sword25/kernel/bs_stdint.h"
+#include "sword25/kernel/common.h"
+#include "sword25/gfx/graphicengine.h"
 
 // Die folgenden Header vertragen sich nicht mit der Memoryleak-Detection, daher wird sie kurzzeitig deaktiviert
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
 #include <list>
-#include "kernel/memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
 
 /**
 	@brief Über die statischen Methoden dieser Klasse werden alle unterstützten Bildformate geladen.
diff --git a/engines/sword25/gfx/image/imageloader_ids.h b/engines/sword25/gfx/image/imageloader_ids.h
index 4564996a0f..e18f2dd64f 100755
--- a/engines/sword25/gfx/image/imageloader_ids.h
+++ b/engines/sword25/gfx/image/imageloader_ids.h
@@ -26,11 +26,11 @@
 	Autor: Malte Thiesen
 */
 
-#include "imageloader.h"
+#include "sword25/gfx/image/imageloader.h"
 
 // Die Headerdateien der ImageLoader müssen hier eingebunden werden
-#include "pngloader.h"
-#include "b25sloader.h"
+#include "sword25/gfx/image/pngloader.h"
+#include "sword25/gfx/image/b25sloader.h"
 
 // Die Tabelle enthält Pointer auf statische Member-Funktionen innerhalb der Klassen, die eine Instanz der Klasse
 // erzeugen
diff --git a/engines/sword25/gfx/image/pngloader.cpp b/engines/sword25/gfx/image/pngloader.cpp
index 3815f4e4ff..f97de5f6e8 100755
--- a/engines/sword25/gfx/image/pngloader.cpp
+++ b/engines/sword25/gfx/image/pngloader.cpp
@@ -21,9 +21,9 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "image.h"
-#include "pngloader.h"
-#include "util/libpng/png.h"
+#include "sword25/gfx/image/image.h"
+#include "sword25/gfx/image/pngloader.h"
+#include <png.h>
 
 #define BS_LOG_PREFIX "PNGLOADER"
 
diff --git a/engines/sword25/gfx/image/pngloader.h b/engines/sword25/gfx/image/pngloader.h
index 5fdedf49fc..dfe38dbe6a 100755
--- a/engines/sword25/gfx/image/pngloader.h
+++ b/engines/sword25/gfx/image/pngloader.h
@@ -25,12 +25,12 @@
 	Autor: Malte Thiesen
 */
 
-#ifndef BS_PNGLOADER2_H
-#define BS_PNGLOADER2_H
+#ifndef SWORD25_PNGLOADER2_H
+#define SWORD25_PNGLOADER2_H
 
 // Includes
-#include "kernel/common.h"
-#include "imageloader.h"
+#include "sword25/kernel/common.h"
+#include "sword25/gfx/image/imageloader.h"
 
 // Klassendefinition
 class BS_PNGLoader : public BS_ImageLoader
@@ -38,9 +38,9 @@ class BS_PNGLoader : public BS_ImageLoader
 public:
 	static BS_ImageLoader* CreateInstance() 
 	{ 
-		#include "kernel/memlog_off.h"
+		#include "sword25/kernel/memlog_off.h"
 		return (BS_ImageLoader*) new BS_PNGLoader();
-		#include "kernel/memlog_on.h"
+		#include "sword25/kernel/memlog_on.h"
 	}
 
 	// Alle virtuellen Methoden von BS_ImageLoader sind hier als static-Methode implementiert, damit sie von BS_B25SLoader aufgerufen werden können.
diff --git a/engines/sword25/gfx/image/vectorimage.cpp b/engines/sword25/gfx/image/vectorimage.cpp
index 035d572149..4cbd0d5cfd 100755
--- a/engines/sword25/gfx/image/vectorimage.cpp
+++ b/engines/sword25/gfx/image/vectorimage.cpp
@@ -21,8 +21,8 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/bs_stdint.h"
-#include "vectorimage.h"
+#include "sword25/kernel/bs_stdint.h"
+#include "sword25/gfx/image/vectorimage.h"
 #include <vector>
 #include <stdexcept>
 
diff --git a/engines/sword25/gfx/image/vectorimage.h b/engines/sword25/gfx/image/vectorimage.h
index 74f6c860d9..a807452b67 100755
--- a/engines/sword25/gfx/image/vectorimage.h
+++ b/engines/sword25/gfx/image/vectorimage.h
@@ -17,16 +17,16 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_VECTORIMAGE_H
-#define BS_VECTORIMAGE_H
+#ifndef SWORD25_VECTORIMAGE_H
+#define SWORD25_VECTORIMAGE_H
 
 // -----------------------------------------------------------------------------
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/common.h"
-#include "gfx/image/image.h"
-#include "math/rect.h"
+#include "sword25/kernel/common.h"
+#include "sword25/gfx/image/image.h"
+#include "sword25/math/rect.h"
 
 #include <vector>
 #include "agg_path_storage.h"
diff --git a/engines/sword25/gfx/image/vectorimagerenderer.cpp b/engines/sword25/gfx/image/vectorimagerenderer.cpp
index 76f2330a65..9d582f623d 100755
--- a/engines/sword25/gfx/image/vectorimagerenderer.cpp
+++ b/engines/sword25/gfx/image/vectorimagerenderer.cpp
@@ -21,8 +21,8 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "vectorimagerenderer.h"
-#include "vectorimage.h"
+#include "sword25/gfx/image/vectorimagerenderer.h"
+#include "sword25/gfx/image/vectorimage.h"
 #include "agg_conv_curve.h"
 #include "agg_path_storage.h"
 #include "agg_conv_stroke.h"
diff --git a/engines/sword25/gfx/image/vectorimagerenderer.h b/engines/sword25/gfx/image/vectorimagerenderer.h
index 2dc29c480e..b79798e2e2 100755
--- a/engines/sword25/gfx/image/vectorimagerenderer.h
+++ b/engines/sword25/gfx/image/vectorimagerenderer.h
@@ -17,14 +17,14 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_VECTORIMAGERENDERER_H
-#define BS_VECTORIMAGERENDERER_H
+#ifndef SWORD25_VECTORIMAGERENDERER_H
+#define SWORD25_VECTORIMAGERENDERER_H
 
 // -----------------------------------------------------------------------------
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/common.h"
+#include "sword25/kernel/common.h"
 #include <vector>
 
 #include "agg_rendering_buffer.h"
diff --git a/engines/sword25/gfx/opengl/glimage.cpp b/engines/sword25/gfx/opengl/glimage.cpp
index 1f5322516b..3dde73a335 100755
--- a/engines/sword25/gfx/opengl/glimage.cpp
+++ b/engines/sword25/gfx/opengl/glimage.cpp
@@ -21,11 +21,11 @@
 // INCLUDES
 // -----------------------------------------------------------------------------
 
-#include "util/glsprites/glsprites.h"
-#include "package/packagemanager.h"
-#include "gfx/image/imageloader.h"
-#include "openglgfx.h"
-#include "glimage.h"
+#include "sword25/util/glsprites/glsprites.h"
+#include "sword25/package/packagemanager.h"
+#include "sword25/gfx/image/imageloader.h"
+#include "sword25/gfx/opengl/openglgfx.h"
+#include "sword25/gfx/opengl/glimage.h"
 
 #define BS_LOG_PREFIX "GLIMAGE"
 
diff --git a/engines/sword25/gfx/opengl/glimage.h b/engines/sword25/gfx/opengl/glimage.h
index d9c81dc4a5..8a910c6b5f 100755
--- a/engines/sword25/gfx/opengl/glimage.h
+++ b/engines/sword25/gfx/opengl/glimage.h
@@ -17,16 +17,16 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_GL_IMAGE_H
-#define BS_GL_IMAGE_H
+#ifndef SWORD25_GL_IMAGE_H
+#define SWORD25_GL_IMAGE_H
 
 // -----------------------------------------------------------------------------
 // INCLUDES
 // -----------------------------------------------------------------------------
 
-#include "kernel/common.h"
-#include "gfx/image/image.h"
-#include "gfx/graphicengine.h"
+#include "sword25/kernel/common.h"
+#include "sword25/gfx/image/image.h"
+#include "sword25/gfx/graphicengine.h"
 
 #include <vector>
 
diff --git a/engines/sword25/gfx/opengl/glvectorimageblit.cpp b/engines/sword25/gfx/opengl/glvectorimageblit.cpp
index 38cfd9fa85..330da47dac 100755
--- a/engines/sword25/gfx/opengl/glvectorimageblit.cpp
+++ b/engines/sword25/gfx/opengl/glvectorimageblit.cpp
@@ -21,9 +21,9 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "gfx/image/vectorimage.h"
-#include "gfx/image/vectorimagerenderer.h"
-#include "util/glsprites/glsprites.h"
+#include "sword25/gfx/image/vectorimage.h"
+#include "sword25/gfx/image/vectorimagerenderer.h"
+#include "sword25/util/glsprites/glsprites.h"
 
 #include <vector>
 using namespace std;
diff --git a/engines/sword25/gfx/opengl/openglgfx.cpp b/engines/sword25/gfx/opengl/openglgfx.cpp
index 6131a229a5..38b1136aa1 100755
--- a/engines/sword25/gfx/opengl/openglgfx.cpp
+++ b/engines/sword25/gfx/opengl/openglgfx.cpp
@@ -25,20 +25,20 @@
 #include <windows.h>
 #include <GL/GL.h>
 
-#include "util/glsprites/glsprites.h"
-#include "../bitmapresource.h"
-#include "../animationresource.h"
-#include "../fontresource.h"
-#include "../panel.h"
-#include "../renderobjectmanager.h"
-#include "../image/vectorimage.h"
-#include "package/packagemanager.h"
-#include "kernel/inputpersistenceblock.h"
-#include "kernel/outputpersistenceblock.h"
-
-#include "openglgfx.h"
-#include "glimage.h"
-#include "swimage.h"
+#include "sword25/util/glsprites/glsprites.h"
+#include "sword25/gfx/bitmapresource.h"
+#include "sword25/gfx/animationresource.h"
+#include "sword25/gfx/fontresource.h"
+#include "sword25/gfx/panel.h"
+#include "sword25/gfx/renderobjectmanager.h"
+#include "sword25/gfx/image/vectorimage.h"
+#include "sword25/package/packagemanager.h"
+#include "sword25/kernel/inputpersistenceblock.h"
+#include "sword25/kernel/outputpersistenceblock.h"
+
+#include "sword25/gfx/opengl/openglgfx.h"
+#include "sword25/gfx/opengl/glimage.h"
+#include "sword25/gfx/opengl/swimage.h"
 
 #include <algorithm>
 
diff --git a/engines/sword25/gfx/opengl/openglgfx.h b/engines/sword25/gfx/opengl/openglgfx.h
index ec305bee8f..37d10000e9 100755
--- a/engines/sword25/gfx/opengl/openglgfx.h
+++ b/engines/sword25/gfx/opengl/openglgfx.h
@@ -17,22 +17,22 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_OPENGLGFX_H
-#define BS_OPENGLGFX_H
+#ifndef SWORD25_OPENGLGFX_H
+#define SWORD25_OPENGLGFX_H
 
 // -----------------------------------------------------------------------------
 // INCLUDES
 // -----------------------------------------------------------------------------
 
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
 #include <memory>
 #include <vector>
-#include "kernel/memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
 
-#include "kernel/common.h"
-#include "../graphicengine.h"
-#include "../renderobjectptr.h"
-#include "util/glsprites/glsprites.h"
+#include "sword25/kernel/common.h"
+#include "sword25/gfx/graphicengine.h"
+#include "sword25/gfx/renderobjectptr.h"
+#include "sword25/util/glsprites/glsprites.h"
 
 // -----------------------------------------------------------------------------
 // FORWARD DECLARATIONS
diff --git a/engines/sword25/gfx/opengl/swimage.cpp b/engines/sword25/gfx/opengl/swimage.cpp
index 7bc36b5f69..2fee1d0588 100755
--- a/engines/sword25/gfx/opengl/swimage.cpp
+++ b/engines/sword25/gfx/opengl/swimage.cpp
@@ -21,10 +21,10 @@
 // INCLUDES
 // -----------------------------------------------------------------------------
 
-#include "package/packagemanager.h"
-#include "gfx/image/imageloader.h"
+#include "sword25/package/packagemanager.h"
+#include "sword25/gfx/image/imageloader.h"
 
-#include "swimage.h"
+#include "sword25/gfx/opengl/swimage.h"
 
 #define BS_LOG_PREFIX "SWIMAGE"
 
diff --git a/engines/sword25/gfx/opengl/swimage.h b/engines/sword25/gfx/opengl/swimage.h
index 1f48c238b3..c8bf363bd6 100755
--- a/engines/sword25/gfx/opengl/swimage.h
+++ b/engines/sword25/gfx/opengl/swimage.h
@@ -17,16 +17,16 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_SWIMAGE_H
-#define BS_SWIMAGE_H
+#ifndef SWORD25_SWIMAGE_H
+#define SWORD25_SWIMAGE_H
 
 // -----------------------------------------------------------------------------
 // INCLUDES
 // -----------------------------------------------------------------------------
 
-#include "kernel/common.h"
-#include "gfx/image/image.h"
-#include "gfx/graphicengine.h"
+#include "sword25/kernel/common.h"
+#include "sword25/gfx/image/image.h"
+#include "sword25/gfx/graphicengine.h"
 
 
 // -----------------------------------------------------------------------------
diff --git a/engines/sword25/gfx/panel.cpp b/engines/sword25/gfx/panel.cpp
index 715f306305..a9deea76ea 100755
--- a/engines/sword25/gfx/panel.cpp
+++ b/engines/sword25/gfx/panel.cpp
@@ -21,12 +21,12 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "panel.h"
+#include "sword25/gfx/panel.h"
 
-#include "kernel/inputpersistenceblock.h"
-#include "kernel/outputpersistenceblock.h"
-#include "graphicengine.h"
-#include "image/image.h"
+#include "sword25/kernel/inputpersistenceblock.h"
+#include "sword25/kernel/outputpersistenceblock.h"
+#include "sword25/gfx/graphicengine.h"
+#include "sword25/image/image.h"
 
 // -----------------------------------------------------------------------------
 
diff --git a/engines/sword25/gfx/panel.h b/engines/sword25/gfx/panel.h
index 50e3df1f29..b38a8905a2 100755
--- a/engines/sword25/gfx/panel.h
+++ b/engines/sword25/gfx/panel.h
@@ -17,15 +17,15 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_PANEL_H
-#define BS_PANEL_H
+#ifndef SWORD25_PANEL_H
+#define SWORD25_PANEL_H
 
 // -----------------------------------------------------------------------------
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/common.h"
-#include "renderobject.h"
+#include "sword25/kernel/common.h"
+#include "sword25/gfx/renderobject.h"
 
 // -----------------------------------------------------------------------------
 // Class Definition
diff --git a/engines/sword25/gfx/renderobject.cpp b/engines/sword25/gfx/renderobject.cpp
index 427038e477..b86ac15c9e 100755
--- a/engines/sword25/gfx/renderobject.cpp
+++ b/engines/sword25/gfx/renderobject.cpp
@@ -17,24 +17,24 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#include "renderobject.h"
+#include "sword25/gfx/renderobject.h"
 
 #include <algorithm>
 
-#include "kernel/outputpersistenceblock.h"
-#include "kernel/inputpersistenceblock.h"
+#include "sword25/kernel/outputpersistenceblock.h"
+#include "sword25/kernel/inputpersistenceblock.h"
 
-#include "renderobjectregistry.h"
-#include "renderobjectmanager.h"
-#include "graphicengine.h"
+#include "sword25/gfx/renderobjectregistry.h"
+#include "sword25/gfx/renderobjectmanager.h"
+#include "sword25/gfx/graphicengine.h"
 
-#include "bitmap.h"
-#include "staticbitmap.h"
-#include "dynamicbitmap.h"
-#include "animation.h"
-#include "panel.h"
-#include "text.h"
-#include "animationtemplate.h"
+#include "sword25/gfx/bitmap.h"
+#include "sword25/gfx/staticbitmap.h"
+#include "sword25/gfx/dynamicbitmap.h"
+#include "sword25/gfx/animation.h"
+#include "sword25/gfx/panel.h"
+#include "sword25/gfx/text.h"
+#include "sword25/gfx/animationtemplate.h"
 
 #define BS_LOG_PREFIX "RENDEROBJECT"
 
diff --git a/engines/sword25/gfx/renderobject.h b/engines/sword25/gfx/renderobject.h
index c0fd6f3afc..8de9a88a05 100755
--- a/engines/sword25/gfx/renderobject.h
+++ b/engines/sword25/gfx/renderobject.h
@@ -27,18 +27,18 @@
 	Autor: Malte Thiesen
 */
 
-#ifndef _BS_RENDEROBJECT_H
-#define _BS_RENDEROBJECT_H
+#ifndef SWORD25_RENDEROBJECT_H
+#define SWORD25_RENDEROBJECT_H
 
 // Includes
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
 #include <vector>
-#include "kernel/memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
 
-#include "kernel/common.h"
-#include "kernel/persistable.h"
-#include "math/rect.h"
-#include "renderobjectptr.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/persistable.h"
+#include "sword25/math/rect.h"
+#include "sword25/gfx/renderobjectptr.h"
 
 // -----------------------------------------------------------------------------
 // Forward Declarations
diff --git a/engines/sword25/gfx/renderobjectmanager.cpp b/engines/sword25/gfx/renderobjectmanager.cpp
index af9e97afb6..3ed6968c6b 100755
--- a/engines/sword25/gfx/renderobjectmanager.cpp
+++ b/engines/sword25/gfx/renderobjectmanager.cpp
@@ -21,17 +21,17 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "renderobjectmanager.h"
-
-#include "kernel/kernel.h"
-#include "kernel/inputpersistenceblock.h"
-#include "kernel/outputpersistenceblock.h"
-#include "gfx/graphicengine.h"
-#include "gfx/animationtemplateregistry.h"
-#include "math/rect.h"
-#include "renderobject.h"
-#include "timedrenderobject.h"
-#include "rootrenderobject.h"
+#include "sword25/gfx/renderobjectmanager.h"
+
+#include "sword25/kernel/kernel.h"
+#include "sword25/kernel/inputpersistenceblock.h"
+#include "sword25/kernel/outputpersistenceblock.h"
+#include "sword25/gfx/graphicengine.h"
+#include "sword25/gfx/animationtemplateregistry.h"
+#include "sword25/math/rect.h"
+#include "sword25/gfx/renderobject.h"
+#include "sword25/gfx/timedrenderobject.h"
+#include "sword25/gfx/rootrenderobject.h"
 
 #define BS_LOG_PREFIX "RENDEROBJECTMANAGER"
 
diff --git a/engines/sword25/gfx/renderobjectmanager.h b/engines/sword25/gfx/renderobjectmanager.h
index 6a46cfa9e9..b7b15adf20 100755
--- a/engines/sword25/gfx/renderobjectmanager.h
+++ b/engines/sword25/gfx/renderobjectmanager.h
@@ -27,17 +27,17 @@
 	Autor: Malte Thiesen
 */
 
-#ifndef _BS_RENDEROBJECTMANAGER_H
-#define _BS_RENDEROBJECTMANAGER_H
+#ifndef SWORD25_RENDEROBJECTMANAGER_H
+#define SWORD25_RENDEROBJECTMANAGER_H
 
 // Includes
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
 #include <vector>
-#include "kernel/memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
 
-#include "kernel/common.h"
-#include "renderobjectptr.h"
-#include "kernel/persistable.h"
+#include "sword25/kernel/common.h"
+#include "sword25/renderobjectptr.h"
+#include "sword25/kernel/persistable.h"
 
 // Klassendefinition
 class BS_Kernel;
diff --git a/engines/sword25/gfx/renderobjectptr.h b/engines/sword25/gfx/renderobjectptr.h
index bc2d00caac..a7ec5e86b0 100755
--- a/engines/sword25/gfx/renderobjectptr.h
+++ b/engines/sword25/gfx/renderobjectptr.h
@@ -17,15 +17,15 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_RENDER_OBJECT_PTR_H
-#define BS_RENDER_OBJECT_PTR_H
+#ifndef SWORD25_RENDER_OBJECT_PTR_H
+#define SWORD25_RENDER_OBJECT_PTR_H
 
 // -----------------------------------------------------------------------------
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/common.h"
-#include "renderobjectregistry.h"
+#include "sword25/kernel/common.h"
+#include "sword25/gfx/renderobjectregistry.h"
 
 // -----------------------------------------------------------------------------
 // Forward Declarations
diff --git a/engines/sword25/gfx/renderobjectregistry.cpp b/engines/sword25/gfx/renderobjectregistry.cpp
index bf96436eee..cc90ba2cb2 100755
--- a/engines/sword25/gfx/renderobjectregistry.cpp
+++ b/engines/sword25/gfx/renderobjectregistry.cpp
@@ -27,7 +27,7 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "renderobjectregistry.h"
+#include "sword25/gfx/renderobjectregistry.h"
 
 // -----------------------------------------------------------------------------
 // Implementation
diff --git a/engines/sword25/gfx/renderobjectregistry.h b/engines/sword25/gfx/renderobjectregistry.h
index 96df59ebe1..ead50dc665 100755
--- a/engines/sword25/gfx/renderobjectregistry.h
+++ b/engines/sword25/gfx/renderobjectregistry.h
@@ -17,19 +17,19 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_RENDEROBJECTREGISTRY_H
-#define BS_RENDEROBJECTREGISTRY_H
+#ifndef SWORD25_RENDEROBJECTREGISTRY_H
+#define SWORD25_RENDEROBJECTREGISTRY_H
 
 // -----------------------------------------------------------------------------
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/common.h"
-#include "kernel/objectregistry.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/objectregistry.h"
 
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
 #include <memory>
-#include "kernel/memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
 
 // -----------------------------------------------------------------------------
 // Forward Deklarationen
diff --git a/engines/sword25/gfx/rootrenderobject.h b/engines/sword25/gfx/rootrenderobject.h
index 8d92cb7a70..460ba148d4 100755
--- a/engines/sword25/gfx/rootrenderobject.h
+++ b/engines/sword25/gfx/rootrenderobject.h
@@ -17,12 +17,12 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_ROOTRENDEROBJECT_H
-#define BS_ROOTRENDEROBJECT_H
+#ifndef SWORD25_ROOTRENDEROBJECT_H
+#define SWORD25_ROOTRENDEROBJECT_H
 
 // Includes
-#include "kernel/common.h"
-#include "renderobject.h"
+#include "sword25/kernel/common.h"
+#include "sword25/gfx/renderobject.h"
 
 // -----------------------------------------------------------------------------
 // Forward Declarations
diff --git a/engines/sword25/gfx/screenshot.cpp b/engines/sword25/gfx/screenshot.cpp
index 82ba4a9374..75e86d0105 100755
--- a/engines/sword25/gfx/screenshot.cpp
+++ b/engines/sword25/gfx/screenshot.cpp
@@ -23,8 +23,8 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "screenshot.h"
-#include "util/libpng/png.h"
+#include "sword25/gfx/screenshot.h"
+#include <png.h>
 
 using namespace std;
 
diff --git a/engines/sword25/gfx/screenshot.h b/engines/sword25/gfx/screenshot.h
index 453579cb53..7b981a11dd 100755
--- a/engines/sword25/gfx/screenshot.h
+++ b/engines/sword25/gfx/screenshot.h
@@ -17,18 +17,18 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef	BS_SCREENSHOT_H
-#define BS_SCREENSHOT_H
+#ifndef	SWORD25_SCREENSHOT_H
+#define SWORD25_SCREENSHOT_H
 
 // -----------------------------------------------------------------------------
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/common.h"
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/memlog_off.h"
 #include <string>
 #include <vector>
-#include "kernel/memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
 
 // -----------------------------------------------------------------------------
 // Class declaration
diff --git a/engines/sword25/gfx/staticbitmap.cpp b/engines/sword25/gfx/staticbitmap.cpp
index 34d89107f1..c6cc45cc8b 100755
--- a/engines/sword25/gfx/staticbitmap.cpp
+++ b/engines/sword25/gfx/staticbitmap.cpp
@@ -21,11 +21,11 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "staticbitmap.h"
-#include "bitmapresource.h"
-#include "package/packagemanager.h"
-#include "kernel/outputpersistenceblock.h"
-#include "kernel/inputpersistenceblock.h"
+#include "sword25/gfx/staticbitmap.h"
+#include "sword25/gfx/bitmapresource.h"
+#include "sword25/package/packagemanager.h"
+#include "sword25/kernel/outputpersistenceblock.h"
+#include "sword25/kernel/inputpersistenceblock.h"
 
 // -----------------------------------------------------------------------------
 // Logging
diff --git a/engines/sword25/gfx/staticbitmap.h b/engines/sword25/gfx/staticbitmap.h
index bdf99e8ce0..728100ce30 100755
--- a/engines/sword25/gfx/staticbitmap.h
+++ b/engines/sword25/gfx/staticbitmap.h
@@ -17,15 +17,15 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_STATIC_BITMAP_H
-#define BS_STATIC_BITMAP_H
+#ifndef SWORD25_STATIC_BITMAP_H
+#define SWORD25_STATIC_BITMAP_H
 
 // -----------------------------------------------------------------------------
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/common.h"
-#include "bitmap.h"
+#include "sword25/kernel/common.h"
+#include "sword25/gfx/bitmap.h"
 
 // -----------------------------------------------------------------------------
 // Klassendeklaration
diff --git a/engines/sword25/gfx/text.cpp b/engines/sword25/gfx/text.cpp
index c51d728cc4..1143f6bda8 100755
--- a/engines/sword25/gfx/text.cpp
+++ b/engines/sword25/gfx/text.cpp
@@ -27,13 +27,13 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/kernel.h"
-#include "kernel/outputpersistenceblock.h"
-#include "kernel/inputpersistenceblock.h"
-#include "fontresource.h"
-#include "bitmapresource.h"
+#include "sword25/kernel/kernel.h"
+#include "sword25/kernel/outputpersistenceblock.h"
+#include "sword25/kernel/inputpersistenceblock.h"
+#include "sword25/gfx/fontresource.h"
+#include "sword25/gfx/bitmapresource.h"
 
-#include "text.h"
+#include "sword25/gfx/text.h"
 
 
 // -----------------------------------------------------------------------------
diff --git a/engines/sword25/gfx/text.h b/engines/sword25/gfx/text.h
index 5b0fefe7d7..238b15fdd7 100755
--- a/engines/sword25/gfx/text.h
+++ b/engines/sword25/gfx/text.h
@@ -17,20 +17,20 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_TEXT_H
-#define BS_TEXT_H
+#ifndef SWORD25_TEXT_H
+#define SWORD25_TEXT_H
 
 // -----------------------------------------------------------------------------
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/common.h"
-#include "math/rect.h"
-#include "renderobject.h"
+#include "sword25/kernel/common.h"
+#include "sword25/math/rect.h"
+#include "sword25/gfx/renderobject.h"
 
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
 #include <vector>
-#include "kernel/memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
 
 // -----------------------------------------------------------------------------
 // Forward Declarations
diff --git a/engines/sword25/gfx/timedrenderobject.cpp b/engines/sword25/gfx/timedrenderobject.cpp
index aecf1038e6..53ddb45c4c 100755
--- a/engines/sword25/gfx/timedrenderobject.cpp
+++ b/engines/sword25/gfx/timedrenderobject.cpp
@@ -17,9 +17,9 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#include "timedrenderobject.h"
+#include "sword25/gfx/timedrenderobject.h"
 
-#include "renderobjectmanager.h"
+#include "sword25/gfx/renderobjectmanager.h"
 
 // -----------------------------------------------------------------------------
 // Konstruktion / Destruktion
diff --git a/engines/sword25/gfx/timedrenderobject.h b/engines/sword25/gfx/timedrenderobject.h
index 61a9709a94..a14a704867 100755
--- a/engines/sword25/gfx/timedrenderobject.h
+++ b/engines/sword25/gfx/timedrenderobject.h
@@ -25,8 +25,8 @@
 // Engine Includes
 // -----------------------------------------------------------------------------
 
-#include "../kernel/common.h"
-#include "renderobject.h"
+#include "sword25/kernel/common.h"
+#include "sword25/gfx/renderobject.h"
 
 // -----------------------------------------------------------------------------
 // Forward Declarations
diff --git a/engines/sword25/kernel/bs_stdint.h b/engines/sword25/kernel/bs_stdint.h
index 5334c3051c..aded9f0e04 100755
--- a/engines/sword25/kernel/bs_stdint.h
+++ b/engines/sword25/kernel/bs_stdint.h
@@ -1,5 +1,5 @@
-#ifndef BS_STDINT_H
-#define BS_STDINT_H
+#ifndef SWORD25_STDINT_H
+#define SWORD25_STDINT_H
 
 #ifdef _MSC_VER
 	typedef unsigned __int8	 uint8_t;
diff --git a/engines/sword25/kernel/callbackregistry.cpp b/engines/sword25/kernel/callbackregistry.cpp
index abdf2bd704..5badbe27ad 100755
--- a/engines/sword25/kernel/callbackregistry.cpp
+++ b/engines/sword25/kernel/callbackregistry.cpp
@@ -39,7 +39,7 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "callbackregistry.h"
+#include "sword25/kernel/callbackregistry.h"
 
 // -----------------------------------------------------------------------------
 
diff --git a/engines/sword25/kernel/callbackregistry.h b/engines/sword25/kernel/callbackregistry.h
index 68d2e85b80..2743829a8c 100755
--- a/engines/sword25/kernel/callbackregistry.h
+++ b/engines/sword25/kernel/callbackregistry.h
@@ -17,18 +17,18 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_CALLBACK_REGISTRY_H
-#define BS_CALLBACK_REGISTRY_H
+#ifndef SWORD25_CALLBACK_REGISTRY_H
+#define SWORD25_CALLBACK_REGISTRY_H
 
 // -----------------------------------------------------------------------------
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/common.h"
+#include "sword25/kernel/common.h"
 
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
 #include <map>
-#include "kernel/memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
 
 // -----------------------------------------------------------------------------
 // Klassendeklaration
diff --git a/engines/sword25/kernel/common.h b/engines/sword25/kernel/common.h
index 72143a310e..8f212524fe 100755
--- a/engines/sword25/kernel/common.h
+++ b/engines/sword25/kernel/common.h
@@ -27,8 +27,8 @@
 	Autor: Malte Thiesen
 */
 
-#ifndef BS_COMMON_H
-#define BS_COMMON_H
+#ifndef SWORD25_COMMON_H
+#define SWORD25_COMMON_H
 
 // Globale Konstanten
 #if _DEBUG && !DEBUG
diff --git a/engines/sword25/kernel/filesystemutil_win32.cpp b/engines/sword25/kernel/filesystemutil_win32.cpp
index 2b4ce49f3d..c1f8eed74d 100755
--- a/engines/sword25/kernel/filesystemutil_win32.cpp
+++ b/engines/sword25/kernel/filesystemutil_win32.cpp
@@ -21,7 +21,7 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "filesystemutil.h"
+#include "sword25/kernel/filesystemutil.h"
 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
 #include <ShlObj.h>
diff --git a/engines/sword25/kernel/hashmap.h b/engines/sword25/kernel/hashmap.h
index 0aa663332c..97698508ba 100755
--- a/engines/sword25/kernel/hashmap.h
+++ b/engines/sword25/kernel/hashmap.h
@@ -17,11 +17,11 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_HASHMAP_H
-#define BS_HASHMAP_H
+#ifndef SWORD25_HASHMAP_H
+#define SWORD25_HASHMAP_H
 
 // stdext::hash_map wird erst seit VC7 untersützt, bei älteren Microsoft-Compilern wird auf std::map zurückgegriffen
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
 #if _MSC_VER >= 1300
 #include <hash_map>
 #define BS_Hashmap stdext::hash_map
@@ -29,6 +29,6 @@
 #include <map>
 #define BS_Hashmap std::map
 #endif
-#include "kernel/memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
 
 #endif
diff --git a/engines/sword25/kernel/inputpersistenceblock.cpp b/engines/sword25/kernel/inputpersistenceblock.cpp
index dd0e6437c3..adf11c6009 100755
--- a/engines/sword25/kernel/inputpersistenceblock.cpp
+++ b/engines/sword25/kernel/inputpersistenceblock.cpp
@@ -23,7 +23,7 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "inputpersistenceblock.h"
+#include "sword25/kernel/inputpersistenceblock.h"
 
 using namespace std;
 
diff --git a/engines/sword25/kernel/inputpersistenceblock.h b/engines/sword25/kernel/inputpersistenceblock.h
index 3a1335943b..ad2eb0cdc4 100755
--- a/engines/sword25/kernel/inputpersistenceblock.h
+++ b/engines/sword25/kernel/inputpersistenceblock.h
@@ -17,18 +17,18 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef	BS_INPUTPERSISTENCEBLOCK_H
-#define BS_INPUTPERSISTENCEBLOCK_H
+#ifndef	SWORD25_INPUTPERSISTENCEBLOCK_H
+#define SWORD25_INPUTPERSISTENCEBLOCK_H
 
 // -----------------------------------------------------------------------------
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/common.h"
-#include "kernel/persistenceblock.h"
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/persistenceblock.h"
+#include "sword25/kernel/memlog_off.h"
 #include <vector>
-#include "kernel/memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
 
 
 // -----------------------------------------------------------------------------
diff --git a/engines/sword25/kernel/kernel.cpp b/engines/sword25/kernel/kernel.cpp
index 123a19b13c..9a0580324f 100755
--- a/engines/sword25/kernel/kernel.cpp
+++ b/engines/sword25/kernel/kernel.cpp
@@ -26,17 +26,17 @@
 #include <math.h>
 #include <algorithm>
 
-#include "kernel.h"
-#include "timer.h"
-#include "service_ids.h"
-
-#include "gfx/graphicengine.h"
-#include "sfx/soundengine.h"
-#include "input/inputengine.h"
-#include "package/packagemanager.h"
-#include "script/script.h"
-#include "fmv/movieplayer.h"
-#include "persistenceservice.h"
+#include "sword25/kernel/kernel.h"
+#include "sword25/kernel/timer.h"
+#include "sword25/kernel/service_ids.h"
+
+#include "sword25/gfx/graphicengine.h"
+#include "sword25/sfx/soundengine.h"
+#include "sword25/input/inputengine.h"
+#include "sword25/package/packagemanager.h"
+#include "sword25/script/script.h"
+#include "sword25/fmv/movieplayer.h"
+#include "sword25/kernel/persistenceservice.h"
 
 #define BS_LOG_PREFIX "KERNEL"
 
diff --git a/engines/sword25/kernel/kernel_script.cpp b/engines/sword25/kernel/kernel_script.cpp
index 4436e05e55..151cb2786f 100755
--- a/engines/sword25/kernel/kernel_script.cpp
+++ b/engines/sword25/kernel/kernel_script.cpp
@@ -21,16 +21,16 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "common.h"
-#include "kernel.h"
-#include "filesystemutil.h"
-#include "window.h"
-#include "resmanager.h"
-#include "persistenceservice.h"
-#include "wincodegenerator.h"
-#include "debug/debugtools.h"
-#include "script/script.h"
-#include "script/luabindhelper.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/kernel.h"
+#include "sword25/kernel/filesystemutil.h"
+#include "sword25/kernel/window.h"
+#include "sword25/kernel/resmanager.h"
+#include "sword25/kernel/persistenceservice.h"
+#include "sword25/kernel/wincodegenerator.h"
+#include "sword25/debug/debugtools.h"
+#include "sword25/script/script.h"
+#include "sword25/script/luabindhelper.h"
 
 // -----------------------------------------------------------------------------
 
diff --git a/engines/sword25/kernel/log.cpp b/engines/sword25/kernel/log.cpp
index bf1d5147b1..02bc7a8475 100755
--- a/engines/sword25/kernel/log.cpp
+++ b/engines/sword25/kernel/log.cpp
@@ -21,9 +21,9 @@
 #include <stdarg.h>
 #include <string>
 
-#include "filesystemutil.h"
-#include "log.h"
-#include "debug/debugtools.h"
+#include "sword25/kernel/filesystemutil.h"
+#include "sword25/kernel/log.h"
+#include "sword25/debug/debugtools.h"
 
 // Konstanten
 static const char*	BF_LOG_FILENAME = "log.txt";
diff --git a/engines/sword25/kernel/log.h b/engines/sword25/kernel/log.h
index 867b19d70e..8e89ccc823 100755
--- a/engines/sword25/kernel/log.h
+++ b/engines/sword25/kernel/log.h
@@ -17,18 +17,18 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_LOG_H
-#define BS_LOG_H
+#ifndef SWORD25_LOG_H
+#define SWORD25_LOG_H
 
 // Includes
-#include "memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
 #include <stdio.h>
 #include <vector>
 #include <string>
 #include <algorithm>
-#include "memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
 
-#include "common.h"
+#include "sword25/kernel/common.h"
 
 // Logging soll nur stattfinden wenn es aktiviert ist
 #ifdef BS_ACTIVATE_LOGGING
diff --git a/engines/sword25/kernel/md5.cpp b/engines/sword25/kernel/md5.cpp
index a336f3ab61..806c4492c1 100755
--- a/engines/sword25/kernel/md5.cpp
+++ b/engines/sword25/kernel/md5.cpp
@@ -41,7 +41,7 @@
 // L. Peter Deutsch
 // ghost@aladdin.com
 
-#include "md5.h"
+#include "sword25/kernel/md5.h"
 
 #undef BYTE_ORDER	/* 1 = big-endian, -1 = little-endian, 0 = unknown */
 #ifdef ARCH_IS_BIG_ENDIAN
diff --git a/engines/sword25/kernel/md5.h b/engines/sword25/kernel/md5.h
index d2ac60afc8..a1bb9fc1b8 100755
--- a/engines/sword25/kernel/md5.h
+++ b/engines/sword25/kernel/md5.h
@@ -17,15 +17,15 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_MD5_H
-#define BS_MD5_H
+#ifndef SWORD25_MD5_H
+#define SWORD25_MD5_H
 
 // -----------------------------------------------------------------------------
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/common.h"
-#include "kernel/bs_stdint.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/bs_stdint.h"
 
 // -----------------------------------------------------------------------------
 // Klassendefinition
diff --git a/engines/sword25/kernel/memleaks.cpp b/engines/sword25/kernel/memleaks.cpp
index 646465f5b2..151eb1d703 100755
--- a/engines/sword25/kernel/memleaks.cpp
+++ b/engines/sword25/kernel/memleaks.cpp
@@ -28,9 +28,9 @@
 // #pragma warning (disable : 4074)
 // #pragma init_seg(compiler)
 
-#include "filesystemutil.h"
+#include "sword25/kernel/filesystemutil.h"
 
-#include "memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
 #include <vector>
 #include <algorithm>
 #include <string>
diff --git a/engines/sword25/kernel/memleaks.h b/engines/sword25/kernel/memleaks.h
index c4193e3b74..91d4822e51 100755
--- a/engines/sword25/kernel/memleaks.h
+++ b/engines/sword25/kernel/memleaks.h
@@ -17,8 +17,8 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BF_MEMLEAKS_H
-#define BF_MEMLEAKS_H
+#ifndef SWORD25_MEMLEAKS_H
+#define SWORD25_MEMLEAKS_H
 
 #ifdef BS_MEMLOG
 
@@ -26,7 +26,7 @@
 #pragma warning(disable : 4291)
 #endif
 
-#include "memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
 
 #include <malloc.h>
 
diff --git a/engines/sword25/kernel/objectregistry.h b/engines/sword25/kernel/objectregistry.h
index e1c80c8b36..5e5bd6e305 100755
--- a/engines/sword25/kernel/objectregistry.h
+++ b/engines/sword25/kernel/objectregistry.h
@@ -17,15 +17,15 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_OBJECTREGISTRY_H
-#define BS_OBJECTREGISTRY_H
+#ifndef SWORD25_OBJECTREGISTRY_H
+#define SWORD25_OBJECTREGISTRY_H
 
 // -----------------------------------------------------------------------------
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/common.h"
-#include "kernel/hashmap.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/hashmap.h"
 
 // -----------------------------------------------------------------------------
 // Klassendeklaration
diff --git a/engines/sword25/kernel/outputpersistenceblock.cpp b/engines/sword25/kernel/outputpersistenceblock.cpp
index 37410caaec..f0358300da 100755
--- a/engines/sword25/kernel/outputpersistenceblock.cpp
+++ b/engines/sword25/kernel/outputpersistenceblock.cpp
@@ -23,7 +23,7 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "outputpersistenceblock.h"
+#include "sword25/kernel/outputpersistenceblock.h"
 
 // -----------------------------------------------------------------------------
 // Constants
diff --git a/engines/sword25/kernel/outputpersistenceblock.h b/engines/sword25/kernel/outputpersistenceblock.h
index 1f730769b8..8710f31f0f 100755
--- a/engines/sword25/kernel/outputpersistenceblock.h
+++ b/engines/sword25/kernel/outputpersistenceblock.h
@@ -17,18 +17,18 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef	BS_OUTPUTPERSISTENCEBLOCK_H
-#define BS_OUTPUTPERSISTENCEBLOCK_H
+#ifndef	SWORD25_OUTPUTPERSISTENCEBLOCK_H
+#define SWORD25_OUTPUTPERSISTENCEBLOCK_H
 
 // -----------------------------------------------------------------------------
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/common.h"
-#include "kernel/persistenceblock.h"
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/persistenceblock.h"
+#include "sword25/kernel/memlog_off.h"
 #include <vector>
-#include "kernel/memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
 
 
 // -----------------------------------------------------------------------------
diff --git a/engines/sword25/kernel/persistable.h b/engines/sword25/kernel/persistable.h
index b1b8bd2c12..5f126446d0 100755
--- a/engines/sword25/kernel/persistable.h
+++ b/engines/sword25/kernel/persistable.h
@@ -17,8 +17,8 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_PERSISTABLE_H
-#define BS_PERSISTABLE_H
+#ifndef SWORD25_PERSISTABLE_H
+#define SWORD25_PERSISTABLE_H
 
 class BS_OutputPersistenceBlock;
 class BS_InputPersistenceBlock;
diff --git a/engines/sword25/kernel/persistenceblock.h b/engines/sword25/kernel/persistenceblock.h
index 4dda4388b7..1a8547f49c 100755
--- a/engines/sword25/kernel/persistenceblock.h
+++ b/engines/sword25/kernel/persistenceblock.h
@@ -17,14 +17,14 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef	BS_PERSISTENCEBLOCK_H
-#define BS_PERSISTENCEBLOCK_H
+#ifndef	SWORD25_PERSISTENCEBLOCK_H
+#define SWORD25_PERSISTENCEBLOCK_H
 
 // -----------------------------------------------------------------------------
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/common.h"
+#include "sword25/kernel/common.h"
 
 
 // -----------------------------------------------------------------------------
diff --git a/engines/sword25/kernel/persistenceservice.cpp b/engines/sword25/kernel/persistenceservice.cpp
index 51491a6c2b..e241e7f28c 100755
--- a/engines/sword25/kernel/persistenceservice.cpp
+++ b/engines/sword25/kernel/persistenceservice.cpp
@@ -21,25 +21,25 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel.h"
-#include "persistenceservice.h"
-#include "inputpersistenceblock.h"
-#include "outputpersistenceblock.h"
-#include "filesystemutil.h"
-#include "gfx/graphicengine.h"
-#include "sfx/soundengine.h"
-#include "input/inputengine.h"
-#include "math/regionregistry.h"
-#include "script/script.h"
-#include "debug/debugtools.h"
-#include "util/zlib/zlib.h"
-
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/kernel.h"
+#include "sword25/kernel/persistenceservice.h"
+#include "sword25/kernel/inputpersistenceblock.h"
+#include "sword25/kernel/outputpersistenceblock.h"
+#include "sword25/kernel/filesystemutil.h"
+#include "sword25/gfx/graphicengine.h"
+#include "sword25/sfx/soundengine.h"
+#include "sword25/input/inputengine.h"
+#include "sword25/math/regionregistry.h"
+#include "sword25/script/script.h"
+#include "sword25/debug/debugtools.h"
+#include "sword25/util/zlib/zlib.h"
+
+#include "sword25/kernel/memlog_off.h"
 #include <sstream>
 #include <fstream>
 #include <algorithm>
 #include <locale>
-#include "kernel/memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
 
 using namespace std;
 
diff --git a/engines/sword25/kernel/persistenceservice.h b/engines/sword25/kernel/persistenceservice.h
index 2693f4cc2e..e707d91f94 100755
--- a/engines/sword25/kernel/persistenceservice.h
+++ b/engines/sword25/kernel/persistenceservice.h
@@ -17,18 +17,18 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef	BS_PERSISTENCESERVICE_H
-#define BS_PERSISTENCESERVICE_H
+#ifndef	SWORD25_PERSISTENCESERVICE_H
+#define SWORD25_PERSISTENCESERVICE_H
 
 // -----------------------------------------------------------------------------
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/common.h"
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/memlog_off.h"
 #include <string>
 #include <vector>
-#include "kernel/memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
 
 // -----------------------------------------------------------------------------
 // Class declaration
diff --git a/engines/sword25/kernel/resmanager.cpp b/engines/sword25/kernel/resmanager.cpp
index 2e7ab87af0..99b28e19e5 100755
--- a/engines/sword25/kernel/resmanager.cpp
+++ b/engines/sword25/kernel/resmanager.cpp
@@ -17,12 +17,12 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#include "resmanager.h"
+#include "sword25/kernel/resmanager.h"
 
-#include "resource.h"
-#include "resservice.h"
-#include "string.h"
-#include "../package/packagemanager.h"
+#include "sword25/kernel/resource.h"
+#include "sword25/kernel/resservice.h"
+#include "sword25/kernel/string.h"
+#include "sword25/package/packagemanager.h"
 
 #define BS_LOG_PREFIX "RESOURCEMANAGER"
 
diff --git a/engines/sword25/kernel/resource.cpp b/engines/sword25/kernel/resource.cpp
index bfcd5a54b4..83f2c94a26 100755
--- a/engines/sword25/kernel/resource.cpp
+++ b/engines/sword25/kernel/resource.cpp
@@ -17,10 +17,10 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#include "resource.h"
-#include "string.h"
-#include "kernel.h"
-#include "package/packagemanager.h"
+#include "sword25/kernel/resource.h"
+#include "sword25/kernel/string.h"
+#include "sword25/kernel/kernel.h"
+#include "sword25/package/packagemanager.h"
 
 #define BS_LOG_PREFIX "RESOURCE"
 
diff --git a/engines/sword25/kernel/resource.h b/engines/sword25/kernel/resource.h
index 5d6c542b07..f4d85c733d 100755
--- a/engines/sword25/kernel/resource.h
+++ b/engines/sword25/kernel/resource.h
@@ -17,14 +17,14 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_RESOURCE_H
-#define BS_RESOURCE_H
+#ifndef SWORD25_RESOURCE_H
+#define SWORD25_RESOURCE_H
 
-#include "memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
 #include <list>
-#include "memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
 
-#include "common.h"
+#include "sword25/kernel/common.h"
 
 class BS_Kernel;
 class BS_ResourceManager;
diff --git a/engines/sword25/kernel/resservice.h b/engines/sword25/kernel/resservice.h
index d2369c0d87..ef95cfdce9 100755
--- a/engines/sword25/kernel/resservice.h
+++ b/engines/sword25/kernel/resservice.h
@@ -17,14 +17,14 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_RESOURCESERVICE_H
-#define BS_RESOURCESERVICE_H
+#ifndef SWORD25_RESOURCESERVICE_H
+#define SWORD25_RESOURCESERVICE_H
 
 // Includes
-#include "common.h"
-#include "service.h"
-#include "kernel.h"
-#include "resmanager.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/service.h"
+#include "sword25/kernel/kernel.h"
+#include "sword25/kernel/resmanager.h"
 
 class BS_Resource;
 
diff --git a/engines/sword25/kernel/service_ids.h b/engines/sword25/kernel/service_ids.h
index 38ba941f5e..77df745236 100755
--- a/engines/sword25/kernel/service_ids.h
+++ b/engines/sword25/kernel/service_ids.h
@@ -27,7 +27,7 @@
 	Autor: Malte Thiesen
 */
 
-#include "common.h"
+#include "sword25/kernel/common.h"
 
 BS_Service * BS_OpenGLGfx_CreateObject(BS_Kernel* pKernel);
 BS_Service * BS_PhysfsPackageManager_CreateObject(BS_Kernel* pKernel);
diff --git a/engines/sword25/kernel/string.h b/engines/sword25/kernel/string.h
index b6802d3075..fcd04805d4 100755
--- a/engines/sword25/kernel/string.h
+++ b/engines/sword25/kernel/string.h
@@ -17,12 +17,12 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_STRING
-#define BS_STRING
+#ifndef SWORD25_STRING
+#define SWORD25_STRING
 
-#include "memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
 #include <string>
-#include "memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
 
 namespace BS_String
 {
diff --git a/engines/sword25/kernel/timer.cpp b/engines/sword25/kernel/timer.cpp
index 22eb1200f3..ec5c21daad 100755
--- a/engines/sword25/kernel/timer.cpp
+++ b/engines/sword25/kernel/timer.cpp
@@ -20,7 +20,7 @@
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
-#include "timer.h"
+#include "sword25/kernel/timer.h"
 
 #define BS_LOG_PREFIX "BS_TIMER"
 
diff --git a/engines/sword25/kernel/timer.h b/engines/sword25/kernel/timer.h
index 52a7d70a83..136d91e762 100755
--- a/engines/sword25/kernel/timer.h
+++ b/engines/sword25/kernel/timer.h
@@ -25,12 +25,12 @@
 	Autor: Malte Thiesen
 */
 
-#ifndef BS_TIMER_H
-#define BS_TIMER_H
+#ifndef SWORD25_TIMER_H
+#define SWORD25_TIMER_H
 
 // Includes
-#include "common.h"
-#include "bs_stdint.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/bs_stdint.h"
 
 /**
 	@brief Eine Klasse zum Auslesen des Systemtimers.
diff --git a/engines/sword25/kernel/win32window.cpp b/engines/sword25/kernel/win32window.cpp
index b5c519f206..d90884147b 100755
--- a/engines/sword25/kernel/win32window.cpp
+++ b/engines/sword25/kernel/win32window.cpp
@@ -17,11 +17,11 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#include "win32window.h"
+#include "sword25/kernel/win32window.h"
 #include "../../projects/resource.h"
 
-#include "kernel/kernel.h"
-#include "input/inputengine.h"
+#include "sword25/kernel/kernel.h"
+#include "sword25/input/inputengine.h"
 
 bool BS_Win32Window::_ClassRegistered = false;
 
diff --git a/engines/sword25/kernel/win32window.h b/engines/sword25/kernel/win32window.h
index e37892a0cb..20c1857fe2 100755
--- a/engines/sword25/kernel/win32window.h
+++ b/engines/sword25/kernel/win32window.h
@@ -26,17 +26,17 @@
 	Autor: Malte Thiesen
 */
 
-#ifndef _BS_WIN32WINDOW_H
-#define _BS_WIN32WINDOW_H
+#ifndef SWORD25_WIN32WINDOW_H
+#define SWORD25_WIN32WINDOW_H
 
 // Includes
-#include "memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
-#include "memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
 
-#include "common.h"
-#include "window.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/window.h"
 
 // Klassendefinition
 class BS_Win32Window : public BS_Window
diff --git a/engines/sword25/kernel/wincodegenerator.cpp b/engines/sword25/kernel/wincodegenerator.cpp
index 1c264ad17b..9c488c7c02 100755
--- a/engines/sword25/kernel/wincodegenerator.cpp
+++ b/engines/sword25/kernel/wincodegenerator.cpp
@@ -21,8 +21,8 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "md5.h"
-#include "wincodegenerator.h"
+#include "sword25/kernel/md5.h"
+#include "sword25/kernel/wincodegenerator.h"
 using namespace std;
 
 // -----------------------------------------------------------------------------
diff --git a/engines/sword25/kernel/wincodegenerator.h b/engines/sword25/kernel/wincodegenerator.h
index 7e1ee78bd0..4db0da3414 100755
--- a/engines/sword25/kernel/wincodegenerator.h
+++ b/engines/sword25/kernel/wincodegenerator.h
@@ -17,15 +17,15 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_WIN_CODE_GENERATOR_H
-#define BS_WIN_CODE_GENERATOR_H
+#ifndef SWORD25_WIN_CODE_GENERATOR_H
+#define SWORD25_WIN_CODE_GENERATOR_H
 
 // -----------------------------------------------------------------------------
 // Includes
 // -----------------------------------------------------------------------------
 
 #include <string>
-#include "common.h"
+#include "sword25/kernel/common.h"
 
 // -----------------------------------------------------------------------------
 // Klassendefinition
diff --git a/engines/sword25/kernel/wincodegenerator_win32.cpp b/engines/sword25/kernel/wincodegenerator_win32.cpp
index 571a4b9f86..3ad038f6d1 100755
--- a/engines/sword25/kernel/wincodegenerator_win32.cpp
+++ b/engines/sword25/kernel/wincodegenerator_win32.cpp
@@ -28,8 +28,8 @@
 #include <vector>
 using namespace std;
 
-#include "md5.h"
-#include "wincodegenerator.h"
+#include "sword25/kernel/md5.h"
+#include "sword25/kernel/wincodegenerator.h"
 
 // -----------------------------------------------------------------------------
 // Hilfsfunktionen
diff --git a/engines/sword25/kernel/window.cpp b/engines/sword25/kernel/window.cpp
index b7b6e0aa27..c6c921cda9 100755
--- a/engines/sword25/kernel/window.cpp
+++ b/engines/sword25/kernel/window.cpp
@@ -17,10 +17,10 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#include "window.h"
+#include "sword25/kernel/window.h"
 
 // Alle Implementationen von BS_Window müssen hier eingetragen werden
-#include "win32window.h"
+#include "sword25/kernel/win32window.h"
 
 // Erstellt ein Fenster des GUI des aktuellen Betriebssystems
 BS_Window* BS_Window::CreateBSWindow(int X, int Y, int Width, int Height, bool Visible)