6 files changed, 9 insertions, 4 deletions
diff --git a/boost/test/data/monomorphic/collection.hpp b/boost/test/data/monomorphic/collection.hpp
index 49e81458bf..71a4863f41 100644
--- a/boost/test/data/monomorphic/collection.hpp
+++ b/boost/test/data/monomorphic/collection.hpp
@@ -75,7 +75,7 @@ struct is_dataset<collection<C>> : mpl::true_ {};
 
 //! @overload boost::unit_test::data::make()
 template<typename C>
-inline typename std::enable_if<is_forward_iterable<C>::value,monomorphic::collection<C>>::type
+inline typename std::enable_if<is_container_forward_iterable<C>::value,monomorphic::collection<C>>::type
 make( C&& c )
 {
     return monomorphic::collection<C>( std::forward<C>(c) );
diff --git a/boost/test/data/monomorphic/fwd.hpp b/boost/test/data/monomorphic/fwd.hpp
index cf6d3b0000..dcd1b84165 100644
--- a/boost/test/data/monomorphic/fwd.hpp
+++ b/boost/test/data/monomorphic/fwd.hpp
@@ -119,7 +119,7 @@ make(DataSet&& ds)
 
 //! @overload boost::unit_test::data::make()
 template<typename T>
-inline typename std::enable_if<!is_forward_iterable<T>::value && 
+inline typename std::enable_if<!is_container_forward_iterable<T>::value && 
                                !monomorphic::is_dataset<T>::value &&
                                !is_array<typename remove_reference<T>::type>::value, 
                                monomorphic::singleton<T>>::type
@@ -129,7 +129,7 @@ make( T&& v );
 
 //! @overload boost::unit_test::data::make()
 template<typename C>
-inline typename std::enable_if<is_forward_iterable<C>::value,monomorphic::collection<C>>::type
+inline typename std::enable_if<is_container_forward_iterable<C>::value,monomorphic::collection<C>>::type
 make( C&& c );
 
 //____________________________________________________________________________//
diff --git a/boost/test/data/monomorphic/generate.hpp b/boost/test/data/monomorphic/generate.hpp
index af3b5c0bb9..614ef3aad5 100644
--- a/boost/test/data/monomorphic/generate.hpp
+++ b/boost/test/data/monomorphic/generate.hpp
@@ -16,6 +16,8 @@
 #include <boost/test/data/config.hpp>
 #include <boost/test/data/monomorphic/fwd.hpp>
 
+#include <boost/core/ref.hpp>
+
 #include <boost/test/detail/suppress_warnings.hpp>
 
 //____________________________________________________________________________//
diff --git a/boost/test/data/monomorphic/grid.hpp b/boost/test/data/monomorphic/grid.hpp
index 3e1b36abad..2cf66189a0 100644
--- a/boost/test/data/monomorphic/grid.hpp
+++ b/boost/test/data/monomorphic/grid.hpp
@@ -22,6 +22,8 @@
 #include <boost/test/data/monomorphic/fwd.hpp>
 #include <boost/test/data/monomorphic/sample_merge.hpp>
 
+#include <boost/mpl/identity.hpp>
+
 #include <boost/test/detail/suppress_warnings.hpp>
 
 //____________________________________________________________________________//
diff --git a/boost/test/data/monomorphic/singleton.hpp b/boost/test/data/monomorphic/singleton.hpp
index 586487a6d7..b0abd0eabb 100644
--- a/boost/test/data/monomorphic/singleton.hpp
+++ b/boost/test/data/monomorphic/singleton.hpp
@@ -81,7 +81,7 @@ struct is_dataset<singleton<T>> : mpl::true_ {};
 
 /// @overload boost::unit_test::data::make()
 template<typename T>
-inline typename std::enable_if<!is_forward_iterable<T>::value && 
+inline typename std::enable_if<!is_container_forward_iterable<T>::value && 
                                !monomorphic::is_dataset<T>::value &&
                                !boost::is_array<typename boost::remove_reference<T>::type>::value, 
                                monomorphic::singleton<T>
diff --git a/boost/test/data/test_case.hpp b/boost/test/data/test_case.hpp
index dd9de141c4..2275f90fff 100644
--- a/boost/test/data/test_case.hpp
+++ b/boost/test/data/test_case.hpp
@@ -16,6 +16,7 @@
 #include <boost/test/data/config.hpp>
 #include <boost/test/data/dataset.hpp>
 #include <boost/test/data/for_each_sample.hpp>
+#include <boost/test/tree/test_unit.hpp>
 
 // Boost
 #include <boost/preprocessor/repetition/enum_params.hpp>