diff --git a/include/wx/msw/bmpbuttn.h b/include/wx/msw/bmpbuttn.h
index a083428948..b894bc47f3 100644
--- a/include/wx/msw/bmpbuttn.h
+++ b/include/wx/msw/bmpbuttn.h
@@ -45,7 +45,6 @@ public:
                            wxWindowID winid,
                            const wxString& name = wxString());
 protected:
-    wxDECLARE_EVENT_TABLE();
     wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxBitmapButton);
 };
 
diff --git a/src/msw/bmpbuttn.cpp b/src/msw/bmpbuttn.cpp
index 45eed2db05..093544d159 100644
--- a/src/msw/bmpbuttn.cpp
+++ b/src/msw/bmpbuttn.cpp
@@ -16,29 +16,10 @@
 
 #include "wx/bmpbuttn.h"
 
-#ifndef WX_PRECOMP
-    #include "wx/log.h"
-    #include "wx/dcmemory.h"
-    #include "wx/image.h"
-#endif
-
-#include "wx/msw/private.h"
-#include "wx/msw/dc.h"          // for wxDCTemp
-
-#include "wx/msw/uxtheme.h"
-
-#ifndef ODS_NOFOCUSRECT
-    #define ODS_NOFOCUSRECT     0x0200
-#endif
-
 // ----------------------------------------------------------------------------
-// macros
+// wxBitmapButton implementation
 // ----------------------------------------------------------------------------
 
-wxBEGIN_EVENT_TABLE(wxBitmapButton, wxBitmapButtonBase)
-    EVT_SYS_COLOUR_CHANGED(wxBitmapButton::OnSysColourChanged)
-wxEND_EVENT_TABLE()
-
 /*
 TODO PROPERTIES :