Stop implicitly importing xproto; goes with proto change to explicitly import it