SWORD25: Fixed rest of the include paths

svn-id: r53181

7 files changed, 43 insertions, 43 deletions

diff --git a/engines/sword25/gfx/opengl/glimage.cpp b/engines/sword25/gfx/opengl/glimage.cpp
index 1f5322516b..3dde73a335 100755
--- a/engines/sword25/gfx/opengl/glimage.cpp
+++ b/engines/sword25/gfx/opengl/glimage.cpp
@@ -21,11 +21,11 @@
 // INCLUDES
 // -----------------------------------------------------------------------------
 
-#include "util/glsprites/glsprites.h"
-#include "package/packagemanager.h"
-#include "gfx/image/imageloader.h"
-#include "openglgfx.h"
-#include "glimage.h"
+#include "sword25/util/glsprites/glsprites.h"
+#include "sword25/package/packagemanager.h"
+#include "sword25/gfx/image/imageloader.h"
+#include "sword25/gfx/opengl/openglgfx.h"
+#include "sword25/gfx/opengl/glimage.h"
 
 #define BS_LOG_PREFIX "GLIMAGE"
 
diff --git a/engines/sword25/gfx/opengl/glimage.h b/engines/sword25/gfx/opengl/glimage.h
index d9c81dc4a5..8a910c6b5f 100755
--- a/engines/sword25/gfx/opengl/glimage.h
+++ b/engines/sword25/gfx/opengl/glimage.h
@@ -17,16 +17,16 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_GL_IMAGE_H
-#define BS_GL_IMAGE_H
+#ifndef SWORD25_GL_IMAGE_H
+#define SWORD25_GL_IMAGE_H
 
 // -----------------------------------------------------------------------------
 // INCLUDES
 // -----------------------------------------------------------------------------
 
-#include "kernel/common.h"
-#include "gfx/image/image.h"
-#include "gfx/graphicengine.h"
+#include "sword25/kernel/common.h"
+#include "sword25/gfx/image/image.h"
+#include "sword25/gfx/graphicengine.h"
 
 #include <vector>
 
diff --git a/engines/sword25/gfx/opengl/glvectorimageblit.cpp b/engines/sword25/gfx/opengl/glvectorimageblit.cpp
index 38cfd9fa85..330da47dac 100755
--- a/engines/sword25/gfx/opengl/glvectorimageblit.cpp
+++ b/engines/sword25/gfx/opengl/glvectorimageblit.cpp
@@ -21,9 +21,9 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "gfx/image/vectorimage.h"
-#include "gfx/image/vectorimagerenderer.h"
-#include "util/glsprites/glsprites.h"
+#include "sword25/gfx/image/vectorimage.h"
+#include "sword25/gfx/image/vectorimagerenderer.h"
+#include "sword25/util/glsprites/glsprites.h"
 
 #include <vector>
 using namespace std;
diff --git a/engines/sword25/gfx/opengl/openglgfx.cpp b/engines/sword25/gfx/opengl/openglgfx.cpp
index 6131a229a5..38b1136aa1 100755
--- a/engines/sword25/gfx/opengl/openglgfx.cpp
+++ b/engines/sword25/gfx/opengl/openglgfx.cpp
@@ -25,20 +25,20 @@
 #include <windows.h>
 #include <GL/GL.h>
 
-#include "util/glsprites/glsprites.h"
-#include "../bitmapresource.h"
-#include "../animationresource.h"
-#include "../fontresource.h"
-#include "../panel.h"
-#include "../renderobjectmanager.h"
-#include "../image/vectorimage.h"
-#include "package/packagemanager.h"
-#include "kernel/inputpersistenceblock.h"
-#include "kernel/outputpersistenceblock.h"
-
-#include "openglgfx.h"
-#include "glimage.h"
-#include "swimage.h"
+#include "sword25/util/glsprites/glsprites.h"
+#include "sword25/gfx/bitmapresource.h"
+#include "sword25/gfx/animationresource.h"
+#include "sword25/gfx/fontresource.h"
+#include "sword25/gfx/panel.h"
+#include "sword25/gfx/renderobjectmanager.h"
+#include "sword25/gfx/image/vectorimage.h"
+#include "sword25/package/packagemanager.h"
+#include "sword25/kernel/inputpersistenceblock.h"
+#include "sword25/kernel/outputpersistenceblock.h"
+
+#include "sword25/gfx/opengl/openglgfx.h"
+#include "sword25/gfx/opengl/glimage.h"
+#include "sword25/gfx/opengl/swimage.h"
 
 #include <algorithm>
 
diff --git a/engines/sword25/gfx/opengl/openglgfx.h b/engines/sword25/gfx/opengl/openglgfx.h
index ec305bee8f..37d10000e9 100755
--- a/engines/sword25/gfx/opengl/openglgfx.h
+++ b/engines/sword25/gfx/opengl/openglgfx.h
@@ -17,22 +17,22 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_OPENGLGFX_H
-#define BS_OPENGLGFX_H
+#ifndef SWORD25_OPENGLGFX_H
+#define SWORD25_OPENGLGFX_H
 
 // -----------------------------------------------------------------------------
 // INCLUDES
 // -----------------------------------------------------------------------------
 
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
 #include <memory>
 #include <vector>
-#include "kernel/memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
 
-#include "kernel/common.h"
-#include "../graphicengine.h"
-#include "../renderobjectptr.h"
-#include "util/glsprites/glsprites.h"
+#include "sword25/kernel/common.h"
+#include "sword25/gfx/graphicengine.h"
+#include "sword25/gfx/renderobjectptr.h"
+#include "sword25/util/glsprites/glsprites.h"
 
 // -----------------------------------------------------------------------------
 // FORWARD DECLARATIONS
diff --git a/engines/sword25/gfx/opengl/swimage.cpp b/engines/sword25/gfx/opengl/swimage.cpp
index 7bc36b5f69..2fee1d0588 100755
--- a/engines/sword25/gfx/opengl/swimage.cpp
+++ b/engines/sword25/gfx/opengl/swimage.cpp
@@ -21,10 +21,10 @@
 // INCLUDES
 // -----------------------------------------------------------------------------
 
-#include "package/packagemanager.h"
-#include "gfx/image/imageloader.h"
+#include "sword25/package/packagemanager.h"
+#include "sword25/gfx/image/imageloader.h"
 
-#include "swimage.h"
+#include "sword25/gfx/opengl/swimage.h"
 
 #define BS_LOG_PREFIX "SWIMAGE"
 
diff --git a/engines/sword25/gfx/opengl/swimage.h b/engines/sword25/gfx/opengl/swimage.h
index 1f48c238b3..c8bf363bd6 100755
--- a/engines/sword25/gfx/opengl/swimage.h
+++ b/engines/sword25/gfx/opengl/swimage.h
@@ -17,16 +17,16 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_SWIMAGE_H
-#define BS_SWIMAGE_H
+#ifndef SWORD25_SWIMAGE_H
+#define SWORD25_SWIMAGE_H
 
 // -----------------------------------------------------------------------------
 // INCLUDES
 // -----------------------------------------------------------------------------
 
-#include "kernel/common.h"
-#include "gfx/image/image.h"
-#include "gfx/graphicengine.h"
+#include "sword25/kernel/common.h"
+#include "sword25/gfx/image/image.h"
+#include "sword25/gfx/graphicengine.h"
 
 
 // -----------------------------------------------------------------------------