diff --git a/config.def.h b/config.def.h
index acd1e43561..74d841be25 100644
--- a/config.def.h
+++ b/config.def.h
@@ -18,7 +18,6 @@
 #define __CONFIG_DEF_H
 
 #include <boolean.h>
-#include "driver.h"
 #include "gfx/video_driver.h"
 
 #ifdef HAVE_CONFIG_H
diff --git a/gfx/video_driver.c b/gfx/video_driver.c
index e801d9b37c..9842f5019d 100644
--- a/gfx/video_driver.c
+++ b/gfx/video_driver.c
@@ -47,6 +47,7 @@
 #include "../record/record_driver.h"
 #include "../config.def.h"
 #include "../configuration.h"
+#include "../driver.h"
 #include "../retroarch.h"
 #include "../runloop.h"
 #include "../performance_counters.h"
diff --git a/menu/menu_driver.c b/menu/menu_driver.c
index 1073f4f0e6..17f26cd316 100644
--- a/menu/menu_driver.c
+++ b/menu/menu_driver.c
@@ -35,9 +35,10 @@
 #include "../config.def.h"
 #include "../content.h"
 #include "../configuration.h"
-#include "../dynamic.h"
 #include "../core.h"
 #include "../core_info.h"
+#include "../dynamic.h"
+#include "../driver.h"
 #include "../retroarch.h"
 #include "../defaults.h"
 #include "../frontend/frontend.h"