diff --git a/src/message_test.c b/src/message_test.c
index 4ad8041..e5fd562 100644
--- a/src/message_test.c
+++ b/src/message_test.c
@@ -402,11 +402,6 @@
 	assert(bsize == 0 || STRNCMP(buf, "9 1234567 7654321", bsize_int) == 0);
 	assert(bsize == 0 || buf[MIN(n, bsize_int)] == '\0');
 
-	n = vim_snprintf(buf, bsize, "%2$d %1$llu %3$lu", 1234567LLU, 9, 7654321UL);
-	assert(n == 17);
-	assert(bsize == 0 || STRNCMP(buf, "9 1234567 7654321", bsize_int) == 0);
-	assert(bsize == 0 || buf[MIN(n, bsize_int)] == '\0');
-
 	n = vim_snprintf(buf, bsize, "%2$d %1$x %3$lu", 0xdeadbeef, 9, 7654321UL);
 	assert(n == 18);
 	assert(bsize == 0 || STRNCMP(buf, "9 deadbeef 7654321", bsize_int) == 0);
diff --git a/src/strings.c b/src/strings.c
index ead5916..e5ad9cd 100644
--- a/src/strings.c
+++ b/src/strings.c
@@ -2260,7 +2260,7 @@
 
 /* Types that can be used in a format string
  */
-    int
+    static int
 format_typeof(
     const char	*type,
     int		usetvs UNUSED)
@@ -2386,7 +2386,7 @@
     return TYPE_UNKNOWN;
 }
 
-    char *
+    static char *
 format_typename(
     const char  *type)
 {
@@ -2429,7 +2429,7 @@
     return _(typename_unknown);
 }
 
-    int
+    static int
 adjust_types(
     const char ***ap_types,
     int arg,
@@ -2490,7 +2490,7 @@
     return OK;
 }
 
-    int
+    static int
 parse_fmt_types(
     const char  ***ap_types,
     int		*num_posarg,
@@ -2788,7 +2788,7 @@
     return FAIL;
 }
 
-    void
+    static void
 skip_to_arg(
     const char	**ap_types,
     va_list	ap_start,
diff --git a/src/version.c b/src/version.c
index fa45168..c759da9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1715,
+/**/
     1714,
 /**/
     1713,