diff --git a/Makefile.common b/Makefile.common
index d091566bfe..83498869c0 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -308,7 +308,7 @@ endif
 ifeq ($(HAVE_PYTHON), 1)
    DEFINES += $(PYTHON_CFLAGS) -Wno-unused-parameter
    LIBS += $(PYTHON_LIBS)
-   OBJ += gfx/video_state_python.o
+   OBJ += gfx/drivers_tracker/video_state_python.o
 endif
 
 ifeq ($(HAVE_EMSCRIPTEN), 1)
diff --git a/gfx/video_state_python.c b/gfx/drivers_tracker/video_state_python.c
similarity index 98%
rename from gfx/video_state_python.c
rename to gfx/drivers_tracker/video_state_python.c
index f6737a6ca3..bbdbff6679 100644
--- a/gfx/video_state_python.c
+++ b/gfx/drivers_tracker/video_state_python.c
@@ -27,10 +27,10 @@
 #include <libretro.h>
 
 #include "video_state_python.h"
-#include "../dynamic.h"
-#include "../core.h"
-#include "../verbosity.h"
-#include "../input/input_config.h"
+#include "../../dynamic.h"
+#include "../../core.h"
+#include "../../verbosity.h"
+#include "../../input/input_config.h"
 
 static PyObject* py_read_wram(PyObject *self, PyObject *args)
 {
diff --git a/gfx/video_state_python.h b/gfx/drivers_tracker/video_state_python.h
similarity index 100%
rename from gfx/video_state_python.h
rename to gfx/drivers_tracker/video_state_python.h
diff --git a/gfx/video_state_tracker.c b/gfx/video_state_tracker.c
index 106ef18b99..d15d437e42 100644
--- a/gfx/video_state_tracker.c
+++ b/gfx/video_state_tracker.c
@@ -24,7 +24,7 @@
 #endif
 
 #ifdef HAVE_PYTHON
-#include "video_state_python.h"
+#include "drivers_tracker/video_state_python.h"
 #endif
 
 #include "video_state_tracker.h"
diff --git a/griffin/griffin.c b/griffin/griffin.c
index f0fd8b8c2c..a3508ccd5c 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -523,7 +523,7 @@ STATE TRACKER
 #include "../gfx/video_state_tracker.c"
 
 #ifdef HAVE_PYTHON
-#include "../gfx/video_state_python.c"
+#include "../gfx/drivers_tracker/video_state_python.c"
 #endif
 
 /*============================================================