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

svn-id: r28966

44 files changed, 174 insertions, 174 deletions

diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp
index 92c6f952d6..3b5bb3e50b 100644
--- a/engines/agos/agos.cpp
+++ b/engines/agos/agos.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 
 #include "common/config-manager.h"
 #include "common/file.h"
@@ -187,7 +187,7 @@ AGOSEngine::AGOSEngine(OSystem *syst)
 	_inCallBack = 0;
 	_cepeFlag = 0;
 	_fastMode = 0;
-	
+
 	_backFlag = 0;
 
 	_debugMode = 0;
@@ -336,7 +336,7 @@ AGOSEngine::AGOSEngine(OSystem *syst)
 
  	_iconToggleCount = 0;
  	_voiceCount = 0;
- 
+
 	_lastTickCount = 0;
 	_thisTickCount = 0;
 	_startSecondCount = 0;
diff --git a/engines/agos/animation.cpp b/engines/agos/animation.cpp
index 8d5238259d..fd78c65002 100644
--- a/engines/agos/animation.cpp
+++ b/engines/agos/animation.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 
 #include "common/endian.h"
 #include "common/events.h"
@@ -74,12 +74,12 @@ bool MoviePlayer::load(const char *filename) {
 			char shortName[20];
 			memset(shortName, 0, sizeof(shortName));
 			memcpy(shortName, filename, 6);
-	
+
 			sprintf(shortName, "%s~1.dxa", shortName);
 
 			if (!loadFile(shortName))
 				error("Failed to load video file %s or %s", videoName, shortName);
-			
+
 			memset(baseName, 0, sizeof(baseName));
 			memcpy(baseName, shortName, 8);
 			debug(0, "Playing video %s", shortName);
diff --git a/engines/agos/charset.cpp b/engines/agos/charset.cpp
index 68eb2d7ac8..58ab892308 100644
--- a/engines/agos/charset.cpp
+++ b/engines/agos/charset.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 
 #include "common/system.h"
 
@@ -742,7 +742,7 @@ void AGOSEngine::windowScroll(WindowBlock *window) {
 		} while (--h);
 
 		_system->unlockScreen();
-	} 
+	}
 
 	colorBlock(window, window->x * 8, (window->height - 1) * 8 + window->y, window->width * 8, 8);
 
diff --git a/engines/agos/contain.cpp b/engines/agos/contain.cpp
index 891ac36d30..24a6951b48 100644
--- a/engines/agos/contain.cpp
+++ b/engines/agos/contain.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 
 #include "agos/agos.h"
 #include "agos/intern.h"
diff --git a/engines/agos/cursor.cpp b/engines/agos/cursor.cpp
index 9c2cb42988..1755f63f61 100644
--- a/engines/agos/cursor.cpp
+++ b/engines/agos/cursor.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 
 #include "common/events.h"
 #include "common/system.h"
@@ -69,63 +69,63 @@ static const uint16 _common_swordInfo1[32] = {
 	0x00FC, 0x0078, 0x01FE, 0x00CC, 0x01CF, 0x0086, 0x0086, 0x0000
 };
 
