diff --git a/include/boost/regex/regex_traits.hpp b/include/boost/regex/regex_traits.hpp
index 5db8f78d..6e8a946d 100644
--- a/include/boost/regex/regex_traits.hpp
+++ b/include/boost/regex/regex_traits.hpp
@@ -147,7 +147,7 @@ public:
       char_class_print = char_class_alpha | char_class_digit | char_class_punct | char_class_underscore | char_class_blank,
       char_class_word = char_class_alpha | char_class_digit | char_class_underscore
    };
-   static std::string set_message_catalogue(const std::string& s);
+   static std::string BOOST_RE_CALL set_message_catalogue(const std::string& s);
 protected:
 #if defined(__MWERKS__) && __MWERKS__ <= 0x6000
    friend class c_regex_traits<char>;
@@ -169,8 +169,8 @@ protected:
    static void BOOST_RE_CALL do_update_ctype();
    static void BOOST_RE_CALL do_update_collate();
 public:
-   static std::string error_string(unsigned id);
-   static char* get_catalogue() { return regex_message_catalogue; }
+   static std::string BOOST_RE_CALL error_string(unsigned id);
+   static char* BOOST_RE_CALL get_catalogue() { return regex_message_catalogue; }
 };
 
 } // namespace re_detail
@@ -233,7 +233,7 @@ public:
       return do_lookup_collate(buf, s.c_str());
    }
 
-   static locale_type imbue(locale_type l){ return l; }
+   static locale_type BOOST_RE_CALL imbue(locale_type l){ return l; }
    locale_type BOOST_RE_CALL getloc()const{ return locale_type(); }
 
    c_regex_traits()
@@ -250,10 +250,10 @@ public:
       { c_regex_traits<char>::update(); }
       operator void*() { return this; }
    };
-   static void update();
+   static void BOOST_RE_CALL update();
 private:
-   static void init();
-   static void free();
+   static void BOOST_RE_CALL init();
+   static void BOOST_RE_CALL free();
    static c_regex_traits<char> i;
 
    static unsigned sort_type;
@@ -305,7 +305,7 @@ public:
 
    static bool BOOST_RE_CALL lookup_collatename(std::basic_string<wchar_t>& s, const wchar_t* first, const wchar_t* last);
 
-   static locale_type imbue(locale_type l){ return l; }
+   static locale_type BOOST_RE_CALL imbue(locale_type l){ return l; }
    locale_type BOOST_RE_CALL getloc()const{ return locale_type(); }
    c_regex_traits<wchar_t>()
    { init(); }
@@ -374,8 +374,8 @@ protected:
    static void BOOST_RE_CALL do_free();
    static void BOOST_RE_CALL do_init();
 public:
-   static std::string error_string(unsigned id);
-   static char* get_catalogue() { return regex_message_catalogue; }
+   static std::string BOOST_RE_CALL error_string(unsigned id);
+   static char* BOOST_RE_CALL get_catalogue() { return regex_message_catalogue; }
 };
 
 } // namespace re_detail
@@ -440,7 +440,7 @@ public:
       return do_lookup_collate(buf, s.c_str());
    }
 
-   static locale_type imbue(locale_type l){ return l; }
+   static locale_type BOOST_RE_CALL imbue(locale_type l){ return l; }
    locale_type BOOST_RE_CALL getloc()const{ return locale_type(); }
 
    struct sentry
@@ -450,7 +450,7 @@ public:
       ~sentry(){}
       operator void*() { return this; }
    };
-   static void update();
+   static void BOOST_RE_CALL update();
    w32_regex_traits();
    ~w32_regex_traits();
 private:
@@ -502,7 +502,7 @@ public:
 
    static bool BOOST_RE_CALL lookup_collatename(std::basic_string<wchar_t>& s, const wchar_t* first, const wchar_t* last);
 
-   static locale_type imbue(locale_type l){ return l; }
+   static locale_type BOOST_RE_CALL imbue(locale_type l){ return l; }
    locale_type BOOST_RE_CALL getloc()const{ return locale_type(); }
 
    struct sentry
