Bug 1832850 - Part 3: Remove an unnecessary include and some unnecessary forward...