re-added missing imports that had been left out during merge