diff --git a/ChangeLog b/ChangeLog
index a5db8d723a..8333cadba5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -69,6 +69,7 @@
 	* include/pwd.h: Likewise.
 	* include/shadow.h: Likewise.
 	* include/rpc/netdb.h: Likewise.
+	* include/setjmp.h: Likewise.
 
 	* include/stdio.h: Add prototypes for compatibility functions.
 	* include/grp.h: Likewise.
diff --git a/include/getopt.h b/include/getopt.h
index 74ca6d453a..7a35c8a20b 100644
--- a/include/getopt.h
+++ b/include/getopt.h
@@ -1 +1,8 @@
+#ifndef _GETOPT_H
+
 #include <posix/getopt.h>
+
+/* Now define the internal interfaces.  */
+extern void __getopt_clean_environment (char **__env);
+
+#endif
diff --git a/include/netdb.h b/include/netdb.h
index 141dce505a..929ab9e6a0 100644
--- a/include/netdb.h
+++ b/include/netdb.h
@@ -151,6 +151,22 @@ extern int ruserpass (const char *host, const char **aname,
 
 #include <inet/netgroup.h>
 
+struct parser_data;
+extern int _nss_files_parse_protoent (char *line, struct protoent *result,
+				      struct parser_data *data,
+				      size_t datalen, int *errnop);
+extern int _nss_files_parse_servent (char *line, struct servent *result,
+				     struct parser_data *data,
+				     size_t datalen, int *errnop);
+extern int _nss_files_parse_netent (char *line, struct netent *result,
+				    struct parser_data *data,
+				    size_t datalen, int *errnop);
+extern enum nss_status _nss_netgroup_parseline (char **cursor,
+						struct __netgrent *result,
+						char *buffer, size_t buflen,
+						int *errnop);
+
+
 #define DECLARE_NSS_PROTOTYPES(service)					      \
 extern enum nss_status _nss_ ## service ## _setprotoent (int);		      \
 extern enum nss_status _nss_ ## service ## _endprotoent (void);		      \
diff --git a/include/resolv.h b/include/resolv.h
index b416764bb6..fe79c16ba3 100644
--- a/include/resolv.h
+++ b/include/resolv.h
@@ -9,4 +9,22 @@
   while (0)
 
 #include <resolv/resolv.h>
+
+/* Now define the internal interfaces.  */
+extern int __res_vinit (res_state, int);
+extern void _sethtent (int);
+extern void _endhtent (void);
+extern struct hostent *_gethtent (void);
+extern struct hostent *_gethtbyname (const char *__name);
+extern struct hostent *_gethtbyname2 (const char *__name, int __af);
+struct hostent *_gethtbyaddr (const char *addr, size_t __len, int __af);
+extern u_int32_t _getlong (const u_char *__src);
+extern u_int16_t _getshort (const u_char *__src);
+extern void res_pquery (const res_state __statp, const u_char *__msg,
+			int __len, FILE *__file);
+extern void res_send_setqhook (res_send_qhook __hook);
+extern void res_send_setrhook (res_send_rhook __hook);
+extern int res_ourserver_p (const res_state __statp,
+			    const struct sockaddr_in6 *__inp);
+
 #endif
diff --git a/include/rpc/netdb.h b/include/rpc/netdb.h
index aec359ac98..310cdd7105 100644
--- a/include/rpc/netdb.h
+++ b/include/rpc/netdb.h
@@ -21,6 +21,11 @@ extern int __getrpcent_r (struct rpcent *__result_buf, char *__buffer,
 extern int __old_getrpcent_r (struct rpcent *__result_buf, char *__buffer,
 			      size_t __buflen, struct rpcent **__result);
 
+struct parser_data;
+extern int _nss_files_parse_rpcent (char *line, struct rpcent *result,
+				    struct parser_data *data,
+				    size_t datalen, int *errnop);
+
 #define DECLARE_NSS_PROTOTYPES(service)					      \
 extern enum nss_status _nss_ ## service ## _setrpcent (int);		      \
 extern enum nss_status _nss_ ## service ## _endrpcent (void);		      \
diff --git a/include/setjmp.h b/include/setjmp.h
index 5093ff7d06..acab1b9acb 100644
--- a/include/setjmp.h
+++ b/include/setjmp.h
@@ -15,4 +15,7 @@ extern int __sigjmp_save (jmp_buf __env, int __savemask);
 
 extern void _longjmp_unwind (jmp_buf env, int val);
 
+extern void __libc_siglongjmp (sigjmp_buf __env, int __val)
+          __attribute__ ((noreturn));
+
 #endif
diff --git a/include/termios.h b/include/termios.h
index e10a7e3af3..e2b369feb1 100644
--- a/include/termios.h
+++ b/include/termios.h
@@ -3,4 +3,7 @@
 
 /* Now define the internal interfaces.  */
 extern int __tcgetattr (int __fd, struct termios *__termios_p);
+
+extern int __libc_tcdrain (int __fd);
+
 #endif
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index e7b3819ada..176099431b 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -2,6 +2,7 @@
 
 	* Examples/ex13.c: Make local functions static.
 	* ecmutex.c: Likewise.
+	* joinrace.c: Likewise.
 	* Examples/ex14.c: Likewise.
 
 	* Examples/ex2.c: Make local functions static; reformat.