diff --git a/stella/src/common/FrameBufferSoft.cxx b/stella/src/common/FrameBufferSoft.cxx
index dd47cefb9..681d50410 100644
--- a/stella/src/common/FrameBufferSoft.cxx
+++ b/stella/src/common/FrameBufferSoft.cxx
@@ -13,11 +13,10 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: FrameBufferSoft.cxx,v 1.45 2006-01-20 20:07:25 stephena Exp $
+// $Id: FrameBufferSoft.cxx,v 1.46 2006-02-05 19:59:22 stephena Exp $
 //============================================================================
 
 #include <SDL.h>
-#include <SDL_syswm.h>
 #include <sstream>
 
 #include "Console.hxx"
diff --git a/stella/src/common/FrameBufferSoft.hxx b/stella/src/common/FrameBufferSoft.hxx
index f5036a2dc..b7679e3a5 100644
--- a/stella/src/common/FrameBufferSoft.hxx
+++ b/stella/src/common/FrameBufferSoft.hxx
@@ -13,14 +13,13 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: FrameBufferSoft.hxx,v 1.31 2006-01-19 00:45:12 stephena Exp $
+// $Id: FrameBufferSoft.hxx,v 1.32 2006-02-05 19:59:22 stephena Exp $
 //============================================================================
 
 #ifndef FRAMEBUFFER_SOFT_HXX
 #define FRAMEBUFFER_SOFT_HXX
 
 #include <SDL.h>
-#include <SDL_syswm.h>
 
 class OSystem;
 class GUI::Font;
@@ -35,7 +34,7 @@ class RectList;
   This class implements an SDL software framebuffer.
 
   @author  Stephen Anthony
-  @version $Id: FrameBufferSoft.hxx,v 1.31 2006-01-19 00:45:12 stephena Exp $
+  @version $Id: FrameBufferSoft.hxx,v 1.32 2006-02-05 19:59:22 stephena Exp $
 */
 class FrameBufferSoft : public FrameBuffer
 {
diff --git a/stella/src/emucore/MediaFactory.cxx b/stella/src/emucore/MediaFactory.cxx
index 58de556d4..63d8df5c4 100644
--- a/stella/src/emucore/MediaFactory.cxx
+++ b/stella/src/emucore/MediaFactory.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: MediaFactory.cxx,v 1.3 2006-01-19 00:45:12 stephena Exp $
+// $Id: MediaFactory.cxx,v 1.4 2006-02-05 19:59:22 stephena Exp $
 //============================================================================
 
 ////////////////////////////////////////////////////////////////////
@@ -50,11 +50,10 @@
 FrameBuffer* MediaFactory::createVideo(OSystem* osystem)
 {
   FrameBuffer* fb = (FrameBuffer*) NULL;
-  const string& type = osystem->settings().getString("video");
 
   // OpenGL mode *may* fail, so we check for it first
 #ifdef DISPLAY_OPENGL
-  if(type == "gl")
+  if(osystem->settings().getString("video") == "gl")
   {
     const string& gl_lib = osystem->settings().getString("gl_lib");
     if(FrameBufferGL::loadFuncs(gl_lib))