diff --git a/stepmania/src/Screen.cpp b/stepmania/src/Screen.cpp
index b7885d8f89..088978d644 100644
--- a/stepmania/src/Screen.cpp
+++ b/stepmania/src/Screen.cpp
@@ -249,146 +249,6 @@ void Screen::ClearMessageQueue( const ScreenMessage SM )
 			m_QueuedMessages.erase( m_QueuedMessages.begin()+i ); 
 }
 
-
-// Screen classes
-#include "ScreenCaution.h"
-#include "ScreenEdit.h"
-#include "ScreenEditMenu.h"
-#include "ScreenEvaluation.h"
-#include "ScreenEz2SelectPlayer.h"
-#include "ScreenGameOver.h"
-#include "ScreenGameplay.h"
-#include "ScreenHowToPlay.h"
-#include "ScreenMapControllers.h"
-#include "ScreenMusicScroll.h"
-#include "ScreenPlayerOptions.h"
-#include "ScreenSandbox.h"
-#include "ScreenSelectDifficulty.h"
-#include "ScreenSelectGroup.h"
-#include "ScreenSelectMusic.h"
-#include "ScreenSelectStyle.h"
-#include "ScreenSongOptions.h"
-#include "ScreenStage.h"
-#include "ScreenTest.h"
-#include "ScreenTestFonts.h"
-#include "ScreenTestSound.h"
-#include "ScreenTitleMenu.h"
-#include "ScreenNetSelectMusic.h"
-#include "ScreenNetRoom.h"
-#include "ScreenNetEvaluation.h"
-#include "ScreenPackages.h"
-#include "ScreenEz2SelectMusic.h"
-#include "ScreenRanking.h"
-#include "ScreenLogo.h"
-#include "ScreenUnlock.h"
-#include "ScreenDemonstration.h"
-#include "ScreenInstructions.h"
-#include "ScreenNameEntry.h"
-#include "ScreenNameEntryTraditional.h"
-#include "ScreenJukebox.h"
-#include "ScreenJukeboxMenu.h"
-#include "ScreenStyleSplash.h"
-#include "ScreenCredits.h"
-#include "ScreenSelectCharacter.h"
-#include "ScreenSelectMode.h"
-#include "ScreenSelectMaster.h"
-#include "ScreenEditCoursesMenu.h"
-#include "ScreenNetworkOptions.h"
-#include "ScreenProfileOptions.h"
-#include "ScreenExit.h"
-#include "ScreenAttract.h"
-#include "ScreenReloadSongs.h"
-#include "ScreenOptionsMaster.h"
-#include "ScreenCenterImage.h"
-#include "ScreenTestInput.h"
-#include "ScreenBookkeeping.h"
-#include "ScreenBranch.h"
-#include "ScreenEnding.h"
-#include "ScreenDownloadMachineStats.h"
-#include "ScreenSetTime.h"
-#include "ScreenTestLights.h"
-#include "ScreenClearMachineStats.h"
-#include "ScreenResetToDefaults.h"
-#include "ScreenClearBookkeepingData.h"
-#include "ScreenInsertCredit.h"
-
-Screen* Screen::Create( CString sClassName )
-{
-	CString sName = sClassName;
-	// Look up the class in the metrics group sName
-	if( THEME->HasMetric(sClassName,"Class") )
-		sClassName = THEME->GetMetric(sClassName,"Class");
-
-#define IF_RETURN(X)	if(sClassName.CompareNoCase(#X)==0)	return new X(sName);
-
-	IF_RETURN( ScreenAttract );
-	IF_RETURN( ScreenCaution );
-	IF_RETURN( ScreenEdit );
-	IF_RETURN( ScreenEditMenu );
-	IF_RETURN( ScreenEvaluation );
-	IF_RETURN( ScreenEz2SelectPlayer );
-	IF_RETURN( ScreenGameOver );
-	IF_RETURN( ScreenGameplay );
-	IF_RETURN( ScreenHowToPlay );
-	IF_RETURN( ScreenMapControllers );
-	IF_RETURN( ScreenMusicScroll );
-	IF_RETURN( ScreenPlayerOptions );
-	IF_RETURN( ScreenSandbox );
-	IF_RETURN( ScreenSelectDifficulty );
-	IF_RETURN( ScreenSelectGroup );
-	IF_RETURN( ScreenSelectMusic );
-	IF_RETURN( ScreenSelectStyle5th );
-	IF_RETURN( ScreenSelectStyle );
-	IF_RETURN( ScreenSelectMode );
-	IF_RETURN( ScreenSongOptions );
-	IF_RETURN( ScreenStage );
-	IF_RETURN( ScreenTest );
-	IF_RETURN( ScreenTestFonts );
-	IF_RETURN( ScreenTestSound );
-	IF_RETURN( ScreenTitleMenu );
-	IF_RETURN( ScreenEz2SelectMusic );
-	IF_RETURN( ScreenRanking );
-	IF_RETURN( ScreenLogo );
-	IF_RETURN( ScreenUnlock );
-	IF_RETURN( ScreenDemonstration );
-	IF_RETURN( ScreenInstructions );
-	IF_RETURN( ScreenNameEntry );
-	IF_RETURN( ScreenNameEntryTraditional );
-	IF_RETURN( ScreenJukebox );
-	IF_RETURN( ScreenJukeboxMenu );
-	IF_RETURN( ScreenStyleSplash );
-	IF_RETURN( ScreenCredits );
-	IF_RETURN( ScreenSelectCharacter );
-	IF_RETURN( ScreenSelectMaster );
-	IF_RETURN( ScreenEditCoursesMenu );
-	IF_RETURN( ScreenProfileOptions );
-	IF_RETURN( ScreenExit );
-	IF_RETURN( ScreenReloadSongs );
-	IF_RETURN( ScreenOptionsMaster );
-	IF_RETURN( ScreenCenterImage );
-	IF_RETURN( ScreenTestInput );
-	IF_RETURN( ScreenBookkeeping );
-	IF_RETURN( ScreenBranch );
-	IF_RETURN( ScreenEnding );
-	IF_RETURN( ScreenDownloadMachineStats );
-	IF_RETURN( ScreenSetTime );
-	IF_RETURN( ScreenTestLights );
-	IF_RETURN( ScreenClearMachineStats );
-	IF_RETURN( ScreenResetToDefaults );
-	IF_RETURN( ScreenClearBookkeepingData );
-	IF_RETURN( ScreenInsertCredit );
-
-#if !defined(WITHOUT_NETWORKING)
-	IF_RETURN( ScreenNetworkOptions );
-	IF_RETURN( ScreenNetSelectMusic );
-	IF_RETURN( ScreenNetRoom );
-	IF_RETURN( ScreenNetEvaluation );
-	IF_RETURN( ScreenPackages );
-#endif
-
-	RageException::Throw( "Invalid Screen class name '%s'", sClassName.c_str() );
-}
-
 /*
  * (c) 2001-2004 Chris Danford, Glenn Maynard
  * All rights reserved.