diff --git a/src/eval.c b/src/eval.c
index bb25044948..fbc33dd9b6 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -18073,7 +18073,6 @@ get_vim_var_nr(idx)
     return vimvars[idx].vv_nr;
 }
 
-#if defined(FEAT_AUTOCMD) || defined(PROTO)
 /*
  * Get string v: variable value.  Uses a static buffer, can only be used once.
  */
@@ -18083,7 +18082,6 @@ get_vim_var_str(idx)
 {
     return get_tv_string(&vimvars[idx].vv_tv);
 }
-#endif
 
 /*
  * Set v:count, v:count1 and v:prevcount.
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 760533d7a4..0f8af05151 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -3141,10 +3141,11 @@ do_ecmd(fnum, ffname, sfname, eap, newlnum, flags)
 #ifdef FEAT_BROWSE
 	if (cmdmod.browse)
 	{
+# ifdef FEAT_AUTOCMD
 	    if (
-# ifdef FEAT_GUI
+#  ifdef FEAT_GUI
 		!gui.in_use &&
-# endif
+#  endif
 		    au_has_group((char_u *)"FileExplorer"))
 	    {
 		/* No browsing supported but we do have the file explorer:
@@ -3153,6 +3154,7 @@ do_ecmd(fnum, ffname, sfname, eap, newlnum, flags)
 		    ffname = (char_u *)".";
 	    }
 	    else
+# endif
 	    {
 		browse_file = do_browse(0, (char_u *)_("Edit File"), ffname,
 						    NULL, NULL, NULL, curbuf);
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 246c4c0b2c..7247d8cbc3 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -7095,10 +7095,11 @@ ex_splitview(eap)
 # endif
 	    && eap->cmdidx != CMD_new)
     {
+# ifdef FEAT_AUTOCMD
 	if (
-# ifdef FEAT_GUI
+#  ifdef FEAT_GUI
 	    !gui.in_use &&
-# endif
+#  endif
 		au_has_group((char_u *)"FileExplorer"))
 	{
 	    /* No browsing supported but we do have the file explorer:
@@ -7107,6 +7108,7 @@ ex_splitview(eap)
 		eap->arg = (char_u *)".";
 	}
 	else
+# endif
 	{
 	    fname = do_browse(0, (char_u *)_("Edit File in new window"),
 					  eap->arg, NULL, NULL, NULL, curbuf);
diff --git a/src/option.c b/src/option.c
index 2d47af3d14..04581a8ebf 100644
--- a/src/option.c
+++ b/src/option.c
@@ -8622,8 +8622,9 @@ makeset(fd, opt_flags, local_only)
 #  endif
 # endif
 # if defined(FEAT_AUTOCMD)
-			    p->indir == PV_FT)
+			    p->indir == PV_FT
 # endif
+			    )
 		    {
 			if (fprintf(fd, "if &%s != '%s'", p->fullname,
 						       *(char_u **)(varp)) < 0
diff --git a/src/quickfix.c b/src/quickfix.c
index e442fcbd1a..ac11416c99 100644
--- a/src/quickfix.c
+++ b/src/quickfix.c
@@ -2999,14 +2999,14 @@ ex_vimgrep(eap)
     char_u	*save_ei = NULL;
 #endif
     aco_save_T	aco;
-#ifdef FEAT_AUTOCMD
-    char_u	*au_name =  NULL;
     int		flags = 0;
     colnr_T	col;
     long	tomatch;
     char_u	dirname_start[MAXPATHL];
     char_u	dirname_now[MAXPATHL];
     char_u	*target_dir = NULL;
+#ifdef FEAT_AUTOCMD
+    char_u	*au_name =  NULL;
 
     switch (eap->cmdidx)
     {
diff --git a/src/version.c b/src/version.c
index a9773ddbfa..0e2c9ed109 100644
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    16,
 /**/
     15,
 /**/