diff --git a/sys/arch/amd64/include/byte_swap.h b/sys/arch/amd64/include/byte_swap.h
index debd4d4c1398..a9c7e7e751c6 100644
--- a/sys/arch/amd64/include/byte_swap.h
+++ b/sys/arch/amd64/include/byte_swap.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: byte_swap.h,v 1.2 2005/12/24 20:06:47 perry Exp $	*/
+/*	$NetBSD: byte_swap.h,v 1.3 2005/12/28 18:40:13 perry Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -45,17 +45,17 @@
 
 #include <sys/types.h>
 
-static inline u_int32_t __byte_swap_long_variable(u_int32_t);
-static inline u_int16_t __byte_swap_word_variable(u_int16_t);
+static __inline u_int32_t __byte_swap_long_variable(u_int32_t);
+static __inline u_int16_t __byte_swap_word_variable(u_int16_t);
 
-static inline u_int32_t
+static __inline u_int32_t
 __byte_swap_long_variable(u_int32_t x)
 {
 	__asm volatile ( "bswap %1" : "=r" (x) : "0" (x));
 	return (x);
 }
 
-static inline u_int16_t
+static __inline u_int16_t
 __byte_swap_word_variable(u_int16_t x)
 {
 	__asm volatile ("rorw $8, %w1" : "=r" (x) : "0" (x)); 
diff --git a/sys/arch/arm/include/byte_swap.h b/sys/arch/arm/include/byte_swap.h
index b323f1e2c514..b90bc117760d 100644
--- a/sys/arch/arm/include/byte_swap.h
+++ b/sys/arch/arm/include/byte_swap.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: byte_swap.h,v 1.4 2005/12/24 20:06:52 perry Exp $	*/
+/*	$NetBSD: byte_swap.h,v 1.5 2005/12/28 18:40:13 perry Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1999, 2002 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
 
 #include <sys/types.h>
 
-static inline u_int32_t
+static __inline u_int32_t
 __byte_swap_32_variable(u_int32_t v)
 {
 	u_int32_t t1;
@@ -54,7 +54,7 @@ __byte_swap_32_variable(u_int32_t v)
 	return (v);
 }
 
-static inline u_int16_t
+static __inline u_int16_t
 __byte_swap_16_variable(u_int16_t v)
 {
 
diff --git a/sys/arch/hppa/include/byte_swap.h b/sys/arch/hppa/include/byte_swap.h
index 2b1f95bb4cf6..ad3a27a20f5e 100644
--- a/sys/arch/hppa/include/byte_swap.h
+++ b/sys/arch/hppa/include/byte_swap.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: byte_swap.h,v 1.4 2005/12/24 20:07:10 perry Exp $	*/
+/*	$NetBSD: byte_swap.h,v 1.5 2005/12/28 18:40:13 perry Exp $	*/
 
 /*	$OpenBSD: endian.h,v 1.7 2001/06/29 20:28:54 mickey Exp $	*/
 
@@ -35,10 +35,10 @@
 #ifndef _HPPA_BYTE_SWAP_H_
 #define	_HPPA_BYTE_SWAP_H_
 
-static inline u_int16_t __byte_swap_word __P((u_int16_t));
-static inline u_int32_t __byte_swap_long __P((u_int32_t));
+static __inline u_int16_t __byte_swap_word __P((u_int16_t));
+static __inline u_int32_t __byte_swap_long __P((u_int32_t));
 
