Index: arch/amd64/amd64/lock_machdep.c
===================================================================
RCS file: /cvs/src/sys/arch/amd64/amd64/lock_machdep.c,v
retrieving revision 1.6
diff -u -p -r1.6 lock_machdep.c
--- arch/amd64/amd64/lock_machdep.c	10 Jul 2014 12:14:48 -0000	1.6
+++ arch/amd64/amd64/lock_machdep.c	11 Feb 2015 04:06:06 -0000
@@ -18,7 +18,6 @@
 
 
 #include <sys/param.h>
-#include <sys/lock.h>
 #include <sys/systm.h>
 
 #include <machine/atomic.h>
Index: arch/hppa/include/pmap.h
===================================================================
RCS file: /cvs/src/sys/arch/hppa/include/pmap.h,v
retrieving revision 1.47
diff -u -p -r1.47 pmap.h
--- arch/hppa/include/pmap.h	17 Dec 2014 15:01:47 -0000	1.47
+++ arch/hppa/include/pmap.h	11 Feb 2015 04:06:06 -0000
@@ -159,8 +159,6 @@ pmap_protect(struct pmap *pmap, vaddr_t 
 
 #if !defined(_LOCORE)
 
-#include <sys/lock.h>
-
 struct pv_entry;
 struct vm_page_md {
 	struct pv_entry	*pvh_list;	/* head of list (locked by pvh_lock) */
Index: arch/i386/i386/db_mp.c
===================================================================
RCS file: /cvs/src/sys/arch/i386/i386/db_mp.c,v
retrieving revision 1.6
diff -u -p -r1.6 db_mp.c
--- arch/i386/i386/db_mp.c	23 Apr 2010 21:34:40 -0000	1.6
+++ arch/i386/i386/db_mp.c	11 Feb 2015 04:06:06 -0000
@@ -17,10 +17,9 @@
  */
 
 #include <sys/types.h>
-#include <sys/lock.h>
+#include <sys/mutex.h>
 
 #include <machine/db_machdep.h>
-#include <sys/mutex.h>
 
 #include <ddb/db_output.h>
 
Index: arch/i386/i386/gdt.c
===================================================================
RCS file: /cvs/src/sys/arch/i386/i386/gdt.c,v
retrieving revision 1.34
diff -u -p -r1.34 gdt.c
--- arch/i386/i386/gdt.c	16 Nov 2014 12:30:57 -0000	1.34
+++ arch/i386/i386/gdt.c	11 Feb 2015 04:06:06 -0000
@@ -49,7 +49,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/lock.h>
 #include <sys/mutex.h>
 
 #include <uvm/uvm_extern.h>
Index: arch/i386/i386/kvm86.c
===================================================================
RCS file: /cvs/src/sys/arch/i386/i386/kvm86.c,v
retrieving revision 1.8
diff -u -p -r1.8 kvm86.c
--- arch/i386/i386/kvm86.c	16 Nov 2014 12:30:57 -0000	1.8
+++ arch/i386/i386/kvm86.c	11 Feb 2015 04:06:06 -0000
@@ -32,7 +32,6 @@
 #include <sys/user.h>
 #include <sys/malloc.h>
 #include <sys/mutex.h>
-#include <sys/lock.h>
 
 #include <uvm/uvm_extern.h>
 
Index: arch/i386/i386/lock_machdep.c
===================================================================
RCS file: /cvs/src/sys/arch/i386/i386/lock_machdep.c,v
retrieving revision 1.16
diff -u -p -r1.16 lock_machdep.c
--- arch/i386/i386/lock_machdep.c	20 Jul 2014 02:48:59 -0000	1.16
+++ arch/i386/i386/lock_machdep.c	11 Feb 2015 04:06:06 -0000
@@ -36,7 +36,6 @@
  */
 
 #include <sys/param.h>
-#include <sys/lock.h>
 #include <sys/systm.h>
 
 #include <machine/atomic.h>
@@ -44,12 +43,6 @@
 #include <machine/cpufunc.h>
 
 #include <ddb/db_output.h>
-
-int
-rw_cas_486(volatile unsigned long *p, unsigned long o, unsigned long n)
-{
-	return (i486_atomic_cas_int((u_int *)p, o, n) != o);
-}
 
 #ifdef MULTIPROCESSOR
  void
Index: arch/i386/include/lock.h
===================================================================
RCS file: /cvs/src/sys/arch/i386/include/lock.h,v
retrieving revision 1.10
diff -u -p -r1.10 lock.h
--- arch/i386/include/lock.h	11 Feb 2015 00:14:11 -0000	1.10
+++ arch/i386/include/lock.h	11 Feb 2015 04:06:06 -0000
@@ -51,8 +51,4 @@
 
 #include <machine/atomic.h>
 
-#ifdef _KERNEL
-extern int rw_cas_486(volatile unsigned long *, unsigned long, unsigned long);
-#endif
-
 #endif /* _MACHINE_LOCK_H_ */
Index: arch/m88k/include/cpu.h
===================================================================
RCS file: /cvs/src/sys/arch/m88k/include/cpu.h,v
retrieving revision 1.62
diff -u -p -r1.62 cpu.h
--- arch/m88k/include/cpu.h	11 Jul 2014 10:53:07 -0000	1.62
+++ arch/m88k/include/cpu.h	11 Feb 2015 04:06:06 -0000
@@ -238,7 +238,6 @@ void	set_cpu_number(cpuid_t);
 #define	cpu_idle_leave()	do { /* nothing */ } while (0)
 
 #if defined(MULTIPROCESSOR)
-#include <sys/lock.h>
 #include <sys/mplock.h>
 #endif
 
Index: arch/m88k/m88k/m88k_machdep.c
===================================================================
RCS file: /cvs/src/sys/arch/m88k/m88k/m88k_machdep.c,v
retrieving revision 1.63
diff -u -p -r1.63 m88k_machdep.c
--- arch/m88k/m88k/m88k_machdep.c	15 Jul 2014 16:28:11 -0000	1.63
+++ arch/m88k/m88k/m88k_machdep.c	11 Feb 2015 04:06:06 -0000
@@ -52,7 +52,6 @@
 #include <sys/msgbuf.h>
 #include <sys/exec.h>
 #include <sys/errno.h>
-#include <sys/lock.h>
 #include <sys/malloc.h>
 #ifdef MULTIPROCESSOR
 #include <sys/mplock.h>
@@ -61,6 +60,7 @@
 #include <machine/asm.h>
 #include <machine/asm_macro.h>
 #include <machine/atomic.h>
+#include <machine/lock.h>
 #include <machine/cmmu.h>
 #include <machine/cpu.h>
 #include <machine/reg.h>
Index: arch/m88k/m88k/mplock.c
===================================================================
RCS file: /cvs/src/sys/arch/m88k/m88k/mplock.c,v
retrieving revision 1.2
diff -u -p -r1.2 mplock.c
--- arch/m88k/m88k/mplock.c	21 Feb 2009 18:37:48 -0000	1.2
+++ arch/m88k/m88k/mplock.c	11 Feb 2015 04:06:06 -0000
@@ -25,7 +25,6 @@
  */
 
 #include <sys/param.h>
-#include <sys/lock.h>
 #include <sys/systm.h>
 
 #include <machine/asm_macro.h>
Index: arch/macppc/macppc/lock_machdep.c
===================================================================
RCS file: /cvs/src/sys/arch/macppc/macppc/lock_machdep.c,v
retrieving revision 1.4
diff -u -p -r1.4 lock_machdep.c
--- arch/macppc/macppc/lock_machdep.c	19 Sep 2014 11:40:16 -0000	1.4
+++ arch/macppc/macppc/lock_machdep.c	11 Feb 2015 04:06:06 -0000
@@ -18,7 +18,6 @@
 
 
 #include <sys/param.h>
-#include <sys/lock.h>
 #include <sys/systm.h>
 
 #include <machine/atomic.h>
Index: arch/mips64/include/cpu.h
===================================================================
RCS file: /cvs/src/sys/arch/mips64/include/cpu.h,v
retrieving revision 1.103
diff -u -p -r1.103 cpu.h
--- arch/mips64/include/cpu.h	14 Aug 2014 17:55:28 -0000	1.103
+++ arch/mips64/include/cpu.h	11 Feb 2015 04:06:06 -0000
@@ -121,7 +121,6 @@
 #if defined(_KERNEL) && !defined(_LOCORE)
 
 #include <sys/device.h>
-#include <sys/lock.h>
 #include <machine/intr.h>
 #include <sys/sched.h>
 
Index: arch/octeon/dev/cn30xxgmx.c
===================================================================
RCS file: /cvs/src/sys/arch/octeon/dev/cn30xxgmx.c,v
retrieving revision 1.17
diff -u -p -r1.17 cn30xxgmx.c
--- arch/octeon/dev/cn30xxgmx.c	9 Dec 2014 06:58:28 -0000	1.17
+++ arch/octeon/dev/cn30xxgmx.c	11 Feb 2015 04:06:06 -0000
@@ -35,7 +35,6 @@
 #include <sys/systm.h>
 #include <sys/types.h>
 #include <sys/device.h>
-#include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/syslog.h>
 
Index: arch/octeon/octeon/lock_machdep.c
===================================================================
RCS file: /cvs/src/sys/arch/octeon/octeon/lock_machdep.c,v
retrieving revision 1.5
diff -u -p -r1.5 lock_machdep.c
--- arch/octeon/octeon/lock_machdep.c	30 Sep 2014 06:51:58 -0000	1.5
+++ arch/octeon/octeon/lock_machdep.c	11 Feb 2015 04:06:06 -0000
@@ -18,7 +18,6 @@
 
 
 #include <sys/param.h>
-#include <sys/lock.h>
 #include <sys/systm.h>
 #include <sys/atomic.h>
 
Index: arch/powerpc/include/cpu.h
===================================================================
RCS file: /cvs/src/sys/arch/powerpc/include/cpu.h,v
retrieving revision 1.59
diff -u -p -r1.59 cpu.h
--- arch/powerpc/include/cpu.h	4 Jan 2015 13:01:42 -0000	1.59
+++ arch/powerpc/include/cpu.h	11 Feb 2015 04:06:06 -0000
@@ -37,7 +37,6 @@
 #include <machine/frame.h>
 
 #include <sys/device.h>
-#include <sys/lock.h>
 #include <sys/sched.h>
 
 struct cpu_info {
Index: arch/sgi/dev/iockbc.c
===================================================================
RCS file: /cvs/src/sys/arch/sgi/dev/iockbc.c,v
retrieving revision 1.10
diff -u -p -r1.10 iockbc.c
--- arch/sgi/dev/iockbc.c	29 Dec 2013 18:31:50 -0000	1.10
+++ arch/sgi/dev/iockbc.c	11 Feb 2015 04:06:06 -0000
@@ -59,7 +59,6 @@
 #include <sys/signalvar.h>
 #include <sys/errno.h>
 #include <sys/queue.h>
-#include <sys/lock.h>
 
 #include <machine/autoconf.h>
 #include <machine/bus.h>
Index: arch/sgi/dev/mkbc.c
===================================================================
RCS file: /cvs/src/sys/arch/sgi/dev/mkbc.c,v
retrieving revision 1.12
diff -u -p -r1.12 mkbc.c
--- arch/sgi/dev/mkbc.c	10 Aug 2012 17:49:31 -0000	1.12
+++ arch/sgi/dev/mkbc.c	11 Feb 2015 04:06:06 -0000
@@ -74,7 +74,6 @@
 #include <sys/signalvar.h>
 #include <sys/errno.h>
 #include <sys/queue.h>
-#include <sys/lock.h>
 
 #include <machine/autoconf.h>
 #include <machine/bus.h>
Index: arch/sgi/sgi/lock_machdep.c
===================================================================
RCS file: /cvs/src/sys/arch/sgi/sgi/lock_machdep.c,v
retrieving revision 1.6
diff -u -p -r1.6 lock_machdep.c
--- arch/sgi/sgi/lock_machdep.c	30 Sep 2014 06:51:58 -0000	1.6
+++ arch/sgi/sgi/lock_machdep.c	11 Feb 2015 04:06:07 -0000
@@ -18,7 +18,6 @@
 
 
 #include <sys/param.h>
-#include <sys/lock.h>
 #include <sys/systm.h>
 #include <sys/atomic.h>
 
Index: arch/sh/include/intr.h
===================================================================
RCS file: /cvs/src/sys/arch/sh/include/intr.h,v
retrieving revision 1.8
diff -u -p -r1.8 intr.h
--- arch/sh/include/intr.h	21 Dec 2010 14:56:24 -0000	1.8
+++ arch/sh/include/intr.h	11 Feb 2015 04:06:07 -0000
@@ -34,7 +34,6 @@
 
 #include <sys/device.h>
 #include <sys/evcount.h>
-#include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/queue.h>
 #include <sh/psl.h>
Index: arch/solbourne/solbourne/pmap.c
===================================================================
RCS file: /cvs/src/sys/arch/solbourne/solbourne/pmap.c,v
retrieving revision 1.8
diff -u -p -r1.8 pmap.c
--- arch/solbourne/solbourne/pmap.c	17 Dec 2014 15:27:17 -0000	1.8
+++ arch/solbourne/solbourne/pmap.c	11 Feb 2015 04:06:07 -0000
@@ -30,7 +30,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/pool.h>
 #include <sys/proc.h>
Index: arch/sparc/sparc/pmap.c
===================================================================
RCS file: /cvs/src/sys/arch/sparc/sparc/pmap.c,v
retrieving revision 1.172
diff -u -p -r1.172 pmap.c
--- arch/sparc/sparc/pmap.c	17 Dec 2014 06:58:10 -0000	1.172
+++ arch/sparc/sparc/pmap.c	11 Feb 2015 04:06:07 -0000
@@ -66,7 +66,6 @@
 #include <sys/exec.h>
 #include <sys/core.h>
 #include <sys/kcore.h>
-#include <sys/lock.h>
 #include <sys/pool.h>
 
 #include <uvm/uvm_extern.h>
Index: arch/sparc64/sparc64/lock_machdep.c
===================================================================
RCS file: /cvs/src/sys/arch/sparc64/sparc64/lock_machdep.c,v
retrieving revision 1.8
diff -u -p -r1.8 lock_machdep.c
--- arch/sparc64/sparc64/lock_machdep.c	30 Nov 2014 22:26:14 -0000	1.8
+++ arch/sparc64/sparc64/lock_machdep.c	11 Feb 2015 04:06:07 -0000
@@ -18,7 +18,6 @@
 
 #include <sys/atomic.h>
 #include <sys/param.h>
-#include <sys/lock.h>
 #include <sys/systm.h>
 
 #include <machine/lock.h>
Index: arch/zaurus/dev/zaurus_apm.c
===================================================================
RCS file: /cvs/src/sys/arch/zaurus/dev/zaurus_apm.c,v
retrieving revision 1.31
diff -u -p -r1.31 zaurus_apm.c
--- arch/zaurus/dev/zaurus_apm.c	7 Feb 2015 03:58:28 -0000	1.31
+++ arch/zaurus/dev/zaurus_apm.c	11 Feb 2015 04:06:07 -0000
@@ -25,7 +25,6 @@
 #include <sys/buf.h>
 #include <sys/sysctl.h>
 #include <sys/mutex.h>
-#include <sys/lock.h>
 #include <sys/reboot.h>
 #include <dev/rndvar.h>
 
Index: sys/lock.h
===================================================================
RCS file: /cvs/src/sys/sys/lock.h,v
retrieving revision 1.24
diff -u -p -r1.24 lock.h
--- sys/lock.h	30 Jan 2015 17:51:11 -0000	1.24
+++ sys/lock.h	11 Feb 2015 04:06:07 -0000
@@ -38,10 +38,6 @@
 #ifndef	_LOCK_H_
 #define	_LOCK_H_
 
-#ifdef _KERNEL
-#include <machine/lock.h>
-#endif
-
 #include <sys/rwlock.h>
 
 struct lock {