diff --git a/Makefile.common b/Makefile.common
index 92b7b41792..83446d48fc 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -102,7 +102,7 @@ OBJ += frontend/frontend.o \
 		gfx/video_driver.o \
 		osk/osk_driver.o \
 		camera/camera_driver.o \
-		menu_driver.o \
+		menu/menu_driver.o \
 		location/location_driver.o \
 		driver.o \
 		settings.o \
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 83c0c832af..3bab7799b2 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -502,7 +502,7 @@ DRIVERS
 #include "../osk/osk_driver.c"
 #include "../camera/camera_driver.c"
 #include "../location/location_driver.c"
-#include "../menu_driver.c"
+#include "../menu/menu_driver.c"
 #include "../driver.c"
 
 /*============================================================
diff --git a/menu_driver.c b/menu/menu_driver.c
similarity index 97%
rename from menu_driver.c
rename to menu/menu_driver.c
index 59505695a7..b8dd2b1a76 100644
--- a/menu_driver.c
+++ b/menu/menu_driver.c
@@ -16,10 +16,10 @@
 
 #include <string.h>
 #include <string/string_list.h>
-#include "menu/menu_driver.h"
-#include "menu/menu.h"
-#include "driver.h"
-#include "general.h"
+#include "menu_driver.h"
+#include "menu.h"
+#include "../driver.h"
+#include "../general.h"
 
 static const menu_ctx_driver_t *menu_ctx_drivers[] = {
 #ifdef IOS