[ros-diffs] [akhaldi] 61566: [3DTEXT] * Remove one time inclusions from the main header and put them back where they belong. * Cleanup the main header. CORE-7716