... and put it into its own header. We want to use it in more places and the name and location are awkward.