Header standardisation.

A bit pedantic, but might as well get it done now...