COMP: Add missing includes
Merge branch 'bug-18183-comp'