When including files from common/, explicitly use the common/ prefix

svn-id: r18444

23 files changed, 31 insertions, 31 deletions

diff --git a/sword1/control.h b/sword1/control.h
index cda29b5ae2..26f976daea 100644
--- a/sword1/control.h
+++ b/sword1/control.h
@@ -22,7 +22,7 @@
 #ifndef BSCONTROL_H
 #define BSCONTROL_H
 
-#include "scummsys.h"
+#include "common/scummsys.h"
 #include "sword1/sworddefs.h"
 
 class OSystem;
diff --git a/sword1/credits.cpp b/sword1/credits.cpp
index 55587406b1..393318f545 100644
--- a/sword1/credits.cpp
+++ b/sword1/credits.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 
 #include "sword1/credits.h"
 #include "sword1/screen.h"
diff --git a/sword1/debug.cpp b/sword1/debug.cpp
index 1d6506d69e..a93b4c646a 100644
--- a/sword1/debug.cpp
+++ b/sword1/debug.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/util.h"
 #include "sword1/debug.h"
 
diff --git a/sword1/debug.h b/sword1/debug.h
index 640b64b76a..8804ecaef0 100644
--- a/sword1/debug.h
+++ b/sword1/debug.h
@@ -22,7 +22,7 @@
 #ifndef BSDEBUG_H
 #define BSDEBUG_H
 
