[too many to list] Index macros directly from definitions

[too many to list] Index macros directly from definitions #8303