Improve raw header parsing, keep list of excluded headers