Maintenance work: unified headers #2