This is a bit of a mess, apparently there are some headers here that may
come from the system and others that are always internal?

Change-Id: Ifbf486d3016bc87849e2593d83b3d48dae3aeca0