-static inline u_int32_t
+static __inline u_int32_t
 __byte_swap_long(u_int32_t x)
 {
 	register in_addr_t __swap32md_x;	\
@@ -54,14 +54,14 @@ __byte_swap_long(u_int32_t x)
 
 #if 0
 /*
- * Use generic C version because w/ asm inline below
+ * Use generic C version because w/ asm __inline below
  * gcc inserts extra "extru r,31,16,r" to convert
  * to 16 bit entity, which produces overhead we don't need.
  * Besides, gcc does swap16 same way by itself.
  */
 #define	__swap16md(x)	__swap16gen(x)
 #else
-static inline u_int16_t
+static __inline u_int16_t
 __byte_swap_word(u_int16_t x)
 {
 	register in_port_t __swap16md_x;				\
diff --git a/sys/arch/i386/include/byte_swap.h b/sys/arch/i386/include/byte_swap.h
index 46bba01495a9..02ffebc522c0 100644
--- a/sys/arch/i386/include/byte_swap.h
+++ b/sys/arch/i386/include/byte_swap.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: byte_swap.h,v 1.8 2005/12/26 19:23:59 perry Exp $	*/
+/*	$NetBSD: byte_swap.h,v 1.9 2005/12/28 18:40:13 perry Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -46,10 +46,10 @@
 #endif
 
 
-static inline uint32_t __byte_swap_long_variable(uint32_t);
-static inline uint16_t __byte_swap_word_variable(uint16_t);
+static __inline uint32_t __byte_swap_long_variable(uint32_t);
+static __inline uint16_t __byte_swap_word_variable(uint16_t);
 
-static inline uint32_t
+static __inline uint32_t
 __byte_swap_long_variable(uint32_t x)
 {
 	__asm volatile (
@@ -62,7 +62,7 @@ __byte_swap_long_variable(uint32_t x)
 	return (x);
 }
 
-static inline uint16_t
+static __inline uint16_t
 __byte_swap_word_variable(uint16_t x)
 {
 	__asm volatile ("rorw $8, %w1" : "=r" (x) : "0" (x)); 
diff --git a/sys/arch/m68k/include/byte_swap.h b/sys/arch/m68k/include/byte_swap.h
index ba3a0ed96f8b..cd170bff2005 100644
--- a/sys/arch/m68k/include/byte_swap.h
+++ b/sys/arch/m68k/include/byte_swap.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: byte_swap.h,v 1.6 2005/12/24 23:24:00 perry Exp $	*/
+/*	$NetBSD: byte_swap.h,v 1.7 2005/12/28 18:40:13 perry Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -39,17 +39,17 @@
 #ifndef	M68K_BYTE_SWAP_H_
 #define	M68K_BYTE_SWAP_H_
 
-static inline u_int16_t __byte_swap_word(u_int16_t);
-static inline u_int32_t __byte_swap_long(u_int32_t);
+static __inline u_int16_t __byte_swap_word(u_int16_t);
+static __inline u_int32_t __byte_swap_long(u_int32_t);
 
-static inline u_int16_t
+static __inline u_int16_t
 __byte_swap_word(u_int16_t var)
 {
 	__asm volatile ("rorw #8, %0" : "=d" (var) : "0" (var));
 	return (var);
 }
 
-static inline u_int32_t
+static __inline u_int32_t
 __byte_swap_long(u_int32_t var)
 {
 	__asm volatile (
diff --git a/sys/arch/pc532/include/byte_swap.h b/sys/arch/pc532/include/byte_swap.h
index 3e5d9c099f78..fbcfcc085031 100644
--- a/sys/arch/pc532/include/byte_swap.h
+++ b/sys/arch/pc532/include/byte_swap.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: byte_swap.h,v 1.6 2005/12/24 20:07:24 perry Exp $	*/
+/*	$NetBSD: byte_swap.h,v 1.7 2005/12/28 18:40:13 perry Exp $	*/
 
 /*
  * Copyright (c) 1987, 1991 Regents of the University of California.
@@ -34,7 +34,7 @@
 #ifndef _PC532_BYTE_SWAP_H_
 #define	_PC532_BYTE_SWAP_H_
 
-static inline unsigned int
+static __inline unsigned int
 __byte_swap_long_variable(unsigned int x)
 {
 
@@ -42,7 +42,7 @@ __byte_swap_long_variable(unsigned int x)
 	return (x);
 }
 
-static inline unsigned short
+static __inline unsigned short
 __byte_swap_word_variable(unsigned short x)
 {
 
diff --git a/sys/arch/sh5/include/byte_swap.h b/sys/arch/sh5/include/byte_swap.h
index b2775c6038c9..28577b2e1a36 100644
--- a/sys/arch/sh5/include/byte_swap.h
+++ b/sys/arch/sh5/include/byte_swap.h
@@ -1,4 +1,4 @@
-/*      $NetBSD: byte_swap.h,v 1.3 2005/12/24 20:07:32 perry Exp $	*/
+/*      $NetBSD: byte_swap.h,v 1.4 2005/12/28 18:40:13 perry Exp $	*/
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -40,11 +40,11 @@
 
 #include <sys/types.h>
 
-static inline u_int16_t _sh5_bswap16(u_int16_t);
-static inline u_int32_t _sh5_bswap32(u_int32_t);
-static inline u_int64_t _sh5_bswap64(u_int64_t);
+static __inline u_int16_t _sh5_bswap16(u_int16_t);
+static __inline u_int32_t _sh5_bswap32(u_int32_t);
+static __inline u_int64_t _sh5_bswap64(u_int64_t);
 
-static inline u_int16_t
+static __inline u_int16_t
 _sh5_bswap16(u_int16_t x)
 {
 
@@ -54,7 +54,7 @@ _sh5_bswap16(u_int16_t x)
 	return (x);
 }
 
-static inline u_int32_t
+static __inline u_int32_t
 _sh5_bswap32(u_int32_t x)
 {
 
@@ -64,7 +64,7 @@ _sh5_bswap32(u_int32_t x)
 	return (x);
 }
 
-static inline u_int64_t
+static __inline u_int64_t
 _sh5_bswap64(u_int64_t x)
 {
 
diff --git a/sys/arch/vax/include/byte_swap.h b/sys/arch/vax/include/byte_swap.h
index 69cb1bb880cc..94af45e8ae52 100644
--- a/sys/arch/vax/include/byte_swap.h
+++ b/sys/arch/vax/include/byte_swap.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: byte_swap.h,v 1.8 2005/12/24 20:07:41 perry Exp $	*/
+/*	$NetBSD: byte_swap.h,v 1.9 2005/12/28 18:40:13 perry Exp $	*/
 
 /*
  * Copyright (c) 1987, 1991 Regents of the University of California.
@@ -36,7 +36,7 @@
 
 #include <sys/types.h>
 
-static inline uint32_t __attribute__((__unused__))
+static __inline uint32_t __attribute__((__unused__))
 __byte_swap_long_variable(uint32_t x)
 {
 	uint32_t y;
@@ -53,7 +53,7 @@ __byte_swap_long_variable(uint32_t x)
 	return (y);
 }
 
-static inline uint16_t __attribute__((__unused__))
+static __inline uint16_t __attribute__((__unused__))
 __byte_swap_word_variable(uint16_t x)
 {