[ros-diffs] [akhaldi] 61553: [DEVMGMT] * Remove one time inclusions from the main header and put them back where they belong. * Cleanup the main header. * Improve the GUIDs situation. CORE-7716