5 files changed, 22 insertions, 27 deletions
diff --git a/include/string.h b/include/string.h
index e965cf4752..c1df7acb93 100644
--- a/include/string.h
+++ b/include/string.h
@@ -72,6 +72,7 @@ libc_hidden_proto (__strndup)
 libc_hidden_proto (__strerror_r)
 libc_hidden_proto (__strverscmp)
 libc_hidden_proto (basename)
+libc_hidden_proto (strcoll)
 
 # ifndef _ISOMAC
 #  ifndef index
diff --git a/include/sys/stat.h b/include/sys/stat.h
index 6dcf0d8e3a..2e2566d9ef 100644
--- a/include/sys/stat.h
+++ b/include/sys/stat.h
@@ -11,14 +11,14 @@ extern __mode_t __umask (__mode_t __mask);
 extern int __mkdir (__const char *__path, __mode_t __mode);
 extern int __mknod (__const char *__path,
 		    __mode_t __mode, __dev_t __dev);
-extern int __fxstat_internal (int __ver, int __fildes,
-			      struct stat *__stat_buf) attribute_hidden;
-extern int __fxstat64_internal (int __ver, int __fildes,
-				struct stat64 *__stat_buf) attribute_hidden;
-extern int __lxstat_internal (int __ver, __const char *__file,
-			      struct stat *__stat_buf) attribute_hidden;
-extern int __lxstat64_internal (int __ver, __const char *__file,
-				struct stat64 *__stat_buf) attribute_hidden;
+#if !defined NOT_IN_libc || defined IS_IN_rtld
+hidden_proto (__fxstat)
+hidden_proto (__fxstat64)
+hidden_proto (__lxstat)
+hidden_proto (__lxstat64)
+hidden_proto (__xstat)
+hidden_proto (__xstat64)
+#endif
 extern __inline__ int __stat (__const char *__path, struct stat *__statbuf)
 {
   return __xstat (_STAT_VER, __path, __statbuf);
@@ -41,22 +41,7 @@ extern __inline__ int __mknod (__const char *__path, __mode_t __mode,
 #define __lstat(fname, buf)  __lxstat (_STAT_VER, fname, buf)
 #define lstat64(fname, buf)  __lxstat64 (_STAT_VER, fname, buf)
 #define stat64(fname, buf) __xstat64 (_STAT_VER, fname, buf)
-#ifndef NOT_IN_libc
-# define fstat64(fd, buf) INTUSE(__fxstat64) (_STAT_VER, fd, buf)
-# define fstat(fd, buf) INTUSE(__fxstat) (_STAT_VER, fd, buf)
-# define __fstat(fd, buf)  INTUSE(__fxstat) (_STAT_VER, fd, buf)
-
-# define __fxstat(ver, fd, buf) INTUSE(__fxstat) (ver, fd, buf)
-# ifndef __fxstat64
-#  define __fxstat64(ver, fd, buf) INTUSE(__fxstat64) (ver, fd, buf)
-# endif
-# define __lxstat(ver, name, buf) INTUSE(__lxstat) (ver, name, buf)
-# ifndef __lxstat64
-#  define __lxstat64(ver, name, buf) INTUSE(__lxstat64) (ver, name, buf)
-# endif
-#else
-# define fstat64(fd, buf) __fxstat64 (_STAT_VER, fd, buf)
-# define fstat(fd, buf) __fxstat (_STAT_VER, fd, buf)
-# define __fstat(fd, buf) __fxstat (_STAT_VER, fd, buf)
-#endif
+#define fstat64(fd, buf) __fxstat64 (_STAT_VER, fd, buf)
+#define fstat(fd, buf) __fxstat (_STAT_VER, fd, buf)
+#define __fstat(fd, buf) __fxstat (_STAT_VER, fd, buf)
 #endif
diff --git a/include/sys/statvfs.h b/include/sys/statvfs.h
index 40acf9db16..b3c6a35c64 100644
--- a/include/sys/statvfs.h
+++ b/include/sys/statvfs.h
@@ -4,4 +4,7 @@
 /* Now define the internal interfaces.  */
 extern int __statvfs64 (__const char *__file, struct statvfs64 *__buf);
 extern int __fstatvfs64 (int __fildes, struct statvfs64 *__buf);
+
+libc_hidden_proto (statvfs)
+libc_hidden_proto (fstatvfs)
 #endif
diff --git a/include/termios.h b/include/termios.h
index e2b369feb1..8916f1434f 100644
--- a/include/termios.h
+++ b/include/termios.h
@@ -6,4 +6,8 @@ extern int __tcgetattr (int __fd, struct termios *__termios_p);
 
 extern int __libc_tcdrain (int __fd);
 
+libc_hidden_proto (tcsetattr)
+libc_hidden_proto (cfsetispeed)
+libc_hidden_proto (cfsetospeed)
+
 #endif
diff --git a/include/unistd.h b/include/unistd.h
index 675f12040f..ec600afc7d 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -12,7 +12,9 @@ libc_hidden_proto (getpid)
 libc_hidden_proto (getsid)
 libc_hidden_proto (getdomainname)
 libc_hidden_proto (getlogin_r)
-
+libc_hidden_proto (seteuid)
+libc_hidden_proto (setegid)
+libc_hidden_proto (tcgetpgrp)
 
 /* Now define the internal interfaces.  */
 extern int __access (__const char *__name, int __type);