Index: uspace/lib/c/include/inttypes.h
===================================================================
--- uspace/lib/c/include/inttypes.h	(revision c9f3e7e90bf5ef1a7d8f76f8717c35a796152375)
+++ uspace/lib/c/include/inttypes.h	(revision d4da8601eeecd6ff5bc2be80760523864c341a26)
@@ -36,7 +36,4 @@
 #define LIBC_INTTYPES_H_
 
-// TODO: Remove
-#include <_bits/all.h>
-
 #include <_bits/inttypes.h>
 
Index: uspace/lib/c/include/io/charfield.h
===================================================================
--- uspace/lib/c/include/io/charfield.h	(revision c9f3e7e90bf5ef1a7d8f76f8717c35a796152375)
+++ uspace/lib/c/include/io/charfield.h	(revision d4da8601eeecd6ff5bc2be80760523864c341a26)
@@ -38,4 +38,5 @@
 
 #include <stdbool.h>
+#include <wchar.h>
 #include <io/color.h>
 #include <io/style.h>
Index: uspace/lib/c/include/stddef.h
===================================================================
--- uspace/lib/c/include/stddef.h	(revision c9f3e7e90bf5ef1a7d8f76f8717c35a796152375)
+++ uspace/lib/c/include/stddef.h	(revision d4da8601eeecd6ff5bc2be80760523864c341a26)
@@ -36,7 +36,4 @@
 #define LIBC_STDDEF_H_
 
-// TODO: Remove
-#include <_bits/all.h>
-
 #include <_bits/size_t.h>
 #include <_bits/ptrdiff_t.h>
Index: uspace/lib/c/include/stdint.h
===================================================================
--- uspace/lib/c/include/stdint.h	(revision c9f3e7e90bf5ef1a7d8f76f8717c35a796152375)
+++ uspace/lib/c/include/stdint.h	(revision d4da8601eeecd6ff5bc2be80760523864c341a26)
@@ -36,7 +36,4 @@
 #define LIBC_STDINT_H_
 
-// TODO: Remove
-#include <_bits/all.h>
-
 #include <_bits/stdint.h>
 
Index: uspace/lib/c/include/wchar.h
===================================================================
--- uspace/lib/c/include/wchar.h	(revision d4da8601eeecd6ff5bc2be80760523864c341a26)
+++ uspace/lib/c/include/wchar.h	(revision d4da8601eeecd6ff5bc2be80760523864c341a26)
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2017 CZ.NIC, z.s.p.o.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* Authors:
+ *	Jiří Zárevúcky (jzr) <zarevucky.jiri@gmail.com>
+ */
+
+/** @addtogroup libc
+ * @{
+ */
+/** @file
+ */
+
+#ifndef LIBC_WCHAR_H_
+#define LIBC_WCHAR_H_
+
+#include <_bits/size_t.h>
+#include <_bits/wchar_t.h>
+#include <_bits/wint_t.h>
+
+#include <_bits/NULL.h>
+#include <_bits/WCHAR_MIN.h>
+#include <_bits/WCHAR_MAX.h>
+#include <_bits/WEOF.h>
+
+#endif
+
+/** @}
+ */