diff --git a/include/wx/combo.h b/include/wx/combo.h
index 1076027de0..db19acef5b 100644
--- a/include/wx/combo.h
+++ b/include/wx/combo.h
@@ -42,14 +42,11 @@
 
 #if wxUSE_COMBOCTRL
 
-
-#include "wx/textctrl.h"
-#include "wx/button.h"
-#include "wx/combobox.h"
+#include "wx/control.h"
 #include "wx/renderer.h" // this is needed for wxCONTROL_XXX flags
 #include "wx/bitmap.h" // wxBitmap used by-value
 
-
+class WXDLLIMPEXP_CORE wxTextCtrl;
 class WXDLLEXPORT wxComboPopup;
 
 //
diff --git a/include/wx/generic/combo.h b/include/wx/generic/combo.h
index 9d179ac385..feca13db3c 100644
--- a/include/wx/generic/combo.h
+++ b/include/wx/generic/combo.h
@@ -31,6 +31,7 @@
 
 #endif
 
+extern WXDLLIMPEXP_DATA_CORE(const wxChar) wxComboBoxNameStr[];
 
 class WXDLLEXPORT wxGenericComboControl : public wxComboCtrlBase
 {