The current organisation of the headers has been making less and less sense over the years, so to simplify things, I'm just going to combine them into a single header. This change will make it easier to do that.