SWORD25: Path fixes for includes

svn-id: r53180

59 files changed, 254 insertions, 267 deletions

diff --git a/engines/sword25/fmv/oggtheora/audiobuffer.cpp b/engines/sword25/fmv/oggtheora/audiobuffer.cpp
index 9161c18fa8..1ad9620134 100755
--- a/engines/sword25/fmv/oggtheora/audiobuffer.cpp
+++ b/engines/sword25/fmv/oggtheora/audiobuffer.cpp
@@ -21,7 +21,7 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "audiobuffer.h"
+#include "sword25/fmv/oggtheora/audiobuffer.h"
 #include <windows.h>
 #include <queue>
 
diff --git a/engines/sword25/fmv/oggtheora/audiobuffer.h b/engines/sword25/fmv/oggtheora/audiobuffer.h
index c0c19811be..a040caf5ab 100755
--- a/engines/sword25/fmv/oggtheora/audiobuffer.h
+++ b/engines/sword25/fmv/oggtheora/audiobuffer.h
@@ -17,14 +17,14 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_AUDIOBUFFER_H
-#define BS_AUDIOBUFFER_H
+#ifndef SWORD25_AUDIOBUFFER_H
+#define SWORD25_AUDIOBUFFER_H
 
 // -----------------------------------------------------------------------------
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/common.h"
+#include "sword25/kernel/common.h"
 
 // -----------------------------------------------------------------------------
 // Klassendefinition
diff --git a/engines/sword25/fmv/oggtheora/moviefile.cpp b/engines/sword25/fmv/oggtheora/moviefile.cpp
index 92cbdad844..3b68a96c5c 100755
--- a/engines/sword25/fmv/oggtheora/moviefile.cpp
+++ b/engines/sword25/fmv/oggtheora/moviefile.cpp
@@ -27,10 +27,10 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/kernel.h"
-#include "package/packagemanager.h"
-#include "oggstate.h"
-#include "moviefile.h"
+#include "sword25/kernel/kernel.h"
+#include "sword25/package/packagemanager.h"
+#include "sword25/fmv/oggtheora/oggstate.h"
+#include "sword25/fmv/oggtheora/moviefile.h"
 
 // -----------------------------------------------------------------------------
 
diff --git a/engines/sword25/fmv/oggtheora/moviefile.h b/engines/sword25/fmv/oggtheora/moviefile.h
index 17935789b7..35566a56ca 100755
--- a/engines/sword25/fmv/oggtheora/moviefile.h
+++ b/engines/sword25/fmv/oggtheora/moviefile.h
@@ -17,18 +17,18 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_MOVIEFILE_H
-#define BS_MOVIEFILE_H
+#ifndef SWORD25_MOVIEFILE_H
+#define SWORD25_MOVIEFILE_H
 
 // -----------------------------------------------------------------------------
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/common.h"
+#include "sword25/kernel/common.h"
 
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
 #include <string>
-#include "kernel/memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
 
 // -----------------------------------------------------------------------------
 
diff --git a/engines/sword25/fmv/oggtheora/oggstate.cpp b/engines/sword25/fmv/oggtheora/oggstate.cpp
index d8300693c9..d6da995d0c 100755
--- a/engines/sword25/fmv/oggtheora/oggstate.cpp
+++ b/engines/sword25/fmv/oggtheora/oggstate.cpp
@@ -21,7 +21,7 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "oggstate.h"
+#include "sword25/fmv/oggtheora/oggstate.h"
 
 // -----------------------------------------------------------------------------
 
diff --git a/engines/sword25/fmv/oggtheora/oggstate.h b/engines/sword25/fmv/oggtheora/oggstate.h
index 18b44e375f..2196e41b7c 100755
--- a/engines/sword25/fmv/oggtheora/oggstate.h
+++ b/engines/sword25/fmv/oggtheora/oggstate.h
@@ -17,14 +17,14 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_OGGSTATE_H
-#define BS_OGGSTATE_H
+#ifndef SWORD25_OGGSTATE_H
+#define SWORD25_OGGSTATE_H
 
 // -----------------------------------------------------------------------------
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/common.h"
+#include "sword25/kernel/common.h"
 #include "ogg/ogg.h"
 // XXX
 #include <iostream>
diff --git a/engines/sword25/fmv/oggtheora/oggstreamstate.cpp b/engines/sword25/fmv/oggtheora/oggstreamstate.cpp
index da4dc317b5..05629be82b 100755
--- a/engines/sword25/fmv/oggtheora/oggstreamstate.cpp
+++ b/engines/sword25/fmv/oggtheora/oggstreamstate.cpp
@@ -21,7 +21,7 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "oggstreamstate.h"
+#include "sword25/fmv/oggtheora/oggstreamstate.h"
 
 // -----------------------------------------------------------------------------
 
diff --git a/engines/sword25/fmv/oggtheora/oggstreamstate.h b/engines/sword25/fmv/oggtheora/oggstreamstate.h
index 9460c7286f..7b296b82aa 100755
--- a/engines/sword25/fmv/oggtheora/oggstreamstate.h
+++ b/engines/sword25/fmv/oggtheora/oggstreamstate.h
@@ -17,14 +17,14 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_OGGSTREAMSTATE_H
-#define BS_OGGSTREAMSTATE_H
+#ifndef SWORD25_OGGSTREAMSTATE_H
+#define SWORD25_OGGSTREAMSTATE_H
 
 // -----------------------------------------------------------------------------
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/common.h"
+#include "sword25/kernel/common.h"
 #include "ogg/ogg.h"
 #include <queue>
 // XXX
