diff --git a/tasks/task_screenshot.c b/tasks/task_screenshot.c
index 2f4ec4b653..9893f37567 100644
--- a/tasks/task_screenshot.c
+++ b/tasks/task_screenshot.c
@@ -58,7 +58,9 @@
 
 #include "tasks_internal.h"
 
-typedef struct
+typedef struct screenshot_task_state screenshot_task_state_t;
+
+struct screenshot_task_state
 {
 #ifdef _XBOX1
    D3DSurface *surf;
@@ -78,7 +80,7 @@ typedef struct
    bool is_paused;
    bool history_list_enable;
    unsigned pixel_format_type;
-} screenshot_task_state_t;
+};
 
 /**
  * task_screenshot_handler:
diff --git a/tasks/task_wifi.c b/tasks/task_wifi.c
index 050766d301..d4fc96466e 100644
--- a/tasks/task_wifi.c
+++ b/tasks/task_wifi.c
@@ -30,10 +30,12 @@
 #include "../menu/menu_entries.h"
 #include "../menu/menu_driver.h"
 
-typedef struct
+typedef struct wifi_handle wifi_handle_t;
+
+struct wifi_handle
 {
    struct string_list *ssid_list;
-} wifi_handle_t;
+};
 
 static void wifi_scan_callback(void *task_data,
                                void *user_data, const char *error)