diff --git a/kdc/windc.c b/kdc/windc.c
index 84b651ad2..dda921b4c 100644
--- a/kdc/windc.c
+++ b/kdc/windc.c
@@ -218,7 +218,7 @@ _kdc_check_access(krb5_context context,
     return ret;
 }
 
-uintptr_t
+uintptr_t KRB5_CALLCONV
 kdc_get_instance(const char *libname)
 {
     static const char *instance = "libkdc";
diff --git a/lib/hdb/hdb.c b/lib/hdb/hdb.c
index ac2a1fe7c..c88ad68e8 100644
--- a/lib/hdb/hdb.c
+++ b/lib/hdb/hdb.c
@@ -509,7 +509,7 @@ hdb_create(krb5_context context, HDB **db, const char *filename)
     return (*cb_ctx.h->create)(context, db, cb_ctx.residual);
 }
 
-uintptr_t
+uintptr_t KRB5_CALLCONV
 hdb_get_instance(const char *libname)
 {
     static const char *instance = "libhdb";
diff --git a/lib/hx509/cms.c b/lib/hx509/cms.c
index d45ada1cf..7bc0b15e9 100644
--- a/lib/hx509/cms.c
+++ b/lib/hx509/cms.c
@@ -1205,7 +1205,7 @@ struct sigctx {
     hx509_certs pool;
 };
 
-static int
+static int HX509_LIB_CALL
 sig_process(hx509_context context, void *ctx, hx509_cert cert)
 {
     struct sigctx *sigctx = ctx;
@@ -1423,7 +1423,7 @@ sig_process(hx509_context context, void *ctx, hx509_cert cert)
     return ret;
 }
 
-static int
+static int HX509_LIB_CALL
 cert_process(hx509_context context, void *ctx, hx509_cert cert)
 {
     struct sigctx *sigctx = ctx;
diff --git a/lib/hx509/hxtool.c b/lib/hx509/hxtool.c
index e686a6080..ea8e6217f 100644
--- a/lib/hx509/hxtool.c
+++ b/lib/hx509/hxtool.c
@@ -330,7 +330,7 @@ cms_verify_sd(struct cms_verify_sd_options *opt, int argc, char **argv)
     return 0;
 }
 
-static int
+static int HX509_LIB_CALL
 print_signer(hx509_context contextp, void *ctx, hx509_cert cert)
 {
     hx509_pem_header **header = ctx;
@@ -693,7 +693,7 @@ struct print_s {
     int verbose;
 };
 
-static int
+static int HX509_LIB_CALL
 print_f(hx509_context hxcontext, void *ctx, hx509_cert cert)
 {
     struct print_s *s = ctx;
@@ -740,7 +740,7 @@ pcert_print(struct print_options *opt, int argc, char **argv)
 }
 
 
-static int
+static int HX509_LIB_CALL
 validate_f(hx509_context hxcontext, void *ctx, hx509_cert c)
 {
     hx509_validate_cert(hxcontext, ctx, c);
@@ -827,7 +827,7 @@ struct verify {
     int count;
 };
 
-static int
+static int HX509_LIB_CALL
 verify_f(hx509_context hxcontext, void *ctx, hx509_cert c)
 {
     struct verify *v = ctx;
@@ -1178,7 +1178,7 @@ revoke_print(struct revoke_print_options *opt, int argc, char **argv)
  *
  */
 
-static int
+static int HX509_LIB_CALL
 verify_o(hx509_context hxcontext, void *ctx, hx509_cert c)
 {
     heim_octet_string *os = ctx;
@@ -2073,7 +2073,7 @@ hxtool_ca(struct certificate_sign_options *opt, int argc, char **argv)
     return 0;
 }
 
-static int
+static int HX509_LIB_CALL
 test_one_cert(hx509_context hxcontext, void *ctx, hx509_cert cert)
 {
     heim_octet_string sd, c;
diff --git a/lib/hx509/keyset.c b/lib/hx509/keyset.c
index fb7dcb8b7..7d35d1c2a 100644
--- a/lib/hx509/keyset.c
+++ b/lib/hx509/keyset.c
@@ -338,7 +338,7 @@ hx509_certs_end_seq(hx509_context context,
 HX509_LIB_FUNCTION int HX509_LIB_CALL
 hx509_certs_iter_f(hx509_context context,
 		   hx509_certs certs,
-		   int (*func)(hx509_context, void *, hx509_cert),
+		   int (HX509_LIB_CALL *func)(hx509_context, void *, hx509_cert),
 		   void *ctx)
 {
     hx509_cursor cursor;
@@ -600,7 +600,7 @@ hx509_certs_filter(hx509_context context,
 }
 
 
-static int
+static int HX509_LIB_CALL
 certs_merge_func(hx509_context context, void *ctx, hx509_cert c)
 {
     return hx509_certs_add(context, (hx509_certs)ctx, c);
diff --git a/lib/hx509/ks_file.c b/lib/hx509/ks_file.c
index 7e957004d..9add061d7 100644
--- a/lib/hx509/ks_file.c
+++ b/lib/hx509/ks_file.c
@@ -528,7 +528,7 @@ struct store_ctx {
     outformat format;
 };
 
-static int
+static int HX509_LIB_CALL
 store_func(hx509_context context, void *ctx, hx509_cert c)
 {
     struct store_ctx *sc = ctx;
diff --git a/lib/hx509/ks_p12.c b/lib/hx509/ks_p12.c
index 73ee2c893..f7b93a9ec 100644
--- a/lib/hx509/ks_p12.c
+++ b/lib/hx509/ks_p12.c
@@ -486,7 +486,7 @@ addBag(hx509_context context,
     return 0;
 }
 
-static int
+static int HX509_LIB_CALL
 store_func(hx509_context context, void *ctx, hx509_cert c)
 {
     PKCS12_AuthenticatedSafe *as = ctx;
diff --git a/lib/hx509/print.c b/lib/hx509/print.c
index 31d3d1812..65aa57ad0 100644
--- a/lib/hx509/print.c
+++ b/lib/hx509/print.c
@@ -93,7 +93,7 @@ Time2string(const Time *T, char **str)
  * @ingroup hx509_print
  */
 
-HX509_LIB_FUNCTION void HX509_LIB_CALL
+HX509_LIB_FUNCTION void
 hx509_print_stdout(void *ctx, const char *fmt, va_list va)
 {
     FILE *f = ctx;
diff --git a/lib/hx509/revoke.c b/lib/hx509/revoke.c
index 6d47d573c..b4d93c3a5 100644
--- a/lib/hx509/revoke.c
+++ b/lib/hx509/revoke.c
@@ -891,7 +891,7 @@ struct ocsp_add_ctx {
     hx509_cert parent;
 };
 
-static int
+static int HX509_LIB_CALL
 add_to_req(hx509_context context, void *ptr, hx509_cert cert)
 {
     struct ocsp_add_ctx *ctx = ptr;
@@ -1477,7 +1477,7 @@ hx509_crl_free(hx509_context context, hx509_crl *crl)
     *crl = NULL;
 }
 
-static int
+static int HX509_LIB_CALL
 add_revoked(hx509_context context, void *ctx, hx509_cert cert)
 {
     TBSCRLCertList *c = ctx;
diff --git a/lib/hx509/softp11.c b/lib/hx509/softp11.c
index 5c86afd30..0a1445ba5 100644
--- a/lib/hx509/softp11.c
+++ b/lib/hx509/softp11.c
@@ -418,7 +418,7 @@ struct foo {
     char *id;
 };
 
-static int
+static int HX509_LIB_CALL
 add_cert(hx509_context hxctx, void *ctx, hx509_cert cert)
 {
     static char empty[] = "";
diff --git a/lib/kadm5/chpass_s.c b/lib/kadm5/chpass_s.c
index 8277886f5..dfbc91b00 100644
--- a/lib/kadm5/chpass_s.c
+++ b/lib/kadm5/chpass_s.c
@@ -46,7 +46,7 @@ struct chpass_principal_hook_ctx {
     const char *password;
 };
 
-static krb5_error_code
+static krb5_error_code KRB5_LIB_CALL
 chpass_principal_hook_cb(krb5_context context,
 			 const void *hook,
 			 void *hookctx,
diff --git a/lib/kadm5/create_s.c b/lib/kadm5/create_s.c
index b8332db65..82d4a925f 100644
--- a/lib/kadm5/create_s.c
+++ b/lib/kadm5/create_s.c
@@ -111,7 +111,7 @@ struct create_principal_hook_ctx {
     const char *password;
 };
 
-static krb5_error_code
+static krb5_error_code KRB5_LIB_CALL
 create_principal_hook_cb(krb5_context context,
 			 const void *hook,
 			 void *hookctx,
diff --git a/lib/kadm5/delete_s.c b/lib/kadm5/delete_s.c
index 465081bd2..5fa0df855 100644
--- a/lib/kadm5/delete_s.c
+++ b/lib/kadm5/delete_s.c
@@ -42,7 +42,7 @@ struct delete_principal_hook_ctx {
     krb5_const_principal princ;
 };
 
-static krb5_error_code
+static krb5_error_code KRB5_LIB_CALL
 delete_principal_hook_cb(krb5_context context,
 			 const void *hook,
 			 void *hookctx,
diff --git a/lib/kadm5/modify_s.c b/lib/kadm5/modify_s.c
index 91b5905f5..e0ce5d976 100644
--- a/lib/kadm5/modify_s.c
+++ b/lib/kadm5/modify_s.c
@@ -43,7 +43,7 @@ struct modify_principal_hook_ctx {
     uint32_t mask;
 };
 
-static krb5_error_code
+static krb5_error_code KRB5_LIB_CALL
 modify_principal_hook_cb(krb5_context context,
 			 const void *hook,
 			 void *hookctx,
diff --git a/lib/kadm5/prune_s.c b/lib/kadm5/prune_s.c
index f786e9249..0bad91102 100644
--- a/lib/kadm5/prune_s.c
+++ b/lib/kadm5/prune_s.c
@@ -42,7 +42,7 @@ struct prune_principal_hook_ctx {
     int kvno;
 };
 
-static krb5_error_code
+static krb5_error_code KRB5_LIB_CALL
 prune_principal_hook_cb(krb5_context context,
 			const void *hook,
 			void *hookctx,
diff --git a/lib/kadm5/randkey_s.c b/lib/kadm5/randkey_s.c
index 1a32e4406..94082040b 100644
--- a/lib/kadm5/randkey_s.c
+++ b/lib/kadm5/randkey_s.c
@@ -42,7 +42,7 @@ struct randkey_principal_hook_ctx {
     krb5_const_principal princ;
 };
 
-static krb5_error_code
+static krb5_error_code KRB5_LIB_CALL
 randkey_principal_hook_cb(krb5_context context,
 			 const void *hook,
 			 void *hookctx,
diff --git a/lib/kadm5/rename_s.c b/lib/kadm5/rename_s.c
index d34d34025..58a608e50 100644
--- a/lib/kadm5/rename_s.c
+++ b/lib/kadm5/rename_s.c
@@ -42,7 +42,7 @@ struct rename_principal_hook_ctx {
     krb5_const_principal source, target;
 };
 
-static krb5_error_code
+static krb5_error_code KRB5_LIB_CALL
 rename_principal_hook_cb(krb5_context context,
 			 const void *hook,
 			 void *hookctx,
diff --git a/lib/kadm5/sample_hook.c b/lib/kadm5/sample_hook.c
index 763258bb1..03ac32b46 100644
--- a/lib/kadm5/sample_hook.c
+++ b/lib/kadm5/sample_hook.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, AuriStor, Inc.
+ * Copyright (c) 2018-2019, AuriStor, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -261,7 +261,7 @@ kadm5_hook_plugin_load(krb5_context context,
 		       size_t *num_hooks,
 		       const kadm5_hook_ftable *const **hooks);
 
-static uintptr_t
+static uintptr_t KRB5_LIB_CALL
 sample_hook_get_instance(const char *libname)
 {
     if (strcmp(libname, "kadm5") == 0)
diff --git a/lib/kadm5/server_hooks.c b/lib/kadm5/server_hooks.c
index 2d4f78f12..79a4af126 100644
--- a/lib/kadm5/server_hooks.c
+++ b/lib/kadm5/server_hooks.c
@@ -83,7 +83,7 @@ _kadm5_s_free_hooks(kadm5_server_context *ctx)
     _krb5_unload_plugins(ctx->context, "kadm5");
 }
 
-uintptr_t
+uintptr_t KRB5_LIB_CALL
 kadm5_get_instance(const char *libname)
 {
     static const char *instance = "libkadm5";
diff --git a/lib/kadm5/setkey3_s.c b/lib/kadm5/setkey3_s.c
index 7f371d680..713affcd6 100644
--- a/lib/kadm5/setkey3_s.c
+++ b/lib/kadm5/setkey3_s.c
@@ -45,7 +45,7 @@ struct setkey_principal_hook_ctx {
     krb5_keyblock *keys;
 };
 
-static krb5_error_code
+static krb5_error_code KRB5_LIB_CALL
 setkey_principal_hook_cb(krb5_context context,
 			 const void *hook,
 			 void *hookctx,
diff --git a/lib/krb5/pkinit.c b/lib/krb5/pkinit.c
index 0adb65e7a..953b55046 100644
--- a/lib/krb5/pkinit.c
+++ b/lib/krb5/pkinit.c
@@ -232,7 +232,7 @@ create_signature(krb5_context context,
     return 0;
 }
 
-static int
+static int KRB5_LIB_CALL
 cert2epi(hx509_context context, void *ctx, hx509_cert c)
 {
     ExternalPrincipalIdentifiers *ids = ctx;