diff --git a/build/Jamfile b/build/Jamfile
index ce5fb17..f56aa87 100644
--- a/build/Jamfile
+++ b/build/Jamfile
@@ -2,7 +2,7 @@
 # (C) Copyright Tobias Schwinger
 #
 # Use modification and distribution are subject to the boost Software License,
-# Version 1.0. (See http:/\/www.boost.org/LICENSE_1_0.txt).
+# Version 1.0. (See http://www.boost.org/LICENSE_1_0.txt).
 
 # Generates preprocessed files with wave.
 
diff --git a/build/preprocess_arity_loops.cpp b/build/preprocess_arity_loops.cpp
index a045e9f..d39b65c 100644
--- a/build/preprocess_arity_loops.cpp
+++ b/build/preprocess_arity_loops.cpp
@@ -2,7 +2,7 @@
 // (C) Copyright Tobias Schwinger
 //
 // Use modification and distribution are subject to the boost Software License,
-// Version 1.0. (See http:/\/www.boost.org/LICENSE_1_0.txt).
+// Version 1.0. (See http://www.boost.org/LICENSE_1_0.txt).
 
 //------------------------------------------------------------------------------
 
diff --git a/build/preprocess_cc_names.cpp b/build/preprocess_cc_names.cpp
index 39d77c5..803667c 100644
--- a/build/preprocess_cc_names.cpp
+++ b/build/preprocess_cc_names.cpp
@@ -2,7 +2,7 @@
 // (C) Copyright Tobias Schwinger
 //
 // Use modification and distribution are subject to the boost Software License,
-// Version 1.0. (See http:/\/www.boost.org/LICENSE_1_0.txt).
+// Version 1.0. (See http://www.boost.org/LICENSE_1_0.txt).
 
 //------------------------------------------------------------------------------
 
diff --git a/build/preprocess_encoding.cpp b/build/preprocess_encoding.cpp
index e2e4a5e..886bec3 100644
--- a/build/preprocess_encoding.cpp
+++ b/build/preprocess_encoding.cpp
@@ -2,7 +2,7 @@
 // (C) Copyright Tobias Schwinger
 //
 // Use modification and distribution are subject to the boost Software License,
-// Version 1.0. (See http:/\/www.boost.org/LICENSE_1_0.txt).
+// Version 1.0. (See http://www.boost.org/LICENSE_1_0.txt).
 
 //------------------------------------------------------------------------------
 
diff --git a/build/timestamps/cc_names b/build/timestamps/cc_names
index e33ac14..f91091c 100644
--- a/build/timestamps/cc_names
+++ b/build/timestamps/cc_names
@@ -1,2 +1 @@
 timestamp file
-
diff --git a/doc/Jamfile b/doc/Jamfile
index b4d7c2a..fc28d86 100644
--- a/doc/Jamfile
+++ b/doc/Jamfile
@@ -2,7 +2,7 @@
 # (C) Copyright Tobias Schwinger
 #
 # Use modification and distribution are subject to the boost Software License,
-# Version 1.0. (See http:/\/www.boost.org/LICENSE_1_0.txt).
+# Version 1.0. (See http://www.boost.org/LICENSE_1_0.txt).
 
 using quickbook ;
 
diff --git a/example/fast_mem_fn_example.cpp b/example/fast_mem_fn_example.cpp
index efe66a1..381ee14 100644
--- a/example/fast_mem_fn_example.cpp
+++ b/example/fast_mem_fn_example.cpp
@@ -101,7 +101,11 @@ int main()
 
   setup_test(v);
   t.restart();
+#if !BOOST_WORKAROUND(BOOST_MSVC, < 1400)
   do_test(v, BOOST_EXAMPLE_FAST_MEM_FN(& test::id));
+#else // MSVC<8 does not like the implementation of the deduction macro:
+  do_test(v, ::example::fast_mem_fn< int (test::*)() const, & test::id >());
+#endif
   time1 = t.elapsed();
   std::cout << "fast_mem_fn                    | " << time1 << std::endl;
 
