diff --git a/include/wx/combobox.h b/include/wx/combobox.h
index c4ce9f63da..bb83358f10 100644
--- a/include/wx/combobox.h
+++ b/include/wx/combobox.h
@@ -14,8 +14,6 @@
 
 #include "wx/defs.h"
 
-#if wxUSE_COMBOBOX
-
 /*
  * wxComboBox style flags
  */
@@ -25,6 +23,8 @@
 #define wxCB_DROPDOWN       0x0020
 #define wxCB_FILENAME       0x0040
 
+#if wxUSE_COMBOBOX
+
 extern WXDLLEXPORT_DATA(const wxChar) wxComboBoxNameStr[];
 
 // ----------------------------------------------------------------------------
diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp
index a7f05f679a..ba57eaa3f5 100644
--- a/src/gtk/choice.cpp
+++ b/src/gtk/choice.cpp
@@ -12,6 +12,7 @@
 #if wxUSE_CHOICE
 
 #include "wx/choice.h"
+#include "wx/combobox.h"
 
 #ifndef WX_PRECOMP
     #include "wx/arrstr.h"