diff --git a/include/boost/optional/detail/old_optional_implementation.hpp b/include/boost/optional/detail/old_optional_implementation.hpp
index f8dc260..3431e15 100644
--- a/include/boost/optional/detail/old_optional_implementation.hpp
+++ b/include/boost/optional/detail/old_optional_implementation.hpp
@@ -79,7 +79,7 @@ class optional_base : public optional_tag
   private :
 
     typedef
-#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+#if !BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
     BOOST_DEDUCED_TYPENAME
 #endif
     ::boost::detail::make_reference_content<T>::type internal_type ;
@@ -619,7 +619,7 @@ class optional_base : public optional_tag
     reference_const_type dereference( internal_type const* p, is_reference_tag     ) const { return p->get() ; }
     reference_type       dereference( internal_type*       p, is_reference_tag     )       { return p->get() ; }
 
-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x581))
+#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x581))
     void destroy_impl ( is_not_reference_tag ) { get_ptr_impl()->internal_type::~internal_type() ; m_initialized = false ; }
 #else
     void destroy_impl ( is_not_reference_tag ) { get_ptr_impl()->~T() ; m_initialized = false ; }
diff --git a/include/boost/optional/detail/optional_config.hpp b/include/boost/optional/detail/optional_config.hpp
index bb7e12f..73f2505 100644
--- a/include/boost/optional/detail/optional_config.hpp
+++ b/include/boost/optional/detail/optional_config.hpp
@@ -28,7 +28,7 @@
 # define BOOST_OPTIONAL_NO_INPLACE_FACTORY_SUPPORT
 #endif
 
-#if BOOST_WORKAROUND(__BORLANDC__, <= 0x551)
+#if BOOST_WORKAROUND(BOOST_BORLANDC, <= 0x551)
 // BCB (5.5.1) cannot parse the nested template struct in an inplace factory.
 # define BOOST_OPTIONAL_NO_INPLACE_FACTORY_SUPPORT
 #endif
diff --git a/test/optional_ref_assign_test_defs.hpp b/test/optional_ref_assign_test_defs.hpp
index 1b2a1b0..7185ff4 100644
--- a/test/optional_ref_assign_test_defs.hpp
+++ b/test/optional_ref_assign_test_defs.hpp
@@ -13,7 +13,7 @@
 
 #include "boost/optional/optional.hpp"
 
-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif
 
diff --git a/test/optional_test.cpp b/test/optional_test.cpp
index 3354430..a0fa5a6 100644
--- a/test/optional_test.cpp
+++ b/test/optional_test.cpp
@@ -24,7 +24,7 @@
 
 #include "boost/optional/optional.hpp"
 
-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif
 
diff --git a/test/optional_test_conversions_from_U.cpp b/test/optional_test_conversions_from_U.cpp
index 57d8215..309cb86 100644
--- a/test/optional_test_conversions_from_U.cpp
+++ b/test/optional_test_conversions_from_U.cpp
@@ -11,7 +11,7 @@
 
 #include "boost/optional/optional.hpp"
 
-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif
 
diff --git a/test/optional_test_convert_from_T.cpp b/test/optional_test_convert_from_T.cpp
index 6d4c2ff..bfa1a0a 100644
--- a/test/optional_test_convert_from_T.cpp
+++ b/test/optional_test_convert_from_T.cpp
@@ -11,7 +11,7 @@
 
 #include "boost/optional/optional.hpp"
 
-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif
 
diff --git a/test/optional_test_emplace.cpp b/test/optional_test_emplace.cpp
index 36972d3..d44e1d1 100644
--- a/test/optional_test_emplace.cpp
+++ b/test/optional_test_emplace.cpp
@@ -11,7 +11,7 @@
 
 #include "boost/optional/optional.hpp"
 
-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif
 
diff --git a/test/optional_test_empty_braces.cpp b/test/optional_test_empty_braces.cpp
index 593a68f..273d81d 100644
--- a/test/optional_test_empty_braces.cpp
+++ b/test/optional_test_empty_braces.cpp
@@ -11,7 +11,7 @@
 
 #include "boost/optional/optional.hpp"
 
-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif
 
diff --git a/test/optional_test_equals_none.cpp b/test/optional_test_equals_none.cpp
index 1c8c5d8..1e3157b 100644
--- a/test/optional_test_equals_none.cpp
+++ b/test/optional_test_equals_none.cpp
@@ -11,7 +11,7 @@
 
 #include "boost/optional/optional.hpp"
 
