diff --git a/common/lib/libc/arch/m68k/gen/bswap16.S b/common/lib/libc/arch/m68k/gen/bswap16.S
index d551c6e93fc0..f7c84718a579 100644
--- a/common/lib/libc/arch/m68k/gen/bswap16.S
+++ b/common/lib/libc/arch/m68k/gen/bswap16.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: bswap16.S,v 1.1 2005/12/20 19:28:49 christos Exp $	*/
+/*	$NetBSD: bswap16.S,v 1.2 2007/09/19 20:31:34 he Exp $	*/
 
 /*
  * Copyright (C) 1996 Scott Reynolds.  All rights reserved.
@@ -28,7 +28,11 @@
 
 #include <machine/asm.h>
 
-ENTRY(bswap16)
+#if defined(_KERNEL) || defined(_STANDALONE)
+_ENTRY(_C_LABEL(bswap16))
+#else /* defined(_KERNEL) || defined(_STANDALONE) */
+_ENTRY(_C_LABEL(__bswap16))
+#endif /* defined(_KERNEL) || defined(_STANDALONE) */
 	movl	%sp@(4),%d0
 	rolw	#8,%d0
 	rts
diff --git a/common/lib/libc/arch/m68k/gen/bswap32.S b/common/lib/libc/arch/m68k/gen/bswap32.S
index e83609de2afe..f8b0b92061cd 100644
--- a/common/lib/libc/arch/m68k/gen/bswap32.S
+++ b/common/lib/libc/arch/m68k/gen/bswap32.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: bswap32.S,v 1.1 2005/12/20 19:28:49 christos Exp $	*/
+/*	$NetBSD: bswap32.S,v 1.2 2007/09/19 20:31:34 he Exp $	*/
 
 /*
  * Copyright (C) 1996 Scott Reynolds.  All rights reserved.
@@ -28,7 +28,11 @@
 
 #include <machine/asm.h>
 
-ENTRY(bswap32)
+#if defined(_KERNEL) || defined(_STANDALONE)
+_ENTRY(_C_LABEL(bswap32))
+#else /* defined(_KERNEL) || defined(_STANDALONE) */
+_ENTRY(_C_LABEL(__bswap32))
+#endif /* defined(_KERNEL) || defined(_STANDALONE) */
 	movl	%sp@(4),%d0
 	rolw	#8,%d0
 	swap	%d0
diff --git a/sys/arch/sun2/include/bswap.h b/sys/arch/sun2/include/bswap.h
index da5419ce31a3..3fc434d00a5d 100644
--- a/sys/arch/sun2/include/bswap.h
+++ b/sys/arch/sun2/include/bswap.h
@@ -1,8 +1,9 @@
-/*     $NetBSD: bswap.h,v 1.1 2001/04/06 13:13:02 fredette Exp $   */
+/*     $NetBSD: bswap.h,v 1.2 2007/09/19 20:31:34 he Exp $   */
 
 #ifndef _MACHINE_BSWAP_H_
 #define	_MACHINE_BSWAP_H_
 
+#define __BSWAP_RENAME
 #include <sys/bswap.h>
 
 #endif /* !_MACHINE_BSWAP_H_ */