diff --git a/stepmania/src/GameplayMessages.h b/stepmania/src/GameplayMessages.h
new file mode 100644
index 0000000000..43a0e982b6
--- /dev/null
+++ b/stepmania/src/GameplayMessages.h
@@ -0,0 +1,57 @@
+#ifndef GameplayMessages_H
+#define GameplayMessages_H
+
+#include "ScreenMessage.h"
+
+
+// messages sent by Combo
+const ScreenMessage SM_PlayToasty				= ScreenMessage(SM_User+104);
+
+const ScreenMessage	SM_100Combo					= ScreenMessage(SM_User+200);
+const ScreenMessage	SM_200Combo					= ScreenMessage(SM_User+201);
+const ScreenMessage	SM_300Combo					= ScreenMessage(SM_User+202);
+const ScreenMessage	SM_400Combo					= ScreenMessage(SM_User+203);
+const ScreenMessage	SM_500Combo					= ScreenMessage(SM_User+204);
+const ScreenMessage	SM_600Combo					= ScreenMessage(SM_User+205);
+const ScreenMessage	SM_700Combo					= ScreenMessage(SM_User+206);
+const ScreenMessage	SM_800Combo					= ScreenMessage(SM_User+207);
+const ScreenMessage	SM_900Combo					= ScreenMessage(SM_User+208);
+const ScreenMessage	SM_1000Combo				= ScreenMessage(SM_User+209);
+const ScreenMessage	SM_ComboStopped				= ScreenMessage(SM_User+210);
+const ScreenMessage SM_ComboContinuing			= ScreenMessage(SM_User+211);
+const ScreenMessage	SM_MissComboAborted			= ScreenMessage(SM_User+212);
+
+const ScreenMessage SM_BattleTrickLevel1		= ScreenMessage(SM_User+301);
+const ScreenMessage SM_BattleTrickLevel2		= ScreenMessage(SM_User+302);
+const ScreenMessage SM_BattleTrickLevel3		= ScreenMessage(SM_User+303);
+const ScreenMessage SM_BattleDamageLevel1		= ScreenMessage(SM_User+304);
+const ScreenMessage SM_BattleDamageLevel2		= ScreenMessage(SM_User+305);
+const ScreenMessage SM_BattleDamageLevel3		= ScreenMessage(SM_User+306);
+
+
+#endif
+
+/*
+ * (c) 2001-2002 Chris Danford
+ * All rights reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, and/or sell copies of the Software, and to permit persons to
+ * whom the Software is furnished to do so, provided that the above
+ * copyright notice(s) and this permission notice appear in all copies of
+ * the Software and that both the above copyright notice(s) and this
+ * permission notice appear in supporting documentation.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+ * THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
+ * INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
+ * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
diff --git a/stepmania/src/Inventory.cpp b/stepmania/src/Inventory.cpp
index a1bb19150d..df32b83a6c 100644
--- a/stepmania/src/Inventory.cpp
+++ b/stepmania/src/Inventory.cpp
@@ -7,7 +7,7 @@
 #include "PrefsManager.h"
 #include "song.h"
 #include "ScreenManager.h"
-#include "ScreenGameplay.h"
+#include "GameplayMessages.h"
 #include "StageStats.h"
 #include "ThemeMetric.h"
 #include "PlayerState.h"
diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp
index db48181ec3..a76dc898fe 100644
--- a/stepmania/src/Player.cpp
+++ b/stepmania/src/Player.cpp
@@ -31,6 +31,7 @@
 #include "RageSoundManager.h"
 #include "ThemeMetric.h"
 #include "PlayerState.h"
+#include "GameplayMessages.h"
 
 ThemeMetric<float> GRAY_ARROWS_Y_STANDARD		("Player","ReceptorArrowsYStandard");
 ThemeMetric<float> GRAY_ARROWS_Y_REVERSE		("Player","ReceptorArrowsYReverse");
diff --git a/stepmania/src/ScoreKeeperMAX2.cpp b/stepmania/src/ScoreKeeperMAX2.cpp
index 3de534e976..8fb1f2b44a 100644
--- a/stepmania/src/ScoreKeeperMAX2.cpp
+++ b/stepmania/src/ScoreKeeperMAX2.cpp
@@ -5,7 +5,7 @@
 #include "Steps.h"
 #include "PrefsManager.h"
 #include "ScreenManager.h"
-#include "ScreenGameplay.h"
+#include "GameplayMessages.h"
 #include "GameState.h"
 #include "Course.h"
 #include "SongManager.h"
@@ -16,6 +16,7 @@
 #include "NetworkSyncManager.h"
 #include "PlayerState.h"
 #include "Style.h"
+#include "Song.h"
 
 ScoreKeeperMAX2::ScoreKeeperMAX2( 
 		const vector<Song*>& apSongs, 
diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index 34e593ca15..5a4405ddcb 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -43,6 +43,7 @@
 #include "ScreenDimensions.h"
 #include "ThemeMetric.h"
 #include "PlayerState.h"
+#include "GameplayMessages.h"
 
 //
 // Defines
diff --git a/stepmania/src/ScreenGameplay.h b/stepmania/src/ScreenGameplay.h
index ef30ec1288..e4b4a879b8 100644
--- a/stepmania/src/ScreenGameplay.h
+++ b/stepmania/src/ScreenGameplay.h
@@ -27,30 +27,6 @@ class Inventory;
 #include "NetworkSyncManager.h"
 #include "AutoKeysounds.h"
 
-// messages sent by Combo
-const ScreenMessage SM_PlayToasty			= ScreenMessage(SM_User+104);
-
-const ScreenMessage	SM_100Combo					= ScreenMessage(SM_User+200);
-const ScreenMessage	SM_200Combo					= ScreenMessage(SM_User+201);
-const ScreenMessage	SM_300Combo					= ScreenMessage(SM_User+202);
-const ScreenMessage	SM_400Combo					= ScreenMessage(SM_User+203);
-const ScreenMessage	SM_500Combo					= ScreenMessage(SM_User+204);
-const ScreenMessage	SM_600Combo					= ScreenMessage(SM_User+205);
-const ScreenMessage	SM_700Combo					= ScreenMessage(SM_User+206);
-const ScreenMessage	SM_800Combo					= ScreenMessage(SM_User+207);
-const ScreenMessage	SM_900Combo					= ScreenMessage(SM_User+208);
-const ScreenMessage	SM_1000Combo				= ScreenMessage(SM_User+209);
-const ScreenMessage	SM_ComboStopped				= ScreenMessage(SM_User+210);
-const ScreenMessage SM_ComboContinuing			= ScreenMessage(SM_User+211);
-const ScreenMessage	SM_MissComboAborted			= ScreenMessage(SM_User+212);
-
-const ScreenMessage SM_BattleTrickLevel1		= ScreenMessage(SM_User+301);
-const ScreenMessage SM_BattleTrickLevel2		= ScreenMessage(SM_User+302);
-const ScreenMessage SM_BattleTrickLevel3		= ScreenMessage(SM_User+303);
-const ScreenMessage SM_BattleDamageLevel1		= ScreenMessage(SM_User+304);
-const ScreenMessage SM_BattleDamageLevel2		= ScreenMessage(SM_User+305);
-const ScreenMessage SM_BattleDamageLevel3		= ScreenMessage(SM_User+306);
-
 class LyricsLoader;
 class ScreenGameplay : public Screen
 {