diff --git a/Makefile.common b/Makefile.common
index 9272a1738f..d914aa6d15 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -777,11 +777,11 @@ ifeq ($(HAVE_COMPRESSION), 1)
 endif 
 
 ifeq ($(HAVE_COCOA),1)
-	OBJ += apple/OSX/settings.o \
-			 input/drivers/cocoa_input.o \
+	OBJ += input/drivers/cocoa_input.o \
 			 input/drivers_keyboard/keyboard_event_apple.o \
 			 ui/drivers/ui_cocoa.o \
 			 ui/drivers/cocoa/cocoa_common.o \
+			 ui/drivers/cocoa/cocoa_settings.o \
 			 gfx/drivers_context/apple_cocoa_gl.o
 endif
 
diff --git a/griffin/griffin_objc.m b/griffin/griffin_objc.m
index e628fbe1b4..03652f3cc0 100644
--- a/griffin/griffin_objc.m
+++ b/griffin/griffin_objc.m
@@ -34,14 +34,14 @@
 #if defined(HAVE_COCOATOUCH)
 
 #if TARGET_OS_IPHONE
-#include "../apple/iOS/menu.m"
-#include "../apple/iOS/browser.m"
+#include "../ui/drivers/cocoa/cocoatouch_menu.m"
+#include "../ui/drivers/cocoa/cocoatouch_browser.m"
 
 #include "../ui/drivers/ui_cocoatouch.m"
 #endif
 
 #elif defined(HAVE_COCOA)
-#include "../apple/OSX/settings.m"
+#include "../ui/drivers/cocoa/cocoa_settings.m"
 
 #include "../ui/drivers/ui_cocoa.m"
 #endif
diff --git a/apple/OSX/settings.m b/ui/drivers/cocoa/cocoa_settings.m
similarity index 97%
rename from apple/OSX/settings.m
rename to ui/drivers/cocoa/cocoa_settings.m
index 118280d53a..fdfa670d82 100644
--- a/apple/OSX/settings.m
+++ b/ui/drivers/cocoa/cocoa_settings.m
@@ -19,13 +19,13 @@
 #include <compat/apple_compat.h>
 #include <retro_miscellaneous.h>
 
-#include "../../ui/drivers/cocoa/cocoa_common.h"
-#include "../../settings.h"
-#include "../../input/drivers/cocoa_input.h"
+#include "cocoa_common.h"
+#include "../../../settings.h"
+#include "../../../input/drivers/cocoa_input.h"
 
-#include "../../driver.h"
-#include "../../input/input_common.h"
-#include "../../input/input_keymaps.h"
+#include "../../../driver.h"
+#include "../../../input/input_common.h"
+#include "../../../input/input_keymaps.h"
 
 static void* const associated_name_tag = (void*)&associated_name_tag;
 
diff --git a/apple/iOS/browser.m b/ui/drivers/cocoa/cocoatouch_browser.m
similarity index 99%
rename from apple/iOS/browser.m
rename to ui/drivers/cocoa/cocoatouch_browser.m
index b9cbd13b3f..42cf692d17 100644
--- a/apple/iOS/browser.m
+++ b/ui/drivers/cocoa/cocoatouch_browser.m
@@ -19,9 +19,9 @@
 #include <file/file_path.h>
 #include <retro_miscellaneous.h>
 
-#include "../../ui/drivers/cocoa/cocoa_common.h"
-#include "../../content.h"
-#include "../../general.h"
+#include "cocoa_common.h"
+#include "../../../content.h"
+#include "../../../general.h"
 
 enum file_action
 {
diff --git a/apple/iOS/menu.m b/ui/drivers/cocoa/cocoatouch_menu.m
similarity index 98%
rename from apple/iOS/menu.m
rename to ui/drivers/cocoa/cocoatouch_menu.m
index 3a92b0fbc0..52deddb2c7 100644
--- a/apple/iOS/menu.m
+++ b/ui/drivers/cocoa/cocoatouch_menu.m
@@ -19,13 +19,13 @@
 #include <file/file_path.h>
 #include <retro_miscellaneous.h>
 
-#include "../../ui/drivers/cocoa/cocoa_common.h"
-#include "../../input/input_common.h"
-#include "../../input/input_keymaps.h"
-#include "../../input/drivers/cocoa_input.h"
+#include "cocoa_common.h"
+#include "../../../input/input_common.h"
+#include "../../../input/input_keymaps.h"
+#include "../../../input/drivers/cocoa_input.h"
 
-#include "../../menu/menu_entries.h"
-#include "../../menu/drivers/shared.h"
+#include "../../../menu/menu_entries.h"
+#include "../../../menu/drivers/shared.h"
 
 /*********************************************/
 /* RunActionSheet                            */