diff --git a/lib/libkse/thread/thr_pspinlock.c b/lib/libkse/thread/thr_pspinlock.c
index b58d7120d4e..de555bfc796 100644
--- a/lib/libkse/thread/thr_pspinlock.c
+++ b/lib/libkse/thread/thr_pspinlock.c
@@ -26,10 +26,13 @@
  * $FreeBSD$
  */
 
+#include <sys/types.h>
 #include <errno.h>
-#include <stdlib.h>
 #include <pthread.h>
-#include <atomic_ops.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#include "atomic_ops.h"
 #include "thr_private.h"
 
 #define SPIN_COUNT 10000
diff --git a/lib/libkse/thread/thr_sem.c b/lib/libkse/thread/thr_sem.c
index 027960e0c85..8312a870a87 100644
--- a/lib/libkse/thread/thr_sem.c
+++ b/lib/libkse/thread/thr_sem.c
@@ -30,6 +30,7 @@
  */
 
 #include "namespace.h"
+#include <sys/types.h>
 #include <sys/queue.h>
 #include <errno.h>
 #include <fcntl.h>
diff --git a/lib/libkse/thread/thr_sigsuspend.c b/lib/libkse/thread/thr_sigsuspend.c
index b8e14e354fe..6452af150d4 100644
--- a/lib/libkse/thread/thr_sigsuspend.c
+++ b/lib/libkse/thread/thr_sigsuspend.c
@@ -31,11 +31,14 @@
  *
  * $FreeBSD$
  */
-#include <signal.h>
+
+#include <sys/types.h>
+#include <sys/signalvar.h>
 #include <errno.h>
 #include <pthread.h>
+#include <signal.h>
 #include <string.h>
-#include <sys/signalvar.h>
+
 #include "thr_private.h"
 
 __weak_reference(__sigsuspend, sigsuspend);
diff --git a/lib/libkse/thread/thr_symbols.c b/lib/libkse/thread/thr_symbols.c
index 5091a9517c6..10e9402a603 100644
--- a/lib/libkse/thread/thr_symbols.c
+++ b/lib/libkse/thread/thr_symbols.c
@@ -32,6 +32,7 @@
  * $FreeBSD$
  */
 
+#include <sys/types.h>
 #include <stddef.h>
 #include <pthread.h>
 #include <rtld.h>
diff --git a/lib/libpthread/thread/thr_pspinlock.c b/lib/libpthread/thread/thr_pspinlock.c
index b58d7120d4e..de555bfc796 100644
--- a/lib/libpthread/thread/thr_pspinlock.c
+++ b/lib/libpthread/thread/thr_pspinlock.c
@@ -26,10 +26,13 @@
  * $FreeBSD$
  */
 
+#include <sys/types.h>
 #include <errno.h>
-#include <stdlib.h>
 #include <pthread.h>
-#include <atomic_ops.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#include "atomic_ops.h"
 #include "thr_private.h"
 
 #define SPIN_COUNT 10000
diff --git a/lib/libpthread/thread/thr_sem.c b/lib/libpthread/thread/thr_sem.c
index 027960e0c85..8312a870a87 100644
--- a/lib/libpthread/thread/thr_sem.c
+++ b/lib/libpthread/thread/thr_sem.c
@@ -30,6 +30,7 @@
  */
 
 #include "namespace.h"
+#include <sys/types.h>
 #include <sys/queue.h>
 #include <errno.h>
 #include <fcntl.h>
diff --git a/lib/libpthread/thread/thr_sigsuspend.c b/lib/libpthread/thread/thr_sigsuspend.c
index b8e14e354fe..6452af150d4 100644
--- a/lib/libpthread/thread/thr_sigsuspend.c
+++ b/lib/libpthread/thread/thr_sigsuspend.c
@@ -31,11 +31,14 @@
  *
  * $FreeBSD$
  */
-#include <signal.h>
+
+#include <sys/types.h>
+#include <sys/signalvar.h>
 #include <errno.h>
 #include <pthread.h>
+#include <signal.h>
 #include <string.h>
-#include <sys/signalvar.h>
+
 #include "thr_private.h"
 
 __weak_reference(__sigsuspend, sigsuspend);
diff --git a/lib/libpthread/thread/thr_symbols.c b/lib/libpthread/thread/thr_symbols.c
index 5091a9517c6..10e9402a603 100644
--- a/lib/libpthread/thread/thr_symbols.c
+++ b/lib/libpthread/thread/thr_symbols.c
@@ -32,6 +32,7 @@
  * $FreeBSD$
  */
 
+#include <sys/types.h>
 #include <stddef.h>
 #include <pthread.h>
 #include <rtld.h>
diff --git a/lib/libthr/thread/thr_create.c b/lib/libthr/thread/thr_create.c
index 774eaaad8ef..22d35e70e36 100644
--- a/lib/libthr/thread/thr_create.c
+++ b/lib/libthr/thread/thr_create.c
@@ -33,12 +33,13 @@
  * $FreeBSD$
  */
 
+#include <sys/types.h>
+#include <sys/signalvar.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stddef.h>
 #include <pthread.h>
-#include <sys/signalvar.h>
 
 #include "thr_private.h"
 
diff --git a/lib/libthr/thread/thr_sem.c b/lib/libthr/thread/thr_sem.c
index bd952ef28e9..aa34b6f432c 100644
--- a/lib/libthr/thread/thr_sem.c
+++ b/lib/libthr/thread/thr_sem.c
@@ -31,6 +31,7 @@
  */
 
 #include "namespace.h"
+#include <sys/types.h>
 #include <sys/queue.h>
 #include <errno.h>
 #include <fcntl.h>
diff --git a/lib/libthr/thread/thr_symbols.c b/lib/libthr/thread/thr_symbols.c
index c35f2c717fe..ca6606aafe6 100644
--- a/lib/libthr/thread/thr_symbols.c
+++ b/lib/libthr/thread/thr_symbols.c
@@ -32,6 +32,7 @@
  * $FreeBSD$
  */
 
+#include <sys/types.h>
 #include <stddef.h>
 #include <pthread.h>
 #include <rtld.h>