Cleaning up headers for the inclusion of sun (and soon, moon)