Merge pull request #6201 from lioncash/headers VideoBackends: Remove header inclusions made unnecessary with Hybrid XFB
