diff --git a/include/boost/test/tools/assertion.hpp b/include/boost/test/tools/assertion.hpp
index 57f463ff..b8643ed9 100644
--- a/include/boost/test/tools/assertion.hpp
+++ b/include/boost/test/tools/assertion.hpp
@@ -17,6 +17,7 @@
 
 // Boost
 #include <boost/type.hpp>
+#include <boost/type_traits/decay.hpp>
 #include <boost/mpl/assert.hpp>
 #include <boost/utility/declval.hpp>
 #include <boost/type_traits/remove_reference.hpp>
@@ -195,11 +196,11 @@ public:
 
 #define ADD_OP_SUPPORT( oper, name, _ )                         \
     template<typename T>                                        \
-    binary_expr<ExprType,typename decay<T const>::type,         \
-        op::name<ValType,typename decay<T const>::type> >       \
+    binary_expr<ExprType,typename boost::decay<T const>::type,  \
+        op::name<ValType,typename boost::decay<T const>::type> > \
     operator oper( T const& rhs ) const                         \
     {                                                           \
-        typedef typename decay<T const>::type Rhs;              \
+        typedef typename boost::decay<T const>::type Rhs;       \
         return binary_expr<ExprType,Rhs,op::name<ValType,Rhs> > \
             ( *static_cast<ExprType const*>(this),              \
               rhs );                                            \
diff --git a/test/test_assertion_construction.cpp b/test/test_assertion_construction.cpp
index f2bd0be1..7de3c412 100644
--- a/test/test_assertion_construction.cpp
+++ b/test/test_assertion_construction.cpp
@@ -16,6 +16,7 @@
 #define BOOST_TEST_MODULE Boost.Test assertion consruction test
 #include <boost/test/unit_test.hpp>
 #include <boost/test/tools/assertion.hpp>
+#include <boost/test/utils/is_forward_iterable.hpp>
 #ifdef BOOST_NO_CXX11_AUTO_DECLARATIONS
 #include <boost/test/tools/detail/expression_holder.hpp>
 #endif