diff --git a/console/retroarch_console.c b/console/retroarch_console.c
index 63e4fae169..48e3e76469 100644
--- a/console/retroarch_console.c
+++ b/console/retroarch_console.c
@@ -297,7 +297,7 @@ static const struct platform_bind platform_keys[] = {
    { CTRL_UP_MASK | CTRL_RSTICK_UP_MASK, "RStick D-Pad Up" },
    { CTRL_DOWN_MASK | CTRL_RSTICK_DOWN_MASK, "RStick D-Pad Down" },
 };
-#elif defined(_XBOX360)
+#elif defined(_XBOX)
 static const struct platform_bind platform_keys[] = {
    { XINPUT_GAMEPAD_B, "B button" },
    { XINPUT_GAMEPAD_A, "A button" },
@@ -309,45 +309,18 @@ static const struct platform_bind platform_keys[] = {
    { XINPUT_GAMEPAD_DPAD_RIGHT, "D-Pad Right" },
    { XINPUT_GAMEPAD_BACK, "Back button" },
    { XINPUT_GAMEPAD_START, "Start button" },
+#ifdef _XBOX1
+   { XINPUT_GAMEPAD_WHITE, "White button" },
+#else
    { XINPUT_GAMEPAD_LEFT_SHOULDER, "Left Shoulder" },
+#endif
    { XINPUT_GAMEPAD_LEFT_TRIGGER, "Left Trigger" },
    { XINPUT_GAMEPAD_LEFT_THUMB, "Left Thumb" },
+#ifdef _XBOX1
+   { XINPUT_GAMEPAD_BLACK, "Black button" },
+#else
    { XINPUT_GAMEPAD_RIGHT_SHOULDER, "Right Shoulder" },
-   { XINPUT_GAMEPAD_RIGHT_TRIGGER, "Right Trigger" },
-   { XINPUT_GAMEPAD_RIGHT_THUMB, "Right Thumb" },
-   { XINPUT_GAMEPAD_LSTICK_LEFT_MASK, "LStick Left" },
-   { XINPUT_GAMEPAD_LSTICK_RIGHT_MASK, "LStick Right" },
-   { XINPUT_GAMEPAD_LSTICK_UP_MASK, "LStick Up" },
-   { XINPUT_GAMEPAD_LSTICK_DOWN_MASK, "LStick Down" },
-   { XINPUT_GAMEPAD_DPAD_LEFT | XINPUT_GAMEPAD_LSTICK_LEFT_MASK, "LStick D-Pad Left" },
-   { XINPUT_GAMEPAD_DPAD_RIGHT | XINPUT_GAMEPAD_LSTICK_RIGHT_MASK, "LStick D-Pad Right" },
-   { XINPUT_GAMEPAD_DPAD_UP | XINPUT_GAMEPAD_LSTICK_UP_MASK, "LStick D-Pad Up" },
-   { XINPUT_GAMEPAD_DPAD_DOWN | XINPUT_GAMEPAD_LSTICK_DOWN_MASK, "LStick D-Pad Down" },
-   { XINPUT_GAMEPAD_RSTICK_LEFT_MASK, "RStick Left" },
-   { XINPUT_GAMEPAD_RSTICK_RIGHT_MASK, "RStick Right" },
-   { XINPUT_GAMEPAD_RSTICK_UP_MASK, "RStick Up" },
-   { XINPUT_GAMEPAD_RSTICK_DOWN_MASK, "RStick Down" },
-   { XINPUT_GAMEPAD_DPAD_LEFT | XINPUT_GAMEPAD_RSTICK_LEFT_MASK, "RStick D-Pad Left" },
-   { XINPUT_GAMEPAD_DPAD_RIGHT | XINPUT_GAMEPAD_RSTICK_RIGHT_MASK, "RStick D-Pad Right" },
-   { XINPUT_GAMEPAD_DPAD_UP | XINPUT_GAMEPAD_RSTICK_UP_MASK, "RStick D-Pad Up" },
-   { XINPUT_GAMEPAD_DPAD_DOWN | XINPUT_GAMEPAD_RSTICK_DOWN_MASK, "RStick D-Pad Down" },
-};
-#elif defined(_XBOX1)
-static const struct platform_bind platform_keys[] = {
-   { XINPUT_GAMEPAD_B, "B button" },
-   { XINPUT_GAMEPAD_A, "A button" },
-   { XINPUT_GAMEPAD_Y, "Y button" },
-   { XINPUT_GAMEPAD_X, "X button" },
-   { XINPUT_GAMEPAD_DPAD_UP, "D-Pad Up" },
-   { XINPUT_GAMEPAD_DPAD_DOWN, "D-Pad Down" },
-   { XINPUT_GAMEPAD_DPAD_LEFT, "D-Pad Left" },
-   { XINPUT_GAMEPAD_DPAD_RIGHT, "D-Pad Right" },
-   { XINPUT_GAMEPAD_BACK, "Back button" },
-   { XINPUT_GAMEPAD_START, "Start button" },
-   { XINPUT_GAMEPAD_WHITE, "Left Shoulder" },
-   { XINPUT_GAMEPAD_LEFT_TRIGGER, "Left Trigger" },
-   { XINPUT_GAMEPAD_LEFT_THUMB, "Left Thumb" },
-   { XINPUT_GAMEPAD_BLACK, "Right Shoulder" },
+#endif
    { XINPUT_GAMEPAD_RIGHT_TRIGGER, "Right Trigger" },
    { XINPUT_GAMEPAD_RIGHT_THUMB, "Right Thumb" },
    { XINPUT_GAMEPAD_LSTICK_LEFT_MASK, "LStick Left" },
@@ -503,22 +476,22 @@ void rarch_input_set_controls_default (void)
    rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_L2]		= platform_keys[PS3_DEVICE_ID_JOYPAD_L2].joykey;
    rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_L3]		= platform_keys[PS3_DEVICE_ID_JOYPAD_L3].joykey;
 #elif defined(_XBOX360)
