diff --git a/frontend/menu/backend/menu_common_backend.c b/frontend/menu/backend/menu_common_backend.c
index 214b5c9d27..491d905ac6 100644
--- a/frontend/menu/backend/menu_common_backend.c
+++ b/frontend/menu/backend/menu_common_backend.c
@@ -3912,10 +3912,8 @@ static int menu_common_setting_set(unsigned setting, unsigned action)
             if (driver.menu->current_pad < MAX_PLAYERS - 1)
                driver.menu->current_pad++;
          }
-#ifdef HAVE_RGUI
          if (port != driver.menu->current_pad)
             driver.menu->need_refresh = true;
-#endif
          port = driver.menu->current_pad;
          break;
       case MENU_SETTINGS_BIND_DEVICE:
diff --git a/gfx/lima_gfx.c b/gfx/lima_gfx.c
index 16d21ed745..9447d6c8e1 100644
--- a/gfx/lima_gfx.c
+++ b/gfx/lima_gfx.c
@@ -927,7 +927,7 @@ static const video_poke_interface_t lima_poke_interface = {
 #endif
   lima_set_aspect_ratio,
   lima_apply_state_changes,
-#if defined(HAVE_RGUI) || defined(HAVE_RMENU) /* TODO: only HAVE_MENU i think */
+#ifdef HAVE_MENU
   lima_set_texture_frame,
   lima_set_texture_enable,
 #endif
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 072e80ec9e..f0cb2def6a 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -608,7 +608,7 @@ MENU
 #include "../frontend/menu/history.c"
 #include "../frontend/menu/file_list.c"
 
-#if defined(HAVE_RMENU) || defined(HAVE_RGUI) || defined(HAVE_RMENU_XUI)
+#ifdef HAVE_MENU
 #include "../frontend/menu/backend/menu_common_backend.c"
 #endif