COMP: use correct Export macros
Merge branch 'bug-18102-MoveOverlayImplementationsToModules'