diff --git a/ps3/frontend/menu.h b/ps3/frontend/menu.h
index b14a0f19fe..0e143af36b 100644
--- a/ps3/frontend/menu.h
+++ b/ps3/frontend/menu.h
@@ -19,6 +19,7 @@
 
 #if defined(__CELLOS_LV2__)
 #define DEVICE_CAST gl_t*
+#define input_ptr input_ps3
 #define DEVICE_PTR device_ptr
 #define FONT_SIZE (g_console.menu_font_size)
 #define render_msg_pre_func() gl_render_msg_pre(DEVICE_PTR)
@@ -26,6 +27,7 @@
 #define render_msg_post_func() gl_render_msg_post(DEVICE_PTR)
 #elif defined(_XBOX1)
 #define DEVICE_CAST xdk_d3d_video_t*
+#define input_ptr input_xinput
 #define DEVICE_PTR device_ptr
 #define FONT_SIZE 0
 #define render_msg_pre_func() xfonts_render_msg_pre(DEVICE_PTR)
diff --git a/xbox1/frontend/menu.cpp b/xbox1/frontend/menu.cpp
index 668bbc7fd2..64c7dde0f6 100644
--- a/xbox1/frontend/menu.cpp
+++ b/xbox1/frontend/menu.cpp
@@ -250,7 +250,7 @@ void menu_loop(void)
       uint64_t input_state = 0;
       static bool first_held = false;
 
