Make x86-only dependencies optional