Index: uspace/Makefile
===================================================================
--- uspace/Makefile	(revision 0564a02eb4ba1d23bbdd0040a31077f926e58fba)
+++ uspace/Makefile	(revision a57a79cda8ae2a6e9b9e6060a4deaee78e8a1431)
@@ -216,4 +216,5 @@
 BASE_LIBS = \
 	lib/c \
+	lib/cpp \
 	lib/softint \
 	lib/softfloat \
@@ -221,5 +222,4 @@
 
 LIBS = \
-	lib/cpp \
 	lib/fs \
 	lib/block \
Index: uspace/app/cpptest/Makefile
===================================================================
--- uspace/app/cpptest/Makefile	(revision 0564a02eb4ba1d23bbdd0040a31077f926e58fba)
+++ uspace/app/cpptest/Makefile	(revision a57a79cda8ae2a6e9b9e6060a4deaee78e8a1431)
@@ -30,5 +30,5 @@
 
 # TODO: Force linker to link libcpp by default when linking cpp apps?
-LIBS = $(USPACE_PREFIX)/lib/cpp/libcpp.a
+LIBS = cpp
 
 BINARY = cpptest
Index: uspace/lib/c/include/stddef.h
===================================================================
--- uspace/lib/c/include/stddef.h	(revision 0564a02eb4ba1d23bbdd0040a31077f926e58fba)
+++ uspace/lib/c/include/stddef.h	(revision a57a79cda8ae2a6e9b9e6060a4deaee78e8a1431)
@@ -37,4 +37,5 @@
 
 #include <_bits/size_t.h>
+#include <_bits/ssize_t.h>
 #include <_bits/ptrdiff_t.h>
 #include <_bits/wchar_t.h>
Index: uspace/lib/cpp/Makefile
===================================================================
--- uspace/lib/cpp/Makefile	(revision 0564a02eb4ba1d23bbdd0040a31077f926e58fba)
+++ uspace/lib/cpp/Makefile	(revision a57a79cda8ae2a6e9b9e6060a4deaee78e8a1431)
@@ -33,6 +33,5 @@
 
 LIBRARY = libcpp
-SLIBRARY = libcpp.so.0.0
-LSONAME = libcpp.so.0
+SOVERSION = 0.0
 
 -include $(CONFIG_MAKEFILE)
Index: uspace/lib/cpp/include/cwchar
===================================================================
--- uspace/lib/cpp/include/cwchar	(revision a57a79cda8ae2a6e9b9e6060a4deaee78e8a1431)
+++ uspace/lib/cpp/include/cwchar	(revision a57a79cda8ae2a6e9b9e6060a4deaee78e8a1431)
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2017 Jaroslav Jindrak
+ * 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.
+ */
+
+#ifndef LIBCPP_WCHAR
+#define LIBCPP_WCHAR
+
+#include "internal/common.hpp"
+
+namespace std
+{
+
+extern "C" {
+#include <wchar.h>
+}
+
+}
+
+#endif
Index: uspace/lib/cpp/include/impl/string.hpp
===================================================================
--- uspace/lib/cpp/include/impl/string.hpp	(revision 0564a02eb4ba1d23bbdd0040a31077f926e58fba)
+++ uspace/lib/cpp/include/impl/string.hpp	(revision a57a79cda8ae2a6e9b9e6060a4deaee78e8a1431)
@@ -36,4 +36,5 @@
 #include <cstdlib>
 #include <cstring>
+#include <cwchar>
 #include <memory>
 #include <utility>