diff --git a/contrib/ipfilter/ipsend/iptests.c b/contrib/ipfilter/ipsend/iptests.c
index 14c4b3ceaceb..87b010a0e0c7 100644
--- a/contrib/ipfilter/ipsend/iptests.c
+++ b/contrib/ipfilter/ipsend/iptests.c
@@ -10,7 +10,6 @@
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/param.h>
-#include <sys/lock.h>
 #define _KERNEL
 #define KERNEL
 #if !defined(solaris) && !defined(linux) && !defined(__sgi)
diff --git a/contrib/ipfilter/ipsend/sock.c b/contrib/ipfilter/ipsend/sock.c
index f6aef25c1ff5..da497c8cf9c1 100644
--- a/contrib/ipfilter/ipsend/sock.c
+++ b/contrib/ipfilter/ipsend/sock.c
@@ -13,7 +13,6 @@
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/param.h>
-#include <sys/lock.h>
 #include <sys/stat.h>
 #ifndef	ultrix
 #include <fcntl.h>
diff --git a/gnu/usr.bin/binutils/gdb/i386/freebsd-nat.c b/gnu/usr.bin/binutils/gdb/i386/freebsd-nat.c
index 45beee1d4be2..1923097137b8 100644
--- a/gnu/usr.bin/binutils/gdb/i386/freebsd-nat.c
+++ b/gnu/usr.bin/binutils/gdb/i386/freebsd-nat.c
@@ -21,7 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "defs.h"
 
 #include <sys/types.h>
-#include <sys/lock.h>
 #include <sys/ptrace.h>
 #include <machine/reg.h>
 #include <machine/frame.h>
diff --git a/gnu/usr.bin/binutils/gdb/i386/kvm-fbsd.c b/gnu/usr.bin/binutils/gdb/i386/kvm-fbsd.c
index 209732e9cbde..07a1e186aa6e 100644
--- a/gnu/usr.bin/binutils/gdb/i386/kvm-fbsd.c
+++ b/gnu/usr.bin/binutils/gdb/i386/kvm-fbsd.c
@@ -27,7 +27,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include <paths.h>
 #include <sys/sysctl.h>
 #include <sys/param.h>
-#include <sys/lock.h>
 #include <sys/time.h>
 #include <sys/proc.h>
 #include <sys/user.h>
diff --git a/gnu/usr.bin/binutils/gdb/kvm-fbsd.c b/gnu/usr.bin/binutils/gdb/kvm-fbsd.c
index 209732e9cbde..07a1e186aa6e 100644
--- a/gnu/usr.bin/binutils/gdb/kvm-fbsd.c
+++ b/gnu/usr.bin/binutils/gdb/kvm-fbsd.c
@@ -27,7 +27,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include <paths.h>
 #include <sys/sysctl.h>
 #include <sys/param.h>
-#include <sys/lock.h>
 #include <sys/time.h>
 #include <sys/proc.h>
 #include <sys/user.h>
diff --git a/gnu/usr.bin/binutils/gdbserver/low-fbsd.c b/gnu/usr.bin/binutils/gdbserver/low-fbsd.c
index 604032afae70..2f1af940838f 100644
--- a/gnu/usr.bin/binutils/gdbserver/low-fbsd.c
+++ b/gnu/usr.bin/binutils/gdbserver/low-fbsd.c
@@ -26,7 +26,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include <stdio.h>
 #include <sys/param.h>
-#include <sys/lock.h>
 #include <dirent.h>
 #include <sys/user.h>
 #include <signal.h>
diff --git a/lib/libc/gen/fstab.c b/lib/libc/gen/fstab.c
index 7e263fb1972f..83db5ec1152a 100644
--- a/lib/libc/gen/fstab.c
+++ b/lib/libc/gen/fstab.c
@@ -42,8 +42,6 @@ static char rcsid[] =
 
 #include "namespace.h"
 #include <sys/param.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
 #include <sys/mount.h>
 #include <sys/stat.h>
 
diff --git a/lib/libc/gen/getmntinfo.c b/lib/libc/gen/getmntinfo.c
index a2ee2378c630..924790de9116 100644
--- a/lib/libc/gen/getmntinfo.c
+++ b/lib/libc/gen/getmntinfo.c
@@ -38,8 +38,6 @@ static char sccsid[] = "@(#)getmntinfo.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
 #include <sys/ucred.h>
 #include <sys/mount.h>
 #include <stdlib.h>
