+ * modules/utf8-ucs4: Renamed from modules/utf8-ucs4-safe.
+ * lib/utf8-ucs4.h: Renamed from lib/utf8-ucs4-safe.h.
+ * lib/unistr/utf8-ucs4.c: Renamed from lib/unistr/utf8-ucs4-safe.c.
+ * modules/unistr/u8-mbtouc: Renamed from modules/unistr/u8-mbtouc-safe.
+ * lib/unistr/u8-mbtouc.c: Renamed from lib/unistr/u8-mbtouc-safe.c.
+ * lib/unistr.h: Update.
+ * lib/striconveh.c: Update.
+ * modules/striconveh: Update.
+ * lib/unistr/u8-to-u16.c: Update.
+ * modules/unistr/u8-to-u16: Update.
+ * lib/unistr/u8-to-u32.c: Update.
+ * modules/unistr/u8-to-u32: Update.