-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif
 
diff --git a/test/optional_test_experimental_traits.cpp b/test/optional_test_experimental_traits.cpp
index 8093056..5088b4a 100644
--- a/test/optional_test_experimental_traits.cpp
+++ b/test/optional_test_experimental_traits.cpp
@@ -11,7 +11,7 @@
 
 #include "boost/optional/optional.hpp"
 
-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif
 
diff --git a/test/optional_test_flat_map.cpp b/test/optional_test_flat_map.cpp
index 409e111..a6b2b13 100644
--- a/test/optional_test_flat_map.cpp
+++ b/test/optional_test_flat_map.cpp
@@ -11,7 +11,7 @@
 
 #include "boost/optional/optional.hpp"
 
-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif
 
diff --git a/test/optional_test_inplace_factory.cpp b/test/optional_test_inplace_factory.cpp
index 1e852f0..b1624f6 100644
--- a/test/optional_test_inplace_factory.cpp
+++ b/test/optional_test_inplace_factory.cpp
@@ -13,7 +13,7 @@
 #include<string>
 #include "boost/optional/optional.hpp"
 
-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif
 
diff --git a/test/optional_test_inplace_fail.cpp b/test/optional_test_inplace_fail.cpp
index bb7c26f..38722ba 100644
--- a/test/optional_test_inplace_fail.cpp
+++ b/test/optional_test_inplace_fail.cpp
@@ -13,7 +13,7 @@
 #include<string>
 #include "boost/optional/optional.hpp"
 
-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif
 
diff --git a/test/optional_test_inplace_fail2.cpp b/test/optional_test_inplace_fail2.cpp
index e6a0004..ad4cedd 100644
--- a/test/optional_test_inplace_fail2.cpp
+++ b/test/optional_test_inplace_fail2.cpp
@@ -13,7 +13,7 @@
 #include<string>
 #include "boost/optional/optional.hpp"
 
-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif
 
diff --git a/test/optional_test_io.cpp b/test/optional_test_io.cpp
index 9dab619..14c2b26 100644
--- a/test/optional_test_io.cpp
+++ b/test/optional_test_io.cpp
@@ -14,7 +14,7 @@
 #include "boost/optional/optional.hpp"
 #include "boost/optional/optional_io.hpp"
 
-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif
 
diff --git a/test/optional_test_make_optional.cpp b/test/optional_test_make_optional.cpp
index 8230c19..be271bd 100644
--- a/test/optional_test_make_optional.cpp
+++ b/test/optional_test_make_optional.cpp
@@ -11,7 +11,7 @@
 
 #include "boost/optional/optional.hpp"
 
-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif
 
diff --git a/test/optional_test_map.cpp b/test/optional_test_map.cpp
index 288249c..3c1617b 100644
--- a/test/optional_test_map.cpp
+++ b/test/optional_test_map.cpp
@@ -11,7 +11,7 @@
 
 #include "boost/optional/optional.hpp"
 
-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif
 
diff --git a/test/optional_test_maybe_uninitialized_warning.cpp b/test/optional_test_maybe_uninitialized_warning.cpp
index a9a0707..7660ece 100644
--- a/test/optional_test_maybe_uninitialized_warning.cpp
+++ b/test/optional_test_maybe_uninitialized_warning.cpp
@@ -11,7 +11,7 @@
 
 #include "boost/optional/optional.hpp"
 
-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif
 
diff --git a/test/optional_test_member_T.cpp b/test/optional_test_member_T.cpp
index 325838d..c31fedb 100644
--- a/test/optional_test_member_T.cpp
+++ b/test/optional_test_member_T.cpp
@@ -11,7 +11,7 @@
 
 #include "boost/optional/optional.hpp"
 
-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif
 
diff --git a/test/optional_test_minimum_requirements.cpp b/test/optional_test_minimum_requirements.cpp
index 77ef1fc..1e22735 100644
--- a/test/optional_test_minimum_requirements.cpp
+++ b/test/optional_test_minimum_requirements.cpp
@@ -11,7 +11,7 @@
 
 #include "boost/optional/optional.hpp"
 
-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif
 
diff --git a/test/optional_test_move.cpp b/test/optional_test_move.cpp
index 1558c34..f27cd99 100644
--- a/test/optional_test_move.cpp
+++ b/test/optional_test_move.cpp
@@ -12,7 +12,7 @@
 
 #include "boost/optional/optional.hpp"
 
