--- a/src/charset.c
+++ b/src/charset.c
@@ -914,7 +914,7 @@ vim_iswordc_buf(p, buf)
 # endif
     return (GET_CHARTAB(buf, *p) != 0);
 }
-#endif /* FEAT_SYN_HL */
+#endif
 
 /*
  * return TRUE if 'c' is a valid file-name character
@@ -1464,7 +1464,7 @@ skipdigits(p)
     return p;
 }
 
-#if defined(FEAT_SYN_HL) || defined(PROTO)
+#if defined(FEAT_SYN_HL) || defined(FEAT_SPELL) || defined(PROTO)
 /*
  * skip over digits and hex characters
  */

--- a/src/misc2.c
+++ b/src/misc2.c
@@ -968,7 +968,7 @@ free_all_mem()
     do_cmdline_cmd((char_u *)"only!");
 #endif
 
-# if defined(FEAT_SYN_HL)
+# if defined(FEAT_SPELL)
     /* Free all spell info. */
     spell_free_all();
 # endif
@@ -1270,7 +1270,7 @@ vim_strup(p)
     }
 }
 
-#if defined(FEAT_EVAL) || defined(FEAT_SYN_HL) || defined(PROTO)
+#if defined(FEAT_EVAL) || defined(FEAT_SPELL) || defined(PROTO)
 /*
  * Make string "s" all upper-case and return it in allocated memory.
  * Handles multi-byte characters as well as possible.
@@ -5758,7 +5758,7 @@ vimpty_getenv(string)
 
 #endif /* !defined(HAVE_SETENV) && !defined(HAVE_PUTENV) */
 
-#if defined(FEAT_EVAL) || defined(FEAT_SYN_HL) || defined(PROTO)
+#if defined(FEAT_EVAL) || defined(FEAT_SPELL) || defined(PROTO)
 /*
  * Return 0 for not writable, 1 for writable file, 2 for a dir which we have
  * rights to write into.

--- a/src/regexp.c
+++ b/src/regexp.c
@@ -1780,12 +1780,12 @@ regatom(flagp)
 	    }
 	    break;
 
-#ifdef FEAT_SYN_HL
       case Magic('z'):
 	{
 	    c = no_Magic(getchr());
 	    switch (c)
 	    {
+#ifdef FEAT_SYN_HL
 		case '(': if (reg_do_extmatch != REX_SET)
 			      EMSG_RET_NULL(_("E66: \\z( not allowed here"));
 			  if (one_exactly)
@@ -1810,6 +1810,7 @@ regatom(flagp)
 			  ret = regnode(ZREF + c - '0');
 			  re_has_z = REX_USE;
 			  break;
+#endif
 
 		case 's': ret = regnode(MOPEN + 0);
 			  break;
@@ -1821,7 +1822,6 @@ regatom(flagp)
 	    }
 	}
 	break;
-#endif
 
       case Magic('%'):
 	{