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

svn-id: r18444

83 files changed, 83 insertions, 83 deletions

diff --git a/scumm/actor.cpp b/scumm/actor.cpp
index a0551b10ad..5ae5dfb5f1 100644
--- a/scumm/actor.cpp
+++ b/scumm/actor.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "scumm/scumm.h"
 #include "scumm/actor.h"
 #include "scumm/akos.h"
diff --git a/scumm/akos.cpp b/scumm/akos.cpp
index 65fd9a8483..8ca603fc85 100644
--- a/scumm/akos.cpp
+++ b/scumm/akos.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "scumm/scumm.h"
 #include "scumm/actor.h"
 #include "scumm/akos.h"
diff --git a/scumm/base-costume.cpp b/scumm/base-costume.cpp
index 89df0607a3..7dde9af10a 100644
--- a/scumm/base-costume.cpp
+++ b/scumm/base-costume.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "scumm/base-costume.h"
 #include "scumm/costume.h"
 
diff --git a/scumm/bomp.cpp b/scumm/bomp.cpp
index 0a70d75da0..9a50eafa94 100644
--- a/scumm/bomp.cpp
+++ b/scumm/bomp.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "scumm/scumm.h"
 #include "scumm/akos.h"
 #include "scumm/bomp.h"
diff --git a/scumm/boxes.cpp b/scumm/boxes.cpp
index d6f308c49b..63ce7fcf12 100644
--- a/scumm/boxes.cpp
+++ b/scumm/boxes.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "scumm/scumm.h"
 #include "scumm/actor.h"
 #include "scumm/boxes.h"
diff --git a/scumm/camera.cpp b/scumm/camera.cpp
index 80b95fd74b..205d017903 100644
--- a/scumm/camera.cpp
+++ b/scumm/camera.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "scumm/scumm.h"
 #include "scumm/intern.h"
 #include "scumm/actor.h"
diff --git a/scumm/charset.cpp b/scumm/charset.cpp
index 875b2fcf07..c614b82a88 100644
--- a/scumm/charset.cpp
+++ b/scumm/charset.cpp
@@ -18,7 +18,7 @@
  * $Header$
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "scumm/charset.h"
 #include "scumm/scumm.h"
 #include "scumm/nut_renderer.h"
diff --git a/scumm/costume.cpp b/scumm/costume.cpp
index 29e701bd34..f7d85b7971 100644
--- a/scumm/costume.cpp
+++ b/scumm/costume.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "scumm/scumm.h"
 #include "scumm/actor.h"
 #include "scumm/costume.h"
diff --git a/scumm/cursor.cpp b/scumm/cursor.cpp
index 98f680fd54..18e7675f03 100644
--- a/scumm/cursor.cpp
+++ b/scumm/cursor.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/system.h"
 #include "common/util.h"
 #include "scumm/bomp.h"
diff --git a/scumm/debugger.cpp b/scumm/debugger.cpp
index fac53e82e2..45163bb74c 100644
--- a/scumm/debugger.cpp
+++ b/scumm/debugger.cpp
@@ -18,7 +18,7 @@
  * $Header$
  *
  */
-#include "stdafx.h"
+#include "common/stdafx.h"
 
 #include "common/config-manager.h"
 #include "common/file.h"
diff --git a/scumm/dialogs.cpp b/scumm/dialogs.cpp
index cba5ed83d9..aeef1ec376 100644
--- a/scumm/dialogs.cpp
+++ b/scumm/dialogs.cpp
@@ -18,7 +18,7 @@
  * $Header$
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 
 #include "common/config-manager.h"
 #include "common/system.h"
diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp
index db3d530018..7342989f61 100644
--- a/scumm/gfx.cpp
+++ b/scumm/gfx.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/system.h"
 #include "scumm/scumm.h"
 #include "scumm/actor.h"
