diff --git a/input/drivers_keyboard/keyboard_event_x11.c b/input/drivers_keyboard/keyboard_event_x11.c
index aa596224dd..f14ad92084 100644
--- a/input/drivers_keyboard/keyboard_event_x11.c
+++ b/input/drivers_keyboard/keyboard_event_x11.c
@@ -25,6 +25,7 @@
 #include <X11/extensions/Xinerama.h>
 #endif
 
+#include "../keyboard_line.h"
 #include "../input_keymaps.h"
 
 /* forward declarations */
diff --git a/input/input_overlay.c b/input/input_overlay.c
index 9522a6c464..1b23bd588c 100644
--- a/input/input_overlay.c
+++ b/input/input_overlay.c
@@ -29,6 +29,7 @@
 #include <rhash.h>
 
 #include "input_overlay.h"
+#include "keyboard_line.h"
 
 #include "../configuration.h"
 #include "input_common.h"
diff --git a/retroarch.c b/retroarch.c
index 07f93ca937..62559b66ad 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -171,9 +171,11 @@ static void print_help(const char *arg0)
    puts("      --log-file=FILE   Log messages to FILE.");
    puts("      --version         Show version.");
    puts("      --features        Prints available features compiled into program.");
+#ifdef HAVE_MENU
    puts("      --menu            Do not require content or libretro core to be loaded,\n"
         "                        starts directly in menu. If no arguments are passed to\n"
         "                        the program, it is equivalent to using --menu as only argument.");
+#endif
    puts("  -s, --save=PATH       Path for save files (*.srm).");
    puts("  -S, --savestate=PATH  Path for the save state files (*.state).");
    puts("  -f, --fullscreen      Start the program in fullscreen regardless of config settings.");
@@ -1264,8 +1266,10 @@ void rarch_main_init_wrap(const struct rarch_main_wrap *args,
       }
       else
       {
+#ifdef HAVE_MENU
          RARCH_LOG("No content, starting dummy core.\n");
          argv[(*argc)++] = strdup("--menu");
+#endif
       }
    }
 
diff --git a/tasks/tasks.h b/tasks/tasks.h
index 65d54631b3..d7ee335407 100644
--- a/tasks/tasks.h
+++ b/tasks/tasks.h
@@ -73,9 +73,8 @@ void rarch_main_data_nbio_image_upload_iterate(bool is_thread);
 #endif
 
 #ifdef HAVE_LIBRETRODB
-#ifdef HAVE_MENU
 void rarch_main_data_db_iterate(bool is_thread);
-
+#ifdef HAVE_MENU
 bool rarch_main_data_db_pending_scan_finished(void);
 #endif