-#include "scummsys.h"
+#include "common/scummsys.h"
 
 namespace Sword1 {
 
diff --git a/sword1/eventman.cpp b/sword1/eventman.cpp
index 0fc60cb881..02ba1874ab 100644
--- a/sword1/eventman.cpp
+++ b/sword1/eventman.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "sword1/eventman.h"
 #include "sword1/sworddefs.h"
 #include "common/util.h"
diff --git a/sword1/logic.cpp b/sword1/logic.cpp
index 9206007616..6a872eb57f 100644
--- a/sword1/logic.cpp
+++ b/sword1/logic.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/util.h"
 
 #include "sword1/logic.h"
diff --git a/sword1/memman.cpp b/sword1/memman.cpp
index ab26f02ac4..55570b90db 100644
--- a/sword1/memman.cpp
+++ b/sword1/memman.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "sword1/memman.h"
 #include "common/util.h"
 
diff --git a/sword1/memman.h b/sword1/memman.h
index f2c003e95d..277159785e 100644
--- a/sword1/memman.h
+++ b/sword1/memman.h
@@ -22,7 +22,7 @@
 #ifndef MEMMAN_H
 #define MEMMAN_H
 
-#include "scummsys.h"
+#include "common/scummsys.h"
 
 namespace Sword1 {
 
diff --git a/sword1/menu.cpp b/sword1/menu.cpp
index 1e7bc4d196..c3b0b5eb6d 100644
--- a/sword1/menu.cpp
+++ b/sword1/menu.cpp
@@ -19,12 +19,12 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "sword1/menu.h"
 #include "sword1/resman.h"
-#include "scummsys.h"
+#include "common/scummsys.h"
 #include "common/util.h"
-#include "system.h"
+#include "common/system.h"
 #include "sword1/mouse.h"
 #include "sword1/screen.h"
 #include "sword1/logic.h"
diff --git a/sword1/mouse.cpp b/sword1/mouse.cpp
index 3bf17f778c..4550b5c93f 100644
--- a/sword1/mouse.cpp
+++ b/sword1/mouse.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "sword1/mouse.h"
 #include "sword1/menu.h"
 #include "sword1/screen.h"
@@ -27,7 +27,7 @@
 #include "sword1/resman.h"
 #include "sword1/objectman.h"
 #include "sword1/sworddefs.h"
-#include "system.h"
+#include "common/system.h"
 #include "sword1/swordres.h"
 #include "sword1/menu.h"
 
diff --git a/sword1/mouse.h b/sword1/mouse.h
index 923b70b27e..59f55fc323 100644
--- a/sword1/mouse.h
+++ b/sword1/mouse.h
@@ -22,7 +22,7 @@
 #ifndef BSMOUSE_H
 #define BSMOUSE_H
 
-#include "scummsys.h"
+#include "common/scummsys.h"
 #include "sword1/sworddefs.h"
 #include "sword1/object.h"
 
diff --git a/sword1/music.cpp b/sword1/music.cpp
index 02eb47714c..6d3efe5f80 100644
--- a/sword1/music.cpp
+++ b/sword1/music.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 
 #include "sword1/music.h"
 
diff --git a/sword1/music.h b/sword1/music.h
index d3dd46ccd1..8e28cc3fd6 100644
--- a/sword1/music.h
+++ b/sword1/music.h
@@ -22,7 +22,7 @@
 #ifndef BSMUSIC_H
 #define BSMUSIC_H
 
-#include "scummsys.h"
+#include "common/scummsys.h"
 #include "common/mutex.h"
 #include "common/file.h"
 #include "sound/audiostream.h"
diff --git a/sword1/object.h b/sword1/object.h
index 75e066aa90..119dd497d1 100644
--- a/sword1/object.h
+++ b/sword1/object.h
@@ -22,7 +22,7 @@
 #ifndef BSOBJECT_H
 #define BSOBJECT_H
 
-#include "scummsys.h"
+#include "common/scummsys.h"
 
 namespace Sword1 {
 
diff --git a/sword1/objectman.cpp b/sword1/objectman.cpp
index 3358e2b53f..37b79a4fc2 100644
--- a/sword1/objectman.cpp
+++ b/sword1/objectman.cpp
@@ -19,9 +19,9 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "sword1/objectman.h"
-#include "scummsys.h"
+#include "common/scummsys.h"
 #include "common/util.h"
 #include "sword1/sworddefs.h"
 #include "sword1/swordres.h"
diff --git a/sword1/resman.cpp b/sword1/resman.cpp
index 4d7f29d07a..5a1b4683b7 100644
--- a/sword1/resman.cpp
+++ b/sword1/resman.cpp
@@ -19,8 +19,8 @@
  *
  */
 
-#include "stdafx.h"
-#include "scummsys.h"
+#include "common/stdafx.h"
+#include "common/scummsys.h"
 #include "sword1/memman.h"
 #include "sword1/resman.h"
 #include "sword1/sworddefs.h"
diff --git a/sword1/router.cpp b/sword1/router.cpp
index e8c3296f45..a126adedbc 100644
--- a/sword1/router.cpp
+++ b/sword1/router.cpp
@@ -19,10 +19,10 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "sword1/router.h"
 #include "common/util.h"
-#include "scummsys.h"
+#include "common/scummsys.h"
 #include "sword1/swordres.h"
 #include "sword1/sworddefs.h"
 #include "sword1/objectman.h"
diff --git a/sword1/router.h b/sword1/router.h
index 397439c814..709b56fd36 100644
--- a/sword1/router.h
+++ b/sword1/router.h
@@ -22,7 +22,7 @@
 #ifndef BSROUTER_H
 #define BSROUTER_H
 
-#include "scummsys.h"
+#include "common/scummsys.h"
 #include "sword1/object.h"
 
 namespace Sword1 {
diff --git a/sword1/screen.cpp b/sword1/screen.cpp
index 994419261b..af156e90de 100644
--- a/sword1/screen.cpp
+++ b/sword1/screen.cpp
@@ -19,9 +19,9 @@
  *
  */
 
-#include "stdafx.h"
-#include "scummsys.h"
-#include "system.h"
+#include "common/stdafx.h"
+#include "common/scummsys.h"
+#include "common/system.h"
 #include "common/util.h"
 #include "sword1/screen.h"
 #include "sword1/logic.h"
diff --git a/sword1/sound.cpp b/sword1/sound.cpp
index 2673c9fc92..94c7eb13db 100644
--- a/sword1/sound.cpp
+++ b/sword1/sound.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "sword1/sound.h"
 #include "common/util.h"
 #include "sword1/resman.h"
diff --git a/sword1/staticres.cpp b/sword1/staticres.cpp
index 0ce9f90c89..c2cba8fc6d 100644
--- a/sword1/staticres.cpp
+++ b/sword1/staticres.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "sword1/sworddefs.h"
 #include "sword1/swordres.h"
 #include "sword1/screen.h"
diff --git a/sword1/sword1.cpp b/sword1/sword1.cpp
index 87c9d3d46e..a07cb499e1 100644
--- a/sword1/sword1.cpp
+++ b/sword1/sword1.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "sword1.h"
 
 #include "backends/fs/fs.h"
diff --git a/sword1/text.cpp b/sword1/text.cpp
index aa92b28aaa..5ff35811dd 100644
--- a/sword1/text.cpp
+++ b/sword1/text.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "sword1/text.h"
 #include "sword1/resman.h"
 #include "sword1/objectman.h"