6 files changed, 8 insertions, 6 deletions

diff --git a/bin/ls/ls.c b/bin/ls/ls.c
index cddbb7955b43d..a8d76072df563 100644
--- a/bin/ls/ls.c
+++ b/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>
 
diff --git a/lib/libc/locale/ldpart.c b/lib/libc/locale/ldpart.c
index 1933312ae333a..ceb83949d3c43 100644
--- a/lib/libc/locale/ldpart.c
+++ b/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>
diff --git a/lib/libc/nls/msgcat.c b/lib/libc/nls/msgcat.c
index 2b80d914ba18b..4d446184eafd2 100644
--- a/lib/libc/nls/msgcat.c
+++ b/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>
diff --git a/lib/libc/posix1e/mac.c b/lib/libc/posix1e/mac.c
index ee6fd739d2a31..135cdd2b097a9 100644
--- a/lib/libc/posix1e/mac.c
+++ b/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>
diff --git a/usr.sbin/kbdmap/kbdmap.c b/usr.sbin/kbdmap/kbdmap.c
index 423a13c8ef0ae..5f2bffdaffe49 100644
--- a/usr.sbin/kbdmap/kbdmap.c
+++ b/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>
diff --git a/usr.sbin/sysinstall/nfs.c b/usr.sbin/sysinstall/nfs.c
index 2f096377b6feb..96590cb84ef57 100644
--- a/usr.sbin/sysinstall/nfs.c
+++ b/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";