hidden_def/hidden_proto: convert all users (I hope) termios split, add some missing headers, other jump relocs removed

3 files changed, 112 insertions, 117 deletions

diff --git a/libc/pwd_grp/lckpwdf.c b/libc/pwd_grp/lckpwdf.c
index f99e9f026..1f1981ac5 100644
--- a/libc/pwd_grp/lckpwdf.c
+++ b/libc/pwd_grp/lckpwdf.c
@@ -19,10 +19,6 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#define sigfillset __sigfillset_internal
-#define sigaction __sigaction
-#define alarm __alarm
-
 #include <features.h>
 #include <fcntl.h>
 #include <signal.h>
@@ -31,6 +27,17 @@
 #include <sys/file.h>
 #include <paths.h>
 
+libc_hidden_proto(memset)
+libc_hidden_proto(open)
+libc_hidden_proto(fcntl)
+libc_hidden_proto(close)
+libc_hidden_proto(sigfillset)
+libc_hidden_proto(sigaction)
+libc_hidden_proto(sigprocmask)
+libc_hidden_proto(sigaddset)
+libc_hidden_proto(sigemptyset)
+libc_hidden_proto(alarm)
+
 #ifdef __UCLIBC_HAS_THREADS__
 # include <pthread.h>
 static pthread_mutex_t mylock = PTHREAD_MUTEX_INITIALIZER;
@@ -46,7 +53,7 @@ static pthread_mutex_t mylock = PTHREAD_MUTEX_INITIALIZER;
 static int lock_fd = -1;
 
 /* Prototypes for local functions.  */
-static void noop_handler __P ((int __sig));
+static void noop_handler (int __sig);
 
 
 int lckpwdf (void)
@@ -65,7 +72,7 @@ int lckpwdf (void)
 
 	LOCK;
 
-	lock_fd = __open (_PATH_PASSWD, O_WRONLY);
+	lock_fd = open (_PATH_PASSWD, O_WRONLY);
 	if (lock_fd == -1) {
 		/* Cannot create lock file.  */
 		UNLOCK;
@@ -73,18 +80,18 @@ int lckpwdf (void)
 	}
 
 	/* Make sure file gets correctly closed when process finished.  */
-	flags = __fcntl (lock_fd, F_GETFD, 0);
+	flags = fcntl (lock_fd, F_GETFD, 0);
 	if (flags == -1) {
 		/* Cannot get file flags.  */
-		__close(lock_fd);
+		close(lock_fd);
 		lock_fd = -1;
 		UNLOCK;
 		return -1;
 	}
 	flags |= FD_CLOEXEC;		/* Close on exit.  */
