diff --git a/ui/drivers/cocoa/cocoa_common.h b/ui/drivers/cocoa/cocoa_common.h
index 74289c5fff..8a32cbe54c 100644
--- a/ui/drivers/cocoa/cocoa_common.h
+++ b/ui/drivers/cocoa/cocoa_common.h
@@ -17,22 +17,9 @@
 #ifndef __COCOA_COMMON_H
 #define __COCOA_COMMON_H
 
-#include <Foundation/Foundation.h>
-
-#ifdef HAVE_MENU
-#include "../../menu/menu_setting.h"
-#include "../../menu/menu_driver.h"
-#endif
-
-#if defined(HAVE_COCOATOUCH)
-#include <UIKit/UIKit.h>
-
-#if TARGET_OS_TV
-#import <GameController/GameController.h>
-#endif
-
 #include "cocoa_common_shared.h"
 
+#if defined(HAVE_COCOATOUCH)
 #if TARGET_OS_IOS
 @interface CocoaView : UIViewController<CLLocationManagerDelegate,
 AVCaptureAudioDataOutputSampleBufferDelegate>
@@ -65,5 +52,4 @@ void get_ios_version(int *major, int *minor);
 
 #endif
 
-
 #endif
diff --git a/ui/drivers/cocoa/cocoa_common_metal.h b/ui/drivers/cocoa/cocoa_common_metal.h
index a8e7bd3f4f..c3f5c28ff4 100644
--- a/ui/drivers/cocoa/cocoa_common_metal.h
+++ b/ui/drivers/cocoa/cocoa_common_metal.h
@@ -17,13 +17,6 @@
 #ifndef __COCOA_COMMON_METAL_H
 #define __COCOA_COMMON_METAL_H
 
-#include <Foundation/Foundation.h>
-
-#ifdef HAVE_MENU
-#include "../../menu/menu_setting.h"
-#include "../../menu/menu_driver.h"
-#endif
-
 #include "cocoa_common_shared.h"
 
 typedef enum apple_view_type {
@@ -67,8 +60,6 @@ typedef enum apple_view_type {
 extern id<ApplePlatform> apple_platform;
 
 #if defined(HAVE_COCOATOUCH)
-#include <UIKit/UIKit.h>
-
 @interface CocoaView : UIViewController<CLLocationManagerDelegate,
 AVCaptureAudioDataOutputSampleBufferDelegate>
 + (CocoaView*)get;
diff --git a/ui/drivers/cocoa/cocoa_common_shared.h b/ui/drivers/cocoa/cocoa_common_shared.h
index 99f5d2ee0f..209e48621b 100644
--- a/ui/drivers/cocoa/cocoa_common_shared.h
+++ b/ui/drivers/cocoa/cocoa_common_shared.h
@@ -17,6 +17,20 @@
 #ifndef __COCOA_COMMON_SHARED_H
 #define __COCOA_COMMON_SHARED_H
 
+#include <Foundation/Foundation.h>
+
+#ifdef HAVE_MENU
+#include "../../menu/menu_setting.h"
+#include "../../menu/menu_driver.h"
+#endif
+
+#if defined(HAVE_COCOATOUCH)
+#include <UIKit/UIKit.h>
+
+#if TARGET_OS_TV
+#import <GameController/GameController.h>
+#endif
+
 /*********************************************/
 /* RAMenuBase                                */
 /* A menu class that displays RAMenuItemBase */
@@ -33,6 +47,8 @@
 
 @end
 
+#endif
+
 typedef struct
 {
    char orientations[32];