diff --git a/android/native/jni/input_android.c b/android/native/jni/input_android.c
index 1959dab902..20f92f55ec 100644
--- a/android/native/jni/input_android.c
+++ b/android/native/jni/input_android.c
@@ -2070,11 +2070,11 @@ static float android_input_get_sensor_input(void *data, unsigned port, unsigned
 
    switch (id)
    {
-      case RETRO_DEVICE_ID_SENSOR_ACCELEROMETER_X:
+      case RETRO_SENSOR_ACCELEROMETER_X:
          return android->accelerometer_state.x;
-      case RETRO_DEVICE_ID_SENSOR_ACCELEROMETER_Y:
+      case RETRO_SENSOR_ACCELEROMETER_Y:
          return android->accelerometer_state.y;
-      case RETRO_DEVICE_ID_SENSOR_ACCELEROMETER_Z:
+      case RETRO_SENSOR_ACCELEROMETER_Z:
          return android->accelerometer_state.z;
    }
 
diff --git a/libretro.h b/libretro.h
index a574d79dd4..28d5639fee 100755
--- a/libretro.h
+++ b/libretro.h
@@ -150,11 +150,6 @@ extern "C" {
 #define RETRO_DEVICE_ID_POINTER_Y         1
 #define RETRO_DEVICE_ID_POINTER_PRESSED   2
 
-// Id values for SENSOR types.
-#define RETRO_DEVICE_ID_SENSOR_ACCELEROMETER_X      0
-#define RETRO_DEVICE_ID_SENSOR_ACCELEROMETER_Y      1
-#define RETRO_DEVICE_ID_SENSOR_ACCELEROMETER_Z      2
-
 // Returned from retro_get_region().
 #define RETRO_REGION_NTSC  0
 #define RETRO_REGION_PAL   1
@@ -696,6 +691,11 @@ enum retro_sensor_action
    RETRO_SENSOR_DUMMY = INT_MAX
 };
 
+// Id values for SENSOR types.
+#define RETRO_SENSOR_ACCELEROMETER_X 0
+#define RETRO_SENSOR_ACCELEROMETER_Y 1
+#define RETRO_SENSOR_ACCELEROMETER_Z 2
+
 typedef bool (*retro_set_sensor_state_t)(unsigned port, enum retro_sensor_action action, unsigned rate);
 typedef float (*retro_sensor_get_input_t)(unsigned port, unsigned id);
 struct retro_sensor_interface