Merge pull request #8221 from JulioCesarMatias/RemoveUnusedHeaderFile