-static const uint16 _common_swordInfo2[32] = { 
+static const uint16 _common_swordInfo2[32] = {
 	0x0000, 0x0000, 0x4000, 0x0000, 0x7000, 0x0000, 0x3800, 0x0000,
 	0x1C00, 0x0000, 0x0E00, 0x0000, 0x0700, 0x0000, 0x0380, 0x0000,
 	0x01C0, 0x0000, 0x00E6, 0x0000, 0x007C, 0x0000, 0x0038, 0x0000,
 	0x0078, 0x0000, 0x00CC, 0x0000, 0x0086, 0x0000, 0x0000, 0x0000,
 };
 
-static const uint16 _common_lightningInfo1[32] = { 
+static const uint16 _common_lightningInfo1[32] = {
 	0x0000, 0x0000, 0xC000, 0x4000, 0xE000, 0x6000, 0xF020, 0x7000,
 	0x7860, 0x3820, 0x7CE0, 0x3C60, 0x3FF0, 0x1EF0, 0x3FF0, 0x1FF0,
 	0x1FF8, 0x0FF8, 0x1FF8, 0x0FF8, 0x0F7C, 0x073C, 0x0E3C, 0x061C,
 	0x061E, 0x020E, 0x040E, 0x0006, 0x0006, 0x0002, 0x0002, 0x0000,
 };
 
-static const uint16 _common_lightningInfo2[32] = { 
+static const uint16 _common_lightningInfo2[32] = {
 	0x0000, 0x0000, 0xC000, 0x0000, 0xE000, 0x0000, 0xF020, 0x0000,
 	0x7860, 0x0000, 0x7CE0, 0x0000, 0x3FF0, 0x0000, 0x3FF0, 0x0000,
 	0x1FF8, 0x0000, 0x1FF8, 0x0000, 0x0F7C, 0x0000, 0x0E3C, 0x0000,
 	0x061E, 0x0000, 0x040E, 0x0000, 0x0006, 0x0000, 0x0002, 0x0000,
 };
 
-static const uint16 _common_crossbowInfo1[32] = { 
+static const uint16 _common_crossbowInfo1[32] = {
 	0x0000, 0x0000, 0x03E0, 0x07C0, 0x1FF8, 0x1FF0, 0x3FFC, 0x3FF8,
 	0x7FFE, 0x7FFC, 0x7FFE, 0x7FFC, 0xF39E, 0xF39E, 0xE38E, 0xE38E,
 	0xC386, 0xC386, 0xC386, 0xC386, 0xC386, 0xC386, 0xC386, 0xC386,
 	0x8002, 0x8002, 0x8002, 0x8002, 0x0000, 0x0000, 0x0000, 0x0000,
 };
 
-static const uint16 _common_crossbowInfo2[32] = { 
+static const uint16 _common_crossbowInfo2[32] = {
 	0x0000, 0x0000, 0x03E0, 0x0000, 0x1FF8, 0x0000, 0x3FFC, 0x0000,
 	0x7FFE, 0x0000, 0x7FFE, 0x0000, 0xF39E, 0x0000, 0xE38E, 0x0000,
 	0xC386, 0x0000, 0xC386, 0x0000, 0xC386, 0x0000, 0xC386, 0x0000,
 	0x8002, 0x0000, 0x8002, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
 };
 
-static const uint16 _common_moveForward[32] = { 
+static const uint16 _common_moveForward[32] = {
 	0x0180, 0x0100, 0x03C0, 0x0380, 0x07E0, 0x07C0, 0x0FF0, 0x0FE0,
 	0x1FF8, 0x1FF0, 0x03C0, 0x0380, 0x03C0, 0x0380, 0x03C0, 0x0380,
 	0x03C0, 0x0380, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
 	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
 };
 
-static const uint16 _common_moveRight[32] = { 
+static const uint16 _common_moveRight[32] = {
 	0x00C0, 0x0080, 0x00E0, 0x00C0, 0x00F0, 0x00E0, 0x1FF8, 0x1FF0,
 	0x3FFC, 0x3FF8, 0x3FF8, 0x3FF0, 0x3CF0, 0x38E0, 0x3CE0, 0x38C0,
 	0x3CC0, 0x3880, 0x3C00, 0x3800, 0x3C00, 0x3800, 0x0000, 0x0000,
 	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
 };
 
-static const uint16 _common_moveBack[32] = { 
+static const uint16 _common_moveBack[32] = {
 	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
 	0x03C0, 0x0380, 0x03C0, 0x0380, 0x03C0, 0x0380, 0x03C0, 0x0380,
 	0x1FF8, 0x1FF0, 0x0FF0, 0x0FE0, 0x07E0, 0x07C0, 0x03C0, 0x0380,
 	0x0180, 0x0100, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
 };
 
-static const uint16 _common_moveLeft[32] = { 
+static const uint16 _common_moveLeft[32] = {
 	0x0C00, 0x0800, 0x1C00, 0x1800, 0x3C00, 0x3800, 0x7FE0, 0x7FC0,
 	0xFFF0, 0xFFE0, 0x7FF0, 0x7FE0, 0x3CF0, 0x38E0, 0x1CF0, 0x18E0,
 	0x0CF0, 0x08E0, 0x00F0, 0x00E0, 0x00F0, 0x00E0, 0x0000, 0x0000,
@@ -672,7 +672,7 @@ void AGOSEngine_Feeble::drawMousePointer() {
 
 	if (_animatePointer == 0 && getBitFlag(99)) {
 		_mouseAnim = 1;
-		cursor = 6;	
+		cursor = 6;
 	} else if (_mouseCursor != 5 && getBitFlag(72)) {
 		cursor += 7;
 	}
@@ -693,7 +693,7 @@ void AGOSEngine_Feeble::drawMousePointer() {
 
 		int hotspotX = 19;
 		int hotspotY = 19;
-		
+
 		if (_mouseCursor == 14) {
 			// Finger pointing away from screen. Not sure where
 			// this is used.
diff --git a/engines/agos/debug.cpp b/engines/agos/debug.cpp
index c074c3e43f..76a0b8e76f 100644
--- a/engines/agos/debug.cpp
+++ b/engines/agos/debug.cpp
@@ -24,7 +24,7 @@
  */
 
 // AGOS debug functions
-#include "common/stdafx.h"
+
 
 #include "agos/debug.h"
 #include "agos/agos.h"
@@ -109,7 +109,7 @@ const byte *AGOSEngine::dumpOpcode(const byte *p) {
 						printf("[%d] ", n - 60000);
 					else
 						printf("%d ", n);
-					
+
 				} else {
 					if (n >= 30000 && n < 30512)
 						printf("[%d] ", n - 30000);
diff --git a/engines/agos/debug.h b/engines/agos/debug.h
index 89d43b5212..788c3206cc 100644
--- a/engines/agos/debug.h
+++ b/engines/agos/debug.h
@@ -26,6 +26,8 @@
 #ifndef AGOS_DEBUG_H
 #define AGOS_DEBUG_H
 
+#include "common/scummsys.h"
+
 namespace AGOS {
 
 static const char *const elvira1_opcodeNameTable[300] = {
diff --git a/engines/agos/debugger.cpp b/engines/agos/debugger.cpp
index 3fc5a1f967..470642ec06 100644
--- a/engines/agos/debugger.cpp
+++ b/engines/agos/debugger.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 
 #include "common/config-manager.h"
 
diff --git a/engines/agos/detection.cpp b/engines/agos/detection.cpp
index 31ff220412..268b62cab2 100644
--- a/engines/agos/detection.cpp
+++ b/engines/agos/detection.cpp
@@ -23,8 +23,6 @@
  *
  */
 
-#include "common/stdafx.h"
-
 #include "base/plugins.h"
 
 #include "common/advancedDetector.h"
@@ -173,10 +171,10 @@ Common::Platform AGOSEngine::getPlatform() const {
 	return _gameDescription->desc.platform;
 }
 
-const char *AGOSEngine::getFileName(int type) const { 
+const char *AGOSEngine::getFileName(int type) const {
 	for (int i = 0; _gameDescription->desc.filesDescriptions[i].fileType; i++) {
 		if (_gameDescription->desc.filesDescriptions[i].fileType == type)
-			return _gameDescription->desc.filesDescriptions[i].fileName; 
+			return _gameDescription->desc.filesDescriptions[i].fileName;
 	}
 	return NULL;
 }
diff --git a/engines/agos/draw.cpp b/engines/agos/draw.cpp
index 68bb152844..c19fad5e4e 100644
--- a/engines/agos/draw.cpp
+++ b/engines/agos/draw.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 
 #include "common/system.h"
 
@@ -53,7 +53,7 @@ void AGOSEngine_Feeble::animateSpritesByY() {
 	VgaSprite *vsp;
 	VgaPointersEntry *vpe;
 	int16 spriteTable[180][2];
-	
+
 	byte *src;
 	int height, slot, y;
 	uint i, numSprites = 0;
@@ -254,7 +254,7 @@ void AGOSEngine::animateSprites() {
 				*dst++ = color;
 			}
 			h--;
-		}			
+		}
 
 		_window4Flag = 1;
 		setMoveRect(0, 0, 224, 127);
@@ -288,7 +288,7 @@ void AGOSEngine::animateSprites() {
 			}
 			dst += 448;
 			h--;
-		}			
+		}
 
 		_window4Flag = 1;
 		setMoveRect(0, 0, 224, 127);
@@ -343,7 +343,7 @@ restart:
 
 	if (_newDirtyClip != 0)
 		goto restart;
-	
+
 }
 
 void AGOSEngine::dirtyClipCheck(int16 x, int16 y, int16 w, int16 h) {
@@ -446,7 +446,7 @@ void AGOSEngine::restoreBackGround() {
 			continue;
 		}
 
-		_windowNum = animTable->windowNum & 0x7FFF;	
+		_windowNum = animTable->windowNum & 0x7FFF;
 
 		VC10_state state;
 		state.srcPtr  = animTable->srcPtr;
@@ -785,7 +785,7 @@ void AGOSEngine::displayScreen() {
 			src += _moveXMin;
 
 			srcWidth = _videoWindows[18] * 16;
-		
+
 			width = _moveXMax - _moveXMin;
 			height = _moveYMax - _moveYMin;
 
@@ -800,7 +800,7 @@ void AGOSEngine::displayScreen() {
 			_moveXMax = 0;
 			_moveYMax = 0;
 		}
-		
+
 		if (_window6Flag == 2) {
 			_window6Flag = 0;
 
diff --git a/engines/agos/event.cpp b/engines/agos/event.cpp
index 5c673de700..ad80b72926 100644
--- a/engines/agos/event.cpp
+++ b/engines/agos/event.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 
 #include "agos/agos.h"
 #include "agos/debugger.h"
@@ -490,7 +490,7 @@ void AGOSEngine::delay(uint amount) {
 					} else if (event.kbd.keycode == Common::KEYCODE_u) {
 						dumpAllSubroutines();
 					}
-				} 
+				}
 
 				if (getGameType() == GType_PP) {
 					if (event.kbd.flags == Common::KBD_SHIFT)
@@ -588,7 +588,7 @@ void AGOSEngine_Feeble::timer_proc1() {
 		}
 
 		animateSprites();
-	} 
+	}
 
 	if (_displayScreen) {
 		if (getGameType() == GType_FF) {
@@ -623,7 +623,7 @@ void AGOSEngine::timer_proc1() {
 		_cepeFlag ^= 1;
 		if (!_cepeFlag)
 			processVgaEvents();
-	} 
+	}
 
 	if (_displayScreen) {
 		displayScreen();
@@ -647,7 +647,7 @@ void AGOSEngine::dimp_idle() {
 					while (z == 0) {
 						n = _rnd.getRandomNumber(2);
 						switch (n) {
-							case(0): 
+							case(0):
 								if (_variableArray[110] > 2)
 									break;
 								n = _rnd.getRandomNumber(6);
diff --git a/engines/agos/gfx.cpp b/engines/agos/gfx.cpp
index 20ab84d15d..f2b6e06a34 100644
--- a/engines/agos/gfx.cpp
+++ b/engines/agos/gfx.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 
 #include "common/system.h"
 
@@ -181,7 +181,7 @@ bool AGOSEngine::drawImage_clip(VC10_state *state) {
 
 	if (getGameType() != GType_FF && getGameType() != GType_PP) {
 		state->draw_width = state->width * 2;
-	} 
+	}
 
 	cur = state->x;
 	if (cur < 0) {
@@ -518,7 +518,7 @@ void AGOSEngine_Simon1::drawMaskedImage(VC10_state *state) {
 						dst[0] = src[0];
 					if ((mask[0] & 0x0F) && (dst[1] & 0x0F0) == 0x20)
 						dst[1] = src[1];
-				} else {	
+				} else {
 					/* no transparency */
 					if (mask[0] & 0xF0)
 						dst[0] = src[0];
@@ -878,7 +878,7 @@ void AGOSEngine::drawImage(VC10_state *state) {
 	} else {
 		if (_windowNum == 6) {
 			state->surf_addr = _window6BackScn;
-			state->surf_pitch = 48;	
+			state->surf_pitch = 48;
 
 			xoffs = state->x * 8;
 			yoffs = state->y;
diff --git a/engines/agos/icons.cpp b/engines/agos/icons.cpp
index 3edcedaa8e..f38828f086 100644
--- a/engines/agos/icons.cpp
+++ b/engines/agos/icons.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 
 #include "common/system.h"
 
@@ -379,7 +379,7 @@ void AGOSEngine_Feeble::drawIconArray(uint num, Item *itemRef, int line, int cla
 		line -= 52;
 		if (k == (flagnumber + 18))
 			k = flagnumber;
-	}	
+	}
 	yp -= line;	// Adjust starting y
 
 	if (itemRef == NULL) {
@@ -428,7 +428,7 @@ l1:;		itemRef = derefItem(itemRef->next);
 	}
 
 	/* Plot arrows and add their boxes */
-	addArrows(window, num);		
+	addArrows(window, num);
 	window->iconPtr->upArrow = _scrollUpHitArea;
 	window->iconPtr->downArrow = _scrollDownHitArea;
 }
@@ -530,7 +530,7 @@ void AGOSEngine::drawIconArray(uint num, Item *itemRef, int line, int classMask)
 
 	if (showArrows != 0 || window->iconPtr->line != 0) {
 		/* Plot arrows and add their boxes */
-		addArrows(window, num);		
+		addArrows(window, num);
 		window->iconPtr->upArrow = _scrollUpHitArea;
 		window->iconPtr->downArrow = _scrollDownHitArea;
 	}
@@ -856,44 +856,44 @@ void AGOSEngine::addArrows(WindowBlock *window, uint8 num) {
 }
 
 static const byte _arrowImage[] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 
-	0x0b, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x0b, 
-	0x0a, 0x0b, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x0b, 0x0a, 
-	0x0d, 0x0a, 0x0b, 0x0a, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x0a, 0x0b, 0x0a, 0x0d, 
-	0x03, 0x0d, 0x0a, 0x0b, 0x0a, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x0a, 0x0b, 0x0a, 0x0d, 0x03, 
-	0x04, 0x03, 0x0d, 0x0a, 0x0b, 0x0a, 0x00, 0x00, 
-	0x00, 0x00, 0x0a, 0x0b, 0x0a, 0x0d, 0x03, 0x04, 
-	0x0f, 0x04, 0x03, 0x0d, 0x0a, 0x0b, 0x0a, 0x00, 
-	0x00, 0x0a, 0x0b, 0x0a, 0x0d, 0x0d, 0x0d, 0x03, 
-	0x04, 0x03, 0x0d, 0x0d, 0x0d, 0x0a, 0x0b, 0x0a, 
-	0x00, 0x0b, 0x0a, 0x0a, 0x0a, 0x0a, 0x09, 0x0d, 
-	0x03, 0x0d, 0x09, 0x0a, 0x0a, 0x0a, 0x0a, 0x0b, 
-	0x00, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0a, 0x0d, 
-	0x0d, 0x0d, 0x0a, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 
-	0x00, 0x0a, 0x0a, 0x0a, 0x0e, 0x0b, 0x0b, 0x0c, 
-	0x0e, 0x0c, 0x0b, 0x0b, 0x0e, 0x0a, 0x0a, 0x0a, 
-	0x00, 0x00, 0x02, 0x02, 0x0a, 0x0b, 0x0a, 0x0d, 
-	0x0d, 0x0d, 0x0a, 0x0b, 0x0a, 0x02, 0x02, 0x00, 
-	0x00, 0x00, 0x00, 0x02, 0x0a, 0x0b, 0x0b, 0x0c, 
-	0x0e, 0x0c, 0x0b, 0x0b, 0x0a, 0x02, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x0a, 0x0b, 0x0a, 0x0d, 
-	0x0d, 0x0d, 0x0a, 0x0b, 0x0a, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x0a, 0x0b, 0x0b, 0x0c, 
-	0x0e, 0x0c, 0x0b, 0x0b, 0x0a, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x0a, 0x0b, 0x0b, 0x0b, 
-	0x0b, 0x0b, 0x0b, 0x0b, 0x0a, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x02, 0x0e, 0x0a, 0x0a, 
-	0x0e, 0x0a, 0x0a, 0x0e, 0x02, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 
-	0x0a, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 
-	0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a,
+	0x0b, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x0b,
+	0x0a, 0x0b, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x0b, 0x0a,
+	0x0d, 0x0a, 0x0b, 0x0a, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x0a, 0x0b, 0x0a, 0x0d,
+	0x03, 0x0d, 0x0a, 0x0b, 0x0a, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x0a, 0x0b, 0x0a, 0x0d, 0x03,
+	0x04, 0x03, 0x0d, 0x0a, 0x0b, 0x0a, 0x00, 0x00,
+	0x00, 0x00, 0x0a, 0x0b, 0x0a, 0x0d, 0x03, 0x04,
+	0x0f, 0x04, 0x03, 0x0d, 0x0a, 0x0b, 0x0a, 0x00,
+	0x00, 0x0a, 0x0b, 0x0a, 0x0d, 0x0d, 0x0d, 0x03,
+	0x04, 0x03, 0x0d, 0x0d, 0x0d, 0x0a, 0x0b, 0x0a,
+	0x00, 0x0b, 0x0a, 0x0a, 0x0a, 0x0a, 0x09, 0x0d,
+	0x03, 0x0d, 0x09, 0x0a, 0x0a, 0x0a, 0x0a, 0x0b,
+	0x00, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0a, 0x0d,
+	0x0d, 0x0d, 0x0a, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
+	0x00, 0x0a, 0x0a, 0x0a, 0x0e, 0x0b, 0x0b, 0x0c,
+	0x0e, 0x0c, 0x0b, 0x0b, 0x0e, 0x0a, 0x0a, 0x0a,
+	0x00, 0x00, 0x02, 0x02, 0x0a, 0x0b, 0x0a, 0x0d,
+	0x0d, 0x0d, 0x0a, 0x0b, 0x0a, 0x02, 0x02, 0x00,
+	0x00, 0x00, 0x00, 0x02, 0x0a, 0x0b, 0x0b, 0x0c,
+	0x0e, 0x0c, 0x0b, 0x0b, 0x0a, 0x02, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x0a, 0x0b, 0x0a, 0x0d,
+	0x0d, 0x0d, 0x0a, 0x0b, 0x0a, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x0a, 0x0b, 0x0b, 0x0c,
+	0x0e, 0x0c, 0x0b, 0x0b, 0x0a, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x0a, 0x0b, 0x0b, 0x0b,
+	0x0b, 0x0b, 0x0b, 0x0b, 0x0a, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x02, 0x0e, 0x0a, 0x0a,
+	0x0e, 0x0a, 0x0a, 0x0e, 0x02, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00,
+	0x0a, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00,
+	0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
 };
 
 void AGOSEngine::drawArrow(uint16 x, uint16 y, int8 dir) {
diff --git a/engines/agos/input.cpp b/engines/agos/input.cpp
index a86cad9b94..453e2c3562 100644
--- a/engines/agos/input.cpp
+++ b/engines/agos/input.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 
 #include "common/config-manager.h"
 #include "common/file.h"
@@ -225,15 +225,15 @@ void AGOSEngine::waitForInput() {
 				_dragEnd = 0;
 				continue;
 			}
-		
+
 			_hitAreaSubjectItem = ha->item_ptr;
 			_verbHitArea = 500;
-		
+
 			do {
 				processSpecialKeys();
 				hitarea_stuff_helper();
 				delay(100);
-		
+
 				if (_dragFlag == 0) {
 					_dragFlag = 0;
 					_dragMode = 0;
@@ -241,19 +241,19 @@ void AGOSEngine::waitForInput() {
 					_dragEnd = 0;
 				}
 			} while (!_dragEnd);
-		
+
 			_dragFlag = 0;
 			_dragMode = 0;
 			_dragCount = 0;
 			_dragEnd = 0;
-		
+
 			boxController(_mouse.x, _mouse.y, 1);
-		
+
 			if (_currentBox != NULL) {
 				_hitAreaObjectItem = _currentBox->item_ptr;
 				setVerbText(ha);
 			}
-		
+
 			break;
 		}
 
@@ -369,7 +369,7 @@ void AGOSEngine::hitarea_stuff_helper() {
 		if (_variableArray[254] || _variableArray[249]) {
 			hitarea_stuff_helper_2();
 		}
-	} else if (getGameType() == GType_ELVIRA2 || getGameType() == GType_WW || 
+	} else if (getGameType() == GType_ELVIRA2 || getGameType() == GType_WW ||
 		getGameType() == GType_SIMON1) {
 		uint subr_id = (uint16)_variableArray[254];
 		if (subr_id) {
diff --git a/engines/agos/items.cpp b/engines/agos/items.cpp
index b5fe745414..3b0ac1d205 100644
--- a/engines/agos/items.cpp
+++ b/engines/agos/items.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 
 #include "common/file.h"
 
diff --git a/engines/agos/menus.cpp b/engines/agos/menus.cpp
index 81df34c311..e6d926b06d 100644
--- a/engines/agos/menus.cpp
+++ b/engines/agos/menus.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 
 #include "common/file.h"
 #include "common/system.h"
@@ -139,7 +139,7 @@ void AGOSEngine::lightMenuStrip(int a) {
 		}
 	}
 
-	mouseOn();	
+	mouseOn();
 }
 
 void AGOSEngine::unlightMenuStrip() {
@@ -198,7 +198,7 @@ void AGOSEngine::lightMenuBox(uint hitarea) {
 uint AGOSEngine::menuFor_e2(Item *item) {
 	if (item == NULL || item == _dummyItem2 || item == _dummyItem3)
 		return 0xFFFF;
- 
+
 	SubObject *subObject = (SubObject *)findChildOfType(item, kObjectType);
 	if (subObject != NULL && subObject->objectFlags & kOFMenu) {
 		uint offs = getOffsetOfChild2Param(subObject, kOFMenu);
diff --git a/engines/agos/midi.cpp b/engines/agos/midi.cpp
index 13b84c0cda..3114b24549 100644
--- a/engines/agos/midi.cpp
+++ b/engines/agos/midi.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 
 #include "common/file.h"
 #include "common/system.h"
diff --git a/engines/agos/midiparser_s1d.cpp b/engines/agos/midiparser_s1d.cpp
index f5a1d5ff87..342f716c22 100644
--- a/engines/agos/midiparser_s1d.cpp
+++ b/engines/agos/midiparser_s1d.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 
 #include "common/util.h"
 
diff --git a/engines/agos/oracle.cpp b/engines/agos/oracle.cpp
index c7ad0ee8b7..0057fc34a8 100644
--- a/engines/agos/oracle.cpp
+++ b/engines/agos/oracle.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 
 #include "common/savefile.h"
 #include "common/system.h"
@@ -91,7 +91,7 @@ void AGOSEngine_Feeble::checkUp(WindowBlock *window) {
 		if (!isBoxDead(j + 201)) {
 			uint index = getWindowNum(window);
 			drawIconArray(index, window->iconPtr->itemRef, 0, window->iconPtr->classMask);
-			animate(4, 9, k + 34, 0, 0, 0);	
+			animate(4, 9, k + 34, 0, 0, 0);
 		}
 	}
 	if ((_variableArray[31] - _variableArray[30]) == 76) {
@@ -114,7 +114,7 @@ void AGOSEngine_Feeble::checkUp(WindowBlock *window) {
 void AGOSEngine_Feeble::inventoryUp(WindowBlock *window) {
 	_marks = 0;
 	checkUp(window);
-	animate(4, 9, 21, 0 ,0, 0);	
+	animate(4, 9, 21, 0 ,0, 0);
 	while (1) {
 		if (_currentBox->id != 0x7FFB || !getBitFlag(89))
 			break;
@@ -136,7 +136,7 @@ void AGOSEngine_Feeble::checkDown(WindowBlock *window) {
 		uint index = getWindowNum(window);
 		drawIconArray(index, window->iconPtr->itemRef, 0, window->iconPtr->classMask);
 		k = ((_variableArray[31] / 52) % 3);
-		animate(4, 9, k + 25, 0, 0, 0);	
+		animate(4, 9, k + 25, 0, 0, 0);
 		_variableArray[31] += 52;
 	}
 	if (((_variableArray[31] - _variableArray[30]) == 40) && (_variableArray[30] > 52)) {
@@ -157,7 +157,7 @@ void AGOSEngine_Feeble::checkDown(WindowBlock *window) {
 void AGOSEngine_Feeble::inventoryDown(WindowBlock *window) {
 	_marks = 0;
 	checkDown(window);
-	animate(4, 9, 23, 0, 0, 0);	
+	animate(4, 9, 23, 0, 0, 0);
 	while (1) {
 		if (_currentBox->id != 0x7FFC || !getBitFlag(89))
 		break;
diff --git a/engines/agos/res.cpp b/engines/agos/res.cpp
index 4898cc9a45..ceb041b397 100644
--- a/engines/agos/res.cpp
+++ b/engines/agos/res.cpp
@@ -24,7 +24,7 @@
  */
 
 // Resource file routines for Simon1/Simon2
-#include "common/stdafx.h"
+
 
 #include "common/file.h"
 
@@ -125,7 +125,7 @@ int AGOSEngine::allocGamePcVars(Common::SeekableReadStream *in) {
 		item_array_size += 2;
 		item_array_inited = item_array_size;
 	} else {
-		item_array_inited += 2;		
+		item_array_inited += 2;
 		item_array_size += 2;
 	}
 
@@ -395,7 +395,7 @@ void AGOSEngine::readItemChildren(Common::SeekableReadStream *in, Item *item, ui
 		setUserFlag(item, 6, in->readUint16BE());
 		setUserFlag(item, 7, in->readUint16BE());
 		SubUserFlag *subUserFlag = (SubUserFlag *)findChildOfType(item, kUserFlagType);
-		subUserFlag->userItems[0] = (uint16)fileReadItemID(in); 
+		subUserFlag->userItems[0] = (uint16)fileReadItemID(in);
 		fileReadItemID(in);
 		fileReadItemID(in);
 		fileReadItemID(in);
@@ -658,7 +658,7 @@ void AGOSEngine::loadVGABeardFile(uint16 id) {
 		if (getPlatform() == Common::kPlatformAmiga) {
 			if (getFeatures() & GF_TALKIE)
 				sprintf(filename, "0%d.out", id);
-			else 
+			else
 				sprintf(filename, "0%d.pkd", id);
 		} else {
 			sprintf(filename, "0%d.VGA", id);
diff --git a/engines/agos/res_ami.cpp b/engines/agos/res_ami.cpp
index e298cf66e9..a40ca54c58 100644
--- a/engines/agos/res_ami.cpp
+++ b/engines/agos/res_ami.cpp
@@ -24,7 +24,7 @@
  */
 
 // Conversion routines for planar graphics in Amiga versions
-#include "common/stdafx.h"
+
 
 #include "agos/agos.h"
 #include "agos/intern.h"
diff --git a/engines/agos/res_snd.cpp b/engines/agos/res_snd.cpp
index beea0de473..738de98342 100644
--- a/engines/agos/res_snd.cpp
+++ b/engines/agos/res_snd.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 
 #include "common/config-manager.h"
 #include "common/file.h"
@@ -308,7 +308,7 @@ void AGOSEngine::playMusic(uint16 music, uint16 track) {
 void AGOSEngine::stopMusic() {
 	if (_midiEnabled) {
 		_midi.stop();
-	} 
+	}
 	_mixer->stopHandle(_modHandle);
 }
 
diff --git a/engines/agos/rooms.cpp b/engines/agos/rooms.cpp
index 5e612080df..e1e6b11d0e 100644
--- a/engines/agos/rooms.cpp
+++ b/engines/agos/rooms.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 
 #include "agos/agos.h"
 #include "agos/intern.h"
@@ -119,10 +119,10 @@ void AGOSEngine::setDoorState(Item *i, uint16 d, uint16 n) {
 		y++;
 	}
 	/* Check are a complete exit pair */
-	if (derefItem(r1->roomExit[d1]) != i)	    
+	if (derefItem(r1->roomExit[d1]) != i)
 		return;
 	/* Change state of exit coming back */
-	changeDoorState(r1, d, n);    
+	changeDoorState(r1, d, n);
 }
 
 // Elvira 1 specific
@@ -265,13 +265,13 @@ int AGOSEngine_Elvira2::changeExitStates(SubSuperRoom *sr, int n, int d, uint16
 				return(0);
 			else
 				break;
-		case 1: 
+		case 1:
 			b = 1; bd = 3;
 			if (((n % (sr->roomX * sr->roomY)) % sr->roomX) == 0)
 				return 0;
 			else
 				break;
-		case 2: 
+		case 2:
 			b = sr->roomX; bd = 0;
 			if (((n % (sr->roomX * sr->roomY)) / sr->roomX) == (sr->roomY - 1))
 				return 0;
diff --git a/engines/agos/saveload.cpp b/engines/agos/saveload.cpp
index da1aa92008..b399e58688 100644
--- a/engines/agos/saveload.cpp
+++ b/engines/agos/saveload.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 
 #include "common/savefile.h"
 #include "common/system.h"
@@ -55,12 +55,12 @@ int AGOSEngine::countSaveGames() {
 		slot[0] = file->c_str()[file->size()-3];
 		slot[1] = file->c_str()[file->size()-2];
 		slot[2] = file->c_str()[file->size()-1];
-		
+
 		slotNum = atoi(slot);
 		if (slotNum >= 0 && slotNum < 256)
 			marks[slotNum] = true;	//mark this slot as valid
 	}
-	
+
 	while (i < 256) {
 		if (marks[i] &&
 		    (f = _saveFileMan->openForLoading(genSaveName(i)))) {
@@ -69,7 +69,7 @@ int AGOSEngine::countSaveGames() {
 		} else
 			break;
 	}
-	
+
 	return i;
 }
 
@@ -242,7 +242,7 @@ void AGOSEngine::userGame(bool load) {
 	char buf[8];
 
 	numSaveGames = countSaveGames();
-	
+
 	time_t saveTime = time(NULL);
 	haltAnimation();
 
diff --git a/engines/agos/script.cpp b/engines/agos/script.cpp
index ace0b9d50f..33ef3141ce 100644
--- a/engines/agos/script.cpp
+++ b/engines/agos/script.cpp
@@ -25,7 +25,7 @@
 
 // Item script opcodes for Simon1/Simon2
 
-#include "common/stdafx.h"
+
 
 #include "common/system.h"
 
@@ -805,7 +805,7 @@ void AGOSEngine::o_freezeZones() {
 			_variableArray[135] = 3;
 			setBitFlag(135, 1);
 			setScriptCondition(0);
-		} 
+		}
 	}
 }
 
diff --git a/engines/agos/script_e1.cpp b/engines/agos/script_e1.cpp
index 5a1d7d104b..c3f7c841dc 100644
--- a/engines/agos/script_e1.cpp
+++ b/engines/agos/script_e1.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 
 #include "agos/agos.h"
 #include "agos/vga.h"
@@ -505,7 +505,7 @@ void AGOSEngine_Elvira1::oe1_copyfo() {
 
 void AGOSEngine_Elvira1::oe1_whatO() {
 	// 57: what o
-	int a = getVarOrWord();	
+	int a = getVarOrWord();
 
 	if (a == 1)
 		_subjectItem = findMaster(_scriptAdj1,_scriptNoun1);
@@ -896,7 +896,7 @@ void AGOSEngine_Elvira1::oe1_pauseGame() {
 	// 274: pause game
 	WindowBlock *window = _windowArray[4];
 	const char *message1, *message2;
-	
+
 	time_t pauseTime = time(NULL);
 	haltAnimation();
 
@@ -933,7 +933,7 @@ restart:
 		window->textRow = 0;
 		window->textColumnOffset = 0;
 		window->textLength = 0;		// Difference
-		
+
 		switch (_language) {
 		case Common::FR_FRA:
 			message1 = "    Etes-vous s<r ?\r\r\r";
@@ -1163,7 +1163,7 @@ void AGOSEngine::printStats() {
 	if (val < -99)
 		val = -99;
 	if (val > 99)
-		val = 99;	
+		val = 99;
 	writeChar(window, 5, 133, 6, val);
 
 	// Resolution
@@ -1171,7 +1171,7 @@ void AGOSEngine::printStats() {
 	if (val < -99)
 		val = -99;
 	if (val > 99)
-		val = 99;	
+		val = 99;
 	writeChar(window, 11, 133, 6, val);
 
 	// Dexterity
@@ -1179,7 +1179,7 @@ void AGOSEngine::printStats() {
 	if (val < -99)
 		val = -99;
 	if (val > 99)
-		val = 99;	
+		val = 99;
 	writeChar(window, 18, 133, 0, val);
 
 	// Skill
@@ -1187,7 +1187,7 @@ void AGOSEngine::printStats() {
 	if (val < -99)
 		val = -99;
 	if (val > 99)
-		val = 99;	
+		val = 99;
 	writeChar(window, 24, 133, 0, val);
 
 	// Life
@@ -1195,7 +1195,7 @@ void AGOSEngine::printStats() {
 	if (val < -99)
 		val = -99;
 	if (val > 99)
-		val = 99;	
+		val = 99;
 	writeChar(window, 30, 133, 2, val);
 
 	// Experience
@@ -1203,7 +1203,7 @@ void AGOSEngine::printStats() {
 	if (val < -99)
 		val = -99;
 	if (val > 99)
-		val = 99;	
+		val = 99;
 	writeChar(window, 36, 133, 4, val);
 
 	mouseOn();
diff --git a/engines/agos/script_e2.cpp b/engines/agos/script_e2.cpp
index 77df3feecb..53f9833b06 100644
--- a/engines/agos/script_e2.cpp
+++ b/engines/agos/script_e2.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 
 #include "agos/agos.h"
 
@@ -703,7 +703,7 @@ void AGOSEngine_Elvira2::printStats() {
 	if (val < -99)
 		val = -99;
 	if (val > 99)
-		val = 99;	
+		val = 99;
 	writeChar(window, 10, y, 0, val);
 
 	// PP
@@ -711,7 +711,7 @@ void AGOSEngine_Elvira2::printStats() {
 	if (val < -99)
 		val = -99;
 	if (val > 99)
-		val = 99;	
+		val = 99;
 	writeChar(window, 16, y, 6, val);
 
 	// HP
@@ -719,7 +719,7 @@ void AGOSEngine_Elvira2::printStats() {
 	if (val < -99)
 		val = -99;
 	if (val > 99)
-		val = 99;	
+		val = 99;
 	writeChar(window, 23, y, 4, val);
 
 	// Experience
@@ -727,7 +727,7 @@ void AGOSEngine_Elvira2::printStats() {
 	if (val < -99)
 		val = -99;
 	if (val > 9999)
-		val = 9999;	
+		val = 9999;
 	writeChar(window, 30, y, 6, val / 100);
 	writeChar(window, 32, y, 2, val % 100);
 
diff --git a/engines/agos/script_ff.cpp b/engines/agos/script_ff.cpp
index 8b7af31a66..89c760b8bf 100644
--- a/engines/agos/script_ff.cpp
+++ b/engines/agos/script_ff.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 
 #include "common/system.h"
 
diff --git a/engines/agos/script_pp.cpp b/engines/agos/script_pp.cpp
index a7bda53e48..7413934d5c 100644
--- a/engines/agos/script_pp.cpp
+++ b/engines/agos/script_pp.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 
 #include "common/system.h"
 
diff --git a/engines/agos/script_s1.cpp b/engines/agos/script_s1.cpp
index 1a4f956b8b..a1308b951d 100644
--- a/engines/agos/script_s1.cpp
+++ b/engines/agos/script_s1.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 
 #include "common/system.h"
 
@@ -368,7 +368,7 @@ void AGOSEngine_Simon1::os1_screenTextBox() {
 	tl->y = getVarOrByte();
 	tl->width = getVarOrWord();
 }
-	
+
 void AGOSEngine_Simon1::os1_screenTextMsg() {
 	// 162: print string
 	uint vgaSpriteId = getVarOrByte();
diff --git a/engines/agos/script_s2.cpp b/engines/agos/script_s2.cpp
index 00addce396..d868e1e5bd 100644
--- a/engines/agos/script_s2.cpp
+++ b/engines/agos/script_s2.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 
 #include "agos/agos.h"
 
diff --git a/engines/agos/script_ww.cpp b/engines/agos/script_ww.cpp
index fc472fd3c3..94c6152315 100644
--- a/engines/agos/script_ww.cpp
+++ b/engines/agos/script_ww.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 
 #include "common/system.h"
 
diff --git a/engines/agos/sound.cpp b/engines/agos/sound.cpp
index a735f54c29..e198fe8d66 100644
--- a/engines/agos/sound.cpp
+++ b/engines/agos/sound.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- 
+
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- 
+
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 
 #include "common/file.h"
 #include "common/util.h"
@@ -739,7 +739,7 @@ void Sound::playSoundData(Audio::SoundHandle *handle, byte *soundData, uint soun
 
 	if (loop == true)
 		flags |= Audio::Mixer::FLAG_LOOP;
-	
+
 	if (compType == 2) {
 		Audio::AudioStream *sndStream = Audio::makeADPCMStream(&stream, size, Audio::kADPCMMS, rate, (flags & Audio::Mixer::FLAG_STEREO) ? 2 : 1, blockAlign);
 		buffer = (byte *)malloc(size * 4);
diff --git a/engines/agos/string.cpp b/engines/agos/string.cpp
index 521a3ab6ea..6714659449 100644
--- a/engines/agos/string.cpp
+++ b/engines/agos/string.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 
 #include "agos/agos.h"
 #include "agos/intern.h"
@@ -482,14 +482,14 @@ void AGOSEngine_Feeble::printInteractText(uint16 num, const char *string) {
 	}
 
 	// ScrollX
-	x = _variableArray[251];		
+	x = _variableArray[251];
 	x += 20;
 
 	if (num == 1)
 		_interactY = 385;
 
 	// Returned values for box definition
-	_variableArray[51] = x;			
+	_variableArray[51] = x;
 	_variableArray[52] = _interactY;
 	_variableArray[53] = w;
 	_variableArray[54] = height;
diff --git a/engines/agos/subroutine.cpp b/engines/agos/subroutine.cpp
index f4a6ba3266..823e87ccb9 100644
--- a/engines/agos/subroutine.cpp
+++ b/engines/agos/subroutine.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 
 #include "agos/agos.h"
 #include "agos/intern.h"
diff --git a/engines/agos/verb.cpp b/engines/agos/verb.cpp
index f99d6db591..1f542729f2 100644
--- a/engines/agos/verb.cpp
+++ b/engines/agos/verb.cpp
@@ -24,7 +24,7 @@
  */
 
 // Verb and hitarea handling
-#include "common/stdafx.h"
+
 
 #include "common/system.h"
 
@@ -239,7 +239,7 @@ void AGOSEngine::printVerbOf(uint hitarea_id) {
 			verb_prep_names = spanish_verb_prep_names;
 			break;
 		case Common::IT_ITA:
-			verb_prep_names = italian_verb_prep_names; 
+			verb_prep_names = italian_verb_prep_names;
 			break;
 		case Common::FR_FRA:
 			verb_prep_names = french_verb_prep_names;
@@ -247,7 +247,7 @@ void AGOSEngine::printVerbOf(uint hitarea_id) {
 		case Common::DE_DEU:
 			verb_prep_names = german_verb_prep_names;
 			break;
-		default: 
+		default:
 			verb_prep_names = english_verb_prep_names;
 			break;
 		}
@@ -273,7 +273,7 @@ void AGOSEngine::printVerbOf(uint hitarea_id) {
 		case Common::DE_DEU:
 			verb_names = german_verb_names;
 			break;
-		default: 
+		default:
 			verb_names = english_verb_names;
 			break;
 		}
@@ -717,7 +717,7 @@ void AGOSEngine::boxController(uint x, uint y, uint mode) {
 			}
 		}
 	}
- 
+
 	if ((getGameType() == GType_WW) && (_mouseCursor == 0 || _mouseCursor >= 4)) {
 		uint verb = best_ha->verb & 0x3FFF;
 		if  (verb >= 239 && verb <= 242) {
diff --git a/engines/agos/vga.cpp b/engines/agos/vga.cpp
index 38c401a80d..e5a01572cf 100644
--- a/engines/agos/vga.cpp
+++ b/engines/agos/vga.cpp
@@ -24,7 +24,7 @@
  */
 
 // Video script opcodes for Simon1/Simon2
-#include "common/stdafx.h"
+
 
 #include "agos/agos.h"
 #include "agos/intern.h"
diff --git a/engines/agos/vga_e2.cpp b/engines/agos/vga_e2.cpp
index a4925de842..8e046f34aa 100644
--- a/engines/agos/vga_e2.cpp
+++ b/engines/agos/vga_e2.cpp
@@ -24,7 +24,7 @@
  */
 
 // Video script opcodes for Simon1/Simon2
-#include "common/stdafx.h"
+
 
 #include "agos/agos.h"
 #include "agos/intern.h"
diff --git a/engines/agos/vga_ff.cpp b/engines/agos/vga_ff.cpp
index 29b05e1e3c..e50fada828 100644
--- a/engines/agos/vga_ff.cpp
+++ b/engines/agos/vga_ff.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 
 #include "agos/agos.h"
 #include "agos/intern.h"
@@ -50,7 +50,7 @@ int AGOSEngine::getScale(int16 y, int16 x) {
 
 	if (y > _baseY) {
 		return((int16)(x * (1 + ((y - _baseY) * _scale))));
-	} else {	
+	} else {
 		if (x == 0)
 			return(0);
 		if (x < 0) {
@@ -122,7 +122,7 @@ void AGOSEngine::vc77_setScaleYOffs() {
 	vsp->y += getScale(vsp->y, y);
 	_variableArrayPtr[var] = vsp->y;
 
-	if (y != 0) 
+	if (y != 0)
 		checkScrollY(y, vsp->y);
 
 	vsp->flags = kDFScaled;
@@ -337,7 +337,7 @@ void AGOSEngine::startOverlayAnims() {
 	int i;
 
 	zoneNum = _variableArray[999];
-	
+
 	for (i = 0; i < 600; i++) {
 		if (_variableArray[1000 + i] < 100)
 			continue;
diff --git a/engines/agos/vga_s1.cpp b/engines/agos/vga_s1.cpp
index 95e8e0a8b5..f99c8afb83 100644
--- a/engines/agos/vga_s1.cpp
+++ b/engines/agos/vga_s1.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 
 #include "agos/agos.h"
 #include "agos/intern.h"
@@ -162,7 +162,7 @@ void AGOSEngine::vc48_setPathFinder() {
 				x = vsp->x & 7;
 				ydiff *= x;
 				ydiff /= 8;
-				ydiff = -ydiff;	
+				ydiff = -ydiff;
 			} else {
 				x = vsp->x & 7;
 				ydiff *= x;
diff --git a/engines/agos/vga_s2.cpp b/engines/agos/vga_s2.cpp
index 9c05bc1100..82f0811811 100644
--- a/engines/agos/vga_s2.cpp
+++ b/engines/agos/vga_s2.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 
 #include "agos/agos.h"
 #include "agos/intern.h"
diff --git a/engines/agos/vga_ww.cpp b/engines/agos/vga_ww.cpp
index c24a115e71..b236fa26a0 100644
--- a/engines/agos/vga_ww.cpp
+++ b/engines/agos/vga_ww.cpp
@@ -24,7 +24,7 @@
  */
 
 // Video script opcodes for Simon1/Simon2
-#include "common/stdafx.h"
+
 
 #include "agos/agos.h"
 #include "agos/intern.h"
diff --git a/engines/agos/window.cpp b/engines/agos/window.cpp
index d4eb7ba3fc..a9331bbc40 100644
--- a/engines/agos/window.cpp
+++ b/engines/agos/window.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 
 #include "common/system.h"
 
@@ -216,7 +216,7 @@ void AGOSEngine::restoreWindow(WindowBlock *window) {
 				w++;
 			}
 		}
-			
+
 		restoreBlock(window->y + window->height * 8, (x + w) * 8, window->y, x * 8);
 	}
 
@@ -287,7 +287,7 @@ void AGOSEngine::waitWindow(WindowBlock *window) {
 		windowPutChar(window, *message);
 
 	ha = findEmptyHitArea();
-	ha->x = (window->width / 2 + window->x - 3) * 8; 
+	ha->x = (window->width / 2 + window->x - 3) * 8;
 	ha->y = window->height * 8 + window->y - 8;
 	ha->width = 48;
 	ha->height = 8;
diff --git a/engines/agos/zones.cpp b/engines/agos/zones.cpp
index d40e1da1de..e754baec10 100644
--- a/engines/agos/zones.cpp
+++ b/engines/agos/zones.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 
 #include "common/file.h"