Issue #2339931 by martin107: Fixed use statements out of step with core.