diff --git a/src/osx/cocoa/nonownedwnd.mm b/src/osx/cocoa/nonownedwnd.mm
index eba768adb8..ec7fcf12c1 100644
--- a/src/osx/cocoa/nonownedwnd.mm
+++ b/src/osx/cocoa/nonownedwnd.mm
@@ -10,16 +10,12 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
-
-#if wxOSX_USE_COCOA
-#include <Cocoa/Cocoa.h>
-#else
-#include <UIKit/UIKit.h>
+#ifndef WX_PRECOMP
+    #include "wx/nonownedwnd.h"
+    #include "wx/frame.h"
 #endif
 
-#ifdef __WXMAC__
 #include "wx/osx/private.h"
-#endif
 
 NSRect wxToNSRect( NSView* parent, const wxRect& r )
 {
diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm
index a358f96dca..df977ab281 100644
--- a/src/osx/cocoa/window.mm
+++ b/src/osx/cocoa/window.mm
@@ -11,7 +11,9 @@
 
 #include "wx/wxprec.h"
 
-#include <Cocoa/Cocoa.h>
+#ifndef WX_PRECOMP
+#include "wx/nonownedwnd.h"
+#endif
 
 #ifdef __WXMAC__
 #include "wx/osx/private.h"