-       input_xinput.poll(NULL);
+       input_ptr.poll(NULL);
 
       static const struct retro_keybind *binds[MAX_PLAYERS] = {
 	      g_settings.input.binds[0],
@@ -280,26 +280,26 @@ void menu_loop(void)
 
       for (unsigned i = 0; i < RARCH_FIRST_META_KEY; i++)
       {
-         input_state |= input_xinput.input_state(NULL, binds, false,
+         input_state |= input_ptr.input_state(NULL, binds, false,
             RETRO_DEVICE_JOYPAD, 0, i) ? (1 << i) : 0;
       }
 
-      input_state |= input_xinput.input_state(NULL, analog_binds, false,
+      input_state |= input_ptr.input_state(NULL, analog_binds, false,
          RETRO_DEVICE_JOYPAD, 0, 0) ? (1 << RETRO_DEVICE_ID_JOYPAD_ANALOG_LEFT_DPAD_LEFT) : 0;
-      input_state |= input_xinput.input_state(NULL, analog_binds, false,
+      input_state |= input_ptr.input_state(NULL, analog_binds, false,
          RETRO_DEVICE_JOYPAD, 0, 1) ? (1 << RETRO_DEVICE_ID_JOYPAD_ANALOG_LEFT_DPAD_RIGHT) : 0;
-      input_state |= input_xinput.input_state(NULL, analog_binds, false,
+      input_state |= input_ptr.input_state(NULL, analog_binds, false,
          RETRO_DEVICE_JOYPAD, 0, 2) ? (1 << RETRO_DEVICE_ID_JOYPAD_ANALOG_LEFT_DPAD_UP) : 0;
-      input_state |= input_xinput.input_state(NULL, analog_binds, false,
+      input_state |= input_ptr.input_state(NULL, analog_binds, false,
          RETRO_DEVICE_JOYPAD, 0, 3) ? (1 << RETRO_DEVICE_ID_JOYPAD_ANALOG_LEFT_DPAD_DOWN) : 0;
 
-      input_state |= input_xinput.input_state(NULL, analog_binds, false,
+      input_state |= input_ptr.input_state(NULL, analog_binds, false,
          RETRO_DEVICE_JOYPAD, 0, 4) ? (1 << RETRO_DEVICE_ID_JOYPAD_ANALOG_RIGHT_DPAD_LEFT) : 0;
-      input_state |= input_xinput.input_state(NULL, analog_binds, false,
+      input_state |= input_ptr.input_state(NULL, analog_binds, false,
          RETRO_DEVICE_JOYPAD, 0, 5) ? (1 << RETRO_DEVICE_ID_JOYPAD_ANALOG_RIGHT_DPAD_RIGHT) : 0;
-      input_state |= input_xinput.input_state(NULL, analog_binds, false,
+      input_state |= input_ptr.input_state(NULL, analog_binds, false,
          RETRO_DEVICE_JOYPAD, 0, 6) ? (1 << RETRO_DEVICE_ID_JOYPAD_ANALOG_RIGHT_DPAD_UP) : 0;
-      input_state |= input_xinput.input_state(NULL, analog_binds, false,
+      input_state |= input_ptr.input_state(NULL, analog_binds, false,
          RETRO_DEVICE_JOYPAD, 0, 7) ? (1 << RETRO_DEVICE_ID_JOYPAD_ANALOG_RIGHT_DPAD_DOWN) : 0;
 
       uint64_t trig_state = input_state & ~old_state; //set first button input frame as trigger
@@ -307,31 +307,31 @@ void menu_loop(void)
 
       //second button input frame
       input_state = 0;
-      input_xinput.poll(NULL);
+      input_ptr.poll(NULL);
 
 
       for (unsigned i = 0; i < RARCH_FIRST_META_KEY; i++)
       {
-         input_state |= input_xinput.input_state(NULL, binds, false,
+         input_state |= input_ptr.input_state(NULL, binds, false,
             RETRO_DEVICE_JOYPAD, 0, i) ? (1 << i) : 0;
       }
 
-      input_state |= input_xinput.input_state(NULL, analog_binds, false,
+      input_state |= input_ptr.input_state(NULL, analog_binds, false,
          RETRO_DEVICE_JOYPAD, 0, 0) ? (1 << RETRO_DEVICE_ID_JOYPAD_ANALOG_LEFT_DPAD_LEFT) : 0;
-      input_state |= input_xinput.input_state(NULL, analog_binds, false,
+      input_state |= input_ptr.input_state(NULL, analog_binds, false,
          RETRO_DEVICE_JOYPAD, 0, 1) ? (1 << RETRO_DEVICE_ID_JOYPAD_ANALOG_LEFT_DPAD_RIGHT) : 0;
-      input_state |= input_xinput.input_state(NULL, analog_binds, false,
+      input_state |= input_ptr.input_state(NULL, analog_binds, false,
          RETRO_DEVICE_JOYPAD, 0, 2) ? (1 << RETRO_DEVICE_ID_JOYPAD_ANALOG_LEFT_DPAD_UP) : 0;
-      input_state |= input_xinput.input_state(NULL, analog_binds, false,
+      input_state |= input_ptr.input_state(NULL, analog_binds, false,
          RETRO_DEVICE_JOYPAD, 0, 3) ? (1 << RETRO_DEVICE_ID_JOYPAD_ANALOG_LEFT_DPAD_DOWN) : 0;
 
-      input_state |= input_xinput.input_state(NULL, analog_binds, false,
+      input_state |= input_ptr.input_state(NULL, analog_binds, false,
          RETRO_DEVICE_JOYPAD, 0, 4) ? (1 << RETRO_DEVICE_ID_JOYPAD_ANALOG_RIGHT_DPAD_LEFT) : 0;
-      input_state |= input_xinput.input_state(NULL, analog_binds, false,
+      input_state |= input_ptr.input_state(NULL, analog_binds, false,
          RETRO_DEVICE_JOYPAD, 0, 5) ? (1 << RETRO_DEVICE_ID_JOYPAD_ANALOG_RIGHT_DPAD_RIGHT) : 0;
-      input_state |= input_xinput.input_state(NULL, analog_binds, false,
+      input_state |= input_ptr.input_state(NULL, analog_binds, false,
          RETRO_DEVICE_JOYPAD, 0, 6) ? (1 << RETRO_DEVICE_ID_JOYPAD_ANALOG_RIGHT_DPAD_UP) : 0;
-      input_state |= input_xinput.input_state(NULL, analog_binds, false,
+      input_state |= input_ptr.input_state(NULL, analog_binds, false,
          RETRO_DEVICE_JOYPAD, 0, 7) ? (1 << RETRO_DEVICE_ID_JOYPAD_ANALOG_RIGHT_DPAD_DOWN) : 0;
 
       bool analog_sticks_pressed = (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_ANALOG_LEFT_DPAD_LEFT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_ANALOG_LEFT_DPAD_RIGHT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_ANALOG_LEFT_DPAD_UP)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_ANALOG_LEFT_DPAD_DOWN)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_ANALOG_RIGHT_DPAD_LEFT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_ANALOG_RIGHT_DPAD_RIGHT)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_ANALOG_RIGHT_DPAD_UP)) || (input_state & (1 << RETRO_DEVICE_ID_JOYPAD_ANALOG_RIGHT_DPAD_DOWN));