diff --git a/stepmania/src/RageDisplay_D3D.h b/stepmania/src/RageDisplay_D3D.h
new file mode 100644
index 0000000000..39cda0336b
--- /dev/null
+++ b/stepmania/src/RageDisplay_D3D.h
@@ -0,0 +1,74 @@
+#ifndef RAGEDISPLAY_D3D_H
+#define RAGEDISPLAY_D3D_H
+
+class RageDisplay_D3D: public RageDisplay
+{
+public:
+	RageDisplay_D3D( bool windowed, int width, int height, int bpp, int rate, bool vsync, CString sWindowTitle, CString sIconFile );
+	~RageDisplay_D3D();
+	void Update(float fDeltaTime);
+
+	bool IsSoftwareRenderer();
+	bool SetVideoMode( bool windowed, int width, int height, int bpp, int rate, bool vsync, CString sWindowTitle, CString sIconFile );
+	void ResolutionChanged();
+	const PixelFormatDesc *GetPixelFormatDesc(PixelFormat pf) const;
+
+	void BeginFrame();	
+	void EndFrame();
+	bool IsWindowed() const;
+	int GetWidth() const;
+	int GetHeight() const;
+	int GetBPP() const;
+	void SetBlendMode( BlendMode mode );
+	bool SupportsTextureFormat( PixelFormat pixfmt );
+	unsigned CreateTexture( PixelFormat pixfmt, SDL_Surface*& img );
+	void UpdateTexture( 
+		unsigned uTexHandle, 
+		PixelFormat pixfmt,	// this must be the same as what was passed to CreateTexture
+		SDL_Surface*& img,
+		int xoffset, int yoffset, int width, int height 
+		);
+	void DeleteTexture( unsigned uTexHandle );
+	void SetTexture( RageTexture* pTexture );
+	void SetTextureModeModulate();
+	void SetTextureModeGlow( GlowMode m=GLOW_WHITEN );
+	void SetTextureWrapping( bool b );
+	int GetMaxTextureSize() const;
+	void SetTextureFiltering( bool b);
+	bool IsZBufferEnabled() const;
+	void SetZBuffer( bool b );
+	void ClearZBuffer();
+	void SetBackfaceCull( bool b );
+	void SetAlphaTest( bool b );
+	void SetMaterial( 
+		float emissive[4],
+		float ambient[4],
+		float diffuse[4],
+		float specular[4],
+		float shininess
+		);
+	void SetLighting( bool b );
+	void SetLightOff( int index );
+	void SetLightDirectional( 
+		int index, 
+		RageColor ambient, 
+		RageColor diffuse, 
+		RageColor specular, 
+		RageVector3 dir );
+
+	void DrawQuads( const RageVertex v[], int iNumVerts );
+	void DrawFan( const RageVertex v[], int iNumVerts );
+	void DrawStrip( const RageVertex v[], int iNumVerts );
+	void DrawTriangles( const RageVertex v[], int iNumVerts );
+	void DrawIndexedTriangles( const RageVertex v[], const Uint16* pIndices, int iNumIndices );
+	void DrawLineStrip( const RageVertex v[], int iNumVerts, float LineWidth );
+
+	void SaveScreenshot( CString sPath );
+protected:
+	void SetViewport(int shift_left, int shift_down);
+	RageMatrix GetOrthoMatrix( float l, float r, float b, float t, float zn, float zf ); 
+
+};
+
+#endif
+
diff --git a/stepmania/src/RageDisplay_OGL.h b/stepmania/src/RageDisplay_OGL.h
new file mode 100644
index 0000000000..9cbe4f1ed1
--- /dev/null
+++ b/stepmania/src/RageDisplay_OGL.h
@@ -0,0 +1,73 @@
+#ifndef RAGEDISPLAY_OGL_H
+#define RAGEDISPLAY_OGL_H
+
+class RageDisplay_OGL: public RageDisplay
+{
+public:
+	RageDisplay_OGL( bool windowed, int width, int height, int bpp, int rate, bool vsync, CString sWindowTitle, CString sIconFile );
+	~RageDisplay_OGL();
+	void Update(float fDeltaTime);
+
+	bool IsSoftwareRenderer();
+	bool SetVideoMode( bool windowed, int width, int height, int bpp, int rate, bool vsync, CString sWindowTitle, CString sIconFile );
+	void ResolutionChanged();
+	const PixelFormatDesc *GetPixelFormatDesc(PixelFormat pf) const;
+
+	void BeginFrame();	
+	void EndFrame();
+	bool IsWindowed() const;
+	int GetWidth() const;
+	int GetHeight() const;
+	int GetBPP() const;
+	void SetBlendMode( BlendMode mode );
+	bool SupportsTextureFormat( PixelFormat pixfmt );
+	unsigned CreateTexture( PixelFormat pixfmt, SDL_Surface*& img );
+	void UpdateTexture( 
+		unsigned uTexHandle, 
+		PixelFormat pixfmt,	// this must be the same as what was passed to CreateTexture
+		SDL_Surface*& img,
+		int xoffset, int yoffset, int width, int height 
+		);
+	void DeleteTexture( unsigned uTexHandle );
+	void SetTexture( RageTexture* pTexture );
+	void SetTextureModeModulate();
+	void SetTextureModeGlow( GlowMode m=GLOW_WHITEN );
+	void SetTextureWrapping( bool b );
+	int GetMaxTextureSize() const;
+	void SetTextureFiltering( bool b);
+	bool IsZBufferEnabled() const;
+	void SetZBuffer( bool b );
+	void ClearZBuffer();
+	void SetBackfaceCull( bool b );
+	void SetAlphaTest( bool b );
+	void SetMaterial( 
+		float emissive[4],
+		float ambient[4],
+		float diffuse[4],
+		float specular[4],
+		float shininess
+		);
+	void SetLighting( bool b );
+	void SetLightOff( int index );
+	void SetLightDirectional( 
+		int index, 
+		RageColor ambient, 
+		RageColor diffuse, 
+		RageColor specular, 
+		RageVector3 dir );
+
+	void DrawQuads( const RageVertex v[], int iNumVerts );
+	void DrawFan( const RageVertex v[], int iNumVerts );
+	void DrawStrip( const RageVertex v[], int iNumVerts );
+	void DrawTriangles( const RageVertex v[], int iNumVerts );
+	void DrawIndexedTriangles( const RageVertex v[], const Uint16* pIndices, int iNumIndices );
+	void DrawLineStrip( const RageVertex v[], int iNumVerts, float LineWidth );
+
+	void SaveScreenshot( CString sPath );
+protected:
+	void SetViewport(int shift_left, int shift_down);
+	RageMatrix GetOrthoMatrix( float l, float r, float b, float t, float zn, float zf ); 
+
+};
+
+#endif