Add missing imports to core