system.h was being included in tons of places, without any good reason; reduced this (total dependencies on system.h went down from 193 to 85 files)

svn-id: r16527

19 files changed, 33 insertions, 9 deletions

diff --git a/scumm/debugger.cpp b/scumm/debugger.cpp
index 042a8651a2..8d5b0710dd 100644
--- a/scumm/debugger.cpp
+++ b/scumm/debugger.cpp
@@ -23,6 +23,7 @@
 #include "common/config-manager.h"
 #include "common/file.h"
 #include "common/str.h"
+#include "common/system.h"
 #include "common/util.h"
 
 #include "scumm/actor.h"
diff --git a/scumm/dialogs.cpp b/scumm/dialogs.cpp
index 873ad56e60..e53e6429d5 100644
--- a/scumm/dialogs.cpp
+++ b/scumm/dialogs.cpp
@@ -21,6 +21,7 @@
 #include "stdafx.h"
 
 #include "common/config-manager.h"
+#include "common/system.h"
 
 #include "gui/chooser.h"
 #include "gui/newgui.h"
diff --git a/scumm/imuse.cpp b/scumm/imuse.cpp
index 3a3dc8bae5..568314b020 100644
--- a/scumm/imuse.cpp
+++ b/scumm/imuse.cpp
@@ -25,6 +25,7 @@
 #include "base/version.h"
 
 #include "common/util.h"
+#include "common/system.h"
 
 #include "scumm/imuse.h"
 #include "scumm/imuse_internal.h"
diff --git a/scumm/imuse.h b/scumm/imuse.h
index c02cc33344..a9da34247b 100644
--- a/scumm/imuse.h
+++ b/scumm/imuse.h
@@ -24,7 +24,7 @@
 #define IMUSE_H
 
 #include "common/scummsys.h"
-#include "common/system.h"
+#include "common/mutex.h"
 #include "scumm/music.h"
 
 class MidiDriver;
