More updates for the header cleanups (and apologies, again, for not having