diff --git a/stepmania/src/DisplayResolutions.h b/stepmania/src/DisplayResolutions.h
index 8dc6403e29..bdef744370 100644
--- a/stepmania/src/DisplayResolutions.h
+++ b/stepmania/src/DisplayResolutions.h
@@ -19,11 +19,7 @@ public:
 	}
 };
 
-class DisplayResolutions
-{
-public:
-	set<DisplayResolution> s;
-};
+typedef set<DisplayResolution> DisplayResolutions;
 
 #endif
 
diff --git a/stepmania/src/RageDisplay.h b/stepmania/src/RageDisplay.h
index bb341c6042..99d6aff53f 100644
--- a/stepmania/src/RageDisplay.h
+++ b/stepmania/src/RageDisplay.h
@@ -5,7 +5,10 @@
 
 #include "RageTypes.h"
 #include "ModelTypes.h"
-class DisplayResolutions;
+#include <set>
+
+class DisplayResolution;
+typedef set<DisplayResolution> DisplayResolutions;
 
 const int REFRESH_DEFAULT = 0;
 struct RageSurface;
diff --git a/stepmania/src/RageDisplay_D3D.cpp b/stepmania/src/RageDisplay_D3D.cpp
index 9e0728b245..df0fddb3ee 100644
--- a/stepmania/src/RageDisplay_D3D.cpp
+++ b/stepmania/src/RageDisplay_D3D.cpp
@@ -310,7 +310,7 @@ void RageDisplay_D3D::GetDisplayResolutions( DisplayResolutions &out ) const
 		g_pd3d->EnumAdapterModes( D3DADAPTER_DEFAULT, i, &mode );
 
 		DisplayResolution res = { mode.Width, mode.Height };
-		out.s.insert( res );
+		out.insert( res );
 	}
 }
 
diff --git a/stepmania/src/RageDisplay_Null.cpp b/stepmania/src/RageDisplay_Null.cpp
index 8d79b710d3..0bcfdf4132 100644
--- a/stepmania/src/RageDisplay_Null.cpp
+++ b/stepmania/src/RageDisplay_Null.cpp
@@ -85,9 +85,9 @@ RString RageDisplay_Null::Init( const VideoModeParams &p, bool bAllowUnaccelerat
 
 void RageDisplay_Null::GetDisplayResolutions( DisplayResolutions &out ) const
 {
-	out.s.clear();
+	out.clear();
 	DisplayResolution res = { 640, 480 };
-	out.s.insert( res );
+	out.insert( res );
 }
 
 RageSurface* RageDisplay_Null::CreateScreenshot()
diff --git a/stepmania/src/RageDisplay_OGL.cpp b/stepmania/src/RageDisplay_OGL.cpp
index 5a3a9550b5..3832c9d163 100644
--- a/stepmania/src/RageDisplay_OGL.cpp
+++ b/stepmania/src/RageDisplay_OGL.cpp
@@ -441,7 +441,7 @@ RageDisplay_OGL::~RageDisplay_OGL()
 
 void RageDisplay_OGL::GetDisplayResolutions( DisplayResolutions &out ) const
 {
-	out.s.clear();
+	out.clear();
 	g_pWind->GetDisplayResolutions( out );
 }
 
diff --git a/stepmania/src/ScreenOptionsMasterPrefs.cpp b/stepmania/src/ScreenOptionsMasterPrefs.cpp
index f73c24cd9a..4a4f8699e0 100644
--- a/stepmania/src/ScreenOptionsMasterPrefs.cpp
+++ b/stepmania/src/ScreenOptionsMasterPrefs.cpp
@@ -197,7 +197,7 @@ static void DisplayResolutionChoices( vector<RString> &out )
 	DisplayResolutions d;
 	DISPLAY->GetDisplayResolutions( d );
 	
-	FOREACHS_CONST( DisplayResolution, d.s, iter )
+	FOREACHS_CONST( DisplayResolution, d, iter )
 	{
 		RString s = ssprintf("%dx%d", iter->iWidth, iter->iHeight);
 		out.push_back( s );
@@ -460,7 +460,7 @@ static void DisplayResolutionM( int &sel, bool ToSel, const ConfOption *pConfOpt
 	DisplayResolutions d;
 	DISPLAY->GetDisplayResolutions( d );
 	
-	FOREACHS_CONST( DisplayResolution, d.s, iter )
+	FOREACHS_CONST( DisplayResolution, d, iter )
 	{
 		v.push_back( res_t(iter->iWidth, iter->iHeight) );
 	}
diff --git a/stepmania/src/arch/LowLevelWindow/LowLevelWindow.h b/stepmania/src/arch/LowLevelWindow/LowLevelWindow.h
index 2f44b14a98..b8715fb365 100644
--- a/stepmania/src/arch/LowLevelWindow/LowLevelWindow.h
+++ b/stepmania/src/arch/LowLevelWindow/LowLevelWindow.h
@@ -3,7 +3,10 @@
 
 /* This handles low-level operations that OGL 1.x doesn't give us. */
 
-class DisplayResolutions;
+#include <set>
+
+class DisplayResolution;
+typedef set<DisplayResolution> DisplayResolutions;
 class VideoModeParams;
 
 class LowLevelWindow
diff --git a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_Cocoa.mm b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_Cocoa.mm
index ea405dbeb8..03eba70dd6 100644
--- a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_Cocoa.mm
+++ b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_Cocoa.mm
@@ -427,7 +427,7 @@ void LowLevelWindow_Cocoa::GetDisplayResolutions( DisplayResolutions &dr ) const
 		if( safe && !GetBoolValue( safe ) )
 			continue;
 		DisplayResolution res = { width, height };
-		dr.s.insert( res );
+		dr.insert( res );
 	}
 	// Do not release modes! We don't own it here.
 }
diff --git a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_SDL.cpp b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_SDL.cpp
index 32d538ced0..21ae72b08d 100644
--- a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_SDL.cpp
+++ b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_SDL.cpp
@@ -218,7 +218,7 @@ void LowLevelWindow_SDL::GetDisplayResolutions( DisplayResolutions &out ) const
 	for(int i=0; modes[i]; ++i )
 	{
 		DisplayResolution res = { modes[i]->w, modes[i]->h };
-		out.s.insert( res );
+		out.insert( res );
 	}
 }
 
diff --git a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_X11.cpp b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_X11.cpp
index b884f257bf..4c457e51cc 100644
--- a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_X11.cpp
+++ b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_X11.cpp
@@ -300,7 +300,7 @@ void LowLevelWindow_X11::GetDisplayResolutions( DisplayResolutions &out ) const
 	for( int i = 0; i < iSizesXct; ++i )
 	{
 		DisplayResolution res = { pSizesX[i].width, pSizesX[i].height };
-		out.s.insert( res );
+		out.insert( res );
 	}
 }
 
diff --git a/stepmania/src/archutils/Win32/GraphicsWindow.cpp b/stepmania/src/archutils/Win32/GraphicsWindow.cpp
index 9ea1f893a6..9be8fbf83f 100644
--- a/stepmania/src/archutils/Win32/GraphicsWindow.cpp
+++ b/stepmania/src/archutils/Win32/GraphicsWindow.cpp
@@ -511,7 +511,7 @@ void GraphicsWindow::GetDisplayResolutions( DisplayResolutions &out )
 		if(ChangeDisplaySettings(&dm, CDS_TEST)==DISP_CHANGE_SUCCESSFUL)
 		{
 			DisplayResolution res = { dm.dmPelsWidth, dm.dmPelsHeight };
-			out.s.insert( res );
+			out.insert( res );
 		}
 	}
 }