Add missing imports
Replace QuartzCoreKit with fork