diff --git a/core/include/boost/mpl/aux_/is_same.hpp b/core/include/boost/mpl/aux_/is_same.hpp
deleted file mode 100644
index 92e763c..0000000
--- a/core/include/boost/mpl/aux_/is_same.hpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef BOOST_MPL_AUX_IS_SAME_HPP_INCLUDED
-#define BOOST_MPL_AUX_IS_SAME_HPP_INCLUDED
-
-// Copyright Andrey Semashev 2014
-//
-// Distributed under 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)
-//
-// See http://www.boost.org/libs/mpl for documentation.
-
-// $Id$
-// $Date$
-// $Revision$
-
-#include <boost/mpl/bool.hpp>
-
-namespace boost { namespace mpl { namespace aux {
-
-template< typename T, typename U >
-struct is_same : mpl::false_ {};
-
-template< typename T >
-struct is_same< T, T > : mpl::true_ {};
-
-}}}
-
-#endif // BOOST_MPL_AUX_IS_SAME_HPP_INCLUDED
diff --git a/core/include/boost/mpl/aux_/test.hpp b/core/include/boost/mpl/aux_/test.hpp
index 7d2c284..887e81f 100644
--- a/core/include/boost/mpl/aux_/test.hpp
+++ b/core/include/boost/mpl/aux_/test.hpp
@@ -17,7 +17,6 @@
 #include <boost/mpl/aux_/test/test_case.hpp>
 #include <boost/mpl/aux_/test/data.hpp>
 #include <boost/mpl/aux_/test/assert.hpp>
-#include <boost/mpl/aux_/is_same.hpp>
 #include <boost/detail/lightweight_test.hpp>
 
 int main()
@@ -27,6 +26,5 @@ int main()
 
 using namespace boost;
 using namespace mpl;
-using boost::mpl::aux_::is_same;
 
 #endif // BOOST_MPL_AUX_TEST_HPP_INCLUDED
diff --git a/core/test/aux_/largest_int.cpp b/core/test/aux_/largest_int.cpp
index d9a6fd3..2dc4c9a 100644
--- a/core/test/aux_/largest_int.cpp
+++ b/core/test/aux_/largest_int.cpp
@@ -13,6 +13,7 @@
 
 #include <boost/mpl/aux_/largest_int.hpp>
 #include <boost/mpl/aux_/test.hpp>
+#include <boost/type_traits/is_same.hpp>
 
 
 MPL_TEST_CASE()
diff --git a/core/test/bool.cpp b/core/test/bool.cpp
index e023c0c..a6fb44f 100644
--- a/core/test/bool.cpp
+++ b/core/test/bool.cpp
@@ -13,6 +13,7 @@
 
 #include <boost/mpl/bool.hpp>
 #include <boost/mpl/aux_/test.hpp>
+#include <boost/type_traits/is_same.hpp>
 
 #include <cassert>
 
diff --git a/core/test/identity.cpp b/core/test/identity.cpp
index db14735..e594de6 100644
--- a/core/test/identity.cpp
+++ b/core/test/identity.cpp
@@ -14,6 +14,7 @@
 #include <boost/mpl/apply.hpp>
 #include <boost/mpl/identity.hpp>
 #include <boost/mpl/aux_/test.hpp>
