Fix class headers. (again)