diff --git a/tasks/task_content.c b/tasks/task_content.c
index cfe2159c7f..2f28630fb0 100644
--- a/tasks/task_content.c
+++ b/tasks/task_content.c
@@ -77,16 +77,13 @@
 #include <lists/string_list.h>
 #include <string/stdstring.h>
 
-#include "../defaults.h"
 #include "../msg_hash.h"
 #include "../content.h"
-#include "../general.h"
 #include "../dynamic.h"
-#include "../movie.h"
 #include "../patch.h"
 #include "../system.h"
+#include "../runloop.h"
 #include "../retroarch.h"
-#include "../command.h"
 #include "../file_path_special.h"
 #include "../core.h"
 #include "../verbosity.h"
@@ -106,7 +103,6 @@
 #include "../cheevos.h"
 #endif
 
-#define MAX_ARGS 32
 
 typedef struct content_stream
 {
@@ -932,6 +928,8 @@ static void content_load_init_wrap(
 #endif
 }
 
+#define MAX_ARGS 32
+
 /**
  * content_load:
  *
diff --git a/tasks/task_database_cue.c b/tasks/task_database_cue.c
index 32073a32dc..110521dd4b 100644
--- a/tasks/task_database_cue.c
+++ b/tasks/task_database_cue.c
@@ -32,7 +32,6 @@
 
 #include "../list_special.h"
 #include "../msg_hash.h"
-#include "../general.h"
 #include "../verbosity.h"
 
 #define MAGIC_LEN       16