diff --git a/include/boost/fusion/functional/adapter/unfused_generic.hpp b/include/boost/fusion/functional/adapter/unfused_generic.hpp
index 47b37268..b687e4ad 100644
--- a/include/boost/fusion/functional/adapter/unfused_generic.hpp
+++ b/include/boost/fusion/functional/adapter/unfused_generic.hpp
@@ -25,7 +25,6 @@
 #include <boost/fusion/functional/adapter/detail/access.hpp>
 
 #include <boost/utility/result_of.hpp>
-#include <boost/type_traits/remove_reference.hpp>
 
 namespace boost { namespace fusion
 {
@@ -33,14 +32,12 @@ namespace boost { namespace fusion
 
     //----- ---- --- -- - -  -   -
 
-    struct void_;
-
     template <class Function> 
     class unfused_generic
     {
         Function fnc_transformed;
 
-        typedef typename remove_const<typename boost::remove_reference<Function>::type>::type function;
+        typedef typename detail::uncr<Function>::type function;
         typedef typename detail::call_param<Function>::type func_const_fwd_t;
 
       public:
diff --git a/include/boost/fusion/functional/adapter/unfused_lvalue_args.hpp b/include/boost/fusion/functional/adapter/unfused_lvalue_args.hpp
index 26f79c4e..93841a64 100644
--- a/include/boost/fusion/functional/adapter/unfused_lvalue_args.hpp
+++ b/include/boost/fusion/functional/adapter/unfused_lvalue_args.hpp
@@ -15,9 +15,6 @@
 #include <boost/preprocessor/repetition/enum_binary_params.hpp>
 #include <boost/preprocessor/facilities/intercept.hpp>
 
-#include <boost/type_traits/remove_reference.hpp>
-#include <boost/type_traits/remove_const.hpp>
-
 #include <boost/utility/result_of.hpp>
 
 #include <boost/fusion/sequence/container/vector/vector.hpp>
@@ -31,13 +28,11 @@ namespace boost { namespace fusion
 
     //----- ---- --- -- - -  -   -
 
-    struct void_;
-
     template <class Function> class unfused_lvalue_args
     {
         Function fnc_transformed;
 
-        typedef typename remove_const<typename boost::remove_reference<Function>::type>::type function;
+        typedef typename detail::uncr<Function>::type function;
         typedef typename detail::call_param<Function>::type func_const_fwd_t;
 
       public:
diff --git a/include/boost/fusion/functional/adapter/unfused_rvalue_args.hpp b/include/boost/fusion/functional/adapter/unfused_rvalue_args.hpp
index 9a95804a..26afd539 100644
--- a/include/boost/fusion/functional/adapter/unfused_rvalue_args.hpp
+++ b/include/boost/fusion/functional/adapter/unfused_rvalue_args.hpp
@@ -15,9 +15,6 @@
 #include <boost/preprocessor/repetition/enum_binary_params.hpp>
 #include <boost/preprocessor/facilities/intercept.hpp>
 
-#include <boost/type_traits/remove_reference.hpp>
-#include <boost/type_traits/remove_const.hpp>
-
 #include <boost/utility/result_of.hpp>
 
 #include <boost/fusion/sequence/container/vector/vector.hpp>
@@ -31,13 +28,11 @@ namespace boost { namespace fusion
 
     //----- ---- --- -- - -  -   -
 
-    struct void_;
-
     template <class Function> class unfused_rvalue_args
     {
         Function fnc_transformed;
 
-        typedef typename remove_const<typename boost::remove_reference<Function>::type>::type function;
+        typedef typename detail::uncr<Function>::type function;
         typedef typename detail::call_param<Function>::type func_const_fwd_t;
 
       public:
diff --git a/include/boost/fusion/functional/adapter/unfused_typed.hpp b/include/boost/fusion/functional/adapter/unfused_typed.hpp
index e8ded64f..e892bd9a 100644
--- a/include/boost/fusion/functional/adapter/unfused_typed.hpp
+++ b/include/boost/fusion/functional/adapter/unfused_typed.hpp
@@ -21,9 +21,6 @@
 
 #include <boost/utility/result_of.hpp>
 
-#include <boost/type_traits/remove_reference.hpp>
-#include <boost/type_traits/remove_const.hpp>
-
 #include <boost/fusion/support/detail/access.hpp>
 #include <boost/fusion/sequence/intrinsic/value_at.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>