Reduce header includes pt. 2