diff --git a/config.def.h b/config.def.h
index a72a4fdc1e..81efc563d8 100644
--- a/config.def.h
+++ b/config.def.h
@@ -20,6 +20,7 @@
 #include <boolean.h>
 #include "libretro.h"
 #include "driver.h"
+#include "gfx/video_driver.h"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/configuration.h b/configuration.h
index 52171001da..5b42d8a4bb 100644
--- a/configuration.h
+++ b/configuration.h
@@ -20,6 +20,7 @@
 #include <stdint.h>
 #include <retro_miscellaneous.h>
 #include "driver.h"
+#include "gfx/video_driver.h"
 
 #ifndef MAX_USERS
 #define MAX_USERS 16
diff --git a/driver.h b/driver.h
index 1f3bda1bc3..09db5848f0 100644
--- a/driver.h
+++ b/driver.h
@@ -28,7 +28,6 @@
 
 #include "frontend/frontend_driver.h"
 #include "ui/ui_companion_driver.h"
-#include "gfx/video_driver.h"
 #include "gfx/font_renderer_driver.h"
 
 #include "camera/camera_driver.h"
diff --git a/gfx/video_context_driver.h b/gfx/video_context_driver.h
index b974dc6323..0c24c0b662 100644
--- a/gfx/video_context_driver.h
+++ b/gfx/video_context_driver.h
@@ -18,7 +18,8 @@
 #define __VIDEO_CONTEXT_DRIVER_H
 
 #include <boolean.h>
-#include "../driver.h"
+
+#include "video_driver.h"
 
 #ifdef HAVE_CONFIG_H
 #include "../config.h"