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

svn-id: r28966

48 files changed, 96 insertions, 104 deletions

diff --git a/engines/gob/cdrom.cpp b/engines/gob/cdrom.cpp
index 1c26199bc1..5afdc832f1 100644
--- a/engines/gob/cdrom.cpp
+++ b/engines/gob/cdrom.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 #include "sound/audiocd.h"
 
diff --git a/engines/gob/coktelvideo.cpp b/engines/gob/coktelvideo.cpp
index c15ffb4a1d..a61addb2b6 100644
--- a/engines/gob/coktelvideo.cpp
+++ b/engines/gob/coktelvideo.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-#include "common/stdafx.h"
 #include "common/endian.h"
 #include "common/system.h"
 
@@ -194,7 +193,7 @@ void Imd::setXY(int16 x, int16 y) {
 		if (y >= 0)
 			_stdY = _stdY - _y + y;
 	}
-	
+
 	// Going through the coordinate table as well
 	if (_frameCoords) {
 		for (int i = 0; i < _framesCount; i++) {
@@ -1116,7 +1115,7 @@ CoktelVideo::State Vmd::processFrame(uint16 frame) {
 
 				_stream->read(_palette + index * 3, (count + 1) * 3);
 				_stream->skip((255 - count) * 3);
-				
+
 				state.flags |= kStatePalette;
 			}
 
diff --git a/engines/gob/dataio.cpp b/engines/gob/dataio.cpp
index 7fd461b93c..d6d8e62372 100644
--- a/engines/gob/dataio.cpp
+++ b/engines/gob/dataio.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 
 #include "gob/gob.h"
diff --git a/engines/gob/dataio.h b/engines/gob/dataio.h
index b30a389865..7a6435e095 100644
--- a/engines/gob/dataio.h
+++ b/engines/gob/dataio.h
@@ -26,7 +26,7 @@
 #ifndef GOB_DATAIO_H
 #define GOB_DATAIO_H
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 
 #include "common/file.h"
diff --git a/engines/gob/detection.cpp b/engines/gob/detection.cpp
index bfd2a0edfc..22b249a4a8 100644
--- a/engines/gob/detection.cpp
+++ b/engines/gob/detection.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "base/plugins.h"
 #include "common/advancedDetector.h"
 
diff --git a/engines/gob/draw.cpp b/engines/gob/draw.cpp
index acf4d5765b..59ef109060 100644
--- a/engines/gob/draw.cpp
+++ b/engines/gob/draw.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 
 #include "gob/gob.h"
@@ -62,7 +62,7 @@ Draw::Draw(GobEngine *vm) : _vm(vm) {
 
 	for (int i = 0; i < 8; i++)
 		_fonts[i] = 0;
-	
+
 	for (int i = 0; i < SPRITES_COUNT; i++)
 		_spritesArray[i] = 0;
 
@@ -357,7 +357,7 @@ void Draw::printTextCentered(int16 id, int16 left, int16 top, int16 right,
 
 		_vm->_global->_inter_execPtr = storedIP;
 	}
-	
+
 	if (str[0] == '\0')
 		return;
 
diff --git a/engines/gob/draw_v1.cpp b/engines/gob/draw_v1.cpp
index 9c4708f187..a2bcf1d693 100644
--- a/engines/gob/draw_v1.cpp
+++ b/engines/gob/draw_v1.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 #include "graphics/cursorman.h"
 
@@ -50,7 +50,7 @@ void Draw_v1::closeScreen() {
 void Draw_v1::blitCursor() {
 	if (_cursorIndex == -1)
 		return;
-	
+
 	if (_showCursor == 2)
 		_showCursor = 0;
 }
diff --git a/engines/gob/draw_v2.cpp b/engines/gob/draw_v2.cpp
index 55585f5619..6c6250bd09 100644
--- a/engines/gob/draw_v2.cpp
+++ b/engines/gob/draw_v2.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 #include "graphics/cursorman.h"
 
@@ -47,7 +47,7 @@ void Draw_v2::initScreen() {
 	initSpriteSurf(21, _vm->_video->_surfWidth, _vm->_video->_surfHeight, 0);
 	_backSurface = _spritesArray[21];
 	_vm->_video->clearSurf(_backSurface);
-	
+
 	initSpriteSurf(23, 32, 16, 2);
 	_cursorSpritesBack = _spritesArray[23];
 	_cursorSprites = _cursorSpritesBack;
@@ -69,7 +69,7 @@ void Draw_v2::closeScreen() {
 void Draw_v2::blitCursor() {
 	if (_cursorIndex == -1)
 		return;
-	
+
 	_showCursor = (_showCursor & ~2) | ((_showCursor & 1) << 1);
 }
 
@@ -122,7 +122,7 @@ void Draw_v2::animateCursor(int16 cursor) {
 						_vm->_util->getTimeKey())) {
 				_cursorAnim++;
 				if ((_cursorAnimHigh[_cursorIndex] < _cursorAnim) ||
-						(_cursorAnimLow[_cursorIndex] > _cursorAnim)) 
+						(_cursorAnimLow[_cursorIndex] > _cursorAnim))
 					_cursorAnim = _cursorAnimLow[_cursorIndex];
 				_cursorTimeKey = _vm->_util->getTimeKey();
 			} else {
@@ -353,7 +353,7 @@ void Draw_v2::printTotText(int16 id) {
 	memset(str, ' ', 80);
 	_backColor = 0;
 	_transparency = 1;
-	
+
 	while (true) {
 		if ((((*ptr >= 1) && (*ptr <= 7)) || (*ptr == 10)) && (strPos != 0)) {
 			str[MAX(strPos, strPos2)] = 0;
diff --git a/engines/gob/driver_vga.cpp b/engines/gob/driver_vga.cpp
index ef1c9c328c..73ae355415 100644
--- a/engines/gob/driver_vga.cpp
+++ b/engines/gob/driver_vga.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 #include "graphics/primitives.h"
 
@@ -53,7 +53,7 @@ void VGAVideoDriver::drawLine(SurfaceDesc *dest, int16 x0, int16 y0, int16 x1,
 
 void VGAVideoDriver::fillRect(SurfaceDesc *dest, int16 left, int16 top,
 		int16 right, int16 bottom, byte color) {
-	
+
 	if ((left >= dest->getWidth()) || (right >= dest->getWidth()) ||
 	    (top >= dest->getHeight()) || (bottom >= dest->getHeight()))
 		return;
@@ -114,11 +114,11 @@ void VGAVideoDriver::drawSprite(SurfaceDesc *source, SurfaceDesc *dest,
 	byte *destPos = dest->getVidMem() + (y * dest->getWidth()) + x;
 
 	if (transp) {
-		while (height--) {  		
+		while (height--) {
 			for (int16 i = 0; i < width; ++i) {
 				if (srcPos[i])
 					destPos[i] = srcPos[i];
-			} 	
+			}
 
 			srcPos += source->getWidth();
 			destPos += dest->getWidth();
@@ -129,7 +129,7 @@ void VGAVideoDriver::drawSprite(SurfaceDesc *source, SurfaceDesc *dest,
 
 			srcPos += source->getWidth();
 			destPos += dest->getWidth();
-		}  
+		}
 	}
 }
 
diff --git a/engines/gob/game.cpp b/engines/gob/game.cpp
index 37817c12a3..cdf7dfb411 100644
--- a/engines/gob/game.cpp
+++ b/engines/gob/game.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 
 #include "gob/gob.h"
@@ -89,7 +89,7 @@ Game::Game(GobEngine *vm) : _vm(vm) {
 
 	_backupedCount = 0;
 	_curBackupPos = 0;
-	
+
 	for (int i = 0; i < 5; i++) {
 		_cursorHotspotXArray[i] = 0;
 		_cursorHotspotYArray[i] = 0;
diff --git a/engines/gob/game_v1.cpp b/engines/gob/game_v1.cpp
index 3f681ddd1f..c6830686fe 100644
--- a/engines/gob/game_v1.cpp
+++ b/engines/gob/game_v1.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 #include "common/stream.h"
 
diff --git a/engines/gob/game_v2.cpp b/engines/gob/game_v2.cpp
index 8a528a96f5..37acf204b6 100644
--- a/engines/gob/game_v2.cpp
+++ b/engines/gob/game_v2.cpp
@@ -23,7 +23,7 @@
 	 *
 	 */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 #include "common/stream.h"
 
diff --git a/engines/gob/gob.cpp b/engines/gob/gob.cpp
index 8dee9c9e32..80eeeb6d3f 100644
--- a/engines/gob/gob.cpp
+++ b/engines/gob/gob.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 
 #include "base/plugins.h"
diff --git a/engines/gob/gob.h b/engines/gob/gob.h
index d573dc3a89..4bd0ab96c3 100644
--- a/engines/gob/gob.h
+++ b/engines/gob/gob.h
@@ -26,7 +26,7 @@
 #ifndef GOB_GOB_H
 #define GOB_GOB_H
 
-#include "common/stdafx.h"
+
 #include "common/system.h"
 #include "common/savefile.h"
 
diff --git a/engines/gob/goblin_v1.cpp b/engines/gob/goblin_v1.cpp
index f8ffb15257..7a66758bce 100644
--- a/engines/gob/goblin_v1.cpp
+++ b/engines/gob/goblin_v1.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 
 #include "gob/gob.h"
diff --git a/engines/gob/goblin_v2.cpp b/engines/gob/goblin_v2.cpp
index 608b0f0790..0b7bef4f7b 100644
--- a/engines/gob/goblin_v2.cpp
+++ b/engines/gob/goblin_v2.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 
 #include "gob/gob.h"
diff --git a/engines/gob/init.cpp b/engines/gob/init.cpp
index 1c6d7faa3b..856b088e12 100644
--- a/engines/gob/init.cpp
+++ b/engines/gob/init.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 
 #include "gob/gob.h"
diff --git a/engines/gob/init_v1.cpp b/engines/gob/init_v1.cpp
index 679c20e380..1f73500a67 100644
--- a/engines/gob/init_v1.cpp
+++ b/engines/gob/init_v1.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 
 #include "gob/gob.h"
diff --git a/engines/gob/init_v2.cpp b/engines/gob/init_v2.cpp
index 175d82fda0..790a0f7694 100644
--- a/engines/gob/init_v2.cpp
+++ b/engines/gob/init_v2.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 
 #include "gob/gob.h"
diff --git a/engines/gob/init_v3.cpp b/engines/gob/init_v3.cpp
index 61e7fb61d0..16057332f1 100644
--- a/engines/gob/init_v3.cpp
+++ b/engines/gob/init_v3.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-#include "common/stdafx.h"
 #include "common/endian.h"
 
 #include "gob/gob.h"
diff --git a/engines/gob/inter.cpp b/engines/gob/inter.cpp
index 4da3746681..0f76ff4bbc 100644
--- a/engines/gob/inter.cpp
+++ b/engines/gob/inter.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 
 #include "gob/gob.h"
diff --git a/engines/gob/inter_bargon.cpp b/engines/gob/inter_bargon.cpp
index 492ea198a1..a7af1d45e1 100644
--- a/engines/gob/inter_bargon.cpp
+++ b/engines/gob/inter_bargon.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 
 #include "gob/gob.h"
diff --git a/engines/gob/inter_v1.cpp b/engines/gob/inter_v1.cpp
index 9f30d9dea2..02434bca4d 100644
--- a/engines/gob/inter_v1.cpp
+++ b/engines/gob/inter_v1.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 #include "common/file.h"
 
@@ -753,7 +753,7 @@ void Inter_v1::checkSwitchTable(byte **ppExec) {
 			READ_LE_UINT16(_vm->_global->_inter_execPtr + 2) + 2;
 		found = false;
 		len = (int8) *_vm->_global->_inter_execPtr++;
-	} 
+	}
 
 	if ((*_vm->_global->_inter_execPtr >> 4) != 4)
 		return;
@@ -1290,7 +1290,7 @@ bool Inter_v1::o1_if(OpFuncParams &params) {
 	byte cmd;
 	bool boolRes;
 	byte *storedIP;
-	
+
 	boolRes = evalBoolResult();
 	if (boolRes) {
 		if ((params.counter == params.cmdCount) && (params.retFlag == 2))
@@ -1611,7 +1611,7 @@ bool Inter_v1::o1_palLoad(OpFuncParams &params) {
 		}
 		break;
 	}
-	
+
 	if (!_vm->_draw->_applyPal) {
 		_vm->_global->_pPaletteDesc->unused2 = _vm->_draw->_unusedPalette2;
 		_vm->_global->_pPaletteDesc->unused1 = _vm->_draw->_unusedPalette1;
diff --git a/engines/gob/inter_v2.cpp b/engines/gob/inter_v2.cpp
index b2ca8716be..34f82850cf 100644
--- a/engines/gob/inter_v2.cpp
+++ b/engines/gob/inter_v2.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 #include "sound/mixer.h"
 #include "sound/mods/infogrames.h"
@@ -747,7 +747,7 @@ void Inter_v2::checkSwitchTable(byte **ppExec) {
 	case 26:
 		value = READ_VARO_UINT32(value);
 		break;
-	
+
 	default:
 		value = (int16) READ_VARO_UINT16(value);
 		break;
@@ -841,7 +841,7 @@ void Inter_v2::o2_setRenderFlags() {
 	int16 expr;
 
 	expr = _vm->_parse->parseValExpr();
-	
+
 	if (expr & 0x8000) {
 		_vm->_draw->_renderFlags |= expr & 0x3FFF;
 	} else {
@@ -1084,7 +1084,7 @@ void Inter_v2::o2_stopCD() {
 
 void Inter_v2::o2_readLIC() {
 	char path[40];
-	
+
 	evalExpr(0);
 	strncpy0(path, _vm->_global->_inter_resStr, 35);
 	strcat(path, ".LIC");
@@ -1285,8 +1285,8 @@ void Inter_v2::o2_setGoblinState() {
 		objAnim.newCycle = animLayer->framesCount;
 		break;
 
-	case 1: 
-	case 4: 
+	case 1:
+	case 4:
 	case 6:
 		layer = obj.goblinStates[objAnim.state][0].layer;
 		animation = obj.goblinStates[objAnim.state][0].animation;
@@ -1414,7 +1414,7 @@ void Inter_v2::o2_initScreen() {
 		_vm->_video->_surfWidth = width;
 	if (height > 0)
 		_vm->_video->_surfHeight = height;
-	
+
 	_vm->_video->_splitHeight1 =
 		MIN<int16>(_vm->_height, _vm->_video->_surfHeight - offY);
 	_vm->_video->_splitHeight2 = offY;
@@ -1518,7 +1518,7 @@ void Inter_v2::o2_playImd() {
 	palStart = _vm->_parse->parseValExpr();
 	palEnd = _vm->_parse->parseValExpr();
 	palCmd = 1 << (flags & 0x3F);
-	
+
 	if ((imd[0] != 0) && !_vm->_vidPlayer->openVideo(imd, x, y, flags)) {
 		WRITE_VAR(11, -1);
 		return;
@@ -2124,7 +2124,7 @@ int16 Inter_v2::loadSound(int16 search) {
 			}
 		}
 	}
-	
+
 	_vm->_game->freeSoundSlot(slot);
 
 	if (id == -1) {
@@ -2155,7 +2155,7 @@ int16 Inter_v2::loadSound(int16 search) {
 		dataPtr = (byte *) _vm->_game->loadTotResource(id, &totSize);
 		dataSize = (uint32) ((int32) totSize);
 	}
-	
+
 	if (dataPtr) {
 		_vm->_game->_soundSamples[slot].load(type, source, dataPtr, dataSize);
 		_vm->_game->_soundSamples[slot]._id = id;
diff --git a/engines/gob/inter_v3.cpp b/engines/gob/inter_v3.cpp
index 7baa451f81..e80181ff4a 100644
--- a/engines/gob/inter_v3.cpp
+++ b/engines/gob/inter_v3.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-#include "common/stdafx.h"
 #include "common/endian.h"
 #include "common/file.h"
 
diff --git a/engines/gob/inter_v4.cpp b/engines/gob/inter_v4.cpp
index 81f53757a3..5a91957b2b 100644
--- a/engines/gob/inter_v4.cpp
+++ b/engines/gob/inter_v4.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-#include "common/stdafx.h"
 #include "common/endian.h"
 #include "common/file.h"
 
@@ -736,7 +735,7 @@ void Inter_v4::o4_playVmdOrMusic() {
 	palStart = _vm->_parse->parseValExpr();
 	palEnd = _vm->_parse->parseValExpr();
 	palCmd = 1 << (flags & 0x3F);
-	
+
 	close = false;
 	if (lastFrame == -1) {
 		close = true;
diff --git a/engines/gob/map.cpp b/engines/gob/map.cpp
index d467348039..2a77a60e28 100644
--- a/engines/gob/map.cpp
+++ b/engines/gob/map.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 
 #include "gob/gob.h"
 #include "gob/map.h"
diff --git a/engines/gob/map_v1.cpp b/engines/gob/map_v1.cpp
index 7134527592..c2ffee2227 100644
--- a/engines/gob/map_v1.cpp
+++ b/engines/gob/map_v1.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/stream.h"
 
 #include "gob/gob.h"
@@ -283,7 +283,7 @@ void Map_v1::loadObjects(Common::SeekableReadStream &data, uint32 objsPos) {
 	Goblin::Gob_State *pState;
 	uint32 tmpStateData[40 * 6];
 	uint32 tmpPos;
-	
+
 	_vm->_goblin->_objCount = data.readUint16LE();
 	for (int i = 0; i < _vm->_goblin->_objCount; i++) {
 		_vm->_goblin->_objects[i] = new Goblin::Gob_Object;
diff --git a/engines/gob/map_v2.cpp b/engines/gob/map_v2.cpp
index 5133ac1286..1ab98e5d44 100644
--- a/engines/gob/map_v2.cpp
+++ b/engines/gob/map_v2.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/stream.h"
 
 #include "gob/gob.h"
diff --git a/engines/gob/map_v4.cpp b/engines/gob/map_v4.cpp
index fb398ecbaf..5eb37b1316 100644
--- a/engines/gob/map_v4.cpp
+++ b/engines/gob/map_v4.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-#include "common/stdafx.h"
 #include "common/stream.h"
 
 #include "gob/gob.h"
diff --git a/engines/gob/mult.cpp b/engines/gob/mult.cpp
index 49f36a0d21..ad69ee93bc 100644
--- a/engines/gob/mult.cpp
+++ b/engines/gob/mult.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 
 #include "gob/gob.h"
diff --git a/engines/gob/mult_v1.cpp b/engines/gob/mult_v1.cpp
index 0c367870ac..63d94f19f7 100644
--- a/engines/gob/mult_v1.cpp
+++ b/engines/gob/mult_v1.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 #include "common/stream.h"
 
diff --git a/engines/gob/mult_v2.cpp b/engines/gob/mult_v2.cpp
index ddce90df0c..9f9ab58644 100644
--- a/engines/gob/mult_v2.cpp
+++ b/engines/gob/mult_v2.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 #include "common/stream.h"
 
@@ -64,7 +64,7 @@ void Mult_v2::loadMult(int16 resId) {
 	uint32 dataSize;
 	byte *extData;
 	bool hasImds;
-	
+
 	index = (resId & 0x8000) ? *_vm->_global->_inter_execPtr++ : 0;
 	resId &= 0x7FFF;
 
@@ -238,7 +238,7 @@ void Mult_v2::loadMult(int16 resId) {
 					_multData->sndKeys[i].cmd);
 		}
 	}
-	
+
 	_multData->imdFiles = 0;
 	_multData->somepointer10 = 0;
 
@@ -321,7 +321,7 @@ void Mult_v2::freeMultKeys() {
 	for (int i = 0; i < _multData->sndSlotsCount; i++)
 		if (!(_multData->sndSlot[i] & 0x8000))
 			_vm->_game->freeSoundSlot(_multData->sndSlot[i]);
-	
+
 	delete[] _multData->sndKeys;
 
 	delete[] _multData->imdFiles;
@@ -329,7 +329,7 @@ void Mult_v2::freeMultKeys() {
 
 	if (_animDataAllocated) {
 		freeMult();
-		
+
 		delete[] _animArrayX;
 		delete[] _animArrayY;
 		delete[] _animArrayData;
@@ -418,7 +418,7 @@ void Mult_v2::multSub(uint16 multIndex) {
 	expr = _vm->_parse->parseValExpr();
 	_multData->animKeysFrames[index] = expr;
 	_multData->animKeysStartFrames[index] = expr;
-	
+
 	WRITE_VAR(18 + index, expr);
 	if (expr == -1) {
 		if (!_objects)
@@ -589,7 +589,7 @@ void Mult_v2::drawStatics(bool &stop) {
 			_vm->_scenery->_curStatic = 0;
 			_vm->_scenery->_curStaticLayer =
 				_multData->staticKeys[_counter].layer;
-			
+
 			staticIndex = _multData->staticIndices[i];
 			while (_vm->_scenery->getStaticLayersCount(staticIndex) <=
 					_vm->_scenery->_curStaticLayer) {
@@ -625,7 +625,7 @@ void Mult_v2::drawStatics(bool &stop) {
 void Mult_v2::drawAnims(bool &stop) { // loc_50D5
 	int16 count;
 	int animIndex;
-	
+
 	for (int i = 0; i < 4; i++) {
 		int16 animKeysCount = _multData->animKeysCount[i];
 		if (_multData->animKeys[i][animKeysCount - 1].frame > _frame)
@@ -641,7 +641,7 @@ void Mult_v2::drawAnims(bool &stop) { // loc_50D5
 
 			if (key.frame != _frame)
 				continue;
-			
+
 			if (key.layer != -1) {
 				*(animObj.pPosX) = key.posX;
 				*(animObj.pPosY) = key.posY;
@@ -740,7 +740,7 @@ void Mult_v2::animate() {
 	int orderArrayPos = 0;
 	int8 animIndices[150];
 	int numAnims = 0;
-	
+
 	if (!_objects)
 		return;
 
@@ -752,7 +752,7 @@ void Mult_v2::animate() {
 		orderArray = 0;
 
 	advanceAllObjects();
-	
+
 	// Find relevant objects
 	for (int i = 0; i < _objCount; i++) {
 		Mult_Object &animObj = _objects[i];
@@ -778,7 +778,7 @@ void Mult_v2::animate() {
 		animObj.newLeft = 1000;
 		animObj.newBottom = 0;
 		animObj.newRight = 0;
-		
+
 		if (animData.isStatic == 2)
 			continue;
 
@@ -1085,7 +1085,7 @@ void Mult_v2::advanceObjects(int16 index) {
 	int16 frame;
 	bool stop = false;
 	bool hasImds = false;
-	
+
 	frame = _multData->animKeysFrames[index];
 	if (frame == -1)
 		return;
@@ -1193,7 +1193,7 @@ void Mult_v2::advanceObjects(int16 index) {
 			playImd(imdFile, key, dir, startFrame);
 		}
 	}
-	
+
 	if (!hasImds && (_vm->_draw->_showCursor == 3))
 		_vm->_game->_preventScroll = false;
 
diff --git a/engines/gob/music.cpp b/engines/gob/music.cpp
index 0f38827363..19bc592e79 100644
--- a/engines/gob/music.cpp
+++ b/engines/gob/music.cpp
@@ -24,7 +24,7 @@
  */
 
 #include "common/file.h"
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 
 #include "gob/gob.h"
@@ -69,7 +69,7 @@ const char *Adlib::_trackFiles[] = {
 };
 
 const unsigned char Adlib::_operators[] = {0, 1, 2, 8, 9, 10, 16, 17, 18};
-const unsigned char Adlib::_volRegNums[] = { 
+const unsigned char Adlib::_volRegNums[] = {
 	3,  4,  5,
 	11, 12, 13,
 	19, 20, 21
@@ -176,8 +176,8 @@ void Adlib::setFreqs() {
 		_notCol[lin] = 0;
 		_notLin[lin] = 0;
 		_notOn[lin] = false;
-	} 
-		
+	}
+
 	// Run through the 25 lines
 	for (lin = 0; lin < 25; lin ++) {
 		// Run through the 12 columns
@@ -187,7 +187,7 @@ void Adlib::setFreqs() {
 					9 / 0x1B503;
 			_freqs[lin][col] = (short)((val + 4) >> 3);
 			val = val * 0x6A / 0x64;
-		} 
+		}
 	}
 }
 
@@ -429,7 +429,7 @@ void Adlib::playBgMusic() {
 
 void Adlib::playTrack(const char *trackname) {
 	if (_playing) return;
-	
+
 	debugC(1, kDebugMusic, "Adlib::playTrack(%s)", trackname);
 	unload();
 	load(_trackFiles[_vm->_util->getRandom(ARRAYSIZE(_trackFiles))]);
@@ -453,7 +453,7 @@ bool Adlib::load(const char *fileName) {
 	reset();
 	setVoices();
 	_playPos = _data + 3 + (_data[1] + 1) * 0x38;
-	
+
 	return true;
 }
 
diff --git a/engines/gob/parse.cpp b/engines/gob/parse.cpp
index 35b17e5543..3fef873a73 100644
--- a/engines/gob/parse.cpp
+++ b/engines/gob/parse.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 
 #include "gob/gob.h"
diff --git a/engines/gob/parse_v1.cpp b/engines/gob/parse_v1.cpp
index b4c8555743..214735fc61 100644
--- a/engines/gob/parse_v1.cpp
+++ b/engines/gob/parse_v1.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 
 #include "gob/gob.h"
diff --git a/engines/gob/parse_v2.cpp b/engines/gob/parse_v2.cpp
index dacdcc917f..515be9b282 100644
--- a/engines/gob/parse_v2.cpp
+++ b/engines/gob/parse_v2.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 
 #include "gob/gob.h"
diff --git a/engines/gob/saveload.cpp b/engines/gob/saveload.cpp
index ea22ede7b6..4d9e24b92f 100644
--- a/engines/gob/saveload.cpp
+++ b/engines/gob/saveload.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-#include "common/stdafx.h"
 #include "common/endian.h"
 #include "common/file.h"
 
@@ -72,7 +71,7 @@ SaveLoad::~SaveLoad() {
 
 	delete[] _saveFiles[0];
 	delete[] _saveFiles[2];
-	delete[] _saveFiles; 
+	delete[] _saveFiles;
 }
 
 const char *SaveLoad::setCurSlot(int slot) {
diff --git a/engines/gob/saveload_v2.cpp b/engines/gob/saveload_v2.cpp
index b8d8d44557..676face1eb 100644
--- a/engines/gob/saveload_v2.cpp
+++ b/engines/gob/saveload_v2.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-#include "common/stdafx.h"
 #include "common/endian.h"
 #include "common/file.h"
 
@@ -215,7 +214,7 @@ bool SaveLoad_v2::saveGame(int16 dataVar, int32 size, int32 offset) {
 
 		Common::SaveFileManager *saveMan = g_system->getSavefileManager();
 		Common::OutSaveFile *out;
-		
+
 		out = saveMan->openForSaving(setCurSlot(slot));
 		if (!out) {
 			warning("Can't open file for slot %d for writing", slot);
diff --git a/engines/gob/saveload_v3.cpp b/engines/gob/saveload_v3.cpp
index f8f69342fe..6d362c5a91 100644
--- a/engines/gob/saveload_v3.cpp
+++ b/engines/gob/saveload_v3.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-#include "common/stdafx.h"
 #include "common/endian.h"
 #include "common/file.h"
 
diff --git a/engines/gob/scenery.cpp b/engines/gob/scenery.cpp
index 95cf90bddc..0d08061b4f 100644
--- a/engines/gob/scenery.cpp
+++ b/engines/gob/scenery.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 #include "common/stream.h"
 
@@ -551,7 +551,7 @@ void Scenery::freeAnim(int16 index) {
 			_spriteResId[spr] = -1;
 		}
 	}
-	
+
 	for (int i = 0; i < _animations[index].layersCount; i++)
 		delete[] _animations[index].layers[i].frames;
 	delete[] _animations[index].layers;
diff --git a/engines/gob/scenery_v1.cpp b/engines/gob/scenery_v1.cpp
index 8d73be4194..8c3c13eda1 100644
--- a/engines/gob/scenery_v1.cpp
+++ b/engines/gob/scenery_v1.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 
 #include "gob/gob.h"
diff --git a/engines/gob/scenery_v2.cpp b/engines/gob/scenery_v2.cpp
index 577bf1a87a..5c2fd2b340 100644
--- a/engines/gob/scenery_v2.cpp
+++ b/engines/gob/scenery_v2.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 
 #include "gob/gob.h"
diff --git a/engines/gob/sound.cpp b/engines/gob/sound.cpp
index b47e6795ac..1c2cf2d716 100644
--- a/engines/gob/sound.cpp
+++ b/engines/gob/sound.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 
 #include "gob/gob.h"
@@ -152,7 +152,7 @@ int Snd::SquareWaveStream::readBuffer(int16 *buffer, const int numSamples) {
 			_remainingSamples--;
 		_mixedSamples++;
 	}
-	
+
 	// Clear the rest of the buffer
 	if (i < numSamples)
 		memset(buffer + i, 0, (numSamples - i) * sizeof(int16));
@@ -196,7 +196,7 @@ Snd::Snd(GobEngine *vm) : _vm(vm) {
 
 Snd::~Snd() {
 	// stop permanent streams manually:
-	
+
 	// First the speaker stream
 	_vm->_mixer->stopHandle(_speakerHandle);
 
@@ -365,7 +365,7 @@ void Snd::playSample(SoundDesc &sndDesc, int16 repCount, int16 frequency,
 	Common::StackLock slock(_mutex);
 
 	if (!_end)
-		return; 
+		return;
 
 	setSample(sndDesc, repCount, frequency, fadeLength);
 }
@@ -400,7 +400,7 @@ int Snd::readBuffer(int16 *buffer, const int numSamples) {
 		int32 val = (_last + (((_cur - _last) * _offsetFrac +
 					FRAC_HALF) >> FRAC_BITS)) << 8;
 		*buffer++ = (val * _fadeVol) >> 16;
-		
+
 		_offsetFrac += _offsetInc;
 
 		// Was there an integral change?
diff --git a/engines/gob/util.cpp b/engines/gob/util.cpp
index 40acf21f9e..6e9021c5c5 100644
--- a/engines/gob/util.cpp
+++ b/engines/gob/util.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/events.h"
 
 #include "gob/gob.h"
diff --git a/engines/gob/video.cpp b/engines/gob/video.cpp
index ffedd6d1f6..bba272f411 100644
--- a/engines/gob/video.cpp
+++ b/engines/gob/video.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 #include "graphics/cursorman.h"
 
@@ -145,7 +145,7 @@ SurfaceDesc *Video::initSurfDesc(int16 vidMode, int16 width, int16 height,
 		_vm->_global->_mouseMaxCol = width;
 		_vm->_global->_primaryHeight = height;
 		_vm->_global->_mouseMaxRow = height;
-		
+
 		descPtr = _vm->_global->_primarySurfDesc;
 		descPtr->resize(width, height);
 		descPtr->_vidMode = vidMode;
@@ -258,7 +258,7 @@ void Video::drawCircle(SurfaceDesc *dest, int16 x0, int16 y0,
 		}
 		x++;
 		ddFx += 2;
-		f += ddFx + 1;    
+		f += ddFx + 1;
 		putPixel(x0 + x, y0 + y, color, dest);
 		putPixel(x0 - x, y0 + y, color, dest);
 		putPixel(x0 + x, y0 - y, color, dest);
diff --git a/engines/gob/video_v1.cpp b/engines/gob/video_v1.cpp
index 15b561b584..59b411d912 100644
--- a/engines/gob/video_v1.cpp
+++ b/engines/gob/video_v1.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 
 #include "gob/gob.h"
diff --git a/engines/gob/video_v2.cpp b/engines/gob/video_v2.cpp
index bdc4767445..3e0c13f025 100644
--- a/engines/gob/video_v2.cpp
+++ b/engines/gob/video_v2.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "common/stdafx.h"
+
 #include "common/endian.h"
 
 #include "gob/gob.h"