Improved header-file dependency rules even more.