COMP: remove include
Merge branch 'bug-18102-MoveOverlayImplementationsToModules'