diff --git a/include/boost/regex/config.hpp b/include/boost/regex/config.hpp
index a221b155..bed485fa 100644
--- a/include/boost/regex/config.hpp
+++ b/include/boost/regex/config.hpp
@@ -144,6 +144,12 @@
 #endif
 #endif
 
+#ifdef BOOST_NORETURN
+#  define BOOST_REGEX_NORETURN BOOST_NORETURN
+#else
+#  define BOOST_REGEX_NORETURN
+#endif
+
 
 /*
 * Define a macro for the namespace that details are placed in, this includes the Boost
diff --git a/include/boost/regex/v5/basic_regex.hpp b/include/boost/regex/v5/basic_regex.hpp
index 04205f7a..18ad5b86 100644
--- a/include/boost/regex/v5/basic_regex.hpp
+++ b/include/boost/regex/v5/basic_regex.hpp
@@ -19,17 +19,6 @@
 #ifndef BOOST_REGEX_V5_BASIC_REGEX_HPP
 #define BOOST_REGEX_V5_BASIC_REGEX_HPP
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 #include <vector>
 
 namespace boost{
@@ -792,15 +781,4 @@ public:
 
 } // namespace boost
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 #endif
diff --git a/include/boost/regex/v5/basic_regex_creator.hpp b/include/boost/regex/v5/basic_regex_creator.hpp
index 4bba6af0..c73bb601 100644
--- a/include/boost/regex/v5/basic_regex_creator.hpp
+++ b/include/boost/regex/v5/basic_regex_creator.hpp
@@ -22,17 +22,6 @@
 
 #include <boost/regex/v5/indexed_bit_flag.hpp>
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 #ifdef BOOST_REGEX_MSVC
 #  pragma warning(push)
 #pragma warning(disable:4459)
@@ -1585,15 +1574,4 @@ void basic_regex_creator<charT, traits>::probe_leading_repeat(re_syntax_base* st
 #  pragma warning(pop)
 #endif
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 #endif
diff --git a/include/boost/regex/v5/basic_regex_parser.hpp b/include/boost/regex/v5/basic_regex_parser.hpp
index 021c53e7..567aab84 100644
--- a/include/boost/regex/v5/basic_regex_parser.hpp
+++ b/include/boost/regex/v5/basic_regex_parser.hpp
@@ -19,20 +19,6 @@
 #ifndef BOOST_REGEX_V5_BASIC_REGEX_PARSER_HPP
 #define BOOST_REGEX_V5_BASIC_REGEX_PARSER_HPP
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#if BOOST_REGEX_MSVC >= 1800
-#pragma warning(disable: 26812)
-#endif
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 namespace boost{
 namespace BOOST_REGEX_DETAIL_NS{
 
@@ -3150,15 +3136,4 @@ bool basic_regex_parser<charT, traits>::unwind_alts(std::ptrdiff_t last_paren_st
 } // namespace BOOST_REGEX_DETAIL_NS
 } // namespace boost
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 #endif
diff --git a/include/boost/regex/v5/c_regex_traits.hpp b/include/boost/regex/v5/c_regex_traits.hpp
index ba425ed4..9de34632 100644
--- a/include/boost/regex/v5/c_regex_traits.hpp
+++ b/include/boost/regex/v5/c_regex_traits.hpp
@@ -23,17 +23,6 @@
 #include <boost/regex/v5/regex_workaround.hpp>
 #include <cctype>
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103 4244)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 namespace boost{
 
    namespace BOOST_REGEX_DETAIL_NS {
@@ -479,17 +468,6 @@ inline int  c_regex_traits<wchar_t>::value(wchar_t c, int radix)
 
 }
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 #endif
 
 
diff --git a/include/boost/regex/v5/char_regex_traits.hpp b/include/boost/regex/v5/char_regex_traits.hpp
index cff34328..aeed86f8 100644
--- a/include/boost/regex/v5/char_regex_traits.hpp
+++ b/include/boost/regex/v5/char_regex_traits.hpp
@@ -20,17 +20,6 @@
 #ifndef BOOST_REGEX_V5_CHAR_REGEX_TRAITS_HPP
 #define BOOST_REGEX_V5_CHAR_REGEX_TRAITS_HPP
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 namespace boost{
 
 namespace deprecated{
@@ -66,16 +55,5 @@ public:
 } // namespace deprecated
 } // namespace boost
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 #endif // include
 
diff --git a/include/boost/regex/v5/cpp_regex_traits.hpp b/include/boost/regex/v5/cpp_regex_traits.hpp
index a37601a9..81af9063 100644
--- a/include/boost/regex/v5/cpp_regex_traits.hpp
+++ b/include/boost/regex/v5/cpp_regex_traits.hpp
@@ -26,37 +26,19 @@
 
 #ifndef BOOST_NO_STD_LOCALE
 
-#ifndef BOOST_RE_PAT_EXCEPT_HPP
 #include <boost/regex/pattern_except.hpp>
-#endif
-#ifndef BOOST_REGEX_TRAITS_DEFAULTS_HPP_INCLUDED
 #include <boost/regex/v5/regex_traits_defaults.hpp>
-#endif
+
 #ifdef BOOST_HAS_THREADS
 #include <mutex>
 #endif
-#ifndef BOOST_REGEX_PRIMARY_TRANSFORM
 #include <boost/regex/v5/primary_transform.hpp>
-#endif
-#ifndef BOOST_REGEX_OBJECT_CACHE_HPP
 #include <boost/regex/v5/object_cache.hpp>
-#endif
 
 #include <climits>
 #include <ios>
 #include <istream>
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 #ifdef BOOST_REGEX_MSVC
 #pragma warning(push)
 #pragma warning(disable:4786 4251)
@@ -1074,17 +1056,6 @@ namespace BOOST_REGEX_DETAIL_NS {
 #pragma warning(pop)
 #endif
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 #endif
 
 #endif
diff --git a/include/boost/regex/v5/cregex.hpp b/include/boost/regex/v5/cregex.hpp
index 71d2fea0..7ffc6659 100644
--- a/include/boost/regex/v5/cregex.hpp
+++ b/include/boost/regex/v5/cregex.hpp
@@ -45,17 +45,6 @@
 #include <stddef.h>
 #endif
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 /* include these defs only for POSIX compatablity */
 #ifdef __cplusplus
 namespace boost{
@@ -197,17 +186,6 @@ BOOST_REGEX_DECL void BOOST_REGEX_CCALL regfreeW(regex_tW*);
 #define regex_t regex_tA
 #endif
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 #ifdef __cplusplus
 } /* extern "C" */
 } /* namespace */