+#include <boost/type_traits/is_same.hpp>
 
 MPL_TEST_CASE()
 {
diff --git a/core/test/if.cpp b/core/test/if.cpp
index df32b6a..a10eb8c 100644
--- a/core/test/if.cpp
+++ b/core/test/if.cpp
@@ -14,6 +14,7 @@
 #include <boost/mpl/if.hpp>
 #include <boost/mpl/bool.hpp>
 #include <boost/mpl/aux_/test.hpp>
+#include <boost/type_traits/is_same.hpp>
 
 MPL_TEST_CASE()
 {
diff --git a/core/test/integral_wrapper_test.hpp b/core/test/integral_wrapper_test.hpp
index be31d50..c7e3ff4 100644
--- a/core/test/integral_wrapper_test.hpp
+++ b/core/test/integral_wrapper_test.hpp
@@ -14,6 +14,7 @@
 #include <boost/mpl/next_prior.hpp>
 #include <boost/mpl/aux_/test.hpp>
 #include <boost/mpl/aux_/config/workaround.hpp>
+#include <boost/type_traits/is_same.hpp>
 
 #include <cassert>
 
diff --git a/core/test/min_max.cpp b/core/test/min_max.cpp
index 02ead23..bd6fc10 100644
--- a/core/test/min_max.cpp
+++ b/core/test/min_max.cpp
@@ -15,6 +15,7 @@
 #include <boost/mpl/int.hpp>
 
 #include <boost/mpl/aux_/test.hpp>
+#include <boost/type_traits/is_same.hpp>
 
 
 MPL_TEST_CASE()
diff --git a/test/advance.cpp b/test/advance.cpp
index e174ae4..aa1ead4 100644
--- a/test/advance.cpp
+++ b/test/advance.cpp
@@ -15,6 +15,8 @@
 #include <boost/mpl/iterator_tags.hpp>
 #include <boost/mpl/aux_/test.hpp>
 
+#include <boost/type_traits/is_same.hpp>
+
 template< int pos > struct iter
 {
     typedef mpl::bidirectional_iterator_tag category;
diff --git a/test/apply.cpp b/test/apply.cpp
index 6ee8e78..f0122d1 100644
--- a/test/apply.cpp
+++ b/test/apply.cpp
@@ -17,6 +17,8 @@
 #include <boost/mpl/int.hpp>
 #include <boost/mpl/aux_/test.hpp>
 
+#include <boost/type_traits/is_same.hpp>
+
 
 template< typename T > struct std_vector
 {
diff --git a/test/apply_wrap.cpp b/test/apply_wrap.cpp
index 9c45f2e..13625d0 100644
--- a/test/apply_wrap.cpp
+++ b/test/apply_wrap.cpp
@@ -16,6 +16,7 @@
 #include <boost/mpl/aux_/preprocessor/params.hpp>
 #include <boost/mpl/aux_/preprocessor/enum.hpp>
 #include <boost/mpl/aux_/test.hpp>
+#include <boost/type_traits/is_same.hpp>
 
 #include <boost/preprocessor/repeat.hpp>
 #include <boost/preprocessor/comma_if.hpp>
diff --git a/test/at.cpp b/test/at.cpp
index 4b30eda..850fa6f 100644
--- a/test/at.cpp
+++ b/test/at.cpp
@@ -14,11 +14,12 @@
 #include <boost/mpl/at.hpp>
 #include <boost/mpl/vector/vector10_c.hpp>
 #include <boost/mpl/aux_/test.hpp>
+#include <boost/type_traits/is_same.hpp>
 
 template< typename Seq, int n > struct at_test
 {
     typedef typename at_c<Seq,n>::type t;
-    MPL_ASSERT(( is_same< t, integral_c<int,9-n> > ));
+    MPL_ASSERT(( boost::is_same< t, integral_c<int,9-n> > ));
     MPL_ASSERT_RELATION( t::value, ==, 9 - n );
 };
 
diff --git a/test/bind.cpp b/test/bind.cpp
index 2a2de62..2fe6af9 100644
--- a/test/bind.cpp
+++ b/test/bind.cpp
@@ -21,6 +21,7 @@
 #include <boost/mpl/aux_/test.hpp>
 
 #include <boost/type_traits/is_float.hpp>
+#include <boost/type_traits/is_same.hpp>
 
 namespace {
 
diff --git a/test/deque.cpp b/test/deque.cpp
index 4ac747c..c133260 100644
--- a/test/deque.cpp
+++ b/test/deque.cpp
@@ -23,6 +23,7 @@
 
 #include <boost/mpl/aux_/test.hpp>
 
+#include <boost/type_traits/is_same.hpp>
 
 MPL_TEST_CASE()
 {
@@ -41,12 +42,12 @@ MPL_TEST_CASE()
     MPL_ASSERT_NOT(( empty<d2> ));
     MPL_ASSERT_NOT(( empty<d9> ));
 
-    MPL_ASSERT(( is_same< front<d1>::type,char > ));
-    MPL_ASSERT(( is_same< back<d1>::type,char > ));
-    MPL_ASSERT(( is_same< front<d2>::type,char > ));
-    MPL_ASSERT(( is_same< back<d2>::type,long > ));
-    MPL_ASSERT(( is_same< front<d9>::type,char > ));
-    MPL_ASSERT(( is_same< back<d9>::type,int > ));
+    MPL_ASSERT(( boost::is_same< front<d1>::type,char > ));
+    MPL_ASSERT(( boost::is_same< back<d1>::type,char > ));
+    MPL_ASSERT(( boost::is_same< front<d2>::type,char > ));
+    MPL_ASSERT(( boost::is_same< back<d2>::type,long > ));
+    MPL_ASSERT(( boost::is_same< front<d9>::type,char > ));
+    MPL_ASSERT(( boost::is_same< back<d9>::type,int > ));
 }
 
 
@@ -58,9 +59,9 @@ MPL_TEST_CASE()
     typedef next<i1>::type  i2;
     typedef next<i2>::type  i3;
     
-    MPL_ASSERT(( is_same<deref<i1>::type,char> ));
-    MPL_ASSERT(( is_same<deref<i2>::type,long> ));
-    MPL_ASSERT(( is_same< i3, end<d2>::type > ));
+    MPL_ASSERT(( boost::is_same<deref<i1>::type,char> ));
+    MPL_ASSERT(( boost::is_same<deref<i2>::type,long> ));
+    MPL_ASSERT(( boost::is_same< i3, end<d2>::type > ));
 }
 
 MPL_TEST_CASE()
@@ -68,14 +69,14 @@ MPL_TEST_CASE()
     typedef deque<> d0;
 
     typedef push_back<d0,int>::type d1;
-    MPL_ASSERT(( is_same< back<d1>::type,int > ));
+    MPL_ASSERT(( boost::is_same< back<d1>::type,int > ));
 
     typedef push_front<d1,char>::type d2;
-    MPL_ASSERT(( is_same< back<d2>::type,int > ));
-    MPL_ASSERT(( is_same< front<d2>::type,char > ));
+    MPL_ASSERT(( boost::is_same< back<d2>::type,int > ));
+    MPL_ASSERT(( boost::is_same< front<d2>::type,char > ));
 
     typedef push_back<d2,long>::type d3;
-    MPL_ASSERT(( is_same< back<d3>::type,long > ));
+    MPL_ASSERT(( boost::is_same< back<d3>::type,long > ));
 }
 
 MPL_TEST_CASE()
diff --git a/test/erase.cpp b/test/erase.cpp
index ca5b411..6c90b90 100644
--- a/test/erase.cpp
+++ b/test/erase.cpp
@@ -20,6 +20,8 @@
 #include <boost/mpl/begin_end.hpp>
 #include <boost/mpl/aux_/test.hpp>
 
+#include <boost/type_traits/is_same.hpp>
+
 MPL_TEST_CASE()
 {
     typedef list<int,char,long,short,char,long,double,long> types;
diff --git a/test/erase_range.cpp b/test/erase_range.cpp
index 5e14c81..b8f456d 100644
--- a/test/erase_range.cpp
+++ b/test/erase_range.cpp
@@ -17,6 +17,7 @@
 #include <boost/mpl/size.hpp>
 #include <boost/mpl/begin_end.hpp>
 #include <boost/mpl/aux_/test.hpp>
+#include <boost/type_traits/is_same.hpp>
 
 MPL_TEST_CASE()
 {
diff --git a/test/find.cpp b/test/find.cpp
index a45d521..0a01599 100644
--- a/test/find.cpp
+++ b/test/find.cpp
@@ -18,6 +18,7 @@
 #include <boost/mpl/begin_end.hpp>
 #include <boost/mpl/int.hpp>
 #include <boost/mpl/aux_/test.hpp>
+#include <boost/type_traits/is_same.hpp>
 
 MPL_TEST_CASE()
 {    
diff --git a/test/inherit.cpp b/test/inherit.cpp
index 4b16adc..57f72c1 100644
--- a/test/inherit.cpp
+++ b/test/inherit.cpp
@@ -13,6 +13,7 @@
 
 #include <boost/mpl/inherit.hpp>
 #include <boost/mpl/aux_/test.hpp>
+#include <boost/type_traits/is_same.hpp>
 
 struct her { typedef her herself; };
 struct my { typedef my myself; };
diff --git a/test/joint_view.cpp b/test/joint_view.cpp
index f71958a..abc9051 100644
--- a/test/joint_view.cpp
+++ b/test/joint_view.cpp
@@ -19,6 +19,8 @@
 #include <boost/mpl/size.hpp>
 #include <boost/mpl/aux_/test.hpp>
 
+#include <boost/type_traits/is_same.hpp>
+
 
 MPL_TEST_CASE()
 {
diff --git a/test/lambda_args.cpp b/test/lambda_args.cpp
index fdd2620..0df6b86 100644
--- a/test/lambda_args.cpp
+++ b/test/lambda_args.cpp
@@ -17,6 +17,8 @@
 #include <boost/mpl/aux_/config/gcc.hpp>
 #include <boost/mpl/aux_/config/workaround.hpp>
 
+#include <boost/type_traits/is_same.hpp>
+
 typedef int UDT::* mem_ptr;
 typedef int (UDT::* mem_fun_ptr)();
 
diff --git a/test/list.cpp b/test/list.cpp
index 655905a..78da46f 100644
--- a/test/list.cpp
+++ b/test/list.cpp
@@ -20,6 +20,8 @@
 
 #include <boost/mpl/aux_/test.hpp>
 
+#include <boost/type_traits/is_same.hpp>
+
 
 MPL_TEST_CASE()
 {
diff --git a/test/list_c.cpp b/test/list_c.cpp
index 7683fda..3d28058 100644
--- a/test/list_c.cpp
+++ b/test/list_c.cpp
@@ -18,6 +18,8 @@
 
 #include <boost/mpl/aux_/test.hpp>
 
+#include <boost/type_traits/is_same.hpp>
+
 
 #if !BOOST_WORKAROUND(BOOST_MSVC,<= 1200)
 MPL_TEST_CASE()
diff --git a/test/multiset.cpp b/test/multiset.cpp
index 48a6176..8c31e3f 100644
--- a/test/multiset.cpp
+++ b/test/multiset.cpp
@@ -23,6 +23,7 @@
 #include <boost/mpl/find.hpp>
 
 #include <boost/config.hpp>
+#include <boost/type_traits/is_same.hpp>
 
 /*
 struct test_data1
diff --git a/test/next.cpp b/test/next.cpp
index d7356c7..3da997e 100644
--- a/test/next.cpp
+++ b/test/next.cpp
@@ -15,6 +15,7 @@
 #include <boost/mpl/prior.hpp>
 #include <boost/mpl/int.hpp>
 #include <boost/mpl/aux_/test.hpp>
+#include <boost/type_traits/is_same.hpp>
 
 MPL_TEST_CASE()
 {
diff --git a/test/pair_view.cpp b/test/pair_view.cpp
index 937ff42..af2a0cc 100644
--- a/test/pair_view.cpp
+++ b/test/pair_view.cpp
@@ -17,6 +17,7 @@
 #include <boost/mpl/range_c.hpp>
 #include <boost/mpl/distance.hpp>
 #include <boost/mpl/aux_/test.hpp>
+#include <boost/type_traits/is_same.hpp>
 
 
 MPL_TEST_CASE()
diff --git a/test/pop_front.cpp b/test/pop_front.cpp
index 71512c1..70fe120 100644
--- a/test/pop_front.cpp
+++ b/test/pop_front.cpp
@@ -16,6 +16,7 @@
 #include <boost/mpl/size.hpp>
 #include <boost/mpl/front.hpp>
 #include <boost/mpl/aux_/test.hpp>
+#include <boost/type_traits/is_same.hpp>
 
 MPL_TEST_CASE()
 {
diff --git a/test/push_back.cpp b/test/push_back.cpp
index bdf7a92..1e75cad 100644
--- a/test/push_back.cpp
+++ b/test/push_back.cpp
@@ -15,6 +15,8 @@
 
 #include <boost/mpl/aux_/test.hpp>
 
+#include <boost/type_traits/is_same.hpp>
+
 struct no_push_back_tag {};
 
 struct no_push_back
diff --git a/test/push_front.cpp b/test/push_front.cpp
index f5edc2f..3307824 100644
--- a/test/push_front.cpp
+++ b/test/push_front.cpp
@@ -20,6 +20,8 @@
 
 #include <boost/mpl/aux_/test.hpp>
 
+#include <boost/type_traits/is_same.hpp>
+
 struct no_push_front_tag {};
 
 struct no_push_front
diff --git a/test/range_c.cpp b/test/range_c.cpp
index 90c32cc..7241bbe 100644
--- a/test/range_c.cpp
+++ b/test/range_c.cpp
@@ -19,6 +19,7 @@
 #include <boost/mpl/front.hpp>
 #include <boost/mpl/back.hpp>
 #include <boost/mpl/aux_/test.hpp>
+#include <boost/type_traits/is_same.hpp>
 
 MPL_TEST_CASE()
 {
diff --git a/test/set.cpp b/test/set.cpp
index ab291d9..fac17ae 100644
--- a/test/set.cpp
+++ b/test/set.cpp
@@ -31,6 +31,7 @@
 
 #include <boost/mpl/aux_/test.hpp>
 
+#include <boost/type_traits/is_same.hpp>
 
 // Use templates for testing so that GCC will show us the actual types involved
 
diff --git a/test/set_c.cpp b/test/set_c.cpp
index e34d86d..0c54c94 100644
--- a/test/set_c.cpp
+++ b/test/set_c.cpp
@@ -18,6 +18,8 @@
 
 #include <boost/mpl/aux_/test.hpp>
 
+#include <boost/type_traits/is_same.hpp>
+
 namespace test { namespace {
 #if !BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
 template< typename S, typename S::value_type k > 
diff --git a/test/single_view.cpp b/test/single_view.cpp
index c46096e..d860fa5 100644
--- a/test/single_view.cpp
+++ b/test/single_view.cpp
@@ -16,6 +16,7 @@
 #include <boost/mpl/size.hpp>
 #include <boost/mpl/begin_end.hpp>
 #include <boost/mpl/aux_/test.hpp>
+#include <boost/type_traits/is_same.hpp>
 
 MPL_TEST_CASE()
 {
diff --git a/test/transform.cpp b/test/transform.cpp
index 8df17f2..274e36f 100644
--- a/test/transform.cpp
+++ b/test/transform.cpp
@@ -23,6 +23,7 @@
 #include <boost/mpl/aux_/config/gcc.hpp>
 #include <boost/mpl/aux_/config/workaround.hpp>
 
+#include <boost/type_traits/is_same.hpp>
 #include <boost/type_traits/add_pointer.hpp>
 
 
diff --git a/test/vector.cpp b/test/vector.cpp
index e1f6e0c..8632399 100644
--- a/test/vector.cpp
+++ b/test/vector.cpp
@@ -25,6 +25,8 @@
 
 #include <boost/mpl/aux_/test.hpp>
 
+#include <boost/type_traits/is_same.hpp>
+
 
 MPL_TEST_CASE()
 {
diff --git a/test/vector_c.cpp b/test/vector_c.cpp
index fbff9ea..49afa9f 100644
--- a/test/vector_c.cpp
+++ b/test/vector_c.cpp
@@ -17,6 +17,8 @@
 
 #include <boost/mpl/aux_/test.hpp>
 
+#include <boost/type_traits/is_same.hpp>
+
 #if !BOOST_WORKAROUND(BOOST_MSVC, <=1200)
 MPL_TEST_CASE()
 {