diff --git a/include/wx/defs.h b/include/wx/defs.h
index c47e26ad79..27b175f910 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -2607,12 +2607,14 @@ typedef void*       WXDisplay;
 
 typedef const void * CFTypeRef;
 
-/* typedef const struct __CFString * CFStringRef; */
-
+DECLARE_WXOSX_OPAQUE_CONST_CFREF( CFData )
 DECLARE_WXOSX_OPAQUE_CONST_CFREF( CFString )
 typedef struct __CFString * CFMutableStringRef;
 DECLARE_WXOSX_OPAQUE_CONST_CFREF( CFDictionary )
 
+DECLARE_WXOSX_OPAQUE_CONST_CFREF( CFArray )
+typedef struct __CFArray * CFMutableArrayRef;
+
 DECLARE_WXOSX_OPAQUE_CFREF( CFRunLoopSource )
 DECLARE_WXOSX_OPAQUE_CONST_CFREF( CTFont )
 DECLARE_WXOSX_OPAQUE_CONST_CFREF( CTFontDescriptor )
@@ -2645,7 +2647,7 @@ DECLARE_WXMAC_OPAQUE_REF( MenuRef )
 typedef IconRef WXHICON ;
 typedef HIShapeRef WXHRGN;
 
-#endif
+#endif // __WXMAC__
 
 #if defined(__WXMAC__)
 
@@ -2712,6 +2714,13 @@ typedef struct objc_object *WX_##klass
 
 #endif /*  (defined(__GNUC__) && defined(__APPLE__)) */
 
+DECLARE_WXCOCOA_OBJC_CLASS(NSArray);
+DECLARE_WXCOCOA_OBJC_CLASS(NSData);
+DECLARE_WXCOCOA_OBJC_CLASS(NSMutableArray);
+DECLARE_WXCOCOA_OBJC_CLASS(NSString);
+
+#if wxOSX_USE_COCOA
+
 DECLARE_WXCOCOA_OBJC_CLASS(NSApplication);
 DECLARE_WXCOCOA_OBJC_CLASS(NSBitmapImageRep);
 DECLARE_WXCOCOA_OBJC_CLASS(NSBox);
@@ -2729,7 +2738,6 @@ DECLARE_WXCOCOA_OBJC_CLASS(NSLayoutManager);
 DECLARE_WXCOCOA_OBJC_CLASS(NSMenu);
 DECLARE_WXCOCOA_OBJC_CLASS(NSMenuExtra);
 DECLARE_WXCOCOA_OBJC_CLASS(NSMenuItem);
-DECLARE_WXCOCOA_OBJC_CLASS(NSMutableArray);
 DECLARE_WXCOCOA_OBJC_CLASS(NSNotification);
 DECLARE_WXCOCOA_OBJC_CLASS(NSObject);
 DECLARE_WXCOCOA_OBJC_CLASS(NSPanel);
@@ -2747,20 +2755,14 @@ DECLARE_WXCOCOA_OBJC_CLASS(NSWindow);
 DECLARE_WXCOCOA_OBJC_CLASS(NSView);
 DECLARE_WXCOCOA_OBJC_CLASS(NSOpenGLContext);
 DECLARE_WXCOCOA_OBJC_CLASS(NSOpenGLPixelFormat);
-DECLARE_WXCOCOA_OBJC_CLASS( NSPrintInfo );
+DECLARE_WXCOCOA_OBJC_CLASS(NSPrintInfo);
 DECLARE_WXCOCOA_OBJC_CLASS(NSGestureRecognizer);
 DECLARE_WXCOCOA_OBJC_CLASS(NSPanGestureRecognizer);
 DECLARE_WXCOCOA_OBJC_CLASS(NSMagnificationGestureRecognizer);
 DECLARE_WXCOCOA_OBJC_CLASS(NSRotationGestureRecognizer);
 DECLARE_WXCOCOA_OBJC_CLASS(NSPressGestureRecognizer);
 DECLARE_WXCOCOA_OBJC_CLASS(NSTouch);
-#endif /* __WXMAC__ &__DARWIN__ */
-
-#ifdef __WXMAC__
-
-DECLARE_WXCOCOA_OBJC_CLASS(NSString);
-
-#if wxOSX_USE_COCOA
+DECLARE_WXCOCOA_OBJC_CLASS(NSPasteboard);
 
 typedef WX_NSWindow WXWindow;
 typedef WX_NSView WXWidget;
@@ -2768,6 +2770,7 @@ typedef WX_NSImage WXImage;
 typedef WX_NSMenu WXHMENU;
 typedef WX_NSOpenGLPixelFormat WXGLPixelFormat;
 typedef WX_NSOpenGLContext WXGLContext;
+typedef WX_NSPasteboard OSXPasteboard;
 
 #elif wxOSX_USE_IPHONE
 
@@ -2780,6 +2783,7 @@ DECLARE_WXCOCOA_OBJC_CLASS(UIEvent);
 DECLARE_WXCOCOA_OBJC_CLASS(NSSet);
 DECLARE_WXCOCOA_OBJC_CLASS(EAGLContext);
 DECLARE_WXCOCOA_OBJC_CLASS(UIWebView);
+DECLARE_WXCOCOA_OBJC_CLASS(UIPasteboard);
 
 typedef WX_UIWindow WXWindow;
 typedef WX_UIView WXWidget;
@@ -2787,6 +2791,7 @@ typedef WX_UIImage WXImage;
 typedef WX_EAGLContext WXGLContext;
 typedef WX_NSString WXGLPixelFormat;
 typedef WX_UIWebView OSXWebViewPtr;
+typedef WX_UIPasteboard OSXPasteboard;
 
 #endif