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

svn-id: r28966

28 files changed, 53 insertions, 84 deletions

diff --git a/gui/Actions.cpp b/gui/Actions.cpp
index 6157603ab0..809188dfef 100644
--- a/gui/Actions.cpp
+++ b/gui/Actions.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-#include "common/stdafx.h"
 #include "gui/Actions.h"
 #include "gui/message.h"
 #include "scumm/scumm.h"
diff --git a/gui/Actions.h b/gui/Actions.h
index 240f8d2295..b68a391dd2 100644
--- a/gui/Actions.h
+++ b/gui/Actions.h
@@ -26,7 +26,6 @@
 #ifndef GUI_ACTIONS_H
 #define GUI_ACTIONS_H
 
-#include "common/stdafx.h"
 #include "common/scummsys.h"
 #include "common/system.h"
 #include "gui/Key.h"
@@ -74,7 +73,7 @@ protected:
 	enum {
 		MAX_ACTIONS = 20
 	};
-	
+
 	static Actions* _instance;
 	OSystem *_mainSystem;
 	Key _key_action[MAX_ACTIONS + 1];
diff --git a/gui/EditTextWidget.cpp b/gui/EditTextWidget.cpp
index 71ca23afb2..806b2a5a16 100644
--- a/gui/EditTextWidget.cpp
+++ b/gui/EditTextWidget.cpp
@@ -22,7 +22,6 @@
  * $Id$
  */
 
-#include "common/stdafx.h"
 #include "gui/EditTextWidget.h"
 #include "gui/dialog.h"
 #include "gui/eval.h"
diff --git a/gui/Key.cpp b/gui/Key.cpp
index 92c703ef09..d3680509c0 100644
--- a/gui/Key.cpp
+++ b/gui/Key.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-#include "common/stdafx.h"
 #include "gui/Key.h"
 
 namespace GUI {
diff --git a/gui/Key.h b/gui/Key.h
index 663293886b..e64745115f 100644
--- a/gui/Key.h
+++ b/gui/Key.h
@@ -26,7 +26,6 @@
 #ifndef GUI_KEY_H
 #define GUI_KEY_H
 
-#include "common/stdafx.h"
 #include "common/scummsys.h"
 #include "common/system.h"
 
diff --git a/gui/KeysDialog.cpp b/gui/KeysDialog.cpp
index 666f03bbc9..12c97b1a59 100644
--- a/gui/KeysDialog.cpp
+++ b/gui/KeysDialog.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-#include "common/stdafx.h"
 #include "gui/KeysDialog.h"
 #include "gui/Actions.h"
 #include <SDL_keyboard.h>
@@ -102,7 +101,7 @@ void KeysDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) {
 			if (key >= Common::ASCII_F1 && key <= Common::ASCII_F9)
 				key = key - Common::ASCII_F1 + SDLK_F1;
 #endif
-			if (key != 0) 
+			if (key != 0)
 				sprintf(selection, "Associated key : %s", SDL_GetKeyName((SDLKey)key));
 			else
 				sprintf(selection, "Associated key : none");
@@ -153,7 +152,7 @@ void KeysDialog::handleKeyUp(Common::KeyState state) {
 		_actionSelected = -1;
 		_actionsList->setEnabled(true);
 		Actions::Instance()->beginMapping(false);
-	} else 
+	} else
 		Dialog::handleKeyUp(state);
 }
 
diff --git a/gui/ListWidget.cpp b/gui/ListWidget.cpp
index 1ca6846e86..52d90fd6b2 100644
--- a/gui/ListWidget.cpp
+++ b/gui/ListWidget.cpp
@@ -22,7 +22,6 @@
  * $Id$
  */
 
-#include "common/stdafx.h"
 #include "common/system.h"
 #include "common/events.h"
 #include "gui/ListWidget.h"
