diff --git a/include/boost/integer.hpp b/include/boost/integer.hpp
index 9fa0019..6db0f76 100644
--- a/include/boost/integer.hpp
+++ b/include/boost/integer.hpp
@@ -137,7 +137,7 @@ namespace boost
   {
      BOOST_STATIC_ASSERT_MSG(Bits <= (int)(sizeof(boost::uintmax_t) * CHAR_BIT),
          "No suitable unsigned integer type with the requested number of bits is available.");
-#if (defined(__BORLANDC__) || defined(__CODEGEAR__)) && defined(BOOST_NO_INTEGRAL_INT64_T)
+#if (defined(BOOST_BORLANDC) || defined(__CODEGEAR__)) && defined(BOOST_NO_INTEGRAL_INT64_T)
      // It's really not clear why this workaround should be needed... shrug I guess!  JM
      BOOST_STATIC_CONSTANT(int, s =
            6 +
@@ -219,7 +219,7 @@ namespace boost
 #endif
   struct uint_value_t
   {
-#if (defined(__BORLANDC__) || defined(__CODEGEAR__))
+#if (defined(BOOST_BORLANDC) || defined(__CODEGEAR__))
      // It's really not clear why this workaround should be needed... shrug I guess!  JM
 #if defined(BOOST_NO_INTEGRAL_INT64_T)
       BOOST_STATIC_CONSTANT(unsigned, which =
diff --git a/include/boost/integer/common_factor_ct.hpp b/include/boost/integer/common_factor_ct.hpp
index 0671d16..dedf660 100644
--- a/include/boost/integer/common_factor_ct.hpp
+++ b/include/boost/integer/common_factor_ct.hpp
@@ -30,7 +30,7 @@ namespace detail
         BOOST_STATIC_CONSTANT( static_gcd_type, new_value1 = Value2 );
         BOOST_STATIC_CONSTANT( static_gcd_type, new_value2 = Value1 % Value2 );
 
-        #ifndef __BORLANDC__
+        #ifndef BOOST_BORLANDC
         #define BOOST_DETAIL_GCD_HELPER_VAL(Value) static_cast<static_gcd_type>(Value)
         #else
         typedef static_gcd_helper_t  self_type;
diff --git a/include/boost/integer/integer_log2.hpp b/include/boost/integer/integer_log2.hpp
index 8b34ce7..0acfa2e 100644
--- a/include/boost/integer/integer_log2.hpp
+++ b/include/boost/integer/integer_log2.hpp
@@ -16,7 +16,7 @@
 #define BOOST_INTEGER_INTEGER_LOG2_HPP
 
 #include <assert.h>
-#ifdef __BORLANDC__
+#if defined(__BORLANDC__) && !defined(__clang__)
 #include <climits>
 #endif
 #include <boost/limits.hpp>
@@ -75,7 +75,7 @@ namespace boost {
   template <typename T>
   struct width {
 
-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
       BOOST_STATIC_CONSTANT(int, value = sizeof(T) * CHAR_BIT);
 #else
       BOOST_STATIC_CONSTANT(int, value = (std::numeric_limits<T>::digits));
diff --git a/include/boost/integer_traits.hpp b/include/boost/integer_traits.hpp
index 94eb00d..aaaeed6 100644
--- a/include/boost/integer_traits.hpp
+++ b/include/boost/integer_traits.hpp
@@ -103,7 +103,7 @@ class integer_traits<wchar_t>
     // library: they are wrong!
 #if defined(WCHAR_MIN) && defined(WCHAR_MAX) && !defined(__APPLE__)
     public detail::integer_traits_base<wchar_t, WCHAR_MIN, WCHAR_MAX>
-#elif defined(__BORLANDC__) || defined(__CYGWIN__) || defined(__MINGW32__) || (defined(__BEOS__) && defined(__GNUC__))
+#elif defined(BOOST_BORLANDC) || defined(__CYGWIN__) || defined(__MINGW32__) || (defined(__BEOS__) && defined(__GNUC__))
     // No WCHAR_MIN and WCHAR_MAX, whar_t is short and unsigned:
     public detail::integer_traits_base<wchar_t, 0, 0xffff>
 #elif (defined(__sgi) && (!defined(__SGI_STL_PORT) || __SGI_STL_PORT < 0x400))\
diff --git a/test/integer_test.cpp b/test/integer_test.cpp
index a79db2d..0cb62e9 100644
--- a/test/integer_test.cpp
+++ b/test/integer_test.cpp
@@ -27,7 +27,7 @@
 #ifdef BOOST_MSVC
 #pragma warning(disable:4127) // conditional expression is constant
 #endif
-#if defined( __BORLANDC__ )
+#if defined( BOOST_BORLANDC )
 # pragma option -w-8008 -w-8066 // condition is always true
 #endif