-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif
 
diff --git a/test/optional_test_msvc_bug_workaround.cpp b/test/optional_test_msvc_bug_workaround.cpp
index 30f3b02..126e885 100644
--- a/test/optional_test_msvc_bug_workaround.cpp
+++ b/test/optional_test_msvc_bug_workaround.cpp
@@ -12,7 +12,7 @@
 #define BOOST_OPTIONAL_CONFIG_NO_RVALUE_REFERENCES
 #include "boost/optional/optional.hpp"
 
-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif
 
diff --git a/test/optional_test_noexcept_move.cpp b/test/optional_test_noexcept_move.cpp
index 0675844..2e270ed 100644
--- a/test/optional_test_noexcept_move.cpp
+++ b/test/optional_test_noexcept_move.cpp
@@ -12,7 +12,7 @@
 #include "boost/static_assert.hpp"
 #include "boost/optional/optional.hpp"
 
-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif
 
diff --git a/test/optional_test_old_impl.cpp b/test/optional_test_old_impl.cpp
index 994d989..f3da56e 100644
--- a/test/optional_test_old_impl.cpp
+++ b/test/optional_test_old_impl.cpp
@@ -12,7 +12,7 @@
 #define BOOST_OPTIONAL_CONFIG_USE_OLD_IMPLEMENTATION_OF_OPTIONAL // does old implementation still work for basic usage?
 #include "boost/optional/optional.hpp"
 
-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif
 
diff --git a/test/optional_test_path_assignment.cpp b/test/optional_test_path_assignment.cpp
index f0c214a..50cda0a 100644
--- a/test/optional_test_path_assignment.cpp
+++ b/test/optional_test_path_assignment.cpp
@@ -11,7 +11,7 @@
 
 #include "boost/optional/optional.hpp"
 
-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif
 
diff --git a/test/optional_test_ref_assign_const_int.cpp b/test/optional_test_ref_assign_const_int.cpp
index a14ef6d..6dddf9e 100644
--- a/test/optional_test_ref_assign_const_int.cpp
+++ b/test/optional_test_ref_assign_const_int.cpp
@@ -11,7 +11,7 @@
 
 #include "boost/optional/optional.hpp"
 
-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif
 
diff --git a/test/optional_test_ref_assign_mutable_int.cpp b/test/optional_test_ref_assign_mutable_int.cpp
index 1c674da..5aa717e 100644
--- a/test/optional_test_ref_assign_mutable_int.cpp
+++ b/test/optional_test_ref_assign_mutable_int.cpp
@@ -11,7 +11,7 @@
 
 #include "boost/optional/optional.hpp"
 
-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif
 
diff --git a/test/optional_test_ref_assign_portable_minimum.cpp b/test/optional_test_ref_assign_portable_minimum.cpp
index 19085d3..31599f3 100644
--- a/test/optional_test_ref_assign_portable_minimum.cpp
+++ b/test/optional_test_ref_assign_portable_minimum.cpp
@@ -11,7 +11,7 @@
 
 #include "boost/optional/optional.hpp"
 
-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif
 
diff --git a/test/optional_test_ref_convert_assign_const_int.cpp b/test/optional_test_ref_convert_assign_const_int.cpp
index fb44aa1..0d6585f 100644
--- a/test/optional_test_ref_convert_assign_const_int.cpp
+++ b/test/optional_test_ref_convert_assign_const_int.cpp
@@ -11,7 +11,7 @@
 
 #include "boost/optional/optional.hpp"
 
-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif
 
diff --git a/test/optional_test_ref_convert_assign_const_int_prevented.cpp b/test/optional_test_ref_convert_assign_const_int_prevented.cpp
index 7690d80..e692475 100644
--- a/test/optional_test_ref_convert_assign_const_int_prevented.cpp
+++ b/test/optional_test_ref_convert_assign_const_int_prevented.cpp
@@ -11,7 +11,7 @@
 
 #include "boost/optional/optional.hpp"
 
-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif
 
diff --git a/test/optional_test_ref_convert_assign_mutable_int.cpp b/test/optional_test_ref_convert_assign_mutable_int.cpp
index 56a6e80..6003c43 100644
--- a/test/optional_test_ref_convert_assign_mutable_int.cpp
+++ b/test/optional_test_ref_convert_assign_mutable_int.cpp
@@ -11,7 +11,7 @@
 
 #include "boost/optional/optional.hpp"
 
