diff --git a/src/auto/configure b/src/auto/configure
index da57bd0..dc9ee6e 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -13042,7 +13042,8 @@
 if ${vim_cv_timer_create+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  save_LIBS="$LIBS"
+
+save_LIBS="$LIBS"
 LIBS="$LIBS -lrt"
 if test "$cross_compiling" = yes; then :
   as_fn_error $? "cross-compiling: please set 'vim_cv_timer_create'" "$LINENO" 5
@@ -13051,8 +13052,12 @@
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-#include<signal.h>
-#include<time.h>
+#if STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#endif
+#include <signal.h>
+#include <time.h>
 static void set_flag(union sigval sv) {}
 
 int
@@ -13086,6 +13091,10 @@
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+#if STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#endif
 #include<signal.h>
 #include<time.h>
 static void set_flag(union sigval sv) {}
diff --git a/src/configure.ac b/src/configure.ac
index c393574..b52aabc 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -3807,12 +3807,16 @@
 dnl Check for timer_create. It probably requires the 'rt' library.
 dnl Run the program to find out if timer_create(CLOCK_MONOTONIC) actually
 dnl works, on Solaris timer_create() exists but fails at runtime.
-AC_CACHE_CHECK([for timer_create], [vim_cv_timer_create],
+AC_CACHE_CHECK([for timer_create], [vim_cv_timer_create], [
 save_LIBS="$LIBS"
 LIBS="$LIBS -lrt"
 AC_RUN_IFELSE([AC_LANG_PROGRAM([
-#include<signal.h>
-#include<time.h>
+#if STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#endif
+#include <signal.h>
+#include <time.h>
 static void set_flag(union sigval sv) {}
 ], [
   struct timespec ts;
@@ -3827,6 +3831,10 @@
   AC_MSG_NOTICE(timer_create with -lrt); vim_cv_timer_create=yes,
   LIBS="$save_LIBS"
   AC_RUN_IFELSE([AC_LANG_PROGRAM([
+#if STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#endif
 #include<signal.h>
 #include<time.h>
 static void set_flag(union sigval sv) {}
@@ -3843,7 +3851,7 @@
     vim_cv_timer_create=yes,
     vim_cv_timer_create=no),
     AC_MSG_ERROR(cross-compiling: please set 'vim_cv_timer_create')
-    )
+    )]
 )
 
 if test "x$vim_cv_timer_create" = "xyes" ; then
diff --git a/src/version.c b/src/version.c
index 08152ad..e576860 100644
--- a/src/version.c
+++ b/src/version.c
@@ -736,6 +736,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    98,
+/**/
     97,
 /**/
     96,