Reduce header includes