Index: contrib/amd/amd/amd.h
===================================================================
--- contrib/amd/amd/amd.h
+++ contrib/amd/amd/amd.h
@@ -625,7 +625,7 @@
 extern void mapc_add_kv(mnt_map *, char *, char *);
 extern mnt_map *mapc_find(char *, char *, const char *, const char *);
 extern void mapc_free(opaque_t);
-extern int  mapc_keyiter(mnt_map *, key_fun, opaque_t);
+extern int  mapc_keyiter(mnt_map *, key_fun *, opaque_t);
 extern void mapc_reload(void);
 extern int  mapc_search(mnt_map *, char *, char **);
 extern void mapc_showtypes(char *buf, size_t l);
Index: contrib/amd/amd/rpc_fwd.c
===================================================================
--- contrib/amd/amd/rpc_fwd.c
+++ contrib/amd/amd/rpc_fwd.c
@@ -221,7 +221,7 @@
  * different address.
  */
 int
-fwd_packet(int type_id, char *pkt, int len, struct sockaddr_in *fwdto, struct sockaddr_in *replyto, opaque_t cb_arg, fwd_fun cb)
+fwd_packet(int type_id, char *pkt, int len, struct sockaddr_in *fwdto, struct sockaddr_in *replyto, opaque_t cb_arg, fwd_fun *cb)
 {
   rpc_forward *p;
   u_int *pkt_int;