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

6 files changed, 11 insertions, 1 deletions

diff --git a/simon/cursor.cpp b/simon/cursor.cpp
index 51178288fc..a8fe272e75 100644
--- a/simon/cursor.cpp
+++ b/simon/cursor.cpp
@@ -23,6 +23,7 @@
 
 #include "simon/simon.h"
 #include "simon/intern.h"
+#include "common/system.h"
 
 namespace Simon {
 
diff --git a/simon/items.cpp b/simon/items.cpp
index e1a3d4e31b..f4698f53de 100644
--- a/simon/items.cpp
+++ b/simon/items.cpp
@@ -26,6 +26,8 @@
 #include "simon/simon.h"
 #include "simon/intern.h"
 
+#include "common/system.h"
+
 namespace Simon {
 
 int SimonEngine::runScript() {
diff --git a/simon/midi.h b/simon/midi.h
index d7075bc58d..ac53cbc021 100644
--- a/simon/midi.h
+++ b/simon/midi.h
@@ -24,6 +24,7 @@
 
 #include "sound/mididrv.h"
 #include "sound/midiparser.h"
+#include "common/mutex.h"
 
 class File;
 class OSystem;
@@ -52,7 +53,7 @@ struct MusicInfo {
 class MidiPlayer : public MidiDriver {
 protected:
 	OSystem *_system;
-	OSystem::MutexRef _mutex;
+	Common::MutexRef _mutex;
 	MidiDriver *_driver;
 	bool _map_mt32_to_gm;
 	bool _passThrough;
diff --git a/simon/saveload.cpp b/simon/saveload.cpp
index 7e95694822..4e68368a10 100644
--- a/simon/saveload.cpp
+++ b/simon/saveload.cpp
@@ -34,6 +34,9 @@
 #include "simon/simon.h"
 #include "simon/intern.h"
 
+#include "common/savefile.h"
+#include "common/system.h"
+
 namespace Simon {
 
 void SimonEngine::o_save_game() {
diff --git a/simon/simon.cpp b/simon/simon.cpp
index 962617f6ad..e54ad83e19 100644
--- a/simon/simon.cpp
+++ b/simon/simon.cpp
@@ -29,6 +29,7 @@
 #include "common/config-manager.h"
 #include "common/file.h"
 #include "common/md5.h"
+#include "common/system.h"
 
 #include "gui/about.h"
 #include "gui/message.h"
diff --git a/simon/vga.cpp b/simon/vga.cpp
index 550548476b..5ff57296a4 100644
--- a/simon/vga.cpp
+++ b/simon/vga.cpp
@@ -25,6 +25,8 @@
 #include "simon/intern.h"
 #include "simon/vga.h"
 
+#include "common/system.h"
+
 namespace Simon {
 
 typedef void (SimonEngine::*VgaOpcodeProc) ();