-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif
 
diff --git a/test/optional_test_ref_convert_assign_non_int.cpp b/test/optional_test_ref_convert_assign_non_int.cpp
index 80566b2..93d3c3f 100644
--- a/test/optional_test_ref_convert_assign_non_int.cpp
+++ b/test/optional_test_ref_convert_assign_non_int.cpp
@@ -11,7 +11,7 @@
 
 #include "boost/optional/optional.hpp"
 
-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif
 
diff --git a/test/optional_test_ref_converting_ctor.cpp b/test/optional_test_ref_converting_ctor.cpp
index 81f3c0f..6f6517a 100644
--- a/test/optional_test_ref_converting_ctor.cpp
+++ b/test/optional_test_ref_converting_ctor.cpp
@@ -11,7 +11,7 @@
 
 #include "boost/optional/optional.hpp"
 
-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif
 
diff --git a/test/optional_test_ref_move.cpp b/test/optional_test_ref_move.cpp
index 78b7bf2..bf0bcb8 100644
--- a/test/optional_test_ref_move.cpp
+++ b/test/optional_test_ref_move.cpp
@@ -11,7 +11,7 @@
 
 #include "boost/optional/optional.hpp"
 
-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif
 
diff --git a/test/optional_test_ref_portable_minimum.cpp b/test/optional_test_ref_portable_minimum.cpp
index c929c3a..ec5b827 100644
--- a/test/optional_test_ref_portable_minimum.cpp
+++ b/test/optional_test_ref_portable_minimum.cpp
@@ -11,7 +11,7 @@
 
 #include "boost/optional/optional.hpp"
 
-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif
 
diff --git a/test/optional_test_ref_to_val.cpp b/test/optional_test_ref_to_val.cpp
index 19e1675..e93469f 100644
--- a/test/optional_test_ref_to_val.cpp
+++ b/test/optional_test_ref_to_val.cpp
@@ -12,7 +12,7 @@
 
 #include "boost/optional/optional.hpp"
 
-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif
 
diff --git a/test/optional_test_sfinae_friendly_ctor.cpp b/test/optional_test_sfinae_friendly_ctor.cpp
index 87539e1..c13bb2b 100644
--- a/test/optional_test_sfinae_friendly_ctor.cpp
+++ b/test/optional_test_sfinae_friendly_ctor.cpp
@@ -11,7 +11,7 @@
 
 #include "boost/optional/optional.hpp"
 
-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif
 
diff --git a/test/optional_test_static_properties.cpp b/test/optional_test_static_properties.cpp
index c47bfa9..5dc1053 100644
--- a/test/optional_test_static_properties.cpp
+++ b/test/optional_test_static_properties.cpp
@@ -11,7 +11,7 @@
 
 #include "boost/optional/optional.hpp"
 
-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif
 
diff --git a/test/optional_test_swap.cpp b/test/optional_test_swap.cpp
index 2feed25..2294c70 100644
--- a/test/optional_test_swap.cpp
+++ b/test/optional_test_swap.cpp
@@ -17,7 +17,7 @@
 #include "boost/optional/optional.hpp"
 #include "boost/utility/in_place_factory.hpp"
 
-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif
 
diff --git a/test/optional_test_tc_base.cpp b/test/optional_test_tc_base.cpp
index a1d293b..8c78dc0 100644
--- a/test/optional_test_tc_base.cpp
+++ b/test/optional_test_tc_base.cpp
@@ -11,7 +11,7 @@
 
 #include "boost/optional/optional.hpp"
 
-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif
 
diff --git a/test/optional_test_tie.cpp b/test/optional_test_tie.cpp
index b5c5818..1ea34f4 100644
--- a/test/optional_test_tie.cpp
+++ b/test/optional_test_tie.cpp
@@ -12,7 +12,7 @@
 
 #include "boost/optional/optional.hpp"
 
-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif
 
diff --git a/test/optional_test_value_access.cpp b/test/optional_test_value_access.cpp
index 47ec5cc..c11cb42 100644
--- a/test/optional_test_value_access.cpp
+++ b/test/optional_test_value_access.cpp
@@ -11,7 +11,7 @@
 
 #include "boost/optional/optional.hpp"
 
-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif