diff --git a/src/c_regex_traits.cpp b/src/c_regex_traits.cpp
index caa72396..a55dc831 100644
--- a/src/c_regex_traits.cpp
+++ b/src/c_regex_traits.cpp
@@ -381,7 +381,7 @@ void BOOST_REGEX_CALL re_message_free()
 const char* BOOST_REGEX_CALL re_get_error_str(unsigned int id)
 {
    BOOST_RE_GUARD_STACK
-#ifdef BOOST_RE_THREADS
+#ifdef BOOST_HAS_THREADS
    boost::re_detail::cs_guard g(*boost::re_detail::p_re_lock);
 #endif
    if(re_custom_error_messages[id] == 0)
@@ -576,7 +576,7 @@ c_regex_traits<char> c_regex_traits<char>::i;
 void BOOST_REGEX_CALL c_regex_traits<char>::init()
 {
    BOOST_RE_GUARD_STACK
-#ifdef BOOST_RE_THREADS
+#ifdef BOOST_HAS_THREADS
    re_detail::re_init_threads();
    re_detail::cs_guard g(*re_detail::p_re_lock);
 #endif
@@ -602,7 +602,7 @@ void BOOST_REGEX_CALL c_regex_traits<char>::init()
 void BOOST_REGEX_CALL c_regex_traits<char>::update()
 {
    BOOST_RE_GUARD_STACK
-   #ifdef BOOST_RE_THREADS
+   #ifdef BOOST_HAS_THREADS
    re_detail::cs_guard g(*re_detail::p_re_lock);
    #endif
    re_message_update();
@@ -622,7 +622,7 @@ void BOOST_REGEX_CALL c_regex_traits<char>::update()
 void BOOST_REGEX_CALL c_regex_traits<char>::m_free()
 {
    BOOST_RE_GUARD_STACK
-   #ifdef BOOST_RE_THREADS
+   #ifdef BOOST_HAS_THREADS
    re_detail::cs_guard g(*re_detail::p_re_lock);
    #endif
    re_message_free();
@@ -634,7 +634,7 @@ void BOOST_REGEX_CALL c_regex_traits<char>::m_free()
       delete ctype_name;
       delete collate_name;
    }
-#ifdef BOOST_RE_THREADS
+#ifdef BOOST_HAS_THREADS
    g.acquire(false);
    re_detail::re_free_threads();
 #endif
@@ -746,7 +746,7 @@ void BOOST_REGEX_CALL c_regex_traits<wchar_t>::init()
 {
    BOOST_RE_GUARD_STACK
    re_detail::re_init_threads();
-#ifdef BOOST_RE_THREADS
+#ifdef BOOST_HAS_THREADS
    re_detail::cs_guard g(*re_detail::p_re_lock);
 #endif
    re_message_init();
@@ -790,7 +790,7 @@ bool BOOST_REGEX_CALL c_regex_traits<wchar_t>::do_lookup_collate(std::basic_stri
 void BOOST_REGEX_CALL c_regex_traits<wchar_t>::update()
 {
    BOOST_RE_GUARD_STACK
-#ifdef BOOST_RE_THREADS
+#ifdef BOOST_HAS_THREADS
    re_detail::cs_guard g(*re_detail::p_re_lock);
 #endif
    re_message_update();
@@ -841,7 +841,7 @@ void BOOST_REGEX_CALL c_regex_traits<wchar_t>::update()
 void BOOST_REGEX_CALL c_regex_traits<wchar_t>::m_free()
 {
    BOOST_RE_GUARD_STACK
-#ifdef BOOST_RE_THREADS
+#ifdef BOOST_HAS_THREADS
    re_detail::cs_guard g(*re_detail::p_re_lock);
 #endif
    --nlsw_count;
@@ -854,7 +854,7 @@ void BOOST_REGEX_CALL c_regex_traits<wchar_t>::m_free()
       delete wlocale_name;
       delete syntax;
    }
-#ifdef BOOST_RE_THREADS
+#ifdef BOOST_HAS_THREADS
    g.acquire(false);
    re_detail::re_free_threads();
 #endif
diff --git a/src/cregex.cpp b/src/cregex.cpp
index 39e5ba3e..8de9ddeb 100644
--- a/src/cregex.cpp
+++ b/src/cregex.cpp
@@ -25,7 +25,7 @@
 
 #include <boost/cregex.hpp>
 #include <boost/regex.hpp>
-#if !defined(BOOST_RE_NO_STRING_H)
+#if !defined(BOOST_NO_STD_STRING)
 #include <map>
 #include <list>
 #include <boost/regex/detail/fileiter.hpp>
diff --git a/src/regex.cpp b/src/regex.cpp
index d69bb415..733f2836 100644
--- a/src/regex.cpp
+++ b/src/regex.cpp
@@ -45,7 +45,7 @@ regbase::regbase(const regbase& b)
 
 } // namespace boost
 
-#if defined(BOOST_RE_USE_VCL) && defined(BOOST_RE_BUILD_DLL)
+#if defined(BOOST_RE_USE_VCL) && defined(BOOST_REGEX_BUILD_DLL)
 
 int WINAPI DllEntryPoint(HINSTANCE , unsigned long , void*)
 {
diff --git a/src/w32_regex_traits.cpp b/src/w32_regex_traits.cpp
index 90fe8ab8..dab7e7fa 100644
--- a/src/w32_regex_traits.cpp
+++ b/src/w32_regex_traits.cpp
@@ -199,7 +199,7 @@ unsigned int BOOST_REGEX_CALL _re_get_message(char* buf, unsigned int len, unsig
 const char* BOOST_REGEX_CALL re_get_error_str(unsigned int id)
 {
    BOOST_RE_GUARD_STACK
-#ifdef BOOST_RE_THREADS
+#ifdef BOOST_HAS_THREADS
    boost::re_detail::cs_guard g(*boost::re_detail::p_re_lock);
 #endif
    if(re_custom_error_messages[id] == 0)
@@ -441,7 +441,7 @@ bool BOOST_REGEX_CALL w32_traits_base::do_lookup_collate(std::string& buf, const
 std::string BOOST_REGEX_CALL w32_traits_base::set_message_catalogue(const std::string& l)
 {
    BOOST_RE_GUARD_STACK
-   #ifdef BOOST_RE_THREADS
+   #ifdef BOOST_HAS_THREADS
    re_detail::cs_guard g(*re_detail::p_re_lock);
    #endif
    if(sizeof(regex_message_catalogue) <= l.size())
@@ -462,7 +462,7 @@ w32_regex_traits<char> w32_regex_traits<char>::i;
 void BOOST_REGEX_CALL w32_regex_traits<char>::update()
 {
    BOOST_RE_GUARD_STACK
-   #ifdef BOOST_RE_THREADS
+   #ifdef BOOST_HAS_THREADS
    re_detail::cs_guard g(*re_detail::p_re_lock);
    #endif
    do_init();
@@ -471,7 +471,7 @@ void BOOST_REGEX_CALL w32_regex_traits<char>::update()
 w32_regex_traits<char>::w32_regex_traits()
 {
    BOOST_RE_GUARD_STACK
-   #ifdef BOOST_RE_THREADS
+   #ifdef BOOST_HAS_THREADS
    re_detail::re_init_threads();
    re_detail::cs_guard g(*re_detail::p_re_lock);
    #endif
@@ -481,12 +481,12 @@ w32_regex_traits<char>::w32_regex_traits()
 w32_regex_traits<char>::~w32_regex_traits()
 {
    BOOST_RE_GUARD_STACK
-#ifdef BOOST_RE_THREADS
+#ifdef BOOST_HAS_THREADS
    re_detail::cs_guard g(*re_detail::p_re_lock);
 #endif
    if(--entry_count == 0)
       do_free();
-#ifdef BOOST_RE_THREADS
+#ifdef BOOST_HAS_THREADS
    g.acquire(false);
    re_detail::re_free_threads();
 #endif
@@ -629,7 +629,7 @@ bool BOOST_REGEX_CALL w32_regex_traits<wchar_t>::do_lookup_collate(std::basic_st
 void BOOST_REGEX_CALL w32_regex_traits<wchar_t>::update()
 {
    BOOST_RE_GUARD_STACK
-#ifdef BOOST_RE_THREADS
+#ifdef BOOST_HAS_THREADS
    re_detail::cs_guard g(*re_detail::p_re_lock);
 #endif
    do_init();
@@ -638,7 +638,7 @@ void BOOST_REGEX_CALL w32_regex_traits<wchar_t>::update()
 w32_regex_traits<wchar_t>::w32_regex_traits()
 {
    BOOST_RE_GUARD_STACK
-#ifdef BOOST_RE_THREADS
+#ifdef BOOST_HAS_THREADS
    re_detail::re_init_threads();
    re_detail::cs_guard g(*re_detail::p_re_lock);
 #endif
@@ -648,12 +648,12 @@ w32_regex_traits<wchar_t>::w32_regex_traits()
 w32_regex_traits<wchar_t>::~w32_regex_traits()
 {
    BOOST_RE_GUARD_STACK
-#ifdef BOOST_RE_THREADS
+#ifdef BOOST_HAS_THREADS
    re_detail::cs_guard g(*re_detail::p_re_lock);
 #endif
    if(--entry_count == 0)
       do_free();
-#ifdef BOOST_RE_THREADS
+#ifdef BOOST_HAS_THREADS
    g.acquire(false);
    re_detail::re_free_threads();
 #endif
diff --git a/src/wide_posix_api.cpp b/src/wide_posix_api.cpp
index ae453ecb..0841708d 100644
--- a/src/wide_posix_api.cpp
+++ b/src/wide_posix_api.cpp
@@ -28,7 +28,7 @@
 
 #include <boost/regex.hpp>
 
-#ifndef BOOST_RE_NO_WCHAR_H
+#ifndef BOOST_NO_WREGEX
 #include <cwchar>
 #endif
 #include <cstring>