diff --git a/lib/krb5/krb5.h b/lib/krb5/krb5.h
index 09072af9f..9dbd50941 100644
--- a/lib/krb5/krb5.h
+++ b/lib/krb5/krb5.h
@@ -285,8 +285,8 @@ typedef struct krb5_auth_context_data{
   krb5_cksumtype cksumtype;
   krb5_enctype enctype;
 
-  krb5_address local_address;
-  krb5_address remote_address;
+  krb5_address *local_address;
+  krb5_address *remote_address;
   krb5_keyblock key;
   krb5_keyblock local_subkey;
   krb5_keyblock remote_subkey;
@@ -422,6 +422,11 @@ krb5_address_order(krb5_context context,
 		   const krb5_address *addr1,
 		   const krb5_address *addr2);
 
+krb5_error_code
+krb5_copy_address(krb5_context context,
+		  const krb5_address *inaddr,
+		  krb5_address *outaddr);
+
 krb5_error_code
 krb5_copy_addresses(krb5_context context,
 		    const krb5_addresses *inaddr,
@@ -726,7 +731,7 @@ krb5_get_krbhst (krb5_context context,
 
 krb5_error_code
 krb5_free_krbhst (krb5_context context,
-		  char *const *hostlist);
+		  char **hostlist);
 
 krb5_error_code
 krb5_get_host_realm(krb5_context context,