more struct->class to fix -Werror's