[ros-diffs] [akhaldi] 61492: [USBCCGP] * Remove some inclusions from the main header. * Improve the GUIDs situation. CORE-7716