diff --git a/Makefile.common b/Makefile.common
index eca0a0c939..8f8ed896de 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -775,12 +775,13 @@ ifeq ($(HAVE_COMPRESSION), 1)
 endif 
 
 ifeq ($(HAVE_COCOA),1)
-	OBJ += apple/common/apple_cocoa_common.o \
+	OBJ += 
 			 apple/OSX/platform.o \
 			 apple/OSX/settings.o \
 			 input/drivers/cocoa_input.o \
 			 input/drivers_keyboard/keyboard_event_apple.o \
 			 ui/drivers/ui_cocoa.o \
+			 ui/drivers/cocoa/cocoa_common.o \
 			 gfx/drivers_context/apple_cocoa_gl.o
 endif
 
diff --git a/apple/OSX/platform.m b/apple/OSX/platform.m
index 443c85a2f4..9f7810ea3f 100644
--- a/apple/OSX/platform.m
+++ b/apple/OSX/platform.m
@@ -17,7 +17,7 @@
 #include <objc/objc-runtime.h>
 #include <string.h>
 
-#import "../common/RetroArch_Apple.h"
+#include "../../ui/drivers/cocoa/cocoa_common.h"
 #include "../../input/drivers/cocoa_input.h"
 #include "../../frontend/frontend.h"
 #include "../../retroarch.h"
diff --git a/apple/OSX/settings.m b/apple/OSX/settings.m
index 39d75673a1..118280d53a 100644
--- a/apple/OSX/settings.m
+++ b/apple/OSX/settings.m
@@ -19,7 +19,7 @@
 #include <compat/apple_compat.h>
 #include <retro_miscellaneous.h>
 
-#import "../common/RetroArch_Apple.h"
+#include "../../ui/drivers/cocoa/cocoa_common.h"
 #include "../../settings.h"
 #include "../../input/drivers/cocoa_input.h"
 
diff --git a/apple/iOS/browser.m b/apple/iOS/browser.m
index fef7c3d800..b9cbd13b3f 100644
--- a/apple/iOS/browser.m
+++ b/apple/iOS/browser.m
@@ -19,7 +19,7 @@
 #include <file/file_path.h>
 #include <retro_miscellaneous.h>
 
-#include "../common/RetroArch_Apple.h"
+#include "../../ui/drivers/cocoa/cocoa_common.h"
 #include "../../content.h"
 #include "../../general.h"
 
diff --git a/apple/iOS/menu.m b/apple/iOS/menu.m
index fdd1a9e186..3a92b0fbc0 100644
--- a/apple/iOS/menu.m
+++ b/apple/iOS/menu.m
@@ -19,7 +19,7 @@
 #include <file/file_path.h>
 #include <retro_miscellaneous.h>
 
-#include "../common/RetroArch_Apple.h"
+#include "../../ui/drivers/cocoa/cocoa_common.h"
 #include "../../input/input_common.h"
 #include "../../input/input_keymaps.h"
 #include "../../input/drivers/cocoa_input.h"
diff --git a/apple/iOS/platform.m b/apple/iOS/platform.m
index 617c07fb9e..c743a10095 100644
--- a/apple/iOS/platform.m
+++ b/apple/iOS/platform.m
@@ -16,7 +16,7 @@
 
 #include <string.h>
 
-#include "../common/RetroArch_Apple.h"
+#include "../../ui/drivers/cocoa/cocoa_common.h"
 #include "../../input/drivers/cocoa_input.h"
 #include "../../settings.h"
 #ifdef HAVE_MFI
diff --git a/gfx/drivers_context/apple_cocoa_gl.m b/gfx/drivers_context/apple_cocoa_gl.m
index 23fb4e049f..5c38e151ff 100644
--- a/gfx/drivers_context/apple_cocoa_gl.m
+++ b/gfx/drivers_context/apple_cocoa_gl.m
@@ -25,7 +25,7 @@
 #elif defined(HAVE_COCOATOUCH)
 #include <GLKit/GLKit.h>
 #endif
-#import "../../apple/common/RetroArch_Apple.h"
+#import "../../../ui/drivers/cocoa/cocoa_common.h"
 #include "../video_context_driver.h"
 #include "../video_monitor.h"
 #include "../../configuration.h"
diff --git a/griffin/griffin_objc.m b/griffin/griffin_objc.m
index 5f94201ff6..1c351fb1d1 100644
--- a/griffin/griffin_objc.m
+++ b/griffin/griffin_objc.m
@@ -25,7 +25,7 @@
 
 #if defined(HAVE_COCOATOUCH) || defined(HAVE_COCOA)
 #include "../gfx/drivers_context/apple_cocoa_gl.m"
-#include "../apple/common/apple_cocoa_common.m"
+#include "../ui/drivers/cocoa/cocoa_common.m"
 
 #if defined(HAVE_COCOATOUCH)
 
diff --git a/apple/common/CFExtensions.h b/ui/drivers/cocoa/CFExtensions.h
similarity index 100%
rename from apple/common/CFExtensions.h
rename to ui/drivers/cocoa/CFExtensions.h
diff --git a/apple/common/RetroArch_Apple.h b/ui/drivers/cocoa/cocoa_common.h
similarity index 100%
rename from apple/common/RetroArch_Apple.h
rename to ui/drivers/cocoa/cocoa_common.h
diff --git a/apple/common/apple_cocoa_common.m b/ui/drivers/cocoa/cocoa_common.m
similarity index 99%
rename from apple/common/apple_cocoa_common.m
rename to ui/drivers/cocoa/cocoa_common.m
index ad6d4ad512..fa5119dcd5 100644
--- a/apple/common/apple_cocoa_common.m
+++ b/ui/drivers/cocoa/cocoa_common.m
@@ -19,7 +19,7 @@
 #include <CoreFoundation/CFArray.h>
 #include <CoreFoundation/CFString.h>
 #import <Foundation/NSPathUtilities.h>
-#import "RetroArch_Apple.h"
+#include "cocoa_common.h"
 #include "../../general.h"
 #include "../../runloop.h"
 #include "../../frontend/frontend.h"
diff --git a/ui/drivers/ui_cocoa.m b/ui/drivers/ui_cocoa.m
index 58a4d56b9c..a28eab3c90 100644
--- a/ui/drivers/ui_cocoa.m
+++ b/ui/drivers/ui_cocoa.m
@@ -13,7 +13,7 @@
  * If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../apple/common/RetroArch_Apple.h"
+#include "cocoa/cocoa_common.h"
 #include <stdint.h>
 #include <boolean.h>
 #include <stddef.h>
diff --git a/ui/drivers/ui_cocoatouch.m b/ui/drivers/ui_cocoatouch.m
index d8c7cd6d17..b64830f81b 100644
--- a/ui/drivers/ui_cocoatouch.m
+++ b/ui/drivers/ui_cocoatouch.m
@@ -13,7 +13,7 @@
  * If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../apple/common/RetroArch_Apple.h"
+#include "cocoa/cocoa_common.h"
 #include <stdint.h>
 #include <boolean.h>
 #include <stddef.h>