diff --git a/command_event.c b/command_event.c
index 181c85c815..4a4f5a4900 100644
--- a/command_event.c
+++ b/command_event.c
@@ -19,6 +19,7 @@
 
 #include "command_event.h"
 
+#include "frontend/frontend_driver.h"
 #include "audio/audio_driver.h"
 #include "autosave.h"
 #include "cheats.h"
diff --git a/driver.h b/driver.h
index b89b182b16..b215953f5a 100644
--- a/driver.h
+++ b/driver.h
@@ -27,7 +27,6 @@
 
 #include "libretro_private.h"
 
-#include "frontend/frontend_driver.h"
 #include "ui/ui_companion_driver.h"
 #include "gfx/font_renderer_driver.h"
 
diff --git a/gfx/video_driver.c b/gfx/video_driver.c
index 2e3baafc7b..9e4cdbef86 100644
--- a/gfx/video_driver.c
+++ b/gfx/video_driver.c
@@ -22,6 +22,7 @@
 #include <file/config_file.h>
 
 #include "video_thread_wrapper.h"
+#include "../frontend/frontend_driver.h"
 #include "video_context_driver.h"
 #include "../config.def.h"
 #include "../general.h"
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 7a71a3e3b8..46d746dcb7 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -30,6 +30,7 @@
 
 #include "../cheats.h"
 #include "../general.h"
+#include "../frontend/frontend_driver.h"
 #include "../gfx/video_shader_driver.h"
 #include "../config.features.h"
 #include "../git_version.h"
diff --git a/retroarch.c b/retroarch.c
index 66250ef44d..b104d0aab5 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -41,6 +41,7 @@
 #include "movie.h"
 #include "verbosity.h"
 
+#include "frontend/frontend_driver.h"
 #include "audio/audio_driver.h"
 #include "libretro_version_1.h"
 #include "configuration.h"