@@ -152,7 +151,7 @@ void ListWidget::handleMouseDown(int x, int y, int button, int clickCount) {
 }
 
 void ListWidget::handleMouseUp(int x, int y, int button, int clickCount) {
-	// If this was a double click and the mouse is still over 
+	// If this was a double click and the mouse is still over
 	// the selected item, send the double click command
 	if (clickCount == 2 && (_selectedItem == findItem(x, y)) &&
 		_selectedItem >= 0) {
@@ -168,7 +167,7 @@ void ListWidget::handleMouseWheel(int x, int y, int direction) {
 int ListWidget::findItem(int x, int y) const {
 	if (y < _topPadding) return -1;
 	int item = (y - _topPadding) / kLineHeight + _currentPos;
-	if (item >= _currentPos && item < _currentPos + _entriesPerPage && 
+	if (item >= _currentPos && item < _currentPos + _entriesPerPage &&
 		item < (int)_list.size())
 		return item;
 	else
diff --git a/gui/PopUpWidget.cpp b/gui/PopUpWidget.cpp
index 9e5f1f46cf..6df54343b6 100644
--- a/gui/PopUpWidget.cpp
+++ b/gui/PopUpWidget.cpp
@@ -22,7 +22,6 @@
  * $Id$
  */
 
-#include "common/stdafx.h"
 #include "common/system.h"
 #include "common/events.h"
 #include "gui/dialog.h"
diff --git a/gui/ScrollBarWidget.cpp b/gui/ScrollBarWidget.cpp
index 615a05d7ac..42e031e515 100644
--- a/gui/ScrollBarWidget.cpp
+++ b/gui/ScrollBarWidget.cpp
@@ -22,7 +22,6 @@
  * $Id$
  */
 
-#include "common/stdafx.h"
 #include "ScrollBarWidget.h"
 #include "gui/dialog.h"
 #include "gui/newgui.h"
diff --git a/gui/TabWidget.cpp b/gui/TabWidget.cpp
index c414f6bf3b..d539dc3805 100644
--- a/gui/TabWidget.cpp
+++ b/gui/TabWidget.cpp
@@ -22,7 +22,6 @@
  * $Id$
  */
 
-#include "common/stdafx.h"
 #include "common/util.h"
 #include "gui/TabWidget.h"
 #include "gui/dialog.h"
@@ -123,16 +122,16 @@ void TabWidget::removeTab(int tabID) {
 		releaseFocus();
 		_firstWidget = 0;
 	}
-	
+
 	// Dispose the widgets in that tab and then the tab itself
 	delete _tabs[tabID].firstWidget;
 	_tabs.remove_at(tabID);
-	
+
 	// Adjust _firstVisibleTab if necessary
 	if (_firstVisibleTab >= (int)_tabs.size()) {
 		_firstVisibleTab = MAX(0, (int)_tabs.size() - 1);
 	}
-	
+
 	// The active tab was removed, so select a new active one (if any remains)
 	if (tabID == _activeTab) {
 		_activeTab = -1;
diff --git a/gui/about.cpp b/gui/about.cpp
index 780091f35d..a6f76d7c02 100644
--- a/gui/about.cpp
+++ b/gui/about.cpp
@@ -22,7 +22,6 @@
  * $Id$
  */
 
-#include "common/stdafx.h"
 #include "engines/engine.h"
 #include "base/plugins.h"
 #include "base/version.h"
diff --git a/gui/browser.cpp b/gui/browser.cpp
index ebe4aef0c4..41d3d15bb6 100644
--- a/gui/browser.cpp
+++ b/gui/browser.cpp
@@ -22,7 +22,6 @@
  * $Id$
  */
 
-#include "common/stdafx.h"
 #include "gui/browser.h"
 #include "gui/newgui.h"
 #include "gui/ListWidget.h"
diff --git a/gui/chooser.cpp b/gui/chooser.cpp
index a189e3b07b..690a42874f 100644
--- a/gui/chooser.cpp
+++ b/gui/chooser.cpp
@@ -22,7 +22,6 @@
  * $Id$
  */
 
-#include "common/stdafx.h"
 #include "common/system.h"
 #include "gui/chooser.h"
 #include "gui/newgui.h"
diff --git a/gui/console.cpp b/gui/console.cpp
index 04a1103628..b57ccbdaa6 100644
--- a/gui/console.cpp
+++ b/gui/console.cpp
@@ -22,7 +22,6 @@
  * $Id$
  */
 
-#include "common/stdafx.h"
 #include "gui/console.h"
 #include "gui/ScrollBarWidget.h"
 #include "gui/eval.h"
@@ -143,10 +142,10 @@ void ConsoleDialog::open() {
 	// this effect: we simply move the console dialog just above (outside) the
 	// visible screen area, then shift it down in handleTickle() over a
 	// certain period of time.
-	
+
 	const int screenW = g_system->getOverlayWidth();
 	const int screenH = g_system->getOverlayHeight();
-	
+
 	// Calculate the real width/height (rounded to char/line multiples)
 	uint16 w = (uint16)(_widthPercent * screenW);
 	uint16 h = (uint16)((_heightPercent * screenH - 2) / kConsoleLineHeight);
diff --git a/gui/debugger.cpp b/gui/debugger.cpp
index 11d5d28e59..81a00d717c 100644
--- a/gui/debugger.cpp
+++ b/gui/debugger.cpp
@@ -23,8 +23,6 @@
  *
  */
 
-#include "common/stdafx.h"
-
 #include "common/system.h"
 
 #include "gui/debugger.h"
@@ -391,13 +389,13 @@ bool Debugger::Cmd_Help(int argc, const char **argv) {
 		width = 0;
 		for (i = 0; i < _dvar_count; i++) {
 			size = strlen(_dvars[i].name) + 1;
-	
+
 			if ((width + size) >= charsPerLine) {
 				DebugPrintf("\n");
 				width = size;
 			} else
 				width += size;
-	
+
 			DebugPrintf("%s ", _dvars[i].name);
 		}
 		DebugPrintf("\n");
diff --git a/gui/dialog.cpp b/gui/dialog.cpp
index f643e6f988..f6854e2b62 100644
--- a/gui/dialog.cpp
+++ b/gui/dialog.cpp
@@ -22,7 +22,6 @@
  * $Id$
  */
 
-#include "common/stdafx.h"
 #include "common/events.h"
 
 #include "gui/newgui.h"
@@ -114,7 +113,7 @@ void Dialog::reflowLayout() {
 	// changed, so any cached image may be invalid. The subsequent redraw
 	// should be treated as the very first draw.
 
-	_drawingHints |= THEME_HINT_FIRST_DRAW; 
+	_drawingHints |= THEME_HINT_FIRST_DRAW;
 	Widget *w = _firstWidget;
 	while (w) {
 		w->reflowLayout();
diff --git a/gui/editable.cpp b/gui/editable.cpp
index ef6bf44d0e..57723bcbcd 100644
--- a/gui/editable.cpp
+++ b/gui/editable.cpp
@@ -22,7 +22,6 @@
  * $Id$
  */
 
-#include "common/stdafx.h"
 #include "common/events.h"
 #include "gui/editable.h"
 #include "gui/newgui.h"
@@ -190,7 +189,7 @@ void EditableWidget::drawCaret(bool erase) {
 	y += getAbsY();
 
 	g_gui.theme()->drawCaret(Common::Rect(x, y, x + 1, y + editRect.height() - 2), erase);
-	
+
 	_caretVisible = !erase;
 }
 
diff --git a/gui/eval.cpp b/gui/eval.cpp
index 89577cc51d..d4c4f5499c 100644
--- a/gui/eval.cpp
+++ b/gui/eval.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-#include "common/stdafx.h"
 #include "common/system.h"
 #include "gui/eval.h"
 #include "gui/widget.h"
@@ -337,4 +336,4 @@ void Eval::reset() {
 	loadConstants();
 }
 
-} // end of namespace GUI 
+} // end of namespace GUI
diff --git a/gui/eval.h b/gui/eval.h
index d63caae291..245ab1230b 100644
--- a/gui/eval.h
+++ b/gui/eval.h
@@ -26,7 +26,6 @@
 #ifndef GUI_EVAL_H
 #define GUI_EVAL_H
 
-#include "common/stdafx.h"
 #include "common/str.h"
 #include "common/hashmap.h"
 #include "common/hash-str.h"
diff --git a/gui/launcher.cpp b/gui/launcher.cpp
index 2dc3fbba28..2be703a405 100644
--- a/gui/launcher.cpp
+++ b/gui/launcher.cpp
@@ -22,8 +22,6 @@
  * $Id$
  */
 
-#include "common/stdafx.h"
-
 #include "engines/engine.h"
 #include "base/game.h"
 #include "base/plugins.h"
@@ -122,7 +120,7 @@ class EditGameDialog : public OptionsDialog {
 public:
 	EditGameDialog(const String &domain, const String &desc);
 
-	virtual void reflowLayout();	
+	virtual void reflowLayout();
 
 	void open();
 	void close();
@@ -503,7 +501,7 @@ LauncherDialog::LauncherDialog()
 			new ButtonWidget(this, "launcher_start_button", "Start", kStartCmd, 'S');
 
 	// Above the lowest button rows: two more buttons (directly below the list box)
-	_addButton = 
+	_addButton =
 		new ButtonWidget(this, "launcher_addGame_button", "Add Game...", kAddGameCmd, 'A');
 	_editButton =
 		new ButtonWidget(this, "launcher_editGame_button", "Edit Game...", kEditGameCmd, 'E');
@@ -554,7 +552,7 @@ void LauncherDialog::open() {
 	// re-launch the same game again.
 	ConfMan.setActiveDomain("");
 	Dialog::open();
-	
+
 	updateButtons();
 }
 
@@ -624,7 +622,7 @@ void LauncherDialog::updateListing() {
 void LauncherDialog::addGame() {
 	int modifiers = g_system->getEventManager()->getModifierState();
 	bool massAdd = (modifiers & Common::KBD_SHIFT) != 0;
-	
+
 	if (massAdd) {
 		MessageDialog alert("Do you really want to run the mass game detector? "
 							"This could potentially add a huge number of games.", "Yes", "No");
@@ -694,10 +692,10 @@ void LauncherDialog::addGame() {
 			EditGameDialog editDialog(domain, result.description());
 			if (editDialog.runModal() > 0) {
 				// User pressed OK, so make changes permanent
-		
+
 				// Write config to disk
 				ConfMan.flushToDisk();
-		
+
 				// Update the ListWidget, select the new item, and force a redraw
 				updateListing();
 				selectGame(domain);
@@ -747,13 +745,13 @@ Common::String addGameToConf(const GameDescriptor &result) {
 	// TODO: Setting the description field here has the drawback
 	// that the user does never notice when we upgrade our descriptions.
 	// It might be nice ot leave this field empty, and only set it to
-	// a value when the user edits the description string. 
+	// a value when the user edits the description string.
 	// However, at this point, that's impractical. Once we have a method
 	// to query all backends for the proper & full description of a given
 	// game target, we can change this (currently, you can only query
 	// for the generic gameid description; it's not possible to obtain
 	// a description which contains extended information like language, etc.).
-	
+
 	return domain;
 }
 
diff --git a/gui/massadd.cpp b/gui/massadd.cpp
index 987a92efb5..686fbc3f01 100644
--- a/gui/massadd.cpp
+++ b/gui/massadd.cpp
@@ -22,8 +22,6 @@
  * $Id$
  */
 
-#include "common/stdafx.h"
-
 #include "engines/engine.h"
 #include "base/game.h"
 #include "base/plugins.h"
@@ -126,28 +124,28 @@ void MassAddDialog::handleTickle() {
 	// Perform a breadth-first scan of the filesystem.
 	while (!_scanStack.empty() && (g_system->getMillis() - t) < kMaxScanTime) {
 		FilesystemNode dir = _scanStack.pop();
-	
+
 		FSList files;
 		if (!dir.getChildren(files, FilesystemNode::kListAll)) {
 			error("browser returned a node that is not a directory: '%s'",
 					dir.getPath().c_str());
 		}
-	
+
 		// Run the detector on the dir
 		GameList candidates(PluginManager::instance().detectGames(files));
-		
+
 		if (candidates.size() >= 1) {
 			// At least one match was found. For now we just take the first one...
 			// a more sophisticated solution would do something more clever here,
-			// e.g. ask the user which one to pick (make sure to display the 
+			// e.g. ask the user which one to pick (make sure to display the
 			// path, too).
 			GameDescriptor result = candidates[0];
 			result["path"] = dir.getPath();
-			
+
 			_games.push_back(result);
 		}
-		
-		
+
+
 		// Recurse into all subdirs
 		for (FSList::const_iterator file = files.begin(); file != files.end(); ++file) {
 			if (file->isDirectory()) {
@@ -157,8 +155,8 @@ void MassAddDialog::handleTickle() {
 
 		_dirsScanned++;
 	}
-	
-	
+
+
 	// Update the dialog
 	char buf[256];
 
@@ -168,14 +166,14 @@ void MassAddDialog::handleTickle() {
 
 		snprintf(buf, sizeof(buf), "Scan complete!");
 		_dirProgressText->setLabel(buf);
-	
+
 		snprintf(buf, sizeof(buf), "Discovered %d games.", _games.size());
 		_gameProgressText->setLabel(buf);
 
 	} else {
 		snprintf(buf, sizeof(buf), "Scanned %d directories ...", _dirsScanned);
 		_dirProgressText->setLabel(buf);
-	
+
 		snprintf(buf, sizeof(buf), "Discovered %d games ...", _games.size());
 		_gameProgressText->setLabel(buf);
 	}
diff --git a/gui/message.cpp b/gui/message.cpp
index 7843225a1f..b4e0f8407b 100644
--- a/gui/message.cpp
+++ b/gui/message.cpp
@@ -22,7 +22,6 @@
  * $Id$
  */
 
-#include "common/stdafx.h"
 #include "common/events.h"
 #include "common/str.h"
 #include "common/system.h"
diff --git a/gui/newgui.cpp b/gui/newgui.cpp
index 51d67b8769..4c9cb5960d 100644
--- a/gui/newgui.cpp
+++ b/gui/newgui.cpp
@@ -22,7 +22,6 @@
  * $Id$
  */
 
-#include "common/stdafx.h"
 #include "common/events.h"
 #include "common/system.h"
 #include "common/util.h"
@@ -64,7 +63,7 @@ void GuiObject::reflowLayout() {
 			error("Undefined variable %s.y", _name.c_str());
 		_w = g_gui.evaluator()->getVar(_name + ".w");
 		_h = g_gui.evaluator()->getVar(_name + ".h");
-	
+
 		if (_x < 0)
 			error("Widget <%s> has x < 0", _name.c_str());
 		if (_x >= g_system->getOverlayWidth())
@@ -109,7 +108,7 @@ NewGui::NewGui() : _needRedraw(false),
 	   warning("falling back to classic style");
 	}
 #endif
-	
+
 	if (loadClassicTheme) {
 		_theme = new ThemeClassic(_system);
 		assert(_theme);
@@ -142,7 +141,7 @@ bool NewGui::loadNewTheme(const Common::String &style) {
 	if (style.compareToIgnoreCase("classic (builtin)") == 0 ||
 		style.compareToIgnoreCase("classic") == 0) {
 		_theme = new ThemeClassic(_system, style);
-	} else {	
+	} else {
 		if (Theme::themeConfigUseable(style, "", &styleType, &cfg)) {
 			if (0 == styleType.compareToIgnoreCase("classic"))
 				_theme = new ThemeClassic(_system, style, &cfg);
@@ -228,7 +227,7 @@ void NewGui::runLoop() {
 		if (_useStdCursor)
 			setupCursor();
 	}
-	
+
 	Common::EventManager *eventMan = _system->getEventManager();
 
 	while (!_dialogStack.empty() && activeDialog == getTopDialog()) {
@@ -269,7 +268,7 @@ void NewGui::runLoop() {
 				_themeChange = false;
 				redraw();
 			}
-			
+
 			switch (event.type) {
 			case Common::EVENT_KEYDOWN:
 				activeDialog->handleKeyDown(event.kbd);
diff --git a/gui/object.cpp b/gui/object.cpp
index 28caf6c380..8b22338801 100644
--- a/gui/object.cpp
+++ b/gui/object.cpp
@@ -22,7 +22,6 @@
  * $Id$
  */
 
-#include "common/stdafx.h"
 #include "common/system.h"
 #include "gui/object.h"
 #include "gui/widget.h"
diff --git a/gui/options.cpp b/gui/options.cpp
index 1504e121d7..7972ceebb2 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -22,7 +22,6 @@
  * $Id$
  */
 
-#include "common/stdafx.h"
 #include "gui/browser.h"
 #include "gui/themebrowser.h"
 #include "gui/chooser.h"
@@ -368,7 +367,7 @@ void OptionsDialog::close() {
 					break;
 				}
 
-				ConfMan.setBool("subtitles", subtitles, _domain); 
+				ConfMan.setBool("subtitles", subtitles, _domain);
 				ConfMan.setBool("speech_mute", speech_mute, _domain);
 
 				// Engines that reuse the subtitle speed widget set their own max value.
@@ -415,7 +414,7 @@ void OptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data
 		if (_subMode < 2)
 			_subMode++;
 		else
-			_subMode = 0;	
+			_subMode = 0;
 
 		_subToggleButton->setLabel(_subModeDesc[_subMode]);
 		_subToggleButton->draw();
@@ -635,7 +634,7 @@ int OptionsDialog::getSubtitleMode(bool subtitles, bool speech_mute) {
 		return 1;
 	else if (subtitles && speech_mute) // Subtitles only
 		return 2;
-	else 
+	else
 		warning("Wrong configuration: Both subtitles and speech are off. Assuming subtitles only");
 	return 2;
 }
@@ -820,7 +819,7 @@ void GlobalOptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint3
 				MessageDialog error("The chosen directory cannot be written to. Please select another one.");
 				error.runModal();
 				return;
-			}	
+			}
 			draw();
 		}
 		break;
diff --git a/gui/theme.h b/gui/theme.h
index b3286d3d48..8fd560603c 100644
--- a/gui/theme.h
+++ b/gui/theme.h
@@ -25,7 +25,6 @@
 #ifndef GUI_THEME_H
 #define GUI_THEME_H
 
-#include "common/stdafx.h"
 #include "common/system.h"
 #include "common/rect.h"
 #include "common/str.h"
@@ -51,16 +50,16 @@ enum {
 	// It may therefore be a good idea to save the background so that it
 	// can be redrawn quickly.
 	THEME_HINT_SAVE_BACKGROUND = 1 << 1,
-	
+
 	// Indicates that this is the launcher dialog (maybe delete this in the future)
 	THEME_HINT_MAIN_DIALOG = 1 << 2,
-	
+
 	// Indicates special colorfade
 	THEME_HINT_SPECIAL_COLOR = 1 << 3,
-	
+
 	// Indicates no colorfade
 	THEME_HINT_PLAIN_COLOR = 1 << 4,
-	
+
 	// Indictaes that a shadows should be drawn around the background
 	THEME_HINT_USE_SHADOW = 1 << 5,
 
@@ -75,7 +74,7 @@ enum {
 class Theme {
 public:
 	Theme();
-		
+
 	virtual ~Theme();
 
 	enum TextAlign {
@@ -138,11 +137,11 @@ public:
 
 	virtual void clearAll() = 0;
 	virtual void drawAll() = 0;
-	
+
 	virtual void setDrawArea(const Common::Rect &r) { _drawArea = r; }
 	// resets the draw area to the screen size
 	virtual void resetDrawArea() = 0;
-	
+
 	virtual const Common::ConfigFile &getConfigFile() { return _configFile; }
 
 	virtual const Graphics::Font *getFont(FontStyle font = kFontStyleBold) const = 0;
@@ -187,7 +186,7 @@ public:
 		};
 		return Graphics::kTextAlignCenter;
 	}
-	
+
 	TextAlign convertAligment(Graphics::TextAlignment align) const {
 		switch (align) {
 		case Graphics::kTextAlignLeft:
diff --git a/gui/themebrowser.cpp b/gui/themebrowser.cpp
index 75fe5404c4..cc2a96d733 100644
--- a/gui/themebrowser.cpp
+++ b/gui/themebrowser.cpp
@@ -22,7 +22,6 @@
  * $Id$
  */
 
-#include "common/stdafx.h"
 #include "gui/themebrowser.h"
 #include "gui/ListWidget.h"
 #include "gui/widget.h"
@@ -89,7 +88,7 @@ void ThemeBrowser::handleCommand(CommandSender *sender, uint32 cmd, uint32 data)
 
 void ThemeBrowser::updateListing() {
 	_themes.clear();
-	
+
 	// classic is always build in
 	Entry th;
 	th.name = "Classic (Builtin)";
@@ -164,7 +163,7 @@ void ThemeBrowser::addDir(ThList &list, const Common::String &dir, int level) {
 						break;
 					}
 				}
-				
+
 				if (add)
 					list.push_back(th);
 			}
diff --git a/gui/widget.cpp b/gui/widget.cpp
index bb4b0b87ed..ebac5d6baf 100644
--- a/gui/widget.cpp
+++ b/gui/widget.cpp
@@ -22,7 +22,6 @@
  * $Id$
  */
 
-#include "common/stdafx.h"
 #include "common/util.h"
 #include "graphics/fontman.h"
 #include "gui/widget.h"