diff --git a/driver.h b/driver.h
index 2f0a58d392..4fd4ee0cb6 100644
--- a/driver.h
+++ b/driver.h
@@ -433,12 +433,13 @@ typedef struct driver
    const location_driver_t *location;
    struct retro_callbacks retro_ctx;
 
-   void *osk_data;
-   void *camera_data;
-   void *location_data;
    void *audio_data;
    void *video_data;
    void *input_data;
+   void *osk_data;
+   void *camera_data;
+   void *location_data;
+
 #ifdef HAVE_MENU
    menu_handle_t *menu;
    const menu_ctx_driver_t *menu_ctx;
diff --git a/frontend/menu/menu_driver.h b/frontend/menu/menu_driver.h
index 0d9d7fec57..921867b003 100644
--- a/frontend/menu/menu_driver.h
+++ b/frontend/menu/menu_driver.h
@@ -67,10 +67,19 @@ struct menu_bind_state
 
 typedef struct
 {
+   /* Keys down last frame. Used for trigger_state */
    uint64_t old_input_state;
+
+   /* New keys pressed down this frame */
    uint64_t trigger_state;
+
+   /* Whether any repeating keys are being held down, */
+   /* and key repeat should be handled */
+   /* TODO: should be a mask of keys we are repeating, */
+   /* instead of repeating all keys being held down. */
    bool do_held;
 
+   /* Used for key repeat */
    unsigned delay_timer;
    unsigned delay_count;