diff --git a/Makefile.common b/Makefile.common
index fe79e2fc83..229edcb683 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -101,7 +101,7 @@ OBJ += frontend/frontend.o \
 		input/input_driver.o \
 		gfx/video_driver.o \
 		osk/osk_driver.o \
-		camera_driver.o \
+		camera/camera_driver.o \
 		driver.o \
 		settings.o \
 		settings_list.o \
diff --git a/camera_driver.c b/camera/camera_driver.c
similarity index 99%
rename from camera_driver.c
rename to camera/camera_driver.c
index 05cba33954..9f88e5eb29 100644
--- a/camera_driver.c
+++ b/camera/camera_driver.c
@@ -17,8 +17,8 @@
 #include <string.h>
 #include <string/string_list.h>
 #include "camera_driver.h"
-#include "driver.h"
-#include "general.h"
+#include "../driver.h"
+#include "../general.h"
 
 static const camera_driver_t *camera_drivers[] = {
 #ifdef HAVE_V4L2
diff --git a/camera_driver.h b/camera/camera_driver.h
similarity index 99%
rename from camera_driver.h
rename to camera/camera_driver.h
index 9e634ac66c..a03f8833c9 100644
--- a/camera_driver.h
+++ b/camera/camera_driver.h
@@ -19,7 +19,7 @@
 
 #include <stdint.h>
 #include <boolean.h>
-#include "libretro.h"
+#include "../libretro.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/driver.h b/driver.h
index bef06b1f0e..43f45fdd66 100644
--- a/driver.h
+++ b/driver.h
@@ -32,7 +32,7 @@
 
 #include "menu/menu_driver.h"
 #include "osk/osk_driver.h"
-#include "camera_driver.h"
+#include "camera/camera_driver.h"
 #include "audio/resamplers/resampler.h"
 #include "record/ffemu.h"
 
diff --git a/griffin/griffin.c b/griffin/griffin.c
index ce4226cae9..c068ab5eef 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -500,7 +500,7 @@ DRIVERS
 #include "../input/input_driver.c"
 #include "../audio/audio_driver.c"
 #include "../osk/osk_driver.c"
-#include "../camera_driver.c"
+#include "../camera/camera_driver.c"
 #include "../driver.c"
 
 /*============================================================