diff --git a/stella/src/debugger/Debugger.cxx b/stella/src/debugger/Debugger.cxx
index b0ada59ff..ad7da756e 100644
--- a/stella/src/debugger/Debugger.cxx
+++ b/stella/src/debugger/Debugger.cxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: Debugger.cxx,v 1.109 2007-01-01 18:04:41 stephena Exp $
+// $Id: Debugger.cxx,v 1.110 2007-06-20 20:36:28 stephena Exp $
 //============================================================================
 
 #include "bspf.hxx"
@@ -156,7 +156,7 @@ void Debugger::initializeVideo()
   GUI::Rect r = getDialogBounds();
 
   string title = string("Stella ") + STELLA_VERSION + ": Debugger mode";
-  myOSystem->frameBuffer().initialize(title, r.width(), r.height(), false);
+  myOSystem->frameBuffer().initialize(title, r.width(), r.height());
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/stella/src/emucore/Settings.cxx b/stella/src/emucore/Settings.cxx
index 1a5476606..8e51bb5c1 100644
--- a/stella/src/emucore/Settings.cxx
+++ b/stella/src/emucore/Settings.cxx
@@ -13,12 +13,13 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: Settings.cxx,v 1.117 2007-06-20 16:33:22 stephena Exp $
+// $Id: Settings.cxx,v 1.118 2007-06-20 20:36:28 stephena Exp $
 //============================================================================
 
 #include <cassert>
 #include <sstream>
 #include <fstream>
+#include <algorithm>
 
 #include "OSystem.hxx"
 #include "Version.hxx"
diff --git a/stella/src/win32/OSystemWin32.cxx b/stella/src/win32/OSystemWin32.cxx
index aed8e2a17..1f8413779 100644
--- a/stella/src/win32/OSystemWin32.cxx
+++ b/stella/src/win32/OSystemWin32.cxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: OSystemWin32.cxx,v 1.17 2007-01-01 18:04:56 stephena Exp $
+// $Id: OSystemWin32.cxx,v 1.18 2007-06-20 20:36:28 stephena Exp $
 //============================================================================
 
 #include <sstream>
@@ -67,10 +67,3 @@ uInt32 OSystemWin32::getTicks()
 {
   return (uInt32) SDL_GetTicks() * 1000;
 }
-
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-void OSystemWin32::getScreenDimensions(int& width, int& height)
-{
-  width  = (int) GetSystemMetrics(SM_CXSCREEN);
-  height = (int) GetSystemMetrics(SM_CYSCREEN);
-}
diff --git a/stella/src/win32/OSystemWin32.hxx b/stella/src/win32/OSystemWin32.hxx
index 426f96009..de826730b 100644
--- a/stella/src/win32/OSystemWin32.hxx
+++ b/stella/src/win32/OSystemWin32.hxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: OSystemWin32.hxx,v 1.9 2007-01-01 18:04:56 stephena Exp $
+// $Id: OSystemWin32.hxx,v 1.10 2007-06-20 20:36:28 stephena Exp $
 //============================================================================
 
 #ifndef OSYSTEM_WIN32_HXX
@@ -25,7 +25,7 @@
   This class defines Windows system specific settings.
 
   @author  Stephen Anthony
-  @version $Id: OSystemWin32.hxx,v 1.9 2007-01-01 18:04:56 stephena Exp $
+  @version $Id: OSystemWin32.hxx,v 1.10 2007-06-20 20:36:28 stephena Exp $
 */
 class OSystemWin32 : public OSystem
 {
@@ -47,11 +47,6 @@ class OSystemWin32 : public OSystem
       @return Current time in microseconds.
     */
     virtual uInt32 getTicks();
-
-    /**
-      This method queries the dimensions of the screen for this hardware.
-    */
-    virtual void getScreenDimensions(int& width, int& height);
 };
 
 #endif
diff --git a/stella/src/win32/Stella.vcproj b/stella/src/win32/Stella.vcproj
index f5586de33..310dcfb2f 100755
--- a/stella/src/win32/Stella.vcproj
+++ b/stella/src/win32/Stella.vcproj
@@ -21,7 +21,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\yacc;..\debugger;..\gui;..\emucore\m6502\src\bspf\src;..\emucore\m6502\src;..\emucore;..\common;..\win32;..\debugger\gui;..\cheat"
-				PreprocessorDefinitions="BSPF_WIN32;WIN32;_DEBUG;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;DISPLAY_OPENGL;SOUND_SUPPORT;CHEATCODE_SUPPORT"
+				PreprocessorDefinitions="BSPF_WIN32;WIN32;_DEBUG;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;DISPLAY_OPENGL;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="2"
@@ -73,7 +73,7 @@ SDLmain.lib
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="..\yacc;..\emucore\m6502\src\bspf\src;..\emucore\m6502\src;..\emucore;..\common;..\gui;..\debugger\gui;..\debugger;..\win32;..\cheat"
-				PreprocessorDefinitions="BSPF_WIN32;WIN32;NDEBUG;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;DISPLAY_OPENGL;SOUND_SUPPORT;CHEATCODE_SUPPORT"
+				PreprocessorDefinitions="BSPF_WIN32;WIN32;NDEBUG;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;DISPLAY_OPENGL;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="2"