[ros-diffs] [akhaldi] 61788: [MSIMTF] * Create a main header and move some inclusions to it. * Improve the header inclusions. CORE-7716