diff --git a/driver.h b/driver.h
index 98fb7f6a83..81ca383bb0 100644
--- a/driver.h
+++ b/driver.h
@@ -27,7 +27,6 @@
 
 #include "libretro_private.h"
 
-#include "ui/ui_companion_driver.h"
 #include "gfx/font_renderer_driver.h"
 
 #include "camera/camera_driver.h"
diff --git a/frontend/frontend.c b/frontend/frontend.c
index f468b1d84c..84b5500f4a 100644
--- a/frontend/frontend.c
+++ b/frontend/frontend.c
@@ -21,6 +21,7 @@
 #include <rthreads/async_job.h>
 
 #include "frontend.h"
+#include "../ui/ui_companion_driver.h"
 
 #include "../defaults.h"
 #include "../driver.h"
@@ -30,6 +31,7 @@
 #include "../runloop.h"
 #include "../verbosity.h"
 
+
 #define MAX_ARGS 32
 
 /**
diff --git a/menu/cbs/menu_cbs_right.c b/menu/cbs/menu_cbs_right.c
index 8703684eac..4c634425e8 100644
--- a/menu/cbs/menu_cbs_right.c
+++ b/menu/cbs/menu_cbs_right.c
@@ -26,6 +26,7 @@
 #include "../../cheats.h"
 #include "../../general.h"
 #include "../../retroarch.h"
+#include "../../ui/ui_companion_driver.h"
 
 #ifndef BIND_ACTION_RIGHT
 #define BIND_ACTION_RIGHT(cbs, name) \
diff --git a/menu/drivers/menu_generic.c b/menu/drivers/menu_generic.c
index 00aa37ada5..0d918f0430 100644
--- a/menu/drivers/menu_generic.c
+++ b/menu/drivers/menu_generic.c
@@ -31,6 +31,7 @@
 #include "../../input/input_autodetect.h"
 #include "../../input/input_config.h"
 #include "../../cheevos.h"
+#include "../../ui/ui_companion_driver.h"
 
 #include "../../runloop.h"
 #include "../../verbosity.h"
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 35c904fb82..ba871c1568 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -31,6 +31,7 @@
 #include "../cheats.h"
 #include "../general.h"
 #include "../frontend/frontend_driver.h"
+#include "../ui/ui_companion_driver.h"
 #include "../gfx/video_shader_driver.h"
 #include "../config.features.h"
 #include "../git_version.h"
diff --git a/ui/ui_companion_driver.c b/ui/ui_companion_driver.c
index 395072f1b5..2ad1dee9ed 100644
--- a/ui/ui_companion_driver.c
+++ b/ui/ui_companion_driver.c
@@ -18,12 +18,13 @@
 #include <boolean.h>
 
 #include "../configuration.h"
-#include "../driver.h"
 
 #ifdef HAVE_CONFIG_H
 #include "../config.h"
 #endif
 
+#include "ui_companion_driver.h"
+
 
 static const ui_companion_driver_t *ui_companion_drivers[] = {
 #if defined(_WIN32) && !defined(_XBOX)