5 files changed, 31 insertions, 28 deletions
diff --git a/engines/sword25/kernel/filesystemutil.h b/engines/sword25/kernel/filesystemutil.h
index 63f76617c0..1835698d14 100755
--- a/engines/sword25/kernel/filesystemutil.h
+++ b/engines/sword25/kernel/filesystemutil.h
@@ -25,21 +25,21 @@
 	implementieren.
 */
 
-#ifndef BS_FILESYSTEMUTIL_H
-#define BS_FILESYSTEMUTIL_H
+#ifndef SWORD25_FILESYSTEMUTIL_H
+#define SWORD25_FILESYSTEMUTIL_H
 
 // -----------------------------------------------------------------------------
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/common.h"
-#include "kernel/bs_stdint.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/bs_stdint.h"
 
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
 #include <string>
 #include <vector>
 #include <ctime>
-#include "kernel/memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
 
 // -----------------------------------------------------------------------------
 // Klassendefinition
diff --git a/engines/sword25/kernel/kernel.h b/engines/sword25/kernel/kernel.h
index 8fda511451..6fb77133f6 100755
--- a/engines/sword25/kernel/kernel.h
+++ b/engines/sword25/kernel/kernel.h
@@ -27,20 +27,23 @@
 	Autor: Malte Thiesen
 */
 
-#ifndef _BS_KERNEL_H
-#define _BS_KERNEL_H
+#ifndef SWORD25_KERNEL_H
+#define SWORD25_KERNEL_H
+
+#include "common/util.h"
+#include "engines/engine.h"
 
 // Includes
-#include "memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
 #include <vector>
 #include <stack>
 #include <string>
-#include "memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
 
-#include "common.h"
-#include "bs_stdint.h"
-#include "window.h"
-#include "resmanager.h"
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/bs_stdint.h"
+#include "sword25/kernel/window.h"
+#include "sword25/kernel/resmanager.h"
 
 
 // Klassendefinition
diff --git a/engines/sword25/kernel/resmanager.h b/engines/sword25/kernel/resmanager.h
index 6bc6b2a8f8..0544950245 100755
--- a/engines/sword25/kernel/resmanager.h
+++ b/engines/sword25/kernel/resmanager.h
@@ -17,16 +17,16 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_RESOURCEMANAGER_H
-#define BS_RESOURCEMANAGER_H
+#ifndef SWORD25_RESOURCEMANAGER_H
+#define SWORD25_RESOURCEMANAGER_H
 
 // Includes
-#include "memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
 #include <vector>
 #include <list>
-#include "memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
 
-#include "common.h"
+#include "sword25/kernel/common.h"
 
 // Klassendefinition
 class BS_ResourceService;
@@ -35,7 +35,7 @@ class BS_Kernel;
 
 class BS_ResourceManager
 {
-friend BS_Kernel;
+friend class BS_Kernel;
 
 public:
 	/**
diff --git a/engines/sword25/kernel/service.h b/engines/sword25/kernel/service.h
index d79194f41a..c5ca98f747 100755
--- a/engines/sword25/kernel/service.h
+++ b/engines/sword25/kernel/service.h
@@ -31,11 +31,11 @@
 	Autor: Malte Thiesen
 */
 
-#ifndef _BS_SERVICE_H
-#define _BS_SERVICE_H
+#ifndef SWORD25_SERVICE_H
+#define SWORD25_SERVICE_H
 
 // Includes
-#include "common.h"
+#include "sword25/kernel/common.h"
 
 // Klassendefinition
 class BS_Kernel;
@@ -54,4 +54,4 @@ public:
 	virtual ~BS_Service(){};
 };
 
-#endif
-\ No newline at end of file
+#endif
diff --git a/engines/sword25/kernel/window.h b/engines/sword25/kernel/window.h
index 6a6121f247..a89d8972c1 100755
--- a/engines/sword25/kernel/window.h
+++ b/engines/sword25/kernel/window.h
@@ -27,11 +27,11 @@
 	Autor: Malte Thiesen
 */
 
-#ifndef _BS_WINDOW_H
-#define _BS_WINDOW_H
+#ifndef SWORD25_WINDOW_H
+#define SWORD25_WINDOW_H
 
 // Includes
-#include "common.h"
+#include "sword25/kernel/common.h"
 
 // Klassendefinition
 /**
@@ -173,4 +173,4 @@ public:
 	static BS_Window* CreateBSWindow(int X, int Y, int Width, int Height, bool Visible);
 };
 
-#endif
-\ No newline at end of file
+#endif