-   rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_B]		= platform_keys[XDK360_DEVICE_ID_JOYPAD_A].joykey;
-   rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_Y]		= platform_keys[XDK360_DEVICE_ID_JOYPAD_X].joykey;
-   rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_SELECT]	= platform_keys[XDK360_DEVICE_ID_JOYPAD_BACK].joykey;
-   rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_START]	= platform_keys[XDK360_DEVICE_ID_JOYPAD_START].joykey;
-   rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_UP]		= platform_keys[XDK360_DEVICE_ID_JOYPAD_UP].joykey;
-   rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_DOWN]	= platform_keys[XDK360_DEVICE_ID_JOYPAD_DOWN].joykey;
-   rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_LEFT]	= platform_keys[XDK360_DEVICE_ID_JOYPAD_LEFT].joykey;
-   rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_RIGHT]	= platform_keys[XDK360_DEVICE_ID_JOYPAD_RIGHT].joykey;
-   rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_A]		= platform_keys[XDK360_DEVICE_ID_JOYPAD_B].joykey;
-   rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_X]		= platform_keys[XDK360_DEVICE_ID_JOYPAD_Y].joykey;
-   rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_L]		= platform_keys[XDK360_DEVICE_ID_JOYPAD_LB].joykey;
-   rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_R]		= platform_keys[XDK360_DEVICE_ID_JOYPAD_RB].joykey;
-   rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_L2]     = platform_keys[XDK360_DEVICE_ID_JOYPAD_LEFT_TRIGGER].joykey;
-   rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_R2]     = platform_keys[XDK360_DEVICE_ID_JOYPAD_RIGHT_TRIGGER].joykey;
-   rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_L3]     = platform_keys[XDK360_DEVICE_ID_LSTICK_THUMB].joykey;
-   rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_R3]     = platform_keys[XDK360_DEVICE_ID_RSTICK_THUMB].joykey;
+   rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_B]		= platform_keys[XDK_DEVICE_ID_JOYPAD_A].joykey;
+   rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_Y]		= platform_keys[XDK_DEVICE_ID_JOYPAD_X].joykey;
+   rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_SELECT]	= platform_keys[XDK_DEVICE_ID_JOYPAD_BACK].joykey;
+   rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_START]	= platform_keys[XDK_DEVICE_ID_JOYPAD_START].joykey;
+   rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_UP]		= platform_keys[XDK_DEVICE_ID_JOYPAD_UP].joykey;
+   rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_DOWN]	= platform_keys[XDK_DEVICE_ID_JOYPAD_DOWN].joykey;
+   rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_LEFT]	= platform_keys[XDK_DEVICE_ID_JOYPAD_LEFT].joykey;
+   rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_RIGHT]	= platform_keys[XDK_DEVICE_ID_JOYPAD_RIGHT].joykey;
+   rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_A]		= platform_keys[XDK_DEVICE_ID_JOYPAD_B].joykey;
+   rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_X]		= platform_keys[XDK_DEVICE_ID_JOYPAD_Y].joykey;
+   rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_L]		= platform_keys[XDK_DEVICE_ID_JOYPAD_LB].joykey;
+   rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_R]		= platform_keys[XDK_DEVICE_ID_JOYPAD_RB].joykey;
+   rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_L2]     = platform_keys[XDK_DEVICE_ID_JOYPAD_LEFT_TRIGGER].joykey;
+   rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_R2]     = platform_keys[XDK_DEVICE_ID_JOYPAD_RIGHT_TRIGGER].joykey;
+   rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_L3]     = platform_keys[XDK_DEVICE_ID_LSTICK_THUMB].joykey;
+   rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_R3]     = platform_keys[XDK_DEVICE_ID_RSTICK_THUMB].joykey;
 #endif
    for(uint32_t x = 0; x < MAX_PLAYERS; x++)
       rarch_input_set_default_keybinds(x);
diff --git a/console/retroarch_console_input.h b/console/retroarch_console_input.h
index a8b1dc87cb..3e34334112 100644
--- a/console/retroarch_console_input.h
+++ b/console/retroarch_console_input.h
@@ -85,42 +85,42 @@ enum ps3_device_id
    RARCH_LAST_PLATFORM_KEY
 };
 
