diff --git a/audio/audio_driver.c b/audio/audio_driver.c
index 6bc5b1812b..9be76bf6c9 100644
--- a/audio/audio_driver.c
+++ b/audio/audio_driver.c
@@ -20,6 +20,7 @@
 
 #include "audio_driver.h"
 #include "audio_resampler_driver.h"
+#include "../record/record_driver.h"
 #include "audio_utils.h"
 #include "audio_thread_wrapper.h"
 
diff --git a/command_event.c b/command_event.c
index 0e21bc0b02..273dc57fd8 100644
--- a/command_event.c
+++ b/command_event.c
@@ -21,6 +21,7 @@
 
 #include "frontend/frontend_driver.h"
 #include "audio/audio_driver.h"
+#include "record/record_driver.h"
 #include "autosave.h"
 #include "cheats.h"
 #include "general.h"
diff --git a/driver.c b/driver.c
index 6cc5cab60a..7183d0705b 100644
--- a/driver.c
+++ b/driver.c
@@ -24,6 +24,7 @@
 #include "audio/audio_driver.h"
 #include "audio/audio_resampler_driver.h"
 #include "camera/camera_driver.h"
+#include "record/record_driver.h"
 #include "location/location_driver.h"
 
 #ifdef HAVE_MENU
diff --git a/driver.h b/driver.h
index 9484a2e23d..2d583cc44a 100644
--- a/driver.h
+++ b/driver.h
@@ -26,9 +26,6 @@
 #include <retro_miscellaneous.h>
 
 #include "libretro_private.h"
-
-#include "record/record_driver.h"
-
 #include "libretro_version_1.h"
 
 #ifdef HAVE_CONFIG_H
diff --git a/dynamic.c b/dynamic.c
index a66e93ff13..9b9ef20eb7 100644
--- a/dynamic.c
+++ b/dynamic.c
@@ -30,6 +30,7 @@
 #include "audio/audio_driver.h"
 #include "camera/camera_driver.h"
 #include "location/location_driver.h"
+#include "record/record_driver.h"
 #include "performance.h"
 
 #include "libretro_private.h"
diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c
index 02afb85930..75e8a604ec 100644
--- a/gfx/drivers/gl.c
+++ b/gfx/drivers/gl.c
@@ -32,6 +32,7 @@
 #include <retro_miscellaneous.h>
 
 #include "../../driver.h"
+#include "../../record/record_driver.h"
 #include "../../performance.h"
 
 #include "../../libretro.h"
diff --git a/gfx/video_driver.c b/gfx/video_driver.c
index dae4a19a69..93535739c6 100644
--- a/gfx/video_driver.c
+++ b/gfx/video_driver.c
@@ -24,6 +24,7 @@
 #include "video_thread_wrapper.h"
 #include "../frontend/frontend_driver.h"
 #include "video_context_driver.h"
+#include "../record/record_driver.h"
 #include "../config.def.h"
 #include "../general.h"
 #include "../performance.h"
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index dfb9d3ab44..47f90236ff 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -40,6 +40,7 @@
 #include "../dynamic.h"
 #include "../camera/camera_driver.h"
 #include "../location/location_driver.h"
+#include "../record/record_driver.h"
 #include "../audio/audio_driver.h"
 #include "../audio/audio_resampler_driver.h"
 #include "../input/input_config.h"
diff --git a/retroarch.c b/retroarch.c
index 6ba1a3c7e5..3cb3e86137 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -43,6 +43,7 @@
 
 #include "frontend/frontend_driver.h"
 #include "audio/audio_driver.h"
+#include "record/record_driver.h"
 #include "libretro_version_1.h"
 #include "configuration.h"
 #include "general.h"
diff --git a/runloop.c b/runloop.c
index 6e58ce1ccb..e55ebe2992 100644
--- a/runloop.c
+++ b/runloop.c
@@ -43,13 +43,14 @@
 #include "dir_list_special.h"
 #include "audio/audio_driver.h"
 #include "camera/camera_driver.h"
+#include "record/record_driver.h"
+#include "input/input_driver.h"
+#include "ui/ui_companion_driver.h"
 
 #include "msg_hash.h"
 
 #include "tasks/tasks.h"
 #include "input/input_keyboard.h"
-#include "input/input_driver.h"
-#include "ui/ui_companion_driver.h"
 
 #ifdef HAVE_MENU
 #include "menu/menu.h"