Do not include <sys/syslimits.h> directly; it is not intended for general

consumption.

bin/ls/ls.c

@@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/syslimits.h>
 #include <sys/ioctl.h>
 #include <sys/mac.h>
 

lib/libc/locale/ldpart.c

@@ -30,9 +30,10 @@ __FBSDID("$FreeBSD$");
 #include "namespace.h"
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/syslimits.h>
+
 #include <errno.h>
 #include <fcntl.h>
+#include <limits.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>

lib/libc/nls/msgcat.c

@@ -41,9 +41,10 @@ __FBSDID("$FreeBSD$");
 #include "namespace.h"
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/syslimits.h>
+
 #include <errno.h>
 #include <fcntl.h>
+#include <limits.h>
 #include <locale.h>
 #include <nl_types.h>
 #include <stdio.h>

lib/libc/posix1e/mac.c

@@ -40,10 +40,10 @@
 #include <sys/types.h>
 #include <sys/queue.h>
 #include <sys/sysctl.h>
-#include <sys/syslimits.h>
 
 #include <dlfcn.h>
 #include <errno.h>
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

usr.sbin/kbdmap/kbdmap.c

@@ -29,11 +29,11 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 #include <sys/queue.h>
-#include <sys/syslimits.h>
 
 #include <assert.h>
 #include <ctype.h>
 #include <dirent.h>
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

usr.sbin/sysinstall/nfs.c

@@ -37,10 +37,11 @@
 #include "sysinstall.h"
 #include <sys/errno.h>
 #include <sys/fcntl.h>
-#include <sys/syslimits.h>
 #include <sys/param.h>
 #include <sys/mount.h>
 
+#include <limits.h>
+
 Boolean NFSMounted;
 static char mountpoint[] = "/dist";