-ADDRESS *mutt_get_address (ENVELOPE *, char **);
-ADDRESS *mutt_lookup_alias (const char *s);
-ADDRESS *mutt_expand_aliases (ADDRESS *);
+address_t *mutt_get_address (ENVELOPE *, const char **);
+address_t *mutt_lookup_alias (const char *s);
+address_t *mutt_expand_aliases (address_t *);