[ros-diffs] [akhaldi] 62032: [WINSTA] * Improve header inclusions. CORE-7716