diff --git a/example/interface_example.cpp b/example/interface_example.cpp
index d4f66bb..6b7f8d9 100644
--- a/example/interface_example.cpp
+++ b/example/interface_example.cpp
@@ -8,6 +8,7 @@
 // See interface.hpp in this directory for details.
 
 #include <iostream>
+#include <typeinfo>
 
 #include "interface.hpp"
 
diff --git a/example/interpreter.hpp b/example/interpreter.hpp
index 65521b8..72cd78b 100644
--- a/example/interpreter.hpp
+++ b/example/interpreter.hpp
@@ -135,7 +135,7 @@ namespace example
       typedef typename mpl::deref<From>::type arg_type;
       typedef typename mpl::next<From>::type next_iter_type;
 
-      invoker<Function, next_iter_type, To>::apply
+      interpreter::invoker<Function, next_iter_type, To>::apply
           ( func, parser, fusion::push_back(args, parser.get<arg_type>()) );
     }
   };
diff --git a/include/boost/function_types/components.hpp b/include/boost/function_types/components.hpp
index b975307..a4432c5 100644
--- a/include/boost/function_types/components.hpp
+++ b/include/boost/function_types/components.hpp
@@ -120,13 +120,14 @@ namespace boost
     template
     < typename Components
     , typename IfTagged
-    , typename ThenTag 
+    , typename ThenTag
+    , typename DefaultBase = components_non_func_base
     >
     struct retagged_if
       : mpl::if_
         < detail::represents_impl<Components, IfTagged>
         , detail::changed_tag<Components,IfTagged,ThenTag>
-        , components_non_func_base
+        , DefaultBase
         >::type
     { };
 
@@ -213,14 +214,71 @@ namespace boost
       : components_impl<T,L>
     { };
 
-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x565))
+
+    template<typename T, class C>
+    struct member_obj_ptr_result
+    { typedef T & type; };
+
+    template<typename T, class C>
+    struct member_obj_ptr_result<T, C const>
+    { typedef T const & type; };
+
+    template<typename T, class C>
+    struct member_obj_ptr_result<T, C volatile>
+    { typedef T volatile & type; };
+
+    template<typename T, class C>
+    struct member_obj_ptr_result<T, C const volatile>
+    { typedef T const volatile & type; };
+
+    template<typename T, class C>
+    struct member_obj_ptr_result<T &, C>
+    { typedef T & type; };
+
+    template<typename T, class C>
+    struct member_obj_ptr_result<T &, C const>
+    { typedef T & type; };
+
+    template<typename T, class C>
+    struct member_obj_ptr_result<T &, C volatile>
+    { typedef T & type; };
+
+    template<typename T, class C>
+    struct member_obj_ptr_result<T &, C const volatile>
+    { typedef T & type; };
+
+    template<typename T, class C, typename L>
+    struct member_obj_ptr_components
+      : member_object_pointer_base
+    {
+      typedef function_types::components<T C::*, L> type;
+      typedef components_mpl_sequence_tag tag;
+
+      typedef mpl::integral_c<std::size_t,1> function_arity;
+
+      typedef mpl::vector2< typename detail::member_obj_ptr_result<T,C>::type,
+          typename detail::class_transform<C,L>::type > types;
+    };
+
+#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x565))
+#   define BOOST_FT_variations BOOST_FT_pointer|BOOST_FT_member_pointer
+
+    template<typename T, class C, typename L>
+    struct components_impl<T C::*, L>
+      : member_obj_ptr_components<T,C,L>
+    { };
+
+#else  
+#   define BOOST_FT_variations BOOST_FT_pointer
+
     // This workaround removes the member pointer from the type to allow 
     // detection of member function pointers with BCC. 
     template<typename T, typename C, typename L>
     struct components_impl<T C::*, L>
       : detail::retagged_if
         < detail::components_impl<typename boost::remove_cv<T>::type *, L>
-        , pointer_tag, /* --> */ member_pointer_tag >
+        , pointer_tag, /* --> */ member_function_pointer_tag
+        , member_obj_ptr_components<T,C,L> >
     { };
 
     // BCC lets us test the cv-qualification of a function type by template 
@@ -349,65 +407,13 @@ namespace boost
     struct components_bcc
       : mpl::if_
         < detail::represents_impl< detail::components_impl<T,L>
