diff --git a/cheevos.c b/cheevos.c
index ff3f473944..67c8600804 100644
--- a/cheevos.c
+++ b/cheevos.c
@@ -23,6 +23,7 @@
 #include <libretro.h>
 
 #include "cheevos.h"
+#include "command.h"
 #include "dynamic.h"
 #include "network/net_http_special.h"
 #include "configuration.h"
diff --git a/driver.c b/driver.c
index 5e6c076363..9bebc2a2a8 100644
--- a/driver.c
+++ b/driver.c
@@ -17,6 +17,7 @@
 #include <compat/posix_string.h>
 #include <string/stdstring.h>
 
+#include "command.h"
 #include "general.h"
 #include "msg_hash.h"
 #include "system.h"
diff --git a/gfx/drivers/vulkan.c b/gfx/drivers/vulkan.c
index 7975eddfcb..aab91ebcc3 100644
--- a/gfx/drivers/vulkan.c
+++ b/gfx/drivers/vulkan.c
@@ -2008,7 +2008,9 @@ static const video_poke_interface_t vulkan_poke_interface = {
    NULL,
    NULL,
 #endif
+#ifdef HAVE_MENU
    vulkan_set_osd_msg,
+#endif
    vulkan_show_mouse,
    NULL,
    vulkan_get_current_shader,