Merge pull request #6653 from lioncash/redundant Common/Config: Remove redundant declaration and unused includes