diff --git a/lib/libc/gen/getvfsbyname.c b/lib/libc/gen/getvfsbyname.c
index f5e3283bda7c..a8f691320e72 100644
--- a/lib/libc/gen/getvfsbyname.c
+++ b/lib/libc/gen/getvfsbyname.c
@@ -40,8 +40,6 @@ static const char rcsid[] =
 #endif /* not lint */
 
 #include <sys/param.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
 #include <sys/mount.h>
 #include <sys/sysctl.h>
 #include <errno.h>
diff --git a/lib/libc/gen/getvfsent.c b/lib/libc/gen/getvfsent.c
index d86dfa06ac46..2b8998cbd0f2 100644
--- a/lib/libc/gen/getvfsent.c
+++ b/lib/libc/gen/getvfsent.c
@@ -7,8 +7,6 @@
  */
 
 #include <sys/param.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
 #include <sys/types.h>
 #include <sys/mount.h>
 #include <sys/sysctl.h>
diff --git a/lib/libc/gen/opendir.c b/lib/libc/gen/opendir.c
index 8af17a6e96fa..d1762f58b892 100644
--- a/lib/libc/gen/opendir.c
+++ b/lib/libc/gen/opendir.c
@@ -39,8 +39,6 @@ static char sccsid[] = "@(#)opendir.c	8.8 (Berkeley) 5/1/95";
 
 #include "namespace.h"
 #include <sys/param.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
 #include <sys/mount.h>
 #include <sys/stat.h>
 
diff --git a/lib/libc_r/uthread/uthread_fstat.c b/lib/libc_r/uthread/uthread_fstat.c
index bc2a00b72317..0aa49d129d84 100644
--- a/lib/libc_r/uthread/uthread_fstat.c
+++ b/lib/libc_r/uthread/uthread_fstat.c
@@ -35,8 +35,6 @@
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/param.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
 #include <sys/mount.h>
 #include <sys/stat.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_fstatfs.c b/lib/libc_r/uthread/uthread_fstatfs.c
index 68d430811544..80a8fd5e4748 100644
--- a/lib/libc_r/uthread/uthread_fstatfs.c
+++ b/lib/libc_r/uthread/uthread_fstatfs.c
@@ -35,8 +35,6 @@
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/param.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
 #include <sys/mount.h>
 #include <sys/stat.h>
 #include <pthread.h>
diff --git a/lib/libc_r/uthread/uthread_init.c b/lib/libc_r/uthread/uthread_init.c
index 9f10f740fd1d..7bf09e58bfa3 100644
--- a/lib/libc_r/uthread/uthread_init.c
+++ b/lib/libc_r/uthread/uthread_init.c
@@ -37,8 +37,6 @@
 
 #include "namespace.h"
 #include <sys/param.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
 #include <sys/types.h>
 #include <machine/reg.h>
 
diff --git a/lib/libc_r/uthread/uthread_jmp.c b/lib/libc_r/uthread/uthread_jmp.c
index 772d53d6b14c..df9759fb81dc 100644
--- a/lib/libc_r/uthread/uthread_jmp.c
+++ b/lib/libc_r/uthread/uthread_jmp.c
@@ -34,8 +34,6 @@
 #include <unistd.h>
 #include <setjmp.h>
 #include <sys/param.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
 #include <sys/user.h>
 #include <machine/reg.h>
 #include <pthread.h>
diff --git a/lib/libkse/thread/thr_init.c b/lib/libkse/thread/thr_init.c
index 9f10f740fd1d..7bf09e58bfa3 100644
--- a/lib/libkse/thread/thr_init.c
+++ b/lib/libkse/thread/thr_init.c
@@ -37,8 +37,6 @@
 
 #include "namespace.h"
 #include <sys/param.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
 #include <sys/types.h>
 #include <machine/reg.h>
 
diff --git a/lib/libkvm/kvm.c b/lib/libkvm/kvm.c
index a00c36f6544d..8ce148eb019f 100644
--- a/lib/libkvm/kvm.c
+++ b/lib/libkvm/kvm.c
@@ -45,8 +45,6 @@ static char sccsid[] = "@(#)kvm.c	8.2 (Berkeley) 2/13/94";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
 #include <sys/user.h>
 #include <sys/proc.h>
 #include <sys/ioctl.h>
