More include formatting cleanup.