Merge pull request #6341 from DieHertz/bfdev-diehertz-unused-define-cleanup