diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 6425ac0..760533d 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -11,7 +11,7 @@
  * ex_cmds.c: some functions for command line commands
  */
 
-#if defined(MSDOS) || defined(MSWIN)
+#if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
 # include "vimio.h"	/* for mch_open(), must be before vim.h */
 #endif
 
@@ -5892,7 +5892,7 @@
     flags = TAG_HELP | TAG_REGEXP | TAG_NAMES | TAG_VERBOSE;
     if (keep_lang)
 	flags |= TAG_KEEP_LANG;
-    if (find_tags(IObuff, num_matches, matches, flags, (int)MAXCOL, NULL) == OK
+    if (find_tags(IObuff, num_matches, matches, flags, TAG_MANY, NULL) == OK
 	    && *num_matches > 0)
 	/* Sort the matches found on the heuristic number that is after the
 	 * tag name. */