diff --git a/include/boost/regex/v5/iterator_traits.hpp b/include/boost/regex/v5/iterator_traits.hpp
index 1e5b485f..293db6bf 100644
--- a/include/boost/regex/v5/iterator_traits.hpp
+++ b/include/boost/regex/v5/iterator_traits.hpp
@@ -19,17 +19,6 @@
 #ifndef BOOST_REGEX_V5_ITERATOR_TRAITS_HPP
 #define BOOST_REGEX_V5_ITERATOR_TRAITS_HPP
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 namespace boost{
 namespace BOOST_REGEX_DETAIL_NS{
 
@@ -39,16 +28,5 @@ struct regex_iterator_traits : public std::iterator_traits<T> {};
 } // namespace BOOST_REGEX_DETAIL_NS
 } // namespace boost
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 #endif
 
diff --git a/include/boost/regex/v5/match_results.hpp b/include/boost/regex/v5/match_results.hpp
index 70549e83..3f9cd012 100644
--- a/include/boost/regex/v5/match_results.hpp
+++ b/include/boost/regex/v5/match_results.hpp
@@ -19,17 +19,6 @@
 #ifndef BOOST_REGEX_V5_MATCH_RESULTS_HPP
 #define BOOST_REGEX_V5_MATCH_RESULTS_HPP
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 namespace boost{
 #ifdef BOOST_REGEX_MSVC
 #pragma warning(push)
@@ -673,17 +662,6 @@ std::basic_ostream<charT, traits>&
 #endif
 } // namespace boost
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 #endif
 
 
diff --git a/include/boost/regex/v5/mem_block_cache.hpp b/include/boost/regex/v5/mem_block_cache.hpp
index 049d7723..0af4eae1 100644
--- a/include/boost/regex/v5/mem_block_cache.hpp
+++ b/include/boost/regex/v5/mem_block_cache.hpp
@@ -23,10 +23,6 @@
 #include <mutex>
 #endif
 
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-
 #ifndef BOOST_NO_CXX11_HDR_ATOMIC
   #include <atomic>
   #if ATOMIC_POINTER_LOCK_FREE == 2
