diff --git a/tasks/task_http.c b/tasks/task_http.c
index 1b25f0b6d7..b75ec77c93 100644
--- a/tasks/task_http.c
+++ b/tasks/task_http.c
@@ -124,8 +124,8 @@ static int task_http_iterate_transfer(retro_task_t *task)
 
 static void rarch_task_http_transfer_handler(retro_task_t *task)
 {
-   http_handle_t *http = (http_handle_t*)task->state;
-   http_transfer_data_t *data;
+   http_transfer_data_t *data = NULL;
+   http_handle_t        *http = (http_handle_t*)task->state;
 
    if (task->cancelled)
       goto task_finished;
@@ -196,7 +196,7 @@ task_finished:
 
 static bool rarch_task_http_finder(retro_task_t *task, void *user_data)
 {
-   http_handle_t *http;
+   http_handle_t *http = NULL;
 
    if (!task || (task->handler != rarch_task_http_transfer_handler))
       return false;
@@ -303,9 +303,9 @@ task_retriever_info_t *http_task_get_transfer_list(void)
    task_retriever_data_t retrieve_data;
 
    /* Fill retrieve data */
-   retrieve_data.handler = rarch_task_http_transfer_handler;
+   retrieve_data.handler      = rarch_task_http_transfer_handler;
    retrieve_data.element_size = sizeof(http_transfer_info_t);
-   retrieve_data.func = rarch_task_http_retriever;
+   retrieve_data.func         = rarch_task_http_retriever;
 
    /* Build list of current HTTP transfers and return it */
    task_queue_ctl(TASK_QUEUE_CTL_RETRIEVE, &retrieve_data);
diff --git a/tasks/task_image.c b/tasks/task_image.c
index 4dacc10f72..e9b3bf0ca5 100644
--- a/tasks/task_image.c
+++ b/tasks/task_image.c
@@ -44,8 +44,8 @@ enum image_status_enum
 
 static int cb_image_menu_upload_generic(void *data, size_t len)
 {
-   nbio_handle_t *nbio = (nbio_handle_t*)data;
    unsigned r_shift, g_shift, b_shift, a_shift;
+   nbio_handle_t *nbio = (nbio_handle_t*)data;
 
    if (!nbio)
       return -1;