diff --git a/include/wx/icon.h b/include/wx/icon.h
index 23ece7720e..fbd402dc17 100644
--- a/include/wx/icon.h
+++ b/include/wx/icon.h
@@ -32,7 +32,7 @@
 #elif defined(__WXDFB__)
   #include "wx/generic/icon.h"
 #elif defined(__WXMAC__)
-#if wxOSX_USE_CARBON
+#if wxOSX_USE_COCOA_OR_CARBON
   #include "wx/osx/icon.h"
 #else
   #include "wx/generic/icon.h"
diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h
index 19c9cd1383..d24c3007de 100644
--- a/include/wx/listctrl.h
+++ b/include/wx/listctrl.h
@@ -30,7 +30,7 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxListCtrlNameStr[];
 
 #if defined(__WIN32__) && !defined(__WXUNIVERSAL__)
     #include "wx/msw/listctrl.h"
-#elif defined(__WXMAC__) && !defined(__WXUNIVERSAL__)
+#elif defined(__WXMAC__) && !defined(__WXUNIVERSAL__) && wxOSX_USE_CARBON
     #include "wx/osx/carbon/listctrl.h"
 #else
     #include "wx/generic/listctrl.h"