diff --git a/include/wx/nonownedwnd.h b/include/wx/nonownedwnd.h
index 8e4cd1daa8..f89c6048ee 100644
--- a/include/wx/nonownedwnd.h
+++ b/include/wx/nonownedwnd.h
@@ -14,6 +14,8 @@
 
 #if defined(__WXDFB__)
     #include "wx/dfb/nonownedwnd.h"
+#elif defined(__WXMAC__)
+    #include "wx/mac/nonownedwnd.h"
 #else
     // other ports can derive both wxTLW and wxPopupWindow directly
     // from wxWindow:
diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h
index 72d822411c..72f2518c26 100644
--- a/include/wx/popupwin.h
+++ b/include/wx/popupwin.h
@@ -129,7 +129,7 @@ protected:
     // get alerted when child gets deleted from under us
     void OnDestroy(wxWindowDestroyEvent& event);
 
-#ifdef __WXMSW__
+#if defined( __WXMSW__ ) || defined( __WXMAC__)
     // check if the mouse needs captured or released
     void OnIdle(wxIdleEvent& event);
 #endif