Re: get rid of unnecessary libunicode dependencies in some more places