diff --git a/engines/sword25/fmv/oggtheora/oggtheora.cpp b/engines/sword25/fmv/oggtheora/oggtheora.cpp
index c5436dcc8f..dcff5e025b 100755
--- a/engines/sword25/fmv/oggtheora/oggtheora.cpp
+++ b/engines/sword25/fmv/oggtheora/oggtheora.cpp
@@ -59,18 +59,17 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
 #include <algorithm>
-#include "kernel/memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
 #include <float.h>
 
-#include "package/packagemanager.h"
-#include "kernel/cpuinfo.h"
-#include "sfx/soundengine.h"
-#include "gfx/graphicengine.h"
-#include "gfx/panel.h"
-#include "oggtheora.h"
-#include "yuvtorgba.h"
+#include "sword25/package/packagemanager.h"
+#include "sword25/sfx/soundengine.h"
+#include "sword25/gfx/graphicengine.h"
+#include "sword25/gfx/panel.h"
+#include "sword25/fmv/oggtheora/oggtheora.h"
+#include "sword25/fmv/oggtheora/yuvtorgba.h"
 
 using namespace std;
 
diff --git a/engines/sword25/fmv/oggtheora/oggtheora.h b/engines/sword25/fmv/oggtheora/oggtheora.h
index 0b43ba698d..516f5cc072 100755
--- a/engines/sword25/fmv/oggtheora/oggtheora.h
+++ b/engines/sword25/fmv/oggtheora/oggtheora.h
@@ -17,30 +17,30 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_OGGTHEORA_H
-#define BS_OGGTHEORA_H
+#ifndef SWORD25_OGGTHEORA_H
+#define SWORD25_OGGTHEORA_H
 
 // -----------------------------------------------------------------------------
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
 #include <vector>
 #include <memory>
 #include <queue>
-#include "kernel/memlog_on.h"
-
-#include "kernel/common.h"
-#include "kernel/bs_stdint.h"
-#include "gfx/bitmap.h"
-#include "gfx/renderobjectptr.h"
-#include "fmv/movieplayer.h"
-#include "vorbisstate.h"
-#include "theorastate.h"
-#include "oggstate.h"
-#include "oggstreamstate.h"
-#include "moviefile.h"
-#include "audiobuffer.h"
+#include "sword25/kernel/memlog_on.h"
+
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/bs_stdint.h"
+#include "sword25/gfx/bitmap.h"
+#include "sword25/gfx/renderobjectptr.h"
+#include "sword25/fmv/movieplayer.h"
+#include "sword25/fmv/oggtheora/vorbisstate.h"
+#include "sword25/fmv/oggtheora/theorastate.h"
+#include "sword25/fmv/oggtheora/oggstate.h"
+#include "sword25/fmv/oggtheora/oggstreamstate.h"
+#include "sword25/fmv/oggtheora/moviefile.h"
+#include "sword25/fmv/oggtheora/audiobuffer.h"
 
 // -----------------------------------------------------------------------------
 // Klassendefinition
diff --git a/engines/sword25/fmv/oggtheora/theorastate.cpp b/engines/sword25/fmv/oggtheora/theorastate.cpp
index 853ef911ba..3d3c4018e4 100755
--- a/engines/sword25/fmv/oggtheora/theorastate.cpp
+++ b/engines/sword25/fmv/oggtheora/theorastate.cpp
@@ -21,7 +21,7 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "theorastate.h"
+#include "sword25/fmv/oggtheora/theorastate.h"
 
 // -----------------------------------------------------------------------------
 
diff --git a/engines/sword25/fmv/oggtheora/theorastate.h b/engines/sword25/fmv/oggtheora/theorastate.h
index 582215bad9..3a88b6fdab 100755
--- a/engines/sword25/fmv/oggtheora/theorastate.h
+++ b/engines/sword25/fmv/oggtheora/theorastate.h
@@ -17,15 +17,15 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_THEORASTATE_H
-#define BS_THEORASTATE_H
+#ifndef SWORD25_THEORASTATE_H
+#define SWORD25_THEORASTATE_H
 
 // -----------------------------------------------------------------------------
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/common.h"
-#include "theora/theora.h"
+#include "sword25/kernel/common.h"
+#include <theora/theora.h>
 
 // -----------------------------------------------------------------------------
 // Klassendefinition
diff --git a/engines/sword25/fmv/oggtheora/vorbisstate.cpp b/engines/sword25/fmv/oggtheora/vorbisstate.cpp
index 683b6fd0d7..a2df701ba2 100755
--- a/engines/sword25/fmv/oggtheora/vorbisstate.cpp
+++ b/engines/sword25/fmv/oggtheora/vorbisstate.cpp
@@ -21,7 +21,7 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "vorbisstate.h"
+#include "sword25/fmv/oggtheora/vorbisstate.h"
 
 // -----------------------------------------------------------------------------
 
diff --git a/engines/sword25/fmv/oggtheora/vorbisstate.h b/engines/sword25/fmv/oggtheora/vorbisstate.h
index 193e115637..87e027e175 100755
--- a/engines/sword25/fmv/oggtheora/vorbisstate.h
+++ b/engines/sword25/fmv/oggtheora/vorbisstate.h
@@ -17,15 +17,15 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_VORBISSTATE_H
-#define BS_VORBISSTATE_H
+#ifndef SWORD25_VORBISSTATE_H
+#define SWORD25_VORBISSTATE_H
 
 // -----------------------------------------------------------------------------
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/common.h"
-#include "vorbis/codec.h"
+#include "sword25/kernel/common.h"
+#include <vorbis/codec.h>
 
 // -----------------------------------------------------------------------------
 // Klassendefinition
