[ros-diffs] [sginsberg] 43041: - Fix some redefinition warnings caused by our headers' suckyness