diff --git a/src/qt/app.cpp b/src/qt/app.cpp
index 93f0ccd3d8..57bd0dd049 100644
--- a/src/qt/app.cpp
+++ b/src/qt/app.cpp
@@ -15,7 +15,7 @@
 #include <QtCore/QStringList>
 #include <QtWidgets/QApplication>
 
-wxIMPLEMENT_DYNAMIC_CLASS(wxApp, wxAppBase);
+wxIMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler);
 
 wxApp::wxApp()
 {
diff --git a/src/qt/brush.cpp b/src/qt/brush.cpp
index 6798e438f1..fc09e71965 100644
--- a/src/qt/brush.cpp
+++ b/src/qt/brush.cpp
@@ -15,7 +15,7 @@
 
 #include <QtGui/QBrush>
 
-wxIMPLEMENT_DYNAMIC_CLASS(wxBrush,wxBrushBase);
+wxIMPLEMENT_DYNAMIC_CLASS(wxBrush,wxGDIObject);
 
 static Qt::BrushStyle ConvertBrushStyle(wxBrushStyle style)
 {
diff --git a/src/qt/dcclient.cpp b/src/qt/dcclient.cpp
index 9c453e7226..d062f0455a 100644
--- a/src/qt/dcclient.cpp
+++ b/src/qt/dcclient.cpp
@@ -61,7 +61,7 @@ wxWindowDCImpl::~wxWindowDCImpl()
 
 //##############################################################################
 
-wxIMPLEMENT_CLASS(wxClientDCImpl,wxQtDCImpl);
+wxIMPLEMENT_CLASS(wxClientDCImpl,wxWindowDCImpl);
 
 wxClientDCImpl::wxClientDCImpl( wxDC *owner )
     : wxWindowDCImpl( owner )
@@ -121,7 +121,7 @@ wxClientDCImpl::~wxClientDCImpl()
 
 //##############################################################################
 
-wxIMPLEMENT_CLASS(wxPaintDCImpl,wxQtDCImpl);
+wxIMPLEMENT_CLASS(wxPaintDCImpl,wxClientDCImpl);
 
 wxPaintDCImpl::wxPaintDCImpl( wxDC *owner )
     : wxWindowDCImpl( owner )
diff --git a/src/qt/dcscreen.cpp b/src/qt/dcscreen.cpp
index 12b02f6715..1f08768ec0 100644
--- a/src/qt/dcscreen.cpp
+++ b/src/qt/dcscreen.cpp
@@ -16,7 +16,7 @@
 #include <QtWidgets/QApplication>
 #include <QtGui/QPixmap>
 
-wxIMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxWindowDCImpl);
+wxIMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxQtDCImpl);
 
 wxScreenDCImpl::wxScreenDCImpl( wxScreenDC *owner )
     : wxWindowDCImpl( owner )
diff --git a/src/qt/msgdlg.cpp b/src/qt/msgdlg.cpp
index fd0a446f95..5fe264a242 100644
--- a/src/qt/msgdlg.cpp
+++ b/src/qt/msgdlg.cpp
@@ -111,7 +111,7 @@ wxMessageDialog::wxMessageDialog( wxWindow *parent, const wxString& message,
     PostCreation();
 }
 
-wxIMPLEMENT_CLASS(wxMessageDialog,wxMessageDialogBase);
+wxIMPLEMENT_CLASS(wxMessageDialog,wxDialog);
 
 int wxMessageDialog::ShowModal()
 {
diff --git a/src/qt/palette.cpp b/src/qt/palette.cpp
index 9fadc79543..8c87a3a9c1 100644
--- a/src/qt/palette.cpp
+++ b/src/qt/palette.cpp
@@ -10,7 +10,7 @@
 
 #include "wx/palette.h"
 
-wxIMPLEMENT_DYNAMIC_CLASS(wxPalette,wxPaletteBase)
+wxIMPLEMENT_DYNAMIC_CLASS(wxPalette,wxGDIObject)
 
 wxPalette::wxPalette()
 {
diff --git a/src/qt/pen.cpp b/src/qt/pen.cpp
index e7310aaa9b..862443cd14 100644
--- a/src/qt/pen.cpp
+++ b/src/qt/pen.cpp
@@ -13,7 +13,7 @@
 #include "wx/qt/private/utils.h"
 #include <QtGui/QPen>
 
-wxIMPLEMENT_DYNAMIC_CLASS(wxPen,wxPenBase);
+wxIMPLEMENT_DYNAMIC_CLASS(wxPen,wxGDIObject);
 
 static Qt::PenStyle ConvertPenStyle(wxPenStyle style)
 {
diff --git a/src/qt/region.cpp b/src/qt/region.cpp
index 0fa4a3db60..a0c3ea8698 100644
--- a/src/qt/region.cpp
+++ b/src/qt/region.cpp
@@ -53,7 +53,7 @@ class wxRegionRefData: public wxGDIRefData
 
 #define M_REGIONDATA ((wxRegionRefData *)m_refData)->m_qtRegion
 
-wxIMPLEMENT_DYNAMIC_CLASS(wxRegion,wxRegionBase);
+wxIMPLEMENT_DYNAMIC_CLASS(wxRegion,wxGDIObject);
 
 wxRegion::wxRegion()
 {
diff --git a/src/qt/tglbtn.cpp b/src/qt/tglbtn.cpp
index 77ee85b15e..5797157286 100644
--- a/src/qt/tglbtn.cpp
+++ b/src/qt/tglbtn.cpp
@@ -54,7 +54,7 @@ void wxQtToggleButton::clicked( bool checked )
 
 wxDEFINE_EVENT( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEvent );
 
-wxIMPLEMENT_DYNAMIC_CLASS(wxBitmapToggleButton, wxToggleButtonBase);
+wxIMPLEMENT_DYNAMIC_CLASS(wxBitmapToggleButton, wxToggleButton);
 
 wxBitmapToggleButton::wxBitmapToggleButton()
 {
@@ -103,7 +103,7 @@ QWidget *wxBitmapToggleButton::GetHandle() const
 
 //##############################################################################
 
-wxIMPLEMENT_DYNAMIC_CLASS(wxToggleButton, wxToggleButtonBase);
+wxIMPLEMENT_DYNAMIC_CLASS(wxToggleButton, wxControl);
 
 wxToggleButton::wxToggleButton()
 {