diff --git a/audio/audio_driver.c b/audio/audio_driver.c
index 592a8d73fb..6bc5b1812b 100644
--- a/audio/audio_driver.c
+++ b/audio/audio_driver.c
@@ -16,11 +16,15 @@
 
 #include <string.h>
 
+#include <retro_assert.h>
+
 #include "audio_driver.h"
 #include "audio_resampler_driver.h"
 #include "audio_utils.h"
 #include "audio_thread_wrapper.h"
 
+#include "../command_event.h"
+#include "../configuration.h"
 #include "../general.h"
 #include "../verbosity.h"
 #include "../string_list_special.h"
diff --git a/command_event.c b/command_event.c
index 4a4f5a4900..bc17996330 100644
--- a/command_event.c
+++ b/command_event.c
@@ -45,6 +45,7 @@
 
 #ifdef HAVE_MENU
 #include "menu/menu.h"
+#include "menu/menu_driver.h"
 #include "menu/menu_display.h"
 #include "menu/menu_shader.h"
 #include "menu/menu_input.h"
diff --git a/driver.h b/driver.h
index cae317cb54..7c98fab49f 100644
--- a/driver.h
+++ b/driver.h
@@ -33,10 +33,6 @@
 
 #include "libretro_version_1.h"
 
-#ifdef HAVE_MENU
-#include "menu/menu_driver.h"
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c
index 755419d0d3..0b4a5ee7a2 100644
--- a/gfx/drivers/gl.c
+++ b/gfx/drivers/gl.c
@@ -54,6 +54,10 @@
 #include <string/string_list.h>
 #endif
 
+#ifdef HAVE_MENU
+#include "../../menu/menu_driver.h"
+#endif
+
 #if defined(_WIN32) && !defined(_XBOX)
 #include "../common/win32_common.h"
 #endif
diff --git a/gfx/drivers/sdl2_gfx.c b/gfx/drivers/sdl2_gfx.c
index 193a670640..f31131eb66 100644
--- a/gfx/drivers/sdl2_gfx.c
+++ b/gfx/drivers/sdl2_gfx.c
@@ -34,6 +34,10 @@
 #include "../common/x11_common.h"
 #endif
 
+#ifdef HAVE_MENU
+#include "../../menu/menu_driver.h"
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/input/drivers_hid/libusb_hid.c b/input/drivers_hid/libusb_hid.c
index 5dea568c14..9d9430aecb 100644
--- a/input/drivers_hid/libusb_hid.c
+++ b/input/drivers_hid/libusb_hid.c
@@ -27,6 +27,7 @@
 #include "../input_config.h"
 #include "../input_driver.h"
 #include "../input_hid_driver.h"
+#include "../../driver.h"
 #include "../../verbosity.h"
 
 #ifndef LIBUSB_CAP_HAS_HOTPLUG
diff --git a/input/drivers_joypad/ctr_joypad.c b/input/drivers_joypad/ctr_joypad.c
index 9d29e9209e..55b8607544 100644
--- a/input/drivers_joypad/ctr_joypad.c
+++ b/input/drivers_joypad/ctr_joypad.c
@@ -15,9 +15,9 @@
  */
 
 #include "../input_joypad_driver.h"
+#include "../input_driver.h"
 #include "../input_autodetect.h"
 #include "../../general.h"
-#include "../../driver.h"
 #include "../../configuration.h"
 #include "../../retroarch.h"
 #include "string.h"
diff --git a/input/drivers_joypad/hid_joypad.c b/input/drivers_joypad/hid_joypad.c
index 72fcd19160..5f06cbbe50 100644
--- a/input/drivers_joypad/hid_joypad.c
+++ b/input/drivers_joypad/hid_joypad.c
@@ -16,7 +16,7 @@
 
 #include "../input_autodetect.h"
 #include "../input_hid_driver.h"
-#include "../../driver.h"
+#include "../input_driver.h"
 
 static const hid_driver_t *generic_hid;
 
diff --git a/input/input_config.h b/input/input_config.h
index 9a641bf8b0..589c48ad34 100644
--- a/input/input_config.h
+++ b/input/input_config.h
@@ -17,9 +17,11 @@
 #ifndef INPUT_CONFIG_H__
 #define INPUT_CONFIG_H__
 
-#include <file/config_file.h>
 #include <stdint.h>
-#include "../driver.h"
+
+#include <file/config_file.h>
+
+#include "input_driver.h"
 
 const char *input_config_bind_map_get_base(unsigned i);
 
diff --git a/input/input_overlay.c b/input/input_overlay.c
index d51bdee99b..97e9b05922 100644
--- a/input/input_overlay.c
+++ b/input/input_overlay.c
@@ -35,6 +35,10 @@
 #include "../verbosity.h"
 #include "../tasks/tasks.h"
 
+#ifdef HAVE_MENU
+#include "../menu/menu_driver.h"
+#endif
+
 struct input_overlay
 {
    void *iface_data;
diff --git a/menu/menu.h b/menu/menu.h
index dd406e54bd..65401dba27 100644
--- a/menu/menu.h
+++ b/menu/menu.h
@@ -24,6 +24,7 @@
 #include <ctype.h>
 #include <boolean.h>
 
+#include "menu_driver.h"
 #include "../driver.h"
 #include "../input/input_driver.h"
 #include "../dynamic.h"
diff --git a/menu/menu_navigation.c b/menu/menu_navigation.c
index 5295766337..4a9f04bc4f 100644
--- a/menu/menu_navigation.c
+++ b/menu/menu_navigation.c
@@ -29,6 +29,8 @@
 #include <boolean.h>
 
 #include "../configuration.h"
+#include "menu_driver.h"
+#include "menu_navigation.h"
 
 typedef struct menu_navigation
 {
diff --git a/netplay.c b/netplay.c
index f591b937be..d719d908df 100644
--- a/netplay.c
+++ b/netplay.c
@@ -26,6 +26,7 @@
 #include <retro_endianness.h>
 
 #include "netplay.h"
+#include "command_event.h"
 #include "general.h"
 #include "autosave.h"
 #include "dynamic.h"
diff --git a/record/record_driver.c b/record/record_driver.c
index 396f63fe97..f37eba141a 100644
--- a/record/record_driver.c
+++ b/record/record_driver.c
@@ -20,7 +20,7 @@
 
 #include "record_driver.h"
 
-#include "../driver.h"
+#include "../command_event.h"
 #include "../general.h"
 #include "../verbosity.h"
 #include "../msg_hash.h"