diff --git a/kuser/kx509.c b/kuser/kx509.c
index a31889e5b..1cd76fcf9 100644
--- a/kuser/kx509.c
+++ b/kuser/kx509.c
@@ -44,7 +44,7 @@ struct validate_store {
     int grace;
 };
 
-static int
+static int KRB5_CALLCONV
 validate1(hx509_context hx509ctx, void *d, hx509_cert cert)
 {
     struct validate_store *v = d;
@@ -111,7 +111,7 @@ validate(krb5_context context,
     hx509_context_free(&hx509ctx);
 }
 
-static krb5_error_code
+static krb5_error_code KRB5_CALLCONV
 add1_2chain(hx509_context hx509ctx, void *d, hx509_cert cert)
 {
     heim_octet_string os;
diff --git a/lib/base/log.c b/lib/base/log.c
index bc987a860..5954716a1 100644
--- a/lib/base/log.c
+++ b/lib/base/log.c
@@ -159,7 +159,7 @@ struct _heimdal_syslog_data{
     int priority;
 };
 
-static void
+static void HEIM_CALLCONV
 log_syslog(heim_context context, const char *timestr,
            const char *msg, void *data)
 {
@@ -167,7 +167,7 @@ log_syslog(heim_context context, const char *timestr,
     syslog(s->priority, "%s", msg);
 }
 
-static void
+static void HEIM_CALLCONV
 close_syslog(void *data)
 {
     free(data);
@@ -209,7 +209,7 @@ struct file_data {
     int freefilename;
 };
 
-static void
+static void HEIM_CALLCONV
 log_file(heim_context context, const char *timestr, const char *msg, void *data)
 {
     struct timeval tv;
@@ -274,7 +274,7 @@ out:
     }
 }
 
-static void
+static void HEIM_CALLCONV
 close_file(void *data)
 {
     struct file_data *f = data;
diff --git a/lib/gssapi/mech/context.c b/lib/gssapi/mech/context.c
index 1e608cd82..74802f796 100644
--- a/lib/gssapi/mech/context.c
+++ b/lib/gssapi/mech/context.c
@@ -231,7 +231,7 @@ gss_mg_set_error_string(gss_OID mech,
 static void *log_ctx = NULL;
 static void (*log_func)(void *ctx, int level, const char *fmt, va_list) = NULL;
 
-void
+void GSSAPI_LIB_CALL
 gss_set_log_function(void *ctx, void (*func)(void * ctx, int level, const char *fmt, va_list))
 {
     if (log_func == NULL) {
diff --git a/lib/krb5/kx509.c b/lib/krb5/kx509.c
index 14ca4df86..e87381bf5 100644
--- a/lib/krb5/kx509.c
+++ b/lib/krb5/kx509.c
@@ -519,7 +519,7 @@ store_kx509_disabled(krb5_context context, const char *realm, krb5_ccache cc)
     krb5_cc_set_config(context, cc, NULL, "kx509_service_status", &data);
 }
 
-static int
+static int KRB5_CALLCONV
 certs_export_func(hx509_context context, void *d, hx509_cert c)
 {
     heim_octet_string os;