SWORD25: Path fixes for includes

svn-id: r53180

10 files changed, 42 insertions, 49 deletions

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"
 
 // -----------------------------------------------------------------------------