diff --git a/gfx/gfx_thumbnail.c b/gfx/gfx_thumbnail.c
index 74d22176ff..1548de7fa4 100644
--- a/gfx/gfx_thumbnail.c
+++ b/gfx/gfx_thumbnail.c
@@ -42,8 +42,8 @@
  * an image load */
 typedef struct
 {
-   gfx_thumbnail_t *thumbnail;
    uint64_t list_id;
+   gfx_thumbnail_t *thumbnail;
 } gfx_thumbnail_tag_t;
 
 /* Setters */
diff --git a/gfx/gfx_thumbnail_path.c b/gfx/gfx_thumbnail_path.c
index ebfa7646aa..a1eaded2ee 100644
--- a/gfx/gfx_thumbnail_path.c
+++ b/gfx/gfx_thumbnail_path.c
@@ -40,6 +40,8 @@
  * each individual entry by hand... */
 struct gfx_thumbnail_path_data
 {
+   enum playlist_thumbnail_mode playlist_right_mode;
+   enum playlist_thumbnail_mode playlist_left_mode;
    char system[PATH_MAX_LENGTH];
    char content_path[PATH_MAX_LENGTH];
    char content_label[PATH_MAX_LENGTH];
@@ -48,8 +50,6 @@ struct gfx_thumbnail_path_data
    char content_img[PATH_MAX_LENGTH];
    char right_path[PATH_MAX_LENGTH];
    char left_path[PATH_MAX_LENGTH];
-   enum playlist_thumbnail_mode playlist_right_mode;
-   enum playlist_thumbnail_mode playlist_left_mode;
 };
 
 /* Resets thumbnail path data