diff --git a/include/boost/regex/config.hpp b/include/boost/regex/config.hpp
index 7b4211db..a4717e0b 100644
--- a/include/boost/regex/config.hpp
+++ b/include/boost/regex/config.hpp
@@ -3,12 +3,12 @@
  * Copyright (c) 1998-2002
  * Dr John Maddock
  *
- * Use, modification and distribution are subject to the 
- * Boost Software License, Version 1.0. (See accompanying file 
+ * Use, modification and distribution are subject to the
+ * Boost Software License, Version 1.0. (See accompanying file
  * LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  *
  */
- 
+
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         config.hpp
@@ -218,8 +218,8 @@ namespace boost{ typedef wchar_t regex_wchar_type; }
 #ifndef BOOST_REGEX_DECL
 #  define BOOST_REGEX_DECL
 #endif
- 
-#if (defined(BOOST_MSVC) || defined(__BORLANDC__)) && !defined(BOOST_REGEX_NO_LIB) && !defined(BOOST_REGEX_SOURCE) && !defined(BOOST_ALL_NO_LIB)
+
+#if (defined(BOOST_MSVC) || defined(__BORLANDC__)) && !defined(BOOST_REGEX_NO_LIB) && !defined(BOOST_REGEX_SOURCE) && !defined(BOOST_ALL_NO_LIB) && defined(__cplusplus)
 #  define BOOST_LIB_NAME boost_regex
 #  if defined(BOOST_REGEX_DYN_LINK) || defined(BOOST_ALL_DYN_LINK)
 #     define BOOST_DYN_LINK
@@ -245,7 +245,7 @@ namespace boost{ typedef wchar_t regex_wchar_type; }
 #  define BOOST_REGEX_CCALL __cdecl
 #endif
 
-#if defined(__BORLANDC__)
+#if defined(__BORLANDC__) && !defined(BOOST_DISABLE_WIN32)
 #  define BOOST_REGEX_CALL __fastcall
 #  define BOOST_REGEX_CCALL __stdcall
 #endif
@@ -392,7 +392,7 @@ public:
  ****************************************************************************/
 
 #if !defined(BOOST_REGEX_NO_W32) && !defined(BOOST_REGEX_V3)
-#  if(defined(_WIN32) || defined(_WIN64) || defined(_WINCE)) && !defined(__GNUC__)
+#  if(defined(_WIN32) || defined(_WIN64) || defined(_WINCE)) && !defined(__GNUC__) && !(__BORLANDC__ >= 0x600)
 #     define BOOST_REGEX_HAS_MS_STACK_GUARD
 #  endif
 #elif defined(BOOST_REGEX_HAS_MS_STACK_GUARD)
@@ -401,7 +401,7 @@ public:
 
 #if defined(__cplusplus) && defined(BOOST_REGEX_HAS_MS_STACK_GUARD)
 
-namespace boost{ 
+namespace boost{
 namespace re_detail{
 
 BOOST_REGEX_DECL void BOOST_REGEX_CALL reset_stack_guard_page();
@@ -420,16 +420,16 @@ BOOST_REGEX_DECL void BOOST_REGEX_CALL reset_stack_guard_page();
 
 #if defined(__cplusplus)
 
-namespace boost{ 
+namespace boost{
 namespace re_detail{
 
 BOOST_REGEX_DECL void BOOST_REGEX_CALL raise_regex_exception(const std::string& s);
 
 template <class traits>
 void raise_error(const traits& t, unsigned code)
-{ 
+{
    (void)t;  // warning suppression
-   raise_regex_exception(t.error_string(code)); 
+   raise_regex_exception(t.error_string(code));
 }
 
 }
@@ -584,7 +584,7 @@ BOOST_REGEX_DECL void BOOST_REGEX_CALL put_mem_block(void*);
 #ifdef BOOST_REGEX_CONFIG_INFO
 BOOST_REGEX_DECL void BOOST_REGEX_CALL print_regex_library_info();
 #endif
- 
+
 #if defined(BOOST_REGEX_DIAG)
 #  pragma message ("BOOST_REGEX_DECL set as: " BOOST_STRINGIZE(BOOST_REGEX_DECL))
 #  pragma message ("BOOST_REGEX_CALL set as: " BOOST_STRINGIZE(BOOST_REGEX_CALL))
diff --git a/include/boost/regex/v4/char_regex_traits.hpp b/include/boost/regex/v4/char_regex_traits.hpp
index f3108499..67cc3677 100644
--- a/include/boost/regex/v4/char_regex_traits.hpp
+++ b/include/boost/regex/v4/char_regex_traits.hpp
@@ -3,8 +3,8 @@
  * Copyright (c) 2002
  * Dr John Maddock
  *
- * Use, modification and distribution are subject to the 
- * Boost Software License, Version 1.0. (See accompanying file 
+ * Use, modification and distribution are subject to the
+ * Boost Software License, Version 1.0. (See accompanying file
  * LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  *
  */
@@ -20,8 +20,8 @@
 #ifndef BOOST_REGEX_V4_CHAR_REGEX_TRAITS_HPP
 #define BOOST_REGEX_V4_CHAR_REGEX_TRAITS_HPP
 
-#ifdef __BORLANDC__
-   #pragma option push -a8 -b -Vx -Ve -pc -w-8027
+#ifdef BOOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_PREFIX
 #endif
 
 namespace boost{
@@ -74,8 +74,8 @@ public:
 } // namespace deprecated
 } // namespace boost
 
-#ifdef __BORLANDC__
-#  pragma option pop
+#ifdef BOOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_SUFFIX
 #endif
 
 #endif // include
diff --git a/include/boost/regex/v4/cregex.hpp b/include/boost/regex/v4/cregex.hpp
index c3af7fb1..15c92b52 100644
--- a/include/boost/regex/v4/cregex.hpp
+++ b/include/boost/regex/v4/cregex.hpp
@@ -3,12 +3,12 @@
  * Copyright (c) 1998-2002
  * Dr John Maddock
  *
- * Use, modification and distribution are subject to the 
- * Boost Software License, Version 1.0. (See accompanying file 
+ * Use, modification and distribution are subject to the
+ * Boost Software License, Version 1.0. (See accompanying file
  * LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  *
  */
- 
+
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         cregex.cpp
@@ -189,7 +189,7 @@ struct pred4;
 
 }  // namespace re_detail
 
-#if defined(BOOST_MSVC) || defined(__BORLANDC__)
+#if (defined(BOOST_MSVC) || defined(__BORLANDC__)) && !defined(BOOST_DISABLE_WIN32)
 typedef bool (__cdecl *GrepCallback)(const RegEx& expression);
 typedef bool (__cdecl *GrepFileCallback)(const char* file, const RegEx& expression);
 typedef bool (__cdecl *FindFilesCallback)(const char* file);
diff --git a/include/boost/regex/v4/instances.hpp b/include/boost/regex/v4/instances.hpp
index bea8a219..e7ab8c1a 100644
--- a/include/boost/regex/v4/instances.hpp
+++ b/include/boost/regex/v4/instances.hpp
@@ -3,8 +3,8 @@
  * Copyright (c) 1998-2002
  * Dr John Maddock
  *
- * Use, modification and distribution are subject to the 
- * Boost Software License, Version 1.0. (See accompanying file 
+ * Use, modification and distribution are subject to the
+ * Boost Software License, Version 1.0. (See accompanying file
  * LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  *
  */
@@ -37,7 +37,7 @@ namespace boost{
 // what follows is compiler specific:
 //
 
-#ifdef __BORLANDC__
+#if  defined(__BORLANDC__) && (__BORLANDC__ < 0x600)
 
 #ifdef BOOST_HAS_ABI_HEADERS
 #  include BOOST_ABI_PREFIX
@@ -83,7 +83,7 @@ template class BOOST_REGEX_DECL reg_expression< BOOST_REGEX_CHAR_T >;
 } // namespace boost
 
 #endif // BOOST_REGEX_NO_EXTERNAL_TEMPLATES
- 
+