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

3 files changed, 7 insertions, 4 deletions

diff --git a/sky/music/mt32music.cpp b/sky/music/mt32music.cpp
index 9b384bcca8..6f941499d1 100644
--- a/sky/music/mt32music.cpp
+++ b/sky/music/mt32music.cpp
@@ -22,6 +22,7 @@
 #include "sky/music/mt32music.h"
 #include "sky/music/gmchannel.h"
 #include "common/util.h"
+#include "common/system.h"
 #include "sound/mididrv.h"
 
 namespace Sky {
@@ -96,7 +97,8 @@ bool MT32Music::processPatchSysEx(uint8 *sysExData) {
 
 	uint8 sysExBuf[15];
 	uint8 crc = 0;
-	if (sysExData[0] & 0x80) return false;
+	if (sysExData[0] & 0x80)
+		return false;
 
 	// decompress data from stream
 	sysExBuf[0]  = 0x41; sysExBuf[1] = 0x10; sysExBuf[2] = 0x16; sysExBuf[3] = 0x12; sysExBuf[4] = 0x5;
@@ -113,7 +115,7 @@ bool MT32Music::processPatchSysEx(uint8 *sysExData) {
 		crc -= sysExBuf[cnt];
 	sysExBuf[14] = crc & 0x7F;					// crc
 	_midiDrv->sysEx(sysExBuf, 15);
-	g_system->delayMillis (5);
+	g_system->delayMillis(5);
 	return true;
 }
 
diff --git a/sky/music/musicbase.cpp b/sky/music/musicbase.cpp
index 8138ccd0bb..104b132103 100644
--- a/sky/music/musicbase.cpp
+++ b/sky/music/musicbase.cpp
@@ -22,6 +22,7 @@
 #include "sky/music/musicbase.h"
 #include "sky/disk.h"
 #include "common/util.h"
+#include "common/system.h"
 
 namespace Sky {
 
diff --git a/sky/music/musicbase.h b/sky/music/musicbase.h
index f33f3ec9bb..f3e88dc1f2 100644
--- a/sky/music/musicbase.h
+++ b/sky/music/musicbase.h
@@ -24,7 +24,7 @@
 
 #include "stdafx.h"
 #include "common/scummsys.h"
-#include "common/system.h"
+#include "common/mutex.h"
 
 class OSystem;
 
@@ -77,7 +77,7 @@ protected:
 	uint32 _aktTime;
 	Actions _onNextPoll;
 	ChannelBase *_channels[10];
-	OSystem::MutexRef _mutex;
+	Common::MutexRef _mutex;
 	
 	virtual void setupPointers(void) = 0;
 	virtual void setupChannels(uint8 *channelData) = 0;