diff --git a/src/aui/auibook.cpp b/src/aui/auibook.cpp
index fd2b3583e8..dc5ce84949 100644
--- a/src/aui/auibook.cpp
+++ b/src/aui/auibook.cpp
@@ -35,6 +35,8 @@
 
 #ifdef __WXMAC__
 #include "wx/osx/private.h"
+// for themeing support
+#include <Carbon/Carbon.h>
 #endif
 
 #include "wx/arrimpl.cpp"
diff --git a/src/aui/dockart.cpp b/src/aui/dockart.cpp
index 8ae482ee6a..55b5e89258 100644
--- a/src/aui/dockart.cpp
+++ b/src/aui/dockart.cpp
@@ -37,6 +37,9 @@
 #ifdef __WXMAC__
 #include "wx/osx/private.h"
 #include "wx/graphics.h"
+#include "wx/dcgraph.h"
+// for themeing support
+#include <Carbon/Carbon.h>
 #endif
 
 #ifdef __WXGTK__
diff --git a/src/common/artstd.cpp b/src/common/artstd.cpp
index 9dab2e5878..4623b41184 100644
--- a/src/common/artstd.cpp
+++ b/src/common/artstd.cpp
@@ -47,7 +47,7 @@ protected:
 
 // There are two ways of getting the standard icon: either via XPMs or via
 // wxIcon ctor. This depends on the platform:
-#if defined(__WXUNIVERSAL__)
+#if defined(__WXUNIVERSAL__) || ( defined(__WXMAC__) && wxOSX_USE_IPHONE )
     #define CREATE_STD_ICON(iconId, xpmRc) return wxNullBitmap;
 #elif defined(__WXGTK__) || defined(__WXMOTIF__)
     #define CREATE_STD_ICON(iconId, xpmRc) return wxBitmap(xpmRc##_xpm);
@@ -77,7 +77,7 @@ protected:
     wxArtProvider::Push(new wxDefaultArtProvider);
 }
 
-#if !(defined(__WXGTK20__) || defined(__WXMAC__)) || defined(__WXUNIVERSAL__)
+#if !(defined(__WXGTK20__) || (defined(__WXMAC__) && wxOSX_USE_CARBON)) || defined(__WXUNIVERSAL__)
 /*static*/ void wxArtProvider::InitNativeProvider()
 {
 }
diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index ec924ef4c1..028a0fddd4 100644
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -25,7 +25,7 @@
 
 #include "wx/listctrl.h"
 
-#if ((!defined(__WXMSW__) && !defined(__WXMAC__)) || defined(__WXUNIVERSAL__))
+#if ((!defined(__WXMSW__) && !(defined(__WXMAC__) && wxOSX_USE_CARBON)) || defined(__WXUNIVERSAL__))
     // if we have a native version, its implementation file does all this
     IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject)
     IMPLEMENT_DYNAMIC_CLASS(wxListView, wxListCtrl)
@@ -51,6 +51,8 @@
 
 #ifdef __WXMAC__
     #include "wx/osx/private.h"
+    // for themeing support
+    #include <Carbon/Carbon.h>
 #endif
 
 
@@ -5064,7 +5066,11 @@ bool wxGenericListCtrl::Create(wxWindow *parent,
     if ( GetWindowVariant() == wxWINDOW_VARIANT_NORMAL )
     {
         wxFont font;
+#if wxOSX_USE_CARBON
         font.MacCreateFromThemeFont( kThemeViewsFont );
+#else
+        font.MacCreateFromUIFont( kCTFontViewsFontType );
+#endif
         SetFont( font );
     }
 #endif
@@ -5077,7 +5083,11 @@ bool wxGenericListCtrl::Create(wxWindow *parent,
         if (m_headerWin)
         {
             wxFont font;
+#if wxOSX_USE_CARBON
             font.MacCreateFromThemeFont( kThemeSmallSystemFont );
+#else
+        font.MacCreateFromUIFont( kCTFontSystemFontType );
+#endif
             m_headerWin->SetFont( font );
             CalculateAndSetHeaderHeight();
         }
diff --git a/src/generic/renderg.cpp b/src/generic/renderg.cpp
index daba7bf33a..0a8193808b 100644
--- a/src/generic/renderg.cpp
+++ b/src/generic/renderg.cpp
@@ -673,7 +673,7 @@ wxRendererGeneric::DrawItemSelectionRect(wxWindow * WXUNUSED(win),
 
     dc.SetBrush(brush);
     if ((flags & wxCONTROL_CURRENT) && (flags & wxCONTROL_FOCUSED)
-#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__)
+#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__) && wxOSX_USE_CARBON
                 && IsControlActive( (ControlRef)win->GetHandle() )
 #endif
     )
diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp
index b9f5f2cf16..5ed3f34d5f 100644
--- a/src/generic/treectlg.cpp
+++ b/src/generic/treectlg.cpp
@@ -792,8 +792,12 @@ void wxGenericTreeCtrl::Init()
 
     m_lastOnSame = false;
 
-#if defined( __WXMAC__ ) && wxOSX_USE_COCOA_OR_CARBON
+#if defined( __WXMAC__ ) 
+#if wxOSX_USE_CARBON
     m_normalFont.MacCreateFromThemeFont( kThemeViewsFont ) ;
+#else
+    m_normalFont.MacCreateFromUIFont( kCTFontViewsFontType ) ;
+#endif
 #else
     m_normalFont = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT );
 #endif
@@ -2295,7 +2299,7 @@ void wxGenericTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
         {
             int flags = wxCONTROL_SELECTED;
             if (m_hasFocus
-#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__)
+#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__) && wxOSX_USE_CARBON // TODO CS
                 && IsControlActive( (ControlRef)GetHandle() )
 #endif
             )
@@ -2446,7 +2450,7 @@ void wxGenericTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level
 
         wxColour colText;
         if ( item->IsSelected()
-#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__)
+#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__) && wxOSX_USE_CARBON // TODO CS
             // On wxMac, if the tree doesn't have the focus we draw an empty
             // rectangle, so we want to make sure that the text is visible
             // against the normal background, not the highlightbackground, so