diff --git a/dynamic.h b/dynamic.h
index 79ed70ab16..af4a0cdd15 100644
--- a/dynamic.h
+++ b/dynamic.h
@@ -66,7 +66,7 @@ struct retro_core_t
    void *(*retro_get_memory_data)(unsigned);
    size_t (*retro_get_memory_size)(unsigned);
 
-   unsigned poll_type;
+   enum poll_type poll_type;
    uint8_t flags;
 };
 
diff --git a/retroarch_types.h b/retroarch_types.h
index f50d7b51e2..2d0aac5120 100644
--- a/retroarch_types.h
+++ b/retroarch_types.h
@@ -20,7 +20,7 @@
 
 RETRO_BEGIN_DECLS
 
-enum
+enum poll_type
 {
    /* Polling is performed before
     * call to retro_run. */
diff --git a/runloop.c b/runloop.c
index 846a5ccc9a..ad53bbdfd8 100644
--- a/runloop.c
+++ b/runloop.c
@@ -4518,7 +4518,7 @@ static void core_input_state_poll_maybe(void)
    runloop_state_t *runloop_st = &runloop_state;
    const enum poll_type_override_t
       core_poll_type_override  = runloop_st->core_poll_type_override;
-   unsigned new_poll_type      = (core_poll_type_override > POLL_TYPE_OVERRIDE_DONTCARE)
+   enum poll_type new_poll_type      = (core_poll_type_override > POLL_TYPE_OVERRIDE_DONTCARE)
       ? (core_poll_type_override - 1)
       : runloop_st->current_core.poll_type;
    if (new_poll_type == POLL_TYPE_NORMAL)
@@ -4531,7 +4531,7 @@ static retro_input_state_t core_input_state_poll_return_cb(void)
    runloop_state_t *runloop_st = &runloop_state;
    const enum poll_type_override_t
       core_poll_type_override  = runloop_st->core_poll_type_override;
-   unsigned new_poll_type      = (core_poll_type_override > POLL_TYPE_OVERRIDE_DONTCARE)
+   enum poll_type new_poll_type      = (core_poll_type_override > POLL_TYPE_OVERRIDE_DONTCARE)
       ? (core_poll_type_override - 1)
       : runloop_st->current_core.poll_type;
    if (new_poll_type == POLL_TYPE_LATE)
@@ -7715,7 +7715,7 @@ void core_run(void)
       current_core             = &runloop_st->current_core;
    const enum poll_type_override_t
       core_poll_type_override  = runloop_st->core_poll_type_override;
-   unsigned new_poll_type      = (core_poll_type_override != POLL_TYPE_OVERRIDE_DONTCARE)
+   enum poll_type new_poll_type      = (core_poll_type_override != POLL_TYPE_OVERRIDE_DONTCARE)
       ? (core_poll_type_override - 1)
       : current_core->poll_type;
    bool early_polling          = new_poll_type == POLL_TYPE_EARLY;