diff --git a/src/os_unixx.h b/src/os_unixx.h
index c83ea31..edf7914 100644
--- a/src/os_unixx.h
+++ b/src/os_unixx.h
@@ -69,16 +69,7 @@
 #endif
 
 #ifdef HAVE_SYS_SYSTEMINFO_H
-/*
- * foolish Sinix <sys/systeminfo.h> uses SYS_NMLN but doesn't include
- * <limits.h>, where it is defined. Perhaps other systems have the same
- * problem? Include it here. -- Slootman
- */
-# if defined(HAVE_LIMITS_H) && !defined(_LIMITS_H)
-#  include <limits.h>		/* for SYS_NMLN (Sinix 5.41 / Unix SysV.4) */
-# endif
-
-/* Define SYS_NMLN ourselves if it still isn't defined (for CrayT3E). */
+/* <sys/systeminfo.h> uses SYS_NMLN but it may not be defined (CrayT3E). */
 # ifndef SYS_NMLN
 #  define SYS_NMLN 32
 # endif
diff --git a/src/version.c b/src/version.c
index 2b08df5..1d23935 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    346,
+/**/
     345,
 /**/
     344,
diff --git a/src/vim.h b/src/vim.h
index 8636c56..b1faf23 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -487,6 +487,9 @@
 # include <errno.h>
 #endif
 
+/* for INT_MAX et al. */
+#include <limits.h>
+
 /*
  * Allow other (non-unix) systems to configure themselves now
  * These are also in os_unix.h, because osdef.sh needs them there.