WINTERMUTE: Rename PlatformSDL->platform_osystem

52 files changed, 51 insertions, 51 deletions

diff --git a/engines/wintermute/ad/AdActor.cpp b/engines/wintermute/ad/AdActor.cpp
index 480851d21f..050a419e53 100644
--- a/engines/wintermute/ad/AdActor.cpp
+++ b/engines/wintermute/ad/AdActor.cpp
@@ -47,7 +47,7 @@
 #include "engines/wintermute/base/scriptables/ScValue.h"

 #include "engines/wintermute/base/scriptables/ScStack.h"

 #include "engines/wintermute/utils/utils.h"

-#include "engines/wintermute/PlatformSDL.h"

+#include "engines/wintermute/platform_osystem.h"

 #include "engines/wintermute/wintermute.h"

 

 namespace WinterMute {

diff --git a/engines/wintermute/ad/AdEntity.cpp b/engines/wintermute/ad/AdEntity.cpp
index c559e99abb..49c723f66a 100644
--- a/engines/wintermute/ad/AdEntity.cpp
+++ b/engines/wintermute/ad/AdEntity.cpp
@@ -45,7 +45,7 @@
 #include "engines/wintermute/base/BRegion.h"

 #include "engines/wintermute/base/BSprite.h"

 #include "engines/wintermute/base/BFileManager.h"

-#include "engines/wintermute/PlatformSDL.h"

+#include "engines/wintermute/platform_osystem.h"

 #include "engines/wintermute/utils/utils.h"

 #include "engines/wintermute/base/scriptables/ScValue.h"

 #include "engines/wintermute/base/scriptables/ScScript.h"

diff --git a/engines/wintermute/ad/AdInventory.cpp b/engines/wintermute/ad/AdInventory.cpp
index 54195cc68a..f913108404 100644
--- a/engines/wintermute/ad/AdInventory.cpp
+++ b/engines/wintermute/ad/AdInventory.cpp
@@ -29,7 +29,7 @@
 #include "engines/wintermute/ad/AdInventory.h"

 #include "engines/wintermute/ad/AdGame.h"

 #include "engines/wintermute/ad/AdItem.h"

-#include "engines/wintermute/PlatformSDL.h"

+#include "engines/wintermute/platform_osystem.h"

 #include "common/str.h"

 

 namespace WinterMute {

diff --git a/engines/wintermute/ad/AdInventoryBox.cpp b/engines/wintermute/ad/AdInventoryBox.cpp
index c5c9c3be67..9509bf9b10 100644
--- a/engines/wintermute/ad/AdInventoryBox.cpp
+++ b/engines/wintermute/ad/AdInventoryBox.cpp
@@ -37,7 +37,7 @@
 #include "engines/wintermute/base/BDynBuffer.h"

 #include "engines/wintermute/ui/UIButton.h"

 #include "engines/wintermute/ui/UIWindow.h"

-#include "engines/wintermute/PlatformSDL.h"

+#include "engines/wintermute/platform_osystem.h"

 #include "common/str.h"

 #include "common/rect.h"

 

diff --git a/engines/wintermute/ad/AdItem.cpp b/engines/wintermute/ad/AdItem.cpp
index 5678f6cfa6..0e443d5c3e 100644
--- a/engines/wintermute/ad/AdItem.cpp
+++ b/engines/wintermute/ad/AdItem.cpp
@@ -38,7 +38,7 @@
 #include "engines/wintermute/base/BSound.h"

 #include "engines/wintermute/base/BSprite.h"

 #include "engines/wintermute/utils/utils.h"

-#include "engines/wintermute/PlatformSDL.h"

+#include "engines/wintermute/platform_osystem.h"

 #include "engines/wintermute/base/scriptables/ScScript.h"

 #include "engines/wintermute/base/scriptables/ScStack.h"

 #include "engines/wintermute/base/scriptables/ScValue.h"

diff --git a/engines/wintermute/ad/AdLayer.cpp b/engines/wintermute/ad/AdLayer.cpp
index d797172338..4549ba4af7 100644
--- a/engines/wintermute/ad/AdLayer.cpp
+++ b/engines/wintermute/ad/AdLayer.cpp
@@ -36,7 +36,7 @@
 #include "engines/wintermute/base/scriptables/ScScript.h"

 #include "engines/wintermute/base/scriptables/ScStack.h"

 #include "engines/wintermute/base/BFileManager.h"

-#include "engines/wintermute/PlatformSDL.h"

+#include "engines/wintermute/platform_osystem.h"

 #include "common/str.h"

 

 namespace WinterMute {

diff --git a/engines/wintermute/ad/AdNodeState.cpp b/engines/wintermute/ad/AdNodeState.cpp
index 8e9894b5f5..fd72a356c5 100644
--- a/engines/wintermute/ad/AdNodeState.cpp
+++ b/engines/wintermute/ad/AdNodeState.cpp
@@ -33,7 +33,7 @@
 #include "engines/wintermute/base/BStringTable.h"

 #include "engines/wintermute/base/BSprite.h"

 #include "engines/wintermute/utils/utils.h"

-#include "engines/wintermute/PlatformSDL.h"

+#include "engines/wintermute/platform_osystem.h"

 #include "common/str.h"

 

 namespace WinterMute {

diff --git a/engines/wintermute/ad/AdResponseBox.cpp b/engines/wintermute/ad/AdResponseBox.cpp
index 1a1732edd0..829d58f2ee 100644
--- a/engines/wintermute/ad/AdResponseBox.cpp
+++ b/engines/wintermute/ad/AdResponseBox.cpp
@@ -42,7 +42,7 @@
 #include "engines/wintermute/base/BSprite.h"

 #include "engines/wintermute/base/BFileManager.h"

 #include "engines/wintermute/utils/utils.h"

-#include "engines/wintermute/PlatformSDL.h"

+#include "engines/wintermute/platform_osystem.h"

 #include "common/str.h"

 

 namespace WinterMute {

diff --git a/engines/wintermute/ad/AdScene.cpp b/engines/wintermute/ad/AdScene.cpp
index 022ec4a8a5..b284543a08 100644
--- a/engines/wintermute/ad/AdScene.cpp
+++ b/engines/wintermute/ad/AdScene.cpp
@@ -52,7 +52,7 @@
 #include "engines/wintermute/base/BScriptable.h"

 #include "engines/wintermute/base/BSprite.h"

 #include "engines/wintermute/base/BViewport.h"

-#include "engines/wintermute/PlatformSDL.h"

+#include "engines/wintermute/platform_osystem.h"

 #include "engines/wintermute/base/scriptables/ScStack.h"

 #include "engines/wintermute/base/scriptables/ScValue.h"

 #include "engines/wintermute/base/scriptables/ScScript.h"

diff --git a/engines/wintermute/ad/AdSceneState.cpp b/engines/wintermute/ad/AdSceneState.cpp
index 2192bc13fe..5dfb8c537e 100644
--- a/engines/wintermute/ad/AdSceneState.cpp
+++ b/engines/wintermute/ad/AdSceneState.cpp
@@ -30,7 +30,7 @@
 #include "engines/wintermute/persistent.h"

 #include "engines/wintermute/ad/AdSceneState.h"

 #include "engines/wintermute/ad/AdNodeState.h"

-#include "engines/wintermute/PlatformSDL.h"

+#include "engines/wintermute/platform_osystem.h"

 #include "common/str.h"

 

 namespace WinterMute {

diff --git a/engines/wintermute/ad/AdTalkHolder.cpp b/engines/wintermute/ad/AdTalkHolder.cpp
index 4c627ca9ad..e1a91792ce 100644
--- a/engines/wintermute/ad/AdTalkHolder.cpp
+++ b/engines/wintermute/ad/AdTalkHolder.cpp
@@ -34,7 +34,7 @@
 #include "engines/wintermute/base/scriptables/ScStack.h"

 #include "engines/wintermute/base/BGame.h"

 #include "engines/wintermute/base/BSprite.h"

-#include "engines/wintermute/PlatformSDL.h"

+#include "engines/wintermute/platform_osystem.h"

 #include "engines/wintermute/wintermute.h"

 #include "common/str.h"

 

diff --git a/engines/wintermute/base/BActiveRect.cpp b/engines/wintermute/base/BActiveRect.cpp
index 382329087a..836a93ad9a 100644
--- a/engines/wintermute/base/BActiveRect.cpp
+++ b/engines/wintermute/base/BActiveRect.cpp
@@ -30,7 +30,7 @@
 #include "engines/wintermute/base/BActiveRect.h"

 #include "engines/wintermute/base/BGame.h"

 #include "engines/wintermute/base/BRegion.h"

-#include "engines/wintermute/PlatformSDL.h"

+#include "engines/wintermute/platform_osystem.h"

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/base/BFader.cpp b/engines/wintermute/base/BFader.cpp
index 7184c6664c..9dec5e1e12 100644
--- a/engines/wintermute/base/BFader.cpp
+++ b/engines/wintermute/base/BFader.cpp
@@ -29,7 +29,7 @@
 #include "engines/wintermute/dcgf.h"

 #include "engines/wintermute/base/BFader.h"

 #include "engines/wintermute/base/BGame.h"

-#include "engines/wintermute/PlatformSDL.h"

+#include "engines/wintermute/platform_osystem.h"

 #include "common/util.h"

 

 namespace WinterMute {

diff --git a/engines/wintermute/base/BFileManager.cpp b/engines/wintermute/base/BFileManager.cpp
index 1cfb3d47d3..80b3d7a8df 100644
--- a/engines/wintermute/base/BFileManager.cpp
+++ b/engines/wintermute/base/BFileManager.cpp
@@ -40,7 +40,7 @@
 #include "engines/wintermute/base/BGame.h"

 #include "engines/wintermute/dcpackage.h"

 #include "engines/wintermute/utils/utils.h"

-#include "engines/wintermute/PlatformSDL.h"

+#include "engines/wintermute/platform_osystem.h"

 #include "engines/wintermute/wintermute.h"

 #include "common/str.h"

 #include "common/textconsole.h"

diff --git a/engines/wintermute/base/BFrame.cpp b/engines/wintermute/base/BFrame.cpp
index 4af9262701..d6d8a3aa5c 100644
--- a/engines/wintermute/base/BFrame.cpp
+++ b/engines/wintermute/base/BFrame.cpp
@@ -34,7 +34,7 @@
 #include "engines/wintermute/base/BSoundMgr.h"

 #include "engines/wintermute/base/BSound.h"

 #include "engines/wintermute/base/BSubFrame.h"

-#include "engines/wintermute/PlatformSDL.h"

+#include "engines/wintermute/platform_osystem.h"

 #include "engines/wintermute/base/scriptables/ScValue.h"

 #include "engines/wintermute/base/scriptables/ScScript.h"

 #include "engines/wintermute/base/scriptables/ScStack.h"

diff --git a/engines/wintermute/base/BObject.cpp b/engines/wintermute/base/BObject.cpp
index 1bb52c0ce6..ed5d6fa5b7 100644
--- a/engines/wintermute/base/BObject.cpp
+++ b/engines/wintermute/base/BObject.cpp
@@ -36,7 +36,7 @@
 #include "engines/wintermute/base/BGame.h"

 #include "engines/wintermute/base/BStringTable.h"

 #include "engines/wintermute/base/BSprite.h"

-#include "engines/wintermute/PlatformSDL.h"

+#include "engines/wintermute/platform_osystem.h"

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/base/BParser.cpp b/engines/wintermute/base/BParser.cpp
index f675d0ca50..80d3b58213 100644
--- a/engines/wintermute/base/BParser.cpp
+++ b/engines/wintermute/base/BParser.cpp
@@ -29,7 +29,7 @@
 #include "engines/wintermute/dcgf.h"

 #include "engines/wintermute/base/BParser.h"

 #include "engines/wintermute/base/BGame.h"

-#include "engines/wintermute/PlatformSDL.h"

+#include "engines/wintermute/platform_osystem.h"

 #include "common/str.h"

 #include "common/util.h"

 

diff --git a/engines/wintermute/base/BPersistMgr.cpp b/engines/wintermute/base/BPersistMgr.cpp
index 0f2cc6bc8a..f8faced95f 100644
--- a/engines/wintermute/base/BPersistMgr.cpp
+++ b/engines/wintermute/base/BPersistMgr.cpp
@@ -31,7 +31,7 @@
 #include "engines/wintermute/base/BGame.h"

 #include "engines/wintermute/base/BPersistMgr.h"

 #include "engines/wintermute/base/BSaveThumbHelper.h"

-#include "engines/wintermute/PlatformSDL.h"

+#include "engines/wintermute/platform_osystem.h"

 #include "engines/wintermute/math/Vector2.h"

 #include "engines/wintermute/utils/StringUtil.h"

 #include "engines/wintermute/base/gfx/base_image.h"

diff --git a/engines/wintermute/base/BRegion.cpp b/engines/wintermute/base/BRegion.cpp
index 1c38174cb8..c8ec87e04a 100644
--- a/engines/wintermute/base/BRegion.cpp
+++ b/engines/wintermute/base/BRegion.cpp
@@ -35,7 +35,7 @@
 #include "engines/wintermute/base/scriptables/ScStack.h"

 #include "engines/wintermute/base/scriptables/ScValue.h"

 #include "engines/wintermute/base/BFileManager.h"

-#include "engines/wintermute/PlatformSDL.h"

+#include "engines/wintermute/platform_osystem.h"

 #include <limits.h>

 

 namespace WinterMute {

diff --git a/engines/wintermute/base/BResources.cpp b/engines/wintermute/base/BResources.cpp
index b99441b5db..839be570c5 100644
--- a/engines/wintermute/base/BResources.cpp
+++ b/engines/wintermute/base/BResources.cpp
@@ -26,7 +26,7 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "engines/wintermute/PlatformSDL.h"

+#include "engines/wintermute/platform_osystem.h"

 #include "engines/wintermute/base/BResources.h"

 #include "common/str.h"

 #include "common/memstream.h"

diff --git a/engines/wintermute/base/BSprite.cpp b/engines/wintermute/base/BSprite.cpp
index c93a40ca75..c4dfaa3f8d 100644
--- a/engines/wintermute/base/BSprite.cpp
+++ b/engines/wintermute/base/BSprite.cpp
@@ -38,7 +38,7 @@
 #include "engines/wintermute/base/BSound.h"

 #include "engines/wintermute/base/BSubFrame.h"

 #include "engines/wintermute/base/BFileManager.h"

-#include "engines/wintermute/PlatformSDL.h"

+#include "engines/wintermute/platform_osystem.h"

 #include "engines/wintermute/base/scriptables/ScValue.h"

 #include "engines/wintermute/base/scriptables/ScScript.h"

 #include "engines/wintermute/base/scriptables/ScStack.h"

diff --git a/engines/wintermute/base/BStringTable.cpp b/engines/wintermute/base/BStringTable.cpp
index 44f26ba7e8..470ae8549c 100644
--- a/engines/wintermute/base/BStringTable.cpp
+++ b/engines/wintermute/base/BStringTable.cpp
@@ -26,7 +26,7 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "engines/wintermute/PlatformSDL.h"

+#include "engines/wintermute/platform_osystem.h"

 #include "engines/wintermute/base/BFileManager.h"

 #include "engines/wintermute/base/BGame.h"

 #include "engines/wintermute/base/BStringTable.h"

diff --git a/engines/wintermute/base/BSubFrame.cpp b/engines/wintermute/base/BSubFrame.cpp
index 60048ac05a..858f2125c6 100644
--- a/engines/wintermute/base/BSubFrame.cpp
+++ b/engines/wintermute/base/BSubFrame.cpp
@@ -34,7 +34,7 @@
 #include "engines/wintermute/base/gfx/base_surface.h"

 #include "engines/wintermute/base/BSurfaceStorage.h"

 #include "engines/wintermute/base/BGame.h"

-#include "engines/wintermute/PlatformSDL.h"

+#include "engines/wintermute/platform_osystem.h"

 #include "engines/wintermute/base/scriptables/ScValue.h"

 #include "engines/wintermute/base/scriptables/ScStack.h"

 

diff --git a/engines/wintermute/base/BSurfaceStorage.cpp b/engines/wintermute/base/BSurfaceStorage.cpp
index f50d174898..887510b675 100644
--- a/engines/wintermute/base/BSurfaceStorage.cpp
+++ b/engines/wintermute/base/BSurfaceStorage.cpp
@@ -31,7 +31,7 @@
 #include "engines/wintermute/base/gfx/base_surface.h"

 #include "engines/wintermute/base/BGame.h"

 #include "engines/wintermute/base/BFileManager.h"

-#include "engines/wintermute/PlatformSDL.h"

+#include "engines/wintermute/platform_osystem.h"

 #include "common/str.h"

 

 namespace WinterMute {

diff --git a/engines/wintermute/base/BTransitionMgr.cpp b/engines/wintermute/base/BTransitionMgr.cpp
index 7c9a95368a..1cea7285bf 100644
--- a/engines/wintermute/base/BTransitionMgr.cpp
+++ b/engines/wintermute/base/BTransitionMgr.cpp
@@ -29,7 +29,7 @@
 #include "engines/wintermute/dcgf.h"

 #include "engines/wintermute/base/BTransitionMgr.h"

 #include "engines/wintermute/base/BGame.h"

-#include "engines/wintermute/PlatformSDL.h"

+#include "engines/wintermute/platform_osystem.h"

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/base/BViewport.cpp b/engines/wintermute/base/BViewport.cpp
index 0f2a67d3bf..2b237a0d38 100644
--- a/engines/wintermute/base/BViewport.cpp
+++ b/engines/wintermute/base/BViewport.cpp
@@ -27,7 +27,7 @@
  */

 

 #include "engines/wintermute/base/BGame.h"

-#include "engines/wintermute/PlatformSDL.h"

+#include "engines/wintermute/platform_osystem.h"

 #include "engines/wintermute/base/BViewport.h"

 

 namespace WinterMute {

diff --git a/engines/wintermute/base/file/BSaveThumbFile.cpp b/engines/wintermute/base/file/BSaveThumbFile.cpp
index b2eebb690b..4a75b7d7ce 100644
--- a/engines/wintermute/base/file/BSaveThumbFile.cpp
+++ b/engines/wintermute/base/file/BSaveThumbFile.cpp
@@ -29,7 +29,7 @@
 #include "engines/wintermute/dcgf.h"

 #include "engines/wintermute/base/BGame.h"

 #include "engines/wintermute/base/file/BSaveThumbFile.h"

-#include "engines/wintermute/PlatformSDL.h"

+#include "engines/wintermute/platform_osystem.h"

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/base/font/BFontBitmap.cpp b/engines/wintermute/base/font/BFontBitmap.cpp
index 031f075d1b..341f90d559 100644
--- a/engines/wintermute/base/font/BFontBitmap.cpp
+++ b/engines/wintermute/base/font/BFontBitmap.cpp
@@ -37,7 +37,7 @@
 #include "engines/wintermute/base/BFrame.h"

 #include "engines/wintermute/base/BSprite.h"

 #include "engines/wintermute/base/BFileManager.h"

-#include "engines/wintermute/PlatformSDL.h"

+#include "engines/wintermute/platform_osystem.h"

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/base/font/BFontStorage.cpp b/engines/wintermute/base/font/BFontStorage.cpp
index a777ac9db8..b5605cf2bc 100644
--- a/engines/wintermute/base/font/BFontStorage.cpp
+++ b/engines/wintermute/base/font/BFontStorage.cpp
@@ -30,7 +30,7 @@
 #include "engines/wintermute/base/font/BFontStorage.h"

 #include "engines/wintermute/base/font/BFont.h"

 #include "engines/wintermute/base/BGame.h"

-#include "engines/wintermute/PlatformSDL.h"

+#include "engines/wintermute/platform_osystem.h"

 #include "common/str.h"

 

 namespace WinterMute {

diff --git a/engines/wintermute/base/font/BFontTT.cpp b/engines/wintermute/base/font/BFontTT.cpp
index 2707dbea31..5f0c9fec1a 100644
--- a/engines/wintermute/base/font/BFontTT.cpp
+++ b/engines/wintermute/base/font/BFontTT.cpp
@@ -38,7 +38,7 @@
 #include "engines/wintermute/base/BGame.h"

 #include "engines/wintermute/base/BFileManager.h"

 #include "engines/wintermute/utils/utils.h"

-#include "engines/wintermute/PlatformSDL.h"

+#include "engines/wintermute/platform_osystem.h"

 #include "engines/wintermute/wintermute.h"

 #include "graphics/fonts/ttf.h"

 #include "graphics/fontman.h"

diff --git a/engines/wintermute/base/gfx/base_renderer.cpp b/engines/wintermute/base/gfx/base_renderer.cpp
index 010aca7141..5c5ebd91b4 100644
--- a/engines/wintermute/base/gfx/base_renderer.cpp
+++ b/engines/wintermute/base/gfx/base_renderer.cpp
@@ -32,7 +32,7 @@
 #include "engines/wintermute/base/gfx/base_surface.h"

 #include "engines/wintermute/base/BSubFrame.h"

 #include "engines/wintermute/base/BRegion.h"

-#include "engines/wintermute/PlatformSDL.h"

+#include "engines/wintermute/platform_osystem.h"

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp b/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp
index 1e4ac9a19e..66c6e4a61a 100644
--- a/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp
+++ b/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp
@@ -32,7 +32,7 @@
 #include "engines/wintermute/base/gfx/osystem/base_surface_osystem.h"

 #include "engines/wintermute/base/gfx/osystem/base_render_osystem.h"

 #include "engines/wintermute/base/gfx/base_image.h"

-#include "engines/wintermute/PlatformSDL.h"

+#include "engines/wintermute/platform_osystem.h"

 #include "graphics/decoders/png.h"

 #include "graphics/decoders/bmp.h"

 #include "graphics/decoders/jpeg.h"

diff --git a/engines/wintermute/base/particles/PartEmitter.cpp b/engines/wintermute/base/particles/PartEmitter.cpp
index 81147a5432..97de1fe044 100644
--- a/engines/wintermute/base/particles/PartEmitter.cpp
+++ b/engines/wintermute/base/particles/PartEmitter.cpp
@@ -37,7 +37,7 @@
 #include "engines/wintermute/base/BRegion.h"

 #include "engines/wintermute/base/BFileManager.h"

 #include "engines/wintermute/utils/utils.h"

-#include "engines/wintermute/PlatformSDL.h"

+#include "engines/wintermute/platform_osystem.h"

 #include "common/str.h"

 #include "common/math.h"

 

diff --git a/engines/wintermute/base/particles/PartParticle.cpp b/engines/wintermute/base/particles/PartParticle.cpp
index aa641f0a1c..1439231993 100644
--- a/engines/wintermute/base/particles/PartParticle.cpp
+++ b/engines/wintermute/base/particles/PartParticle.cpp
@@ -32,7 +32,7 @@
 #include "engines/wintermute/base/BSprite.h"

 #include "engines/wintermute/base/BGame.h"

 #include "engines/wintermute/utils/utils.h"

-#include "engines/wintermute/PlatformSDL.h"

+#include "engines/wintermute/platform_osystem.h"

 #include "common/str.h"

 #include <math.h>

 

diff --git a/engines/wintermute/base/scriptables/SXFile.cpp b/engines/wintermute/base/scriptables/SXFile.cpp
index b2a6d24677..1924a42d72 100644
--- a/engines/wintermute/base/scriptables/SXFile.cpp
+++ b/engines/wintermute/base/scriptables/SXFile.cpp
@@ -35,7 +35,7 @@
 #include "engines/wintermute/base/BGame.h"

 #include "engines/wintermute/base/file/BFile.h"

 #include "engines/wintermute/base/BFileManager.h"

-#include "engines/wintermute/PlatformSDL.h"

+#include "engines/wintermute/platform_osystem.h"

 #include "engines/wintermute/base/scriptables/SXFile.h"

 

 // Note: This code is completely untested, as I have yet to find a game that uses SXFile.

diff --git a/engines/wintermute/base/scriptables/ScEngine.h b/engines/wintermute/base/scriptables/ScEngine.h
index df327d800c..0322319b3d 100644
--- a/engines/wintermute/base/scriptables/ScEngine.h
+++ b/engines/wintermute/base/scriptables/ScEngine.h
@@ -34,7 +34,7 @@
 #include "engines/wintermute/base/BBase.h"

 #include "engines/wintermute/wme_debugger.h"

 #include "engines/wintermute/utils/utils.h"

-#include "engines/wintermute/PlatformSDL.h"

+#include "engines/wintermute/platform_osystem.h"

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/base/scriptables/ScValue.cpp b/engines/wintermute/base/scriptables/ScValue.cpp
index e9d5645682..f38a12fc7a 100644
--- a/engines/wintermute/base/scriptables/ScValue.cpp
+++ b/engines/wintermute/base/scriptables/ScValue.cpp
@@ -26,7 +26,7 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "engines/wintermute/PlatformSDL.h"

+#include "engines/wintermute/platform_osystem.h"

 #include "engines/wintermute/base/BDynBuffer.h"

 #include "engines/wintermute/base/BGame.h"

 #include "engines/wintermute/base/scriptables/ScValue.h"

diff --git a/engines/wintermute/module.mk b/engines/wintermute/module.mk
index 0c74193dac..ccda7ffffe 100644
--- a/engines/wintermute/module.mk
+++ b/engines/wintermute/module.mk
@@ -92,7 +92,7 @@ MODULE_OBJS := \
 	math/MathUtil.o \
 	math/Matrix4.o \
 	math/Vector2.o \
-	PlatformSDL.o \
+	platform_osystem.o \
 	system/SysClass.o \
 	system/SysClassRegistry.o \
 	system/SysInstance.o \
diff --git a/engines/wintermute/PlatformSDL.cpp b/engines/wintermute/platform_osystem.cpp
index 5bb757eee7..82b53da723 100644
--- a/engines/wintermute/PlatformSDL.cpp
+++ b/engines/wintermute/platform_osystem.cpp
@@ -30,7 +30,7 @@
 #include "engines/wintermute/base/BGame.h"

 #include "engines/wintermute/base/gfx/osystem/base_render_osystem.h"

 #include "engines/wintermute/utils/PathUtil.h"

-#include "engines/wintermute/PlatformSDL.h"

+#include "engines/wintermute/platform_osystem.h"

 #include "engines/wintermute/base/BRegistry.h"

 #include "engines/wintermute/base/BSoundMgr.h"

 #include "engines/wintermute/base/scriptables/ScEngine.h"

diff --git a/engines/wintermute/PlatformSDL.h b/engines/wintermute/platform_osystem.h
index e0314898bf..e0314898bf 100644
--- a/engines/wintermute/PlatformSDL.h
+++ b/engines/wintermute/platform_osystem.h
diff --git a/engines/wintermute/system/SysClassRegistry.cpp b/engines/wintermute/system/SysClassRegistry.cpp
index c37f3857e5..3260fd3d5f 100644
--- a/engines/wintermute/system/SysClassRegistry.cpp
+++ b/engines/wintermute/system/SysClassRegistry.cpp
@@ -27,7 +27,7 @@
  */

 

 #include "engines/wintermute/base/BGame.h"

-#include "engines/wintermute/PlatformSDL.h"

+#include "engines/wintermute/platform_osystem.h"

 #include "engines/wintermute/wintermute.h"

 #include "SysInstance.h"

 #include "SysClassRegistry.h"

diff --git a/engines/wintermute/ui/UIButton.cpp b/engines/wintermute/ui/UIButton.cpp
index f6c50597bd..273f923376 100644
--- a/engines/wintermute/ui/UIButton.cpp
+++ b/engines/wintermute/ui/UIButton.cpp
@@ -38,7 +38,7 @@
 #include "engines/wintermute/base/BStringTable.h"

 #include "engines/wintermute/base/BSprite.h"

 #include "engines/wintermute/base/BFileManager.h"

-#include "engines/wintermute/PlatformSDL.h"

+#include "engines/wintermute/platform_osystem.h"

 #include "engines/wintermute/base/scriptables/ScValue.h"

 #include "engines/wintermute/base/scriptables/ScScript.h"

 #include "engines/wintermute/base/scriptables/ScStack.h"

diff --git a/engines/wintermute/ui/UIEdit.cpp b/engines/wintermute/ui/UIEdit.cpp
index 4825761734..610853d8cb 100644
--- a/engines/wintermute/ui/UIEdit.cpp
+++ b/engines/wintermute/ui/UIEdit.cpp
@@ -40,7 +40,7 @@
 #include "engines/wintermute/base/BSprite.h"

 #include "engines/wintermute/base/BStringTable.h"

 #include "engines/wintermute/base/BGame.h"

-#include "engines/wintermute/PlatformSDL.h"

+#include "engines/wintermute/platform_osystem.h"

 #include "engines/wintermute/base/scriptables/ScValue.h"

 #include "engines/wintermute/base/scriptables/ScStack.h"

 #include "engines/wintermute/base/scriptables/ScScript.h"

diff --git a/engines/wintermute/ui/UIObject.cpp b/engines/wintermute/ui/UIObject.cpp
index 1032faeb2c..8b3dc19537 100644
--- a/engines/wintermute/ui/UIObject.cpp
+++ b/engines/wintermute/ui/UIObject.cpp
@@ -31,7 +31,7 @@
 #include "engines/wintermute/ui/UIObject.h"

 #include "engines/wintermute/ui/UITiledImage.h"

 #include "engines/wintermute/ui/UIWindow.h"

-#include "engines/wintermute/PlatformSDL.h"

+#include "engines/wintermute/platform_osystem.h"

 #include "engines/wintermute/base/scriptables/ScValue.h"

 #include "engines/wintermute/base/scriptables/ScStack.h"

 #include "engines/wintermute/base/font/BFontStorage.h"

diff --git a/engines/wintermute/ui/UIText.cpp b/engines/wintermute/ui/UIText.cpp
index 0b7df9bf19..a496483f67 100644
--- a/engines/wintermute/ui/UIText.cpp
+++ b/engines/wintermute/ui/UIText.cpp
@@ -40,7 +40,7 @@
 #include "engines/wintermute/base/scriptables/ScStack.h"

 #include "engines/wintermute/base/BSprite.h"

 #include "engines/wintermute/base/BFileManager.h"

-#include "engines/wintermute/PlatformSDL.h"

+#include "engines/wintermute/platform_osystem.h"

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/ui/UITiledImage.cpp b/engines/wintermute/ui/UITiledImage.cpp
index b80ae76978..04a2cfca58 100644
--- a/engines/wintermute/ui/UITiledImage.cpp
+++ b/engines/wintermute/ui/UITiledImage.cpp
@@ -34,7 +34,7 @@
 #include "engines/wintermute/base/BGame.h"

 #include "engines/wintermute/base/BSubFrame.h"

 #include "engines/wintermute/base/BFileManager.h"

-#include "engines/wintermute/PlatformSDL.h"

+#include "engines/wintermute/platform_osystem.h"

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/ui/UIWindow.cpp b/engines/wintermute/ui/UIWindow.cpp
index 1c6931b4a6..35330e720e 100644
--- a/engines/wintermute/ui/UIWindow.cpp
+++ b/engines/wintermute/ui/UIWindow.cpp
@@ -46,7 +46,7 @@
 #include "engines/wintermute/base/scriptables/ScStack.h"

 #include "engines/wintermute/base/BSprite.h"

 #include "engines/wintermute/base/BFileManager.h"

-#include "engines/wintermute/PlatformSDL.h"

+#include "engines/wintermute/platform_osystem.h"

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/utils/PathUtil.h b/engines/wintermute/utils/PathUtil.h
index 13e9e46652..139ce89ddd 100644
--- a/engines/wintermute/utils/PathUtil.h
+++ b/engines/wintermute/utils/PathUtil.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_PATHUTILS_H

 #define WINTERMUTE_PATHUTILS_H

 

-#include "engines/wintermute/PlatformSDL.h"

+#include "engines/wintermute/platform_osystem.h"

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/utils/StringUtil.h b/engines/wintermute/utils/StringUtil.h
index 794007276b..bd1b71f405 100644
--- a/engines/wintermute/utils/StringUtil.h
+++ b/engines/wintermute/utils/StringUtil.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_STRINGUTIL_H

 #define WINTERMUTE_STRINGUTIL_H

 

-#include "engines/wintermute/PlatformSDL.h"

+#include "engines/wintermute/platform_osystem.h"

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/utils/utils.cpp b/engines/wintermute/utils/utils.cpp
index 641b2d20ac..1735732185 100644
--- a/engines/wintermute/utils/utils.cpp
+++ b/engines/wintermute/utils/utils.cpp
@@ -28,7 +28,7 @@
 

 #include "engines/wintermute/dcgf.h"

 #include "utils.h"

-#include "engines/wintermute/PlatformSDL.h"

+#include "engines/wintermute/platform_osystem.h"

 #include "engines/wintermute/wintypes.h"

 #include "PathUtil.h"

 #include "engines/wintermute/base/BGame.h"

diff --git a/engines/wintermute/video/VidTheoraPlayer.cpp b/engines/wintermute/video/VidTheoraPlayer.cpp
index 8727f6f5a6..ffb24d22dd 100644
--- a/engines/wintermute/video/VidTheoraPlayer.cpp
+++ b/engines/wintermute/video/VidTheoraPlayer.cpp
@@ -36,7 +36,7 @@
 #include "engines/wintermute/base/gfx/base_image.h"
 #include "engines/wintermute/base/BSoundMgr.h"
 #include "engines/wintermute/utils/utils.h"
-#include "engines/wintermute/PlatformSDL.h"
+#include "engines/wintermute/platform_osystem.h"
 #include "engines/wintermute/video/decoders/theora_decoder.h"
 #include "common/system.h"
 //#pragma comment(lib, "libtheora.lib")
diff --git a/engines/wintermute/wintermute.cpp b/engines/wintermute/wintermute.cpp
index 22981dc35f..220e9f4057 100644
--- a/engines/wintermute/wintermute.cpp
+++ b/engines/wintermute/wintermute.cpp
@@ -33,7 +33,7 @@
 #include "engines/util.h"
 #include "engines/wintermute/ad/AdGame.h"
 #include "engines/wintermute/wintermute.h"
-#include "engines/wintermute/PlatformSDL.h"
+#include "engines/wintermute/platform_osystem.h"
 #include "engines/wintermute/base/BRegistry.h"
 
 #include "engines/wintermute/base/BSoundMgr.h"