diff --git a/stepmania/src/RageDisplay_D3D.cpp b/stepmania/src/RageDisplay_D3D.cpp
index 7f1631b625..8d8aeac2a2 100644
--- a/stepmania/src/RageDisplay_D3D.cpp
+++ b/stepmania/src/RageDisplay_D3D.cpp
@@ -9,7 +9,6 @@
 #include "RageTextureManager.h"
 #include "RageMath.h"
 #include "RageTypes.h"
-#include "StepMania.h"
 #include "RageSurface.h"
 #include "RageSurfaceUtils.h"
 #include "EnumHelper.h"
diff --git a/stepmania/src/archutils/Win32/GraphicsWindow.cpp b/stepmania/src/archutils/Win32/GraphicsWindow.cpp
index 9be8fbf83f..784a581ac9 100644
--- a/stepmania/src/archutils/Win32/GraphicsWindow.cpp
+++ b/stepmania/src/archutils/Win32/GraphicsWindow.cpp
@@ -1,6 +1,5 @@
 #include "global.h"
 #include "GraphicsWindow.h"
-#include "StepMania.h"
 #include "ProductInfo.h"
 #include "RageLog.h"
 #include "RageUtil.h"
@@ -82,18 +81,7 @@ static LRESULT CALLBACK GraphicsWindow_WndProc( HWND hWnd, UINT msg, WPARAM wPar
 			 * because that's where most other apps seem to do it. */
 			if( g_bHasFocus && !bHadFocus )
 			{
-				// Set the video mode through DISPLAY instead of ChangeDisplaySettings 
-				// so that the viewport is correctly reset.
-
-#if 1
 				ChangeDisplaySettings( &g_FullScreenDevMode, CDS_FULLSCREEN );
-#else
-				bool bNewDevice;
-				VideoModeParams p;
-				StepMania::GetPreferredVideoModeParams( p );
-				DISPLAY->SetVideoMode( p, bNewDevice );
-#endif
-
 				ShowWindow( g_hWndMain, SW_SHOWNORMAL );
 			}
 			else if( !g_bHasFocus && bHadFocus )