diff --git a/src/getchar.c b/src/getchar.c
index 3ae5f40609..54bce315f3 100644
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -3710,9 +3710,11 @@ do_map(maptype, arg, mode, abbrev)
 	else if (*keys == Ctrl_C)
 	{
 	    /* If CTRL-C has been unmapped, reuse it for Interrupting. */
+#ifdef FEAT_LOCALMAP
 	    if (map_table == curbuf->b_maphash)
 		curbuf->b_mapped_ctrl_c &= ~mode;
 	    else
+#endif
 		mapped_ctrl_c &= ~mode;
 	}
 	goto theend;
@@ -3750,9 +3752,11 @@ do_map(maptype, arg, mode, abbrev)
     /* If CTRL-C has been mapped, don't always use it for Interrupting. */
     if (*keys == Ctrl_C)
     {
+#ifdef FEAT_LOCALMAP
 	if (map_table == curbuf->b_maphash)
 	    curbuf->b_mapped_ctrl_c |= mode;
 	else
+#endif
 	    mapped_ctrl_c |= mode;
     }
 
diff --git a/src/version.c b/src/version.c
index b6e75563a0..39191f5004 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    571,
 /**/
     570,
 /**/