CP-5913: Move users of "xs.h" to "xenstore.h"