diff --git a/android/native/jni/input_android.c b/android/native/jni/input_android.c
index 9a21ecaeaf..1dd66bb7f1 100644
--- a/android/native/jni/input_android.c
+++ b/android/native/jni/input_android.c
@@ -26,14 +26,6 @@
 #define MAX_PADS 8
 #define MAX_TOUCH 8
 
-enum
-{
-   DPAD_EMULATION_NONE = 0,
-   DPAD_EMULATION_LSTICK,
-   DPAD_EMULATION_RSTICK,
-   DPAD_EMULATION_LAST
-};
-
 enum {
    AKEYCODE_ESCAPE          = 111,
    AKEYCODE_BREAK           = 121,
diff --git a/console/rarch_console_input.h b/console/rarch_console_input.h
index 7fbf036f4e..51636a6ca8 100644
--- a/console/rarch_console_input.h
+++ b/console/rarch_console_input.h
@@ -27,14 +27,6 @@ enum keybind_set_id
    KEYBIND_DEFAULT
 };
 
-enum
-{
-   DPAD_EMULATION_NONE = 0,
-   DPAD_EMULATION_LSTICK,
-   DPAD_EMULATION_RSTICK,
-   DPAD_EMULATION_LAST
-};
-
 extern uint64_t rarch_default_keybind_lut[RARCH_FIRST_META_KEY];
 extern char rarch_default_libretro_keybind_name_lut[RARCH_FIRST_META_KEY][32];
 extern char rarch_dpad_emulation_name_lut[KEYBIND_DEFAULT][32];
diff --git a/general.h b/general.h
index afd2969832..292d87bebe 100644
--- a/general.h
+++ b/general.h
@@ -92,6 +92,14 @@
 
 #define MAX_PLAYERS 8
 
+enum dpad_emu_enums
+{
+   DPAD_EMULATION_NONE = 0,
+   DPAD_EMULATION_LSTICK,
+   DPAD_EMULATION_RSTICK,
+   DPAD_EMULATION_LAST
+};
+
 // All config related settings go here.
 struct settings
 {
@@ -173,7 +181,7 @@ struct settings
       struct retro_keybind binds[MAX_PLAYERS][RARCH_BIND_LIST_END];
       float axis_threshold;
       int joypad_map[MAX_PLAYERS];
-      unsigned dpad_emulation[MAX_PLAYERS];
+      enum dpad_emu_enums dpad_emulation[MAX_PLAYERS];
 #ifdef RARCH_CONSOLE
       unsigned currently_selected_controller_no;
       unsigned map_dpad_to_stick;