change header bringup and fix include for reports so they don't have to
come out of order