Fix header dependency changes.