diff --git a/ui/drivers/cocoa/cocoa_common.h b/ui/drivers/cocoa/cocoa_common.h
index c3b691961c..cc0287b78a 100644
--- a/ui/drivers/cocoa/cocoa_common.h
+++ b/ui/drivers/cocoa/cocoa_common.h
@@ -19,8 +19,10 @@
 
 #include <Foundation/Foundation.h>
 
+#ifdef HAVE_MENU
 #include "../../menu/menu_setting.h"
-#include "../../menu/menu.h"
+#include "../../menu/menu_driver.h"
+#endif
 
 #ifdef HAVE_CORELOCATION
 #include <CoreLocation/CoreLocation.h>
diff --git a/ui/drivers/cocoa/cocoatouch_menu.m b/ui/drivers/cocoa/cocoatouch_menu.m
index 1cb2b3169d..efefdabdb3 100644
--- a/ui/drivers/cocoa/cocoatouch_menu.m
+++ b/ui/drivers/cocoa/cocoatouch_menu.m
@@ -25,9 +25,12 @@
 #include "../../../input/input_keymaps.h"
 #include "../../../input/drivers/cocoa_input.h"
 
+#include "../../../runloop.h"
+
+#ifdef HAVE_MENU
 #include "../../../menu/menu_entry.h"
 #include "../../../menu/drivers/menu_generic.h"
-#include "../../../runloop.h"
+#endif
 
 // Menu Support
 
diff --git a/ui/drivers/ui_cocoatouch.m b/ui/drivers/ui_cocoatouch.m
index 2bdfb9d33f..061d5a071c 100644
--- a/ui/drivers/ui_cocoatouch.m
+++ b/ui/drivers/ui_cocoatouch.m
@@ -26,12 +26,15 @@
 #include "../ui_companion_driver.h"
 #include "../../input/drivers/cocoa_input.h"
 #include "../../input/drivers_keyboard/keyboard_event_apple.h"
-#include "../../menu/menu_setting.h"
 #include "../../retroarch.h"
 
 #include "../../frontend/frontend.h"
 #include "../../runloop.h"
 
+#ifdef HAVE_MENU
+#include "../../menu/menu_setting.h"
+#endif
+
 static char msg_old[PATH_MAX_LENGTH];
 static id apple_platform;
 static CFRunLoopObserverRef iterate_observer;
@@ -509,6 +512,7 @@ static void *ui_companion_cocoatouch_init(void)
 }
 
 static size_t old_size = 0;
+
 static void ui_companion_cocoatouch_notify_list_pushed(void *data,
    file_list_t *list, file_list_t *menu_list)
 {