diff --git a/lib/libkvm/kvm_amd64.c b/lib/libkvm/kvm_amd64.c
index eac32c052ae2..c9550c386687 100644
--- a/lib/libkvm/kvm_amd64.c
+++ b/lib/libkvm/kvm_amd64.c
@@ -50,8 +50,6 @@ static char sccsid[] = "@(#)kvm_hp300.c	8.1 (Berkeley) 6/4/93";
  */
 
 #include <sys/param.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
 #include <sys/user.h>
 #include <sys/proc.h>
 #include <sys/stat.h>
diff --git a/lib/libkvm/kvm_file.c b/lib/libkvm/kvm_file.c
index 83882e07352a..f0c1b9318994 100644
--- a/lib/libkvm/kvm_file.c
+++ b/lib/libkvm/kvm_file.c
@@ -48,8 +48,6 @@ static char sccsid[] = "@(#)kvm_file.c	8.1 (Berkeley) 6/4/93";
  */
 
 #include <sys/param.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
 #include <sys/user.h>
 #include <sys/proc.h>
 #define _KERNEL
diff --git a/lib/libkvm/kvm_getloadavg.c b/lib/libkvm/kvm_getloadavg.c
index 6ca3869aa713..ef68fc78a32f 100644
--- a/lib/libkvm/kvm_getloadavg.c
+++ b/lib/libkvm/kvm_getloadavg.c
@@ -41,8 +41,6 @@ static char sccsid[] = "@(#)kvm_getloadavg.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <sys/proc.h>
diff --git a/lib/libkvm/kvm_getswapinfo.c b/lib/libkvm/kvm_getswapinfo.c
index c2cc5a0a2434..f3f72ddd27a6 100644
--- a/lib/libkvm/kvm_getswapinfo.c
+++ b/lib/libkvm/kvm_getswapinfo.c
@@ -11,8 +11,6 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <sys/conf.h>
diff --git a/lib/libkvm/kvm_i386.c b/lib/libkvm/kvm_i386.c
index eac32c052ae2..c9550c386687 100644
--- a/lib/libkvm/kvm_i386.c
+++ b/lib/libkvm/kvm_i386.c
@@ -50,8 +50,6 @@ static char sccsid[] = "@(#)kvm_hp300.c	8.1 (Berkeley) 6/4/93";
  */
 
 #include <sys/param.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
 #include <sys/user.h>
 #include <sys/proc.h>
 #include <sys/stat.h>
diff --git a/lib/libkvm/kvm_proc.c b/lib/libkvm/kvm_proc.c
index 48cf4143529c..990f856ece5e 100644
--- a/lib/libkvm/kvm_proc.c
+++ b/lib/libkvm/kvm_proc.c
@@ -52,8 +52,6 @@ static char sccsid[] = "@(#)kvm_proc.c	8.3 (Berkeley) 9/23/93";
  */
 
 #include <sys/param.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
 #include <sys/user.h>
 #include <sys/proc.h>
 #include <sys/exec.h>
diff --git a/lib/libncp/ipx.c b/lib/libncp/ipx.c
index 6ca1dfdcb709..b55b58b41f81 100644
--- a/lib/libncp/ipx.c
+++ b/lib/libncp/ipx.c
@@ -34,8 +34,6 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/sysctl.h>
diff --git a/lib/libncp/ncpl_conn.c b/lib/libncp/ncpl_conn.c
index c60d62890850..0ae7a1c6595a 100644
--- a/lib/libncp/ncpl_conn.c
+++ b/lib/libncp/ncpl_conn.c
@@ -47,8 +47,6 @@ __FBSDID("$FreeBSD$");
  * 
  */
 #include <sys/param.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
 #include <sys/sysctl.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
diff --git a/lib/libpthread/thread/thr_init.c b/lib/libpthread/thread/thr_init.c
index 9f10f740fd1d..7bf09e58bfa3 100644
--- a/lib/libpthread/thread/thr_init.c
+++ b/lib/libpthread/thread/thr_init.c
@@ -37,8 +37,6 @@
 
 #include "namespace.h"
 #include <sys/param.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
 #include <sys/types.h>
 #include <machine/reg.h>
 
diff --git a/lib/libstand/netif.c b/lib/libstand/netif.c
index 4d852d490c9f..baae9a91f8f8 100644
--- a/lib/libstand/netif.c
+++ b/lib/libstand/netif.c
@@ -35,8 +35,6 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
 #include <sys/types.h>
 #include <sys/cdefs.h>
 #include <sys/mount.h>
