Maintenance work: unified headers #1