diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp
index 3d0e5c5c48..0f7befea19 100644
--- a/src/common/combocmn.cpp
+++ b/src/common/combocmn.cpp
@@ -81,7 +81,11 @@ wxFLAGS_MEMBER(wxCB_DROPDOWN)
 
 wxEND_FLAGS( wxComboBoxStyle )
 
+#ifdef __WXUNIVERSAL__
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxComboBox, wxControl, "wx/combobox.h")
+#else
 wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxComboBox, wxChoice, "wx/combobox.h")
+#endif
 
 wxBEGIN_PROPERTIES_TABLE(wxComboBox)
 wxEVENT_PROPERTY( Select, wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEvent )
diff --git a/src/generic/calctrlg.cpp b/src/generic/calctrlg.cpp
index 3bb4170e5f..b7f7a0e6f5 100644
--- a/src/generic/calctrlg.cpp
+++ b/src/generic/calctrlg.cpp
@@ -47,6 +47,12 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
+#if wxHAS_NATIVE_CALENDARCTRL
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxGenericCalendarCtrl, wxControl,"wx/calctrl.h")
+
+#endif
+
 BEGIN_EVENT_TABLE(wxGenericCalendarCtrl, wxControl)
     EVT_PAINT(wxGenericCalendarCtrl::OnPaint)