diff --git a/scumm/help.cpp b/scumm/help.cpp
index 9d690841ca..493c867c96 100644
--- a/scumm/help.cpp
+++ b/scumm/help.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "scumm/help.h"
 #include "scumm/scumm.h"
 #include "common/str.h"
diff --git a/scumm/imuse.cpp b/scumm/imuse.cpp
index fead93c9d6..5570e7c2e1 100644
--- a/scumm/imuse.cpp
+++ b/scumm/imuse.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 
 #include "base/version.h"
 
diff --git a/scumm/imuse_digi/dimuse.cpp b/scumm/imuse_digi/dimuse.cpp
index 20165f41a8..f6f2d71070 100644
--- a/scumm/imuse_digi/dimuse.cpp
+++ b/scumm/imuse_digi/dimuse.cpp
@@ -18,7 +18,7 @@
  * $Header$
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/system.h"
 #include "common/timer.h"
 
diff --git a/scumm/imuse_digi/dimuse_bndmgr.cpp b/scumm/imuse_digi/dimuse_bndmgr.cpp
index b076ae0773..35a0414e3d 100644
--- a/scumm/imuse_digi/dimuse_bndmgr.cpp
+++ b/scumm/imuse_digi/dimuse_bndmgr.cpp
@@ -18,7 +18,7 @@
  * $Header$
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/scummsys.h"
 #include "scumm/scumm.h"
 #include "scumm/util.h"
diff --git a/scumm/imuse_digi/dimuse_codecs.cpp b/scumm/imuse_digi/dimuse_codecs.cpp
index 39ec1d3332..1c59cb9746 100644
--- a/scumm/imuse_digi/dimuse_codecs.cpp
+++ b/scumm/imuse_digi/dimuse_codecs.cpp
@@ -18,7 +18,7 @@
  * $Header$
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/scummsys.h"
 #include "common/util.h"
 
diff --git a/scumm/imuse_digi/dimuse_music.cpp b/scumm/imuse_digi/dimuse_music.cpp
index 43490da5e9..0ee5ecd291 100644
--- a/scumm/imuse_digi/dimuse_music.cpp
+++ b/scumm/imuse_digi/dimuse_music.cpp
@@ -18,7 +18,7 @@
  * $Header$
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/scummsys.h"
 #include "scumm/scumm.h"
 #include "scumm/imuse_digi/dimuse.h"
diff --git a/scumm/imuse_digi/dimuse_script.cpp b/scumm/imuse_digi/dimuse_script.cpp
index b7f3691e35..3113318f0b 100644
--- a/scumm/imuse_digi/dimuse_script.cpp
+++ b/scumm/imuse_digi/dimuse_script.cpp
@@ -18,7 +18,7 @@
  * $Header$
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/system.h"
 #include "common/timer.h"
 
diff --git a/scumm/imuse_digi/dimuse_sndmgr.cpp b/scumm/imuse_digi/dimuse_sndmgr.cpp
index af8aafefd9..ebc0a4db1b 100644
--- a/scumm/imuse_digi/dimuse_sndmgr.cpp
+++ b/scumm/imuse_digi/dimuse_sndmgr.cpp
@@ -18,7 +18,7 @@
  * $Header$
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/scummsys.h"
 #include "common/util.h"
 
diff --git a/scumm/imuse_digi/dimuse_sndmgr.h b/scumm/imuse_digi/dimuse_sndmgr.h
index 4b4d5c488d..2881316174 100644
--- a/scumm/imuse_digi/dimuse_sndmgr.h
+++ b/scumm/imuse_digi/dimuse_sndmgr.h
@@ -21,7 +21,7 @@
 #ifndef IMUSE_DIGI_SNDMGR_H
 #define IMUSE_DIGI_SNDMGR_H
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/scummsys.h"
 #include "sound/audiostream.h"
 #include "scumm/imuse_digi/dimuse_bndmgr.h"
