Tidy up some headers

Fixes #255.