-char *pgp_gpgme_findkeys (ADDRESS * to, ADDRESS * cc, ADDRESS * bcc);
-char *smime_gpgme_findkeys (ADDRESS * to, ADDRESS * cc, ADDRESS * bcc);
+char *pgp_gpgme_findkeys (address_t * to, address_t * cc, address_t * bcc);
+char *smime_gpgme_findkeys (address_t * to, address_t * cc, address_t * bcc);