#include <string.h>
#include "c-ctype.h"
#include "xsize.h"
-
-#include "utf8-ucs4-unsafe.h"
-
-#include "utf16-ucs4-unsafe.h"
+#include "unistr.h"
#ifdef unused
static inline int
-u32_mbtouc (unsigned int *puc, const unsigned int *s, size_t n)
+u32_mbtouc_unsafe (unsigned int *puc, const unsigned int *s, size_t n)
{
*puc = *s;
return 1;