diff --git a/src/message.c b/src/message.c
index ab193f085..a4d2cc8f3 100644
--- a/src/message.c
+++ b/src/message.c
@@ -539,7 +539,7 @@ emsg_not_now(void)
     return FALSE;
 }
 
-#ifdef FEAT_EVAL
+#if defined(FEAT_EVAL) || defined(PROTO)
 static garray_T ignore_error_list = GA_EMPTY;
 
     void
diff --git a/src/misc2.c b/src/misc2.c
index 992e5c292..cfdfc4c4a 100644
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -2099,7 +2099,7 @@ ga_concat_strings(garray_T *gap, char *sep)
     return s;
 }
 
-#if defined(FEAT_VIMINFO) || defined(PROTO)
+#if defined(FEAT_VIMINFO) || defined(FEAT_EVAL) || defined(PROTO)
 /*
  * Make a copy of string "p" and add it to "gap".
  * When out of memory nothing changes.
diff --git a/src/version.c b/src/version.c
index 0c9731d3f..26b5455ab 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    397,
 /**/
     396,
 /**/