@@ -40,7 +40,7 @@ class IMuse : public MusicEngine {
 private:
 	OSystem *_system;
 	IMuseInternal *_target;
-	mutable OSystem::MutexRef _mutex;
+	mutable Common::MutexRef _mutex;
 
 	IMuse(OSystem *system, IMuseInternal *target);
 	void in() const;
diff --git a/scumm/imuse_digi/dimuse.cpp b/scumm/imuse_digi/dimuse.cpp
index 036be47137..1f9b702282 100644
--- a/scumm/imuse_digi/dimuse.cpp
+++ b/scumm/imuse_digi/dimuse.cpp
@@ -19,6 +19,7 @@
  */
 
 #include "stdafx.h"
+#include "common/system.h"
 #include "common/timer.h"
 
 #include "scumm/actor.h"
diff --git a/scumm/imuse_digi/dimuse.h b/scumm/imuse_digi/dimuse.h
index eb1e0df68f..dce27f3816 100644
--- a/scumm/imuse_digi/dimuse.h
+++ b/scumm/imuse_digi/dimuse.h
@@ -84,7 +84,7 @@ private:
 
 	Track *_track[MAX_DIGITAL_TRACKS + MAX_DIGITAL_FADETRACKS];
 
-	OSystem::MutexRef _mutex;
+	Common::MutexRef _mutex;
 	ScummEngine *_vm;
 	ImuseDigiSndMgr *_sound;
 
diff --git a/scumm/imuse_digi/dimuse_script.cpp b/scumm/imuse_digi/dimuse_script.cpp
index edef204032..356e004bdb 100644
--- a/scumm/imuse_digi/dimuse_script.cpp
+++ b/scumm/imuse_digi/dimuse_script.cpp
@@ -19,6 +19,7 @@
  */
 
 #include "stdafx.h"
+#include "common/system.h"
 #include "common/timer.h"
 
 #include "scumm/actor.h"
diff --git a/scumm/imuse_digi/dimuse_sndmgr.h b/scumm/imuse_digi/dimuse_sndmgr.h
index 421bcab9eb..3435e256b2 100644
--- a/scumm/imuse_digi/dimuse_sndmgr.h
+++ b/scumm/imuse_digi/dimuse_sndmgr.h
@@ -23,7 +23,6 @@
 
 #include "stdafx.h"
 #include "common/scummsys.h"
-#include "common/system.h"
 #include "scumm/imuse_digi/dimuse_bndmgr.h"
 
 namespace Scumm {
diff --git a/scumm/input.cpp b/scumm/input.cpp
index 376196122f..912574ca76 100644
--- a/scumm/input.cpp
+++ b/scumm/input.cpp
@@ -23,6 +23,7 @@
 #include "stdafx.h"
 
 #include "common/config-manager.h"
+#include "common/system.h"
 
 #include "scumm/debugger.h"
 #include "scumm/imuse.h"
diff --git a/scumm/insane/insane.cpp b/scumm/insane/insane.cpp
index 84acd3f790..5f23226a78 100644
--- a/scumm/insane/insane.cpp
+++ b/scumm/insane/insane.cpp
@@ -24,6 +24,8 @@
 
 #include "base/engine.h"
 
+#include "common/system.h"
+
 #include "scumm/scumm.h"
 #include "scumm/actor.h"
 #include "scumm/sound.h"
diff --git a/scumm/player_v2.cpp b/scumm/player_v2.cpp
index 452bd3b913..7a9db4fb0e 100644
--- a/scumm/player_v2.cpp
+++ b/scumm/player_v2.cpp
@@ -22,6 +22,7 @@
 
 #include "stdafx.h"
 #include "base/engine.h"
+#include "common/system.h"
 #include "scumm/player_v2.h"
 #include "scumm/scumm.h"
 #include "sound/mididrv.h"
@@ -963,6 +964,14 @@ void Player_V2::generatePCjrSamples(int16 *data, uint len) {
 		lowPassFilter(data, len);
 }
 
+void Player_V2::mutex_up() {
+	_system->lockMutex (_mutex);
+}
+
+void Player_V2::mutex_down() {
+	_system->unlockMutex (_mutex);
+}
+
 } // End of namespace Scumm
 
 #ifdef __PALM_OS__
diff --git a/scumm/player_v2.h b/scumm/player_v2.h
index 3ba3f99a0c..7cc4c3e28a 100644
--- a/scumm/player_v2.h
+++ b/scumm/player_v2.h
@@ -24,7 +24,7 @@
 #define PLAYER_V2_H
 
 #include "common/scummsys.h"
-#include "common/system.h"
+#include "common/mutex.h"
 #include "scumm/music.h"
 #include "sound/audiostream.h"
 
@@ -133,12 +133,12 @@ private:
 
 	const uint16 *_freqs_table;
 
-	OSystem::MutexRef _mutex;
+	Common::MutexRef _mutex;
 	ChannelInfo _channels[5];
 
 protected:
-	void mutex_up() { _system->lockMutex (_mutex); }
-	void mutex_down() { _system->unlockMutex (_mutex); }
+	void mutex_up();
+	void mutex_down();
 
 	virtual void nextTick();
 	virtual void clear_channel(int i);
diff --git a/scumm/saveload.cpp b/scumm/saveload.cpp
index ca88038c01..73293371a2 100644
--- a/scumm/saveload.cpp
+++ b/scumm/saveload.cpp
@@ -23,6 +23,8 @@
 #include "stdafx.h"
 
 #include "common/config-manager.h"
+#include "common/savefile.h"
+#include "common/system.h"
 
 #include "scumm/actor.h"
 #include "scumm/charset.h"
diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp
index 28f3fdd1cc..e4eed6b1a3 100644
--- a/scumm/script_v5.cpp
+++ b/scumm/script_v5.cpp
@@ -28,6 +28,7 @@
 #include "scumm/scumm.h"
 #include "scumm/sound.h"
 #include "scumm/verbs.h"
+#include "common/savefile.h"
 
 namespace Scumm {
 
diff --git a/scumm/script_v72he.cpp b/scumm/script_v72he.cpp
index 3322edc469..dc9abc00d6 100644
--- a/scumm/script_v72he.cpp
+++ b/scumm/script_v72he.cpp
@@ -24,6 +24,7 @@
 #include "stdafx.h"
 
 #include "common/config-manager.h"
+#include "common/system.h"
 
 #include "scumm/actor.h"
 #include "scumm/charset.h"
diff --git a/scumm/script_v8.cpp b/scumm/script_v8.cpp
index b6d9d765bc..7b026d49b0 100644
--- a/scumm/script_v8.cpp
+++ b/scumm/script_v8.cpp
@@ -21,6 +21,7 @@
 
 #include "stdafx.h"
 #include "common/config-manager.h"
+#include "common/system.h"
 #include "scumm/actor.h"
 #include "scumm/akos.h"
 #include "scumm/charset.h"
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp
index 399f084b6f..094f8caafc 100644
--- a/scumm/scumm.cpp
+++ b/scumm/scumm.cpp
@@ -29,6 +29,7 @@
 
 #include "common/config-manager.h"
 #include "common/md5.h"
+#include "common/system.h"
 
 #include "gui/message.h"
 #include "gui/newgui.h"
diff --git a/scumm/smush/smush_player.cpp b/scumm/smush/smush_player.cpp
index 794221ac6e..d5eaac4511 100644
--- a/scumm/smush/smush_player.cpp
+++ b/scumm/smush/smush_player.cpp
@@ -25,8 +25,9 @@
 
 #include "common/config-manager.h"
 #include "common/file.h"
-#include "common/util.h"
+#include "common/system.h"
 #include "common/timer.h"
+#include "common/util.h"
 
 #include "scumm/bomp.h"
 #include "scumm/imuse_digi/dimuse.h"
diff --git a/scumm/sound.cpp b/scumm/sound.cpp
index 6892579cf4..d9bd683011 100644
--- a/scumm/sound.cpp
+++ b/scumm/sound.cpp
@@ -29,6 +29,7 @@
 #include "scumm/sound.h"
 
 #include "common/config-manager.h"
+#include "common/system.h"
 #include "common/timer.h"
 #include "common/util.h"