diff --git a/libretro-db/bintree.c b/libretro-db/bintree.c
index b6189a8a18..1a19010d78 100644
--- a/libretro-db/bintree.c
+++ b/libretro-db/bintree.c
@@ -39,8 +39,8 @@ struct bintree_node
 struct bintree
 {
    struct bintree_node *root;
-   bintree_cmp_func cmp;
    void *ctx;
+   bintree_cmp_func cmp;
 };
 
 /* TODO/FIXME - static global variable */
diff --git a/libretro-db/libretrodb.c b/libretro-db/libretrodb.c
index 9ed745d0be..266e0affd8 100644
--- a/libretro-db/libretrodb.c
+++ b/libretro-db/libretrodb.c
@@ -55,10 +55,10 @@ struct node_iter_ctx
 struct libretrodb
 {
 	RFILE *fd;
+   char *path;
 	uint64_t root;
 	uint64_t count;
 	uint64_t first_index_offset;
-   char *path;
 };
 
 struct libretrodb_index
@@ -81,11 +81,11 @@ typedef struct libretrodb_header
 
 struct libretrodb_cursor
 {
-	int is_valid;
    RFILE *fd;
-	int eof;
 	libretrodb_query_t *query;
 	libretrodb_t *db;
+	int is_valid;
+	int eof;
 };
 
 static int libretrodb_read_metadata(RFILE *fd, libretrodb_metadata_t *md)
diff --git a/menu/menu_driver.h b/menu/menu_driver.h
index 821999606a..48c12d75d5 100644
--- a/menu/menu_driver.h
+++ b/menu/menu_driver.h
@@ -306,11 +306,27 @@ typedef struct menu_ctx_driver
 
 typedef struct
 {
+   /* Holds a list of search terms that may be
+    * used to filter the currently displayed
+    * menu list */
+   struct string_list *search_terms;
+
+   const menu_ctx_driver_t *driver_ctx;
+   void *userdata;
+   char *core_buf;
+
+   /* This is used for storing intermediary variables
+    * that get used later on during menu actions -
+    * for instance, selecting a shader pass for a shader
+    * slot */
+   struct
+   {
+      unsigned                unsigned_var;
+   } scratchpad;
    unsigned rpl_entry_selection_ptr;
    size_t                     core_len;
    uint64_t state;
 
-   char *core_buf;
    char menu_state_msg[8192];
    /* Scratchpad variables. These are used for instance
     * by the filebrowser when having to store intermediary
@@ -322,23 +338,6 @@ typedef struct
    char db_playlist_file[PATH_MAX_LENGTH];
    char filebrowser_label[PATH_MAX_LENGTH];
    char detect_content_path[PATH_MAX_LENGTH];
-
-   /* This is used for storing intermediary variables
-    * that get used later on during menu actions -
-    * for instance, selecting a shader pass for a shader
-    * slot */
-   struct
-   {
-      unsigned                unsigned_var;
-   } scratchpad;
-
-   /* Holds a list of search terms that may be
-    * used to filter the currently displayed
-    * menu list */
-   struct string_list *search_terms;
-
-   const menu_ctx_driver_t *driver_ctx;
-   void *userdata;
 } menu_handle_t;
 
 typedef struct menu_content_ctx_defer_info
@@ -387,30 +386,30 @@ typedef struct menu_ctx_iterate
 
 typedef struct menu_ctx_environment
 {
-   enum menu_environ_cb type;
    void *data;
+   enum menu_environ_cb type;
 } menu_ctx_environment_t;
 
 typedef struct menu_ctx_pointer
 {
+   menu_file_list_cbs_t *cbs;
+   menu_entry_t *entry;
+   enum menu_input_pointer_gesture gesture;
    unsigned x;
    unsigned y;
    unsigned ptr;
    unsigned action;
-   enum menu_input_pointer_gesture gesture;
    int retcode;
-   menu_file_list_cbs_t *cbs;
-   menu_entry_t *entry;
 } menu_ctx_pointer_t;
 
 typedef struct menu_ctx_bind
 {
+   menu_file_list_cbs_t *cbs;
    const char *path;
    const char *label;
    unsigned type;
    size_t idx;
    int retcode;
-   menu_file_list_cbs_t *cbs;
 } menu_ctx_bind_t;
 
 /**