PrefsManager should not depend on ThemeManager

stepmania/src/GameConstantsAndTypes.cpp

@@ -5,6 +5,7 @@
 #include "ThemeManager.h"
 #include "EnumHelper.h"
 #include "Foreach.h"
+#include "PrefsManager.h"
 
 
 static const CString RadarCategoryNames[NUM_RADAR_CATEGORIES] = {
@@ -235,6 +236,10 @@ static const CString StyleTypeNames[NUM_STYLE_TYPES] = {
 XToString( StyleType );
 StringToX( StyleType );
 
+#include "LuaFunctions.h"
+LuaFunction_NoArgs( CoinMode,   CoinModeToString(PREFSMAN->m_CoinMode) )
+LuaFunction_NoArgs( Premium,    PremiumToString(PREFSMAN->m_Premium) )
+
 /*
  * (c) 2001-2004 Chris Danford
  * All rights reserved.

stepmania/src/PrefsManager.cpp

@@ -8,7 +8,6 @@
 #include "RageSoundReader_Resample.h" /* for ResampleQuality */
 #include "RageFile.h"
 #include "ProductInfo.h"
-#include "GameConstantsAndTypes.h"
 #include "Foreach.h"
 #include "Preference.h"
 
@@ -848,11 +847,6 @@ Premium	PrefsManager::GetPremium()
 }
 
 
-#include "LuaFunctions.h"
-LuaFunction_NoArgs( CoinMode,	CoinModeToString(PREFSMAN->m_CoinMode) )
-LuaFunction_NoArgs( Premium,	PremiumToString(PREFSMAN->m_Premium) )
-
-
 /*
  * (c) 2001-2004 Chris Danford, Chris Gomez
  * All rights reserved.