diff --git a/configuration.c b/configuration.c
index 89738d988e..36d5c85af0 100644
--- a/configuration.c
+++ b/configuration.c
@@ -28,6 +28,7 @@
 #include "input/input_config.h"
 #include "input/input_keymaps.h"
 #include "input/input_remapping.h"
+#include "defaults.h"
 #include "general.h"
 #include "retroarch.h"
 #include "system.h"
diff --git a/frontend/frontend_driver.h b/frontend/frontend_driver.h
index 8243af9569..33f9f4ea21 100644
--- a/frontend/frontend_driver.h
+++ b/frontend/frontend_driver.h
@@ -21,6 +21,8 @@
 
 #include <boolean.h>
 
+#include "../defaults.h"
+
 #ifdef HAVE_CONFIG_H
 #include "../config.h"
 #endif
diff --git a/general.h b/general.h
index 8adbfb3534..6741f67ea9 100644
--- a/general.h
+++ b/general.h
@@ -25,7 +25,6 @@
 #include <retro_assert.h>
 
 #include "runloop.h"
-#include "defaults.h"
 #include "verbosity.h"
 
 #ifdef HAVE_CONFIG_H
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index 819e036bc2..72ec8ce74c 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -23,6 +23,7 @@
 #include "../menu_shader.h"
 #include "../menu_hash.h"
 
+#include "../../defaults.h"
 #include "../../cheats.h"
 #include "../../general.h"
 #include "../../tasks/tasks.h"
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index a336f898bd..4e872e9f3f 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -35,6 +35,7 @@
 #include "menu_input.h"
 #include "menu_hash.h"
 
+#include "../defaults.h"
 #include "../driver.h"
 #include "../general.h"
 #include "../system.h"