diff --git a/include/boost/fusion/sequence/intrinsic/begin.hpp b/include/boost/fusion/sequence/intrinsic/begin.hpp
index 815d9813..79c14d74 100644
--- a/include/boost/fusion/sequence/intrinsic/begin.hpp
+++ b/include/boost/fusion/sequence/intrinsic/begin.hpp
@@ -8,8 +8,8 @@
 #define FUSION_BEGIN_04052005_1132
 
 #include <boost/fusion/support/config.hpp>
-#include <boost/blank.hpp>
 #include <boost/utility/enable_if.hpp>
+#include <boost/mpl/empty_base.hpp>
 #include <boost/mpl/if.hpp>
 #include <boost/fusion/sequence/intrinsic_fwd.hpp>
 #include <boost/fusion/support/tag_of.hpp>
@@ -36,7 +36,7 @@ namespace boost { namespace fusion
               : mpl::if_<
                     traits::is_segmented<Sequence>
                   , detail::segmented_begin<Sequence>
-                  , blank
+                  , mpl::empty_base
                 >::type
             {};
         };
diff --git a/include/boost/fusion/sequence/intrinsic/end.hpp b/include/boost/fusion/sequence/intrinsic/end.hpp
index e60c62ea..b342468f 100644
--- a/include/boost/fusion/sequence/intrinsic/end.hpp
+++ b/include/boost/fusion/sequence/intrinsic/end.hpp
@@ -8,8 +8,8 @@
 #define FUSION_END_04052005_1141
 
 #include <boost/fusion/support/config.hpp>
-#include <boost/blank.hpp>
 #include <boost/utility/enable_if.hpp>
+#include <boost/mpl/empty_base.hpp>
 #include <boost/mpl/if.hpp>
 #include <boost/fusion/sequence/intrinsic_fwd.hpp>
 #include <boost/fusion/support/tag_of.hpp>
@@ -36,7 +36,7 @@ namespace boost { namespace fusion
               : mpl::if_<
                     traits::is_segmented<Sequence>
                   , detail::segmented_end<Sequence>
-                  , blank
+                  , mpl::empty_base
                 >::type
             {};
         };
diff --git a/test/functional/fused.cpp b/test/functional/fused.cpp
index e2c89395..b2ce8dde 100644
--- a/test/functional/fused.cpp
+++ b/test/functional/fused.cpp
@@ -10,18 +10,18 @@
 #include <boost/detail/lightweight_test.hpp>
 
 #include <boost/noncopyable.hpp>
-#include <boost/blank.hpp>
 
 #include <boost/fusion/container/generation/make_vector.hpp>
 #include <boost/fusion/container/vector.hpp>
 
 #include <boost/type_traits/is_same.hpp>
 #include <boost/mpl/assert.hpp>
+#include <boost/mpl/empty_base.hpp>
 
 namespace fusion = boost::fusion;
 using boost::noncopyable;
 
