diff --git a/enable_if.html b/enable_if.html
index 7a00225..2b6ac0a 100644
--- a/enable_if.html
+++ b/enable_if.html
@@ -128,7 +128,7 @@ When valid, <TT>enable_if_c&lt;B, T&gt;::type</TT> equals <TT>T</TT>.
 The <TT>enable_if_c</TT> template can thus be used for controlling when functions are considered for
 overload resolution and when they are not. 
 For example, the following function is defined for all arithmetic types (according to the
-classification of the <A HREF="http://www.boost.org/libs/type_traits">Boost type_traits library</A>):
+classification of the <A HREF="../type_traits/index.html">Boost type_traits library</A>):
 <PRE>template &lt;class T&gt;
 typename enable_if_c&lt;boost::is_arithmetic&lt;T&gt;::value, T&gt;::type 
 foo(T t) { return t; }
diff --git a/ref_ct_test.cpp b/ref_ct_test.cpp
index f072537..a3b5eea 100644
--- a/ref_ct_test.cpp
+++ b/ref_ct_test.cpp
@@ -7,8 +7,12 @@
 // see 'ref_test.cpp' for run-time part
 
 #include <boost/ref.hpp>
-#include <boost/type_traits/same_traits.hpp>
+#include <boost/type_traits/is_same.hpp>
+#include <boost/type_traits/remove_const.hpp>
 #include <boost/static_assert.hpp>
+#include <boost/detail/workaround.hpp>
+
+#include <boost/mpl/assert.hpp>
 
 namespace {
 
@@ -35,13 +39,23 @@ void is_reference_wrapper_test(T)
 template< typename R, typename Ref >
 void cxx_reference_test(Ref)
 {
+#if BOOST_WORKAROUND(__BORLANDC__, < 0x600)
+    typedef typename boost::remove_const<Ref>::type ref;
+    BOOST_STATIC_ASSERT((boost::is_same<R,ref>::value));
+#else
     BOOST_STATIC_ASSERT((boost::is_same<R,Ref>::value));
+#endif
 }
 
 template< typename R, typename Ref >
 void unwrap_reference_test(Ref)
 {
+#if BOOST_WORKAROUND(__BORLANDC__, < 0x600)
+    typedef typename boost::remove_const<Ref>::type ref;
+    typedef typename boost::unwrap_reference<ref>::type type;
+#else
     typedef typename boost::unwrap_reference<Ref>::type type;
+#endif
     BOOST_STATIC_ASSERT((boost::is_same<R,type>::value));
 }