diff --git a/bin/tests/rbt_test.c b/bin/tests/rbt_test.c
index f98c1e968e..66e5dd7cb9 100644
--- a/bin/tests/rbt_test.c
+++ b/bin/tests/rbt_test.c
@@ -430,7 +430,7 @@ main(int argc, char **argv) {
 
 			} else if (CMDCHECK("print")) {
 				if (arg == NULL || *arg == '\0')
-					dns_rbt_printall(rbt, NULL);
+					dns_rbt_printtext(rbt, NULL, stdout);
 				else
 					printf("usage: print\n");
 
diff --git a/lib/isc/hash.c b/lib/isc/hash.c
index aff12eb21d..5d67c053b3 100644
--- a/lib/isc/hash.c
+++ b/lib/isc/hash.c
@@ -395,7 +395,7 @@ isc_hash_calc(const unsigned char *key, unsigned int keylen,
 }
 
 void
-isc__hash_setvec(const uint16_t *vec) {
+isc__hash_setvec(const isc_uint16_t *vec) {
 	int i;
 	hash_random_t *p;
 
diff --git a/lib/isc/include/isc/hash.h b/lib/isc/include/isc/hash.h
index 662e37aff4..3dec1d9946 100644
--- a/lib/isc/include/isc/hash.h
+++ b/lib/isc/include/isc/hash.h
@@ -20,7 +20,7 @@
 #ifndef ISC_HASH_H
 #define ISC_HASH_H 1
 
-#include <stdint.h>
+#include <isc/types.h>
 
 /*****
  ***** Module Info
@@ -183,7 +183,7 @@ isc_hash_calc(const unsigned char *key, unsigned int keylen,
 /*@}*/
 
 void
-isc__hash_setvec(const uint16_t *vec);
+isc__hash_setvec(const isc_uint16_t *vec);
 
 /*!<
  * \brief Set the contents of the random vector used in hashing.