Tidy up header include guards