diff --git a/driver.c b/driver.c
index 08d1dd98b9..f146e04869 100644
--- a/driver.c
+++ b/driver.c
@@ -967,25 +967,3 @@ bool driver_monitor_fps_statistics(double *refresh_rate,
 
    return true;
 }
-
-/**
- * driver_video_resolve:
- * @drv                : real video driver will be set to this.
- *
- * Use this if you need the real video driver 
- * and driver data pointers.
- *
- * Returns: video driver's userdata.
- **/
-void *driver_video_resolve(const video_driver_t **drv)
-{
-#ifdef HAVE_THREADS
-   if (g_settings.video.threaded
-         && !g_extern.system.hw_render_callback.context_type)
-      return rarch_threaded_video_resolve(drv);
-#endif
-   if (drv)
-      *drv = driver.video;
-
-   return driver.video_data;
-}
diff --git a/driver.h b/driver.h
index 6082fc21a4..52450f60c3 100644
--- a/driver.h
+++ b/driver.h
@@ -445,18 +445,6 @@ bool driver_set_sensor_state(unsigned port,
 
 float driver_sensor_get_input(unsigned port, unsigned action);
 
-/**
- * driver_video_resolve:
- * @drv                : real video driver will be set to this.
- *
- * Use this if you need the real video driver 
- * and driver data pointers.
- *
- * Returns: video driver's userdata.
- **/
-void *driver_video_resolve(const video_driver_t **drv);
-
-
 /**
  * driver_update_system_av_info:
  * @info               : pointer to new A/V info
diff --git a/gfx/video_driver.c b/gfx/video_driver.c
index d23fadca4c..da9a4468e2 100644
--- a/gfx/video_driver.c
+++ b/gfx/video_driver.c
@@ -17,6 +17,7 @@
 #include <string.h>
 #include <string/string_list.h>
 #include "video_driver.h"
+#include "video_thread_wrapper.h"
 #include "../general.h"
 
 static const video_driver_t *video_drivers[] = {
@@ -165,3 +166,25 @@ void find_video_driver(void)
          rarch_fail(1, "find_video_driver()");
    }
 }
+
+/**
+ * driver_video_resolve:
+ * @drv                : real video driver will be set to this.
+ *
+ * Use this if you need the real video driver 
+ * and driver data pointers.
+ *
+ * Returns: video driver's userdata.
+ **/
+void *driver_video_resolve(const video_driver_t **drv)
+{
+#ifdef HAVE_THREADS
+   if (g_settings.video.threaded
+         && !g_extern.system.hw_render_callback.context_type)
+      return rarch_threaded_video_resolve(drv);
+#endif
+   if (drv)
+      *drv = driver.video;
+
+   return driver.video_data;
+}
diff --git a/gfx/video_driver.h b/gfx/video_driver.h
index 931ee425f9..ebe6ecae1a 100644
--- a/gfx/video_driver.h
+++ b/gfx/video_driver.h
@@ -213,6 +213,17 @@ const char* config_get_video_driver_options(void);
 
 void find_video_driver(void);
 
+/**
+ * driver_video_resolve:
+ * @drv                : real video driver will be set to this.
+ *
+ * Use this if you need the real video driver 
+ * and driver data pointers.
+ *
+ * Returns: video driver's userdata.
+ **/
+void *driver_video_resolve(const video_driver_t **drv);
+
 #ifdef __cplusplus
 }
 #endif