SWORD25: Path fixes for includes

svn-id: r53180

4 files changed, 13 insertions, 18 deletions

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