diff --git a/gfx/video_driver.c b/gfx/video_driver.c
index 9151313dc3..03abd13edb 100644
--- a/gfx/video_driver.c
+++ b/gfx/video_driver.c
@@ -32,6 +32,7 @@
 #include "../string_list_special.h"
 #include "../libretro_version_1.h"
 #include "../system.h"
+#include "../command_event.h"
 
 #ifdef HAVE_MENU
 #include "../menu/menu_hash.h"
diff --git a/input/input_overlay.c b/input/input_overlay.c
index cc367de90c..79c62951b5 100644
--- a/input/input_overlay.c
+++ b/input/input_overlay.c
@@ -541,6 +541,7 @@ static void input_overlay_loaded(void *task_data, void *user_data, const char *e
    if (err)
       return;
 
+#ifdef HAVE_MENU
    /* We can't display when the menu is up */
    if (settings->input.overlay_hide_in_menu && menu_driver_ctl(RARCH_MENU_CTL_IS_ALIVE, NULL))
    {
@@ -548,6 +549,7 @@ static void input_overlay_loaded(void *task_data, void *user_data, const char *e
             && settings->input.overlay_enable)
          goto abort_load;
    }
+#endif
 
    if (!settings->input.overlay_enable)
       goto abort_load;
diff --git a/retroarch.c b/retroarch.c
index 9cd566290d..0fa699464c 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -74,6 +74,7 @@
 #endif
 
 #include "config.features.h"
+#include "command_event.h"
 
 /* Descriptive names for options without short variant. Please keep the name in
    sync with the option name. Order does not matter. */