[ros-diffs] [akhaldi] 61944: [CDROM_NEW] * Move some inclusions to the main header. * Improve header inclusions. * Remove inclusions and definitions that already exist in the main header. * Improve the GUIDs s...