diff --git a/src/eval.c b/src/eval.c
index b2ab0ad..5fc32e2 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -12044,6 +12044,11 @@
 	"all_builtin_terms",
 # endif
 #endif
+#if defined(FEAT_BROWSE) && (defined(USE_FILE_CHOOSER) \
+	|| defined(FEAT_GUI_W32) \
+	|| defined(FEAT_GUI_MOTIF))
+	"browsefilter",
+#endif
 #ifdef FEAT_BYTEOFF
 	"byte_offset",
 #endif
diff --git a/src/gui_gtk.c b/src/gui_gtk.c
index c62201e..4b63d51 100644
--- a/src/gui_gtk.c
+++ b/src/gui_gtk.c
@@ -779,9 +779,6 @@
 /*
  * Implementation of the file selector related stuff
  */
-#if GTK_CHECK_VERSION(2,4,0)
-# define USE_FILE_CHOOSER
-#endif
 
 #ifndef USE_FILE_CHOOSER
     static void
diff --git a/src/version.c b/src/version.c
index 5f615ed..1b04aed 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    593,
+/**/
     592,
 /**/
     591,
diff --git a/src/vim.h b/src/vim.h
index 562c883..7fd6df9 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -2125,6 +2125,12 @@
 # endif
 #endif
 
+#if defined(FEAT_BROWSE) && defined(GTK_CHECK_VERSION)
+# if GTK_CHECK_VERSION(2,4,0)
+#  define USE_FILE_CHOOSER
+# endif
+#endif
+
 #ifndef FEAT_NETBEANS_INTG
 # undef NBDEBUG
 #endif