@@ -175,9 +171,5 @@ inline void  put_mem_block(void* p)
 }
 } // namespace boost
 
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-
 #endif
 
diff --git a/include/boost/regex/v5/pattern_except.hpp b/include/boost/regex/v5/pattern_except.hpp
index d7cc6b82..731aefb6 100644
--- a/include/boost/regex/v5/pattern_except.hpp
+++ b/include/boost/regex/v5/pattern_except.hpp
@@ -30,17 +30,6 @@
 
 namespace boost{
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 #ifdef BOOST_REGEX_MSVC
 #pragma warning(push)
 #pragma warning(disable : 4275)
@@ -88,7 +77,7 @@ typedef regex_error bad_expression;
 
 namespace BOOST_REGEX_DETAIL_NS{
 
-inline void BOOST_REGEX_CALL raise_runtime_error(const std::runtime_error& ex)
+inline void raise_runtime_error(const std::runtime_error& ex)
 {
 #ifndef BOOST_REGEX_STANDALONE
    ::boost::throw_exception(ex);
@@ -111,17 +100,6 @@ void raise_error(const traits& t, regex_constants::error_type code)
 #pragma warning(pop)
 #endif
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 } // namespace boost
 
 #endif
diff --git a/include/boost/regex/v5/perl_matcher.hpp b/include/boost/regex/v5/perl_matcher.hpp
index 072254af..deeffa58 100644
--- a/include/boost/regex/v5/perl_matcher.hpp
+++ b/include/boost/regex/v5/perl_matcher.hpp
@@ -14,17 +14,6 @@
 
 #include <boost/regex/v5/iterator_category.hpp>
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 #ifdef BOOST_REGEX_MSVC
 #  pragma warning(push)
 #pragma warning(disable : 4251 4459)
@@ -575,17 +564,6 @@ private:
 #  pragma warning(pop)
 #endif
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 } // namespace boost
 
 //
diff --git a/include/boost/regex/v5/perl_matcher_common.hpp b/include/boost/regex/v5/perl_matcher_common.hpp
index 7b3fa490..5b29d893 100644
--- a/include/boost/regex/v5/perl_matcher_common.hpp
+++ b/include/boost/regex/v5/perl_matcher_common.hpp
@@ -20,23 +20,6 @@
 #ifndef BOOST_REGEX_V5_PERL_MATCHER_COMMON_HPP
 #define BOOST_REGEX_V5_PERL_MATCHER_COMMON_HPP
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#if BOOST_REGEX_MSVC >= 1800
-#pragma warning(disable: 26812)
-#endif
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
-#ifdef BOOST_BORLANDC
-#  pragma option push -w-8008 -w-8066
-#endif
 #ifdef BOOST_REGEX_MSVC
 #  pragma warning(push)
 #pragma warning(disable:4459)
@@ -928,19 +911,5 @@ bool perl_matcher<BidiIterator, Allocator, traits>::find_restart_lit()
 #  pragma warning(pop)
 #endif
 
-#ifdef BOOST_BORLANDC
-#  pragma option pop
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 #endif
 
diff --git a/include/boost/regex/v5/perl_matcher_non_recursive.hpp b/include/boost/regex/v5/perl_matcher_non_recursive.hpp
index 73bc5993..1d2f0a53 100644
--- a/include/boost/regex/v5/perl_matcher_non_recursive.hpp
+++ b/include/boost/regex/v5/perl_matcher_non_recursive.hpp
@@ -22,16 +22,6 @@
 
 #include <boost/regex/v5/mem_block_cache.hpp>
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
 #ifdef BOOST_REGEX_MSVC
 #  pragma warning(push)
 #  pragma warning(disable: 4706 4459)
@@ -1879,15 +1869,4 @@ bool perl_matcher<BidiIterator, Allocator, traits>::unwind_then(bool b)
 #  pragma warning(pop)
 #endif
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 #endif
diff --git a/include/boost/regex/v5/primary_transform.hpp b/include/boost/regex/v5/primary_transform.hpp
index d494aa98..ed46f392 100644
--- a/include/boost/regex/v5/primary_transform.hpp
+++ b/include/boost/regex/v5/primary_transform.hpp
@@ -20,17 +20,6 @@
 #ifndef BOOST_REGEX_PRIMARY_TRANSFORM
 #define BOOST_REGEX_PRIMARY_TRANSFORM
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 namespace boost{
    namespace BOOST_REGEX_DETAIL_NS{
 
@@ -125,22 +114,7 @@ unsigned find_sort_syntax(const traits* pt, charT* delim)
    } // namespace BOOST_REGEX_DETAIL_NS
 } // namespace boost
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 #endif
 
 
 
-
-
-
-
diff --git a/include/boost/regex/v5/regbase.hpp b/include/boost/regex/v5/regbase.hpp
index 724f4d88..5cefb36b 100644
--- a/include/boost/regex/v5/regbase.hpp
+++ b/include/boost/regex/v5/regbase.hpp
@@ -19,17 +19,6 @@
 #ifndef BOOST_REGEX_V5_REGBASE_HPP
 #define BOOST_REGEX_V5_REGBASE_HPP
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 namespace boost{
 //
 // class regbase
@@ -165,16 +154,5 @@ namespace regex_constants{
 
 } // namespace boost
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 #endif
 
diff --git a/include/boost/regex/v5/regex_format.hpp b/include/boost/regex/v5/regex_format.hpp
index c11953fa..4c82d185 100644
--- a/include/boost/regex/v5/regex_format.hpp
+++ b/include/boost/regex/v5/regex_format.hpp
@@ -26,17 +26,6 @@
 
 namespace boost{
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 //
 // Forward declaration:
 //
@@ -1124,17 +1113,6 @@ inline std::basic_string<typename match_results<Iterator, Allocator>::char_type>
    return m.format(fmt, flags);
 }
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 } // namespace boost
 
 #endif  // BOOST_REGEX_FORMAT_HPP
diff --git a/include/boost/regex/v5/regex_grep.hpp b/include/boost/regex/v5/regex_grep.hpp
index b29ef22e..6cd625d6 100644
--- a/include/boost/regex/v5/regex_grep.hpp
+++ b/include/boost/regex/v5/regex_grep.hpp
@@ -22,17 +22,6 @@
 
 namespace boost{
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 //
 // regex_grep:
 // find all non-overlapping matches within the sequence first last:
@@ -103,17 +92,6 @@ inline unsigned int regex_grep(Predicate foo, const std::basic_string<charT, ST,
    return regex_grep(foo, s.begin(), s.end(), e, flags);
 }
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 } // namespace boost
 
 #endif  // BOOST_REGEX_V5_REGEX_GREP_HPP
diff --git a/include/boost/regex/v5/regex_iterator.hpp b/include/boost/regex/v5/regex_iterator.hpp
index da291f8e..ba74e6de 100644
--- a/include/boost/regex/v5/regex_iterator.hpp
+++ b/include/boost/regex/v5/regex_iterator.hpp
@@ -23,17 +23,6 @@
 
 namespace boost{
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 template <class BidirectionalIterator, 
           class charT,
           class traits>
@@ -178,17 +167,6 @@ inline regex_iterator<typename std::basic_string<charT, ST, SA>::const_iterator,
    return regex_iterator<typename std::basic_string<charT, ST, SA>::const_iterator, charT, traits>(p.begin(), p.end(), e, m);
 }
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 } // namespace boost
 
 #endif // BOOST_REGEX_V5_REGEX_ITERATOR_HPP
