diff --git a/cheevos/cheevos.c b/cheevos/cheevos.c
index 4b5e4267ba..e21ce860b7 100644
--- a/cheevos/cheevos.c
+++ b/cheevos/cheevos.c
@@ -1818,7 +1818,7 @@ static void cheevos_make_lboard_url(const cheevos_leaderboard_t *lboard,
 #endif
 }
 
-static void cheevos_lboard_submit(retro_task_t *task, void *task_data, void *user_data,
+static void cheevos_lboard_submit(void *task_data, void *user_data,
       const char *error)
 {
    cheevos_leaderboard_t *lboard = (cheevos_leaderboard_t *)user_data;
diff --git a/tasks/task_netplay_find_content.c b/tasks/task_netplay_find_content.c
index 72ff1550d8..0505890945 100644
--- a/tasks/task_netplay_find_content.c
+++ b/tasks/task_netplay_find_content.c
@@ -54,7 +54,7 @@ typedef struct
    struct string_list *lpl_list;
 } netplay_crc_handle_t;
 
-static void netplay_crc_scan_callback(retro_task_t *task, void *task_data,
+static void netplay_crc_scan_callback(void *task_data,
                                void *user_data, const char *error)
 {
    netplay_crc_handle_t *state     = (netplay_crc_handle_t*)task_data;
@@ -152,14 +152,16 @@ static void netplay_crc_scan_callback(retro_task_t *task, void *task_data,
    free(state);
 }
 
-static void begin_task(retro_task_t *task, const char *title) {
+static void begin_task(retro_task_t *task, const char *title)
+{
    task_set_progress(task, 0);
    task_free_title(task);
    task_set_title(task, strdup(title));
    task_set_finished(task, false);
 }
 
-static void finish_task(retro_task_t *task, const char *title) {
+static void finish_task(retro_task_t *task, const char *title)
+{
    task_set_progress(task, 100);
    task_free_title(task);
    task_set_title(task, strdup(title));
diff --git a/tasks/task_netplay_nat_traversal.c b/tasks/task_netplay_nat_traversal.c
index dc6dfc93e3..b3375047d9 100644
--- a/tasks/task_netplay_nat_traversal.c
+++ b/tasks/task_netplay_nat_traversal.c
@@ -35,7 +35,7 @@ struct nat_traversal_state_data
    uint16_t port;
 };
 
-static void netplay_nat_traversal_callback(retro_task_t *task, void *task_data,
+static void netplay_nat_traversal_callback(void *task_data,
                                void *user_data, const char *error)
 {
    struct nat_traversal_state_data *ntsd =