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, 6 insertions, 2 deletions

diff --git a/common/debugger.cpp b/common/debugger.cpp
index d8090d0955..8d967a1792 100644
--- a/common/debugger.cpp
+++ b/common/debugger.cpp
@@ -21,6 +21,7 @@
 #include "stdafx.h"
 
 #include "common/debugger.h"
+#include "common/system.h"
 
 #if USE_CONSOLE
 	#include "gui/console.h"
diff --git a/common/timer.cpp b/common/timer.cpp
index b5725f6cea..230366ad0d 100644
--- a/common/timer.cpp
+++ b/common/timer.cpp
@@ -24,6 +24,7 @@
 #include "common/scummsys.h"
 #include "common/timer.h"
 #include "common/util.h"
+#include "common/system.h"
 
 Timer *g_timer = NULL;
 
diff --git a/common/timer.h b/common/timer.h
index abd828cd3e..6b3509f41c 100644
--- a/common/timer.h
+++ b/common/timer.h
@@ -22,7 +22,7 @@
 #define COMMON_TIMER_H
 
 #include "common/scummsys.h"
-#include "common/system.h"
+#include "common/mutex.h"
 
 #define MAX_TIMERS 2
 
@@ -31,13 +31,15 @@
 #include "morphos_timer.h"
 #else
 
+class OSystem;
+
 class Timer {
 public:
 	typedef void (*TimerProc)(void *refCon);
 
 private:
 	OSystem *_system;
-	OSystem::MutexRef _mutex;
+	Common::MutexRef _mutex;
 	void *_timerHandler;
 	int32 _thisTime;
 	int32 _lastTime;