diff --git a/Makefile.common b/Makefile.common
index a9b9db40d2..aee0f662dc 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -98,7 +98,7 @@ OBJ += frontend/frontend.o \
 		libretro-sdk/file/file_path.o \
 		hash.o \
 		audio/audio_driver.o \
-		video_driver.o \
+		gfx/video_driver.o \
 		driver.o \
 		settings.o \
 		settings_list.o \
diff --git a/driver.h b/driver.h
index 3a6950f0e4..18fb2f8c80 100644
--- a/driver.h
+++ b/driver.h
@@ -30,7 +30,7 @@
 #include "frontend/frontend_context.h"
 #include <retro_miscellaneous.h>
 
-#include "video_driver.h"
+#include "gfx/video_driver.h"
 #include "audio/audio_driver.h"
 
 #include "menu/menu_driver.h"
diff --git a/video_driver.c b/gfx/video_driver.c
similarity index 99%
rename from video_driver.c
rename to gfx/video_driver.c
index 42ba784877..d23fadca4c 100644
--- a/video_driver.c
+++ b/gfx/video_driver.c
@@ -17,7 +17,7 @@
 #include <string.h>
 #include <string/string_list.h>
 #include "video_driver.h"
-#include "general.h"
+#include "../general.h"
 
 static const video_driver_t *video_drivers[] = {
 #ifdef HAVE_OPENGL
diff --git a/video_driver.h b/gfx/video_driver.h
similarity index 98%
rename from video_driver.h
rename to gfx/video_driver.h
index d70feb4d70..0954205f71 100644
--- a/video_driver.h
+++ b/gfx/video_driver.h
@@ -21,13 +21,13 @@
 #include <stddef.h>
 #include <sys/types.h>
 #include <boolean.h>
-#include "libretro.h"
+#include "../libretro.h"
 
-#include "input/input_context.h"
-#include "gfx/shader/shader_parse.h"
+#include "../input/input_context.h"
+#include "../gfx/shader/shader_parse.h"
 
 #ifdef HAVE_OVERLAY
-#include "input/overlay.h"
+#include "../input/overlay.h"
 #endif
 
 #ifdef __cplusplus
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 4a3ec780d6..b62f687643 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -496,7 +496,7 @@ AUDIO
 /*============================================================
 DRIVERS
 ============================================================ */
-#include "../video_driver.c"
+#include "../gfx/video_driver.c"
 #include "../audio/audio_driver.c"
 #include "../driver.c"