[ros-diffs] [rharabien] 54909: [FMIFS] - Make header C++ friendly