-template <class Base = boost::blank>
+template <class Base = boost::mpl::empty_base>
 struct test_func
     : Base
 {
diff --git a/test/functional/fused_function_object.cpp b/test/functional/fused_function_object.cpp
index c8d4c590..399745a0 100644
--- a/test/functional/fused_function_object.cpp
+++ b/test/functional/fused_function_object.cpp
@@ -10,7 +10,7 @@
 #include <boost/detail/lightweight_test.hpp>
 
 #include <boost/noncopyable.hpp>
-#include <boost/blank.hpp>
+#include <boost/mpl/empty_base.hpp>
 
 #include <boost/fusion/container/generation/make_vector.hpp>
 #include <boost/fusion/container/vector.hpp>
@@ -18,7 +18,7 @@
 namespace fusion = boost::fusion;
 using boost::noncopyable;
 
-template <class Base = boost::blank>
+template <class Base = boost::mpl::empty_base>
 struct test_func
     : Base
 {
diff --git a/test/functional/fused_procedure.cpp b/test/functional/fused_procedure.cpp
index 57443c20..1ed0ddf7 100644
--- a/test/functional/fused_procedure.cpp
+++ b/test/functional/fused_procedure.cpp
@@ -10,7 +10,7 @@
 #include <boost/detail/lightweight_test.hpp>
 
 #include <boost/noncopyable.hpp>
-#include <boost/blank.hpp>
+#include <boost/mpl/empty_base.hpp>
 
 #include <boost/fusion/container/generation/make_vector.hpp>
 #include <boost/fusion/container/vector.hpp>
@@ -26,7 +26,7 @@ int effect;
         BOOST_TEST(effect == e); \
     }
 
-template <class Base = boost::blank>
+template <class Base = boost::mpl::empty_base>
 struct test_func
     : Base
 {
diff --git a/test/functional/make_fused.cpp b/test/functional/make_fused.cpp
index a207359c..ceb82063 100644
--- a/test/functional/make_fused.cpp
+++ b/test/functional/make_fused.cpp
@@ -10,7 +10,7 @@
 #include <boost/detail/lightweight_test.hpp>
 
 #include <boost/noncopyable.hpp>
-#include <boost/blank.hpp>
+#include <boost/mpl/empty_base.hpp>
 
 #include <boost/fusion/container/generation/make_vector.hpp>
 #include <boost/fusion/container/vector.hpp>
@@ -20,7 +20,7 @@ using boost::noncopyable;
 using boost::cref;
 using boost::ref;
 
-template <class Base = boost::blank>
+template <class Base = boost::mpl::empty_base>
 struct test_func
     : Base
 {
diff --git a/test/functional/make_fused_function_object.cpp b/test/functional/make_fused_function_object.cpp
index 87ee8e23..79ea517b 100644
--- a/test/functional/make_fused_function_object.cpp
+++ b/test/functional/make_fused_function_object.cpp
@@ -10,7 +10,7 @@
 #include <boost/detail/lightweight_test.hpp>
 
 #include <boost/noncopyable.hpp>
-#include <boost/blank.hpp>
+#include <boost/mpl/empty_base.hpp>
 
 #include <boost/fusion/container/generation/make_vector.hpp>
 #include <boost/fusion/container/vector.hpp>
@@ -20,7 +20,7 @@ using boost::noncopyable;
 using boost::cref;
 using boost::ref;
 
-template <class Base = boost::blank>
+template <class Base = boost::mpl::empty_base>
 struct test_func
     : Base
 {
diff --git a/test/functional/make_fused_procedure.cpp b/test/functional/make_fused_procedure.cpp
index ce7e267c..2fa2762c 100644
--- a/test/functional/make_fused_procedure.cpp
+++ b/test/functional/make_fused_procedure.cpp
@@ -10,7 +10,7 @@
 #include <boost/detail/lightweight_test.hpp>
 
 #include <boost/noncopyable.hpp>
-#include <boost/blank.hpp>
+#include <boost/mpl/empty_base.hpp>
 
 #include <boost/fusion/container/generation/make_vector.hpp>
 #include <boost/fusion/container/vector.hpp>
@@ -28,7 +28,7 @@ int effect;
         BOOST_TEST(effect == e); \
     }
 
-template <class Base = boost::blank>
+template <class Base = boost::mpl::empty_base>
 struct test_func
     : Base
 {
diff --git a/test/functional/make_unfused.cpp b/test/functional/make_unfused.cpp
index 1e286918..73be142b 100644
--- a/test/functional/make_unfused.cpp
+++ b/test/functional/make_unfused.cpp
@@ -10,14 +10,15 @@
 #include <boost/detail/lightweight_test.hpp>
 
 #include <boost/noncopyable.hpp>
-#include <boost/blank.hpp>
 
+#include <boost/mpl/empty_base.hpp>
 #include <boost/mpl/if.hpp>
 #include <boost/mpl/and.hpp>
+#include <boost/mpl/not.hpp>
 #include <boost/mpl/bool.hpp>
-#include <boost/mpl/identity.hpp>
 
 #include <boost/utility/result_of.hpp>
+#include <boost/core/enable_if.hpp>
 
 #include <boost/fusion/sequence/intrinsic/empty.hpp>
 #include <boost/fusion/algorithm/iteration/fold.hpp>
@@ -33,17 +34,18 @@ typedef mpl::true_ no_nullary_call;
 using boost::ref;
 using boost::cref;
 
-template <class Base = boost::blank, class RemoveNullary = mpl::false_>
+template <class Base = mpl::empty_base, class RemoveNullary = mpl::false_>
 struct test_func
     : Base
 {
     template <typename Sig>
     struct result;
 
-    template <class Self, class Seq> 
+    template <class Self, class Seq>
     struct result< Self(Seq &) >
-        : mpl::if_< mpl::and_< boost::fusion::result_of::empty<Seq>, RemoveNullary >, 
-                    boost::blank, mpl::identity<long> >::type
+        : boost::enable_if<
+              mpl::not_<mpl::and_<boost::fusion::result_of::empty<Seq>, RemoveNullary> >,
+              long>
     { };
 
     template <typename Seq>
diff --git a/test/functional/unfused.cpp b/test/functional/unfused.cpp
index bde9b95b..1e30eabd 100644
--- a/test/functional/unfused.cpp
+++ b/test/functional/unfused.cpp
@@ -10,8 +10,8 @@
 #include <boost/detail/lightweight_test.hpp>
 
 #include <boost/noncopyable.hpp>
-#include <boost/blank.hpp>
 
+#include <boost/mpl/empty_base.hpp>
 #include <boost/mpl/identity.hpp>
 
 #include <boost/utility/result_of.hpp>
@@ -24,7 +24,7 @@ namespace mpl = boost::mpl;
 
 using boost::noncopyable;
 
-template <class Base = boost::blank>
+template <class Base = boost::mpl::empty_base>
 struct test_func
     : Base
 {
diff --git a/test/functional/unfused_typed.cpp b/test/functional/unfused_typed.cpp
index 93c35b6d..eaa03425 100644
--- a/test/functional/unfused_typed.cpp
+++ b/test/functional/unfused_typed.cpp
@@ -9,11 +9,9 @@
 #include <boost/fusion/functional/adapter/unfused_typed.hpp>
 #include <boost/detail/lightweight_test.hpp>
 
-#include <boost/blank.hpp>
 #include <boost/noncopyable.hpp>
 
-#include <boost/utility/result_of.hpp>
-
+#include <boost/mpl/empty_base.hpp>
 #include <boost/mpl/identity.hpp>
 #include <boost/mpl/placeholders.hpp>
 
@@ -31,7 +29,7 @@ typedef fusion::vector<> types0;
 typedef fusion::vector<long &> types1;
 typedef fusion::vector<long &,int,char> types3;
 
-template <class Base = boost::blank>
+template <class Base = boost::mpl::empty_base>
 struct test_func
     : Base
 {