diff --git a/tasks/task_netplay_lan_scan.c b/tasks/task_netplay_lan_scan.c
index 8844b78f54..702c2673f2 100644
--- a/tasks/task_netplay_lan_scan.c
+++ b/tasks/task_netplay_lan_scan.c
@@ -25,11 +25,11 @@ static void netplay_lan_scan_callback(void *task_data,
                                void *user_data, const char *error)
 {
    unsigned i;
-   unsigned menu_type            = 0;
-   const char *path              = NULL;
-   const char *label             = NULL;
-   enum msg_hash_enums enum_idx  = MSG_UNKNOWN;
-   file_list_t *file_list        = NULL;
+   unsigned menu_type                      = 0;
+   const char *path                        = NULL;
+   const char *label                       = NULL;
+   enum msg_hash_enums enum_idx            = MSG_UNKNOWN;
+   file_list_t *file_list                  = NULL;
    struct netplay_host_list *netplay_hosts = NULL;
 
    menu_entries_get_last_stack(&path, &label, &menu_type, &enum_idx, NULL);
@@ -81,10 +81,10 @@ bool task_push_netplay_lan_scan(void)
    if (!task)
       goto error;
 
-   task->type = TASK_TYPE_BLOCKING;
-   task->handler = task_netplay_lan_scan_handler;
+   task->type     = TASK_TYPE_BLOCKING;
+   task->handler  = task_netplay_lan_scan_handler;
    task->callback = netplay_lan_scan_callback;
-   task->title = strdup(msg_hash_to_str(MSG_NETPLAY_LAN_SCANNING));
+   task->title    = strdup(msg_hash_to_str(MSG_NETPLAY_LAN_SCANNING));
 
    task_queue_ctl(TASK_QUEUE_CTL_PUSH, task);
 
diff --git a/tasks/task_overlay.c b/tasks/task_overlay.c
index 9743ca86d7..ed3fb2998c 100644
--- a/tasks/task_overlay.c
+++ b/tasks/task_overlay.c
@@ -64,8 +64,8 @@ static void task_overlay_load_desc_image(
    char image_path[PATH_MAX_LENGTH];
    config_file_t              *conf = loader->conf;
 
-   overlay_desc_image_key[0] = '\0';
-   image_path[0]             = '\0';
+   overlay_desc_image_key[0]        = '\0';
+   image_path[0]                    = '\0';
 
    snprintf(overlay_desc_image_key, sizeof(overlay_desc_image_key),
          "overlay%u_desc%u_overlay", ol_idx, desc_idx);
@@ -729,10 +729,10 @@ static bool task_overlay_finder(retro_task_t *task, void *user_data)
 static bool task_push_overlay_load(const char *overlay_path,
       retro_task_callback_t cb, void *user_data)
 {
+   task_finder_data_t find_data;
    retro_task_t *t          = NULL;
    config_file_t *conf      = NULL;
    overlay_loader_t *loader = (overlay_loader_t*)calloc(1, sizeof(*loader));
-   task_finder_data_t find_data;
 
    if (!loader)
       goto error;