Don't include sys/user.h merely for its side-effect of recursively

including other headers.

4 files changed, 5 insertions, 3 deletions

diff --git a/lib/libc_r/uthread/pthread_private.h b/lib/libc_r/uthread/pthread_private.h
index f83e2f4..ecd330c 100644
--- a/lib/libc_r/uthread/pthread_private.h
+++ b/lib/libc_r/uthread/pthread_private.h
@@ -52,6 +52,7 @@
 #include <setjmp.h>
 #include <signal.h>
 #include <stdio.h>
+#include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/types.h>
 #include <sys/time.h>
@@ -60,6 +61,10 @@
 #include <spinlock.h>
 #include <ucontext.h>
 #include <pthread_np.h>
+#include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/pmap.h>
+#include <vm/vm_map.h>
 
 /*
  * Define machine dependent macros to get and set the stack pointer
diff --git a/lib/libc_r/uthread/uthread_init.c b/lib/libc_r/uthread/uthread_init.c
index d3a2b45..fadc277 100644
--- a/lib/libc_r/uthread/uthread_init.c
+++ b/lib/libc_r/uthread/uthread_init.c
@@ -49,7 +49,6 @@
 #include <sys/sysctl.h>
 #include <sys/time.h>
 #include <sys/ttycom.h>
-#include <sys/user.h>
 #include <sys/wait.h>
 #include <sys/mman.h>
 #include <dirent.h>
diff --git a/lib/libc_r/uthread/uthread_jmp.c b/lib/libc_r/uthread/uthread_jmp.c
index df9759f..5aa0001 100644
--- a/lib/libc_r/uthread/uthread_jmp.c
+++ b/lib/libc_r/uthread/uthread_jmp.c
@@ -34,7 +34,6 @@
 #include <unistd.h>
 #include <setjmp.h>
 #include <sys/param.h>
-#include <sys/user.h>
 #include <machine/reg.h>
 #include <pthread.h>
 #include "pthread_private.h"
diff --git a/lib/libc_r/uthread/uthread_stack.c b/lib/libc_r/uthread/uthread_stack.c
index 63fa4cd..b2f3f57 100644
--- a/lib/libc_r/uthread/uthread_stack.c
+++ b/lib/libc_r/uthread/uthread_stack.c
@@ -31,7 +31,6 @@
 #include <sys/mman.h>
 #include <sys/param.h>
 #include <sys/queue.h>
-#include <sys/user.h>
 #include <stdlib.h>
 #include <pthread.h>
 #include "un-namespace.h"