diff --git a/frontend/frontend.c b/frontend/frontend.c
index 604297b4b3..7efe2d0043 100644
--- a/frontend/frontend.c
+++ b/frontend/frontend.c
@@ -18,6 +18,7 @@
 #include "../driver.h"
 #include "frontend.h"
 #include "../general.h"
+#include "../performance.h"
 
 #if defined(HAVE_MENU)
 #include "menu/menu_input_line_cb.h"
diff --git a/retroarch.c b/retroarch.c
index 2a923b290a..f5418c2bf6 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -164,10 +164,12 @@ static void take_screenshot(void)
 
    if (viewport_read)
    {
+#ifdef HAVE_MENU
       /* Avoid taking screenshot of GUI overlays. */
       if (driver.video_poke && driver.video_poke->set_texture_enable)
          driver.video_poke->set_texture_enable(driver.video_data,
                false, false);
+#endif
 
       if (driver.video)
          rarch_render_cached_frame();
@@ -3176,7 +3178,9 @@ void rarch_main_command(unsigned cmd)
          save_core_config();
          break;
       case RARCH_CMD_SHADERS_APPLY_CHANGES:
+#ifdef HAVE_MENU
          menu_shader_manager_apply_changes();
+#endif
          break;
    }
 }
@@ -3197,6 +3201,7 @@ bool rarch_main_iterate(void)
          !driver.video->alive(driver.video_data))
       return false;
 
+#ifdef HAVE_MENU
    if (g_extern.is_menu)
    {
       if (
@@ -3223,6 +3228,7 @@ bool rarch_main_iterate(void)
       rarch_main_set_state(RARCH_ACTION_STATE_MENU_PREINIT);
       return true; /* Enter menu on next run. */
    }
+#endif
 
    if (g_extern.exec)
    {
diff --git a/settings_data.c b/settings_data.c
index ae704adde0..e0011186b8 100644
--- a/settings_data.c
+++ b/settings_data.c
@@ -1809,6 +1809,7 @@ unsigned menu_gx_resolutions[GX_RESOLUTIONS_LAST][2] = {
 unsigned menu_current_gx_resolution = GX_RESOLUTIONS_640_480;
 #endif
 
+#ifdef HAVE_MENU
 static void menu_common_setting_set_label_perf(char *type_str,
       size_t type_str_size, unsigned *w, unsigned type,
       const struct retro_perf_counter **counters, unsigned offset)
@@ -1832,7 +1833,6 @@ static void menu_common_setting_set_label_perf(char *type_str,
    }
 }
 
-
 void setting_data_get_label(char *type_str,
       size_t type_str_size, unsigned *w, unsigned type, 
       const char *menu_label, const char *label, unsigned index)
@@ -1846,10 +1846,8 @@ void setting_data_get_label(char *type_str,
             !strcmp(menu_label, "video_shader_preset_parameters"))
       )
    {
-#ifdef HAVE_MENU
       menu_shader_manager_get_str(driver.menu->shader, type_str, type_str_size,
             menu_label, label, type);
-#endif
    }
    else if (!strcmp(label, "input_bind_device_id"))
    {
@@ -2000,6 +1998,7 @@ void setting_data_get_label(char *type_str,
       }
    }
 }
+#endif
 
 static void general_read_handler(void *data)
 {
diff --git a/settings_data.h b/settings_data.h
index db36820ff1..82196256ed 100644
--- a/settings_data.h
+++ b/settings_data.h
@@ -183,12 +183,12 @@ rarch_setting_t setting_data_bind_setting(const char* name,
 int setting_data_get_description(const char *label, char *msg,
       size_t msg_sizeof);
 
+#ifdef HAVE_MENU
+rarch_setting_t* setting_data_get_mainmenu(bool regenerate);
+
 void setting_data_get_label(char *type_str,
       size_t type_str_size, unsigned *w, unsigned type, 
       const char *menu_label, const char *label, unsigned index);
-
-#ifdef HAVE_MENU
-rarch_setting_t* setting_data_get_mainmenu(bool regenerate);
 #endif
 rarch_setting_t* setting_data_get_list(void);