diff --git a/engines/sword25/fmv/oggtheora/yuvtorgba.cpp b/engines/sword25/fmv/oggtheora/yuvtorgba.cpp
index 0e709b12e0..9fc2c0ae58 100755
--- a/engines/sword25/fmv/oggtheora/yuvtorgba.cpp
+++ b/engines/sword25/fmv/oggtheora/yuvtorgba.cpp
@@ -21,8 +21,8 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/cpuinfo.h"
-#include "yuvtorgba.h"
+#include "sword25/kernel/cpuinfo.h"
+#include "sword25/fmv/ogghteora/yuvtorgba.h"
 
 #include <mmintrin.h>
 
diff --git a/engines/sword25/fmv/oggtheora/yuvtorgba.h b/engines/sword25/fmv/oggtheora/yuvtorgba.h
index 0bd74e5a18..116e854494 100755
--- a/engines/sword25/fmv/oggtheora/yuvtorgba.h
+++ b/engines/sword25/fmv/oggtheora/yuvtorgba.h
@@ -17,18 +17,18 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_YUVTORGBA_H
-#define BS_YUVTORGBA_H
+#ifndef SWORD25_YUVTORGBA_H
+#define SWORD25_YUVTORGBA_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 "sword25/kernel/common.h"
 #include "theora/theora.h"
 
 // -----------------------------------------------------------------------------
