diff --git a/imap/ctl_conversationsdb.c b/imap/ctl_conversationsdb.c
index 5f9789f997..f6584c6b5b 100644
--- a/imap/ctl_conversationsdb.c
+++ b/imap/ctl_conversationsdb.c
@@ -930,7 +930,7 @@ static int usage(const char *name)
     exit(EX_USAGE);
 }
 
-void fatal(const char* s, int code)
+EXPORTED void fatal(const char* s, int code)
 {
     fprintf(stderr, "ctl_conversationsdb: %s\n", s);
     cyrus_done();
diff --git a/imap/httpd.c b/imap/httpd.c
index 3e5f277bfa..61b5050d58 100644
--- a/imap/httpd.c
+++ b/imap/httpd.c
@@ -1066,7 +1066,7 @@ void shut_down(int code)
 }
 
 
-void fatal(const char* s, int code)
+EXPORTED void fatal(const char* s, int code)
 {
     static int recurse_code = 0;
     const char *fatal = "Fatal error: ";
diff --git a/imap/icu_wrap.cpp b/imap/icu_wrap.cpp
index 6ea805bcc2..60b4c92a0a 100644
--- a/imap/icu_wrap.cpp
+++ b/imap/icu_wrap.cpp
@@ -51,7 +51,7 @@ extern "C" {
 #include <unicode/unistr.h>
 #include <unicode/timezone.h>
 
-extern "C" char *icu_getIDForWindowsID(const char *id)
+extern "C" EXPORTED char *icu_getIDForWindowsID(const char *id)
 {
     UErrorCode status = U_ZERO_ERROR;
 
diff --git a/imap/message_test.c b/imap/message_test.c
index f0c1eed367..e5479812c5 100644
--- a/imap/message_test.c
+++ b/imap/message_test.c
@@ -307,7 +307,7 @@ static int usage(const char *name)
     exit(EX_USAGE);
 }
 
-void fatal(const char* s, int code)
+EXPORTED void fatal(const char* s, int code)
 {
     fprintf(stderr, "message_test: %s\n", s);
     cyrus_done();
diff --git a/imap/search_test.c b/imap/search_test.c
index 1899da3000..0558981e1d 100644
--- a/imap/search_test.c
+++ b/imap/search_test.c
@@ -328,7 +328,7 @@ static int usage(const char *name)
     exit(EX_USAGE);
 }
 
-void fatal(const char* s, int code)
+EXPORTED void fatal(const char* s, int code)
 {
     fprintf(stderr, "search_test: %s\n", s);
     cyrus_done();
diff --git a/imap/xapian_wrap.cpp b/imap/xapian_wrap.cpp
index 50f278609b..09f706dd08 100644
--- a/imap/xapian_wrap.cpp
+++ b/imap/xapian_wrap.cpp
@@ -1258,7 +1258,7 @@ EXPORTED int xapian_filter(const char *dest, const char **sources,
     return r;
 }
 
-const char *xapian_version_string()
+EXPORTED const char *xapian_version_string()
 {
     return Xapian::version_string();
 }