diff --git a/ChangeLog b/ChangeLog
index 406bff4b54..791b94bec1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2002-08-03  Roland McGrath  <roland@redhat.com>
 
+	* include/sys/syslog.h: Use libc_hidden_proto for syslog, vsyslog.
+	* include/err.h: Use libc_hidden_proto for warn, warnx, vwarn, vwarn,
+	verr, verrx.
+	* include/stdlib.h: Use libc_hidden_proto for exit, getenv, bsearch.
+	* misc/syslog.c: Add libc_hidden_def.
+	* misc/err.c: Likewise.
+	* stdlib/exit.c: Likewise.
+	* stdlib/bsearch.c: Likewise.
+	* sysdeps/generic/getenv.c: Likewise.
+
 	* include/libc-symbols.h (hidden_weak): Define it for [__ASSEMBLER__].
 
 	* sysdeps/unix/make-syscalls.sh: Generate libc_hidden_def or
diff --git a/include/err.h b/include/err.h
index 915720aa4c..737dfc1b6f 100644
--- a/include/err.h
+++ b/include/err.h
@@ -1 +1,8 @@
 #include <misc/err.h>
+
+libc_hidden_proto (warn)
+libc_hidden_proto (warnx)
+libc_hidden_proto (vwarn)
+libc_hidden_proto (vwarnx)
+libc_hidden_proto (verr)
+libc_hidden_proto (verrx)
diff --git a/include/stdlib.h b/include/stdlib.h
index ad9ea8e0e7..39629e1f6b 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -9,6 +9,9 @@
 /* Now define the internal interfaces.  */
 #ifndef __Need_M_And_C
 
+libc_hidden_proto (exit)
+libc_hidden_proto (getenv)
+libc_hidden_proto (bsearch)
 libc_hidden_proto (__secure_getenv)
 
 extern long int __random (void);
diff --git a/include/sys/syslog.h b/include/sys/syslog.h
index 247528b430..e018225333 100644
--- a/include/sys/syslog.h
+++ b/include/sys/syslog.h
@@ -1 +1,4 @@
 #include <misc/sys/syslog.h>
+
+libc_hidden_proto (syslog)
+libc_hidden_proto (vsyslog)
diff --git a/misc/err.c b/misc/err.c
index 1e681b399d..05406276d0 100644
--- a/misc/err.c
+++ b/misc/err.c
@@ -1,5 +1,5 @@
 /* 4.4BSD utility functions for error messages.
-   Copyright (C) 1995, 1996, 1998, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1995,96,98,2001,02 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -108,6 +108,7 @@ vwarnx (const char *format, __gnuc_va_list ap)
     }
   funlockfile (stderr);
 }
+libc_hidden_def (warnx)
 
 void
 vwarn (const char *format, __gnuc_va_list ap)
@@ -141,6 +142,7 @@ vwarn (const char *format, __gnuc_va_list ap)
     }
   funlockfile (stderr);
 }
+libc_hidden_def (warnx)
 
 
 void
@@ -148,12 +150,14 @@ warn (const char *format, ...)
 {
   VA (vwarn (format, ap))
 }
+libc_hidden_def (warn)
 
 void
 warnx (const char *format, ...)
 {
   VA (vwarnx (format, ap))
 }
+libc_hidden_def (warnx)
 
 void
 verr (int status, const char *format, __gnuc_va_list ap)
@@ -161,6 +165,7 @@ verr (int status, const char *format, __gnuc_va_list ap)
   vwarn (format, ap);
   exit (status);
 }
+libc_hidden_def (verr)
 
 void
 verrx (int status, const char *format, __gnuc_va_list ap)
@@ -168,6 +173,7 @@ verrx (int status, const char *format, __gnuc_va_list ap)
   vwarnx (format, ap);
   exit (status);
 }
+libc_hidden_def (verrx)
 
 void
 err (int status, const char *format, ...)
diff --git a/misc/syslog.c b/misc/syslog.c
index 10a830969c..c27671fecb 100644
--- a/misc/syslog.c
+++ b/misc/syslog.c
@@ -102,6 +102,7 @@ syslog(pri, fmt, va_alist)
 	vsyslog(pri, fmt, ap);
 	va_end(ap);
 }
+libc_hidden_def (syslog)
 
 void
 vsyslog(pri, fmt, ap)
@@ -278,6 +279,7 @@ vsyslog(pri, fmt, ap)
 
 	free (buf);
 }
+libc_hidden_def (vsyslog)
 
 static struct sockaddr SyslogAddr;	/* AF_UNIX address of local logger */
 
diff --git a/stdlib/bsearch.c b/stdlib/bsearch.c
index 95668ff3df..1bc6c4ba43 100644
--- a/stdlib/bsearch.c
+++ b/stdlib/bsearch.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1997, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,97,2000,02 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -46,3 +46,4 @@ bsearch (const void *key, const void *base, size_t nmemb, size_t size,
 
   return NULL;
 }
+libc_hidden_def (bsearch)
diff --git a/stdlib/exit.c b/stdlib/exit.c
index a4a51dca19..ac247a1233 100644
--- a/stdlib/exit.c
+++ b/stdlib/exit.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,1995,1996,1997,1999,2001 Free Software Foundation, Inc.
+/* Copyright (C) 1991,95,96,97,99,2001,02 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -81,3 +81,4 @@ exit (int status)
 
   _exit (status);
 }
+libc_hidden_def (exit)
diff --git a/sysdeps/generic/getenv.c b/sysdeps/generic/getenv.c
index 8900e3566f..d659f66022 100644
--- a/sysdeps/generic/getenv.c
+++ b/sysdeps/generic/getenv.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 92, 94, 96, 98, 99 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,94,96,98,99,2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -98,3 +98,4 @@ getenv (name)
 
   return NULL;
 }
+libc_hidden_def (getenv)