diff --git a/include/boost/regex/v5/regex_match.hpp b/include/boost/regex/v5/regex_match.hpp
index f1078db5..21753576 100644
--- a/include/boost/regex/v5/regex_match.hpp
+++ b/include/boost/regex/v5/regex_match.hpp
@@ -24,17 +24,6 @@
 
 namespace boost{
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 //
 // proc regex_match
 // returns true if the specified regular expression matches
@@ -97,35 +86,7 @@ inline bool regex_match(const std::basic_string<charT, ST, SA>& s,
 }
 
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 } // namespace boost
 
 #endif   // BOOST_REGEX_MATCH_HPP
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/include/boost/regex/v5/regex_merge.hpp b/include/boost/regex/v5/regex_merge.hpp
index 3bbd2ff1..a5103c53 100644
--- a/include/boost/regex/v5/regex_merge.hpp
+++ b/include/boost/regex/v5/regex_merge.hpp
@@ -24,17 +24,6 @@
 
 namespace boost{
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 template <class OutputIterator, class Iterator, class traits, class charT>
 inline OutputIterator regex_merge(OutputIterator out,
                          Iterator first,
@@ -75,17 +64,6 @@ inline std::basic_string<charT> regex_merge(const std::basic_string<charT>& s,
    return regex_replace(s, e, fmt, flags);
 }
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 } // namespace boost
 
 #endif  // BOOST_REGEX_V5_REGEX_MERGE_HPP
diff --git a/include/boost/regex/v5/regex_raw_buffer.hpp b/include/boost/regex/v5/regex_raw_buffer.hpp
index e5e9a28a..443c57a2 100644
--- a/include/boost/regex/v5/regex_raw_buffer.hpp
+++ b/include/boost/regex/v5/regex_raw_buffer.hpp
@@ -31,17 +31,6 @@
 namespace boost{
    namespace BOOST_REGEX_DETAIL_NS{
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 struct empty_padding{};
 
 union padding
@@ -217,25 +206,8 @@ inline raw_storage::raw_storage(size_type n)
    last = start + n;
 }
 
-
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 } // namespace BOOST_REGEX_DETAIL_NS
 } // namespace boost
 
 #endif
 
