diff --git a/Makefile.common b/Makefile.common
index 7429869b14..5750ad4851 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -629,7 +629,7 @@ endif
 # Record
 
 ifeq ($(HAVE_FFMPEG), 1)
-   OBJ += record/ffmpeg.o
+   OBJ += record/drivers/ffmpeg.o
    LIBS += $(AVCODEC_LIBS) $(AVFORMAT_LIBS) $(AVUTIL_LIBS) $(SWSCALE_LIBS) $(FFMPEG_LIBS)
    DEFINES += $(AVCODEC_CFLAGS) $(AVFORMAT_CFLAGS) $(AVUTIL_CFLAGS) $(SWSCALE_CFLAGS)
 	DEFINES += -DHAVE_FFMPEG -Iffmpeg
diff --git a/record/ffmpeg.c b/record/drivers/ffmpeg.c
similarity index 99%
rename from record/ffmpeg.c
rename to record/drivers/ffmpeg.c
index 4e725440b9..9a38bdf6bb 100644
--- a/record/ffmpeg.c
+++ b/record/drivers/ffmpeg.c
@@ -17,7 +17,7 @@
 #include <compat/msvc.h>
 
 #ifdef HAVE_CONFIG_H
-#include "../config.h"
+#include "../../config.h"
 #endif
 
 #ifdef __cplusplus
@@ -46,11 +46,11 @@ extern "C" {
 #include <boolean.h>
 #include <queues/fifo_buffer.h>
 #include <rthreads/rthreads.h>
-#include "../general.h"
+#include "../../general.h"
 #include <gfx/scaler/scaler.h>
 #include <file/config_file.h>
-#include "../audio/utils.h"
-#include "record_driver.h"
+#include "../../audio/utils.h"
+#include "../record_driver.h"
 #include <assert.h>
 
 #ifdef FFEMU_PERF