fix include formatting and spacing