Merged common/stdafx.h into common/scummsys.h. All referencing files have been updated.

svn-id: r28966

86 files changed, 6 insertions, 92 deletions

diff --git a/backends/platform/PalmOS/Src/be_base.h b/backends/platform/PalmOS/Src/be_base.h
index 0520d4bfdc..a4c27cf2da 100644
--- a/backends/platform/PalmOS/Src/be_base.h
+++ b/backends/platform/PalmOS/Src/be_base.h
@@ -29,7 +29,6 @@
 #include "PalmVersion.h"
 #include "globals.h"
 
-#include "common/stdafx.h"
 #include "common/scummsys.h"
 #include "common/system.h"
 #include "common/events.h"
diff --git a/backends/platform/PalmOS/Src/be_save.h b/backends/platform/PalmOS/Src/be_save.h
index 56b1b5e7a0..cad5855551 100755
--- a/backends/platform/PalmOS/Src/be_save.h
+++ b/backends/platform/PalmOS/Src/be_save.h
@@ -26,7 +26,6 @@
 #ifndef BACKEND_SAVES_PALM_H
 #define BACKEND_SAVES_PALM_H
 
-#include "common/stdafx.h"
 #include "saves/default/default-saves.h"
 
 class PalmSaveFileManager : public DefaultSaveFileManager {
diff --git a/backends/platform/PalmOS/Src/cd_aeroplayer.cpp b/backends/platform/PalmOS/Src/cd_aeroplayer.cpp
index 7e9ae5d1bd..e1785c9239 100644
--- a/backends/platform/PalmOS/Src/cd_aeroplayer.cpp
+++ b/backends/platform/PalmOS/Src/cd_aeroplayer.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-#include "stdafx.h"
 #include "common/system.h"
 #include "common/config-manager.h"
 
diff --git a/backends/platform/PalmOS/Src/cd_default.cpp b/backends/platform/PalmOS/Src/cd_default.cpp
index e103df6931..416701524d 100644
--- a/backends/platform/PalmOS/Src/cd_default.cpp
+++ b/backends/platform/PalmOS/Src/cd_default.cpp
@@ -22,7 +22,6 @@
  * $Id$
  *
  */
-#include "common/stdafx.h"
 #include "common/system.h"
 #include "cd_default.h"
 
diff --git a/backends/platform/PalmOS/Src/cd_msa.cpp b/backends/platform/PalmOS/Src/cd_msa.cpp
index 5fb1a0c12f..1a9752852e 100644
--- a/backends/platform/PalmOS/Src/cd_msa.cpp
+++ b/backends/platform/PalmOS/Src/cd_msa.cpp
@@ -23,7 +23,6 @@
  *
  */
 #include <SonyClie.h>
-#include "common/stdafx.h"
 #include "common/system.h"
 #include "cd_msa.h"
 #include "start.h"	// for appFileCreat
diff --git a/backends/platform/PalmOS/Src/cd_pockettunes.cpp b/backends/platform/PalmOS/Src/cd_pockettunes.cpp
index 66483a6e87..b647114fb8 100644
--- a/backends/platform/PalmOS/Src/cd_pockettunes.cpp
+++ b/backends/platform/PalmOS/Src/cd_pockettunes.cpp
@@ -22,7 +22,6 @@
  * $Id$
  *
  */
-#include "common/stdafx.h"
 #include "common/system.h"
 #include "common/config-manager.h"
 
diff --git a/backends/platform/PalmOS/Src/launcher/forms/formmain.cpp b/backends/platform/PalmOS/Src/launcher/forms/formmain.cpp
index 78b9ac3256..f8c441e2e4 100644
--- a/backends/platform/PalmOS/Src/launcher/forms/formmain.cpp
+++ b/backends/platform/PalmOS/Src/launcher/forms/formmain.cpp
@@ -32,7 +32,6 @@
 #include "scumm_globals.h"
 #include "globals.h"
 
-#include "common/stdafx.h"
 #include "base/version.h"
 
 #include "formEditGame.h"
diff --git a/backends/platform/PalmOS/Src/native/zodiacARM.cpp b/backends/platform/PalmOS/Src/native/zodiacARM.cpp
index ad2f94605f..87de372943 100644
--- a/backends/platform/PalmOS/Src/native/zodiacARM.cpp
+++ b/backends/platform/PalmOS/Src/native/zodiacARM.cpp
@@ -36,7 +36,6 @@
 //#include <AdnDebugMgr.h>
 //#define DEBUG_ARM
 
-#include "stdafx.h"
 #include "base/main.h"
 #ifdef COMPILE_ZODIAC
 #	include "be_zodiac.h"
diff --git a/backends/platform/dc/audio.cpp b/backends/platform/dc/audio.cpp
index 7364b170e6..5f95a836e8 100644
--- a/backends/platform/dc/audio.cpp
+++ b/backends/platform/dc/audio.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-#include <common/stdafx.h>
 #include <common/scummsys.h>
 #include "engines/engine.h"
 #include "sound/mixer.h"
diff --git a/backends/platform/dc/dcloader.cpp b/backends/platform/dc/dcloader.cpp
index 7e5a068780..2aba1cddf5 100644
--- a/backends/platform/dc/dcloader.cpp
+++ b/backends/platform/dc/dcloader.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-#include <common/stdafx.h>
 #include <ronin/ronin.h>
 #include <string.h>
 #include <stdarg.h>
diff --git a/backends/platform/dc/dcmain.cpp b/backends/platform/dc/dcmain.cpp
index 9c11d0f9da..bada39180c 100644
--- a/backends/platform/dc/dcmain.cpp
+++ b/backends/platform/dc/dcmain.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-#include <common/stdafx.h>
 #include <common/scummsys.h>
 #include <engines/engine.h>
 #include <base/main.h>
diff --git a/backends/platform/dc/display.cpp b/backends/platform/dc/display.cpp
index 9d095e389d..062df16a7e 100644
--- a/backends/platform/dc/display.cpp
+++ b/backends/platform/dc/display.cpp
@@ -25,7 +25,6 @@
 
 #define RONIN_TIMER_ACCESS
 
-#include <common/stdafx.h>
 #include <common/scummsys.h>
 #include <graphics/scaler/intern.h>
 #include <graphics/surface.h>
diff --git a/backends/platform/dc/input.cpp b/backends/platform/dc/input.cpp
index 6d7178fc97..be2ac2f178 100644
--- a/backends/platform/dc/input.cpp
+++ b/backends/platform/dc/input.cpp
@@ -25,7 +25,6 @@
 
 #define RONIN_TIMER_ACCESS
 
-#include <common/stdafx.h>
 #include <common/scummsys.h>
 #include <common/events.h>
 #include "dc.h"
diff --git a/backends/platform/dc/selector.cpp b/backends/platform/dc/selector.cpp
index 7c472ccf24..a734a9e13e 100644
--- a/backends/platform/dc/selector.cpp
+++ b/backends/platform/dc/selector.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-#include <common/stdafx.h>
 #include <common/scummsys.h>
 #include <engines/engine.h>
 #include <base/plugins.h>
diff --git a/backends/platform/dc/softkbd.cpp b/backends/platform/dc/softkbd.cpp
index 1f2bd619e1..112eb0c1c0 100644
--- a/backends/platform/dc/softkbd.cpp
+++ b/backends/platform/dc/softkbd.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-#include <common/stdafx.h>
 #include <common/scummsys.h>
 #include "common/events.h"
 #include "engines/engine.h"
diff --git a/backends/platform/dc/time.cpp b/backends/platform/dc/time.cpp
index 890e98f6b4..c87062d583 100644
--- a/backends/platform/dc/time.cpp
+++ b/backends/platform/dc/time.cpp
@@ -25,7 +25,6 @@
 
 #define RONIN_TIMER_ACCESS
 
-#include <common/stdafx.h>
 #include <common/scummsys.h>
 #include "dc.h"
 
diff --git a/backends/platform/dc/vmsave.cpp b/backends/platform/dc/vmsave.cpp
index 5b7eaf5f46..39526a48c3 100644
--- a/backends/platform/dc/vmsave.cpp
+++ b/backends/platform/dc/vmsave.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-#include <common/stdafx.h>
 #include <common/scummsys.h>
 #include "engines/engine.h"
 #include "dc.h"
diff --git a/backends/platform/ds/arm9/source/blitters.cpp b/backends/platform/ds/arm9/source/blitters.cpp
index 1ce8429a4d..9522dbc9cb 100644
--- a/backends/platform/ds/arm9/source/blitters.cpp
+++ b/backends/platform/ds/arm9/source/blitters.cpp
@@ -20,7 +20,6 @@
  *
  */
 
-#include "stdafx.h"
 #include "blitters.h"
 #define CHARSET_MASK_TRANSPARENCY 253
 
diff --git a/backends/platform/ds/arm9/source/cdaudio.cpp b/backends/platform/ds/arm9/source/cdaudio.cpp
index 3a012fc01a..a550ccf968 100644
--- a/backends/platform/ds/arm9/source/cdaudio.cpp
+++ b/backends/platform/ds/arm9/source/cdaudio.cpp
@@ -20,7 +20,6 @@
  *
  */
  
-#include "stdafx.h"
 #include "cdaudio.h"
 #include "ds-fs.h"
 #include "config-manager.h"
diff --git a/backends/platform/ds/arm9/source/dsmain.h b/backends/platform/ds/arm9/source/dsmain.h
index 94f02145a2..a353a7cec8 100644
--- a/backends/platform/ds/arm9/source/dsmain.h
+++ b/backends/platform/ds/arm9/source/dsmain.h
@@ -24,7 +24,6 @@
 #define _DSMAIN_H
 
 #include <nds.h>
-#include "stdafx.h"
 #include "osystem_ds.h"
 #include "scummconsole.h"
 #include "NDS/scummvm_ipc.h"
diff --git a/backends/platform/ds/arm9/source/dsoptions.h b/backends/platform/ds/arm9/source/dsoptions.h
index 6976fb1a59..87282142f6 100644
--- a/backends/platform/ds/arm9/source/dsoptions.h
+++ b/backends/platform/ds/arm9/source/dsoptions.h
@@ -23,7 +23,6 @@
 #ifndef _DSOPTIONS_H_
 #define _DSOPTIONS_H_
 
-#include "stdafx.h"
 
 #include "common/scummsys.h"
 #include "common/str.h"
diff --git a/backends/platform/ds/arm9/source/gbampsave.h b/backends/platform/ds/arm9/source/gbampsave.h
index c7d9732d4c..b9589a29e6 100644
--- a/backends/platform/ds/arm9/source/gbampsave.h
+++ b/backends/platform/ds/arm9/source/gbampsave.h
@@ -23,7 +23,6 @@
 #ifndef _GBAMPSAVE_H_
 #define _GBAMPSAVE_H_
 
-#include "stdafx.h"
 #include "system.h"
 
 #define SAVE_BUFFER_SIZE 100000
diff --git a/backends/platform/ds/arm9/source/osystem_ds.cpp b/backends/platform/ds/arm9/source/osystem_ds.cpp
index 39413d0723..ae5d116985 100644
--- a/backends/platform/ds/arm9/source/osystem_ds.cpp
+++ b/backends/platform/ds/arm9/source/osystem_ds.cpp
@@ -20,7 +20,6 @@
  */
 
 
-#include "stdafx.h"
 #include "common/scummsys.h"
 #include "common/system.h"
 #include "system.h"
diff --git a/backends/platform/ds/arm9/source/portdefs.cpp b/backends/platform/ds/arm9/source/portdefs.cpp
index 28120e07b8..e669dd5b80 100644
--- a/backends/platform/ds/arm9/source/portdefs.cpp
+++ b/backends/platform/ds/arm9/source/portdefs.cpp
@@ -20,7 +20,6 @@
  *
  */
 
-#include "stdafx.h"
 #include <string.h>
 #include "nds/dma.h"
 #include "osystem_ds.h"
diff --git a/backends/platform/ds/arm9/source/ramsave.cpp b/backends/platform/ds/arm9/source/ramsave.cpp
index ea4bff9cc3..1cd7ff814b 100644
--- a/backends/platform/ds/arm9/source/ramsave.cpp
+++ b/backends/platform/ds/arm9/source/ramsave.cpp
@@ -20,7 +20,6 @@
  * 
  */
  // Save in order 1,2,3,4,larger 2,5
-#include "stdafx.h"
 #include "system.h"
 #include "ramsave.h"
 #include "nds.h"
diff --git a/backends/platform/ds/arm9/source/scummhelp.cpp b/backends/platform/ds/arm9/source/scummhelp.cpp
index 2bbaac4b07..452f782dc5 100644
--- a/backends/platform/ds/arm9/source/scummhelp.cpp
+++ b/backends/platform/ds/arm9/source/scummhelp.cpp
@@ -20,7 +20,6 @@
  *
  */
  
-#include "stdafx.h"
 #include "scummhelp.h"
 
 #define ADD_BIND(k,d) do { key[i] = k; dsc[i] = d; i++; } while (0)
diff --git a/backends/platform/ds/arm9/source/zipreader.cpp b/backends/platform/ds/arm9/source/zipreader.cpp
index 0c86bd97ae..01321f44f5 100644
--- a/backends/platform/ds/arm9/source/zipreader.cpp
+++ b/backends/platform/ds/arm9/source/zipreader.cpp
@@ -21,7 +21,6 @@
  */
 
 
-#include "stdafx.h"
 #include "zipreader.h"
 
 #define SWAP_U16(v) (((v & 0xFF) << 8) + (v & 0xFF00))
diff --git a/backends/platform/ds/arm9/source/zipreader.h b/backends/platform/ds/arm9/source/zipreader.h
index d4390ab74d..19aa3d9f31 100644
--- a/backends/platform/ds/arm9/source/zipreader.h
+++ b/backends/platform/ds/arm9/source/zipreader.h
@@ -22,7 +22,6 @@
  
 #ifndef _ZIPREADER_H_
 #define _ZIPREADER_H_
-#include "stdafx.h"
 #include "portdefs.h"
 #define ZF_SEARCH_START 0x08000000
 #define ZF_SEARCH_END 0x09000000
diff --git a/backends/platform/gp2x/gp2x-common.h b/backends/platform/gp2x/gp2x-common.h
index 1812fdd8d9..4a688bbf9d 100644
--- a/backends/platform/gp2x/gp2x-common.h
+++ b/backends/platform/gp2x/gp2x-common.h
@@ -29,7 +29,6 @@
 #define __GP2X__
 #define USE_OSD
 
-#include "common/stdafx.h"
 #include "common/scummsys.h"
 #include "common/system.h"
 #include "graphics/scaler.h"
diff --git a/backends/platform/gp32/gp32_launcher.cpp b/backends/platform/gp32/gp32_launcher.cpp
index 69c9b00e3e..9931118f08 100644
--- a/backends/platform/gp32/gp32_launcher.cpp
+++ b/backends/platform/gp32/gp32_launcher.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-#include "stdafx.h"
 #include "common/scummsys.h"
 #include "common/file.h"
 
diff --git a/backends/platform/gp32/gp32_launcher.h b/backends/platform/gp32/gp32_launcher.h
index d7384e4caa..fee9e9b60e 100644
--- a/backends/platform/gp32/gp32_launcher.h
+++ b/backends/platform/gp32/gp32_launcher.h
@@ -26,7 +26,6 @@
 #ifndef __GP32_LAUNCHER_H
 #define __GP32_LAUNCHER_H
 
-#include "stdafx.h"
 #include "common/scummsys.h"
 
 extern void readConfigVars();
diff --git a/backends/platform/gp32/gp32_main.cpp b/backends/platform/gp32/gp32_main.cpp
index 578ef86e4e..e985993e5f 100644
--- a/backends/platform/gp32/gp32_main.cpp
+++ b/backends/platform/gp32/gp32_main.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-#include "stdafx.h"
 #include "common/scummsys.h"
 
 #include "common/config-manager.h"
diff --git a/backends/platform/gp32/gp32_osys.cpp b/backends/platform/gp32/gp32_osys.cpp
index f6e0a10bbc..56a9f103ed 100644
--- a/backends/platform/gp32/gp32_osys.cpp
+++ b/backends/platform/gp32/gp32_osys.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-#include "stdafx.h"
 #include "common/scummsys.h"
 #include "common/system.h"
 
diff --git a/backends/platform/gp32/gp32_osys.h b/backends/platform/gp32/gp32_osys.h
index 94578e8e15..3c6e0686f4 100644
--- a/backends/platform/gp32/gp32_osys.h
+++ b/backends/platform/gp32/gp32_osys.h
@@ -27,7 +27,6 @@
 #define GP32_OSYS_H
 
 //Standard ScummVM includes.
-#include "common/stdafx.h"
 #include "common/scummsys.h"
 #include "common/system.h"
 #include "backends/intern.h"
diff --git a/backends/platform/gp32/gp32std.cpp b/backends/platform/gp32/gp32std.cpp
index 7218505436..898d4669b6 100644
--- a/backends/platform/gp32/gp32std.cpp
+++ b/backends/platform/gp32/gp32std.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-#include "stdafx.h"
 #include "common/scummsys.h"
 //#include "graphics/scaler.h"
 #include "common/system.h"
diff --git a/backends/platform/gp32/gp32std_file.cpp b/backends/platform/gp32/gp32std_file.cpp
index fcd9acf4da..61fe3da0ee 100644
--- a/backends/platform/gp32/gp32std_file.cpp
+++ b/backends/platform/gp32/gp32std_file.cpp
@@ -24,7 +24,6 @@
  */
 
 
-#include "stdafx.h"
 #include "common/scummsys.h"
 //#include "graphics/scaler.h"
 #include "common/system.h"
diff --git a/backends/platform/gp32/gp32std_grap.cpp b/backends/platform/gp32/gp32std_grap.cpp
index 275513818d..50349d6708 100644
--- a/backends/platform/gp32/gp32std_grap.cpp
+++ b/backends/platform/gp32/gp32std_grap.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-#include "stdafx.h"
 #include "common/scummsys.h"
 #include "common/system.h"
 #include "backends/intern.h"
diff --git a/backends/platform/gp32/gp32std_input.cpp b/backends/platform/gp32/gp32std_input.cpp
index de82f8b0bc..a3ad7a00c8 100644
--- a/backends/platform/gp32/gp32std_input.cpp
+++ b/backends/platform/gp32/gp32std_input.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-#include "stdafx.h"
 #include "common/scummsys.h"
 
 #include "gp32std.h"
diff --git a/backends/platform/gp32/gp32std_input.h b/backends/platform/gp32/gp32std_input.h
index 6c765d840f..bd784d3432 100644
--- a/backends/platform/gp32/gp32std_input.h
+++ b/backends/platform/gp32/gp32std_input.h
@@ -26,7 +26,6 @@
 #ifndef __GP32STD_INPUT_H
 #define __GP32STD_INPUT_H
 
-#include "stdafx.h"
 #include "common/scummsys.h"
 
 #define BUTTON_DOWN 1
diff --git a/backends/platform/gp32/gp32std_memory.cpp b/backends/platform/gp32/gp32std_memory.cpp
index 449fec9f95..607ea7659a 100644
--- a/backends/platform/gp32/gp32std_memory.cpp
+++ b/backends/platform/gp32/gp32std_memory.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-#include "stdafx.h"
 #include "common/scummsys.h"
 //#include "graphics/scaler.h"
 #include "common/system.h"
diff --git a/backends/platform/gp32/gp32std_sound.cpp b/backends/platform/gp32/gp32std_sound.cpp
index 70969bc1b7..71c09c900c 100644
--- a/backends/platform/gp32/gp32std_sound.cpp
+++ b/backends/platform/gp32/gp32std_sound.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-#include "stdafx.h"
 #include "common/scummsys.h"
 
 #include "gp32std.h"
diff --git a/backends/platform/maemo/maemo-sdl.cpp b/backends/platform/maemo/maemo-sdl.cpp
index 7d0c218ca8..cb0141924b 100644
--- a/backends/platform/maemo/maemo-sdl.cpp
+++ b/backends/platform/maemo/maemo-sdl.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-#include "common/stdafx.h"
 #include "backends/platform/maemo/maemo-sdl.h"
 
 
diff --git a/backends/platform/maemo/maemo-sdl.h b/backends/platform/maemo/maemo-sdl.h
index 530af27af6..f45648a9e6 100644
--- a/backends/platform/maemo/maemo-sdl.h
+++ b/backends/platform/maemo/maemo-sdl.h
@@ -26,7 +26,6 @@
 #ifndef MAEMO_SDL_H
 #define MAEMO_SDL_H
 
-#include "common/stdafx.h"
 #include "backends/platform/sdl/sdl-common.h"
 
 //#include "CEkeys.h"
diff --git a/backends/platform/maemo/main.cpp b/backends/platform/maemo/main.cpp
index 73a5aff7bc..af5c6b4c10 100644
--- a/backends/platform/maemo/main.cpp
+++ b/backends/platform/maemo/main.cpp
@@ -23,7 +23,6 @@
  *
  */
  
-#include <common/stdafx.h>
 #include <common/scummsys.h>
 #include <X11/Xlib.h> 
 #include <X11/extensions/Xsp.h>
diff --git a/backends/platform/null/null.cpp b/backends/platform/null/null.cpp
index 250ca0fb29..194a7b6889 100644
--- a/backends/platform/null/null.cpp
+++ b/backends/platform/null/null.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-#include "common/stdafx.h"
 #include "common/system.h"
 #include "base/main.h"
 
diff --git a/backends/platform/ps2/systemps2.cpp b/backends/platform/ps2/systemps2.cpp
index 6572166e91..f842874850 100644
--- a/backends/platform/ps2/systemps2.cpp
+++ b/backends/platform/ps2/systemps2.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-#include "common/stdafx.h"
 #include <kernel.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/backends/platform/ps2/systemps2.h b/backends/platform/ps2/systemps2.h
index 033431a6fd..beae62dc0e 100644
--- a/backends/platform/ps2/systemps2.h
+++ b/backends/platform/ps2/systemps2.h
@@ -26,7 +26,6 @@
 #ifndef SYSTEMPS2_H
 #define SYSTEMPS2_H
 
-#include "common/stdafx.h"
 #include "common/system.h"
 
 class Gs2dScreen;
diff --git a/backends/platform/psp/osys_psp.cpp b/backends/platform/psp/osys_psp.cpp
index 5144f5a401..ed615d7955 100644
--- a/backends/platform/psp/osys_psp.cpp
+++ b/backends/platform/psp/osys_psp.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-#include "common/stdafx.h"
 #include "common/config-manager.h"
 #include "common/events.h"
 #include "common/rect.h"
diff --git a/backends/platform/psp/osys_psp.h b/backends/platform/psp/osys_psp.h
index 7c0932dc20..a7a4834441 100644
--- a/backends/platform/psp/osys_psp.h
+++ b/backends/platform/psp/osys_psp.h
@@ -23,7 +23,6 @@
  *
  */
 
-#include "common/stdafx.h"
 #include "common/scummsys.h"
 #include "common/system.h"
 #include "backends/intern.h"
diff --git a/backends/platform/psp/osys_psp_gu.h b/backends/platform/psp/osys_psp_gu.h
index 6486e7f3cc..af67be5185 100644
--- a/backends/platform/psp/osys_psp_gu.h
+++ b/backends/platform/psp/osys_psp_gu.h
@@ -22,7 +22,6 @@
  */
 
 #include <pspgu.h>
-#include "common/stdafx.h"
 #include "common/scummsys.h"
 
 #include "common/rect.h"
diff --git a/backends/platform/psp/psp_main.cpp b/backends/platform/psp/psp_main.cpp
index 8cfed7e573..92d6beea74 100644
--- a/backends/platform/psp/psp_main.cpp
+++ b/backends/platform/psp/psp_main.cpp
@@ -31,7 +31,6 @@
 #include <pspdebug.h>
 #endif
 
-#include <common/stdafx.h>
 #include <common/system.h>
 #include <engines/engine.h>
 #include <base/main.h>
diff --git a/backends/platform/sdl/sdl.h b/backends/platform/sdl/sdl.h
index 35e6dde1cd..fde721c36a 100644
--- a/backends/platform/sdl/sdl.h
+++ b/backends/platform/sdl/sdl.h
@@ -28,7 +28,6 @@
 
 #include <SDL.h>
 
-#include "common/stdafx.h"
 #include "common/scummsys.h"
 #include "common/system.h"
 #include "graphics/scaler.h"
@@ -215,7 +214,7 @@ protected:
 
 	// unseen game screen
 	SDL_Surface *_screen;
-	
+
 	// TODO: We could get rid of the following two vars and just use _screen instead
 	int _screenWidth, _screenHeight;
 
@@ -272,7 +271,7 @@ protected:
 	int _mode;
 	int _transactionMode;
 	bool _fullscreen;
-	
+
 	bool _screenIsLocked;
 	Graphics::Surface _framebuffer;
 
@@ -368,7 +367,7 @@ protected:
 
 	Common::SaveFileManager *_savefile;
 	Audio::Mixer *_mixer;
-	
+
 	SDL_TimerID _timerID;
 	Common::TimerManager *_timer;
 
@@ -382,7 +381,7 @@ protected:
 	virtual void drawMouse(); // overloaded by CE backend
 	virtual void undrawMouse(); // overloaded by CE backend (FIXME)
 	virtual void blitCursor(); // overloaded by CE backend (FIXME)
- 
+
 	/** Set the position of the virtual mouse cursor. */
 	void setMousePos(int x, int y);
 	virtual void fillMouseEvent(Common::Event &event, int x, int y); // overloaded by CE backend
@@ -400,8 +399,8 @@ protected:
 	virtual bool saveScreenshot(const char *filename); // overloaded by CE backend
 
 	int effectiveScreenHeight() const {
-		return (_adjustAspectRatio ? real2Aspect(_screenHeight) : _screenHeight) 
-			* _scaleFactor; 
+		return (_adjustAspectRatio ? real2Aspect(_screenHeight) : _screenHeight)
+			* _scaleFactor;
 	}
 
 	void setupIcon();
diff --git a/backends/platform/symbian/src/SymbianActions.cpp b/backends/platform/symbian/src/SymbianActions.cpp
index 3809253032..23b554c532 100644
--- a/backends/platform/symbian/src/SymbianActions.cpp
+++ b/backends/platform/symbian/src/SymbianActions.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-#include "common/stdafx.h"
 #include "backends/platform/symbian/src/SymbianActions.h"
 
 #include "gui/message.h"
diff --git a/backends/platform/symbian/src/SymbianActions.h b/backends/platform/symbian/src/SymbianActions.h
index cbd333e500..1e68fbbe46 100644
--- a/backends/platform/symbian/src/SymbianActions.h
+++ b/backends/platform/symbian/src/SymbianActions.h
@@ -26,7 +26,6 @@
 #ifndef SYMBIANACTIONS_H
 #define SYMBIANACTIONS_H
 
-#include "common/stdafx.h"
 #include "common/scummsys.h"
 #include "common/system.h"
 #include "gui/Key.h"
diff --git a/backends/platform/wince/CEActionsPocket.cpp b/backends/platform/wince/CEActionsPocket.cpp
index efada68ad9..43e2594ac5 100644
--- a/backends/platform/wince/CEActionsPocket.cpp
+++ b/backends/platform/wince/CEActionsPocket.cpp
@@ -24,7 +24,6 @@
  */
 
 
-#include "common/stdafx.h"
 #include "CEActionsPocket.h"
 #include "EventsBuffer.h"
 #include "gui/message.h"
diff --git a/backends/platform/wince/CEActionsPocket.h b/backends/platform/wince/CEActionsPocket.h
index 9749ca60ef..ae0ed19975 100644
--- a/backends/platform/wince/CEActionsPocket.h
+++ b/backends/platform/wince/CEActionsPocket.h
@@ -26,7 +26,6 @@
 #ifndef CEACTIONSPOCKET
 #define CEACTIONSPOCKET
 
-#include "common/stdafx.h"
 #include "common/scummsys.h"
 #include "common/system.h"
 #include "wince-sdl.h"
diff --git a/backends/platform/wince/CEActionsSmartphone.cpp b/backends/platform/wince/CEActionsSmartphone.cpp
index 227318d552..a04c818070 100644
--- a/backends/platform/wince/CEActionsSmartphone.cpp
+++ b/backends/platform/wince/CEActionsSmartphone.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-#include "common/stdafx.h"
 #include "CEActionsSmartphone.h"
 #include "EventsBuffer.h"
 #include "gui/message.h"
diff --git a/backends/platform/wince/CEActionsSmartphone.h b/backends/platform/wince/CEActionsSmartphone.h
index 590302ef26..eacc571a67 100644
--- a/backends/platform/wince/CEActionsSmartphone.h
+++ b/backends/platform/wince/CEActionsSmartphone.h
@@ -26,7 +26,6 @@
 #ifndef CEACTIONSSMARTPHONE
 #define CEACTIONSSMARTPHONE
 
-#include "common/stdafx.h"
 #include "common/scummsys.h"
 #include "common/system.h"
 #include "wince-sdl.h"
diff --git a/backends/platform/wince/CEDevice.cpp b/backends/platform/wince/CEDevice.cpp
index 855c601741..7fda42d109 100644
--- a/backends/platform/wince/CEDevice.cpp
+++ b/backends/platform/wince/CEDevice.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-#include "common/stdafx.h"
 #include "CEDevice.h"
 
 #include <SDL.h>
diff --git a/backends/platform/wince/CEDevice.h b/backends/platform/wince/CEDevice.h
index c2dab4e793..9fee8497c2 100644
--- a/backends/platform/wince/CEDevice.h
+++ b/backends/platform/wince/CEDevice.h
@@ -26,7 +26,6 @@
 #ifndef CEDEVICE
 #define CEDEVICE
 
-#include "common/stdafx.h"
 #include "common/scummsys.h"
 #include "common/system.h"
 #include "common/str.h"
diff --git a/backends/platform/wince/CELauncherDialog.cpp b/backends/platform/wince/CELauncherDialog.cpp
index aef85ebf6c..aac2fdbe7c 100644
--- a/backends/platform/wince/CELauncherDialog.cpp
+++ b/backends/platform/wince/CELauncherDialog.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-#include "common/stdafx.h"
 
 #include "wince-sdl.h"
 
diff --git a/backends/platform/wince/CEScaler.cpp b/backends/platform/wince/CEScaler.cpp
index a09c4dcc65..bb1aaec0be 100644
--- a/backends/platform/wince/CEScaler.cpp
+++ b/backends/platform/wince/CEScaler.cpp
@@ -23,7 +23,6 @@
  *
  */
 #include "graphics/scaler/intern.h"
-#include "common/stdafx.h"
 #include "CEScaler.h"
 
 int redblueMasks[] = { 0x7C1F, 0xF81F };
diff --git a/backends/platform/wince/CEScaler.h b/backends/platform/wince/CEScaler.h
index b02b0555f1..7a8705a221 100644
--- a/backends/platform/wince/CEScaler.h
+++ b/backends/platform/wince/CEScaler.h
@@ -26,7 +26,6 @@
 #ifndef CESCALER
 #define CESCALER
 
-#include "common/stdafx.h"
 #include "common/scummsys.h"
 #include "common/system.h"
 #include "graphics/scaler.h"
diff --git a/backends/platform/wince/CEgui/GUIElement.cpp b/backends/platform/wince/CEgui/GUIElement.cpp
index 6c74e7e7e7..a37182e69d 100644
--- a/backends/platform/wince/CEgui/GUIElement.cpp
+++ b/backends/platform/wince/CEgui/GUIElement.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-#include "common/stdafx.h"
 #include "Toolbar.h"
 
 #include "SDL_ImageResource.h"
diff --git a/backends/platform/wince/CEgui/GUIElement.h b/backends/platform/wince/CEgui/GUIElement.h
index ebf80320e7..beb9d95047 100644
--- a/backends/platform/wince/CEgui/GUIElement.h
+++ b/backends/platform/wince/CEgui/GUIElement.h
@@ -26,7 +26,6 @@
 #ifndef CEGUI_GUIELEMENT
 #define CEGUI_GUIELEMENT
 
-#include "common/stdafx.h"
 #include "common/scummsys.h"
 #include "common/system.h"
 
diff --git a/backends/platform/wince/CEgui/ItemAction.cpp b/backends/platform/wince/CEgui/ItemAction.cpp
index f9bf903cd2..3808622b2e 100644
--- a/backends/platform/wince/CEgui/ItemAction.cpp
+++ b/backends/platform/wince/CEgui/ItemAction.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-#include "common/stdafx.h"
 #include "ItemAction.h"
 
 namespace CEGUI {
diff --git a/backends/platform/wince/CEgui/ItemAction.h b/backends/platform/wince/CEgui/ItemAction.h
index 35747374b9..e2cd5b2367 100644
--- a/backends/platform/wince/CEgui/ItemAction.h
+++ b/backends/platform/wince/CEgui/ItemAction.h
@@ -26,7 +26,6 @@
 #ifndef CEGUI_ITEMACTION
 #define CEGUI_ITEMACTION
 
-#include "common/stdafx.h"
 #include "common/scummsys.h"
 #include "common/system.h"
 
diff --git a/backends/platform/wince/CEgui/ItemSwitch.cpp b/backends/platform/wince/CEgui/ItemSwitch.cpp
index 7fc32ac67f..445b3bb69b 100644
--- a/backends/platform/wince/CEgui/ItemSwitch.cpp
+++ b/backends/platform/wince/CEgui/ItemSwitch.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-#include "common/stdafx.h"
 #include "ItemSwitch.h"
 
 namespace CEGUI {
diff --git a/backends/platform/wince/CEgui/ItemSwitch.h b/backends/platform/wince/CEgui/ItemSwitch.h
index cd9dacbc83..1fa5732b6a 100644
--- a/backends/platform/wince/CEgui/ItemSwitch.h
+++ b/backends/platform/wince/CEgui/ItemSwitch.h
@@ -26,7 +26,6 @@
 #ifndef CEGUI_ITEMSWITCH
 #define CEGUI_ITEMSWITCH
 
-#include "common/stdafx.h"
 #include "common/scummsys.h"
 #include "common/system.h"
 
diff --git a/backends/platform/wince/CEgui/Panel.cpp b/backends/platform/wince/CEgui/Panel.cpp
index 3d120d87bb..a2d965ca78 100644
--- a/backends/platform/wince/CEgui/Panel.cpp
+++ b/backends/platform/wince/CEgui/Panel.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-#include "common/stdafx.h"
 #include "Panel.h"
 
 namespace CEGUI {
diff --git a/backends/platform/wince/CEgui/Panel.h b/backends/platform/wince/CEgui/Panel.h
index 549f692ea0..0b55c00dee 100644
--- a/backends/platform/wince/CEgui/Panel.h
+++ b/backends/platform/wince/CEgui/Panel.h
@@ -26,7 +26,6 @@
 #ifndef CEGUI_PANEL
 #define CEGUI_PANEL
 
-#include "common/stdafx.h"
 #include "common/scummsys.h"
 #include "common/system.h"
 #include "common/hashmap.h"
diff --git a/backends/platform/wince/CEgui/PanelItem.cpp b/backends/platform/wince/CEgui/PanelItem.cpp
index 12353f6d39..0898839c5d 100644
--- a/backends/platform/wince/CEgui/PanelItem.cpp
+++ b/backends/platform/wince/CEgui/PanelItem.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-#include "common/stdafx.h"
 #include "PanelItem.h"
 
 namespace CEGUI {
diff --git a/backends/platform/wince/CEgui/PanelItem.h b/backends/platform/wince/CEgui/PanelItem.h
index d11f943a6a..82e9b03e22 100644
--- a/backends/platform/wince/CEgui/PanelItem.h
+++ b/backends/platform/wince/CEgui/PanelItem.h
@@ -26,7 +26,6 @@
 #ifndef CEGUI_PANELITEM
 #define CEGUI_PANELITEM
 
-#include "common/stdafx.h"
 #include "common/scummsys.h"
 #include "common/system.h"
 
diff --git a/backends/platform/wince/CEgui/PanelKeyboard.cpp b/backends/platform/wince/CEgui/PanelKeyboard.cpp
index 79b833f84b..369a75cae1 100644
--- a/backends/platform/wince/CEgui/PanelKeyboard.cpp
+++ b/backends/platform/wince/CEgui/PanelKeyboard.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-#include "common/stdafx.h"
 #include "PanelKeyboard.h"
 
 namespace CEGUI {
diff --git a/backends/platform/wince/CEgui/PanelKeyboard.h b/backends/platform/wince/CEgui/PanelKeyboard.h
index d0182ce5fe..5ef4adc73e 100644
--- a/backends/platform/wince/CEgui/PanelKeyboard.h
+++ b/backends/platform/wince/CEgui/PanelKeyboard.h
@@ -26,7 +26,6 @@
 #ifndef CEGUI_PANELKEYBOARD
 #define CEGUI_PANELKEYBOARD
 
-#include "common/stdafx.h"
 #include "common/scummsys.h"
 #include "common/system.h"
 
diff --git a/backends/platform/wince/CEgui/SDL_ImageResource.cpp b/backends/platform/wince/CEgui/SDL_ImageResource.cpp
index de055f2e54..e1a9d911de 100644
--- a/backends/platform/wince/CEgui/SDL_ImageResource.cpp
+++ b/backends/platform/wince/CEgui/SDL_ImageResource.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-#include "common/stdafx.h"
 #include "SDL_ImageResource.h"
 
 namespace CEGUI {
diff --git a/backends/platform/wince/CEgui/SDL_ImageResource.h b/backends/platform/wince/CEgui/SDL_ImageResource.h
index 3dffbac281..140a11c356 100644
--- a/backends/platform/wince/CEgui/SDL_ImageResource.h
+++ b/backends/platform/wince/CEgui/SDL_ImageResource.h
@@ -26,7 +26,6 @@
 #ifndef CEGUI_SDL_IMAGERESOURCE
 #define CEGUI_SDL_IMAGERESOURCE
 
-#include "common/stdafx.h"
 #include "common/scummsys.h"
 #include "common/system.h"
 
diff --git a/backends/platform/wince/CEgui/Toolbar.cpp b/backends/platform/wince/CEgui/Toolbar.cpp
index d8c23b3d08..0501249de9 100644
--- a/backends/platform/wince/CEgui/Toolbar.cpp
+++ b/backends/platform/wince/CEgui/Toolbar.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-#include "common/stdafx.h"
 #include "Toolbar.h"
 
 namespace CEGUI {
diff --git a/backends/platform/wince/CEgui/Toolbar.h b/backends/platform/wince/CEgui/Toolbar.h
index f60947925e..c23559d315 100644
--- a/backends/platform/wince/CEgui/Toolbar.h
+++ b/backends/platform/wince/CEgui/Toolbar.h
@@ -26,7 +26,6 @@
 #ifndef CEGUI_TOOLBAR
 #define CEGUI_TOOLBAR
 
-#include "common/stdafx.h"
 #include "common/scummsys.h"
 #include "common/system.h"
 
diff --git a/backends/platform/wince/CEgui/ToolbarHandler.cpp b/backends/platform/wince/CEgui/ToolbarHandler.cpp
index eb65984778..94319901dc 100644
--- a/backends/platform/wince/CEgui/ToolbarHandler.cpp
+++ b/backends/platform/wince/CEgui/ToolbarHandler.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-#include "common/stdafx.h"
 #include "ToolbarHandler.h"
 
 namespace CEGUI {
diff --git a/backends/platform/wince/CEgui/ToolbarHandler.h b/backends/platform/wince/CEgui/ToolbarHandler.h
index 4606d59302..30a299d153 100644
--- a/backends/platform/wince/CEgui/ToolbarHandler.h
+++ b/backends/platform/wince/CEgui/ToolbarHandler.h
@@ -26,7 +26,6 @@
 #ifndef CEGUI_TOOLBARHANDLER
 #define CEGUI_TOOLBARHANDLER
 
-#include "common/stdafx.h"
 #include "common/scummsys.h"
 #include "common/system.h"
 #include "common/str.h"
diff --git a/backends/platform/wince/CEkeys/EventsBuffer.cpp b/backends/platform/wince/CEkeys/EventsBuffer.cpp
index 19978c23dc..92a21ab7ad 100644
--- a/backends/platform/wince/CEkeys/EventsBuffer.cpp
+++ b/backends/platform/wince/CEkeys/EventsBuffer.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-#include "common/stdafx.h"
 #include "EventsBuffer.h"
 
 namespace CEKEYS {
diff --git a/backends/platform/wince/CEkeys/EventsBuffer.h b/backends/platform/wince/CEkeys/EventsBuffer.h
index 541e1b15c8..2e13770d25 100644
--- a/backends/platform/wince/CEkeys/EventsBuffer.h
+++ b/backends/platform/wince/CEkeys/EventsBuffer.h
@@ -26,7 +26,6 @@
 #ifndef CEKEYS_EVENTSBUFFER
 #define CEKEYS_EVENTSBUFFER
 
-#include "common/stdafx.h"
 #include "common/scummsys.h"
 #include "common/system.h"
 #include "common/list.h"
diff --git a/backends/platform/wince/wince-sdl.cpp b/backends/platform/wince/wince-sdl.cpp
index c19ac3d898..5353c9e39d 100644
--- a/backends/platform/wince/wince-sdl.cpp
+++ b/backends/platform/wince/wince-sdl.cpp
@@ -25,7 +25,6 @@
 
 // NOTE: formatted for tabstop=4
 
-#include "common/stdafx.h"
 #include "backends/platform/wince/wince-sdl.h"
 
 #include "common/config-manager.h"
diff --git a/backends/platform/wince/wince-sdl.h b/backends/platform/wince/wince-sdl.h
index e74c438807..ab1e896bf9 100644
--- a/backends/platform/wince/wince-sdl.h
+++ b/backends/platform/wince/wince-sdl.h
@@ -26,7 +26,6 @@
 #ifndef WINCE_SDL_H
 #define WINCE_SDL_H
 
-#include "common/stdafx.h"
 #include "common/scummsys.h"
 #include "common/system.h"
 #include "graphics/scaler.h"
diff --git a/backends/platform/x11/x11.cpp b/backends/platform/x11/x11.cpp
index 56e9b2a79b..e82b4bf2d6 100644
--- a/backends/platform/x11/x11.cpp
+++ b/backends/platform/x11/x11.cpp
@@ -25,7 +25,6 @@
 
 /* The bare pure X11 port done by Lionel 'BBrox' Ulmer */
 
-#include "common/stdafx.h"
 #include "common/scummsys.h"
 #include "common/events.h"
 #include "common/system.h"