diff --git a/stepmania/src/RageDisplay.cpp b/stepmania/src/RageDisplay.cpp
index fedca19697..826c3e2846 100644
--- a/stepmania/src/RageDisplay.cpp
+++ b/stepmania/src/RageDisplay.cpp
@@ -356,10 +356,10 @@ public:
 };
 
 
-MatrixStack	g_ProjectionStack;
-MatrixStack	g_ViewStack;
-MatrixStack	g_WorldStack;
-MatrixStack	g_TextureStack;
+static MatrixStack g_ProjectionStack;
+static MatrixStack g_ViewStack;
+static MatrixStack g_WorldStack;
+static MatrixStack g_TextureStack;
 
 const RageMatrix* RageDisplay::GetProjectionTop()
 {
diff --git a/stepmania/src/RageDisplay_D3D.cpp b/stepmania/src/RageDisplay_D3D.cpp
index c5fdba99a4..0269fb6eec 100644
--- a/stepmania/src/RageDisplay_D3D.cpp
+++ b/stepmania/src/RageDisplay_D3D.cpp
@@ -412,7 +412,7 @@ CString SetD3DParams( bool &bNewDeviceOut )
 }
 
 /* If the given parameters have failed, try to lower them. */
-bool D3DReduceParams( D3DPRESENT_PARAMETERS	*pp )
+static bool D3DReduceParams( D3DPRESENT_PARAMETERS *pp )
 {
 	D3DDISPLAYMODE current;
 	current.Format = pp->BackBufferFormat;