[ros-diffs] [jgardou] 58380: [USP10] - Get back Amine's work on headers inclusion