diff --git a/regress/lib/libc/clone/clonetest.c b/regress/lib/libc/clone/clonetest.c
index 10032a336410..bb4468b7c770 100644
--- a/regress/lib/libc/clone/clonetest.c
+++ b/regress/lib/libc/clone/clonetest.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: clonetest.c,v 1.9 2004/07/19 06:34:10 chs Exp $	*/
+/*	$NetBSD: clonetest.c,v 1.10 2005/12/24 21:22:46 perry Exp $	*/
 
 /*
  * This file placed in the public domain.
@@ -46,7 +46,7 @@ test1()
 	sigset_t mask;
 	void *allocstack, *stack;
 	pid_t pid;
-	__volatile long frobme[2];
+	volatile long frobme[2];
 	int stat;
 
 	allocstack = mmap(NULL, STACKSIZE, PROT_READ|PROT_WRITE|PROT_EXEC,
diff --git a/regress/sys/arch/arm/abort-fixup/abortfixup.c b/regress/sys/arch/arm/abort-fixup/abortfixup.c
index 96e02fc1ddf8..69eab7e4d975 100644
--- a/regress/sys/arch/arm/abort-fixup/abortfixup.c
+++ b/regress/sys/arch/arm/abort-fixup/abortfixup.c
@@ -1,4 +1,4 @@
-/* $NetBSD: abortfixup.c,v 1.6 2002/04/09 03:13:18 thorpej Exp $ */
+/* $NetBSD: abortfixup.c,v 1.7 2005/12/24 21:22:46 perry Exp $ */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
 
 #include <sys/types.h>
 
-__RCSID("$NetBSD: abortfixup.c,v 1.6 2002/04/09 03:13:18 thorpej Exp $");
+__RCSID("$NetBSD: abortfixup.c,v 1.7 2005/12/24 21:22:46 perry Exp $");
 
 #include <setjmp.h>
 #include <signal.h>
