diff --git a/src/macros.h b/src/macros.h
index 16aab2e..86fd60b 100644
--- a/src/macros.h
+++ b/src/macros.h
@@ -261,12 +261,13 @@
 # define MESSAGE_QUEUE
 #endif
 
+#include <float.h>
+#if defined(HAVE_MATH_H)
+  // for isnan() and isinf()
+# include <math.h>
+#endif
+
 #if defined(FEAT_EVAL)
-# include <float.h>
-# if defined(HAVE_MATH_H)
-   // for isnan() and isinf()
-#  include <math.h>
-# endif
 # ifdef USING_FLOAT_STUFF
 #  ifdef MSWIN
 #   ifndef isnan
diff --git a/src/version.c b/src/version.c
index 8493c73..88888d4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -700,6 +700,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    494,
+/**/
     493,
 /**/
     492,