Solve half of the conflicts with XBOX code in headers