diff --git a/include/wx/apptrait.h b/include/wx/apptrait.h
index 322b047c8e..7264604bd3 100644
--- a/include/wx/apptrait.h
+++ b/include/wx/apptrait.h
@@ -183,8 +183,6 @@ protected:
     #include "wx/msw/apptbase.h"
 #elif defined(__UNIX__) && !defined(__EMX__)
     #include "wx/unix/apptbase.h"
-#elif defined(__WXMAC__)
-    #include "wx/mac/apptbase.h"
 #elif defined(__OS2__)
     #include "wx/os2/apptbase.h"
 #else // no platform-specific methods to add to wxAppTraits
@@ -300,8 +298,6 @@ public:
     #include "wx/os2/apptrait.h"
 #elif defined(__UNIX__)
     #include "wx/unix/apptrait.h"
-#elif defined(__WXMAC__)
-    #include "wx/mac/apptrait.h"
 #elif defined(__DOS__)
     #include "wx/msdos/apptrait.h"
 #else
diff --git a/include/wx/defs.h b/include/wx/defs.h
index 5d1d87415c..47512f3e4e 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -2534,11 +2534,16 @@ typedef struct __CFString * CFMutableStringRef;
 
 typedef struct __CFRunLoopSource * CFRunLoopSourceRef;
 
-typedef struct CGColor *CGColorRef;
+#define DECLARE_WXMAC_OPAQUE_CGREF( name ) typedef struct name* name##Ref;
+
+DECLARE_WXMAC_OPAQUE_CGREF( CGColor );
+DECLARE_WXMAC_OPAQUE_CGREF( CGImage );
+DECLARE_WXMAC_OPAQUE_CGREF( CGContext );
 
 #define DECLARE_WXMAC_OPAQUE_REF( name ) typedef struct Opaque##name* name;
 
 DECLARE_WXMAC_OPAQUE_REF( PasteboardRef );
+DECLARE_WXMAC_OPAQUE_REF( IconRef );
 
 #endif