-
-
-
-
-
diff --git a/include/boost/regex/v5/regex_replace.hpp b/include/boost/regex/v5/regex_replace.hpp
index 98ddc16c..75f8894f 100644
--- a/include/boost/regex/v5/regex_replace.hpp
+++ b/include/boost/regex/v5/regex_replace.hpp
@@ -24,17 +24,6 @@
 
 namespace boost{
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 template <class OutputIterator, class BidirectionalIterator, class traits, class charT, class Formatter>
 OutputIterator regex_replace(OutputIterator out,
                          BidirectionalIterator first,
@@ -81,17 +70,6 @@ std::basic_string<charT> regex_replace(const std::basic_string<charT>& s,
    return result;
 }
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 } // namespace boost
 
 #endif  // BOOST_REGEX_V5_REGEX_REPLACE_HPP
diff --git a/include/boost/regex/v5/regex_search.hpp b/include/boost/regex/v5/regex_search.hpp
index bf1d9294..d0addb19 100644
--- a/include/boost/regex/v5/regex_search.hpp
+++ b/include/boost/regex/v5/regex_search.hpp
@@ -22,17 +22,6 @@
 
 namespace boost{
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 template <class BidiIterator, class Allocator, class charT, class traits>
 bool regex_search(BidiIterator first, BidiIterator last, 
                   match_results<BidiIterator, Allocator>& m, 
@@ -107,17 +96,6 @@ inline bool regex_search(const std::basic_string<charT, ST, SA>& s,
    return regex_search(s.begin(), s.end(), e, flags);
 }
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 } // namespace boost
 
 #endif  // BOOST_REGEX_V5_REGEX_SEARCH_HPP
diff --git a/include/boost/regex/v5/regex_split.hpp b/include/boost/regex/v5/regex_split.hpp
index 0bec26c8..8d932896 100644
--- a/include/boost/regex/v5/regex_split.hpp
+++ b/include/boost/regex/v5/regex_split.hpp
@@ -23,17 +23,6 @@
 
 namespace boost{
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 #ifdef BOOST_REGEX_MSVC
 #  pragma warning(push)
 #if BOOST_REGEX_MSVC < 1910
@@ -156,17 +145,6 @@ inline std::size_t regex_split(OutputIterator out,
 #  pragma warning(pop)
 #endif
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 } // namespace boost
 
 #endif
diff --git a/include/boost/regex/v5/regex_token_iterator.hpp b/include/boost/regex/v5/regex_token_iterator.hpp
index 40ebc5e7..98f7d213 100644
--- a/include/boost/regex/v5/regex_token_iterator.hpp
+++ b/include/boost/regex/v5/regex_token_iterator.hpp
@@ -23,19 +23,6 @@
 
 namespace boost{
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#pragma warning(push)
-#pragma warning(disable:4700)
-#endif
-
 template <class BidirectionalIterator,
           class charT,
           class traits>
@@ -259,18 +246,6 @@ inline regex_token_iterator<typename std::basic_string<charT, ST, SA>::const_ite
    return regex_token_iterator<typename std::basic_string<charT, ST, SA>::const_iterator, charT, traits>(p.begin(), p.end(), e, submatch, m);
 }
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 } // namespace boost
 
 #endif // BOOST_REGEX_V5_REGEX_TOKEN_ITERATOR_HPP
diff --git a/include/boost/regex/v5/regex_traits.hpp b/include/boost/regex/v5/regex_traits.hpp
index 2df94b8d..6c64695b 100644
--- a/include/boost/regex/v5/regex_traits.hpp
+++ b/include/boost/regex/v5/regex_traits.hpp
@@ -31,17 +31,6 @@
 #endif
 #include <boost/regex_fwd.hpp>
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 namespace boost{
 
 template <class charT, class implementationT >
@@ -137,16 +126,5 @@ private:
 
 } // namespace boost
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 #endif // include
 
diff --git a/include/boost/regex/v5/regex_traits_defaults.hpp b/include/boost/regex/v5/regex_traits_defaults.hpp
index 38f0491e..f5136b97 100644
--- a/include/boost/regex/v5/regex_traits_defaults.hpp
+++ b/include/boost/regex/v5/regex_traits_defaults.hpp
@@ -19,17 +19,6 @@
 #ifndef BOOST_REGEX_TRAITS_DEFAULTS_HPP_INCLUDED
 #define BOOST_REGEX_TRAITS_DEFAULTS_HPP_INCLUDED
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 #include <boost/regex/config.hpp>
 
 #include <boost/regex/v5/syntax_type.hpp>
@@ -1003,15 +992,4 @@ inline typename std::enable_if<(sizeof(charT) == 1), const charT*>::type get_esc
 } // BOOST_REGEX_DETAIL_NS
 } // boost
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 #endif
diff --git a/include/boost/regex/v5/states.hpp b/include/boost/regex/v5/states.hpp
index 20e630e4..60fc99d0 100644
--- a/include/boost/regex/v5/states.hpp
+++ b/include/boost/regex/v5/states.hpp
@@ -19,17 +19,6 @@
 #ifndef BOOST_REGEX_V5_STATES_HPP
 #define BOOST_REGEX_V5_STATES_HPP
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 namespace boost{
 namespace BOOST_REGEX_DETAIL_NS{
 
@@ -305,17 +294,6 @@ iterator  re_is_set_member(iterator next,
 
 } // namespace boost
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 #endif
 
 
diff --git a/include/boost/regex/v5/sub_match.hpp b/include/boost/regex/v5/sub_match.hpp
index 0b988e5c..aa61b560 100644
--- a/include/boost/regex/v5/sub_match.hpp
+++ b/include/boost/regex/v5/sub_match.hpp
@@ -19,17 +19,6 @@
 #ifndef BOOST_REGEX_V5_SUB_MATCH_HPP
 #define BOOST_REGEX_V5_SUB_MATCH_HPP
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 namespace boost{
 
 template <class BidiIterator>
@@ -389,16 +378,5 @@ std::basic_ostream<charT, traits>&
 
 } // namespace boost
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 #endif
 
diff --git a/include/boost/regex/v5/u32regex_iterator.hpp b/include/boost/regex/v5/u32regex_iterator.hpp
index f47fca74..97d8e799 100644
--- a/include/boost/regex/v5/u32regex_iterator.hpp
+++ b/include/boost/regex/v5/u32regex_iterator.hpp
@@ -21,10 +21,6 @@
 
 namespace boost{
 
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-
 template <class BidirectionalIterator>
 class u32regex_iterator_implementation 
 {
@@ -175,10 +171,6 @@ inline u32regex_iterator<const UChar*> make_u32regex_iterator(const U_NAMESPACE_
    return u32regex_iterator<const UChar*>(s.getBuffer(), s.getBuffer() + s.length(), e, m);
 }
 
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-
 } // namespace boost
 
 #endif // BOOST_REGEX_V5_REGEX_ITERATOR_HPP
diff --git a/include/boost/regex/v5/u32regex_token_iterator.hpp b/include/boost/regex/v5/u32regex_token_iterator.hpp
index 3c2bb3b5..0f3cad5b 100644
--- a/include/boost/regex/v5/u32regex_token_iterator.hpp
+++ b/include/boost/regex/v5/u32regex_token_iterator.hpp
@@ -21,9 +21,6 @@
 
 namespace boost{
 
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
 #ifdef BOOST_REGEX_MSVC
 #  pragma warning(push)
 #  pragma warning(disable:4700)
@@ -305,9 +302,6 @@ inline u32regex_token_iterator<const UChar*> make_u32regex_token_iterator(const
 #ifdef BOOST_REGEX_MSVC
 #  pragma warning(pop)
 #endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
 
 } // namespace boost
 
diff --git a/include/boost/regex/v5/unicode_iterator.hpp b/include/boost/regex/v5/unicode_iterator.hpp
index 026ccf03..07443609 100644
--- a/include/boost/regex/v5/unicode_iterator.hpp
+++ b/include/boost/regex/v5/unicode_iterator.hpp
@@ -119,7 +119,7 @@ inline unsigned utf8_trailing_byte_count(std::uint8_t c)
 #pragma warning(disable:4100)
 #endif
 #ifndef BOOST_NO_EXCEPTIONS
-BOOST_NORETURN
+BOOST_REGEX_NORETURN
 #endif
 inline void invalid_utf32_code_point(std::uint32_t val)
 {
diff --git a/include/boost/regex/v5/w32_regex_traits.hpp b/include/boost/regex/v5/w32_regex_traits.hpp
index 3d082b63..932ce817 100644
--- a/include/boost/regex/v5/w32_regex_traits.hpp
+++ b/include/boost/regex/v5/w32_regex_traits.hpp
@@ -35,17 +35,6 @@
 #pragma comment(lib, "user32.lib")
 #endif
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 #ifdef BOOST_REGEX_MSVC
 #pragma warning(push)
 #pragma warning(disable:4786)
@@ -1180,17 +1169,6 @@ namespace BOOST_REGEX_DETAIL_NS {
 #pragma warning(pop)
 #endif
 
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(push)
-#pragma warning(disable: 4103)
-#endif
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-#ifdef BOOST_REGEX_MSVC
-#pragma warning(pop)
-#endif
-
 #endif // BOOST_REGEX_NO_WIN32_LOCALE
 
 #endif