update imports for remerged scheming-support branch