Fix duplicate definitions in ROOT macros
Merge pull request #6852 from wmtan/FixDuplicateDefinitions

Fix duplicate definitions in ROOT macros