11 files changed, 22 insertions, 23 deletions
diff --git a/backends/platform/PalmOS/Src/be_base.h b/backends/platform/PalmOS/Src/be_base.h
index 36f8a1d080..333b633f05 100644
--- a/backends/platform/PalmOS/Src/be_base.h
+++ b/backends/platform/PalmOS/Src/be_base.h
@@ -31,8 +31,7 @@
 #include "PalmVersion.h"
 #include "globals.h"
 
-#include "common/scummsys.h"
-#include "common/system.h"
+#include "backends/base-backend.h"
 #include "common/events.h"
 #include "graphics/surface.h"
 
@@ -89,7 +88,7 @@ typedef struct {
 	void *param;
 } SoundType, *SoundPtr;
 
-class OSystem_PalmBase : public OSystem {
+class OSystem_PalmBase : public BaseBackend {
 private:
 	virtual void int_initBackend() { }
 
diff --git a/backends/platform/dc/dc.h b/backends/platform/dc/dc.h
index f2675c0f89..eabc013cdd 100644
--- a/backends/platform/dc/dc.h
+++ b/backends/platform/dc/dc.h
@@ -23,7 +23,7 @@
  *
  */
 
-#include <common/system.h>
+#include "backends/base-backend.h"
 #include <graphics/surface.h>
 #include <graphics/colormasks.h>
 #include <ronin/soundcommon.h>
@@ -43,7 +43,7 @@ class Interactive
 
 #include "softkbd.h"
 
-class OSystem_Dreamcast : public OSystem, public FilesystemFactory {
+class OSystem_Dreamcast : public BaseBackend, public FilesystemFactory {
 
  public:
   OSystem_Dreamcast();
diff --git a/backends/platform/ds/arm9/source/osystem_ds.h b/backends/platform/ds/arm9/source/osystem_ds.h
index 575bad0609..b5802803d0 100644
--- a/backends/platform/ds/arm9/source/osystem_ds.h
+++ b/backends/platform/ds/arm9/source/osystem_ds.h
@@ -23,7 +23,8 @@
 
 #ifndef _OSYSTEM_DS_H_
 #define _OSYSTEM_DS_H_
-#include "common/system.h"
+
+#include "backends/base-backend.h"
 #include "common/events.h"
 #include "nds.h"
 #include "ramsave.h"
@@ -34,7 +35,7 @@
 #include "graphics/surface.h"
 #include "graphics/colormasks.h"
 
-class OSystem_DS : public OSystem {
+class OSystem_DS : public BaseBackend {
 protected:
 
 	int eventNum;
diff --git a/backends/platform/gp2x/gp2x-common.h b/backends/platform/gp2x/gp2x-common.h
index de305923a0..14c62edf87 100644
--- a/backends/platform/gp2x/gp2x-common.h
+++ b/backends/platform/gp2x/gp2x-common.h
@@ -29,8 +29,7 @@
 #define __GP2X__
 #define USE_OSD
 
-#include "common/scummsys.h"
-#include "common/system.h"
+#include "backends/base-backend.h"
 #include "graphics/scaler.h"
 
 #include <SDL.h>
@@ -58,7 +57,7 @@ enum {
 };
 
 
-class OSystem_GP2X : public OSystem {
+class OSystem_GP2X : public BaseBackend {
 public:
 	OSystem_GP2X();
 	virtual ~OSystem_GP2X();
diff --git a/backends/platform/iphone/osys_iphone.h b/backends/platform/iphone/osys_iphone.h
index 746a6e848f..b3404c15c2 100644
--- a/backends/platform/iphone/osys_iphone.h
+++ b/backends/platform/iphone/osys_iphone.h
@@ -27,7 +27,7 @@
 
 #include "graphics/surface.h"
 #include "iphone_common.h"
-#include "common/system.h"
+#include "backends/base-backend.h"
 #include "common/events.h"
 #include "sound/mixer_intern.h"
 #include "backends/fs/posix/posix-fs-factory.h"
@@ -52,7 +52,7 @@ typedef struct AQCallbackStruct {
     AudioStreamBasicDescription dataFormat;
 } AQCallbackStruct;
 
-class OSystem_IPHONE : public OSystem {
+class OSystem_IPHONE : public BaseBackend {
 protected:
 
 	static const OSystem::GraphicsMode s_supportedGraphicsModes[];
diff --git a/backends/platform/null/null.cpp b/backends/platform/null/null.cpp
index 0da8dd7712..304b7e80eb 100644
--- a/backends/platform/null/null.cpp
+++ b/backends/platform/null/null.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/system.h"
+#include "backends/base-backend.h"
 #include "base/main.h"
 
 #if defined(USE_NULL_DRIVER)
@@ -51,7 +51,7 @@
 	#include "backends/fs/windows/windows-fs-factory.h"
 #endif
 
-class OSystem_NULL : public OSystem {
+class OSystem_NULL : public BaseBackend {
 protected:
 	Common::SaveFileManager *_savefile;
 	Audio::MixerImpl *_mixer;
diff --git a/backends/platform/ps2/systemps2.h b/backends/platform/ps2/systemps2.h
index fecd7244f8..c0a8b9af60 100644
--- a/backends/platform/ps2/systemps2.h
+++ b/backends/platform/ps2/systemps2.h
@@ -26,7 +26,7 @@
 #ifndef SYSTEMPS2_H
 #define SYSTEMPS2_H
 
-#include "common/system.h"
+#include "backends/base-backend.h"
 
 class DefaultTimerManager;
 
@@ -52,7 +52,7 @@ namespace Audio {
 	class MixerImpl;
 };
 
-class OSystem_PS2 : public OSystem {
+class OSystem_PS2 : public BaseBackend {
 public:
 	OSystem_PS2(const char *elfPath);
 	virtual ~OSystem_PS2(void);
diff --git a/backends/platform/psp/osys_psp.h b/backends/platform/psp/osys_psp.h
index 5fee067eec..50a5572142 100644
--- a/backends/platform/psp/osys_psp.h
+++ b/backends/platform/psp/osys_psp.h
@@ -24,10 +24,10 @@
  */
 
 #include "common/scummsys.h"
-#include "common/system.h"
 #include "graphics/surface.h"
 #include "graphics/colormasks.h"
 #include "sound/mixer_intern.h"
+#include "backends/base-backend.h"
 #include "backends/fs/psp/psp-fs-factory.h"
 
 
@@ -40,7 +40,7 @@ enum GraphicModeID {
 	CENTERED_362X272
 };
 
-class OSystem_PSP : public OSystem {
+class OSystem_PSP : public BaseBackend {
 public:
 	static const OSystem::GraphicsMode s_supportedGraphicsModes[];
 	static OSystem *instance();
diff --git a/backends/platform/sdl/graphics.cpp b/backends/platform/sdl/graphics.cpp
index 2a4e166ab2..d498c8f62a 100644
--- a/backends/platform/sdl/graphics.cpp
+++ b/backends/platform/sdl/graphics.cpp
@@ -24,6 +24,7 @@
  */
 
 #include "backends/platform/sdl/sdl.h"
+#include "common/mutex.h"
 #include "common/util.h"
 #include "graphics/font.h"
 #include "graphics/fontman.h"
diff --git a/backends/platform/sdl/sdl.h b/backends/platform/sdl/sdl.h
index 80a08de821..d657a964ba 100644
--- a/backends/platform/sdl/sdl.h
+++ b/backends/platform/sdl/sdl.h
@@ -32,8 +32,7 @@
 #include <SDL.h>
 #endif
 
-#include "common/scummsys.h"
-#include "common/system.h"
+#include "backends/base-backend.h"
 #include "graphics/scaler.h"
 
 
@@ -72,7 +71,7 @@ enum {
 };
 
 
-class OSystem_SDL : public OSystem {
+class OSystem_SDL : public BaseBackend {
 public:
 	OSystem_SDL();
 	virtual ~OSystem_SDL();
diff --git a/backends/platform/wii/osystem.h b/backends/platform/wii/osystem.h
index afc80e1bcd..1d97d5259a 100644
--- a/backends/platform/wii/osystem.h
+++ b/backends/platform/wii/osystem.h
@@ -23,11 +23,11 @@
 #define _WII_OSYSTEM_H_
 
 #include "base/main.h"
-#include "common/system.h"
 #include "common/fs.h"
 #include "common/rect.h"
 #include "common/events.h"
 
+#include "backends/base-backend.h"
 #include "backends/saves/default/default-saves.h"
 #include "backends/timer/default/default-timer.h"
 #include "graphics/colormasks.h"
@@ -53,7 +53,7 @@ extern void wii_memstats(void);
 }
 #endif
 
-class OSystem_Wii : public OSystem {
+class OSystem_Wii : public BaseBackend {
 private:
 	s64 _startup_time;
 	syswd_t _alarm;