diff --git a/stepmania/src/GameInput.h b/stepmania/src/GameInput.h
index b60d0ce965..759d2d3166 100644
--- a/stepmania/src/GameInput.h
+++ b/stepmania/src/GameInput.h
@@ -149,6 +149,17 @@ GameButton StringToGameButton( const InputScheme* pInputs, const RString& s );
 #define LIGHTS_BUTTON_BASS_RIGHT	GAME_BUTTON_CUSTOM_08
 #define NUM_LIGHTS_BUTTONS		GAME_BUTTON_CUSTOM_09
 
+typedef GameButton MenuButton;
+#define MENU_BUTTON_LEFT GAME_BUTTON_MENULEFT
+#define MENU_BUTTON_RIGHT GAME_BUTTON_MENURIGHT
+#define MENU_BUTTON_UP GAME_BUTTON_MENUUP
+#define MENU_BUTTON_DOWN GAME_BUTTON_MENUDOWN
+#define MENU_BUTTON_START GAME_BUTTON_START
+#define MENU_BUTTON_SELECT GAME_BUTTON_SELECT
+#define MENU_BUTTON_BACK GAME_BUTTON_BACK
+#define MENU_BUTTON_COIN GAME_BUTTON_COIN
+#define MENU_BUTTON_OPERATOR GAME_BUTTON_OPERATOR
+#define MenuButton_Invalid GameButton_Invalid
 
 struct GameInput
 {
diff --git a/stepmania/src/MenuInput.h b/stepmania/src/MenuInput.h
index 738aed3044..8d9e53fd4d 100644
--- a/stepmania/src/MenuInput.h
+++ b/stepmania/src/MenuInput.h
@@ -3,19 +3,6 @@
 #ifndef MENU_INPUT_H
 #define MENU_INPUT_H
 
-#include "GameInput.h"
-typedef GameButton MenuButton;
-#define MENU_BUTTON_LEFT GAME_BUTTON_MENULEFT
-#define MENU_BUTTON_RIGHT GAME_BUTTON_MENURIGHT
-#define MENU_BUTTON_UP GAME_BUTTON_MENUUP
-#define MENU_BUTTON_DOWN GAME_BUTTON_MENUDOWN
-#define MENU_BUTTON_START GAME_BUTTON_START
-#define MENU_BUTTON_SELECT GAME_BUTTON_SELECT
-#define MENU_BUTTON_BACK GAME_BUTTON_BACK
-#define MENU_BUTTON_COIN GAME_BUTTON_COIN
-#define MENU_BUTTON_OPERATOR GAME_BUTTON_OPERATOR
-#define MenuButton_Invalid GameButton_Invalid
-
 #endif
 
 /*
diff --git a/stepmania/src/ScreenEdit.h b/stepmania/src/ScreenEdit.h
index 55f9d8d2b4..aecdb7ee46 100644
--- a/stepmania/src/ScreenEdit.h
+++ b/stepmania/src/ScreenEdit.h
@@ -15,7 +15,7 @@
 #include "Steps.h"
 #include "ThemeMetric.h"
 #include "PlayerState.h"
-#include "MenuInput.h"
+#include "GameInput.h"
 
 #include <map>