Index: testsuites/psxtests/Makefile.am
===================================================================
--- testsuites/psxtests/Makefile.am	(revision f70079ca20b11da6e481ddfeab4516545ec71cbd)
+++ testsuites/psxtests/Makefile.am	(revision add0b6a3f5cd7638285aeb5f6132aee20af9ca70)
@@ -1613,4 +1613,8 @@
 ## lib_a_SOURCES += psxhdrs/ucontext/setcontext.c  See ticket #3640
 ## lib_a_SOURCES += psxhdrs/ucontext/swapcontext.c See ticket #3640
+## lib_a_SOURCES += psxhdrs/c11/uchar/c16rtomb.c   See ticket #3643
+## lib_a_SOURCES += psxhdrs/c11/uchar/c32rtomb.c   See ticket #3643
+## lib_a_SOURCES += psxhdrs/c11/uchar/c32rtomb.c   See ticket #3643
+## lib_a_SOURCES += psxhdrs/c11/uchar/mbrtoc32.c   See ticket #3643
 endif
 
Index: testsuites/psxtests/psxhdrs/c11/uchar/c16rtomb.c
===================================================================
--- testsuites/psxtests/psxhdrs/c11/uchar/c16rtomb.c	(revision add0b6a3f5cd7638285aeb5f6132aee20af9ca70)
+++ testsuites/psxtests/psxhdrs/c11/uchar/c16rtomb.c	(revision add0b6a3f5cd7638285aeb5f6132aee20af9ca70)
@@ -0,0 +1,41 @@
+/**
+ *  @file
+ *  @brief c16rtomb() API Conformance Test. This is a C11 method.
+ */
+
+/*
+ *  COPYRIGHT (c) 2018.
+ *  MarÃ§al Comajoan Cara
+ *
+ *  Permission to use, copy, modify, and/or distribute this software
+ *  for any purpose with or without fee is hereby granted.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+ *  WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR
+ *  BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES
+ *  OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ *  WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ *  ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <uchar.h>
+#include <stdlib.h>
+
+int test( void );
+
+int test( void )
+{
+  char16_t* c16_str = u"Mar\u00E7al";
+  char out[MB_CUR_MAX];
+  mbstate_t mbs;
+  int result;
+
+  result = c16rtomb( out, *c16_str, &mbs );
+
+  return result;
+}
Index: testsuites/psxtests/psxhdrs/c11/uchar/c32rtomb.c
===================================================================
--- testsuites/psxtests/psxhdrs/c11/uchar/c32rtomb.c	(revision add0b6a3f5cd7638285aeb5f6132aee20af9ca70)
+++ testsuites/psxtests/psxhdrs/c11/uchar/c32rtomb.c	(revision add0b6a3f5cd7638285aeb5f6132aee20af9ca70)
@@ -0,0 +1,41 @@
+/**
+ *  @file
+ *  @brief c32rtomb() API Conformance Test. This is a C11 method.
+ */
+
+/*
+ *  COPYRIGHT (c) 2018.
+ *  MarÃ§al Comajoan Cara
+ *
+ *  Permission to use, copy, modify, and/or distribute this software
+ *  for any purpose with or without fee is hereby granted.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+ *  WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR
+ *  BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES
+ *  OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ *  WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ *  ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <uchar.h>
+#include <stdlib.h>
+
+int test( void );
+
+int test( void )
+{
+  char32_t* c32_str = U"Mar\u00E7al";
+  char out[MB_CUR_MAX];
+  mbstate_t mbs;
+  int result;
+
+  result = c32rtomb( out, *c32_str, &mbs );
+
+  return result;
+}
Index: testsuites/psxtests/psxhdrs/c11/uchar/mbrtoc16.c
===================================================================
--- testsuites/psxtests/psxhdrs/c11/uchar/mbrtoc16.c	(revision add0b6a3f5cd7638285aeb5f6132aee20af9ca70)
+++ testsuites/psxtests/psxhdrs/c11/uchar/mbrtoc16.c	(revision add0b6a3f5cd7638285aeb5f6132aee20af9ca70)
@@ -0,0 +1,41 @@
+/**
+ *  @file
+ *  @brief mbrtoc16() API Conformance Test. This is a C11 method.
+ */
+
+/*
+ *  COPYRIGHT (c) 2018.
+ *  MarÃ§al Comajoan Cara
+ *
+ *  Permission to use, copy, modify, and/or distribute this software
+ *  for any purpose with or without fee is hereby granted.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+ *  WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR
+ *  BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES
+ *  OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ *  WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ *  ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <uchar.h>
+#include <stdlib.h>
+
+int test( void );
+
+int test( void )
+{
+  char16_t pc16;
+  char* str = u8"Mar\u00E7al";
+  mbstate_t mbs;
+  int result;
+
+  result = mbrtoc16( &pc16, str, MB_CUR_MAX, &mbs );
+
+  return result;
+}
Index: testsuites/psxtests/psxhdrs/c11/uchar/mbrtoc32.c
===================================================================
--- testsuites/psxtests/psxhdrs/c11/uchar/mbrtoc32.c	(revision add0b6a3f5cd7638285aeb5f6132aee20af9ca70)
+++ testsuites/psxtests/psxhdrs/c11/uchar/mbrtoc32.c	(revision add0b6a3f5cd7638285aeb5f6132aee20af9ca70)
@@ -0,0 +1,41 @@
+/**
+ *  @file
+ *  @brief mbrtoc32() API Conformance Test. This is a C11 method.
+ */
+
+/*
+ *  COPYRIGHT (c) 2018.
+ *  MarÃ§al Comajoan Cara
+ *
+ *  Permission to use, copy, modify, and/or distribute this software
+ *  for any purpose with or without fee is hereby granted.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+ *  WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR
+ *  BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES
+ *  OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ *  WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ *  ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <uchar.h>
+#include <stdlib.h>
+
+int test( void );
+
+int test( void )
+{
+  char32_t pc32;
+  char* str = u8"Mar\u00E7al";
+  mbstate_t mbs;
+  int result;
+
+  result = mbrtoc32( &pc32, str, MB_CUR_MAX, &mbs );
+
+  return result;
+}
