Oh shit I wasn't paying attention to headers in that last commit at all

Now our headers look less dumb