Index: src/prelude/extras.c
===================================================================
--- src/prelude/extras.c	(revision fbcb35488c190b8e3845a1a9572c9c931586897f)
+++ src/prelude/extras.c	(revision 1dcd955480c332b81ce157f2b7ccf8e34ad2acd3)
@@ -1,3 +1,5 @@
-#include <stddef.h>
-#include <stdlib.h>
-#include <stdio.h>
+#include <stddef.h>					// size_t, ptrdiff_t
+#include <uchar.h>					// char16_t, char32_t
+#include <wchar.h>					// wchar_t
+#include <stdlib.h>					// malloc, free, exit, atexit, abort
+#include <stdio.h>					// printf
Index: src/prelude/extras.regx
===================================================================
--- src/prelude/extras.regx	(revision fbcb35488c190b8e3845a1a9572c9c931586897f)
+++ src/prelude/extras.regx	(revision 1dcd955480c332b81ce157f2b7ccf8e34ad2acd3)
@@ -1,8 +1,11 @@
 typedef.* size_t;
 typedef.* ptrdiff_t;
+typedef.* char16_t;
+typedef.* char32_t;
+typedef.* wchar_t;
+extern.*\*malloc\(.*\).*
+extern.* free\(.*\).*
+extern.* exit\(.*\).*
+extern.* atexit\(.*\).*
 extern.* abort\(.*\).*
-extern.* atexit\(.*\).*
-extern.* exit\(.*\).*
-extern.* free\(.*\).*
-extern.*\*malloc\(.*\).*
 extern.* printf\(.*\).*