Index: sys/compat/sys/mount.h
===================================================================
RCS file: /cvsroot/src/sys/compat/sys/mount.h,v
retrieving revision 1.8
diff -u -p -u -r1.8 mount.h
--- sys/compat/sys/mount.h	11 Jan 2009 02:45:50 -0000	1.8
+++ sys/compat/sys/mount.h	4 Oct 2013 20:40:30 -0000
@@ -94,18 +94,21 @@ struct compat_30_fhandle {
 #else
 
 __BEGIN_DECLS
-int	fstatfs(int, struct statfs12 *);
-int	getfsstat(struct statfs12 *, long, int);
-int	statfs(const char *, struct statfs12 *);
-int	getmntinfo(struct statfs12 **, int);
+int	compat_fstatfs(int, struct statfs12 *) __dso_hidden;
+int	compat_getfsstat(struct statfs12 *, long, int) __dso_hidden;
+int	compat_statfs(const char *, struct statfs12 *) __dso_hidden;
+int	compat_getmntinfo(struct statfs12 **, int) __dso_hidden;
 #if defined(_NETBSD_SOURCE)
 struct compat_30_fhandle;
-int	fhstatfs(const struct compat_30_fhandle *, struct statfs12 *);
+int	compat_fhstatfs(const struct compat_30_fhandle *, struct statfs12 *)
+    __dso_hidden;
 struct stat13;
-int	fhstat(const struct compat_30_fhandle *, struct stat13 *);
+int	compat_fhstat(const struct compat_30_fhandle *, struct stat13 *)
+    __dso_hidden;
 struct stat30;
-int	__fhstat30(const struct compat_30_fhandle *, struct stat30 *);
-int	__fhstat40(const void *, size_t, struct stat30 *);
+int	compat___fhstat30(const struct compat_30_fhandle *, struct stat30 *)
+    __dso_hidden;
+int	compat___fhstat40(const void *, size_t, struct stat30 *) __dso_hidden;
 struct stat;
 int	__fhstat50(const void *, size_t, struct stat *);
 #endif /* _NETBSD_SOURCE */
Index: sys/compat/sys/resource.h
===================================================================
RCS file: /cvsroot/src/sys/compat/sys/resource.h,v
retrieving revision 1.3
diff -u -p -u -r1.3 resource.h
--- sys/compat/sys/resource.h	17 Jan 2009 22:28:53 -0000	1.3
+++ sys/compat/sys/resource.h	4 Oct 2013 20:40:30 -0000
@@ -61,7 +61,7 @@ void rusage_to_rusage50(const struct rus
 
 #ifndef _KERNEL
 __BEGIN_DECLS
-int	getrusage(int, struct rusage50 *);
+int	compat_getrusage(int, struct rusage50 *) __dso_hidden;
 int	__getrusage50(int, struct rusage *);
 __END_DECLS
 #endif	/* _KERNEL */
Index: sys/compat/sys/stat.h
===================================================================
RCS file: /cvsroot/src/sys/compat/sys/stat.h,v
retrieving revision 1.4
diff -u -p -u -r1.4 stat.h
--- sys/compat/sys/stat.h	11 Jan 2009 02:45:50 -0000	1.4
+++ sys/compat/sys/stat.h	4 Oct 2013 20:40:30 -0000
@@ -181,20 +181,20 @@ void compat_12_stat_conv(const struct st
 #if !defined(_KERNEL) && !defined(_STANDALONE)
 
 __BEGIN_DECLS
-int	stat(const char *, struct stat12 *);
-int	fstat(int, struct stat12 *);
-int	mknod(const char *, mode_t, uint32_t);
-int	__stat13(const char *, struct stat13 *);
-int	__fstat13(int, struct stat13 *);
-int	__stat30(const char *, struct stat30 *);
-int	__fstat30(int, struct stat30 *);
+int	compat_stat(const char *, struct stat12 *) __dso_hidden;
+int	compat_fstat(int, struct stat12 *) __dso_hidden;
+int	compat_mknod(const char *, mode_t, uint32_t) __dso_hidden;
+int	compat___stat13(const char *, struct stat13 *) __dso_hidden;
+int	compat___fstat13(int, struct stat13 *) __dso_hidden;
+int	compat___stat30(const char *, struct stat30 *) __dso_hidden;
+int	compat___fstat30(int, struct stat30 *) __dso_hidden;
 int	__stat50(const char *, struct stat *);
 int	__fstat50(int, struct stat *);
 int	__mknod50(const char *, mode_t, dev_t);
 #if defined(_XOPEN_SOURCE) || defined(_NETBSD_SOURCE)
-int	lstat(const char *, struct stat12 *);
-int	__lstat13(const char *, struct stat13 *);
-int	__lstat30(const char *, struct stat30 *);
+int	compat_lstat(const char *, struct stat12 *) __dso_hidden;
+int	compat___lstat13(const char *, struct stat13 *) __dso_hidden;
+int	compat___lstat30(const char *, struct stat30 *) __dso_hidden;
 int	__lstat50(const char *, struct stat *);
 #endif /* defined(_XOPEN_SOURCE) || defined(_NETBSD_SOURCE) */
 __END_DECLS
Index: sys/compat/sys/time.h
===================================================================
RCS file: /cvsroot/src/sys/compat/sys/time.h,v
retrieving revision 1.3
diff -u -p -u -r1.3 time.h
--- sys/compat/sys/time.h	5 Nov 2009 16:59:01 -0000	1.3
+++ sys/compat/sys/time.h	4 Oct 2013 20:40:30 -0000
@@ -44,7 +44,8 @@ __BEGIN_DECLS
 #if (_POSIX_C_SOURCE - 0) >= 200112L || \
     defined(_XOPEN_SOURCE) || defined(_NETBSD_SOURCE)
 int	getitimer(int, struct itimerval50 *);
-int	gettimeofday(struct timeval50 * __restrict, void *__restrict);
+int	compat_gettimeofday(struct timeval50 * __restrict, void *__restrict)
+    __dso_hidden;
 int	setitimer(int, const struct itimerval50 * __restrict,
 	    struct itimerval50 * __restrict);
 int	utimes(const char *, const struct timeval50 [2]);
Index: lib/libc/stdio/gets.c
===================================================================
RCS file: /cvsroot/src/lib/libc/stdio/gets.c,v
retrieving revision 1.17
diff -u -p -u -r1.17 gets.c
--- lib/libc/stdio/gets.c	15 Mar 2012 18:22:30 -0000	1.17
+++ lib/libc/stdio/gets.c	4 Oct 2013 20:40:30 -0000
@@ -53,7 +53,7 @@ __RCSID("$NetBSD: gets.c,v 1.17 2012/03/
 __warn_references(gets, "warning: this program uses gets(), which is unsafe.")
 
 char *
-gets(char *buf)
+__gets(char *buf)
 {
 	int c;
 	char *s;
@@ -77,3 +77,8 @@ gets(char *buf)
 	FUNLOCKFILE(stdin);
 	return buf;
 }
+
+char *
+gets(char *buf) {
+	return __gets(buf);
+}
Index: lib/libc/stdio/local.h
===================================================================
RCS file: /cvsroot/src/lib/libc/stdio/local.h,v
retrieving revision 1.36
diff -u -p -u -r1.36 local.h
--- lib/libc/stdio/local.h	19 Apr 2013 23:32:17 -0000	1.36
+++ lib/libc/stdio/local.h	4 Oct 2013 20:40:30 -0000
@@ -117,6 +117,8 @@ extern int	 __vfwscanf_unlocked_l(FILE *
 extern void __flockfile_internal(FILE *, int);
 extern void __funlockfile_internal(FILE *, int);
 
+extern char *__gets(char *);
+
 /*
  * Detect if the current file position fits in a long int.
  */
Index: lib/libc/ssp/gets_chk.c
===================================================================
RCS file: /cvsroot/src/lib/libc/ssp/gets_chk.c,v
retrieving revision 1.6
diff -u -p -u -r1.6 gets_chk.c
--- lib/libc/ssp/gets_chk.c	17 Jan 2010 23:13:32 -0000	1.6
+++ lib/libc/ssp/gets_chk.c	4 Oct 2013 20:40:30 -0000
@@ -40,6 +40,7 @@ __RCSID("$NetBSD: gets_chk.c,v 1.6 2010/
 #include <stdlib.h>
 #include <ssp/stdio.h>
 
+extern char *__gets(char *);
 #undef gets
 
 char *
@@ -49,10 +50,10 @@ __gets_chk(char * __restrict buf, size_t
 	size_t len;
 
 	if (slen >= (size_t)INT_MAX)
-		return gets(buf);
+		return __gets(buf);
 
 	if ((abuf = malloc(slen + 1)) == NULL)
-		return gets(buf);
+		return __gets(buf);
 
 	if (fgets(abuf, (int)(slen + 1), stdin) == NULL) {
 		free(abuf);
Index: lib/libc/compat/gen/compat___fts13.c
===================================================================
RCS file: /cvsroot/src/lib/libc/compat/gen/compat___fts13.c,v
retrieving revision 1.9
diff -u -p -u -r1.9 compat___fts13.c
--- lib/libc/compat/gen/compat___fts13.c	14 Mar 2012 00:25:19 -0000	1.9
+++ lib/libc/compat/gen/compat___fts13.c	4 Oct 2013 20:40:31 -0000
@@ -42,9 +42,9 @@ __warn_references(__fts_set13,
     ((a) > USHRT_MAX ? USHRT_MAX : (unsigned short)(a))
 #endif
 
-#define	stat		__stat13
-#define	lstat		__lstat13
-#define	fstat		__fstat13
+#define	stat		compat___stat13
+#define	lstat		compat___lstat13
+#define	fstat		compat___fstat13
 
 #undef	fts_children
 #define	fts_children __fts_children13
Index: lib/libc/compat/gen/compat___fts30.c
===================================================================
RCS file: /cvsroot/src/lib/libc/compat/gen/compat___fts30.c,v
retrieving revision 1.6
diff -u -p -u -r1.6 compat___fts30.c
--- lib/libc/compat/gen/compat___fts30.c	14 Mar 2012 00:25:19 -0000	1.6
+++ lib/libc/compat/gen/compat___fts30.c	4 Oct 2013 20:40:31 -0000
@@ -32,9 +32,9 @@ __warn_references(__fts_set30,
 #define	__fts_dev_t	uint32_t
 #define	__fts_level_t	short
 
-#define	stat		__stat30
-#define	lstat		__lstat30
-#define	fstat		__fstat30
+#define	stat		compat___stat30
+#define	lstat		compat___lstat30
+#define	fstat		compat___fstat30
 
 #ifndef ftsent_namelen_truncate
 #define ftsent_namelen_truncate(a)	\
Index: lib/libc/compat/gen/compat___fts31.c
===================================================================
RCS file: /cvsroot/src/lib/libc/compat/gen/compat___fts31.c,v
retrieving revision 1.4
diff -u -p -u -r1.4 compat___fts31.c
--- lib/libc/compat/gen/compat___fts31.c	14 Mar 2012 00:25:19 -0000	1.4
+++ lib/libc/compat/gen/compat___fts31.c	4 Oct 2013 20:40:31 -0000
@@ -40,9 +40,9 @@ __warn_references(__fts_set31,
     ((a) > USHRT_MAX ? USHRT_MAX : (unsigned short)(a))
 #endif
 
-#define	stat		__stat30
-#define	lstat		__lstat30
-#define	fstat		__fstat30
+#define	stat		compat___stat30
+#define	lstat		compat___lstat30
+#define	fstat		compat___fstat30
 
 #undef	fts_children
 #define	fts_children __fts_children31
Index: lib/libc/compat/gen/compat___fts32.c
===================================================================
RCS file: /cvsroot/src/lib/libc/compat/gen/compat___fts32.c,v
retrieving revision 1.3
diff -u -p -u -r1.3 compat___fts32.c
--- lib/libc/compat/gen/compat___fts32.c	19 Oct 2009 17:52:05 -0000	1.3
+++ lib/libc/compat/gen/compat___fts32.c	4 Oct 2013 20:40:31 -0000
@@ -46,8 +46,8 @@ __warn_references(__fts_set32,
 
 #define	__FTS_COMPAT_LEVEL
 
-#define	stat		__stat30
-#define	lstat		__lstat30
-#define	fstat		__fstat30
+#define	stat		compat___stat30
+#define	lstat		compat___lstat30
+#define	fstat		compat___fstat30
 
 #include "gen/fts.c"
Index: lib/libc/compat/gen/compat_fts.c
===================================================================
RCS file: /cvsroot/src/lib/libc/compat/gen/compat_fts.c,v
retrieving revision 1.6
diff -u -p -u -r1.6 compat_fts.c
--- lib/libc/compat/gen/compat_fts.c	15 Mar 2012 16:47:38 -0000	1.6
+++ lib/libc/compat/gen/compat_fts.c	4 Oct 2013 20:40:31 -0000
@@ -62,4 +62,8 @@ __warn_references(fts_set,
 #define	__FTS_COMPAT_LENGTH
 #define	__FTS_COMPAT_LEVEL
 
+#define stat compat_stat
+#define lstat compat_lstat
+#define fstat compat_fstat
+
 #include "gen/fts.c"
Index: lib/libc/compat/gen/compat_getmntinfo.c
===================================================================
RCS file: /cvsroot/src/lib/libc/compat/gen/compat_getmntinfo.c,v
retrieving revision 1.2
diff -u -p -u -r1.2 compat_getmntinfo.c
--- lib/libc/compat/gen/compat_getmntinfo.c	20 Mar 2012 17:05:59 -0000	1.2
+++ lib/libc/compat/gen/compat_getmntinfo.c	4 Oct 2013 20:40:31 -0000
@@ -54,11 +54,13 @@ __RCSID("$NetBSD: compat_getmntinfo.c,v 
 __weak_alias(getmntinfo,_getmntinfo)
 #endif
 
+__strong_alias(getmntinfo, compat_getmntinfo)
+
 /*
  * Return information about mounted filesystems.
  */
 int
-getmntinfo(struct statfs12 **mntbufp, int flags)
+compat_getmntinfo(struct statfs12 **mntbufp, int flags)
 {
 	static struct statfs12 *mntbuf;
 	static int mntsize;
@@ -67,10 +69,10 @@ getmntinfo(struct statfs12 **mntbufp, in
 	_DIAGASSERT(mntbufp != NULL);
 
 	if (mntsize <= 0 &&
-	    (mntsize = getfsstat(NULL, 0L, MNT_NOWAIT)) == -1)
+	    (mntsize = compat_getfsstat(NULL, 0L, MNT_NOWAIT)) == -1)
 		return (0);
 	if (bufsize > 0 &&
-	    (mntsize = getfsstat(mntbuf, (long)bufsize, flags)) == -1)
+	    (mntsize = compat_getfsstat(mntbuf, (long)bufsize, flags)) == -1)
 		return (0);
 	while (bufsize <= mntsize * sizeof(struct statfs12)) {
 		if (mntbuf)
@@ -78,7 +80,8 @@ getmntinfo(struct statfs12 **mntbufp, in
 		bufsize = (mntsize + 1) * sizeof(struct statfs12);
 		if ((mntbuf = malloc(bufsize)) == NULL)
 			return (0);
-		if ((mntsize = getfsstat(mntbuf, (long)bufsize, flags)) == -1)
+		if ((mntsize = compat_getfsstat(mntbuf, (long)bufsize,
+		    flags)) == -1)
 			return (0);
 	}
 	*mntbufp = mntbuf;
Index: lib/libc/compat/gen/compat_glob.c
===================================================================
RCS file: /cvsroot/src/lib/libc/compat/gen/compat_glob.c,v
retrieving revision 1.2
diff -u -p -u -r1.2 compat_glob.c
--- lib/libc/compat/gen/compat_glob.c	11 Jan 2009 02:46:25 -0000	1.2
+++ lib/libc/compat/gen/compat_glob.c	4 Oct 2013 20:40:31 -0000
@@ -28,4 +28,8 @@ __warn_references(glob,
 __warn_references(globfree,
     "warning: reference to compatibility globfree(); include <glob.h> for correct reference")
 
+#define stat compat_stat
+#define lstat compat_lstat
+#define fstat compat_fstat
+
 #include "gen/glob.c"
Index: lib/libc/compat/gen/compat_time.c
===================================================================
RCS file: /cvsroot/src/lib/libc/compat/gen/compat_time.c,v
retrieving revision 1.2
diff -u -p -u -r1.2 compat_time.c
--- lib/libc/compat/gen/compat_time.c	11 Jan 2009 02:46:25 -0000	1.2
+++ lib/libc/compat/gen/compat_time.c	4 Oct 2013 20:40:31 -0000
@@ -24,4 +24,7 @@ __warn_references(time,
 
 #define timeval timeval50
 #define time_t int32_t
+
+#define gettimeofday compat_gettimeofday
+
 #include "gen/time.c"
Index: lib/libc/compat/gen/compat_times.c
===================================================================
RCS file: /cvsroot/src/lib/libc/compat/gen/compat_times.c,v
retrieving revision 1.2
diff -u -p -u -r1.2 compat_times.c
--- lib/libc/compat/gen/compat_times.c	11 Jan 2009 02:46:25 -0000	1.2
+++ lib/libc/compat/gen/compat_times.c	4 Oct 2013 20:40:31 -0000
@@ -25,4 +25,7 @@ __warn_references(times,
 #define __times_rusage struct rusage50
 #define __times_timeval struct timeval50
 
+#define getrusage compat_getrusage
+#define gettimeofday compat_gettimeofday
+
 #include "gen/times.c"
Index: lib/libc/compat/sys/compat___fhstat30.c
===================================================================
RCS file: /cvsroot/src/lib/libc/compat/sys/compat___fhstat30.c,v
retrieving revision 1.4
diff -u -p -u -r1.4 compat___fhstat30.c
--- lib/libc/compat/sys/compat___fhstat30.c	11 Jan 2009 02:46:25 -0000	1.4
+++ lib/libc/compat/sys/compat___fhstat30.c	4 Oct 2013 20:40:31 -0000
@@ -45,11 +45,13 @@ __RCSID("$NetBSD: compat___fhstat30.c,v 
 __warn_references(fhstat,
     "warning: reference to compatibility __fhstat30(); include <sys/mount.h> to generate correct reference")
 
+__strong_alias(__fhstat30, compat___fhstat30)
+
 /*
  * Convert old fhstat() call to new calling convention
  */
 int
-__fhstat30(const struct compat_30_fhandle *fhp, struct stat30 *sb)
+compat___fhstat30(const struct compat_30_fhandle *fhp, struct stat30 *sb)
 {
-	return __fhstat40(fhp, FHANDLE30_SIZE, sb);
+	return compat___fhstat40(fhp, FHANDLE30_SIZE, sb);
 }
Index: lib/libc/compat/sys/compat___stat13.c
===================================================================
RCS file: /cvsroot/src/lib/libc/compat/sys/compat___stat13.c,v
retrieving revision 1.4
diff -u -p -u -r1.4 compat___stat13.c
--- lib/libc/compat/sys/compat___stat13.c	11 Jan 2009 02:46:26 -0000	1.4
+++ lib/libc/compat/sys/compat___stat13.c	4 Oct 2013 20:40:31 -0000
@@ -58,6 +58,10 @@ __warn_references(__lstat13,
 __warn_references(fhstat,
     "warning: reference to compatibility fhstat(); include <sys/mount.h> to generate correct reference")
 
+__strong_alias(__stat13, compat___stat13)
+__strong_alias(__fstat13, compat___fstat13)
+__strong_alias(__lstat13, compat___lstat13)
+__strong_alias(fhstat, compat_fhstat)
 
 /*
  * Convert from a new to an old stat structure.
@@ -92,7 +96,7 @@ cvtstat(struct stat13 *ost, const struct
 }
 
 int
-__stat13(const char *file, struct stat13 *ost)
+compat___stat13(const char *file, struct stat13 *ost)
 {
 	struct stat nst;
 	int ret;
@@ -104,7 +108,7 @@ __stat13(const char *file, struct stat13
 }
 
 int
-__fstat13(int f, struct stat13 *ost)
+compat___fstat13(int f, struct stat13 *ost)
 {
 	struct stat nst;
 	int ret;
@@ -116,7 +120,7 @@ __fstat13(int f, struct stat13 *ost)
 }
 
 int
-__lstat13(const char *file, struct stat13 *ost)
+compat___lstat13(const char *file, struct stat13 *ost)
 {
 	struct stat nst;
 	int ret;
@@ -128,7 +132,7 @@ __lstat13(const char *file, struct stat1
 }
 
 int
-fhstat(const struct compat_30_fhandle *fh, struct stat13 *ost)
+compat_fhstat(const struct compat_30_fhandle *fh, struct stat13 *ost)
 {
 	struct stat nst;
 	int ret;
Index: lib/libc/compat/sys/compat___stat30.c
===================================================================
RCS file: /cvsroot/src/lib/libc/compat/sys/compat___stat30.c,v
retrieving revision 1.2
diff -u -p -u -r1.2 compat___stat30.c
--- lib/libc/compat/sys/compat___stat30.c	11 Jan 2009 02:46:26 -0000	1.2
+++ lib/libc/compat/sys/compat___stat30.c	4 Oct 2013 20:40:31 -0000
@@ -59,6 +59,11 @@ __warn_references(__fhstat40,
     "warning: reference to compatibility __fhstat40(); include <sys/mount.h> to generate correct reference")
 
 
+__strong_alias(__stat30, compat___stat30)
+__strong_alias(__fstat30, compat___fstat30)
+__strong_alias(__lstat30, compat___lstat30)
+__strong_alias(__fhstat40, compat___fhstat40)
+
 /*
  * Convert from a new to an old stat structure.
  */
@@ -88,7 +93,7 @@ cvtstat(struct stat30 *ost, const struct
 }
 
 int
-__stat30(const char *file, struct stat30 *ost)
+compat___stat30(const char *file, struct stat30 *ost)
 {
 	struct stat nst;
 	int ret;
@@ -100,7 +105,7 @@ __stat30(const char *file, struct stat30
 }
 
 int
-__fstat30(int f, struct stat30 *ost)
+compat___fstat30(int f, struct stat30 *ost)
 {
 	struct stat nst;
 	int ret;
@@ -112,7 +117,7 @@ __fstat30(int f, struct stat30 *ost)
 }
 
 int
-__lstat30(const char *file, struct stat30 *ost)
+compat___lstat30(const char *file, struct stat30 *ost)
 {
 	struct stat nst;
 	int ret;
@@ -124,7 +129,7 @@ __lstat30(const char *file, struct stat3
 }
 
 int
-__fhstat40(const void *fh, size_t fh_size, struct stat30 *ost)
+compat___fhstat40(const void *fh, size_t fh_size, struct stat30 *ost)
 {
 	struct stat nst;
 	int ret;
Index: lib/libc/compat/sys/compat_getrusage.c
===================================================================
RCS file: /cvsroot/src/lib/libc/compat/sys/compat_getrusage.c,v
retrieving revision 1.2
diff -u -p -u -r1.2 compat_getrusage.c
--- lib/libc/compat/sys/compat_getrusage.c	11 Jan 2009 02:46:26 -0000	1.2
+++ lib/libc/compat/sys/compat_getrusage.c	4 Oct 2013 20:40:31 -0000
@@ -45,6 +45,8 @@ __RCSID("$NetBSD: compat_getrusage.c,v 1
 __warn_references(getrusage,
     "warning: reference to compatibility getrusage(); include <sys/resource.h> to generate correct reference")
 
+__strong_alias(getrusage, compat_getrusage)
+
 void __rusage_to_rusage50(const struct rusage *, struct rusage50 *);
 
 void
@@ -62,7 +64,7 @@ __rusage_to_rusage50(const struct rusage
  * libc12 compatible getrusage routine.
  */
 int
-getrusage(int who, struct rusage50 *ru50)
+compat_getrusage(int who, struct rusage50 *ru50)
 {
 	struct rusage ru;
 	int rv;
Index: lib/libc/compat/sys/compat_gettimeofday.c
===================================================================
RCS file: /cvsroot/src/lib/libc/compat/sys/compat_gettimeofday.c,v
retrieving revision 1.2
diff -u -p -u -r1.2 compat_gettimeofday.c
--- lib/libc/compat/sys/compat_gettimeofday.c	11 Jan 2009 02:46:26 -0000	1.2
+++ lib/libc/compat/sys/compat_gettimeofday.c	4 Oct 2013 20:40:31 -0000
@@ -44,11 +44,13 @@ __RCSID("$NetBSD: compat_gettimeofday.c,
 __warn_references(gettimeofday,
     "warning: reference to compatibility gettimeofday(); include <sys/time.h> to generate correct reference")
 
+__strong_alias(gettimeofday, compat_gettimeofday)
+
 /*
  * libc12 compatible gettimeofday routine.
  */
 int
-gettimeofday(struct timeval50 *tv50, void *tzp)
+compat_gettimeofday(struct timeval50 *tv50, void *tzp)
 {
 	struct timeval tv;
 	int rv;
Index: lib/libc/compat/sys/compat_mknod.c
===================================================================
RCS file: /cvsroot/src/lib/libc/compat/sys/compat_mknod.c,v
retrieving revision 1.2
diff -u -p -u -r1.2 compat_mknod.c
--- lib/libc/compat/sys/compat_mknod.c	11 Jan 2009 02:46:26 -0000	1.2
+++ lib/libc/compat/sys/compat_mknod.c	4 Oct 2013 20:40:31 -0000
@@ -50,8 +50,10 @@ __RCSID("$NetBSD: compat_mknod.c,v 1.2 2
 __warn_references(mknod,
     "warning: reference to compatibility mknod(); include <time.h> to generate correct reference")
 
+__strong_alias(mknod, compat_mknod)
+
 int
-mknod(const char *path, mode_t mode, uint32_t dev)
+compat_mknod(const char *path, mode_t mode, uint32_t dev)
 {
 	return __mknod50(path, mode, dev);
 }
Index: lib/libc/compat/sys/compat_stat.c
===================================================================
RCS file: /cvsroot/src/lib/libc/compat/sys/compat_stat.c,v
retrieving revision 1.2
diff -u -p -u -r1.2 compat_stat.c
--- lib/libc/compat/sys/compat_stat.c	11 Jan 2009 02:46:27 -0000	1.2
+++ lib/libc/compat/sys/compat_stat.c	4 Oct 2013 20:40:31 -0000
@@ -58,6 +58,10 @@ __warn_references(lstat,
 
 static void cvtstat(const struct stat *, struct stat12 *);
 
+__strong_alias(stat, compat_stat)
+__strong_alias(lstat, compat_lstat)
+__strong_alias(fstat, compat_fstat)
+
 static void
 cvtstat(const struct stat *st, struct stat12 *ost)
 {
@@ -86,7 +90,7 @@ cvtstat(const struct stat *st, struct st
 }
 
 int
-stat(const char *file, struct stat12 *ost)
+compat_stat(const char *file, struct stat12 *ost)
 {
 	struct stat nst;
 	int ret;
@@ -98,7 +102,7 @@ stat(const char *file, struct stat12 *os
 }
 
 int
-fstat(int f, struct stat12 *ost)
+compat_fstat(int f, struct stat12 *ost)
 {
 	struct stat nst;
 	int ret;
@@ -110,7 +114,7 @@ fstat(int f, struct stat12 *ost)
 }
 
 int
-lstat(const char *file, struct stat12 *ost)
+compat_lstat(const char *file, struct stat12 *ost)
 {
 	struct stat nst;
 	int ret;
Index: lib/libc/compat/sys/compat_statfs.c
===================================================================
RCS file: /cvsroot/src/lib/libc/compat/sys/compat_statfs.c,v
retrieving revision 1.5
diff -u -p -u -r1.5 compat_statfs.c
--- lib/libc/compat/sys/compat_statfs.c	3 Feb 2009 05:04:52 -0000	1.5
+++ lib/libc/compat/sys/compat_statfs.c	4 Oct 2013 20:40:31 -0000
@@ -57,6 +57,11 @@ __warn_references(fhstatfs,
 __warn_references(getfsstat,
     "warning: reference to obsolete getfsstat(); use getvfsstat()")
 
+__strong_alias(statfs, compat_statfs)
+__strong_alias(fstatfs, compat_fstatfs)
+__strong_alias(fhstatfs, compat_fhstatfs)
+__strong_alias(getfsstat, compat_getfsstat)
+
 /*
  * Convert from a new statvfs to an old statfs structure.
  */
@@ -125,7 +130,7 @@ vfs2fs(struct statfs12 *bfs, const struc
 }
 
 int
-statfs(const char *file, struct statfs12 *ost)
+compat_statfs(const char *file, struct statfs12 *ost)
 {
 	struct statvfs nst;
 	int ret;
@@ -137,7 +142,7 @@ statfs(const char *file, struct statfs12
 }
 
 int
-fstatfs(int f, struct statfs12 *ost)
+compat_fstatfs(int f, struct statfs12 *ost)
 {
 	struct statvfs nst;
 	int ret;
@@ -152,7 +157,7 @@ int __fhstatvfs140(const void *fhp, size
     int flags);
 
 int
-fhstatfs(const struct compat_30_fhandle *fh, struct statfs12 *ost)
+compat_fhstatfs(const struct compat_30_fhandle *fh, struct statfs12 *ost)
 {
 	struct statvfs nst;
 	int ret;
@@ -164,7 +169,7 @@ fhstatfs(const struct compat_30_fhandle 
 }
 
 int
-getfsstat(struct statfs12 *ost, long size, int flags)
+compat_getfsstat(struct statfs12 *ost, long size, int flags)
 {
 	struct statvfs *nst;
 	int ret, i;