diff --git a/lib/krb5/krb5.h b/lib/krb5/krb5.h
index 8d2505c86..f8ead451d 100644
--- a/lib/krb5/krb5.h
+++ b/lib/krb5/krb5.h
@@ -99,11 +99,13 @@ enum {
 
 typedef HostAddress krb5_address;
 
-/* typedef HostAddresses krb5_addresses; */
+typedef HostAddresses krb5_addresses;
+#if 0
 typedef struct krb5_addresses {
     int number;
     krb5_address *addrs;
 } krb5_addresses;
+#endif
 
 typedef enum krb5_keytype { KEYTYPE_DES = 1 } krb5_keytype;
 
@@ -395,10 +397,17 @@ krb5_auth_getauthenticator(krb5_context context,
 			   krb5_auth_context auth_context,
 			   krb5_authenticator *authenticator);
 
+#if 0
 krb5_boolean
 krb5_address_search(krb5_context context,
 		    const krb5_address *addr,
 		    krb5_address *const *addrlist);
+#endif
+
+krb5_boolean
+krb5_address_search(krb5_context context,
+		    const krb5_address *addr,
+		    const krb5_addresses *addrlist);
 
 krb5_boolean
 krb5_address_compare(krb5_context context,
@@ -419,6 +428,10 @@ krb5_error_code
 krb5_free_address(krb5_context context,
 		  krb5_address *address);
 
+krb5_error_code
+krb5_free_addresses(krb5_context context,
+		    krb5_addresses *addresses);
+
 void
 krb5_free_authenticator(krb5_context,
 			krb5_authenticator *authenticator);
@@ -735,7 +748,6 @@ extern const char krb5_defkeyname[];
 
 void krb5_free_context(krb5_context context);
 
-
 krb5_error_code
 krb5_get_all_client_addrs (krb5_addresses *res);