diff --git a/src/generic/prntdlgg.cpp b/src/generic/prntdlgg.cpp
index 75ce62c8e3..30d393cb4d 100644
--- a/src/generic/prntdlgg.cpp
+++ b/src/generic/prntdlgg.cpp
@@ -46,6 +46,7 @@
     #include "wx/combobox.h"
     #include "wx/intl.h"
     #include "wx/sizer.h"
+    #include "wx/cmndata.h"
 #endif
 
 #if wxUSE_STATLINE
diff --git a/src/mac/carbon/control.cpp b/src/mac/carbon/control.cpp
index 0ef4cd0a87..9e6e919791 100644
--- a/src/mac/carbon/control.cpp
+++ b/src/mac/carbon/control.cpp
@@ -767,11 +767,6 @@ void wxControl::MacRedrawControl()
 
 void wxControl::OnPaint(wxPaintEvent& event)
 {
-    if ( IsKindOf( CLASSINFO( wxBitmapButton ) ) )
-    {
-        int i ;
-        i = 0 ;
-    }
     if ( (ControlHandle) m_macControl )
     {
         wxPaintDC dc(this) ;
diff --git a/src/mac/control.cpp b/src/mac/control.cpp
index 0ef4cd0a87..9e6e919791 100644
--- a/src/mac/control.cpp
+++ b/src/mac/control.cpp
@@ -767,11 +767,6 @@ void wxControl::MacRedrawControl()
 
 void wxControl::OnPaint(wxPaintEvent& event)
 {
-    if ( IsKindOf( CLASSINFO( wxBitmapButton ) ) )
-    {
-        int i ;
-        i = 0 ;
-    }
     if ( (ControlHandle) m_macControl )
     {
         wxPaintDC dc(this) ;