diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index 5c73e28522..8c30438cc2 100644
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -37,6 +37,7 @@
 
 #include <isc/base64.h>
 #include <isc/file.h>
+#include <isc/getaddresses.h>
 #include <isc/hex.h>
 #include <isc/lang.h>
 #include <isc/log.h>
@@ -79,8 +80,6 @@
 
 #include <irs/resconf.h>
 
-#include <bind9/getaddresses.h>
-
 #include "dighost.h"
 
 #define systemlocale(l) (void)setlocale(l, "")
@@ -534,8 +533,7 @@ set_nameserver(char *opt) {
 	}
 
 	isc_loopmgr_blocking(loopmgr);
-	result = bind9_getaddresses(opt, 0, sockaddrs, DIG_MAX_ADDRESSES,
-				    &count);
+	result = isc_getaddresses(opt, 0, sockaddrs, DIG_MAX_ADDRESSES, &count);
 	isc_loopmgr_nonblocking(loopmgr);
 	if (result != ISC_R_SUCCESS) {
 		fatal("couldn't get address for '%s': %s", opt,
@@ -4528,7 +4526,7 @@ get_address(char *host, in_port_t myport, isc_sockaddr_t *sockaddr) {
 	isc_result_t result;
 
 	isc_loopmgr_blocking(loopmgr);
-	result = bind9_getaddresses(host, myport, sockaddr, 1, &count);
+	result = isc_getaddresses(host, myport, sockaddr, 1, &count);
 	isc_loopmgr_nonblocking(loopmgr);
 	if (result != ISC_R_SUCCESS) {
 		return (result);
@@ -4549,8 +4547,8 @@ getaddresses(dig_lookup_t *lookup, const char *host, isc_result_t *resultp) {
 	char tmp[ISC_NETADDR_FORMATSIZE];
 
 	isc_loopmgr_blocking(loopmgr);
-	result = bind9_getaddresses(host, 0, sockaddrs, DIG_MAX_ADDRESSES,
-				    &count);
+	result = isc_getaddresses(host, 0, sockaddrs, DIG_MAX_ADDRESSES,
+				  &count);
 	isc_loopmgr_nonblocking(loopmgr);
 	if (resultp != NULL) {
 		*resultp = result;
diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c
index 58b36619a4..60a3874a6a 100644
--- a/bin/nsupdate/nsupdate.c
+++ b/bin/nsupdate/nsupdate.c
@@ -26,6 +26,7 @@
 #include <isc/buffer.h>
 #include <isc/commandline.h>
 #include <isc/file.h>
+#include <isc/getaddresses.h>
 #include <isc/hash.h>
 #include <isc/job.h>
 #include <isc/lex.h>
@@ -91,8 +92,6 @@
 
 #endif /* HAVE_GSSAPI */
 
-#include <bind9/getaddresses.h>
-
 #include "../dig/readline.h"
 
 #define MAXCMD	     (128 * 1024)
@@ -104,7 +103,7 @@
 
 #define DNSDEFAULTPORT 53
 
-/* Number of addresses to request from bind9_getaddresses() */
+/* Number of addresses to request from isc_getaddresses() */
 #define MAX_SERVERADDRS 4
 
 static uint16_t dnsport = DNSDEFAULTPORT;
@@ -1008,7 +1007,7 @@ get_addresses(char *host, in_port_t port, isc_sockaddr_t *sockaddr,
 	isc_result_t result;
 
 	isc_loopmgr_blocking(loopmgr);
-	result = bind9_getaddresses(host, port, sockaddr, naddrs, &count);
+	result = isc_getaddresses(host, port, sockaddr, naddrs, &count);
 	isc_loopmgr_nonblocking(loopmgr);
 	if (result != ISC_R_SUCCESS) {
 		error("couldn't get address for '%s': %s", host,
diff --git a/bin/rndc/rndc.c b/bin/rndc/rndc.c
index 3d226ac03c..c2d128b5cb 100644
--- a/bin/rndc/rndc.c
+++ b/bin/rndc/rndc.c
@@ -22,6 +22,7 @@
 #include <isc/buffer.h>
 #include <isc/commandline.h>
 #include <isc/file.h>
+#include <isc/getaddresses.h>
 #include <isc/log.h>
 #include <isc/loop.h>
 #include <isc/managers.h>
@@ -48,8 +49,6 @@
 
 #include <isccfg/namedconf.h>
 
-#include <bind9/getaddresses.h>
-
 #include "util.h"
 
 #define SERVERADDRS 10
@@ -278,7 +277,7 @@ get_addresses(const char *host, in_port_t port) {
 		}
 	} else {
 		count = SERVERADDRS - nserveraddrs;
-		result = bind9_getaddresses(
+		result = isc_getaddresses(
 			host, port, &serveraddrs[nserveraddrs], count, &found);
 		nserveraddrs += found;
 	}
diff --git a/bin/tools/mdig.c b/bin/tools/mdig.c
index f519696af4..b8aa675c83 100644
--- a/bin/tools/mdig.c
+++ b/bin/tools/mdig.c
@@ -19,6 +19,7 @@
 
 #include <isc/attributes.h>
 #include <isc/base64.h>
+#include <isc/getaddresses.h>
 #include <isc/hash.h>
 #include <isc/hex.h>
 #include <isc/log.h>
@@ -51,8 +52,6 @@
 #include <dns/types.h>
 #include <dns/view.h>
 
-#include <bind9/getaddresses.h>
-
 #define CHECK(str, x)                                                       \
 	{                                                                   \
 		if ((x) != ISC_R_SUCCESS) {                                 \
@@ -2109,7 +2108,7 @@ main(int argc, char *argv[]) {
 	}
 
 	ns = 0;
-	result = bind9_getaddresses(server, port, &dstaddr, 1, &ns);
+	result = isc_getaddresses(server, port, &dstaddr, 1, &ns);
 	if (result != ISC_R_SUCCESS) {
 		fatal("couldn't get address for '%s': %s", server,
 		      isc_result_totext(result));
diff --git a/lib/bind9/Makefile.am b/lib/bind9/Makefile.am
index c48018a906..dc8888f1a0 100644
--- a/lib/bind9/Makefile.am
+++ b/lib/bind9/Makefile.am
@@ -4,12 +4,10 @@ lib_LTLIBRARIES = libbind9.la
 
 libbind9_ladir = $(includedir)/bind9
 
-libbind9_la_HEADERS =			\
-	include/bind9/getaddresses.h
+libbind9_la_HEADERS =
 
 libbind9_la_SOURCES =		\
-	$(libbind9_la_HEADERS)	\
-	getaddresses.c
+	$(libbind9_la_HEADERS)
 
 libbind9_la_CPPFLAGS =		\
 	$(AM_CPPFLAGS)		\
diff --git a/lib/isc/Makefile.am b/lib/isc/Makefile.am
index dff12e76c9..77a667700c 100644
--- a/lib/isc/Makefile.am
+++ b/lib/isc/Makefile.am
@@ -31,6 +31,7 @@ libisc_la_HEADERS =			\
 	include/isc/formatcheck.h	\
 	include/isc/fsaccess.h		\
 	include/isc/fuzz.h		\
+	include/isc/getaddresses.h	\
 	include/isc/glob.h		\
 	include/isc/hash.h		\
 	include/isc/hashmap.h		\
@@ -130,6 +131,7 @@ libisc_la_SOURCES =		\
 	fsaccess.c		\
 	fsaccess_common.c	\
 	fsaccess_common_p.h	\
+	getaddresses.c		\
 	glob.c			\
 	hash.c			\
 	hashmap.c		\
diff --git a/lib/bind9/getaddresses.c b/lib/isc/getaddresses.c
similarity index 96%
rename from lib/bind9/getaddresses.c
rename to lib/isc/getaddresses.c
index 9e2e9d3d79..bed59b483a 100644
--- a/lib/bind9/getaddresses.c
+++ b/lib/isc/getaddresses.c
@@ -18,6 +18,7 @@
 #include <stdbool.h>
 #include <string.h>
 
+#include <isc/getaddresses.h>
 #include <isc/net.h>
 #include <isc/netaddr.h>
 #include <isc/netscope.h>
@@ -26,11 +27,9 @@
 #include <isc/string.h>
 #include <isc/util.h>
 
-#include <bind9/getaddresses.h>
-
 isc_result_t
-bind9_getaddresses(const char *hostname, in_port_t port, isc_sockaddr_t *addrs,
-		   int addrsize, int *addrcount) {
+isc_getaddresses(const char *hostname, in_port_t port, isc_sockaddr_t *addrs,
+		 int addrsize, int *addrcount) {
 	struct in_addr in4;
 	struct in6_addr in6;
 	bool have_ipv4, have_ipv6;
diff --git a/lib/bind9/include/bind9/getaddresses.h b/lib/isc/include/isc/getaddresses.h
similarity index 92%
rename from lib/bind9/include/bind9/getaddresses.h
rename to lib/isc/include/isc/getaddresses.h
index b9a431b581..9bb2435075 100644
--- a/lib/bind9/include/bind9/getaddresses.h
+++ b/lib/isc/include/isc/getaddresses.h
@@ -22,8 +22,8 @@
 ISC_LANG_BEGINDECLS
 
 isc_result_t
-bind9_getaddresses(const char *hostname, in_port_t port, isc_sockaddr_t *addrs,
-		   int addrsize, int *addrcount);
+isc_getaddresses(const char *hostname, in_port_t port, isc_sockaddr_t *addrs,
+		 int addrsize, int *addrcount);
 /*%<
  * Use the system resolver to get the addresses associated with a hostname.
  * If successful, the number of addresses found is returned in 'addrcount'.
diff --git a/lib/isccfg/parser.c b/lib/isccfg/parser.c
index 933b6cf0df..d2e777ba00 100644
--- a/lib/isccfg/parser.c
+++ b/lib/isccfg/parser.c
@@ -2926,7 +2926,7 @@ token_addr(cfg_parser_t *pctx, unsigned int flags, isc_netaddr_t *na) {
 			}
 		}
 		if ((flags & CFG_ADDR_V6OK) != 0 && strlen(s) <= 127U) {
-			char buf[128];	   /* see lib/bind9/getaddresses.c */
+			char buf[128];	   /* see isc_getaddresses() */
 			char *d;	   /* zone delimiter */
 			uint32_t zone = 0; /* scope zone ID */