diff --git a/input/rarch_xinput2.h b/input/rarch_xinput2.h
index 11f3021c69..7554cefce1 100644
--- a/input/rarch_xinput2.h
+++ b/input/rarch_xinput2.h
@@ -18,16 +18,19 @@
 #define __RARCH_XINPUT2_H
 
 #ifndef _XBOX1
-#define XINPUT_GAMEPAD_LSTICK_LEFT_MASK		(65536)
-#define XINPUT_GAMEPAD_LSTICK_RIGHT_MASK	(131072)
-#define XINPUT_GAMEPAD_LSTICK_UP_MASK		(262144)
-#define XINPUT_GAMEPAD_LSTICK_DOWN_MASK		(524288)
-#define XINPUT_GAMEPAD_RSTICK_LEFT_MASK		(1048576)
-#define XINPUT_GAMEPAD_RSTICK_RIGHT_MASK	(2097152)
-#define XINPUT_GAMEPAD_RSTICK_UP_MASK		(4194304)
-#define XINPUT_GAMEPAD_RSTICK_DOWN_MASK		(8388608)
-#define XINPUT_GAMEPAD_LEFT_TRIGGER         (16777216)
-#define XINPUT_GAMEPAD_RIGHT_TRIGGER        (33554432)
+
+enum {
+   XINPUT_GAMEPAD_LSTICK_LEFT_MASK         = 1 << 16,
+   XINPUT_GAMEPAD_LSTICK_RIGHT_MASK        = 1 << 17,
+   XINPUT_GAMEPAD_LSTICK_UP_MASK           = 1 << 18,
+   XINPUT_GAMEPAD_LSTICK_DOWN_MASK         = 1 << 19,
+   XINPUT_GAMEPAD_RSTICK_LEFT_MASK         = 1 << 20,
+   XINPUT_GAMEPAD_RSTICK_RIGHT_MASK        = 1 << 21,
+   XINPUT_GAMEPAD_RSTICK_UP_MASK           = 1 << 22,
+   XINPUT_GAMEPAD_RSTICK_DOWN_MASK         = 1 << 23,
+   XINPUT_GAMEPAD_LEFT_TRIGGER             = 1 << 24,
+   XINPUT_GAMEPAD_RIGHT_TRIGGER            = 1 << 25
+};
 #endif
 #define DEADZONE                            (16000)