new file mode 100644
--- /dev/null
+++ b/lib/unistr/u16-next.c
@@ -0,0 +1,39 @@
+/* Iterate over next character in UTF-16 string.
+   Copyright (C) 2002, 2006 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"
+
+const uint16_t *
+u16_next (ucs4_t *puc, const uint16_t *s)
+{
+  int count;
+
+  count = u16_strmbtouc (puc, s);
+  if (count > 0)
+    return s + count;
+  else
+    {
+      if (count < 0)
+	*puc = 0xfffd;
+      return NULL;
+    }
+}

new file mode 100644
--- /dev/null
+++ b/lib/unistr/u32-next.c
@@ -0,0 +1,41 @@
+/* Iterate over next 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"
+
+const uint32_t *
+u32_next (ucs4_t *puc, const uint32_t *s)
+{
+  int count;
+
+  count = u32_strmbtouc (puc, s);
+  if (count > 0)
+    return s + count;
+  else
+    {
+#if CONFIG_UNICODE_SAFETY
+      if (count < 0)
+	*puc = 0xfffd;
+#endif
+      return NULL;
+    }
+}

new file mode 100644
--- /dev/null
+++ b/lib/unistr/u8-next.c
@@ -0,0 +1,39 @@
+/* Iterate over next character in UTF-8 string.
+   Copyright (C) 2002, 2006 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"
+
+const uint8_t *
+u8_next (ucs4_t *puc, const uint8_t *s)
+{
+  int count;
+
+  count = u8_strmbtouc (puc, s);
+  if (count > 0)
+    return s + count;
+  else
+    {
+      if (count < 0)
+	*puc = 0xfffd;
+      return NULL;
+    }
+}

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

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

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