Splits x86 arch for circular deps