Remove unneeded includes in util/utf.h