-                                 , member_pointer_tag>
+                                 , member_function_pointer_tag>
         , detail::mfp_components<detail::components_impl<T,L>,T,OrigT,L>
         , detail::components_impl<T,L>
         >::type
     { };
 
-// TODO: add data member support for Borland
-
-#   define BOOST_FT_variations BOOST_FT_pointer
-#else // end of BORLAND WORKAROUND
-#   define BOOST_FT_variations BOOST_FT_pointer|BOOST_FT_member_pointer
-
-    template<typename T, class C>
-    struct member_obj_ptr_result
-    { typedef T & type; };
-
-    template<typename T, class C>
-    struct member_obj_ptr_result<T, C const>
-    { typedef T const & type; };
-
-    template<typename T, class C>
-    struct member_obj_ptr_result<T, C volatile>
-    { typedef T volatile & type; };
-
-    template<typename T, class C>
-    struct member_obj_ptr_result<T, C const volatile>
-    { typedef T const volatile & type; };
-
-    template<typename T, class C>
-    struct member_obj_ptr_result<T &, C>
-    { typedef T & type; };
-
-    template<typename T, class C>
-    struct member_obj_ptr_result<T &, C const>
-    { typedef T & type; };
-
-    template<typename T, class C>
-    struct member_obj_ptr_result<T &, C volatile>
-    { typedef T & type; };
-
-    template<typename T, class C>
-    struct member_obj_ptr_result<T &, C const volatile>
-    { typedef T & type; };
-
-
-    template<typename T, class C, typename L>
-    struct components_impl<T C::*, L>
-        : member_object_pointer_base
-    {
-      typedef function_types::components<T C::*, L> type;
-      typedef components_mpl_sequence_tag tag;
-
-      typedef mpl::integral_c<std::size_t,1> function_arity;
-
-      typedef mpl::vector2< typename detail::member_obj_ptr_result<T,C>::type,
-          typename detail::class_transform<C,L>::type > types;
-    };
-
-#endif 
+#endif // end of BORLAND WORKAROUND
 
 #define BOOST_FT_al_path boost/function_types/detail/components_impl
 #include <boost/function_types/detail/pp_loop.hpp>
diff --git a/include/boost/function_types/detail/cv_traits.hpp b/include/boost/function_types/detail/cv_traits.hpp
index b48452d..e5b2706 100644
--- a/include/boost/function_types/detail/cv_traits.hpp
+++ b/include/boost/function_types/detail/cv_traits.hpp
@@ -12,7 +12,9 @@
 #include <cstddef>
 #include <boost/detail/workaround.hpp>
 
-#if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+#if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) \
+    || BOOST_WORKAROUND(__BORLANDC__, <= 0x582) \
+    || BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x590))
 #   include <boost/type_traits/remove_cv.hpp>
 #   include <boost/type_traits/remove_pointer.hpp>
 #   include <boost/type_traits/remove_reference.hpp>
@@ -25,7 +27,9 @@ namespace boost { namespace function_types { namespace detail {
 namespace ft = boost::function_types;
 
 
-#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) && !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+#if ! (defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) \
+    || BOOST_WORKAROUND(__BORLANDC__, <= 0x582) \
+    || BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x590)))
 
 template<typename T> struct cv_traits 
 { typedef non_cv tag; typedef T type; };
