[ros-diffs] [akhaldi] 62027: [BZIP2] * Improve header inclusions. CORE-7716