Fix headers so that "make checkheaders" passes again