@@ -73,7 +73,7 @@ main(void)
 	 */
 
 	if (setjmp(buf) == 0) {
-		__asm __volatile (
+		__asm volatile (
 		"	mov r0, #0			\n"
 		"	mov r1, r0			\n"
 		"	str r1, [r0], r1, ror #10");
@@ -88,7 +88,7 @@ main(void)
 	/* Similar but pre-indexed, to check ARM2/3 abort address function. */
 
 	if (setjmp(buf) == 0) {
-		__asm __volatile (
+		__asm volatile (
 		"	mov r0, #0			\n"
 		"	mov r1, r0			\n"
 		"	str r1, [r0, r1, ror #10]");
diff --git a/regress/sys/kern/lock/lock.c b/regress/sys/kern/lock/lock.c
index c428cb946db7..6d1d727f2102 100644
--- a/regress/sys/kern/lock/lock.c
+++ b/regress/sys/kern/lock/lock.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lock.c,v 1.1 2002/08/28 07:41:04 gmcgarry Exp $ */
+/* $NetBSD: lock.c,v 1.2 2005/12/24 21:22:46 perry Exp $ */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
 #include <machine/lock.h>
 
 __cpu_simple_lock_t lk;
-__volatile int handled = 0;
+volatile int handled = 0;
 
 void handler(int);
 
diff --git a/regress/sys/kern/ras/ras1/ras1.c b/regress/sys/kern/ras/ras1/ras1.c
index 1b9795d62071..e9eb7f5c7361 100644
--- a/regress/sys/kern/ras/ras1/ras1.c
+++ b/regress/sys/kern/ras/ras1/ras1.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ras1.c,v 1.6 2004/03/03 21:06:25 thorpej Exp $ */
+/* $NetBSD: ras1.c,v 1.7 2005/12/24 21:22:46 perry Exp $ */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -42,8 +42,8 @@
 
 #define COUNT	10
 
-__volatile int handled = 0;
-__volatile int count = 0;
+volatile int handled = 0;
+volatile int count = 0;
 struct itimerval itv;
 
 void handler(int);
diff --git a/regress/sys/kern/ras/ras2/ras2.c b/regress/sys/kern/ras/ras2/ras2.c
index 18b4e25618de..15497bb62681 100644
--- a/regress/sys/kern/ras/ras2/ras2.c
+++ b/regress/sys/kern/ras/ras2/ras2.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ras2.c,v 1.6 2004/03/03 21:06:25 thorpej Exp $ */
+/* $NetBSD: ras2.c,v 1.7 2005/12/24 21:22:47 perry Exp $ */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -44,8 +44,8 @@
 
 #define COUNT	10
 
-__volatile int handled = 0;
-__volatile int count = 0;
+volatile int handled = 0;
+volatile int count = 0;
 struct itimerval itv;
 
 void handler(int);
diff --git a/regress/sys/kern/ras/ras3/ras3.c b/regress/sys/kern/ras/ras3/ras3.c
index 8365ce447be0..362ae96bb150 100644
--- a/regress/sys/kern/ras/ras3/ras3.c
+++ b/regress/sys/kern/ras/ras3/ras3.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ras3.c,v 1.6 2004/03/03 21:06:25 thorpej Exp $ */
+/* $NetBSD: ras3.c,v 1.7 2005/12/24 21:22:47 perry Exp $ */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -44,8 +44,8 @@
 
 #define COUNT	10
 
-__volatile int handled = 0;
-__volatile int count = 0;
+volatile int handled = 0;
+volatile int count = 0;
 struct itimerval itv;
 
 void handler(int);
diff --git a/share/man/man9/dmover.9 b/share/man/man9/dmover.9
index d9eef4ff06c6..17ccd6e09edc 100644
--- a/share/man/man9/dmover.9
+++ b/share/man/man9/dmover.9
@@ -1,4 +1,4 @@
-.\"	$NetBSD: dmover.9,v 1.9 2003/04/16 13:35:28 wiz Exp $
+.\"	$NetBSD: dmover.9,v 1.10 2005/12/24 21:27:22 perry Exp $
 .\"
 .\" Copyright (c) 2002 Wasabi Systems, Inc.
 .\" All rights reserved.
@@ -33,7 +33,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd July 15, 2002
+.Dd December 24, 2005
 .Dt DMOVER 9
 .Os
 .Sh NAME
@@ -213,7 +213,7 @@ This is a pointer to client private data specific to the request.
 .It void *dreq_dmbcookie
 This is a pointer to back-end private data, for use while the back-end
 is actively processing a request.
-.It __volatile int dreq_flags
+.It volatile int dreq_flags
 The following flags are defined:
 .Bl -tag -width "DMOVER_REQ_RUNNINGXX"
 .It DMOVER_REQ_DONE
diff --git a/share/man/man9/ltsleep.9 b/share/man/man9/ltsleep.9
index c74cf4b45ba5..6b65e36a71c7 100644
--- a/share/man/man9/ltsleep.9
+++ b/share/man/man9/ltsleep.9
@@ -1,4 +1,4 @@
-.\"	$NetBSD: ltsleep.9,v 1.6 2004/10/04 19:12:52 rumble Exp $
+.\"	$NetBSD: ltsleep.9,v 1.7 2005/12/24 21:27:22 perry Exp $
 .\"
 .\" Copyright (c) 1996, 2002 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd April 11, 2003
+.Dd December 24, 2005
 .Dt LTSLEEP 9
 .Os
 .Sh NAME
@@ -45,7 +45,7 @@
 .Sh SYNOPSIS
 .In sys/proc.h
 .Ft int
-.Fn "ltsleep" "const void *ident" "int priority" "const char *wmesg" "int timo" "__volatile struct simplelock *slock"
+.Fn "ltsleep" "const void *ident" "int priority" "const char *wmesg" "int timo" "volatile struct simplelock *slock"
 .Ft int
 .Fn "tsleep" "const void *ident" "int priority" "const char *wmesg" "int timo"
 .Ft void