23 files changed, 80 insertions, 80 deletions
diff --git a/sword1/control.h b/sword1/control.h
index a020f477f6..68c4861ec1 100644
--- a/sword1/control.h
+++ b/sword1/control.h
@@ -23,7 +23,7 @@
 #define BSCONTROL_H
 
 #include "scummsys.h"
-#include "sworddefs.h"
+#include "sword1/sworddefs.h"
 
 class OSystem;
 class SaveFileManager;
diff --git a/sword1/debug.cpp b/sword1/debug.cpp
index a2d98d4439..5daf322fde 100644
--- a/sword1/debug.cpp
+++ b/sword1/debug.cpp
@@ -20,8 +20,8 @@
  */
 
 #include "stdafx.h"
-#include "debug.h"
 #include "common/util.h"
+#include "sword1/debug.h"
 
 namespace Sword1 {
 
diff --git a/sword1/eventman.cpp b/sword1/eventman.cpp
index 66a0bde566..1a631b6323 100644
--- a/sword1/eventman.cpp
+++ b/sword1/eventman.cpp
@@ -20,8 +20,8 @@
  */
 
 #include "stdafx.h"
-#include "eventman.h"
-#include "sworddefs.h"
+#include "sword1/eventman.h"
+#include "sword1/sworddefs.h"
 #include "common/util.h"
 
 namespace Sword1 {
diff --git a/sword1/eventman.h b/sword1/eventman.h
index 3df88c74e4..ae769338d6 100644
--- a/sword1/eventman.h
+++ b/sword1/eventman.h
@@ -22,7 +22,7 @@
 #ifndef BSEVENTMAN_H
 #define BSEVENTMAN_H
 
-#include "object.h"
+#include "sword1/object.h"
 
 namespace Sword1 {
 
diff --git a/sword1/logic.cpp b/sword1/logic.cpp
index 6f273104e2..d5a314dd34 100644
--- a/sword1/logic.cpp
+++ b/sword1/logic.cpp
@@ -20,21 +20,22 @@
  */
 
 #include "stdafx.h"
-#include "logic.h"
-#include "text.h"
-#include "sound.h"
-#include "eventman.h"
-#include "menu.h"
 #include "common/util.h"
-#include "router.h"
-#include "screen.h"
-#include "mouse.h"
-#include "sword1.h"
-#include "music.h"
-#include "swordres.h"
-#include "animation.h"
-
-#include "debug.h"
+
+#include "sword1/logic.h"
+#include "sword1/text.h"
+#include "sword1/sound.h"
+#include "sword1/eventman.h"
+#include "sword1/menu.h"
+#include "sword1/router.h"
+#include "sword1/screen.h"
+#include "sword1/mouse.h"
+#include "sword1/sword1.h"
+#include "sword1/music.h"
+#include "sword1/swordres.h"
+#include "sword1/animation.h"
+
+#include "sword1/debug.h"
 
 namespace Sword1 {
 
diff --git a/sword1/logic.h b/sword1/logic.h
index 3d3fc47288..edc65c8484 100644
--- a/sword1/logic.h
+++ b/sword1/logic.h
@@ -23,8 +23,8 @@
 #define BSLOGIC_H
 // combination of logic.c and scr_int.c
 
-#include "sworddefs.h"
-#include "objectman.h"
+#include "sword1/sworddefs.h"
+#include "sword1/objectman.h"
 #include "common/util.h"
 #include "sound/mixer.h"
 
diff --git a/sword1/memman.cpp b/sword1/memman.cpp
index 37c8574fbe..f26c61b33c 100644
--- a/sword1/memman.cpp
+++ b/sword1/memman.cpp
@@ -20,7 +20,7 @@
  */
 
 #include "stdafx.h"
-#include "memman.h"
+#include "sword1/memman.h"
 #include "common/util.h"
 
 namespace Sword1 {
diff --git a/sword1/menu.cpp b/sword1/menu.cpp
index 7eff49103a..61c8236ffa 100644
--- a/sword1/menu.cpp
+++ b/sword1/menu.cpp
@@ -20,14 +20,14 @@
  */
 
 #include "stdafx.h"
-#include "menu.h"
-#include "resman.h"
+#include "sword1/menu.h"
+#include "sword1/resman.h"
 #include "scummsys.h"
 #include "common/util.h"
 #include "system.h"
-#include "mouse.h"
-#include "screen.h"
-#include "logic.h"
+#include "sword1/mouse.h"
+#include "sword1/screen.h"
+#include "sword1/logic.h"
 
 namespace Sword1 {
 
diff --git a/sword1/menu.h b/sword1/menu.h
index 461d883248..d2b75c7276 100644
--- a/sword1/menu.h
+++ b/sword1/menu.h
@@ -22,8 +22,8 @@
 #ifndef BSMENU_H
 #define BSMENU_H
 
-#include "sworddefs.h"
-#include "object.h"
+#include "sword1/sworddefs.h"
+#include "sword1/object.h"
 
 namespace Sword1 {
 
diff --git a/sword1/mouse.cpp b/sword1/mouse.cpp
index ae8ecaae21..a979bfcf45 100644
--- a/sword1/mouse.cpp
+++ b/sword1/mouse.cpp
@@ -20,16 +20,16 @@
  */
 
 #include "stdafx.h"
-#include "mouse.h"
-#include "menu.h"
-#include "screen.h"
-#include "logic.h"
-#include "resman.h"
-#include "objectman.h"
-#include "sworddefs.h"
+#include "sword1/mouse.h"
+#include "sword1/menu.h"
+#include "sword1/screen.h"
+#include "sword1/logic.h"
+#include "sword1/resman.h"
+#include "sword1/objectman.h"
+#include "sword1/sworddefs.h"
 #include "system.h"
-#include "swordres.h"
-#include "menu.h"
+#include "sword1/swordres.h"
+#include "sword1/menu.h"
 
 namespace Sword1 {
 
diff --git a/sword1/mouse.h b/sword1/mouse.h
index 059dd41909..a5047674e4 100644
--- a/sword1/mouse.h
+++ b/sword1/mouse.h
@@ -23,8 +23,8 @@
 #define BSMOUSE_H
 
 #include "scummsys.h"
-#include "sworddefs.h"
-#include "object.h"
+#include "sword1/sworddefs.h"
+#include "sword1/object.h"
 
 class OSystem;
 
diff --git a/sword1/music.cpp b/sword1/music.cpp
index a3ef334a49..c0b7a67142 100644
--- a/sword1/music.cpp
+++ b/sword1/music.cpp
@@ -20,7 +20,7 @@
  */
 
 #include "stdafx.h"
-#include "music.h"
+#include "sword1/music.h"
 #include "sound/mixer.h"
 #include "common/util.h"
 #include "common/file.h"
diff --git a/sword1/objectman.cpp b/sword1/objectman.cpp
index 3e20f615b5..f82ffcc29d 100644
--- a/sword1/objectman.cpp
+++ b/sword1/objectman.cpp
@@ -20,12 +20,12 @@
  */
 
 #include "stdafx.h"
-#include "objectman.h"
+#include "sword1/objectman.h"
 #include "scummsys.h"
 #include "common/util.h"
-#include "sworddefs.h"
-#include "swordres.h"
-#include "sword1.h"
+#include "sword1/sworddefs.h"
+#include "sword1/swordres.h"
+#include "sword1/sword1.h"
 
 namespace Sword1 {
 
diff --git a/sword1/objectman.h b/sword1/objectman.h
index 39f032ad17..c65ae441c6 100644
--- a/sword1/objectman.h
+++ b/sword1/objectman.h
@@ -25,8 +25,8 @@
 #define OBJECTMAN_H
 
 #include "resman.h"
-#include "sworddefs.h"
-#include "object.h"
+#include "sword1/sworddefs.h"
+#include "sword1/object.h"
 
 namespace Sword1 {
 
@@ -63,4 +63,3 @@ private:
 } // End of namespace Sword1 
 
 #endif //OBJECTMAN_H
-
diff --git a/sword1/resman.h b/sword1/resman.h
index 44ddbd1dd1..f2b08c388d 100644
--- a/sword1/resman.h
+++ b/sword1/resman.h
@@ -22,9 +22,9 @@
 #ifndef RESMAN_H
 #define RESMAN_H
 
-#include "memman.h"
+#include "sword1/memman.h"
 #include "file.h"
-#include "sworddefs.h"
+#include "sword1/sworddefs.h"
 
 namespace Sword1 {
 
diff --git a/sword1/router.cpp b/sword1/router.cpp
index 82d3fdcd49..c594ba7ce0 100644
--- a/sword1/router.cpp
+++ b/sword1/router.cpp
@@ -20,13 +20,13 @@
  */
 
 #include "stdafx.h"
-#include "router.h"
+#include "sword1/router.h"
 #include "common/util.h"
 #include "scummsys.h"
-#include "swordres.h"
-#include "sworddefs.h"
-#include "objectman.h"
-#include "resman.h"
+#include "sword1/swordres.h"
+#include "sword1/sworddefs.h"
+#include "sword1/objectman.h"
+#include "sword1/resman.h"
 
 namespace Sword1 {
 
diff --git a/sword1/router.h b/sword1/router.h
index d4c89bf2fe..94b2ebc504 100644
--- a/sword1/router.h
+++ b/sword1/router.h
@@ -23,7 +23,7 @@
 #define BSROUTER_H
 
 #include "scummsys.h"
-#include "object.h"
+#include "sword1/object.h"
 
 namespace Sword1 {
 
diff --git a/sword1/screen.h b/sword1/screen.h
index 569b1fccb2..d6f5720b36 100644
--- a/sword1/screen.h
+++ b/sword1/screen.h
@@ -22,7 +22,7 @@
 #ifndef BSSCREEN_H
 #define BSSCREEN_H
 
-#include "sworddefs.h"
+#include "sword1/sworddefs.h"
 
 class OSystem;
 
diff --git a/sword1/sound.cpp b/sword1/sound.cpp
index 516f024558..f3fcdcb5cf 100644
--- a/sword1/sound.cpp
+++ b/sword1/sound.cpp
@@ -20,11 +20,11 @@
  */
 
 #include "stdafx.h"
-#include "sound.h"
+#include "sword1/sound.h"
 #include "common/util.h"
-#include "resman.h"
-#include "logic.h"
-#include "sword1.h"
+#include "sword1/resman.h"
+#include "sword1/logic.h"
+#include "sword1/sword1.h"
 
 namespace Sword1 {
 
diff --git a/sword1/sword1.cpp b/sword1/sword1.cpp
index 3ba4dc926b..8174ba7a8d 100644
--- a/sword1/sword1.cpp
+++ b/sword1/sword1.cpp
@@ -29,17 +29,17 @@
 #include "common/file.h"
 #include "common/timer.h"
 
-#include "memman.h"
-#include "resman.h"
-#include "objectman.h"
-#include "mouse.h"
-#include "logic.h"
-#include "sound.h"
-#include "screen.h"
-#include "swordres.h"
-#include "menu.h"
-#include "music.h"
-#include "control.h"
+#include "sword1/memman.h"
+#include "sword1/resman.h"
+#include "sword1/objectman.h"
+#include "sword1/mouse.h"
+#include "sword1/logic.h"
+#include "sword1/sound.h"
+#include "sword1/screen.h"
+#include "sword1/swordres.h"
+#include "sword1/menu.h"
+#include "sword1/music.h"
+#include "sword1/control.h"
 
 #include "gui/message.h"
 #include "gui/newgui.h"
diff --git a/sword1/sword1.h b/sword1/sword1.h
index 117b7526e6..a15322bfe2 100644
--- a/sword1/sword1.h
+++ b/sword1/sword1.h
@@ -25,7 +25,7 @@
 #include "base/engine.h"
 #include "common/util.h"
 #include "base/gameDetector.h"
-#include "sworddefs.h"
+#include "sword1/sworddefs.h"
 
 namespace Sword1 {
 
diff --git a/sword1/text.cpp b/sword1/text.cpp
index e72cf3c999..c832c581ba 100644
--- a/sword1/text.cpp
+++ b/sword1/text.cpp
@@ -20,12 +20,12 @@
  */
 
 #include "stdafx.h"
-#include "text.h"
-#include "resman.h"
-#include "objectman.h"
+#include "sword1/text.h"
+#include "sword1/resman.h"
+#include "sword1/objectman.h"
 #include "common/util.h"
-#include "swordres.h"
-#include "sworddefs.h"
+#include "sword1/swordres.h"
+#include "sword1/sworddefs.h"
 
 namespace Sword1 {
 
diff --git a/sword1/text.h b/sword1/text.h
index 5056421889..6619e7b32d 100644
--- a/sword1/text.h
+++ b/sword1/text.h
@@ -22,8 +22,8 @@
 #ifndef BSTEXT_H
 #define BSTEXT_H
 
-#include "object.h"
-#include "sworddefs.h"
+#include "sword1/object.h"
+#include "sword1/sworddefs.h"
 
 namespace Sword1 {