I put a fix in to cvs head yesterdy for the missing ubik_client declaration, but it's not really the right fix.