new file mode 100644
--- /dev/null
+++ b/lib/unistr/u16-strmbtouc.c
@@ -0,0 +1,52 @@
+/* Look at first character in UTF-16 string.
+   Copyright (C) 1999-2000, 2002, 2006-2007 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2002.
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include "unistr.h"
+
+int
+u16_strmbtouc (ucs4_t *puc, const uint16_t *s)
+{
+  /* Keep in sync with utf16-ucs4.h and utf16-ucs4.c.  */
+  uint16_t c = *s;
+
+  if (c < 0xd800 || c >= 0xe000)
+    {
+      *puc = c;
+      return (c != 0 ? 1 : 0);
+    }
+#if CONFIG_UNICODE_SAFETY
+  if (c < 0xdc00)
+#endif
+    {
+#if CONFIG_UNICODE_SAFETY
+      if (s[1] >= 0xdc00 && s[1] < 0xe000)
+#else
+      if (s[1] != 0)
+#endif
+	{
+	  *puc = 0x10000 + ((c - 0xd800) << 10) + (s[1] - 0xdc00);
+	  return 2;
+	}
+    }
+  /* invalid or incomplete multibyte character */
+  return -1;
+}

new file mode 100644
--- /dev/null
+++ b/lib/unistr/u32-strmbtouc.c
@@ -0,0 +1,41 @@
+/* Look at first character in UTF-32 string.
+   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2002.
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include "unistr.h"
+
+int
+u32_strmbtouc (ucs4_t *puc, const uint32_t *s)
+{
+  uint32_t c = *s;
+
+#if CONFIG_UNICODE_SAFETY
+  if (c < 0xd800 || (c >= 0xe000 && c < 0x110000))
+#endif
+    {
+      *puc = c;
+      return (c != 0 ? 1 : 0);
+    }
+#if CONFIG_UNICODE_SAFETY
+  /* invalid multibyte character */
+  return -1;
+#endif
+}

