diff --git a/gfx/drivers_context/cocoa_gl_ctx.m b/gfx/drivers_context/cocoa_gl_ctx.m
index ce006b75ae..e038630e49 100644
--- a/gfx/drivers_context/cocoa_gl_ctx.m
+++ b/gfx/drivers_context/cocoa_gl_ctx.m
@@ -89,7 +89,7 @@ static bool g_is_syncing = true;
 static bool g_use_hw_ctx;
 
 #if defined(HAVE_COCOA)
-#include "../../ui/drivers/cocoa/ui_cocoa_window.h"
+#include "../../ui/drivers/ui_cocoa.h"
 static NSOpenGLPixelFormat* g_format;
 
 void *glcontext_get_ptr(void)
diff --git a/ui/drivers/cocoa/cocoa_common.m b/ui/drivers/cocoa/cocoa_common.m
index 7c06fff93f..4627c1c211 100644
--- a/ui/drivers/cocoa/cocoa_common.m
+++ b/ui/drivers/cocoa/cocoa_common.m
@@ -18,7 +18,7 @@
 #include <sys/stat.h>
 #include "cocoa_common.h"
 #ifdef HAVE_COCOA
-#include "ui_cocoa_window.h"
+#include "../ui_cocoa.h"
 #endif
 
 /* Define compatibility symbols and categories. */
diff --git a/ui/drivers/cocoa/ui_cocoa_window.m b/ui/drivers/cocoa/ui_cocoa_window.m
index 9287fe765e..6a2282575f 100644
--- a/ui/drivers/cocoa/ui_cocoa_window.m
+++ b/ui/drivers/cocoa/ui_cocoa_window.m
@@ -20,7 +20,7 @@
 #include <string.h>
 
 #include "cocoa_common.h"
-#include "ui_cocoa_window.h"
+#include "../ui_cocoa.h"
 #include "../../ui_companion_driver.h"
 
 static void ui_window_cocoa_destroy(void *data)
diff --git a/ui/drivers/cocoa/ui_cocoa_window.h b/ui/drivers/ui_cocoa.h
similarity index 84%
rename from ui/drivers/cocoa/ui_cocoa_window.h
rename to ui/drivers/ui_cocoa.h
index 23079dfe29..242e4a1151 100644
--- a/ui/drivers/cocoa/ui_cocoa_window.h
+++ b/ui/drivers/ui_cocoa.h
@@ -14,8 +14,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _COCOA_WINDOW_UI
-#define _COCOA_WINDOW_UI
+#ifndef _COCOA_UI
+#define _COCOA_UI
 
 #include <stdint.h>
 #include <stddef.h>
@@ -23,12 +23,17 @@
 #include <boolean.h>
 #include <retro_common_api.h>
 
-#include "cocoa_common.h"
+#include "cocoa/cocoa_common.h"
 
-#include "../../ui_companion_driver.h"
+#include "../ui_companion_driver.h"
 
 RETRO_BEGIN_DECLS
 
+typedef struct ui_application_cocoa
+{
+   void *empty;
+} ui_application_cocoa_t;
+
 typedef struct ui_window_cocoa
 {
     CocoaView *data;