6 files changed, 28 insertions, 28 deletions
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