diff --git a/scumm/imuse_digi/dimuse_tables.cpp b/scumm/imuse_digi/dimuse_tables.cpp
index ebb5a718c2..7c5527431d 100644
--- a/scumm/imuse_digi/dimuse_tables.cpp
+++ b/scumm/imuse_digi/dimuse_tables.cpp
@@ -18,7 +18,7 @@
  * $Header$
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "scumm/imuse_digi/dimuse.h"
 
 namespace Scumm {
diff --git a/scumm/imuse_digi/dimuse_track.cpp b/scumm/imuse_digi/dimuse_track.cpp
index 5a32beff1a..f0fda62f8a 100644
--- a/scumm/imuse_digi/dimuse_track.cpp
+++ b/scumm/imuse_digi/dimuse_track.cpp
@@ -18,7 +18,7 @@
  * $Header$
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/timer.h"
 
 #include "scumm/actor.h"
diff --git a/scumm/imuse_player.cpp b/scumm/imuse_player.cpp
index 2502f55d3c..6dbcdd66b4 100644
--- a/scumm/imuse_player.cpp
+++ b/scumm/imuse_player.cpp
@@ -19,7 +19,7 @@
  * $Header$
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 
 #include "common/util.h"
 #include "base/engine.h"
diff --git a/scumm/input.cpp b/scumm/input.cpp
index d3f8071b8d..3a3d0fe813 100644
--- a/scumm/input.cpp
+++ b/scumm/input.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 
 #include "common/config-manager.h"
 #include "common/system.h"
diff --git a/scumm/insane/insane.cpp b/scumm/insane/insane.cpp
index 61e0eccb16..22133c0915 100644
--- a/scumm/insane/insane.cpp
+++ b/scumm/insane/insane.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 
 #include "base/engine.h"
 
diff --git a/scumm/insane/insane_ben.cpp b/scumm/insane/insane_ben.cpp
index 1f56df116a..1184be452a 100644
--- a/scumm/insane/insane_ben.cpp
+++ b/scumm/insane/insane_ben.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 
 #include "base/engine.h"
 
diff --git a/scumm/insane/insane_enemy.cpp b/scumm/insane/insane_enemy.cpp
index 336166132d..dadaba995c 100644
--- a/scumm/insane/insane_enemy.cpp
+++ b/scumm/insane/insane_enemy.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 
 #include "base/engine.h"
 
diff --git a/scumm/insane/insane_iact.cpp b/scumm/insane/insane_iact.cpp
index bd53842e38..be341967fa 100644
--- a/scumm/insane/insane_iact.cpp
+++ b/scumm/insane/insane_iact.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 
 #include "base/engine.h"
 
diff --git a/scumm/insane/insane_scenes.cpp b/scumm/insane/insane_scenes.cpp
index 49a0035e7e..2a549fd307 100644
--- a/scumm/insane/insane_scenes.cpp
+++ b/scumm/insane/insane_scenes.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 
 #include "base/engine.h"
 
diff --git a/scumm/instrument.cpp b/scumm/instrument.cpp
index 284c562ac7..2c86c53db0 100644
--- a/scumm/instrument.cpp
+++ b/scumm/instrument.cpp
@@ -19,7 +19,7 @@
  * $Header$
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "scumm/scumm.h"
 #include "scumm/saveload.h"
 #include "scumm/instrument.h"
diff --git a/scumm/instrument.h b/scumm/instrument.h
index 9e0c397b55..51a0afb081 100644
--- a/scumm/instrument.h
+++ b/scumm/instrument.h
@@ -22,7 +22,7 @@
 #ifndef INSTRUMENT_H
 #define INSTRUMENT_H
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/scummsys.h"
 
 class MidiChannel;
diff --git a/scumm/logic_he.cpp b/scumm/logic_he.cpp
index 9909fbb0a3..50db5c4a09 100644
--- a/scumm/logic_he.cpp
+++ b/scumm/logic_he.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 
 #include "scumm/intern.h"
 #include "scumm/logic_he.h"
diff --git a/scumm/logic_he.h b/scumm/logic_he.h
index 66c4333d02..edf704128f 100644
--- a/scumm/logic_he.h
+++ b/scumm/logic_he.h
@@ -22,7 +22,7 @@
 #if !defined(LOGIC_HE_H) && !defined(DISABLE_HE)
 #define LOGIC_HE_H
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 
 #include "scumm/intern.h"
 
diff --git a/scumm/midiparser_eup.cpp b/scumm/midiparser_eup.cpp
index afffca84f9..5e9280d240 100644
--- a/scumm/midiparser_eup.cpp
+++ b/scumm/midiparser_eup.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "sound/midiparser.h"
 #include "sound/mididrv.h"
 #include "common/util.h"
diff --git a/scumm/midiparser_ro.cpp b/scumm/midiparser_ro.cpp
index af93d6f97c..650c449247 100644
--- a/scumm/midiparser_ro.cpp
+++ b/scumm/midiparser_ro.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "sound/midiparser.h"
 #include "sound/mididrv.h"
 #include "common/util.h"
diff --git a/scumm/nut_renderer.cpp b/scumm/nut_renderer.cpp
index 6c9a5c976b..d8b6ed0d79 100644
--- a/scumm/nut_renderer.cpp
+++ b/scumm/nut_renderer.cpp
@@ -18,7 +18,7 @@
  * $Header$
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "scumm/scumm.h"
 #include "scumm/nut_renderer.h"
 #include "scumm/bomp.h"
diff --git a/scumm/object.cpp b/scumm/object.cpp
index 262a79a777..a852b4f400 100644
--- a/scumm/object.cpp
+++ b/scumm/object.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "scumm/scumm.h"
 #include "scumm/actor.h"
 #include "scumm/bomp.h"
diff --git a/scumm/palette.cpp b/scumm/palette.cpp
index 76c5f72e6d..f1a49819d0 100644
--- a/scumm/palette.cpp
+++ b/scumm/palette.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/system.h"
 #include "common/util.h"
 
diff --git a/scumm/palette_he.cpp b/scumm/palette_he.cpp
index 782fc865f6..929481191a 100644
--- a/scumm/palette_he.cpp
+++ b/scumm/palette_he.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/system.h"
 #include "common/util.h"
 #include "scumm/scumm.h"
diff --git a/scumm/player_mod.cpp b/scumm/player_mod.cpp
index 80d747ff62..6ae58b99c0 100644
--- a/scumm/player_mod.cpp
+++ b/scumm/player_mod.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "scumm/player_mod.h"
 #include "sound/mixer.h"
 #include "sound/rate.h"
diff --git a/scumm/player_nes.cpp b/scumm/player_nes.cpp
index 278e763978..6cf48fbc1d 100644
--- a/scumm/player_nes.cpp
+++ b/scumm/player_nes.cpp
@@ -21,7 +21,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "base/engine.h"
 #include "scumm/player_nes.h"
 #include "scumm/scumm.h"
diff --git a/scumm/player_v1.cpp b/scumm/player_v1.cpp
index 151f0345d6..0ca5c7af46 100644
--- a/scumm/player_v1.cpp
+++ b/scumm/player_v1.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "base/engine.h"
 #include "scumm/player_v1.h"
 #include "scumm/scumm.h"
diff --git a/scumm/player_v2.cpp b/scumm/player_v2.cpp
index 97eba6cecd..a70a4b9a1f 100644
--- a/scumm/player_v2.cpp
+++ b/scumm/player_v2.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "base/engine.h"
 #include "scumm/player_v2.h"
 #include "scumm/scumm.h"
diff --git a/scumm/player_v2a.cpp b/scumm/player_v2a.cpp
index f913295e8e..24ee173dc1 100644
--- a/scumm/player_v2a.cpp
+++ b/scumm/player_v2a.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "base/engine.h"
 #include "scumm/player_v2a.h"
 #include "scumm/scumm.h"
diff --git a/scumm/player_v3a.cpp b/scumm/player_v3a.cpp
index e33a258435..8a35f8bb61 100644
--- a/scumm/player_v3a.cpp
+++ b/scumm/player_v3a.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "base/engine.h"
 #include "scumm/player_v3a.h"
 #include "scumm/scumm.h"
diff --git a/scumm/resource.cpp b/scumm/resource.cpp
index b79b575d37..2d9df5f41f 100644
--- a/scumm/resource.cpp
+++ b/scumm/resource.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/str.h"
 
 #include "scumm/charset.h"
diff --git a/scumm/resource_v2.cpp b/scumm/resource_v2.cpp
index 27b62fde91..d7f92a5de2 100644
--- a/scumm/resource_v2.cpp
+++ b/scumm/resource_v2.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 
 #include "scumm/scumm.h"
 #include "scumm/intern.h"
diff --git a/scumm/resource_v3.cpp b/scumm/resource_v3.cpp
index 6d504d8110..4ce8e21efd 100644
--- a/scumm/resource_v3.cpp
+++ b/scumm/resource_v3.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "scumm/scumm.h"
 #include "scumm/intern.h"
 #include "scumm/util.h"
diff --git a/scumm/resource_v4.cpp b/scumm/resource_v4.cpp
index e00c96aa9a..172125f3fd 100644
--- a/scumm/resource_v4.cpp
+++ b/scumm/resource_v4.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "scumm/scumm.h"
 #include "scumm/intern.h"
 #include "scumm/resource.h"
diff --git a/scumm/resource_v7he.cpp b/scumm/resource_v7he.cpp
index 04a3d6ce5d..2240377a63 100644
--- a/scumm/resource_v7he.cpp
+++ b/scumm/resource_v7he.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "scumm/scumm.h"
 #include "scumm/intern.h"
 #include "scumm/resource.h"
diff --git a/scumm/room.cpp b/scumm/room.cpp
index 48248dd01e..1b30e54225 100644
--- a/scumm/room.cpp
+++ b/scumm/room.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 
 #include "scumm/actor.h"
 #include "scumm/boxes.h"
diff --git a/scumm/saveload.cpp b/scumm/saveload.cpp
index a146076988..a8c3254cd1 100644
--- a/scumm/saveload.cpp
+++ b/scumm/saveload.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 
 #include "common/config-manager.h"
 #include "common/savefile.h"
diff --git a/scumm/script.cpp b/scumm/script.cpp
index 37598b3c53..ad2e2f0366 100644
--- a/scumm/script.cpp
+++ b/scumm/script.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 
 #include "common/config-manager.h"
 #include "common/util.h"
diff --git a/scumm/script_c64.cpp b/scumm/script_c64.cpp
index a52251ec36..8f182af6ea 100644
--- a/scumm/script_c64.cpp
+++ b/scumm/script_c64.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "scumm/actor.h"
 #include "scumm/charset.h"
 #include "scumm/intern.h"
diff --git a/scumm/script_v100he.cpp b/scumm/script_v100he.cpp
index 5060536b5e..7f79436ff0 100644
--- a/scumm/script_v100he.cpp
+++ b/scumm/script_v100he.cpp
@@ -21,7 +21,7 @@
  */
 
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 
 #include "common/config-manager.h"
 
diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp
index 475cf94ca2..cf7b55200d 100644
--- a/scumm/script_v2.cpp
+++ b/scumm/script_v2.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "scumm/actor.h"
 #include "scumm/charset.h"
 #include "scumm/intern.h"
diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp
index 43f657ca3f..0c93bcf491 100644
--- a/scumm/script_v5.cpp
+++ b/scumm/script_v5.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "scumm/actor.h"
 #include "scumm/charset.h"
 #include "scumm/intern.h"
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp
index 29f4fc6a80..34648bac5b 100644
--- a/scumm/script_v6.cpp
+++ b/scumm/script_v6.cpp
@@ -21,7 +21,7 @@
  */
 
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 
 #include "common/config-manager.h"
 
diff --git a/scumm/script_v6he.cpp b/scumm/script_v6he.cpp
index 870ead68d9..57b897d993 100644
--- a/scumm/script_v6he.cpp
+++ b/scumm/script_v6he.cpp
@@ -21,7 +21,7 @@
  */
 
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 
 #include "common/config-manager.h"
 #include "common/savefile.h"
diff --git a/scumm/script_v72he.cpp b/scumm/script_v72he.cpp
index f48cca0205..061b23d2cc 100644
--- a/scumm/script_v72he.cpp
+++ b/scumm/script_v72he.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 
 #include "common/config-manager.h"
 #include "common/savefile.h"
diff --git a/scumm/script_v7he.cpp b/scumm/script_v7he.cpp
index e525aa6619..2467e30e6a 100644
--- a/scumm/script_v7he.cpp
+++ b/scumm/script_v7he.cpp
@@ -21,7 +21,7 @@
  */
 
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 
 #include "common/config-manager.h"
 
diff --git a/scumm/script_v8.cpp b/scumm/script_v8.cpp
index dc05fd1541..33b9c18972 100644
--- a/scumm/script_v8.cpp
+++ b/scumm/script_v8.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/config-manager.h"
 #include "common/system.h"
 #include "scumm/actor.h"
diff --git a/scumm/script_v80he.cpp b/scumm/script_v80he.cpp
index 1d54389c3a..f10316d663 100644
--- a/scumm/script_v80he.cpp
+++ b/scumm/script_v80he.cpp
@@ -21,7 +21,7 @@
  */
 
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 
 #include "common/config-file.h"
 #include "common/config-manager.h"
diff --git a/scumm/script_v90he.cpp b/scumm/script_v90he.cpp
index cec3795a48..828ff7d287 100644
--- a/scumm/script_v90he.cpp
+++ b/scumm/script_v90he.cpp
@@ -21,7 +21,7 @@
  */
 
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 
 #include "common/config-manager.h"
 
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp
index 7c4138bc5e..9ba88fadc6 100644
--- a/scumm/scumm.cpp
+++ b/scumm/scumm.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 
 #include "backends/fs/fs.h"
 
diff --git a/scumm/smush/chunk.cpp b/scumm/smush/chunk.cpp
index 33ee752301..b2c2b0aeab 100644
--- a/scumm/smush/chunk.cpp
+++ b/scumm/smush/chunk.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "scumm/smush/chunk.h"
 #include "scumm/scumm.h"
 
diff --git a/scumm/smush/codec1.cpp b/scumm/smush/codec1.cpp
index fb10bb5a6b..b92355a1c5 100644
--- a/scumm/smush/codec1.cpp
+++ b/scumm/smush/codec1.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/scummsys.h"
 
 namespace Scumm {
diff --git a/scumm/smush/codec37.cpp b/scumm/smush/codec37.cpp
index d76526db79..c7ed741156 100644
--- a/scumm/smush/codec37.cpp
+++ b/scumm/smush/codec37.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/util.h"
 #include "scumm/bomp.h"
 #include "scumm/smush/codec37.h"
diff --git a/scumm/smush/codec47.cpp b/scumm/smush/codec47.cpp
index fa371b8d83..9715a25a49 100644
--- a/scumm/smush/codec47.cpp
+++ b/scumm/smush/codec47.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/util.h"
 #include "scumm/bomp.h"
 #include "scumm/smush/codec47.h"
diff --git a/scumm/smush/imuse_channel.cpp b/scumm/smush/imuse_channel.cpp
index 7689974dc7..3adbe4a266 100644
--- a/scumm/smush/imuse_channel.cpp
+++ b/scumm/smush/imuse_channel.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "scumm/scumm.h"
 #include "scumm/smush/channel.h"
 #include "scumm/smush/chunk.h"
diff --git a/scumm/smush/saud_channel.cpp b/scumm/smush/saud_channel.cpp
index 6ef2d8c85a..a72d1c7fe7 100644
--- a/scumm/smush/saud_channel.cpp
+++ b/scumm/smush/saud_channel.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 
 #include "scumm/smush/channel.h"
 #include "scumm/smush/chunk.h"
diff --git a/scumm/smush/smush_font.cpp b/scumm/smush/smush_font.cpp
index 20e809e5aa..e1b131fa19 100644
--- a/scumm/smush/smush_font.cpp
+++ b/scumm/smush/smush_font.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/file.h"
 #include "scumm/scumm.h"
 #include "scumm/util.h"
diff --git a/scumm/smush/smush_mixer.cpp b/scumm/smush/smush_mixer.cpp
index b24761ff72..dfb467d541 100644
--- a/scumm/smush/smush_mixer.cpp
+++ b/scumm/smush/smush_mixer.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/util.h"
 
 #include "scumm/smush/smush_mixer.h"
diff --git a/scumm/smush/smush_mixer.h b/scumm/smush/smush_mixer.h
index cff529b5c6..206a9e0da0 100644
--- a/scumm/smush/smush_mixer.h
+++ b/scumm/smush/smush_mixer.h
@@ -22,7 +22,7 @@
 #ifndef SMUSH_MIXER_H
 #define SMUSH_MIXER_H
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "scumm/sound.h"
 
 namespace Scumm {
diff --git a/scumm/smush/smush_player.cpp b/scumm/smush/smush_player.cpp
index 8f8645b5f5..96fa18ed36 100644
--- a/scumm/smush/smush_player.cpp
+++ b/scumm/smush/smush_player.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 
 #include "base/engine.h"
 
diff --git a/scumm/sound.cpp b/scumm/sound.cpp
index 7382ee113c..22b3132b52 100644
--- a/scumm/sound.cpp
+++ b/scumm/sound.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "scumm/actor.h"
 #include "scumm/imuse.h"
 #include "scumm/imuse_digi/dimuse.h"
diff --git a/scumm/sprite_he.cpp b/scumm/sprite_he.cpp
index ac9e1a1b27..02525e62d2 100644
--- a/scumm/sprite_he.cpp
+++ b/scumm/sprite_he.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 
 #include "scumm/intern.h"
 #include "scumm/resource.h"
diff --git a/scumm/string.cpp b/scumm/string.cpp
index 8cba88263a..96a591f09a 100644
--- a/scumm/string.cpp
+++ b/scumm/string.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 
 #include "common/config-manager.h"
 
diff --git a/scumm/usage_bits.cpp b/scumm/usage_bits.cpp
index 36b560eba1..2877ab4e53 100644
--- a/scumm/usage_bits.cpp
+++ b/scumm/usage_bits.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "scumm/scumm.h"
 #include "scumm/usage_bits.h"
 
diff --git a/scumm/vars.cpp b/scumm/vars.cpp
index b608dfce99..d48ad18276 100644
--- a/scumm/vars.cpp
+++ b/scumm/vars.cpp
@@ -21,7 +21,7 @@
  */
 
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/config-manager.h"
 #include "scumm/scumm.h"
 #include "scumm/intern.h"
diff --git a/scumm/verbs.cpp b/scumm/verbs.cpp
index 283fda46e7..eae9b5f3d1 100644
--- a/scumm/verbs.cpp
+++ b/scumm/verbs.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "scumm/charset.h"
 #include "scumm/intern.h"
 #include "scumm/object.h"
diff --git a/scumm/wiz_he.cpp b/scumm/wiz_he.cpp
index 7870afb6fb..aea26c53c7 100644
--- a/scumm/wiz_he.cpp
+++ b/scumm/wiz_he.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 
 #include "scumm/intern.h"
 #include "scumm/resource.h"