diff --git a/input/drivers/android_input.c b/input/drivers/android_input.c
index 00a0bc0ffc..977bae2ee7 100644
--- a/input/drivers/android_input.c
+++ b/input/drivers/android_input.c
@@ -56,55 +56,12 @@ enum {
 #endif
 
 /* If using an SDK lower than 24 then add missing relative axis codes */
-#if __ANDROID_API__ < 24
+#ifndef AMOTION_EVENT_AXIS_RELATIVE_X
 #define AMOTION_EVENT_AXIS_RELATIVE_X 27
-#define AMOTION_EVENT_AXIS_RELATIVE_Y 28
+#endif
 
-enum
-{
-	AMOTION_EVENT_AXIS_X = 0,
-	AMOTION_EVENT_AXIS_Y = 1,
-	AMOTION_EVENT_AXIS_PRESSURE = 2,
-	AMOTION_EVENT_AXIS_SIZE = 3,
-	AMOTION_EVENT_AXIS_TOUCH_MAJOR = 4,
-	AMOTION_EVENT_AXIS_TOUCH_MINOR = 5,
-	AMOTION_EVENT_AXIS_TOOL_MAJOR = 6,
-	AMOTION_EVENT_AXIS_TOOL_MINOR = 7,
-	AMOTION_EVENT_AXIS_ORIENTATION = 8,
-	AMOTION_EVENT_AXIS_VSCROLL = 9,
-	AMOTION_EVENT_AXIS_HSCROLL = 10,
-	AMOTION_EVENT_AXIS_Z = 11,
-	AMOTION_EVENT_AXIS_RX = 12,
-	AMOTION_EVENT_AXIS_RY = 13,
-	AMOTION_EVENT_AXIS_RZ = 14,
-	AMOTION_EVENT_AXIS_HAT_X = 15,
-	AMOTION_EVENT_AXIS_HAT_Y = 16,
-	AMOTION_EVENT_AXIS_LTRIGGER = 17,
-	AMOTION_EVENT_AXIS_RTRIGGER = 18,
-	AMOTION_EVENT_AXIS_THROTTLE = 19,
-	AMOTION_EVENT_AXIS_RUDDER = 20,
-	AMOTION_EVENT_AXIS_WHEEL = 21,
-	AMOTION_EVENT_AXIS_GAS = 22,
-	AMOTION_EVENT_AXIS_BRAKE = 23,
-	AMOTION_EVENT_AXIS_DISTANCE = 24,
-	AMOTION_EVENT_AXIS_TILT = 25,
-	AMOTION_EVENT_AXIS_GENERIC_1 = 32,
-	AMOTION_EVENT_AXIS_GENERIC_2 = 33,
-	AMOTION_EVENT_AXIS_GENERIC_3 = 34,
-	AMOTION_EVENT_AXIS_GENERIC_4 = 35,
-	AMOTION_EVENT_AXIS_GENERIC_5 = 36,
-	AMOTION_EVENT_AXIS_GENERIC_6 = 37,
-	AMOTION_EVENT_AXIS_GENERIC_7 = 38,
-	AMOTION_EVENT_AXIS_GENERIC_8 = 39,
-	AMOTION_EVENT_AXIS_GENERIC_9 = 40,
-	AMOTION_EVENT_AXIS_GENERIC_10 = 41,
-	AMOTION_EVENT_AXIS_GENERIC_11 = 42,
-	AMOTION_EVENT_AXIS_GENERIC_12 = 43,
-	AMOTION_EVENT_AXIS_GENERIC_13 = 44,
-	AMOTION_EVENT_AXIS_GENERIC_14 = 45,
-	AMOTION_EVENT_AXIS_GENERIC_15 = 46,
-	AMOTION_EVENT_AXIS_GENERIC_16 = 47,
-};
+#ifndef AMOTION_EVENT_AXIS_RELATIVE_Y
+#define AMOTION_EVENT_AXIS_RELATIVE_Y 28
 #endif
 
 /* Use this to enable/disable using the touch screen as mouse */