6 files changed, 17 insertions, 7 deletions
diff --git a/sword1/animation.cpp b/sword1/animation.cpp
index f142cb9a15..1f9ed0a46a 100644
--- a/sword1/animation.cpp
+++ b/sword1/animation.cpp
@@ -28,6 +28,7 @@
 
 #include "common/config-manager.h"
 #include "common/str.h"
+#include "common/system.h"
 
 namespace Sword1 {
 
diff --git a/sword1/control.cpp b/sword1/control.cpp
index 2c466ec2da..0258e35b34 100644
--- a/sword1/control.cpp
+++ b/sword1/control.cpp
@@ -22,7 +22,7 @@
 #include "common/file.h"
 #include "common/stdafx.h"
 #include "common/util.h"
-#include "common/util.h"
+#include "common/system.h"
 
 #include "gui/message.h"
 
diff --git a/sword1/credits.cpp b/sword1/credits.cpp
index e9c426abec..527bf74a0f 100644
--- a/sword1/credits.cpp
+++ b/sword1/credits.cpp
@@ -20,14 +20,18 @@
  */
 
 #include "stdafx.h"
+
 #include "sword1/credits.h"
 #include "sword1/screen.h"
-#include "common/file.h"
+#include "sword1/sword1.h"
+
+#include "sound/audiostream.h"
 #include "sound/mixer.h"
+
+#include "common/file.h"
 #include "common/util.h"
-#include "sound/audiostream.h"
+#include "common/system.h"
 
-#include "sword1.h"
 
 #define CREDITS_X 480
 #define CREDITS_Y 300
diff --git a/sword1/music.cpp b/sword1/music.cpp
index c2b21409a3..ac2a3345b7 100644
--- a/sword1/music.cpp
+++ b/sword1/music.cpp
@@ -20,10 +20,14 @@
  */
 
 #include "stdafx.h"
+
 #include "sword1/music.h"
-#include "sound/mixer.h"
+
 #include "common/util.h"
 #include "common/file.h"
+#include "common/system.h"
+
+#include "sound/mixer.h"
 #include "sound/mp3.h"
 #include "sound/vorbis.h"
 #include "sound/wave.h"
diff --git a/sword1/music.h b/sword1/music.h
index 3cbc13584a..1820a8704c 100644
--- a/sword1/music.h
+++ b/sword1/music.h
@@ -23,7 +23,7 @@
 #define BSMUSIC_H
 
 #include "scummsys.h"
-#include "common/system.h"
+#include "common/mutex.h"
 #include "common/file.h"
 #include "sound/audiostream.h"
 #include "sound/rate.h"
@@ -109,7 +109,7 @@ private:
 	OSystem *_system;
 	SoundMixer *_mixer;
 	uint32 _sampleRate;
-	OSystem::MutexRef _mutex;
+	Common::MutexRef _mutex;
 
 	static void passMixerFunc(void *param, int16 *buf, uint len);
 	void mixer(int16 *buf, uint32 len);
diff --git a/sword1/sword1.cpp b/sword1/sword1.cpp
index 2c8709435a..4e4eca1d37 100644
--- a/sword1/sword1.cpp
+++ b/sword1/sword1.cpp
@@ -28,6 +28,7 @@
 #include "common/config-manager.h"
 #include "common/file.h"
 #include "common/timer.h"
+#include "common/system.h"
 
 #include "sword1/resman.h"
 #include "sword1/objectman.h"