Fix formatting, update header inclusion rules.