SWORD25: Fixed rest of the include paths

svn-id: r53181

37 files changed, 145 insertions, 145 deletions

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)