diff --git a/360/frontend-xdk/main.c b/360/frontend-xdk/main.c
index 12081faa5b..05e650ddbf 100644
--- a/360/frontend-xdk/main.c
+++ b/360/frontend-xdk/main.c
@@ -26,7 +26,7 @@
 #endif
 
 #include <xbdm.h>
-#include "../../input/rarch_xinput2.h"
+#include "../../360/xinput_360_input.h"
 
 #ifdef _XBOX
 #if defined(_XBOX1)
diff --git a/input/xinput2_input.c b/360/xinput_360_input.c
similarity index 99%
rename from input/xinput2_input.c
rename to 360/xinput_360_input.c
index 3aab8fad7a..2d6515375c 100644
--- a/input/xinput2_input.c
+++ b/360/xinput_360_input.c
@@ -24,7 +24,7 @@
 #include "../driver.h"
 #include "../general.h"
 #include "../libretro.h"
-#include "rarch_xinput2.h"
+#include "xinput_360_input.h"
 
 static uint64_t state[4];
 static unsigned pads_connected;
diff --git a/input/rarch_xinput2.h b/360/xinput_360_input.h
similarity index 95%
rename from input/rarch_xinput2.h
rename to 360/xinput_360_input.h
index 7554cefce1..53efa72f74 100644
--- a/input/rarch_xinput2.h
+++ b/360/xinput_360_input.h
@@ -14,10 +14,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __RARCH_XINPUT2_H
-#define __RARCH_XINPUT2_H
-
-#ifndef _XBOX1
+#ifndef _XDK360_XINPUT2_H
+#define _XDK360_XINPUT2_H
 
 enum {
    XINPUT_GAMEPAD_LSTICK_LEFT_MASK         = 1 << 16,
@@ -31,7 +29,7 @@ enum {
    XINPUT_GAMEPAD_LEFT_TRIGGER             = 1 << 24,
    XINPUT_GAMEPAD_RIGHT_TRIGGER            = 1 << 25
 };
-#endif
+
 #define DEADZONE                            (16000)
 
 #ifdef _XBOX
diff --git a/console/griffin/griffin.c b/console/griffin/griffin.c
index 4744e36ffb..a6088c3475 100644
--- a/console/griffin/griffin.c
+++ b/console/griffin/griffin.c
@@ -132,7 +132,7 @@ INPUT
 #if defined(HAVE_XINPUT_XBOX1)
 #include "../../xbox1/xinput_xbox_input.c"
 #elif defined(HAVE_XINPUT2)
-#include "../../input/xinput2_input.c"
+#include "../../360/xinput_360_input.c"
 #endif
 #endif
 
diff --git a/console/retroarch_console_input.h b/console/retroarch_console_input.h
index 2269cc8da5..21011ac4f5 100644
--- a/console/retroarch_console_input.h
+++ b/console/retroarch_console_input.h
@@ -42,7 +42,7 @@ enum
 };
 
 #ifdef _XBOX
-#include "../input/rarch_xinput2.h"
+#include "../360/xinput_360_input.h"
 #endif
 
 #if defined(__CELLOS_LV2__)