diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp
index 7cfcbc5bce..4358e40e2e 100644
--- a/src/mac/carbon/listbox.cpp
+++ b/src/mac/carbon/listbox.cpp
@@ -16,13 +16,11 @@
 #include "wx/app.h"
 #include "wx/listbox.h"
 #include "wx/settings.h"
+#include "wx/toplevel.h"
 #include "wx/dynarray.h"
 #include "wx/log.h"
 
 #include "wx/utils.h"
-#ifndef __DARWIN__
-//  #include "extldef.h"
-#endif
 
 #if !USE_SHARED_LIBRARY
   IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index 08950c5c74..ea632f8964 100644
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -28,7 +28,7 @@
 #include "wx/app.h"
 #include "wx/dc.h"
 #include "wx/button.h"
-#include "wx/panel.h"
+#include "wx/toplevel.h"
 #include "wx/textctrl.h"
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"
diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp
index 32c34193ab..296aa8dfe0 100644
--- a/src/mac/carbon/toplevel.cpp
+++ b/src/mac/carbon/toplevel.cpp
@@ -31,12 +31,14 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/toplevel.h"
+    #include "wx/frame.h"
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/intl.h"
 #endif //WX_PRECOMP
 
 #include "wx/mac/uma.h"
+#include "wx/mac/aga.h"
 #include "wx/tooltip.h"
 
 // ----------------------------------------------------------------------------
diff --git a/src/mac/listbox.cpp b/src/mac/listbox.cpp
index 7cfcbc5bce..4358e40e2e 100644
--- a/src/mac/listbox.cpp
+++ b/src/mac/listbox.cpp
@@ -16,13 +16,11 @@
 #include "wx/app.h"
 #include "wx/listbox.h"
 #include "wx/settings.h"
+#include "wx/toplevel.h"
 #include "wx/dynarray.h"
 #include "wx/log.h"
 
 #include "wx/utils.h"
-#ifndef __DARWIN__
-//  #include "extldef.h"
-#endif
 
 #if !USE_SHARED_LIBRARY
   IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
diff --git a/src/mac/textctrl.cpp b/src/mac/textctrl.cpp
index 08950c5c74..ea632f8964 100644
--- a/src/mac/textctrl.cpp
+++ b/src/mac/textctrl.cpp
@@ -28,7 +28,7 @@
 #include "wx/app.h"
 #include "wx/dc.h"
 #include "wx/button.h"
-#include "wx/panel.h"
+#include "wx/toplevel.h"
 #include "wx/textctrl.h"
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"
diff --git a/src/mac/toplevel.cpp b/src/mac/toplevel.cpp
index 32c34193ab..296aa8dfe0 100644
--- a/src/mac/toplevel.cpp
+++ b/src/mac/toplevel.cpp
@@ -31,12 +31,14 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/toplevel.h"
+    #include "wx/frame.h"
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/intl.h"
 #endif //WX_PRECOMP
 
 #include "wx/mac/uma.h"
+#include "wx/mac/aga.h"
 #include "wx/tooltip.h"
 
 // ----------------------------------------------------------------------------