-	if (__fcntl (lock_fd, F_SETFD, flags) < 0) {
+	if (fcntl (lock_fd, F_SETFD, flags) < 0) {
 		/* Cannot set new flags.  */
-		__close(lock_fd);
+		close(lock_fd);
 		lock_fd = -1;
 		UNLOCK;
 		return -1;
@@ -98,7 +105,7 @@ int lckpwdf (void)
 
 	   It is important that we don't change the signal state.  We must
 	   restore the old signal behaviour.  */
-	__memset (&new_act, '\0', sizeof (struct sigaction));
+	memset (&new_act, '\0', sizeof (struct sigaction));
 	new_act.sa_handler = noop_handler;
 	sigfillset (&new_act.sa_mask);
 	new_act.sa_flags = 0ul;
@@ -106,7 +113,7 @@ int lckpwdf (void)
 	/* Install new action handler for alarm and save old.  */
 	if (sigaction (SIGALRM, &new_act, &saved_act) < 0) {
 		/* Cannot install signal handler.  */
-		__close(lock_fd);
+		close(lock_fd);
 		lock_fd = -1;
 		UNLOCK;
 		return -1;
@@ -115,9 +122,9 @@ int lckpwdf (void)
 	/* Now make sure the alarm signal is not blocked.  */
 	sigemptyset (&new_set);
 	sigaddset (&new_set, SIGALRM);
-	if (__sigprocmask (SIG_UNBLOCK, &new_set, &saved_set) < 0) {
+	if (sigprocmask (SIG_UNBLOCK, &new_set, &saved_set) < 0) {
 		sigaction (SIGALRM, &saved_act, NULL);
-		__close(lock_fd);
+		close(lock_fd);
 		lock_fd = -1;
 		UNLOCK;
 		return -1;
@@ -128,24 +135,24 @@ int lckpwdf (void)
 	alarm (TIMEOUT);
 
 	/* Try to get the lock.  */
-	__memset (&fl, '\0', sizeof (struct flock));
+	memset (&fl, '\0', sizeof (struct flock));
 	fl.l_type = F_WRLCK;
 	fl.l_whence = SEEK_SET;
-	result = __fcntl (lock_fd, F_SETLKW, &fl);
+	result = fcntl (lock_fd, F_SETLKW, &fl);
 
 	/* Clear alarm.  */
 	alarm (0);
 
 	/* Restore old set of handled signals.  We don't need to know
 	   about the current one.*/
-	__sigprocmask (SIG_SETMASK, &saved_set, NULL);
+	sigprocmask (SIG_SETMASK, &saved_set, NULL);
 
 	/* Restore old action handler for alarm.  We don't need to know
 	   about the current one.  */
 	sigaction (SIGALRM, &saved_act, NULL);
 
 	if (result < 0) {
-		__close(lock_fd);
+		close(lock_fd);
 		lock_fd = -1;
 		UNLOCK;
 		return -1;
@@ -166,7 +173,7 @@ int ulckpwdf (void)
 	}
 	else {
 		LOCK;
-		result = __close (lock_fd);
+		result = close (lock_fd);
 		/* Mark descriptor as unused.  */
 		lock_fd = -1;
 		UNLOCK;
diff --git a/libc/pwd_grp/pwd_grp.c b/libc/pwd_grp/pwd_grp.c
index 0f7c564f0..1237df72c 100644
--- a/libc/pwd_grp/pwd_grp.c
+++ b/libc/pwd_grp/pwd_grp.c
@@ -18,11 +18,6 @@
  *
  */
 
-#define setgroups __setgroups
-#define strtoul __strtoul
-#define rewind __rewind
-#define fgets_unlocked __fgets_unlocked
-
 #define _GNU_SOURCE
 #include <features.h>
 #include <stdio.h>
@@ -43,16 +38,19 @@
 #include <pthread.h>
 #endif
 
-extern int __getspnam_r (__const char *__name, struct spwd *__result_buf,
-		       char *__buffer, size_t __buflen,
-		       struct spwd **__result) attribute_hidden;
-
-extern int __getpwuid_r (__uid_t __uid,
-		       struct passwd *__restrict __resultbuf,
-		       char *__restrict __buffer, size_t __buflen,
-		       struct passwd **__restrict __result) attribute_hidden;
-
-extern int __fputc_unlocked_internal(int c, FILE *stream) attribute_hidden;
+libc_hidden_proto(strchr)
+libc_hidden_proto(strcmp)
+libc_hidden_proto(strcpy)
+libc_hidden_proto(strlen)
+libc_hidden_proto(setgroups)
+libc_hidden_proto(strtoul)
+libc_hidden_proto(rewind)
+libc_hidden_proto(fgets_unlocked)
+libc_hidden_proto(__fputc_unlocked)
+libc_hidden_proto(sprintf)
+libc_hidden_proto(fopen)
+libc_hidden_proto(fclose)
+libc_hidden_proto(fprintf)
 
 /**********************************************************************/
 /* Sizes for staticly allocated buffers. */
@@ -89,7 +87,7 @@ extern int __pgsreader(int (*__parserfunc)(void *d, char *line), void *data,
 /**********************************************************************/
 #ifdef L_fgetpwent_r
 
-int attribute_hidden __fgetpwent_r(FILE *__restrict stream, struct passwd *__restrict resultbuf,
+int fgetpwent_r(FILE *__restrict stream, struct passwd *__restrict resultbuf,
 				char *__restrict buffer, size_t buflen,
 				struct passwd **__restrict result)
 {
@@ -103,13 +101,14 @@ int attribute_hidden __fgetpwent_r(FILE *__restrict stream, struct passwd *__res
 
 	return rv;
 }
-strong_alias(__fgetpwent_r,fgetpwent_r)
+libc_hidden_proto(fgetpwent_r)
+libc_hidden_def(fgetpwent_r)
 
 #endif
 /**********************************************************************/
 #ifdef L_fgetgrent_r
 
-int attribute_hidden __fgetgrent_r(FILE *__restrict stream, struct group *__restrict resultbuf,
+int fgetgrent_r(FILE *__restrict stream, struct group *__restrict resultbuf,
 				char *__restrict buffer, size_t buflen,
 				struct group **__restrict result)
 {
@@ -123,13 +122,14 @@ int attribute_hidden __fgetgrent_r(FILE *__restrict stream, struct group *__rest
 
 	return rv;
 }
-strong_alias(__fgetgrent_r,fgetgrent_r)
+libc_hidden_proto(fgetgrent_r)
+libc_hidden_def(fgetgrent_r)
 
 #endif
 /**********************************************************************/
 #ifdef L_fgetspent_r
 
-int attribute_hidden __fgetspent_r(FILE *__restrict stream, struct spwd *__restrict resultbuf,
+int fgetspent_r(FILE *__restrict stream, struct spwd *__restrict resultbuf,
 				char *__restrict buffer, size_t buflen,
 				struct spwd **__restrict result)
 {
@@ -143,7 +143,8 @@ int attribute_hidden __fgetspent_r(FILE *__restrict stream, struct spwd *__restr
 
 	return rv;
 }
-strong_alias(__fgetspent_r,fgetspent_r)
+libc_hidden_proto(fgetspent_r)
+libc_hidden_def(fgetspent_r)
 
 #endif
 /**********************************************************************/
@@ -153,10 +154,7 @@ strong_alias(__fgetspent_r,fgetspent_r)
 /**********************************************************************/
 #ifdef L_fgetpwent
 
-extern int __fgetpwent_r (FILE *__restrict __stream,
-			struct passwd *__restrict __resultbuf,
-			char *__restrict __buffer, size_t __buflen,
-			struct passwd **__restrict __result) attribute_hidden;
+libc_hidden_proto(fgetpwent_r)
 
 struct passwd *fgetpwent(FILE *stream)
 {
@@ -164,7 +162,7 @@ struct passwd *fgetpwent(FILE *stream)
 	static struct passwd resultbuf;
 	struct passwd *result;
 
-	__fgetpwent_r(stream, &resultbuf, buffer, sizeof(buffer), &result);
+	fgetpwent_r(stream, &resultbuf, buffer, sizeof(buffer), &result);
 	return result;
 }
 
@@ -172,10 +170,7 @@ struct passwd *fgetpwent(FILE *stream)
 /**********************************************************************/
 #ifdef L_fgetgrent
 
-extern int __fgetgrent_r (FILE *__restrict __stream,
-			struct group *__restrict __resultbuf,
-			char *__restrict __buffer, size_t __buflen,
-			struct group **__restrict __result) attribute_hidden;
+libc_hidden_proto(fgetgrent_r)
 
 struct group *fgetgrent(FILE *stream)
 {
@@ -183,7 +178,7 @@ struct group *fgetgrent(FILE *stream)
 	static struct group resultbuf;
 	struct group *result;
 
-	__fgetgrent_r(stream, &resultbuf, buffer, sizeof(buffer), &result);
+	fgetgrent_r(stream, &resultbuf, buffer, sizeof(buffer), &result);
 	return result;
 }
 
@@ -191,9 +186,7 @@ struct group *fgetgrent(FILE *stream)
 /**********************************************************************/
 #ifdef L_fgetspent
 
-extern int __fgetspent_r (FILE *__stream, struct spwd *__result_buf,
-			char *__buffer, size_t __buflen,
-			struct spwd **__result) attribute_hidden;
+libc_hidden_proto(fgetspent_r)
 
 struct spwd *fgetspent(FILE *stream)
 {
@@ -201,7 +194,7 @@ struct spwd *fgetspent(FILE *stream)
 	static struct spwd resultbuf;
 	struct spwd *result;
 
-	__fgetspent_r(stream, &resultbuf, buffer, sizeof(buffer), &result);
+	fgetspent_r(stream, &resultbuf, buffer, sizeof(buffer), &result);
 	return result;
 }
 
@@ -209,7 +202,7 @@ struct spwd *fgetspent(FILE *stream)
 /**********************************************************************/
 #ifdef L_sgetspent_r
 
-int attribute_hidden __sgetspent_r(const char *string, struct spwd *result_buf,
+int sgetspent_r(const char *string, struct spwd *result_buf,
 				char *buffer, size_t buflen, struct spwd **result)
 {
 	int rv = ERANGE;
@@ -223,10 +216,10 @@ int attribute_hidden __sgetspent_r(const char *string, struct spwd *result_buf,
 	}
 
 	if (string != buffer) {
-		if (__strlen(string) >= buflen) {
+		if (strlen(string) >= buflen) {
 			goto DO_ERANGE;
 		}
-		__strcpy(buffer, string);
+		strcpy(buffer, string);
 	}
 
 	if (!(rv = __parsespent(result_buf, buffer))) {
@@ -236,7 +229,8 @@ int attribute_hidden __sgetspent_r(const char *string, struct spwd *result_buf,
  DONE:
 	return rv;
 }
-strong_alias(__sgetspent_r,sgetspent_r)
+libc_hidden_proto(sgetspent_r)
+libc_hidden_def(sgetspent_r)
 
 #endif
 /**********************************************************************/
@@ -246,40 +240,36 @@ strong_alias(__sgetspent_r,sgetspent_r)
 #endif
 
 #ifdef L_getpwnam_r
-#define GETXXKEY_R_FUNC_HIDDEN	__getpwnam_r
 #define GETXXKEY_R_FUNC		getpwnam_r
 #define GETXXKEY_R_PARSER   	__parsepwent
 #define GETXXKEY_R_ENTTYPE	struct passwd
-#define GETXXKEY_R_TEST(ENT)	(!__strcmp((ENT)->pw_name, key))
+#define GETXXKEY_R_TEST(ENT)	(!strcmp((ENT)->pw_name, key))
 #define DO_GETXXKEY_R_KEYTYPE	const char *__restrict
 #define DO_GETXXKEY_R_PATHNAME  _PATH_PASSWD
 #include "pwd_grp_internal.c"
 #endif
 
 #ifdef L_getgrnam_r
-#define GETXXKEY_R_FUNC_HIDDEN	__getgrnam_r
 #define GETXXKEY_R_FUNC		getgrnam_r
 #define GETXXKEY_R_PARSER   	__parsegrent
 #define GETXXKEY_R_ENTTYPE	struct group
-#define GETXXKEY_R_TEST(ENT)	(!__strcmp((ENT)->gr_name, key))
+#define GETXXKEY_R_TEST(ENT)	(!strcmp((ENT)->gr_name, key))
 #define DO_GETXXKEY_R_KEYTYPE	const char *__restrict
 #define DO_GETXXKEY_R_PATHNAME  _PATH_GROUP
 #include "pwd_grp_internal.c"
 #endif
 
 #ifdef L_getspnam_r
-#define GETXXKEY_R_FUNC_HIDDEN	__getspnam_r
 #define GETXXKEY_R_FUNC		getspnam_r
 #define GETXXKEY_R_PARSER   	__parsespent
 #define GETXXKEY_R_ENTTYPE	struct spwd
-#define GETXXKEY_R_TEST(ENT)	(!__strcmp((ENT)->sp_namp, key))
+#define GETXXKEY_R_TEST(ENT)	(!strcmp((ENT)->sp_namp, key))
 #define DO_GETXXKEY_R_KEYTYPE	const char *__restrict
 #define DO_GETXXKEY_R_PATHNAME  _PATH_SHADOW
 #include "pwd_grp_internal.c"
 #endif
 
 #ifdef L_getpwuid_r
-#define GETXXKEY_R_FUNC_HIDDEN	__getpwuid_r
 #define GETXXKEY_R_FUNC		getpwuid_r
 #define GETXXKEY_R_PARSER   	__parsepwent
 #define GETXXKEY_R_ENTTYPE	struct passwd
@@ -290,7 +280,6 @@ strong_alias(__sgetspent_r,sgetspent_r)
 #endif
 
 #ifdef L_getgrgid_r
-#define GETXXKEY_R_FUNC_HIDDEN	__getgrgid_r
 #define GETXXKEY_R_FUNC		getgrgid_r
 #define GETXXKEY_R_PARSER   	__parsegrent
 #define GETXXKEY_R_ENTTYPE	struct group
@@ -303,13 +292,15 @@ strong_alias(__sgetspent_r,sgetspent_r)
 /**********************************************************************/
 #ifdef L_getpwuid
 
+libc_hidden_proto(getpwuid_r)
+
 struct passwd *getpwuid(uid_t uid)
 {
 	static char buffer[PWD_BUFFER_SIZE];
 	static struct passwd resultbuf;
 	struct passwd *result;
 
-	__getpwuid_r(uid, &resultbuf, buffer, sizeof(buffer), &result);
+	getpwuid_r(uid, &resultbuf, buffer, sizeof(buffer), &result);
 	return result;
 }
 
@@ -317,9 +308,7 @@ struct passwd *getpwuid(uid_t uid)
 /**********************************************************************/
 #ifdef L_getgrgid
 
-extern int __getgrgid_r (__gid_t __gid, struct group *__restrict __resultbuf,
-		       char *__restrict __buffer, size_t __buflen,
-		       struct group **__restrict __result) attribute_hidden;
+libc_hidden_proto(getgrgid_r)
 
 struct group *getgrgid(gid_t gid)
 {
@@ -327,7 +316,7 @@ struct group *getgrgid(gid_t gid)
 	static struct group resultbuf;
 	struct group *result;
 
-	__getgrgid_r(gid, &resultbuf, buffer, sizeof(buffer), &result);
+	getgrgid_r(gid, &resultbuf, buffer, sizeof(buffer), &result);
 	return result;
 }
 
@@ -339,6 +328,9 @@ struct group *getgrgid(gid_t gid)
  * to have been created as a reentrant version of the non-standard
  * functions getspuid.  Why getspuid was added, I do not know. */
 
+libc_hidden_proto(getpwuid_r)
+libc_hidden_proto(getspnam_r)
+
 int getspuid_r(uid_t uid, struct spwd *__restrict resultbuf,
 		       char *__restrict buffer, size_t buflen,
 		       struct spwd **__restrict result)
@@ -349,8 +341,8 @@ int getspuid_r(uid_t uid, struct spwd *__restrict resultbuf,
 	char pwd_buff[PWD_BUFFER_SIZE];
 
 	*result = NULL;
-	if (!(rv = __getpwuid_r(uid, &password, pwd_buff, sizeof(pwd_buff), &pp))) {
-		rv = __getspnam_r(password.pw_name, resultbuf, buffer, buflen, result);
+	if (!(rv = getpwuid_r(uid, &password, pwd_buff, sizeof(pwd_buff), &pp))) {
+		rv = getspnam_r(password.pw_name, resultbuf, buffer, buflen, result);
 	}
 
 	return rv;
@@ -363,6 +355,8 @@ int getspuid_r(uid_t uid, struct spwd *__restrict resultbuf,
 /* This function is non-standard and is currently not built.
  * Why it was added, I do not know. */
 
+libc_hidden_proto(getspuid_r)
+
 struct spwd *getspuid(uid_t uid)
 {
 	static char buffer[PWD_BUFFER_SIZE];
@@ -377,10 +371,7 @@ struct spwd *getspuid(uid_t uid)
 /**********************************************************************/
 #ifdef L_getpwnam
 
-extern int __getpwnam_r (__const char *__restrict __name,
-		       struct passwd *__restrict __resultbuf,
-		       char *__restrict __buffer, size_t __buflen,
-		       struct passwd **__restrict __result) attribute_hidden;
+libc_hidden_proto(getpwnam_r)
 
 struct passwd *getpwnam(const char *name)
 {
@@ -388,7 +379,7 @@ struct passwd *getpwnam(const char *name)
 	static struct passwd resultbuf;
 	struct passwd *result;
 
-	__getpwnam_r(name, &resultbuf, buffer, sizeof(buffer), &result);
+	getpwnam_r(name, &resultbuf, buffer, sizeof(buffer), &result);
 	return result;
 }
 
@@ -396,10 +387,7 @@ struct passwd *getpwnam(const char *name)
 /**********************************************************************/
 #ifdef L_getgrnam
 
-extern int __getgrnam_r (__const char *__restrict __name,
-		       struct group *__restrict __resultbuf,
-		       char *__restrict __buffer, size_t __buflen,
-		       struct group **__restrict __result) attribute_hidden;
+libc_hidden_proto(getgrnam_r)
 
 struct group *getgrnam(const char *name)
 {
@@ -407,7 +395,7 @@ struct group *getgrnam(const char *name)
 	static struct group resultbuf;
 	struct group *result;
 
-	__getgrnam_r(name, &resultbuf, buffer, sizeof(buffer), &result);
+	getgrnam_r(name, &resultbuf, buffer, sizeof(buffer), &result);
 	return result;
 }
 
@@ -415,13 +403,15 @@ struct group *getgrnam(const char *name)
 /**********************************************************************/
 #ifdef L_getspnam
 
+libc_hidden_proto(getspnam_r)
+
 struct spwd *getspnam(const char *name)
 {
 	static char buffer[PWD_BUFFER_SIZE];
 	static struct spwd resultbuf;
 	struct spwd *result;
 
-	__getspnam_r(name, &resultbuf, buffer, sizeof(buffer), &result);
+	getspnam_r(name, &resultbuf, buffer, sizeof(buffer), &result);
 	return result;
 }
 
@@ -429,6 +419,8 @@ struct spwd *getspnam(const char *name)
 /**********************************************************************/
 #ifdef L_getpw
 
+libc_hidden_proto(getpwuid_r)
+
 int getpw(uid_t uid, char *buf)
 {
 	struct passwd resultbuf;
@@ -437,8 +429,8 @@ int getpw(uid_t uid, char *buf)
 
 	if (!buf) {
 		__set_errno(EINVAL);
-	} else if (!__getpwuid_r(uid, &resultbuf, buffer, sizeof(buffer), &result)) {
-		if (__sprintf(buf, "%s:%s:%lu:%lu:%s:%s:%s\n",
+	} else if (!getpwuid_r(uid, &resultbuf, buffer, sizeof(buffer), &result)) {
+		if (sprintf(buf, "%s:%s:%lu:%lu:%s:%s:%s\n",
 					resultbuf.pw_name, resultbuf.pw_passwd,
 					(unsigned long)(resultbuf.pw_uid),
 					(unsigned long)(resultbuf.pw_gid),
@@ -487,7 +479,7 @@ void endpwent(void)
 }
 
 
-int attribute_hidden __getpwent_r(struct passwd *__restrict resultbuf, 
+int getpwent_r(struct passwd *__restrict resultbuf, 
 			   char *__restrict buffer, size_t buflen,
 			   struct passwd **__restrict result)
 {
@@ -515,7 +507,7 @@ int attribute_hidden __getpwent_r(struct passwd *__restrict resultbuf,
 
 	return rv;
 }
-strong_alias(__getpwent_r,getpwent_r)
+libc_hidden_proto(getpwent_r)
 
 #endif
 /**********************************************************************/
@@ -542,7 +534,7 @@ void endgrent(void)
 	UNLOCK;
 }
 
-int attribute_hidden __getgrent_r(struct group *__restrict resultbuf,
+int getgrent_r(struct group *__restrict resultbuf,
 			   char *__restrict buffer, size_t buflen,
 			   struct group **__restrict result)
 {
@@ -570,7 +562,8 @@ int attribute_hidden __getgrent_r(struct group *__restrict resultbuf,
 
 	return rv;
 }
-strong_alias(__getgrent_r,getgrent_r)
+libc_hidden_proto(getgrent_r)
+libc_hidden_def(getgrent_r)
 
 #endif
 /**********************************************************************/
@@ -597,7 +590,7 @@ void endspent(void)
 	UNLOCK;
 }
 
-int attribute_hidden __getspent_r(struct spwd *resultbuf, char *buffer, 
+int getspent_r(struct spwd *resultbuf, char *buffer, 
 			   size_t buflen, struct spwd **result)
 {
 	int rv;
@@ -624,15 +617,14 @@ int attribute_hidden __getspent_r(struct spwd *resultbuf, char *buffer,
 
 	return rv;
 }
-strong_alias(__getspent_r,getspent_r)
+libc_hidden_proto(getspent_r)
+libc_hidden_def(getspent_r)
 
 #endif
 /**********************************************************************/
 #ifdef L_getpwent
-	
-extern int __getpwent_r (struct passwd *__restrict __resultbuf,
-		       char *__restrict __buffer, size_t __buflen,
-		       struct passwd **__restrict __result) attribute_hidden;
+
+libc_hidden_proto(getpwent_r)
 
 struct passwd *getpwent(void)
 {
@@ -640,7 +632,7 @@ struct passwd *getpwent(void)
 	static struct passwd pwd;
 	struct passwd *result;
 
-	__getpwent_r(&pwd, line_buff, sizeof(line_buff), &result);
+	getpwent_r(&pwd, line_buff, sizeof(line_buff), &result);
 	return result;
 }
 
@@ -648,9 +640,7 @@ struct passwd *getpwent(void)
 /**********************************************************************/
 #ifdef L_getgrent
 
-extern int __getgrent_r (struct group *__restrict __resultbuf,
-		       char *__restrict __buffer, size_t __buflen,
-		       struct group **__restrict __result) attribute_hidden;
+libc_hidden_proto(getgrent_r)
 
 struct group *getgrent(void)
 {
@@ -658,7 +648,7 @@ struct group *getgrent(void)
 	static struct group gr;
 	struct group *result;
 
-	__getgrent_r(&gr, line_buff, sizeof(line_buff), &result);
+	getgrent_r(&gr, line_buff, sizeof(line_buff), &result);
 	return result;
 }
 
@@ -666,8 +656,7 @@ struct group *getgrent(void)
 /**********************************************************************/
 #ifdef L_getspent
 
-extern int __getspent_r (struct spwd *__result_buf, char *__buffer,
-		       size_t __buflen, struct spwd **__result) attribute_hidden;
+libc_hidden_proto(getspent_r)
 
 struct spwd *getspent(void)
 {
@@ -675,7 +664,7 @@ struct spwd *getspent(void)
 	static struct spwd spwd;
 	struct spwd *result;
 
-	__getspent_r(&spwd, line_buff, sizeof(line_buff), &result);
+	getspent_r(&spwd, line_buff, sizeof(line_buff), &result);
 	return result;
 }
 
@@ -683,9 +672,7 @@ struct spwd *getspent(void)
 /**********************************************************************/
 #ifdef L_sgetspent
 
-extern int __sgetspent_r (__const char *__string, struct spwd *__result_buf,
-			char *__buffer, size_t __buflen,
-			struct spwd **__result) attribute_hidden;
+libc_hidden_proto(sgetspent_r)
 
 struct spwd *sgetspent(const char *string)
 {
@@ -693,7 +680,7 @@ struct spwd *sgetspent(const char *string)
 	static struct spwd spwd;
 	struct spwd *result;
 
-	__sgetspent_r(string, &spwd, line_buff, sizeof(line_buff), &result);
+	sgetspent_r(string, &spwd, line_buff, sizeof(line_buff), &result);
 	return result;
 }
 
@@ -726,7 +713,7 @@ int initgroups(const char *user, gid_t gid)
 			assert(group.gr_mem); /* Must have at least a NULL terminator. */
 			if (group.gr_gid != gid) {
 				for (m=group.gr_mem ; *m ; m++) {
-					if (!__strcmp(*m, user)) {
+					if (!strcmp(*m, user)) {
 						if (!(num_groups & 7)) {
 							gid_t *tmp = (gid_t *)
 								realloc(group_list,
@@ -809,7 +796,7 @@ int putgrent(const struct group *__restrict p, FILE *__restrict f)
 
 			do {
 				if (!*m) {
-					if (__fputc_unlocked_internal('\n', f) >= 0) {
+					if (__fputc_unlocked('\n', f) >= 0) {
 						rv = 0;
 					}
 					break;
@@ -875,7 +862,7 @@ int putspent(const struct spwd *p, FILE *stream)
 		goto DO_UNLOCK;
 	}
 
-	if (__fputc_unlocked_internal('\n', stream) > 0) {
+	if (__fputc_unlocked('\n', stream) > 0) {
 		rv = 0;
 	}
 
@@ -919,7 +906,7 @@ int attribute_hidden __parsepwent(void *data, char *line)
 			/* NOTE: glibc difference - glibc allows omission of
 			 * ':' seperators after the gid field if all remaining
 			 * entries are empty.  We require all separators. */
-			if (!(line = __strchr(line, ':'))) {
+			if (!(line = strchr(line, ':'))) {
 				break;
 			}
 		} else {
@@ -971,7 +958,7 @@ int attribute_hidden __parsegrent(void *data, char *line)
 
 		if (i < 2) {
 			*((char **) p) = line;
-			if (!(line = __strchr(line, ':'))) {
+			if (!(line = strchr(line, ':'))) {
 				break;
 			}
 			*line++ = 0;
@@ -1071,7 +1058,7 @@ int attribute_hidden __parsespent(void *data, char * line)
 		p = ((char *) ((struct spwd *) data)) + sp_off[i];
 		if (i < 2) {
 			*((char **) p) = line;
-			if (!(line = __strchr(line, ':'))) {
+			if (!(line = strchr(line, ':'))) {
 				break;
 			}
 		} else {
@@ -1148,7 +1135,7 @@ int attribute_hidden __pgsreader(int (*__parserfunc)(void *d, char *line), void
 				break;
 			}
 
-			line_len = __strlen(line_buff) - 1; /* strlen() must be > 0. */
+			line_len = strlen(line_buff) - 1; /* strlen() must be > 0. */
 			if (line_buff[line_len] == '\n') {
 				line_buff[line_len] = 0;
 			} else if (line_len + 2 == buflen) { /* line too long */
diff --git a/libc/pwd_grp/pwd_grp_internal.c b/libc/pwd_grp/pwd_grp_internal.c
index 8520cf45b..6d32ec911 100644
--- a/libc/pwd_grp/pwd_grp_internal.c
+++ b/libc/pwd_grp/pwd_grp_internal.c
@@ -55,7 +55,7 @@
 /**********************************************************************/
 #ifdef GETXXKEY_R_FUNC
 
-int attribute_hidden GETXXKEY_R_FUNC_HIDDEN(DO_GETXXKEY_R_KEYTYPE key,
+int GETXXKEY_R_FUNC(DO_GETXXKEY_R_KEYTYPE key,
 					GETXXKEY_R_ENTTYPE *__restrict resultbuf,
 					char *__restrict buffer, size_t buflen,
 					GETXXKEY_R_ENTTYPE **__restrict result)
@@ -89,7 +89,8 @@ int attribute_hidden GETXXKEY_R_FUNC_HIDDEN(DO_GETXXKEY_R_KEYTYPE key,
 
 	return rv;
 }
-strong_alias(GETXXKEY_R_FUNC_HIDDEN,GETXXKEY_R_FUNC)
+libc_hidden_proto(GETXXKEY_R_FUNC)
+libc_hidden_def(GETXXKEY_R_FUNC)
 
 #endif
 /**********************************************************************/