diff --git a/sys/sys/priority.h b/sys/sys/priority.h
--- a/sys/sys/priority.h
+++ b/sys/sys/priority.h
@@ -136,10 +136,10 @@
 #endif
 
 struct priority {
-	u_char	pri_class;	/* Scheduling class. */
-	u_char	pri_level;	/* Normal priority level. */
-	u_char	pri_native;	/* Priority before propagation. */
-	u_char	pri_user;	/* User priority based on p_cpu and p_nice. */
+	unsigned char pri_class;	/* Scheduling class. */
+	unsigned char pri_level;	/* Normal priority level. */
+	unsigned char pri_native;	/* Priority before propagation. */
+	unsigned char pri_user;		/* User priority based on p_cpu and p_nice. */
 };
 
 #endif	/* !_SYS_PRIORITY_H_ */
diff --git a/sys/sys/rtprio.h b/sys/sys/rtprio.h
--- a/sys/sys/rtprio.h
+++ b/sys/sys/rtprio.h
@@ -34,6 +34,7 @@
 #ifndef _SYS_RTPRIO_H_
 #define _SYS_RTPRIO_H_
 
+#include <sys/_types.h>
 #include <sys/priority.h>
 
 /*
@@ -71,8 +72,8 @@
  * Scheduling class information.
  */
 struct rtprio {
-	u_short type;			/* scheduling class */
-	u_short prio;
+	unsigned short type;	/* scheduling class */
+	unsigned short prio;
 };
 
 #ifdef _KERNEL
@@ -86,8 +87,8 @@
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-int	rtprio(int, pid_t, struct rtprio *);
-int	rtprio_thread(int, lwpid_t, struct rtprio *);
+int	rtprio(int, __pid_t, struct rtprio *);
+int	rtprio_thread(int, __lwpid_t, struct rtprio *);
 __END_DECLS
 #endif	/* !_KERNEL */
 #endif	/* !_SYS_RTPRIO_H_ */
diff --git a/tools/build/test-includes/badfiles.inc b/tools/build/test-includes/badfiles.inc
--- a/tools/build/test-includes/badfiles.inc
+++ b/tools/build/test-includes/badfiles.inc
@@ -90,14 +90,12 @@
 	sys/pmckern.h \
 	sys/posix4.h \
 	sys/power.h \
-	sys/priority.h \
 	sys/prng.h \
 	sys/qmath.h \
 	sys/racct.h \
 	sys/resourcevar.h \
 	sys/rman.h \
 	sys/rmlock.h \
-	sys/rtprio.h \
 	sys/runq.h \
 	sys/rwlock.h \
 	sys/sbuf.h \