[ros-diffs] [khornicek] 38025: fix build 2nd try: - merge header changes from trunk - add some missing files