[ros-diffs] [dreimer] 42966: Next try. This time I reverted most of my header changes and just needed to add some and edit two of them.