diff --git a/include/wx/generic/listctrl.h b/include/wx/generic/listctrl.h
index d0c9055bc9..b0b1bca7a7 100644
--- a/include/wx/generic/listctrl.h
+++ b/include/wx/generic/listctrl.h
@@ -252,7 +252,7 @@ private:
     DECLARE_DYNAMIC_CLASS(wxGenericListCtrl)
 };
 
-#if (!defined(__WXMSW__) || defined(__WXUNIVERSAL__)) && !defined(__WXMAC__)
+#if (!defined(__WXMSW__) || defined(__WXUNIVERSAL__)) && (!defined(__WXMAC__) || defined(__WXUNIVERSAL__))
 /*
  * wxListCtrl has to be a real class or we have problems with
  * the run-time information.
diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h
index f8385b6ab5..3c9d72301d 100644
--- a/include/wx/listctrl.h
+++ b/include/wx/listctrl.h
@@ -30,7 +30,7 @@ extern WXDLLEXPORT_DATA(const wxChar) wxListCtrlNameStr[];
 
 #if defined(__WIN32__) && !defined(__WXUNIVERSAL__)
     #include "wx/msw/listctrl.h"
-#elif defined(__WXMAC__)
+#elif defined(__WXMAC__) && !defined(__WXUNIVERSAL__)
     #include "wx/mac/carbon/listctrl.h"
 #else
     #include "wx/generic/listctrl.h"
diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h
index c8adb53e31..e33370b924 100644
--- a/include/wx/popupwin.h
+++ b/include/wx/popupwin.h
@@ -66,6 +66,8 @@ public:
     #include "wx/motif/popupwin.h"
 #elif defined(__WXMGL__)
     #include "wx/mgl/popupwin.h"
+#elif defined(__WXMAC__)
+    #include "wx/mac/popupwin.h"
 #else
     #error "wxPopupWindow is not supported under this platform."
 #endif