diff --git a/usr.bin/fstat/fstat.c b/usr.bin/fstat/fstat.c
index cc088596c2b6..0e76a5a80087 100644
--- a/usr.bin/fstat/fstat.c
+++ b/usr.bin/fstat/fstat.c
@@ -46,7 +46,6 @@ static const char rcsid[] =
 #endif /* not lint */
 
 #include <sys/param.h>
-#include <sys/lock.h>
 #include <sys/time.h>
 #include <sys/proc.h>
 #include <sys/user.h>
diff --git a/usr.bin/gcore/aoutcore.c b/usr.bin/gcore/aoutcore.c
index 5f17bf9e753b..8894cd4d2eed 100644
--- a/usr.bin/gcore/aoutcore.c
+++ b/usr.bin/gcore/aoutcore.c
@@ -57,7 +57,6 @@ static const char rcsid[] =
  * contract BG 91-66 and contributed to Berkeley.
  */
 #include <sys/param.h>
-#include <sys/lock.h>
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <sys/proc.h>
diff --git a/usr.bin/gcore/gcore.c b/usr.bin/gcore/gcore.c
index 5f17bf9e753b..8894cd4d2eed 100644
--- a/usr.bin/gcore/gcore.c
+++ b/usr.bin/gcore/gcore.c
@@ -57,7 +57,6 @@ static const char rcsid[] =
  * contract BG 91-66 and contributed to Berkeley.
  */
 #include <sys/param.h>
-#include <sys/lock.h>
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <sys/proc.h>
diff --git a/usr.bin/killall/killall.c b/usr.bin/killall/killall.c
index d1cb973da43d..463ea5cd33be 100644
--- a/usr.bin/killall/killall.c
+++ b/usr.bin/killall/killall.c
@@ -29,7 +29,6 @@
 
 #include <sys/cdefs.h>
 #include <sys/param.h>
-#include <sys/lock.h>
 #include <sys/stat.h>
 #include <sys/user.h>
 #include <sys/sysctl.h>
diff --git a/usr.bin/ktrace/subr.c b/usr.bin/ktrace/subr.c
index a66bbcf1564d..4e4b3bf466a5 100644
--- a/usr.bin/ktrace/subr.c
+++ b/usr.bin/ktrace/subr.c
@@ -41,7 +41,6 @@ static const char rcsid[] =
 
 #include <sys/param.h>
 #include <sys/file.h>
-#include <sys/lock.h>
 #include <sys/user.h>
 #include <sys/proc.h>
 #include <sys/time.h>
diff --git a/usr.bin/systat/pigs.c b/usr.bin/systat/pigs.c
index 62a603ad16ab..03a9e94513fd 100644
--- a/usr.bin/systat/pigs.c
+++ b/usr.bin/systat/pigs.c
@@ -43,7 +43,6 @@ static char sccsid[] = "@(#)pigs.c	8.2 (Berkeley) 9/23/93";
 
 #include <sys/param.h>
 #include <sys/dkstat.h>
-#include <sys/lock.h>
 #include <sys/time.h>
 #include <sys/user.h>
 #include <sys/sysctl.h>
diff --git a/usr.bin/top/machine.c b/usr.bin/top/machine.c
index 99ea02039360..65a0a79e63d5 100644
--- a/usr.bin/top/machine.c
+++ b/usr.bin/top/machine.c
@@ -28,7 +28,6 @@
 #include <sys/types.h>
 #include <sys/signal.h>
 #include <sys/param.h>
-#include <sys/lock.h>
 
 #include "os.h"
 #include <stdio.h>
diff --git a/usr.bin/w/proc_compare.c b/usr.bin/w/proc_compare.c
index 7337b491e821..66a0fdab8982 100644
--- a/usr.bin/w/proc_compare.c
+++ b/usr.bin/w/proc_compare.c
@@ -40,7 +40,6 @@ static const char rcsid[] =
 #endif /* not lint */
 
 #include <sys/param.h>
-#include <sys/lock.h>
 #include <sys/time.h>
 #include <sys/user.h>
 
diff --git a/usr.bin/w/w.c b/usr.bin/w/w.c
index d00713d31020..d410ec74eed1 100644
--- a/usr.bin/w/w.c
+++ b/usr.bin/w/w.c
@@ -52,7 +52,6 @@ static const char rcsid[] =
  *
  */
 #include <sys/param.h>
-#include <sys/lock.h>
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <sys/sysctl.h>