diff --git a/stepmania/src/ScreenDimensions.cpp b/stepmania/src/ScreenDimensions.cpp
index ec6ff962e2..57354fc96e 100644
--- a/stepmania/src/ScreenDimensions.cpp
+++ b/stepmania/src/ScreenDimensions.cpp
@@ -3,6 +3,8 @@
 #include "PrefsManager.h"
 #include "LuaManager.h"
 #include "LuaFunctions.h"
+#include "ThemeManager.h"
+#include "ThemeMetric.h"
 
 static ThemeMetric<float> THEME_SCREEN_WIDTH("Common","ScreenWidth");
 static ThemeMetric<float> THEME_SCREEN_HEIGHT("Common","ScreenHeight");
diff --git a/stepmania/src/ScreenDimensions.h b/stepmania/src/ScreenDimensions.h
index e9cd3bca07..3668f2970b 100644
--- a/stepmania/src/ScreenDimensions.h
+++ b/stepmania/src/ScreenDimensions.h
@@ -3,9 +3,6 @@
 #ifndef SCREEN_DIMENSIONS_H
 #define SCREEN_DIMENSIONS_H
 
-#include "ThemeManager.h"
-#include "ThemeMetric.h"
-
 namespace ScreenDimensions
 {
 	float GetScreenAspectRatio();