diff --git a/tasks/task_autodetect.c b/tasks/task_autodetect.c
index ff917c9230..159d980683 100644
--- a/tasks/task_autodetect.c
+++ b/tasks/task_autodetect.c
@@ -33,23 +33,26 @@
 
 #include "tasks_internal.h"
 
-typedef struct autoconfig_disconnect
+typedef struct autoconfig_disconnect autoconfig_disconnect_t;
+typedef struct autoconfig_params     autoconfig_params_t;
+
+struct autoconfig_disconnect
 {
    unsigned idx;
    char msg[255];
-} autoconfig_disconnect_t;
+};
 
-typedef struct autoconfig_params
+struct autoconfig_params
 {
    char  name[255];
    char  driver[255];
    char  display_name[255];
-   unsigned idx;
+   char autoconfig_directory[4096];
    int32_t vid;
    int32_t pid;
+   unsigned idx;
    uint32_t max_users;
-   char autoconfig_directory[4096];
-} autoconfig_params_t;
+};
 
 static bool input_autoconfigured[MAX_USERS];
 static unsigned input_device_name_index[MAX_USERS];
diff --git a/tasks/task_overlay.c b/tasks/task_overlay.c
index 9679807fdc..5940e93081 100644
--- a/tasks/task_overlay.c
+++ b/tasks/task_overlay.c
@@ -33,25 +33,25 @@
 #include "../configuration.h"
 #include "../verbosity.h"
 
-typedef struct
+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 overlay_enable;
+   bool overlay_hide_in_menu;
+   size_t resolve_pos;
    unsigned size;
    unsigned pos;
    unsigned pos_increment;
-   struct overlay *overlays;
-   struct overlay *active;
-   size_t resolve_pos;
-
-   bool overlay_enable;
-   bool overlay_hide_in_menu;
    float overlay_opacity;
    float overlay_scale;
-
-} overlay_loader_t;
+};
 
 static void task_overlay_image_done(struct overlay *overlay)
 {
diff --git a/tasks/task_powerstate.c b/tasks/task_powerstate.c
index 028e7f741f..c507858535 100644
--- a/tasks/task_powerstate.c
+++ b/tasks/task_powerstate.c
@@ -22,11 +22,13 @@
 static int              power_percent = 0;
 static enum frontend_powerstate state = FRONTEND_POWERSTATE_NONE;
 
-typedef struct
+typedef struct powerstate powerstate_t;
+
+struct powerstate
 {
    int percent;
    enum frontend_powerstate state;
-} powerstate_t;
+};
 
 enum frontend_powerstate get_last_powerstate(int *percent)
 {