Fix includes

Nicolas Fellarequested to merge
work/incl into master

Add missing ones

Remove unneeded ones

Merge request reports