diff --git a/gfx/gfx_display.c b/gfx/gfx_display.c
index c19d9dbf65..fc8e7324c3 100644
--- a/gfx/gfx_display.c
+++ b/gfx/gfx_display.c
@@ -1095,7 +1095,7 @@ void gfx_display_draw_keyboard(
    };
 
 #ifdef HAVE_MIST
-   if(steam_has_osk_open())
+   if (steam_has_osk_open())
       return;
 #endif
 
diff --git a/gfx/video_driver.c b/gfx/video_driver.c
index 98bbca1958..e74effb3f8 100644
--- a/gfx/video_driver.c
+++ b/gfx/video_driver.c
@@ -1783,7 +1783,7 @@ float *video_driver_get_hdr_paper_white_float(void)
 {
    static float paper_white[4] = { 0.5f, 0.5f, 0.5f, 1.0f};
    static float sdr_white  [4] = { 1.0f, 1.0f, 1.0f, 1.0f};
-   if(      video_driver_supports_hdr() 
+   if (     video_driver_supports_hdr() 
          && config_get_ptr()->bools.video_hdr_enable)
       return paper_white;
    return sdr_white;
@@ -1797,7 +1797,7 @@ float *video_driver_get_hdr_paper_white_float(void)
 float video_driver_get_hdr_luminance(float nits)
 {
    settings_t *settings                = config_get_ptr();
-   if(video_driver_supports_hdr() && settings->bools.video_hdr_enable)
+   if (video_driver_supports_hdr() && settings->bools.video_hdr_enable)
    {
       float luminance = nits / 
          settings->floats.video_hdr_paper_white_nits;
@@ -1812,7 +1812,7 @@ float video_driver_get_hdr_luminance(float nits)
  * after inverse tonemapping has been applied */
 unsigned video_driver_get_hdr_color(unsigned color)
 {
-   if(   video_driver_supports_hdr() 
+   if (  video_driver_supports_hdr() 
       && config_get_ptr()->bools.video_hdr_enable)
    {
       float luminance;
diff --git a/gfx/widgets/gfx_widget_generic_message.c b/gfx/widgets/gfx_widget_generic_message.c
index 84792c06a4..897bc9ddf9 100644
--- a/gfx/widgets/gfx_widget_generic_message.c
+++ b/gfx/widgets/gfx_widget_generic_message.c
@@ -18,7 +18,6 @@
 #include "../gfx_widgets.h"
 #include "../gfx_animation.h"
 #include "../gfx_display.h"
-#include "../../retroarch.h"
 
 #define GENERIC_MESSAGE_FADE_DURATION MSG_QUEUE_ANIMATION_DURATION
 
diff --git a/gfx/widgets/gfx_widget_libretro_message.c b/gfx/widgets/gfx_widget_libretro_message.c
index d6ec85570a..a0d754d459 100644
--- a/gfx/widgets/gfx_widget_libretro_message.c
+++ b/gfx/widgets/gfx_widget_libretro_message.c
@@ -18,7 +18,6 @@
 #include "../gfx_widgets.h"
 #include "../gfx_animation.h"
 #include "../gfx_display.h"
-#include "../../retroarch.h"
 
 #define LIBRETRO_MESSAGE_FADE_DURATION MSG_QUEUE_ANIMATION_DURATION
 
diff --git a/gfx/widgets/gfx_widget_load_content_animation.c b/gfx/widgets/gfx_widget_load_content_animation.c
index 185a7a4295..65503f2b15 100644
--- a/gfx/widgets/gfx_widget_load_content_animation.c
+++ b/gfx/widgets/gfx_widget_load_content_animation.c
@@ -22,7 +22,6 @@
 #include "../gfx_widgets.h"
 #include "../gfx_animation.h"
 #include "../gfx_display.h"
-#include "../../retroarch.h"
 #include "../../core_info.h"
 #include "../../playlist.h"
 #include "../../paths.h"
@@ -310,9 +309,9 @@ bool gfx_widget_start_load_content_animation(void)
     *   core is started (this higher level behaviour is
     *   deeply ingrained in RetroArch, and too difficult
     *   to change...) */
-   if (string_is_empty(content_path) ||
-       string_is_empty(core_path) ||
-       string_is_equal(core_path, "builtin"))
+   if (   string_is_empty(content_path)
+       || string_is_empty(core_path)
+       || string_is_equal(core_path, "builtin"))
       return false;
 
    /* Check core validity */
diff --git a/gfx/widgets/gfx_widget_progress_message.c b/gfx/widgets/gfx_widget_progress_message.c
index 318986e3aa..1b787df767 100644
--- a/gfx/widgets/gfx_widget_progress_message.c
+++ b/gfx/widgets/gfx_widget_progress_message.c
@@ -18,7 +18,6 @@
 #include "../gfx_widgets.h"
 #include "../gfx_animation.h"
 #include "../gfx_display.h"
-#include "../../retroarch.h"
 
 /* Widget state */
 
diff --git a/gfx/widgets/gfx_widget_screenshot.c b/gfx/widgets/gfx_widget_screenshot.c
index 4c813c0832..7633466f29 100644
--- a/gfx/widgets/gfx_widget_screenshot.c
+++ b/gfx/widgets/gfx_widget_screenshot.c
@@ -19,7 +19,6 @@
 #include "../gfx_animation.h"
 #include "../gfx_display.h"
 #include "../../configuration.h"
-#include "../../retroarch.h"
 
 #define SCREENSHOT_DURATION_IN            66
 #define SCREENSHOT_DURATION_OUT           SCREENSHOT_DURATION_IN*10
diff --git a/gfx/widgets/gfx_widget_volume.c b/gfx/widgets/gfx_widget_volume.c
index 8b208573bd..5b2461ab75 100644
--- a/gfx/widgets/gfx_widget_volume.c
+++ b/gfx/widgets/gfx_widget_volume.c
@@ -18,7 +18,6 @@
 #include "../gfx_widgets.h"
 #include "../gfx_animation.h"
 #include "../gfx_display.h"
-#include "../../retroarch.h"
 
 /* Constants */
 #define VOLUME_DURATION 3000
diff --git a/tasks/task_audio_mixer.c b/tasks/task_audio_mixer.c
index 1634e2642d..260ae57e6b 100644
--- a/tasks/task_audio_mixer.c
+++ b/tasks/task_audio_mixer.c
@@ -29,7 +29,6 @@
 
 #include "../file_path_special.h"
 #include "../audio/audio_driver.h"
-#include "../retroarch.h"
 #include "../verbosity.h"
 
 #include "task_file_transfer.h"
diff --git a/tasks/task_autodetect.c b/tasks/task_autodetect.c
index 16e4452315..dafaac59e9 100644
--- a/tasks/task_autodetect.c
+++ b/tasks/task_autodetect.c
@@ -28,7 +28,6 @@
 #include "../configuration.h"
 #include "../file_path_special.h"
 #include "../list_special.h"
-#include "../retroarch.h"
 #include "../verbosity.h"
 #include "../input/input_driver.h"
 #include "../input/input_remapping.h"
diff --git a/tasks/task_autodetect_blissbox.c b/tasks/task_autodetect_blissbox.c
index e8d579ab39..5972835355 100644
--- a/tasks/task_autodetect_blissbox.c
+++ b/tasks/task_autodetect_blissbox.c
@@ -22,7 +22,7 @@
 #include <string/stdstring.h>
 
 #include "../verbosity.h"
-#include "../retroarch.h"
+#include "../runloop.h"
 
 #include "tasks_internal.h"
 
diff --git a/tasks/task_bluetooth.c b/tasks/task_bluetooth.c
index dd90dc9526..f1e32aa97b 100644
--- a/tasks/task_bluetooth.c
+++ b/tasks/task_bluetooth.c
@@ -21,7 +21,6 @@
 #include "tasks_internal.h"
 
 #include "../msg_hash.h"
-#include "../verbosity.h"
 #include "../bluetooth/bluetooth_driver.h"
 
 static void task_bluetooth_scan_handler(retro_task_t *task)
diff --git a/tasks/task_content_disc.c b/tasks/task_content_disc.c
index 9a01aa3813..468e92e2ac 100755
--- a/tasks/task_content_disc.c
+++ b/tasks/task_content_disc.c
@@ -62,7 +62,6 @@
 
 #include "../configuration.h"
 #include "../msg_hash.h"
-#include "../retroarch.h"
 #include "../verbosity.h"
 
 #ifdef HAVE_CDROM
@@ -97,9 +96,6 @@ typedef struct
 static void task_cdrom_dump_handler(retro_task_t *task)
 {
    task_cdrom_dump_state_t *state    = (task_cdrom_dump_state_t*)task->state;
-   settings_t              *settings = config_get_ptr();
-   const char *directory_core_assets = settings 
-      ? settings->paths.directory_core_assets : NULL;
 
    if (task_get_progress(task) == 100)
    {
@@ -146,6 +142,9 @@ static void task_cdrom_dump_handler(retro_task_t *task)
             size_t _len;
             char output_file[PATH_MAX_LENGTH];
             char cue_filename[PATH_MAX_LENGTH];
+            settings_t              *settings = config_get_ptr();
+            const char *directory_core_assets = settings 
+               ? settings->paths.directory_core_assets : NULL;
             /* write cuesheet to a file */
             int64_t cue_size     = filestream_get_size(state->file);
             char *cue_data       = (char*)calloc(1, cue_size);
@@ -259,6 +258,9 @@ static void task_cdrom_dump_handler(retro_task_t *task)
             {
                char output_path[PATH_MAX_LENGTH];
                char track_filename[PATH_MAX_LENGTH];
+               settings_t              *settings = config_get_ptr();
+               const char *directory_core_assets = settings 
+                  ? settings->paths.directory_core_assets : NULL;
 
                track_filename[0] = '\0';
 
diff --git a/tasks/task_database.c b/tasks/task_database.c
index 2938889d12..edef9dc94f 100644
--- a/tasks/task_database.c
+++ b/tasks/task_database.c
@@ -37,7 +37,6 @@
 #include "../playlist.h"
 #ifdef RARCH_INTERNAL
 #include "../configuration.h"
-#include "../retroarch.h"
 #include "../ui/ui_companion_driver.h"
 #include "../gfx/video_display_server.h"
 #endif
diff --git a/tasks/task_database_cue.c b/tasks/task_database_cue.c
index be8019e540..bc281fe077 100644
--- a/tasks/task_database_cue.c
+++ b/tasks/task_database_cue.c
@@ -27,7 +27,6 @@
 #include <streams/file_stream.h>
 #include <streams/interface_stream.h>
 #include <string/stdstring.h>
-#include "../retroarch.h"
 #include "task_database_cue.h"
 
 #ifdef HAVE_CONFIG_H
@@ -38,7 +37,6 @@
 
 #include "tasks_internal.h"
 
-#include "../list_special.h"
 #include "../msg_hash.h"
 #include "../verbosity.h"
 
diff --git a/tasks/task_manual_content_scan.c b/tasks/task_manual_content_scan.c
index e904f86b72..0b3cfcec9d 100644
--- a/tasks/task_manual_content_scan.c
+++ b/tasks/task_manual_content_scan.c
@@ -30,8 +30,6 @@
 
 #include "tasks_internal.h"
 
-#include "../configuration.h"
-#include "../retroarch.h"
 #include "../msg_hash.h"
 #include "../playlist.h"
 #include "../manual_content_scan.h"
diff --git a/tasks/task_netplay_nat_traversal.c b/tasks/task_netplay_nat_traversal.c
index 0ea2373ce1..0d167d80a7 100644
--- a/tasks/task_netplay_nat_traversal.c
+++ b/tasks/task_netplay_nat_traversal.c
@@ -50,11 +50,9 @@ static bool find_local_address(struct natt_device *device,
       struct addrinfo hints  = {0};
       uint8_t *dev_addr8     = (uint8_t*)&device->addr.sin_addr;
 
-      addrs  = (struct addrinfo**)calloc(interfaces.size, sizeof(*addrs));
-      if (!addrs)
+      if (!(addrs  = (struct addrinfo**)calloc(interfaces.size, sizeof(*addrs))))
          goto done;
-      scores = (uint32_t*)calloc(interfaces.size, sizeof(*scores));
-      if (!scores)
+      if (!(scores = (uint32_t*)calloc(interfaces.size, sizeof(*scores))))
          goto done;
 
       hints.ai_family = AF_INET;
diff --git a/tasks/task_overlay.c b/tasks/task_overlay.c
index 350cf2582b..20ba577431 100644
--- a/tasks/task_overlay.c
+++ b/tasks/task_overlay.c
@@ -27,9 +27,10 @@
 
 #include "tasks_internal.h"
 
+#include "../gfx/video_driver.h"
+#include "../input/input_driver.h"
 #include "../input/input_overlay.h"
 #include "../input/input_remapping.h"
-#include "../retroarch.h"
 #include "../verbosity.h"
 
 typedef struct overlay_loader overlay_loader_t;
diff --git a/tasks/task_patch.c b/tasks/task_patch.c
index 496898b247..b5a30ae335 100644
--- a/tasks/task_patch.c
+++ b/tasks/task_patch.c
@@ -31,7 +31,7 @@
 
 #include <encodings/crc32.h>
 
-#include "../retroarch.h"
+#include "../runloop.h"
 #include "../msg_hash.h"
 #include "../verbosity.h"
 #include "../configuration.h"
diff --git a/tasks/task_save.c b/tasks/task_save.c
index baa92b1a6e..85b23650bd 100644
--- a/tasks/task_save.c
+++ b/tasks/task_save.c
@@ -54,8 +54,9 @@
 #include "../core_info.h"
 #include "../file_path_special.h"
 #include "../configuration.h"
+#include "../gfx/video_driver.h"
 #include "../msg_hash.h"
-#include "../retroarch.h"
+#include "../runloop.h"
 #include "../verbosity.h"
 #include "tasks_internal.h"
 #ifdef HAVE_CHEATS
diff --git a/tasks/task_screenshot.c b/tasks/task_screenshot.c
index 0206bd2154..c0a857d8f9 100644
--- a/tasks/task_screenshot.c
+++ b/tasks/task_screenshot.c
@@ -49,10 +49,8 @@
 #include "../defaults.h"
 #include "../command.h"
 #include "../configuration.h"
-#include "../retroarch.h"
 #include "../paths.h"
 #include "../msg_hash.h"
-#include "../verbosity.h"
 
 #include "tasks_internal.h"
 
diff --git a/tasks/tasks_internal.h b/tasks/tasks_internal.h
index 1c3766642b..fb9025efa1 100644
--- a/tasks/tasks_internal.h
+++ b/tasks/tasks_internal.h
@@ -100,7 +100,8 @@ bool task_push_netplay_nat_close(void *data);
 
 void *task_push_get_core_updater_list(
       core_updater_list_t* core_list, bool mute, bool refresh_menu);
-/* Note: If crc is set to 0, crc of local core file
+
+/* NOTE: If CRC is set to 0, CRC of local core file
  * will be calculated automatically */
 void *task_push_core_updater_download(
       core_updater_list_t* core_list,
@@ -143,9 +144,9 @@ bool task_push_pl_thumbnail_download(
 
 /* Core backup/restore tasks */
 
-/* Note 1: If crc is set to 0, crc of core_path file will
+/* NOTE 1: If CRC is set to 0, CRC of core_path file will
  * be calculated automatically
- * Note 2: If core_display_name is set to NULL, display
+ * NOTE 2: If core_display_name is set to NULL, display
  * name will be determined automatically
  * > core_display_name *must* be set to a non-empty
  *   string if task_push_core_backup() is *not* called
@@ -155,7 +156,8 @@ void *task_push_core_backup(
       uint32_t crc, enum core_backup_mode backup_mode,
       size_t auto_backup_history_size,
       const char *dir_core_assets, bool mute);
-/* Note: If 'core_loaded' is true, menu stack should be
+
+/* NOTE: If 'core_loaded' is true, menu stack should be
  * flushed if task_push_core_restore() returns true */
 bool task_push_core_restore(const char *backup_path,
       const char *dir_libretro,