fixed missing imports in lately edited core files