diff --git a/frontend/menu/disp/xmb.c b/frontend/menu/disp/xmb.c
index fe2b078a60..7fbb8b4d65 100644
--- a/frontend/menu/disp/xmb.c
+++ b/frontend/menu/disp/xmb.c
@@ -395,6 +395,9 @@ static void xmb_screen_changed(void)
            path_buf[PATH_MAX];
       const char *path = NULL, *entry_label = NULL;
       unsigned type = 0, w = 0;
+       
+       (void)entry_title_buf;
+       (void)type_str_buf;
 
       file_list_get_at_offset(driver.menu->selection_buf, i, &path,
             &entry_label, &type);
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 3dbe1540c5..162ce1fda4 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -671,6 +671,7 @@ MENU
 #ifdef HAVE_LAKKA
 #include "../frontend/menu/backend/menu_lakka_backend.c"
 #include "../frontend/menu/disp/lakka.c"
+#include "../frontend/menu/disp/xmb.c"
 #include "../frontend/menu/disp/tween.c"
 #endif
 
@@ -678,11 +679,6 @@ MENU
 #include "../frontend/menu/disp/glui.c"
 #endif
 
-#ifdef HAVE_XMB
-#include "../frontend/menu/disp/xmb.c"
-#include "../frontend/menu/disp/tween.c"
-#endif
-
 #endif
 
 #ifdef HAVE_COMMAND