diff --git a/gfx/common/win32_common.c b/gfx/common/win32_common.c
index 589574ea57..328b1dfea5 100644
--- a/gfx/common/win32_common.c
+++ b/gfx/common/win32_common.c
@@ -59,9 +59,9 @@ static bool win32_browser(
 
 LRESULT win32_menu_loop(HWND owner, WPARAM wparam)
 {
-    WPARAM mode         = wparam & 0xffff;
-	unsigned cmd         = EVENT_CMD_NONE;
-	bool do_wm_close     = false;
+   WPARAM mode         = wparam & 0xffff;
+   enum event_command cmd         = EVENT_CMD_NONE;
+   bool do_wm_close     = false;
    settings_t *settings = config_get_ptr();
    global_t   *global   = global_get_ptr();
 
diff --git a/menu/menu_entries_cbs_ok.c b/menu/menu_entries_cbs_ok.c
index b3e96dfd16..9369676dd6 100644
--- a/menu/menu_entries_cbs_ok.c
+++ b/menu/menu_entries_cbs_ok.c
@@ -982,9 +982,8 @@ static int action_ok_custom_viewport(const char *path,
 }
 
 
-static int generic_action_ok_command(unsigned cmd)
+static int generic_action_ok_command(enum event_command cmd)
 {
-
    if (!event_command(cmd))
       return -1;
    return 0;
diff --git a/runloop.c b/runloop.c
index bd67dbbfad..24e7f001dd 100644
--- a/runloop.c
+++ b/runloop.c
@@ -54,7 +54,7 @@ static bool check_pause(bool pause_pressed, bool frameadvance_pressed)
    runloop_t *runloop       = rarch_main_get_ptr();
    static bool old_focus    = true;
    bool focus               = true;
-   unsigned cmd             = EVENT_CMD_NONE;
+   enum event_command cmd   = EVENT_CMD_NONE;
    bool old_is_paused       = runloop->is_paused;
    settings_t *settings     = config_get_ptr();
 
diff --git a/settings.c b/settings.c
index 4634c18369..433e907208 100644
--- a/settings.c
+++ b/settings.c
@@ -2937,7 +2937,7 @@ static void general_read_handler(void *data)
 
 static void general_write_handler(void *data)
 {
-   unsigned rarch_cmd = EVENT_CMD_NONE;
+   enum event_command rarch_cmd = EVENT_CMD_NONE;
    rarch_setting_t *setting = (rarch_setting_t*)data;
    settings_t *settings     = config_get_ptr();
    driver_t *driver         = driver_get_ptr();
diff --git a/settings_list.c b/settings_list.c
index 8fb508ccdc..eb046ed0dd 100644
--- a/settings_list.c
+++ b/settings_list.c
@@ -114,7 +114,7 @@ void settings_list_current_add_values(
 void settings_list_current_add_cmd(
       rarch_setting_t **list,
       rarch_setting_info_t *list_info,
-      unsigned values)
+      enum event_command values)
 {
    unsigned idx = list_info->index - 1;
    (*list)[idx].cmd_trigger.idx = values;
diff --git a/settings_list.h b/settings_list.h
index 4baa28bb26..0ea6c45ba7 100644
--- a/settings_list.h
+++ b/settings_list.h
@@ -173,7 +173,7 @@ typedef struct rarch_setting
 
    struct
    {
-      unsigned idx;
+      enum event_command idx;
       bool triggered;
    } cmd_trigger;
 
@@ -219,7 +219,7 @@ void settings_list_current_add_values(
 void settings_list_current_add_cmd(
       rarch_setting_t **list,
       rarch_setting_info_t *list_info,
-      unsigned values);
+      enum event_command values);
 
 void settings_info_list_free(rarch_setting_info_t *list_info);
 
diff --git a/ui/drivers/ui_null.c b/ui/drivers/ui_null.c
index 42c57de77e..d6b2172fd5 100644
--- a/ui/drivers/ui_null.c
+++ b/ui/drivers/ui_null.c
@@ -63,7 +63,7 @@ static void ui_companion_null_toggle(void *data)
    (void)data;
 }
 
-static void ui_companion_null_event_command(void *data, unsigned cmd)
+static void ui_companion_null_event_command(void *data, enum event_command cmd)
 {
    (void)data;
    (void)cmd;