new file mode 100644
--- /dev/null
+++ b/lib/unistr/u8-strmbtouc.c
@@ -0,0 +1,131 @@
+/* Look at first character in UTF-8 string.
+   Copyright (C) 1999-2000, 2002, 2006-2007 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2002.
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include "unistr.h"
+
+int
+u8_strmbtouc (ucs4_t *puc, const uint8_t *s)
+{
+  /* Keep in sync with utf8-ucs4.h and utf8-ucs4.c.  */
+  uint8_t c = *s;
+
+  if (c < 0x80)
+    {
+      *puc = c;
+      return (c != 0 ? 1 : 0);
+    }
+  if (c >= 0xc2)
+    {
+      if (c < 0xe0)
+	{
+#if CONFIG_UNICODE_SAFETY
+	  if ((s[1] ^ 0x80) < 0x40)
+#else
+	  if (s[1] != 0)
+#endif
+	    {
+	      *puc = ((unsigned int) (c & 0x1f) << 6)
+	             | (unsigned int) (s[1] ^ 0x80);
+	      return 2;
+	    }
+	}
+      else if (c < 0xf0)
+	{
+#if CONFIG_UNICODE_SAFETY
+	  if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
+	      && (c >= 0xe1 || s[1] >= 0xa0)
+	      && (c != 0xed || s[1] < 0xa0))
+#else
+	  if (s[1] != 0 && s[2] != 0)
+#endif
+	    {
+	      *puc = ((unsigned int) (c & 0x0f) << 12)
+	             | ((unsigned int) (s[1] ^ 0x80) << 6)
+	             | (unsigned int) (s[2] ^ 0x80);
+	      return 3;
+	    }
+	}
+      else if (c < 0xf8)
+	{
+#if CONFIG_UNICODE_SAFETY
+	  if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
+	      && (s[3] ^ 0x80) < 0x40
+	      && (c >= 0xf1 || s[1] >= 0x90)
+#if 1
+	      && (c < 0xf4 || (c == 0xf4 && s[1] < 0x90))
+#endif
+	     )
+#else
+	  if (s[1] != 0 && s[2] != 0 && s[3] != 0)
+#endif
+	    {
+	      *puc = ((unsigned int) (c & 0x07) << 18)
+	             | ((unsigned int) (s[1] ^ 0x80) << 12)
+	             | ((unsigned int) (s[2] ^ 0x80) << 6)
+	             | (unsigned int) (s[3] ^ 0x80);
+	      return 4;
+	    }
+	}
+#if 0
+      else if (c < 0xfc)
+	{
+#if CONFIG_UNICODE_SAFETY
+	  if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
+	      && (s[3] ^ 0x80) < 0x40 && (s[4] ^ 0x80) < 0x40
+	      && (c >= 0xf9 || s[1] >= 0x88))
+#else
+	  if (s[1] != 0 && s[2] != 0 && s[3] != 0 && s[4] != 0)
+#endif
+	    {
+	      *puc = ((unsigned int) (c & 0x03) << 24)
+	             | ((unsigned int) (s[1] ^ 0x80) << 18)
+	             | ((unsigned int) (s[2] ^ 0x80) << 12)
+	             | ((unsigned int) (s[3] ^ 0x80) << 6)
+	             | (unsigned int) (s[4] ^ 0x80);
+	      return 5;
+	    }
+	}
+      else if (c < 0xfe)
+	{
+#if CONFIG_UNICODE_SAFETY
+	  if ((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40
+	      && (s[3] ^ 0x80) < 0x40 && (s[4] ^ 0x80) < 0x40
+	      && (s[5] ^ 0x80) < 0x40
+	      && (c >= 0xfd || s[1] >= 0x84))
+#else
+	  if (s[1] != 0 && s[2] != 0 && s[3] != 0 && s[4] != 0 && s[5] != 0)
+#endif
+	    {
+	      *puc = ((unsigned int) (c & 0x01) << 30)
+	             | ((unsigned int) (s[1] ^ 0x80) << 24)
+	             | ((unsigned int) (s[2] ^ 0x80) << 18)
+	             | ((unsigned int) (s[3] ^ 0x80) << 12)
+	             | ((unsigned int) (s[4] ^ 0x80) << 6)
+	             | (unsigned int) (s[5] ^ 0x80);
+	      return 6;
+	    }
+	}
+#endif
+    }
+  /* invalid or incomplete multibyte character */
+  return -1;
+}

new file mode 100644
--- /dev/null
+++ b/modules/unistr/u16-strmbtouc
@@ -0,0 +1,23 @@
+Description:
+Look at first character in UTF-16 string.
+
+Files:
+lib/unistr/u16-strmbtouc.c
+
+Depends-on:
+unistr/base
+
+configure.ac:
+
+Makefile.am:
+lib_SOURCES += unistr/u16-strmbtouc.c
+
+Include:
+"unistr.h"
+
+License:
+LGPL
+
+Maintainer:
+Bruno Haible
+

new file mode 100644
--- /dev/null
+++ b/modules/unistr/u32-strmbtouc
@@ -0,0 +1,23 @@
+Description:
+Look at first character in UTF-32 string.
+
+Files:
+lib/unistr/u32-strmbtouc.c
+
+Depends-on:
+unistr/base
+
+configure.ac:
+
+Makefile.am:
+lib_SOURCES += unistr/u32-strmbtouc.c
+
+Include:
+"unistr.h"
+
+License:
+LGPL
+
+Maintainer:
+Bruno Haible
+

new file mode 100644
--- /dev/null
+++ b/modules/unistr/u8-strmbtouc
@@ -0,0 +1,23 @@
+Description:
+Look at first character in UTF-8 string.
+
+Files:
+lib/unistr/u8-strmbtouc.c
+
+Depends-on:
+unistr/base
+
+configure.ac:
+
+Makefile.am:
+lib_SOURCES += unistr/u8-strmbtouc.c
+
+Include:
+"unistr.h"
+
+License:
+LGPL
+
+Maintainer:
+Bruno Haible
+