7 files changed, 17 insertions, 12 deletions

diff --git a/include/netdb.h b/include/netdb.h
index 57cd70b0b023..6a2bd27cf43a 100644
--- a/include/netdb.h
+++ b/include/netdb.h
@@ -257,18 +257,6 @@ void		setservent(int);
 
 /* DO NOT USE THESE, THEY ARE SUBJECT TO CHANGE AND ARE NOT PORTABLE!!! */
 int	* __h_error(void);
-void	_sethosthtent(int);
-void	_endhosthtent(void);
-void	_sethostdnsent(int);
-void	_endhostdnsent(void);
-void	_setnethtent(int);
-void	_endnethtent(void);
-void	_setnetdnsent(int);
-void	_endnetdnsent(void);
-struct hostent * _gethostbynisname(const char *, int);
-struct hostent * _gethostbynisaddr(const char *, int, int);
-void _map_v4v6_address(const char *, char *);
-void _map_v4v6_hostent(struct hostent *, char **, char **);
 __END_DECLS
 
 #endif /* !_NETDB_H_ */
diff --git a/lib/libc/net/gethostbydns.c b/lib/libc/net/gethostbydns.c
index 84912075ded9..cc67011222d6 100644
--- a/lib/libc/net/gethostbydns.c
+++ b/lib/libc/net/gethostbydns.c
@@ -79,6 +79,7 @@ __FBSDID("$FreeBSD$");
 #include <stdarg.h>
 #include <nsswitch.h>
 
+#include "netdb_private.h"
 #include "res_config.h"
 
 #define SPRINTF(x) ((size_t)sprintf x)
diff --git a/lib/libc/net/gethostbyht.c b/lib/libc/net/gethostbyht.c
index e414058e0e42..0318adbb010c 100644
--- a/lib/libc/net/gethostbyht.c
+++ b/lib/libc/net/gethostbyht.c
@@ -69,6 +69,7 @@ __FBSDID("$FreeBSD$");
 #include <nsswitch.h>
 #include <arpa/nameser.h>	/* XXX */
 #include <resolv.h>		/* XXX */
+#include "netdb_private.h"
 
 #define	MAXALIASES	35
 
diff --git a/lib/libc/net/gethostnamadr.c b/lib/libc/net/gethostnamadr.c
index 2409502f3c67..66348eaa713b 100644
--- a/lib/libc/net/gethostnamadr.c
+++ b/lib/libc/net/gethostnamadr.c
@@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$");
 #include <arpa/nameser.h>		/* XXX hack for _res */
 #include <resolv.h>			/* XXX hack for _res */
 #include "un-namespace.h"
+#include "netdb_private.h"
 
 extern int _ht_gethostbyname(void *, void *, va_list);
 extern int _dns_gethostbyname(void *, void *, va_list);
diff --git a/lib/libc/net/getnetnamadr.c b/lib/libc/net/getnetnamadr.c
index 002765af9e89..eec3d9aec934 100644
--- a/lib/libc/net/getnetnamadr.c
+++ b/lib/libc/net/getnetnamadr.c
@@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$");
 #include <stdarg.h>
 #include <nsswitch.h>
 #include "un-namespace.h"
+#include "netdb_private.h"
 
 extern int _ht_getnetbyname(void *, void *, va_list);
 extern int _dns_getnetbyname(void *, void *, va_list);
diff --git a/lib/libc/net/name6.c b/lib/libc/net/name6.c
index 37059b351ba0..428101523689 100644
--- a/lib/libc/net/name6.c
+++ b/lib/libc/net/name6.c
@@ -120,6 +120,7 @@ __FBSDID("$FreeBSD$");
 #include <nsswitch.h>
 #include <unistd.h>
 #include "un-namespace.h"
+#include "netdb_private.h"
 
 #ifndef _PATH_HOSTS
 #define	_PATH_HOSTS	"/etc/hosts"
diff --git a/lib/libc/net/netdb_private.h b/lib/libc/net/netdb_private.h
index b932620c5e19..270b198a6a1e 100644
--- a/lib/libc/net/netdb_private.h
+++ b/lib/libc/net/netdb_private.h
@@ -79,6 +79,18 @@ struct servdata {
 
 struct protodata *__protodata_init(void);
 struct servdata *__servdata_init(void);
+void _endhostdnsent(void);
+void _endhosthtent(void);
+void _endnetdnsent(void);
+void _endnethtent(void);
+struct hostent *_gethostbynisaddr(const char *, int, int);
+struct hostent *_gethostbynisname(const char *, int);
+void _map_v4v6_address(const char *, char *);
+void _map_v4v6_hostent(struct hostent *, char **, char **);
+void _sethostdnsent(int);
+void _sethosthtent(int);
+void _setnetdnsent(int);
+void _setnethtent(int);
 void endprotoent_r(struct protoent_data *);
 void endservent_r(struct servent_data *);
 int getprotobyname_r(const char *, struct protoent *, struct protoent_data *);