Nicolas Fella authored Apr 23, 2022 and Heiko Becker committed May 07, 2022

Add missing ones

Remove unneeded ones

Convert forward decl to include where needed

Fix syntax where needed

(cherry picked from commit 6a6156db)