Merge "Revert "raviole: remove redundant includes"" into sc-dev