diff --git a/src/common/FrameBufferGL.hxx b/src/common/FrameBufferGL.hxx
index 377c5a136..2200c2245 100644
--- a/src/common/FrameBufferGL.hxx
+++ b/src/common/FrameBufferGL.hxx
@@ -116,7 +116,7 @@ class FrameBufferGL : public FrameBuffer
     /**
       This method is called to query the type of the FrameBuffer.
     */
-    BufferType type() const { return kGLBuffer; }
+    BufferType type() const { return kDoubleBuffer; }
 
     /**
       This method is called to get the specified scanline data.
diff --git a/src/emucore/FrameBuffer.cxx b/src/emucore/FrameBuffer.cxx
index 0940d4121..9a1d42564 100644
--- a/src/emucore/FrameBuffer.cxx
+++ b/src/emucore/FrameBuffer.cxx
@@ -255,7 +255,7 @@ void FrameBuffer::update()
     {
       // When onscreen messages are enabled in double-buffer mode,
       // a full redraw is required
-      myOSystem->menu().draw(myMsg.enabled && type() == kGLBuffer);
+      myOSystem->menu().draw(myMsg.enabled && type() == kDoubleBuffer);
       break;  // S_MENU
     }
 
@@ -263,7 +263,7 @@ void FrameBuffer::update()
     {
       // When onscreen messages are enabled in double-buffer mode,
       // a full redraw is required
-      myOSystem->commandMenu().draw(myMsg.enabled && type() == kGLBuffer);
+      myOSystem->commandMenu().draw(myMsg.enabled && type() == kDoubleBuffer);
       break;  // S_CMDMENU
     }
 
@@ -271,7 +271,7 @@ void FrameBuffer::update()
     {
       // When onscreen messages are enabled in double-buffer mode,
       // a full redraw is required
-      myOSystem->launcher().draw(myMsg.enabled && type() == kGLBuffer);
+      myOSystem->launcher().draw(myMsg.enabled && type() == kDoubleBuffer);
       break;  // S_LAUNCHER
     }
 
@@ -280,7 +280,7 @@ void FrameBuffer::update()
     {
       // When onscreen messages are enabled in double-buffer mode,
       // a full redraw is required
-      myOSystem->debugger().draw(myMsg.enabled && type() == kGLBuffer);
+      myOSystem->debugger().draw(myMsg.enabled && type() == kDoubleBuffer);
       break;  // S_DEBUGGER
     }
 #endif
@@ -448,7 +448,7 @@ void FrameBuffer::refresh()
   // This method is in essence a FULL refresh, putting all rendering
   // buffers in a known, fully redrawn state
 
-  bool doubleBuffered = (type() == kGLBuffer);
+  bool doubleBuffered = (type() == kDoubleBuffer);
   switch(myOSystem->eventHandler().state())
   {
     case EventHandler::S_EMULATE:
diff --git a/src/emucore/FrameBuffer.hxx b/src/emucore/FrameBuffer.hxx
index 2fae3c6af..7de2124d6 100644
--- a/src/emucore/FrameBuffer.hxx
+++ b/src/emucore/FrameBuffer.hxx
@@ -41,7 +41,7 @@ namespace GUI {
 // Different types of framebuffer derived objects
 enum BufferType {
   kSoftBuffer,
-  kGLBuffer
+  kDoubleBuffer
 };
 
 // Return values for initialization of framebuffer window
diff --git a/src/emucore/MT24LC256.cxx b/src/emucore/MT24LC256.cxx
index 42f891271..9d8a81f1c 100644
--- a/src/emucore/MT24LC256.cxx
+++ b/src/emucore/MT24LC256.cxx
@@ -134,7 +134,7 @@ void MT24LC256::update()
   (jpee_mdat && jpee_sdat && jpee_mclk && (jpee_data_start(),1), jpee_mdat = 0))
 
   // These pins have to be updated at the same time
-  // However, there's no guarantee that the writeSDA() and writeSDL()
+  // However, there's no guarantee that the writeSDA() and writeSCL()
   // methods will be called at the same time or in the correct order, so
   // we only do the write when they have the same 'timestamp'
   if(myCyclesWhenSDASet == myCyclesWhenSCLSet)
diff --git a/src/emucore/MediaFactory.cxx b/src/emucore/MediaFactory.cxx
index 5ac2569a2..441193a7e 100644
--- a/src/emucore/MediaFactory.cxx
+++ b/src/emucore/MediaFactory.cxx
@@ -27,26 +27,16 @@
 #include "Settings.hxx"
 
 #include "FrameBuffer.hxx"
+#include "FrameBufferSoft.hxx"
 #ifdef DISPLAY_OPENGL
   #include "FrameBufferGL.hxx"
 #endif
 
-#if defined(GP2X)
-  #include "FrameBufferGP2X.hxx"
-#elif defined (_WIN32_WCE)
-  #include "FrameBufferWinCE.hxx"
-#else
-  #include "FrameBufferSoft.hxx"
-#endif
-
 #include "Sound.hxx"
-#include "SoundNull.hxx"
 #ifdef SOUND_SUPPORT
-  #ifndef _WIN32_WCE
-    #include "SoundSDL.hxx"
-  #else
-    #include "SoundWinCE.hxx"
-  #endif
+  #include "SoundSDL.hxx"
+#else
+  #include "SoundNull.hxx"
 #endif
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -67,15 +57,7 @@ FrameBuffer* MediaFactory::createVideo(OSystem* osystem)
   // If OpenGL failed, or if it wasn't requested, create the appropriate
   // software framebuffer
   if(!fb)
-  {
-   #if defined (GP2X)
-    fb = new FrameBufferGP2X(osystem);
-   #elif defined (_WIN32_WCE)
-    fb = new FrameBufferWinCE(osystem);
-   #else
     fb = new FrameBufferSoft(osystem);
-   #endif
-  }
 
   // This should never happen
   assert(fb != NULL);
@@ -89,11 +71,7 @@ Sound* MediaFactory::createAudio(OSystem* osystem)
   Sound* sound = (Sound*) NULL;
 
 #ifdef SOUND_SUPPORT
-  #if defined (_WIN32_WCE)
-    sound = new SoundWinCE(osystem);
-  #else
-    sound = new SoundSDL(osystem);
-  #endif
+  sound = new SoundSDL(osystem);
 #else
   sound = new SoundNull(osystem);
 #endif
diff --git a/src/emucore/OSystem.cxx b/src/emucore/OSystem.cxx
index 03628671b..9b445fdd7 100644
--- a/src/emucore/OSystem.cxx
+++ b/src/emucore/OSystem.cxx
@@ -446,7 +446,7 @@ FBInitStatus OSystem::createFrameBuffer()
   // Otherwise, pass the error to the parent
 fallback:
   if(fbstatus == kFailNotSupported && myFrameBuffer &&
-     myFrameBuffer->type() == kGLBuffer)
+     myFrameBuffer->type() == kDoubleBuffer)
   {
     logMessage("ERROR: OpenGL mode failed, fallback to software\n", 0);
     delete myFrameBuffer; myFrameBuffer = NULL;
diff --git a/src/gui/VideoDialog.cxx b/src/gui/VideoDialog.cxx
index a672c3b77..fecea40f1 100644
--- a/src/gui/VideoDialog.cxx
+++ b/src/gui/VideoDialog.cxx
@@ -295,7 +295,7 @@ VideoDialog::~VideoDialog()
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void VideoDialog::loadConfig()
 {
-  bool gl = (instance().frameBuffer().type() == kGLBuffer);
+  bool gl = (instance().frameBuffer().type() == kDoubleBuffer);
 
   // Renderer settings
   myRenderer->setLabel(gl ? "OpenGL" : "Software");