diff --git a/include/boost/function_types/detail/pp_arity_loop.hpp b/include/boost/function_types/detail/pp_arity_loop.hpp
index 91dfb7c..b6dbff5 100644
--- a/include/boost/function_types/detail/pp_arity_loop.hpp
+++ b/include/boost/function_types/detail/pp_arity_loop.hpp
@@ -81,14 +81,16 @@ BOOST_PP_EXPAND(#) include BOOST_FT_AL_PREPROCESSED
 #         include <boost/preprocessor/repetition/enum_trailing_params.hpp>
 #     endif
 
+#     define BOOST_FT_AL_INCLUDE_FILE <BOOST_FT_al_path/master.hpp>
+
 #     define BOOST_FT_ARITY_LOOP_PREFIX 1
-#     include BOOST_PP_EXPAND(<BOOST_FT_al_path/master.hpp>)
+#     include BOOST_FT_AL_INCLUDE_FILE
 #     undef  BOOST_FT_ARITY_LOOP_PREFIX
 
 #     if !BOOST_PP_IS_ITERATING
-#       define BOOST_PP_FILENAME_1 <BOOST_FT_al_path/master.hpp>
+#       define BOOST_PP_FILENAME_1 BOOST_FT_AL_INCLUDE_FILE
 #     elif BOOST_PP_ITERATION_DEPTH() == 1
-#       define BOOST_PP_FILENAME_2 <BOOST_FT_al_path/master.hpp>
+#       define BOOST_PP_FILENAME_2 BOOST_FT_AL_INCLUDE_FILE
 #     else
 #       error "loops nested too deeply"
 #     endif
@@ -133,8 +135,10 @@ BOOST_PP_EXPAND(#) include BOOST_FT_AL_PREPROCESSED
 #     undef BOOST_FT_type
 
 #     define BOOST_FT_ARITY_LOOP_SUFFIX 1
-#     include BOOST_PP_EXPAND(<BOOST_FT_al_path/master.hpp>)
+#     include BOOST_FT_AL_INCLUDE_FILE
 #     undef  BOOST_FT_ARITY_LOOP_SUFFIX
+
+#     undef BOOST_FT_AL_INCLUDE_FILE
 #   endif
 
 #   undef BOOST_FT_FROM_ARITY
diff --git a/include/boost/function_types/detail/pp_cc_loop/master.hpp b/include/boost/function_types/detail/pp_cc_loop/master.hpp
index 5a6d6c4..60e958c 100644
--- a/include/boost/function_types/detail/pp_cc_loop/master.hpp
+++ b/include/boost/function_types/detail/pp_cc_loop/master.hpp
@@ -42,7 +42,7 @@
 #     define BOOST_FT_cc_name implicit_cc
 #     define BOOST_FT_cc BOOST_PP_EMPTY
 #     define BOOST_FT_cond callable_builtin
-#     include BOOST_PP_EXPAND ( <BOOST_FT_cc_file> )
+#     include BOOST_FT_cc_file
 #     undef BOOST_FT_cond
 #     undef BOOST_FT_cc_name
 #     undef BOOST_FT_cc
@@ -54,7 +54,7 @@ BOOST_PP_EXPAND(#)   define BOOST_FT_cc_name implicit_cc
 BOOST_PP_EXPAND(#)   define BOOST_FT_cc BOOST_PP_EMPTY
 BOOST_PP_EXPAND(#)   define BOOST_FT_cond callable_builtin
 #define _()
-BOOST_PP_EXPAND(#)   include BOOST_PP_EXPAND _()( <BOOST_FT_cc_file> )
+BOOST_PP_EXPAND(#)   include BOOST_FT_cc_file
 #undef _
 BOOST_PP_EXPAND(#)   undef BOOST_FT_cond
 BOOST_PP_EXPAND(#)   undef BOOST_FT_cc_name
@@ -85,7 +85,7 @@ BOOST_PP_EXPAND(#) endif
 
 #   if BOOST_FT_cond
 #     define BOOST_FT_config_valid 1
-#     include BOOST_PP_EXPAND(<BOOST_FT_cc_file>)
+#     include BOOST_FT_cc_file
 #   endif
 
 #   undef BOOST_FT_cond
@@ -121,7 +121,7 @@ BOOST_PP_EXPAND(#) define BOOST_FT_cond BOOST_FT_cc_cond_v
 BOOST_PP_EXPAND(#) if BOOST_FT_cond
 BOOST_PP_EXPAND(#)   define BOOST_FT_config_valid 1
 #define _()
-BOOST_PP_EXPAND(#)   include BOOST_PP_EXPAND _()(<BOOST_FT_cc_file>)
+BOOST_PP_EXPAND(#)   include BOOST_FT_cc_file
 #undef _
 BOOST_PP_EXPAND(#) endif
 
diff --git a/include/boost/function_types/detail/pp_cc_loop/preprocessed.hpp b/include/boost/function_types/detail/pp_cc_loop/preprocessed.hpp
index 87c6031..da4079c 100644
--- a/include/boost/function_types/detail/pp_cc_loop/preprocessed.hpp
+++ b/include/boost/function_types/detail/pp_cc_loop/preprocessed.hpp
@@ -15,7 +15,7 @@
 # define BOOST_FT_cond BOOST_FT_CC_IMPLICIT
 # if BOOST_FT_cond
 # define BOOST_FT_config_valid 1
-# include BOOST_PP_EXPAND ( <BOOST_FT_cc_file> )
+# include BOOST_FT_cc_file
 # endif
 # undef BOOST_FT_cond
 # undef BOOST_FT_cc_name
@@ -27,7 +27,7 @@
 # define BOOST_FT_cond BOOST_FT_CC_CDECL
 # if BOOST_FT_cond
 # define BOOST_FT_config_valid 1
-# include BOOST_PP_EXPAND ( <BOOST_FT_cc_file> )
+# include BOOST_FT_cc_file
 # endif
 # undef BOOST_FT_cond
 # undef BOOST_FT_cc_name
@@ -39,7 +39,7 @@
 # define BOOST_FT_cond BOOST_FT_CC_STDCALL
 # if BOOST_FT_cond
 # define BOOST_FT_config_valid 1
-# include BOOST_PP_EXPAND ( <BOOST_FT_cc_file> )
+# include BOOST_FT_cc_file
 # endif
 # undef BOOST_FT_cond
 # undef BOOST_FT_cc_name
@@ -51,7 +51,7 @@
 # define BOOST_FT_cond BOOST_FT_CC_PASCAL
 # if BOOST_FT_cond
 # define BOOST_FT_config_valid 1
-# include BOOST_PP_EXPAND ( <BOOST_FT_cc_file> )
+# include BOOST_FT_cc_file
 # endif
 # undef BOOST_FT_cond
 # undef BOOST_FT_cc_name
@@ -63,7 +63,7 @@
 # define BOOST_FT_cond BOOST_FT_CC_FASTCALL
 # if BOOST_FT_cond
 # define BOOST_FT_config_valid 1
-# include BOOST_PP_EXPAND ( <BOOST_FT_cc_file> )
+# include BOOST_FT_cc_file
 # endif
 # undef BOOST_FT_cond
 # undef BOOST_FT_cc_name
@@ -75,7 +75,7 @@
 # define BOOST_FT_cond BOOST_FT_CC_CLRCALL
 # if BOOST_FT_cond
 # define BOOST_FT_config_valid 1
-# include BOOST_PP_EXPAND ( <BOOST_FT_cc_file> )
+# include BOOST_FT_cc_file
 # endif
 # undef BOOST_FT_cond
 # undef BOOST_FT_cc_name
@@ -87,7 +87,7 @@
 # define BOOST_FT_cond BOOST_FT_CC_THISCALL
 # if BOOST_FT_cond
 # define BOOST_FT_config_valid 1
-# include BOOST_PP_EXPAND ( <BOOST_FT_cc_file> )
+# include BOOST_FT_cc_file
 # endif
 # undef BOOST_FT_cond
 # undef BOOST_FT_cc_name
@@ -99,7 +99,7 @@
 # define BOOST_FT_cond BOOST_FT_CC_IMPLICIT_THISCALL
 # if BOOST_FT_cond
 # define BOOST_FT_config_valid 1
-# include BOOST_PP_EXPAND ( <BOOST_FT_cc_file> )
+# include BOOST_FT_cc_file
 # endif
 # undef BOOST_FT_cond
 # undef BOOST_FT_cc_name
@@ -110,7 +110,7 @@
 # define BOOST_FT_cc_name implicit_cc
 # define BOOST_FT_cc BOOST_PP_EMPTY
 # define BOOST_FT_cond 0x00000001
-# include BOOST_PP_EXPAND ( <BOOST_FT_cc_file> )
+# include BOOST_FT_cc_file
 # undef BOOST_FT_cond
 # undef BOOST_FT_cc_name
 # undef BOOST_FT_cc
diff --git a/include/boost/function_types/detail/pp_loop.hpp b/include/boost/function_types/detail/pp_loop.hpp
index 7521cf2..7d8c347 100644
--- a/include/boost/function_types/detail/pp_loop.hpp
+++ b/include/boost/function_types/detail/pp_loop.hpp
@@ -28,9 +28,9 @@
 #if defined(BOOST_FT_al_path)
 
 #   define BOOST_FT_cc_file \
-        boost/function_types/detail/pp_variate_loop/preprocessed.hpp
+        <boost/function_types/detail/pp_variate_loop/preprocessed.hpp>
 #   define BOOST_FT_variate_file \
-        boost/function_types/detail/pp_arity_loop.hpp
+        <boost/function_types/detail/pp_arity_loop.hpp>
 
 #   ifndef BOOST_FT_type_function
 #   define BOOST_FT_type_function(cc,name) BOOST_FT_SYNTAX( \
diff --git a/include/boost/function_types/detail/pp_variate_loop/master.hpp b/include/boost/function_types/detail/pp_variate_loop/master.hpp
index cf27477..5026342 100644
--- a/include/boost/function_types/detail/pp_variate_loop/master.hpp
+++ b/include/boost/function_types/detail/pp_variate_loop/master.hpp
@@ -140,7 +140,7 @@ BOOST_PP_EXPAND(#)   define BOOST_FT_cv const volatile
 #     endif
 #   endif
 BOOST_PP_EXPAND(#)   define BOOST_FT_flags BOOST_PP_SLOT(1)
-BOOST_PP_EXPAND(#)   include BOOST_PP_EXPAND BOOST_PP_EMPTY()(<BOOST_FT_variate_file>)
+BOOST_PP_EXPAND(#)   include BOOST_FT_variate_file
 
 BOOST_PP_EXPAND(#)   undef BOOST_FT_cv
 BOOST_PP_EXPAND(#)   undef BOOST_FT_ell
diff --git a/include/boost/function_types/detail/pp_variate_loop/preprocessed.hpp b/include/boost/function_types/detail/pp_variate_loop/preprocessed.hpp
index d87d519..7e7c4f9 100644
--- a/include/boost/function_types/detail/pp_variate_loop/preprocessed.hpp
+++ b/include/boost/function_types/detail/pp_variate_loop/preprocessed.hpp
@@ -15,7 +15,7 @@
 # define BOOST_FT_nullary_param BOOST_FT_NULLARY_PARAM
 # define BOOST_FT_cv 
 # define BOOST_FT_flags 519
-# include BOOST_PP_EXPAND ( <BOOST_FT_variate_file> )
+# include BOOST_FT_variate_file
 # undef BOOST_FT_cv
 # undef BOOST_FT_ell
 # undef BOOST_FT_nullary_param
@@ -28,7 +28,7 @@
 # define BOOST_FT_nullary_param
 # define BOOST_FT_cv 
 # define BOOST_FT_flags 263
-# include BOOST_PP_EXPAND ( <BOOST_FT_variate_file> )
+# include BOOST_FT_variate_file
 # undef BOOST_FT_cv
 # undef BOOST_FT_ell
 # undef BOOST_FT_nullary_param
@@ -42,7 +42,7 @@
 # define BOOST_FT_nullary_param BOOST_FT_NULLARY_PARAM
 # define BOOST_FT_cv const
 # define BOOST_FT_flags 1543
-# include BOOST_PP_EXPAND ( <BOOST_FT_variate_file> )
+# include BOOST_FT_variate_file
 # undef BOOST_FT_cv
 # undef BOOST_FT_ell
 # undef BOOST_FT_nullary_param
@@ -55,7 +55,7 @@
 # define BOOST_FT_nullary_param
 # define BOOST_FT_cv const
 # define BOOST_FT_flags 1287
-# include BOOST_PP_EXPAND ( <BOOST_FT_variate_file> )
+# include BOOST_FT_variate_file
 # undef BOOST_FT_cv
 # undef BOOST_FT_ell
 # undef BOOST_FT_nullary_param
@@ -68,7 +68,7 @@
 # define BOOST_FT_nullary_param BOOST_FT_NULLARY_PARAM
 # define BOOST_FT_cv volatile
 # define BOOST_FT_flags 2567
-# include BOOST_PP_EXPAND ( <BOOST_FT_variate_file> )
+# include BOOST_FT_variate_file
 # undef BOOST_FT_cv
 # undef BOOST_FT_ell
 # undef BOOST_FT_nullary_param
@@ -81,7 +81,7 @@
 # define BOOST_FT_nullary_param
 # define BOOST_FT_cv volatile
 # define BOOST_FT_flags 2311
-# include BOOST_PP_EXPAND ( <BOOST_FT_variate_file> )
+# include BOOST_FT_variate_file
 # undef BOOST_FT_cv
 # undef BOOST_FT_ell
 # undef BOOST_FT_nullary_param
@@ -94,7 +94,7 @@
 # define BOOST_FT_nullary_param BOOST_FT_NULLARY_PARAM
 # define BOOST_FT_cv const volatile
 # define BOOST_FT_flags 3591
-# include BOOST_PP_EXPAND ( <BOOST_FT_variate_file> )
+# include BOOST_FT_variate_file
 # undef BOOST_FT_cv
 # undef BOOST_FT_ell
 # undef BOOST_FT_nullary_param
@@ -107,7 +107,7 @@
 # define BOOST_FT_nullary_param
 # define BOOST_FT_cv const volatile
 # define BOOST_FT_flags 3335
-# include BOOST_PP_EXPAND ( <BOOST_FT_variate_file> )
+# include BOOST_FT_variate_file
 # undef BOOST_FT_cv
 # undef BOOST_FT_ell
 # undef BOOST_FT_nullary_param
@@ -123,7 +123,7 @@
 # define BOOST_FT_nullary_param BOOST_FT_NULLARY_PARAM
 # define BOOST_FT_cv 
 # define BOOST_FT_flags 523
-# include BOOST_PP_EXPAND ( <BOOST_FT_variate_file> )
+# include BOOST_FT_variate_file
 # undef BOOST_FT_cv
 # undef BOOST_FT_ell
 # undef BOOST_FT_nullary_param
@@ -136,7 +136,7 @@
 # define BOOST_FT_nullary_param
 # define BOOST_FT_cv 
 # define BOOST_FT_flags 267
-# include BOOST_PP_EXPAND ( <BOOST_FT_variate_file> )
+# include BOOST_FT_variate_file
 # undef BOOST_FT_cv
 # undef BOOST_FT_ell
 # undef BOOST_FT_nullary_param
@@ -151,7 +151,7 @@
 # define BOOST_FT_nullary_param BOOST_FT_NULLARY_PARAM
 # define BOOST_FT_cv 
 # define BOOST_FT_flags 531
-# include BOOST_PP_EXPAND ( <BOOST_FT_variate_file> )
+# include BOOST_FT_variate_file
 # undef BOOST_FT_cv
 # undef BOOST_FT_ell
 # undef BOOST_FT_nullary_param
@@ -164,7 +164,7 @@
 # define BOOST_FT_nullary_param
 # define BOOST_FT_cv 
 # define BOOST_FT_flags 275
-# include BOOST_PP_EXPAND ( <BOOST_FT_variate_file> )
+# include BOOST_FT_variate_file
 # undef BOOST_FT_cv
 # undef BOOST_FT_ell
 # undef BOOST_FT_nullary_param
@@ -181,7 +181,7 @@
 # define BOOST_FT_nullary_param BOOST_FT_NULLARY_PARAM
 # define BOOST_FT_cv 
 # define BOOST_FT_flags 609
-# include BOOST_PP_EXPAND ( <BOOST_FT_variate_file> )
+# include BOOST_FT_variate_file
 # undef BOOST_FT_cv
 # undef BOOST_FT_ell
 # undef BOOST_FT_nullary_param
@@ -194,7 +194,7 @@
 # define BOOST_FT_nullary_param
 # define BOOST_FT_cv 
 # define BOOST_FT_flags 353
-# include BOOST_PP_EXPAND ( <BOOST_FT_variate_file> )
+# include BOOST_FT_variate_file
 # undef BOOST_FT_cv
 # undef BOOST_FT_ell
 # undef BOOST_FT_nullary_param
@@ -207,7 +207,7 @@
 # define BOOST_FT_nullary_param BOOST_FT_NULLARY_PARAM
 # define BOOST_FT_cv const
 # define BOOST_FT_flags 1633
-# include BOOST_PP_EXPAND ( <BOOST_FT_variate_file> )
+# include BOOST_FT_variate_file
 # undef BOOST_FT_cv
 # undef BOOST_FT_ell
 # undef BOOST_FT_nullary_param
@@ -220,7 +220,7 @@
 # define BOOST_FT_nullary_param
 # define BOOST_FT_cv const
 # define BOOST_FT_flags 1377
-# include BOOST_PP_EXPAND ( <BOOST_FT_variate_file> )
+# include BOOST_FT_variate_file
 # undef BOOST_FT_cv
 # undef BOOST_FT_ell
 # undef BOOST_FT_nullary_param
@@ -233,7 +233,7 @@
 # define BOOST_FT_nullary_param BOOST_FT_NULLARY_PARAM
 # define BOOST_FT_cv volatile
 # define BOOST_FT_flags 2657
-# include BOOST_PP_EXPAND ( <BOOST_FT_variate_file> )
+# include BOOST_FT_variate_file
 # undef BOOST_FT_cv
 # undef BOOST_FT_ell
 # undef BOOST_FT_nullary_param
@@ -246,7 +246,7 @@
 # define BOOST_FT_nullary_param
 # define BOOST_FT_cv volatile
 # define BOOST_FT_flags 2401
-# include BOOST_PP_EXPAND ( <BOOST_FT_variate_file> )
+# include BOOST_FT_variate_file
 # undef BOOST_FT_cv
 # undef BOOST_FT_ell
 # undef BOOST_FT_nullary_param
@@ -259,7 +259,7 @@
 # define BOOST_FT_nullary_param BOOST_FT_NULLARY_PARAM
 # define BOOST_FT_cv const volatile
 # define BOOST_FT_flags 3681
-# include BOOST_PP_EXPAND ( <BOOST_FT_variate_file> )
+# include BOOST_FT_variate_file
 # undef BOOST_FT_cv
 # undef BOOST_FT_ell
 # undef BOOST_FT_nullary_param
@@ -272,7 +272,7 @@
 # define BOOST_FT_nullary_param
 # define BOOST_FT_cv const volatile
 # define BOOST_FT_flags 3425
-# include BOOST_PP_EXPAND ( <BOOST_FT_variate_file> )
+# include BOOST_FT_variate_file
 # undef BOOST_FT_cv
 # undef BOOST_FT_ell
 # undef BOOST_FT_nullary_param
diff --git a/include/boost/function_types/is_member_object_pointer.hpp b/include/boost/function_types/is_member_object_pointer.hpp
index fbf4850..77527d9 100644
--- a/include/boost/function_types/is_member_object_pointer.hpp
+++ b/include/boost/function_types/is_member_object_pointer.hpp
@@ -24,10 +24,10 @@ namespace boost
         < function_types::components<T>
         , detail::member_object_pointer_tag >
     { 
-      BOOST_MPL_AUX_LAMBDA_SUPPORT(2,is_member_object_pointer,(T,Tag))
+      BOOST_MPL_AUX_LAMBDA_SUPPORT(1,is_member_object_pointer,(T))
     };
   }
-  BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(2,function_types::is_member_object_pointer)
+  BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(1,function_types::is_member_object_pointer)
 } 
 
 #endif 
diff --git a/include/boost/function_types/property_tags.hpp b/include/boost/function_types/property_tags.hpp
index b241e1a..bbc64d5 100644
--- a/include/boost/function_types/property_tags.hpp
+++ b/include/boost/function_types/property_tags.hpp
@@ -141,7 +141,7 @@ template<class Tag, class QueryTag> struct extract
 #include <boost/function_types/detail/pp_tags/preprocessed.hpp>
 
 namespace boost { namespace function_types {
-#define BOOST_FT_cc_file boost/function_types/detail/pp_tags/cc_tag.hpp
+#define BOOST_FT_cc_file <boost/function_types/detail/pp_tags/cc_tag.hpp>
 #include <boost/function_types/detail/pp_loop.hpp>
 } } // namespace boost::function_types