diff --git a/command_event.c b/command_event.c
index 905e6e6a6f..599804546a 100644
--- a/command_event.c
+++ b/command_event.c
@@ -22,6 +22,7 @@
 
 #include "command_event.h"
 
+#include "defaults.h"
 #include "frontend/frontend_driver.h"
 #include "audio/audio_driver.h"
 #include "record/record_driver.h"
diff --git a/content.c b/content.c
index 38ed9a5961..c1ed491421 100644
--- a/content.c
+++ b/content.c
@@ -52,6 +52,7 @@
 #include <lists/string_list.h>
 #include <string/stdstring.h>
 
+#include "defaults.h"
 #include "msg_hash.h"
 #include "content.h"
 #include "general.h"
diff --git a/frontend/drivers/platform_darwin.m b/frontend/drivers/platform_darwin.m
index fb95b0395c..d93b6833a3 100644
--- a/frontend/drivers/platform_darwin.m
+++ b/frontend/drivers/platform_darwin.m
@@ -46,9 +46,10 @@
 #include <rhash.h>
 
 #include "../frontend_driver.h"
-#include "../../ui/ui_companion_driver.h"
+#include "../../defaults.h"
 #include "../../general.h"
 #include "../../verbosity.h"
+#include "../../ui/ui_companion_driver.h"
 
 #ifdef HAVE_MENU
 #include "../../menu/menu_driver.h"
diff --git a/frontend/drivers/platform_emscripten.c b/frontend/drivers/platform_emscripten.c
index 9cee89de8f..e915e8f18d 100644
--- a/frontend/drivers/platform_emscripten.c
+++ b/frontend/drivers/platform_emscripten.c
@@ -19,6 +19,7 @@
 
 #include <file/config_file.h>
 
+#include "../../defaults.h"
 #include "../../general.h"
 #include "../../content.h"
 #include "../frontend.h"
diff --git a/frontend/drivers/platform_linux.c b/frontend/drivers/platform_linux.c
index 95ce3dceee..902f0714dd 100644
--- a/frontend/drivers/platform_linux.c
+++ b/frontend/drivers/platform_linux.c
@@ -46,6 +46,7 @@
 
 #include "../frontend.h"
 #include "../frontend_driver.h"
+#include "../../defaults.h"
 #include "../../general.h"
 #include "../../verbosity.h"
 #include "platform_linux.h"
diff --git a/frontend/drivers/platform_qnx.c b/frontend/drivers/platform_qnx.c
index d8bee45cac..8999574120 100644
--- a/frontend/drivers/platform_qnx.c
+++ b/frontend/drivers/platform_qnx.c
@@ -22,6 +22,7 @@
 
 #include <bps/bps.h>
 
+#include "../../defaults.h"
 #include "../../dynamic.h"
 
 static void frontend_qnx_init(void *data)
diff --git a/frontend/frontend_driver.h b/frontend/frontend_driver.h
index 9f0208a786..395b1df04a 100644
--- a/frontend/frontend_driver.h
+++ b/frontend/frontend_driver.h
@@ -21,8 +21,6 @@
 
 #include <boolean.h>
 
-#include "../defaults.h"
-
 #ifdef HAVE_CONFIG_H
 #include "../config.h"
 #endif
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 6b4371d503..ae93953a39 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -30,6 +30,7 @@
 #include "../database_info.h"
 #endif
 
+#include "../defaults.h"
 #include "../cheats.h"
 #include "../general.h"
 #include "../retroarch.h"