diff --git a/tasks/task_overlay.c b/tasks/task_overlay.c
index 63cb408d8d..e8db07c188 100644
--- a/tasks/task_overlay.c
+++ b/tasks/task_overlay.c
@@ -35,21 +35,24 @@ typedef struct overlay_loader overlay_loader_t;
 
 struct overlay_loader
 {
-   enum overlay_status state;
-   enum overlay_image_transfer_status loading_status;
-   config_file_t *conf;
-   char *overlay_path;
-   struct overlay *overlays;
-   struct overlay *active;
+   bool driver_rgba_support;
    bool overlay_enable;
    bool overlay_hide_in_menu;
+
+   enum overlay_status state;
+   enum overlay_image_transfer_status loading_status;
+
    size_t resolve_pos;
    unsigned size;
    unsigned pos;
    unsigned pos_increment;
    float overlay_opacity;
    float overlay_scale;
-   bool driver_rgba_support;
+
+   config_file_t *conf;
+   char *overlay_path;
+   struct overlay *overlays;
+   struct overlay *active;
 };
 
 static void task_overlay_image_done(struct overlay *overlay)
diff --git a/tasks/task_pl_thumbnail_download.c b/tasks/task_pl_thumbnail_download.c
index 349bf70bc1..972b3bd115 100644
--- a/tasks/task_pl_thumbnail_download.c
+++ b/tasks/task_pl_thumbnail_download.c
@@ -51,26 +51,28 @@ enum pl_thumb_status
 
 typedef struct pl_thumb_handle
 {
+   bool overwrite;
+   bool right_thumbnail_exists;
+   bool left_thumbnail_exists;
+   bool http_task_complete;
+   enum pl_thumb_status status;
+
+   size_t list_size;
+   size_t list_index;
+   unsigned type_idx;
+
    char *system;
    char *playlist_path;
    char *dir_thumbnails;
    playlist_t *playlist;
    gfx_thumbnail_path_data_t *thumbnail_path_data;
    retro_task_t *http_task;
-   bool http_task_complete;
-   size_t list_size;
-   size_t list_index;
-   unsigned type_idx;
-   bool overwrite;
-   bool right_thumbnail_exists;
-   bool left_thumbnail_exists;
-   enum pl_thumb_status status;
 } pl_thumb_handle_t;
 
 typedef struct pl_entry_id
 {
-   char *playlist_path;
    size_t idx;
+   char *playlist_path;
 } pl_entry_id_t;
 
 /*********************/
@@ -84,14 +86,14 @@ static bool get_thumbnail_paths(
    char *path, size_t path_size,
    char *url, size_t url_size)
 {
+   char raw_url[2048];
+   char content_dir[PATH_MAX_LENGTH];
+   char tmp_buf[PATH_MAX_LENGTH];
    const char *system      = NULL;
    const char *db_name     = NULL;
    const char *img_name    = NULL;
    const char *sub_dir     = NULL;
    const char *system_name = NULL;
-   char content_dir[PATH_MAX_LENGTH];
-   char raw_url[2048];
-   char tmp_buf[PATH_MAX_LENGTH];
    
    content_dir[0] = '\0';
    raw_url[0]     = '\0';
diff --git a/tasks/task_playlist_manager.c b/tasks/task_playlist_manager.c
index af892e1c40..9355138347 100644
--- a/tasks/task_playlist_manager.c
+++ b/tasks/task_playlist_manager.c
@@ -44,14 +44,14 @@ enum pl_manager_status
 
 typedef struct pl_manager_handle
 {
+   bool use_old_format;
+   bool fuzzy_archive_match;
+   enum pl_manager_status status;
+   size_t list_size;
+   size_t list_index;
    char *playlist_path;
    char *playlist_name;
    playlist_t *playlist;
-   size_t list_size;
-   size_t list_index;
-   enum pl_manager_status status;
-   bool use_old_format;
-   bool fuzzy_archive_match;
 } pl_manager_handle_t;
 
 /*********************/
diff --git a/tasks/task_powerstate.c b/tasks/task_powerstate.c
index 5d8dd3bab4..02db0d7316 100644
--- a/tasks/task_powerstate.c
+++ b/tasks/task_powerstate.c
@@ -29,8 +29,8 @@ typedef struct powerstate powerstate_t;
 
 struct powerstate
 {
-   int percent;
    enum frontend_powerstate state;
+   int percent;
 };
 
 enum frontend_powerstate get_last_powerstate(int *percent)