-#elif defined(_XBOX360)
+#elif defined(_XBOX)
 
-enum xdk360_device_id
+enum xdk_device_id
 {
-   XDK360_DEVICE_ID_JOYPAD_B = 0,
-   XDK360_DEVICE_ID_JOYPAD_A,
-   XDK360_DEVICE_ID_JOYPAD_Y,
-   XDK360_DEVICE_ID_JOYPAD_X,
-   XDK360_DEVICE_ID_JOYPAD_UP,
-   XDK360_DEVICE_ID_JOYPAD_DOWN,
-   XDK360_DEVICE_ID_JOYPAD_LEFT,
-   XDK360_DEVICE_ID_JOYPAD_RIGHT,
-   XDK360_DEVICE_ID_JOYPAD_BACK,
-   XDK360_DEVICE_ID_JOYPAD_START,
-   XDK360_DEVICE_ID_JOYPAD_LB,
-   XDK360_DEVICE_ID_JOYPAD_LEFT_TRIGGER,
-   XDK360_DEVICE_ID_LSTICK_THUMB,
-   XDK360_DEVICE_ID_JOYPAD_RB,
-   XDK360_DEVICE_ID_JOYPAD_RIGHT_TRIGGER,
-   XDK360_DEVICE_ID_RSTICK_THUMB,
-   XDK360_DEVICE_ID_LSTICK_LEFT,
-   XDK360_DEVICE_ID_LSTICK_RIGHT,
-   XDK360_DEVICE_ID_LSTICK_UP,
-   XDK360_DEVICE_ID_LSTICK_DOWN,
-   XDK360_DEVICE_ID_LSTICK_LEFT_DPAD,
-   XDK360_DEVICE_ID_LSTICK_RIGHT_DPAD,
-   XDK360_DEVICE_ID_LSTICK_UP_DPAD,
-   XDK360_DEVICE_ID_LSTICK_DOWN_DPAD,
-   XDK360_DEVICE_ID_RSTICK_LEFT,
-   XDK360_DEVICE_ID_RSTICK_RIGHT,
-   XDK360_DEVICE_ID_RSTICK_UP,
-   XDK360_DEVICE_ID_RSTICK_DOWN,
-   XDK360_DEVICE_ID_RSTICK_LEFT_DPAD,
-   XDK360_DEVICE_ID_RSTICK_RIGHT_DPAD,
-   XDK360_DEVICE_ID_RSTICK_UP_DPAD,
-   XDK360_DEVICE_ID_RSTICK_DOWN_DPAD,
+   XDKK_DEVICE_ID_JOYPAD_B = 0,
+   XDK_DEVICE_ID_JOYPAD_A,
+   XDK_DEVICE_ID_JOYPAD_Y,
+   XDK_DEVICE_ID_JOYPAD_X,
+   XDK_DEVICE_ID_JOYPAD_UP,
+   XDK_DEVICE_ID_JOYPAD_DOWN,
+   XDK_DEVICE_ID_JOYPAD_LEFT,
+   XDK_DEVICE_ID_JOYPAD_RIGHT,
+   XDK_DEVICE_ID_JOYPAD_BACK,
+   XDK_DEVICE_ID_JOYPAD_START,
+   XDK_DEVICE_ID_JOYPAD_LB,
+   XDK_DEVICE_ID_JOYPAD_LEFT_TRIGGER,
+   XDK_DEVICE_ID_LSTICK_THUMB,
+   XDK_DEVICE_ID_JOYPAD_RB,
+   XDK_DEVICE_ID_JOYPAD_RIGHT_TRIGGER,
+   XDK_DEVICE_ID_RSTICK_THUMB,
+   XDK_DEVICE_ID_LSTICK_LEFT,
+   XDK_DEVICE_ID_LSTICK_RIGHT,
+   XDK_DEVICE_ID_LSTICK_UP,
+   XDK_DEVICE_ID_LSTICK_DOWN,
+   XDK_DEVICE_ID_LSTICK_LEFT_DPAD,
+   XDK_DEVICE_ID_LSTICK_RIGHT_DPAD,
+   XDK_DEVICE_ID_LSTICK_UP_DPAD,
+   XDK_DEVICE_ID_LSTICK_DOWN_DPAD,
+   XDK_DEVICE_ID_RSTICK_LEFT,
+   XDK_DEVICE_ID_RSTICK_RIGHT,
+   XDK_DEVICE_ID_RSTICK_UP,
+   XDK_DEVICE_ID_RSTICK_DOWN,
+   XDK_DEVICE_ID_RSTICK_LEFT_DPAD,
+   XDK_DEVICE_ID_RSTICK_RIGHT_DPAD,
+   XDK_DEVICE_ID_RSTICK_UP_DPAD,
+   XDK_DEVICE_ID_RSTICK_DOWN_DPAD,
 
    RARCH_LAST_PLATFORM_KEY
 };