diff --git a/src/glx/glxextensions.h b/src/glx/glxextensions.h
index 999db335717..0af2db04e17 100644
--- a/src/glx/glxextensions.h
+++ b/src/glx/glxextensions.h
@@ -283,17 +283,11 @@ __glXEnableDirectExtension(struct glx_screen *psc, const char *name);
 /* GLX_ALIAS should be used for functions with a non-void return type.
    GLX_ALIAS_VOID is for functions with a void return type. */
 # ifdef HAVE_FUNC_ATTRIBUTE_ALIAS
-/* GLX_ALIAS and GLX_ALIAS_VOID both expand to the macro GLX_ALIAS2. Using the
- * extra expansion means that the name mangling macros in glx_mangle.h will
- * apply before stringification, so the alias attribute will have a string like
- * "mglXFoo" instead of "glXFoo". */
-#  define GLX_ALIAS2(return_type, real_func, proto_args, args, aliased_func) \
+#  define GLX_ALIAS(return_type, real_func, proto_args, args, aliased_func) \
    return_type  real_func  proto_args                                   \
    __attribute__ ((alias( # aliased_func ) ));
-#  define GLX_ALIAS(return_type, real_func, proto_args, args, aliased_func) \
-   GLX_ALIAS2(return_type, real_func, proto_args, args, aliased_func)
 #  define GLX_ALIAS_VOID(real_func, proto_args, args, aliased_func) \
-   GLX_ALIAS2(void, real_func, proto_args, args, aliased_func)
+   GLX_ALIAS(void, real_func, proto_args, args, aliased_func)
 # else
 #  define GLX_ALIAS(return_type, real_func, proto_args, args, aliased_func) \
    return_type  real_func  proto_args                                   \