@@ -574,7 +574,7 @@ struct BOOST_RE_IX_DECL cpp_regex_traits_base : public regex_traits_base
                          | char_class_upper | char_class_xdigit
    };
 
-   static std::string set_message_catalogue(const std::string& s);
+   static std::string BOOST_RE_CALL set_message_catalogue(const std::string& s);
 protected:
    static char regex_message_cat[200];
 };
@@ -747,7 +747,7 @@ public:
    cpp_regex_traits();
    ~cpp_regex_traits();
    locale_type BOOST_RE_CALL imbue(locale_type l);
-   locale_type BOOST_RE_CALL BOOST_RE_CALL getloc()const{ return locale_inst; }
+   locale_type BOOST_RE_CALL getloc()const{ return locale_inst; }
    unsigned int BOOST_RE_CALL strwiden(wchar_t *s1, unsigned int len, const char *s2)const;
 
    struct sentry
diff --git a/src/c_regex_traits.cpp b/src/c_regex_traits.cpp
index 0977a31a..62692a55 100644
--- a/src/c_regex_traits.cpp
+++ b/src/c_regex_traits.cpp
@@ -597,7 +597,7 @@ void c_regex_traits<char>::init()
    ++entry_count;
 }
 
-void c_regex_traits<char>::update()
+void BOOST_RE_CALL c_regex_traits<char>::update()
 {
    BOOST_RE_GUARD_STACK
    #ifdef BOOST_RE_THREADS
@@ -617,7 +617,7 @@ void c_regex_traits<char>::update()
    sort_type = re_detail::find_sort_syntax(&i, &sort_delim);
 }
 
-void c_regex_traits<char>::free()
+void BOOST_RE_CALL c_regex_traits<char>::free()
 {
    BOOST_RE_GUARD_STACK
    #ifdef BOOST_RE_THREADS
diff --git a/src/cpp_regex_traits.cpp b/src/cpp_regex_traits.cpp
index 9f2b316c..f56a2037 100644
--- a/src/cpp_regex_traits.cpp
+++ b/src/cpp_regex_traits.cpp
@@ -270,7 +270,7 @@ message_data<char>::message_data(const std::locale& l, const std::string& regex_
 #endif
 }
 
-std::string cpp_regex_traits_base::set_message_catalogue(const std::string& l)
+std::string BOOST_RE_CALL cpp_regex_traits_base::set_message_catalogue(const std::string& l)
 {
    if(sizeof(regex_message_cat) <= l.size())
       return l;
diff --git a/src/w32_regex_traits.cpp b/src/w32_regex_traits.cpp
index d7804849..4bc1b65f 100644
--- a/src/w32_regex_traits.cpp
+++ b/src/w32_regex_traits.cpp
@@ -373,7 +373,7 @@ void BOOST_RE_CALL w32_traits_base::do_free()
    }
 }
 
-std::string w32_traits_base::error_string(unsigned id)
+std::string BOOST_RE_CALL w32_traits_base::error_string(unsigned id)
 {
    return re_get_error_str(id);
 }
@@ -424,7 +424,7 @@ bool BOOST_RE_CALL w32_traits_base::do_lookup_collate(std::string& buf, const ch
    return result;
 }
 
-std::string w32_traits_base::set_message_catalogue(const std::string& l)
+std::string BOOST_RE_CALL w32_traits_base::set_message_catalogue(const std::string& l)
 {
    BOOST_RE_GUARD_STACK
    #ifdef BOOST_RE_THREADS
@@ -445,7 +445,7 @@ char w32_traits_base::lower_case_map[map_size];
 
 w32_regex_traits<char> w32_regex_traits<char>::i;
 
-void w32_regex_traits<char>::update()
+void BOOST_RE_CALL w32_regex_traits<char>::update()
 {
    BOOST_RE_GUARD_STACK
    #ifdef BOOST_RE_THREADS