p350: Only add some needed headers??