do away with versioned xs includes