diff --git a/include/boost/function/function_template.hpp b/include/boost/function/function_template.hpp
index 519e31f..f8f9e8d 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_VOID_FUNCTION_OBJ_INVOKER    void_function_obj_invoker
 #define BOOST_FUNCTION_FUNCTION_REF_INVOKER         function_ref_invoker
 #define BOOST_FUNCTION_VOID_FUNCTION_REF_INVOKER    void_function_ref_invoker
 #define BOOST_FUNCTION_MEMBER_INVOKER               function_mem_invoker
@@ -102,7 +101,7 @@ namespace boost {
         typename R BOOST_FUNCTION_COMMA
         BOOST_FUNCTION_TEMPLATE_PARMS
       >
-      struct BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER
+      struct void_function_obj_invoker
       {
         static BOOST_FUNCTION_VOID_RETURN_TYPE
         invoke(function_buffer& function_obj_ptr BOOST_FUNCTION_COMMA
@@ -220,7 +219,7 @@ namespace boost {
       struct BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER
       {
         typedef typename conditional<(is_void<R>::value),
-                            BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER<
+                            void_function_obj_invoker<
                             FunctionObj,
                             R BOOST_FUNCTION_COMMA
                             BOOST_FUNCTION_TEMPLATE_ARGS
@@ -1077,7 +1076,6 @@ public:
 // Cleanup after ourselves...
 #undef BOOST_FUNCTION_VTABLE
 #undef BOOST_FUNCTION_COMMA
-#undef BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER
 #undef BOOST_FUNCTION_FUNCTION_REF_INVOKER
 #undef BOOST_FUNCTION_VOID_FUNCTION_REF_INVOKER
 #undef BOOST_FUNCTION_MEMBER_INVOKER