diff --git a/engines/sword25/gfx/panel.h b/engines/sword25/gfx/panel.h
index b1ecd7ce69..50e3df1f29 100755
--- a/engines/sword25/gfx/panel.h
+++ b/engines/sword25/gfx/panel.h
@@ -33,7 +33,7 @@
 
 class BS_Panel : public BS_RenderObject
 {
-friend BS_RenderObject;
+friend class BS_RenderObject;
 
 private:
 	BS_Panel(BS_RenderObjectPtr<BS_RenderObject> ParentPtr, int Width, int Height, unsigned int Color);
diff --git a/engines/sword25/input/inputengine.cpp b/engines/sword25/input/inputengine.cpp
index 85164447ce..058c0ca06a 100755
--- a/engines/sword25/input/inputengine.cpp
+++ b/engines/sword25/input/inputengine.cpp
@@ -23,7 +23,7 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "inputengine.h"
+#include "sword25/input/inputengine.h"
 
 // -----------------------------------------------------------------------------
 
diff --git a/engines/sword25/input/inputengine.h b/engines/sword25/input/inputengine.h
index d2c4c92c5d..fb045d40d2 100755
--- a/engines/sword25/input/inputengine.h
+++ b/engines/sword25/input/inputengine.h
@@ -26,13 +26,13 @@
 	Autor: Alex Arnst
 **/
 
-#ifndef BS_INPUTENGINE_H
-#define BS_INPUTENGINE_H
+#ifndef SWORD25_INPUTENGINE_H
+#define SWORD25_INPUTENGINE_H
 
 /// Includes
-#include "kernel/common.h"
-#include "kernel/service.h"
-#include "kernel/persistable.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/service.h"
+#include "sword25/kernel/persistable.h"
 
 /// Klassendefinition
 class BS_InputEngine : public BS_Service, public BS_Persistable
diff --git a/engines/sword25/input/inputengine_script.cpp b/engines/sword25/input/inputengine_script.cpp
index 7c2868186b..9d36e03917 100755
--- a/engines/sword25/input/inputengine_script.cpp
+++ b/engines/sword25/input/inputengine_script.cpp
@@ -24,14 +24,14 @@
 #include <string>
 #include <algorithm>
 
-#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 "inputengine.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/input/inputengine.h"
 
 #define BS_LOG_PREFIX "INPUTENGINE"
 
diff --git a/engines/sword25/input/stdwininput.cpp b/engines/sword25/input/stdwininput.cpp
index 16e3832b67..600e67b7ee 100755
--- a/engines/sword25/input/stdwininput.cpp
+++ b/engines/sword25/input/stdwininput.cpp
@@ -17,11 +17,11 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#include "kernel/kernel.h"
-#include "kernel/callbackregistry.h"
-#include "kernel/inputpersistenceblock.h"
-#include "kernel/outputpersistenceblock.h"
-#include "stdwininput.h"
+#include "sword25/kernel/kernel.h"
+#include "sword25/kernel/callbackregistry.h"
+#include "sword25/kernel/inputpersistenceblock.h"
+#include "sword25/kernel/outputpersistenceblock.h"
+#include "sword25/input/stdwininput.h"
 
 #include <algorithm>
 using namespace std;
diff --git a/engines/sword25/input/stdwininput.h b/engines/sword25/input/stdwininput.h
index 20e02fdd11..ff79167471 100755
--- a/engines/sword25/input/stdwininput.h
+++ b/engines/sword25/input/stdwininput.h
@@ -17,18 +17,18 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_STDWININPUT_H
-#define BS_STDWININPUT_H
+#ifndef SWORD25_STDWININPUT_H
+#define SWORD25_STDWININPUT_H
 
 /// Includes
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <list>
-#include "kernel/memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
 
-#include "kernel/common.h"
-#include "inputengine.h"
+#include "sword25/kernel/common.h"
+#include "sword25/input/inputengine.h"
 
 /// Klassendefinitionen
 class BS_Kernel;
diff --git a/engines/sword25/kernel/debug/debugtools.cpp b/engines/sword25/kernel/debug/debugtools.cpp
index 91abe66ba7..4f6288a905 100755
--- a/engines/sword25/kernel/debug/debugtools.cpp
+++ b/engines/sword25/kernel/debug/debugtools.cpp
@@ -30,9 +30,9 @@
 #include <fstream>
 using namespace std;
 
-#include "kernel/md5.h"
-#include "kernel/filesystemutil.h"
-#include "debugtools.h"
+#include "sword25/kernel/md5.h"
+#include "sword25/kernel/filesystemutil.h"
+#include "sword25/kernel/debug/debugtools.h"
 
 // -----------------------------------------------------------------------------
 // Konstanten und Hilfsfunktionen
diff --git a/engines/sword25/kernel/debug/debugtools.h b/engines/sword25/kernel/debug/debugtools.h
index 30dd04a83d..2d6cea9495 100755
--- a/engines/sword25/kernel/debug/debugtools.h
+++ b/engines/sword25/kernel/debug/debugtools.h
@@ -17,8 +17,8 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef DEBUGTOOLS_H
-#define DEBUGTOOLS_H
+#ifndef SWORD25_DEBUGTOOLS_H
+#define SWORD25_DEBUGTOOLS_H
 
 class BS_Debugtools
 {
diff --git a/engines/sword25/math/geometry.cpp b/engines/sword25/math/geometry.cpp
index 5527d7f30d..ab63a923c0 100755
--- a/engines/sword25/math/geometry.cpp
+++ b/engines/sword25/math/geometry.cpp
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#include "geometry.h"
+#include "sword25/math/geometry.h"
 
 #define BS_LOG_PREFIX "GEOMETRY"
 
diff --git a/engines/sword25/math/geometry.h b/engines/sword25/math/geometry.h
index c63167269f..fe9dda113e 100755
--- a/engines/sword25/math/geometry.h
+++ b/engines/sword25/math/geometry.h
@@ -17,15 +17,15 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_GEOMETRY_H
-#define BS_GEOMETRY_H
+#ifndef SWORD25_GEOMETRY_H
+#define SWORD25_GEOMETRY_H
 
 // -----------------------------------------------------------------------------
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/common.h"
-#include "kernel/service.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/service.h"
 
 // -----------------------------------------------------------------------------
 
diff --git a/engines/sword25/math/geometry_script.cpp b/engines/sword25/math/geometry_script.cpp
index 688f5fd356..33ff113316 100755
--- a/engines/sword25/math/geometry_script.cpp
+++ b/engines/sword25/math/geometry_script.cpp
@@ -21,22 +21,22 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
 #include <memory>
 #include <vector>
-#include "kernel/memlog_on.h"
-
-#include "gfx/graphicengine.h"
-#include "kernel/common.h"
-#include "kernel/kernel.h"
-#include "script/script.h"
-#include "script/luabindhelper.h"
-
-#include "geometry.h"
-#include "region.h"
-#include "regionregistry.h"
-#include "walkregion.h"
-#include "vertex.h"
+#include "sword25/kernel/memlog_on.h"
+
+#include "sword25/gfx/graphicengine.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/kernel.h"
+#include "sword25/script/script.h"
+#include "sword25/script/luabindhelper.h"
+
+#include "sword25/math/geometry.h"
+#include "sword25/math/region.h"
+#include "sword25/math/regionregistry.h"
+#include "sword25/math/walkregion.h"
+#include "sword25/math/vertex.h"
 
 // -----------------------------------------------------------------------------
 
diff --git a/engines/sword25/math/line.h b/engines/sword25/math/line.h
index aaae3a0764..7307efd380 100755
--- a/engines/sword25/math/line.h
+++ b/engines/sword25/math/line.h
@@ -29,14 +29,14 @@
 	Autor: Malte Thiesen
 */
 
-#ifndef _BS_LINE_H_
-#define _BS_LINE_H_
+#ifndef SWORD25_LINE_H
+#define SWORD25_LINE_H
 
 // -----------------------------------------------------------------------------
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/common.h"
+#include "sword25/kernel/common.h"
 
 // -----------------------------------------------------------------------------
 
diff --git a/engines/sword25/math/polygon.cpp b/engines/sword25/math/polygon.cpp
index c204a11d09..963d9ae105 100755
--- a/engines/sword25/math/polygon.cpp
+++ b/engines/sword25/math/polygon.cpp
@@ -17,18 +17,18 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
 #include <utility>
 #include <vector>
-#include "kernel/memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
 
 #include <math.h>
 
-#include "kernel/outputpersistenceblock.h"
-#include "kernel/inputpersistenceblock.h"
+#include "sword25/kernel/outputpersistenceblock.h"
+#include "sword25/kernel/inputpersistenceblock.h"
 
-#include "polygon.h"
-#include "line.h"
+#include "sword25/math/polygon.h"
+#include "sword25/math/line.h"
 
 #define max(a,b) (((a) > (b)) ? (a) : (b))
 
diff --git a/engines/sword25/math/polygon.h b/engines/sword25/math/polygon.h
index 68e2f4c05a..2e294a328e 100755
--- a/engines/sword25/math/polygon.h
+++ b/engines/sword25/math/polygon.h
@@ -17,13 +17,13 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_POLYGON_H
-#define BS_POLYGON_H
+#ifndef SWORD25_POLYGON_H
+#define SWORD25_POLYGON_H
 
 // Includes
-#include "kernel/common.h"
-#include "kernel/persistable.h"
-#include "vertex.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/persistable.h"
+#include "sword25/math/vertex.h"
 
 // -----------------------------------------------------------------------------
 // Forward Declarations
diff --git a/engines/sword25/math/rect.h b/engines/sword25/math/rect.h
index 5edcf6b6af..0d9ebf7c3c 100755
--- a/engines/sword25/math/rect.h
+++ b/engines/sword25/math/rect.h
@@ -17,12 +17,12 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_RECT_H
-#define BS_RECT_H
+#ifndef SWORD25_RECT_H
+#define SWORD25_RECT_H
 
 // Includes
-#include "kernel/common.h"
-#include "vertex.h"
+#include "sword25/kernel/common.h"
+#include "sword25/math/vertex.h"
 
 // Klassendefinition
 /**
diff --git a/engines/sword25/math/region.cpp b/engines/sword25/math/region.cpp
index 3c7f3ef5dc..d873d627f0 100755
--- a/engines/sword25/math/region.cpp
+++ b/engines/sword25/math/region.cpp
@@ -17,12 +17,12 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#include "kernel/inputpersistenceblock.h"
-#include "kernel/outputpersistenceblock.h"
+#include "sword25/kernel/inputpersistenceblock.h"
+#include "sword25/kernel/outputpersistenceblock.h"
 
-#include "region.h"
-#include "walkregion.h"
-#include "regionregistry.h"
+#include "sword25/math/region.h"
+#include "sword25/math/walkregion.h"
+#include "sword25/math/regionregistry.h"
 
 #define BS_LOG_PREFIX "REGION"
 
diff --git a/engines/sword25/math/region.h b/engines/sword25/math/region.h
index 7004d252eb..4ce71a8561 100755
--- a/engines/sword25/math/region.h
+++ b/engines/sword25/math/region.h
@@ -17,18 +17,18 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_REGION_H
-#define BS_REGION_H
+#ifndef SWORD25_REGION_H
+#define SWORD25_REGION_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"
 
-#include "kernel/common.h"
-#include "kernel/persistable.h"
-#include "vertex.h"
-#include "polygon.h"
-#include "rect.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/persistable.h"
+#include "sword25/math/vertex.h"
+#include "sword25/math/polygon.h"
+#include "sword25/math/rect.h"
 
 /**
 	@brief Diese Klasse ist die Basisklasse aller Regionen.
diff --git a/engines/sword25/math/regionregistry.cpp b/engines/sword25/math/regionregistry.cpp
index af120ddd8b..c21deb722f 100755
--- a/engines/sword25/math/regionregistry.cpp
+++ b/engines/sword25/math/regionregistry.cpp
@@ -27,10 +27,10 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/outputpersistenceblock.h"
-#include "kernel/inputpersistenceblock.h"
-#include "regionregistry.h"
-#include "region.h"
+#include "sword25/kernel/outputpersistenceblock.h"
+#include "sword25/kernel/inputpersistenceblock.h"
+#include "sword25/math/regionregistry.h"
+#include "sword25/math/region.h"
 
 // -----------------------------------------------------------------------------
 // Implementation
diff --git a/engines/sword25/math/regionregistry.h b/engines/sword25/math/regionregistry.h
index fba6ba2cf6..4127481c70 100755
--- a/engines/sword25/math/regionregistry.h
+++ b/engines/sword25/math/regionregistry.h
@@ -17,20 +17,20 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_REGIONREGISTRY_H
-#define BS_REGIONREGISTRY_H
+#ifndef SWORD25_REGIONREGISTRY_H
+#define SWORD25_REGIONREGISTRY_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/math/vertex.cpp b/engines/sword25/math/vertex.cpp
index ddf13e3d9d..24697814ae 100755
--- a/engines/sword25/math/vertex.cpp
+++ b/engines/sword25/math/vertex.cpp
@@ -17,12 +17,12 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#include "vertex.h"
+#include "sword25/math/vertex.h"
 
 extern "C"
 {
-	#include <lua.h>
-	#include <lauxlib.h>
+	#include "sword25/util/lua/lua.h"
+	#include "sword25/util/lua/lauxlib.h"
 }
 
 // -----------------------------------------------------------------------------
diff --git a/engines/sword25/math/vertex.h b/engines/sword25/math/vertex.h
index 3353f34f10..71253add89 100755
--- a/engines/sword25/math/vertex.h
+++ b/engines/sword25/math/vertex.h
@@ -24,12 +24,12 @@
 	Autor: Malte Thiesen
 */
 
-#ifndef _BS_VERTEX_H
-#define _BS_VERTEX_H
+#ifndef SWORD25_VERTEX_H
+#define SWORD25_VERTEX_H
 
 // Includes
 #include <math.h>
-#include "../kernel/common.h"
+#include "sword25/kernel/common.h"
 
 // Forward-Declarations
 struct lua_State;
diff --git a/engines/sword25/math/walkregion.cpp b/engines/sword25/math/walkregion.cpp
index 4d13a9b82e..ebf4a3e541 100755
--- a/engines/sword25/math/walkregion.cpp
+++ b/engines/sword25/math/walkregion.cpp
@@ -19,10 +19,10 @@
 
 #include <list>
 #include <algorithm>
-#include "kernel/inputpersistenceblock.h"
-#include "kernel/outputpersistenceblock.h"
-#include "walkregion.h"
-#include "line.h"
+#include "sword25/kernel/inputpersistenceblock.h"
+#include "sword25/kernel/outputpersistenceblock.h"
+#include "sword25/math/walkregion.h"
+#include "sword25/math/line.h"
 
 #define BS_LOG_PREFIX "WALKREGION"
 
diff --git a/engines/sword25/math/walkregion.h b/engines/sword25/math/walkregion.h
index d9fa73d585..b07f2dbae8 100755
--- a/engines/sword25/math/walkregion.h
+++ b/engines/sword25/math/walkregion.h
@@ -17,15 +17,15 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_WALKREGION_H
-#define BS_WALKREGION_H
+#ifndef SWORD25_WALKREGION_H
+#define SWORD25_WALKREGION_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"
 
-#include "kernel/common.h"
-#include "region.h"
+#include "sword25/kernel/common.h"
+#include "sword25/math/region.h"
 
 // -----------------------------------------------------------------------------
 // Typdefinitionen
diff --git a/engines/sword25/package/packagemanager.cpp b/engines/sword25/package/packagemanager.cpp
index ecee060d56..cb5b2b34a9 100755
--- a/engines/sword25/package/packagemanager.cpp
+++ b/engines/sword25/package/packagemanager.cpp
@@ -23,7 +23,7 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "packagemanager.h"
+#include "sword25/package/packagemanager.h"
 
 // -----------------------------------------------------------------------------
 
diff --git a/engines/sword25/package/packagemanager_script.cpp b/engines/sword25/package/packagemanager_script.cpp
index 01b6692a4c..5ed664625b 100755
--- a/engines/sword25/package/packagemanager_script.cpp
+++ b/engines/sword25/package/packagemanager_script.cpp
@@ -21,12 +21,12 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/common.h"
-#include "kernel/kernel.h"
-#include "script/script.h"
-#include "script/luabindhelper.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/kernel.h"
+#include "sword25/script/script.h"
+#include "sword25/script/luabindhelper.h"
 
-#include "packagemanager.h"
+#include "sword25/package/packagemanager.h"
 
 // -----------------------------------------------------------------------------
 
diff --git a/engines/sword25/package/physfspackagemanager.cpp b/engines/sword25/package/physfspackagemanager.cpp
index 70b9d98578..51fe900096 100755
--- a/engines/sword25/package/physfspackagemanager.cpp
+++ b/engines/sword25/package/physfspackagemanager.cpp
@@ -21,17 +21,12 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "physfspackagemanager.h"
-#include "util/physfs/physfs.h"
-extern "C"
-{
-	#include "util/physfs/extras/globbing.h"
-};
+#include "sword25/package/physfspackagemanager.h"
 
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
 #include <vector>
 #include <sstream>
-#include "kernel/memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
 
 using namespace std;
 
diff --git a/engines/sword25/package/physfspackagemanager.h b/engines/sword25/package/physfspackagemanager.h
index 236ec4fbbe..179c3790fa 100755
--- a/engines/sword25/package/physfspackagemanager.h
+++ b/engines/sword25/package/physfspackagemanager.h
@@ -17,15 +17,15 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_PHYSFS_PACKAGE_MANAGER_H
-#define BS_PHYSFS_PACKAGE_MANAGER_H
+#ifndef SWORD25_PHYSFS_PACKAGE_MANAGER_H
+#define SWORD25_PHYSFS_PACKAGE_MANAGER_H
 
 // -----------------------------------------------------------------------------
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/common.h"
-#include "packagemanager.h"
+#include "sword25/kernel/common.h"
+#include "sword25/package/packagemanager.h"
 
 // -----------------------------------------------------------------------------
 // Forward declarations
diff --git a/engines/sword25/script/lua_extensions.cpp b/engines/sword25/script/lua_extensions.cpp
index 05f9c5db79..b93d033989 100755
--- a/engines/sword25/script/lua_extensions.cpp
+++ b/engines/sword25/script/lua_extensions.cpp
@@ -21,8 +21,8 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "luascript.h"
-#include "luabindhelper.h"
+#include "sword25/script/luascript.h"
+#include "sword25/script/luabindhelper.h"
 
 // -----------------------------------------------------------------------------
 
diff --git a/engines/sword25/script/luabindhelper.h b/engines/sword25/script/luabindhelper.h
index 0b9d9c75d9..b99ac9cef5 100755
--- a/engines/sword25/script/luabindhelper.h
+++ b/engines/sword25/script/luabindhelper.h
@@ -17,15 +17,15 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef LUABINDHELPER_H
-#define LUABINDHELPER_H
+#ifndef SWORD25_LUABINDHELPER_H
+#define SWORD25_LUABINDHELPER_H
 
 #include "sword25/kernel/common.h"
 
 extern "C"
 {
-	#include <sword25/util/lua/lua.h>
-	#include <sword25/util/lua/lauxlib.h>
+	#include "sword25/util/lua/lua.h"
+	#include "sword25/util/lua/lauxlib.h"
 }
 
 #define lua_pushbooleancpp(L, b) (lua_pushboolean(L, b ? 1 : 0))
diff --git a/engines/sword25/script/luacallback.cpp b/engines/sword25/script/luacallback.cpp
index 09103d5467..6af1c17e92 100755
--- a/engines/sword25/script/luacallback.cpp
+++ b/engines/sword25/script/luacallback.cpp
@@ -21,13 +21,13 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "luacallback.h"
-#include "luabindhelper.h"
+#include "sword25/script/luacallback.h"
+#include "sword25/script/luabindhelper.h"
 
 extern "C"
 {
-	#include <lua.h>
-	#include <lauxlib.h>
+	#include "sword25/util/lua/lua.h"
+	#include "sword25/util/lua/lauxlib.h"
 }
 
 #define BS_LOG_PREFIX "LUA"
diff --git a/engines/sword25/script/luacallback.h b/engines/sword25/script/luacallback.h
index dbf201b4ad..ba505cadfe 100755
--- a/engines/sword25/script/luacallback.h
+++ b/engines/sword25/script/luacallback.h
@@ -17,14 +17,14 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_LUACALLBACK_H
-#define BS_LUACALLBACK_H
+#ifndef SWORD25_LUACALLBACK_H
+#define SWORD25_LUACALLBACK_H
 
 // -----------------------------------------------------------------------------
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/common.h"
+#include "sword25/kernel/common.h"
 
 // -----------------------------------------------------------------------------
 // Forward Deklarationen
diff --git a/engines/sword25/script/luascript.cpp b/engines/sword25/script/luascript.cpp
index dbefc338ce..a58265f7bd 100755
--- a/engines/sword25/script/luascript.cpp
+++ b/engines/sword25/script/luascript.cpp
@@ -25,22 +25,22 @@
 
 extern "C"
 {
-	#include <lua.h>
-	#include <lualib.h>
-	#include <lauxlib.h>
-	#include "util/pluto/pluto.h"
+	#include "sword25/util/lua/lua.h"
+	#include "sword25/util/lua/lualib.h"
+	#include "sword25/util/lua/lauxlib.h"
+	#include "sword25/util/pluto/pluto.h"
 }
 
-#include "package/packagemanager.h"
-#include "luascript.h"
-#include "luabindhelper.h"
+#include "sword25/package/packagemanager.h"
+#include "sword25/script/luascript.h"
+#include "sword25/script/luabindhelper.h"
 
-#include "kernel/outputpersistenceblock.h"
-#include "kernel/inputpersistenceblock.h"
+#include "sword25/kernel/outputpersistenceblock.h"
+#include "sword25/kernel/inputpersistenceblock.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"
 
 using namespace std;
 
diff --git a/engines/sword25/script/luascript.h b/engines/sword25/script/luascript.h
index dd0500a710..83c2a22f8e 100755
--- a/engines/sword25/script/luascript.h
+++ b/engines/sword25/script/luascript.h
@@ -17,15 +17,15 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef LUASCRIPT_H
-#define LUASCRIPT_H
+#ifndef SWORD25_LUASCRIPT_H
+#define SWORD25_LUASCRIPT_H
 
 // -----------------------------------------------------------------------------
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/common.h"
-#include "script.h"
+#include "sword25/kernel/common.h"
+#include "sword25/script/script.h"
 
 // -----------------------------------------------------------------------------
 // Forward declarations
diff --git a/engines/sword25/sfx/fmodexchannel.cpp b/engines/sword25/sfx/fmodexchannel.cpp
index 88ad9640c5..85a6fce342 100755
--- a/engines/sword25/sfx/fmodexchannel.cpp
+++ b/engines/sword25/sfx/fmodexchannel.cpp
@@ -27,9 +27,8 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "fmod.h"
-#include "fmodexexception.h"
-#include "fmodexchannel.h"
+#include "sword25/sfx/fmodexexception.h"
+#include "sword25/sfx/fmodexchannel.h"
 
 // -----------------------------------------------------------------------------
 // Konstruktion / Destruktion
diff --git a/engines/sword25/sfx/fmodexchannel.h b/engines/sword25/sfx/fmodexchannel.h
index 9ebf674ff2..1d69fc4a2d 100755
--- a/engines/sword25/sfx/fmodexchannel.h
+++ b/engines/sword25/sfx/fmodexchannel.h
@@ -17,14 +17,14 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef FMODEXCHANNEL_H
-#define FMODEXCHANNEL_H
+#ifndef SWORD25_FMODEXCHANNEL_H
+#define SWORD25_FMODEXCHANNEL_H
 
 // -----------------------------------------------------------------------------
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/common.h"
+#include "sword25/kernel/common.h"
 
 // -----------------------------------------------------------------------------
 // Forward Declarations
diff --git a/engines/sword25/sfx/fmodexexception.h b/engines/sword25/sfx/fmodexexception.h
index c0541f6d3c..01b24d052a 100755
--- a/engines/sword25/sfx/fmodexexception.h
+++ b/engines/sword25/sfx/fmodexexception.h
@@ -17,15 +17,14 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_FMODEXEXCEPTION_H
-#define BS_FMODEXEXCEPTION_H
+#ifndef SWORD25_FMODEXEXCEPTION_H
+#define SWROD25_FMODEXEXCEPTION_H
 
 // -----------------------------------------------------------------------------
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/common.h"
-#include "fmod_errors.h"
+#include "sword25/kernel/common.h"
 
 // -----------------------------------------------------------------------------
 // Klassendefinition
diff --git a/engines/sword25/sfx/fmodexresource.cpp b/engines/sword25/sfx/fmodexresource.cpp
index 3e15dbb260..06581dca7a 100755
--- a/engines/sword25/sfx/fmodexresource.cpp
+++ b/engines/sword25/sfx/fmodexresource.cpp
@@ -28,11 +28,10 @@
 // -----------------------------------------------------------------------------
 
 #include <memory>
-#include "fmod.h"
-#include "fmodexexception.h"
-#include "fmodexchannel.h"
-#include "package/packagemanager.h"
-#include "fmodexresource.h"
+#include "sword25/sfx/fmodexexception.h"
+#include "sword25/sfx/fmodexchannel.h"
+#include "sword25/package/packagemanager.h"
+#include "sword25/sfx/fmodexresource.h"
 
 // -----------------------------------------------------------------------------
 // Konstanten
diff --git a/engines/sword25/sfx/fmodexresource.h b/engines/sword25/sfx/fmodexresource.h
index 43ff93e380..0ae9049749 100755
--- a/engines/sword25/sfx/fmodexresource.h
+++ b/engines/sword25/sfx/fmodexresource.h
@@ -17,15 +17,15 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_FMODRESOURCE_H
-#define BS_FMODRESOURCE_H
+#ifndef SWORD25_FMODRESOURCE_H
+#define SWORD25_FMODRESOURCE_H
 
 // -----------------------------------------------------------------------------
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/common.h"
-#include "kernel/resource.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/resource.h"
 
 // -----------------------------------------------------------------------------
 // Forward Declarations
diff --git a/engines/sword25/sfx/fmodexsound.cpp b/engines/sword25/sfx/fmodexsound.cpp
index 346d55086b..327f430121 100755
--- a/engines/sword25/sfx/fmodexsound.cpp
+++ b/engines/sword25/sfx/fmodexsound.cpp
@@ -31,16 +31,14 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "fmod.h"
-#include "fmod_errors.h"
-#include "fmodexexception.h"
-#include "fmodexchannel.h"
-#include "fmodexresource.h"
-#include "kernel/string.h"
-#include "kernel/inputpersistenceblock.h"
-#include "kernel/outputpersistenceblock.h"
-#include "package/packagemanager.h"
-#include "fmodexsound.h"
+#include "sword25/sfx/fmodexexception.h"
+#include "sword25/sfx/fmodexchannel.h"
+#include "sword25/sfx/fmodexresource.h"
+#include "sword25/kernel/string.h"
+#include "sword25/kernel/inputpersistenceblock.h"
+#include "sword25/kernel/outputpersistenceblock.h"
+#include "sword25/package/packagemanager.h"
+#include "sword25/sfx/fmodexsound.h"
 
 // -----------------------------------------------------------------------------
 // Konstanten und lokale Funktionen
diff --git a/engines/sword25/sfx/fmodexsound.h b/engines/sword25/sfx/fmodexsound.h
index 4c0d8fc448..9dd05fe78d 100755
--- a/engines/sword25/sfx/fmodexsound.h
+++ b/engines/sword25/sfx/fmodexsound.h
@@ -17,23 +17,21 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef FMODEXSOUND_H
-#define FMODEXSOUND_H
+#ifndef SWORD25_FMODEXSOUND_H
+#define SWORD25_FMODEXSOUND_H
 
 // -----------------------------------------------------------------------------
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
 #include <vector>
 #include <map>
-#include "kernel/memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
 
-#include "kernel/common.h"
-#include "kernel/hashmap.h"
-#include "soundengine.h"
-
-#include "fmod.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/hashmap.h"
+#include "sword25/sfx/soundengine.h"
 
 // -----------------------------------------------------------------------------
 // Forward Declarations
diff --git a/engines/sword25/sfx/soundengine.cpp b/engines/sword25/sfx/soundengine.cpp
index d12c1fb604..3996154cda 100755
--- a/engines/sword25/sfx/soundengine.cpp
+++ b/engines/sword25/sfx/soundengine.cpp
@@ -23,7 +23,7 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "soundengine.h"
+#include "sword25/sfx/soundengine.h"
 
 // -----------------------------------------------------------------------------
 
diff --git a/engines/sword25/sfx/soundengine.h b/engines/sword25/sfx/soundengine.h
index 16442c2481..8258508047 100755
--- a/engines/sword25/sfx/soundengine.h
+++ b/engines/sword25/sfx/soundengine.h
@@ -29,16 +29,16 @@
 	Autor: Malte Thiesen
 */
 
-#ifndef BS_SOUNDENGINE_H
-#define BS_SOUNDENGINE_H
+#ifndef SWORD25_SOUNDENGINE_H
+#define SWORD25_SOUNDENGINE_H
 
 // -----------------------------------------------------------------------------
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/common.h"
-#include "kernel/resservice.h"
-#include "kernel/persistable.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/resservice.h"
+#include "sword25/kernel/persistable.h"
 
 // -----------------------------------------------------------------------------
 // Klassendefinition
diff --git a/engines/sword25/sfx/soundengine_script.cpp b/engines/sword25/sfx/soundengine_script.cpp
index 9cc3fcb153..758f4482b5 100755
--- a/engines/sword25/sfx/soundengine_script.cpp
+++ b/engines/sword25/sfx/soundengine_script.cpp
@@ -21,12 +21,12 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/common.h"
-#include "kernel/kernel.h"
-#include "script/script.h"
-#include "script/luabindhelper.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/kernel.h"
+#include "sword25/script/script.h"
+#include "sword25/script/luabindhelper.h"
 
-#include "soundengine.h"
+#include "sword25/sfx/soundengine.h"
 
 // -----------------------------------------------------------------------------