diff --git a/include/limits.h b/include/limits.h
--- a/include/limits.h
+++ b/include/limits.h
@@ -121,6 +121,14 @@
 #define	_POSIX_RE_DUP_MAX	_POSIX2_RE_DUP_MAX
 #endif
 
+/*
+ * Pthread run-time invariant values:
+ */
+#define	PTHREAD_DESTRUCTOR_ITERATIONS		4
+#define	PTHREAD_KEYS_MAX			256
+#define	PTHREAD_STACK_MIN			__MINSIGSTKSZ
+#define	PTHREAD_THREADS_MAX			__ULONG_MAX
+
 #if __XSI_VISIBLE || __POSIX_VISIBLE >= 200809
 #define	NL_ARGMAX		4096	/* max # of position args for printf */
 #define	NL_MSGMAX		32767
diff --git a/include/pthread.h b/include/pthread.h
--- a/include/pthread.h
+++ b/include/pthread.h
@@ -47,14 +47,11 @@
 #include <sys/_sigset.h>
 #include <sched.h>
 #include <time.h>
+#include <limits.h>
 
 /*
  * Run-time invariant values:
  */
-#define	PTHREAD_DESTRUCTOR_ITERATIONS		4
-#define	PTHREAD_KEYS_MAX			256
-#define	PTHREAD_STACK_MIN			__MINSIGSTKSZ
-#define	PTHREAD_THREADS_MAX			__ULONG_MAX
 #define	PTHREAD_BARRIER_SERIAL_THREAD		-1
 
 /*
diff --git a/lib/libstdthreads/tss.c b/lib/libstdthreads/tss.c
--- a/lib/libstdthreads/tss.c
+++ b/lib/libstdthreads/tss.c
@@ -31,6 +31,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include <limits.h>
 #include <pthread.h>
 
 #include "threads.h"