Move around some headers for PacketFilter plugins