diff --git a/include/boost/function/function_template.hpp b/include/boost/function/function_template.hpp
index d893eef..8596361 100644
--- a/include/boost/function/function_template.hpp
+++ b/include/boost/function/function_template.hpp
@@ -27,7 +27,6 @@
 #define BOOST_FUNCTION_COMMA ,
 
 // Class names used in this version of the code
-#define BOOST_FUNCTION_GET_FUNCTION_INVOKER         get_function_invoker
 #define BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER     get_function_obj_invoker
 #define BOOST_FUNCTION_GET_FUNCTION_REF_INVOKER     get_function_ref_invoker
 #define BOOST_FUNCTION_GET_MEMBER_INVOKER           get_member_invoker
@@ -191,7 +190,7 @@ namespace boost {
         typename R BOOST_FUNCTION_COMMA
         BOOST_FUNCTION_TEMPLATE_PARMS
       >
-      struct BOOST_FUNCTION_GET_FUNCTION_INVOKER
+      struct get_function_invoker
       {
         typedef typename conditional<(is_void<R>::value),
                             void_function_invoker<
@@ -293,7 +292,7 @@ namespace boost {
                  typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS>
         struct apply
         {
-          typedef typename BOOST_FUNCTION_GET_FUNCTION_INVOKER<
+          typedef typename get_function_invoker<
                              FunctionPtr,
                              R BOOST_FUNCTION_COMMA
                              BOOST_FUNCTION_TEMPLATE_ARGS
@@ -307,7 +306,7 @@ namespace boost {
                  typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS>
         struct apply_a
         {
-          typedef typename BOOST_FUNCTION_GET_FUNCTION_INVOKER<
+          typedef typename get_function_invoker<
                              FunctionPtr,
                              R BOOST_FUNCTION_COMMA
                              BOOST_FUNCTION_TEMPLATE_ARGS
@@ -1072,7 +1071,6 @@ public:
 // Cleanup after ourselves...
 #undef BOOST_FUNCTION_VTABLE
 #undef BOOST_FUNCTION_COMMA
-#undef BOOST_FUNCTION_GET_FUNCTION_INVOKER
 #undef BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER
 #undef BOOST_FUNCTION_GET_FUNCTION_REF_INVOKER
 #undef BOOST_FUNCTION_GET_MEM_FUNCTION_INVOKER