Clean up second half of headers with XBOX code

With that all the code in headers has no more reference to the XBOX stuff.