Merge pull request #5022 from lioncash/header BTStub: Get rid of an unnecessary forward declaration in the cpp file