--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,10 @@
 	* lib/utf8-ucs4-safe.h: New file.
 	* lib/unistr/utf8-ucs4-safe.c: New file.
 
+	* modules/utf16-ucs4-safe: New file.
+	* lib/utf16-ucs4-safe.h: New file.
+	* lib/unistr/utf16-ucs4-safe.c: New file.
+
 2007-01-08  Bruno Haible  <bruno@clisp.org>
 
 	* modules/utf8-ucs4 (Files, lib_SOURCES): Add unistr/utf8-ucs4.c.

new file mode 100644
--- /dev/null
+++ b/lib/unistr/utf16-ucs4-safe.c
@@ -0,0 +1,49 @@
+/* Conversion UTF-16 to UCS-4.
+   Copyright (C) 2001-2002, 2006 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2001.
+
+   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 "utf16-ucs4-safe.h"
+
+int
+u16_mbtouc_safe_aux (ucs4_t *puc, const uint16_t *s, size_t n)
+{
+  uint16_t c = *s;
+
+  if (c < 0xdc00)
+    {
+      if (n >= 2)
+	{
+	  if (s[1] >= 0xdc00 && s[1] < 0xe000)
+	    {
+	      *puc = 0x10000 + ((c - 0xd800) << 10) + (s[1] - 0xdc00);
+	      return 2;
+	    }
+	  /* invalid multibyte character */
+	}
+      else
+	{
+	  /* incomplete multibyte character */
+	}
+    }
+  /* invalid multibyte character */
+  *puc = 0xfffd;
+  return 1;
+}

new file mode 100644
--- /dev/null
+++ b/lib/utf16-ucs4-safe.h
@@ -0,0 +1,45 @@
+/* Conversion UTF-16 to UCS-4.
+   Copyright (C) 2001-2002, 2005-2007 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2001.
+
+   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.  */
+
+#ifndef _UTF16_UCS4_SAFE_H
+#define _UTF16_UCS4_SAFE_H
+
+#include <stddef.h>
+#include "unitypes.h"
+
+extern int u16_mbtouc_safe_aux (ucs4_t *puc, const uint16_t *s, size_t n);
+
+/* Return the length (number of units) of the first character in S, putting
+   its 'ucs4_t' representation in *PUC.
+   The number of available units, N, must be > 0.  */
+static inline int
+u16_mbtouc_safe (ucs4_t *puc, const uint16_t *s, size_t n)
+{
+  uint16_t c = *s;
+
+  if (c < 0xd800 || c >= 0xe000)
+    {
+      *puc = c;
+      return 1;
+    }
+  else
+    return u16_mbtouc_safe_aux (puc, s, n);
+}
+
+#endif /* _UTF16_UCS4_SAFE_H */

new file mode 100644
--- /dev/null
+++ b/modules/utf16-ucs4-safe
@@ -0,0 +1,25 @@
+Description:
+Conversion UTF-16 to UCS-4.
+
+Files:
+lib/utf16-ucs4-safe.h
+lib/unistr/utf16-ucs4-safe.c
+m4/utf-ucs4.m4
+
+Depends-on:
+
+configure.ac:
+gl_UTF_UCS4
+
+Makefile.am:
+lib_SOURCES += utf16-ucs4-safe.h unistr/utf16-ucs4-safe.c
+
+Include:
+"utf16-ucs4-safe.h"
+
+License:
+LGPL
+
+Maintainer:
+Bruno Haible
+