Index: uspace/lib/cpp/include/impl/type_traits.hpp
===================================================================
--- uspace/lib/cpp/include/impl/type_traits.hpp	(revision 2084bfcd2218ed50144a23dc3b17bf640d5d23a4)
+++ uspace/lib/cpp/include/impl/type_traits.hpp	(revision 8ac215d3ef9fa45981854eb3814449c8e57e1a28)
@@ -31,4 +31,5 @@
 
 #include <cstdlib>
+#include <cstddef>
 
 namespace std
@@ -55,5 +56,5 @@
             return value;
         }
-    }
+    };
 
     using true_type = integral_constant<bool, true>;
@@ -70,24 +71,128 @@
     using remove_cv_t = typename remove_cv<T>::type;
 
-    template<class T>
-    struct is_void: aux::is_void<remove_cv_t<T>>;
-
-    template<class T>
-    struct is_null_pointer: aux::is_null_pointer<remove_cv_t<T>>;
-
-    template<class T>
-    struct is_integral: aux::is_integral<remove_cv_t<T>>;
-
-    template<class T>
-    struct is_floating_point: aux::is_floating_point<remove_cv_t<T>>;
-
-    template<class>
-    struct is_array: false_type;
-
-    template<class T>
-    struct is_array<T[]>: true_type;
-
-    template<class T>
-    struct is_pointer: aux::is_pointer<remove_cv_t<T>>;
+    template<class>
+    struct __is_void: false_type
+    { /* DUMMY BODY */ };
+
+    template<>
+    struct __is_void<void>: true_type
+    { /* DUMMY BODY */ };
+
+    template<class T>
+    struct is_void: __is_void<remove_cv_t<T>>
+    { /* DUMMY BODY */ };
+
+    template<class>
+    struct __is_null_pointer: false_type
+    { /* DUMMY BODY */ };
+
+    template<>
+    struct __is_null_pointer<nullptr_t>: true_type
+    { /* DUMMY BODY */ };
+
+    template<class T>
+    struct is_null_pointer: __is_null_pointer<remove_cv_t<T>>
+    { /* DUMMY BODY */ };
+
+    template<class T>
+    struct __is_integral: false_type
+    { /* DUMMY BODY */ };
+
+    template<>
+    struct __is_integral<bool>: true_type
+    { /* DUMMY BODY */ };
+
+    template<>
+    struct __is_integral<char>: true_type
+    { /* DUMMY BODY */ };
+
+    template<>
+    struct __is_integral<signed char>: true_type
+    { /* DUMMY BODY */ };
+
+    template<>
+    struct __is_integral<unsigned char>: true_type
+    { /* DUMMY BODY */ };
+
+    /* TODO: Problem - wchar_t is typedef'd to int here.
+    template<>
+    struct __is_integral<wchar_t>;
+    */
+
+    template<>
+    struct __is_integral<long>: true_type
+    { /* DUMMY BODY */ };
+
+    template<>
+    struct __is_integral<unsigned long>: true_type
+    { /* DUMMY BODY */ };
+
+    template<>
+    struct __is_integral<int>: true_type
+    { /* DUMMY BODY */ };
+
+    template<>
+    struct __is_integral<unsigned int>: true_type
+    { /* DUMMY BODY */ };
+
+    template<>
+    struct __is_integral<short>: true_type
+    { /* DUMMY BODY */ };
+
+    template<>
+    struct __is_integral<unsigned short>: true_type
+    { /* DUMMY BODY */ };
+
+    template<>
+    struct __is_integral<long long>: true_type
+    { /* DUMMY BODY */ };
+
+    template<>
+    struct __is_integral<unsigned long long>: true_type
+    { /* DUMMY BODY */ };
+
+    template<class T>
+    struct is_integral: __is_integral<remove_cv_t<T>>
+    { /* DUMMY BODY */ };
+
+    template<class>
+    struct __is_floating_point: false_type
+    { /* DUMMY BODY */ };
+
+    template<>
+    struct __is_floating_point<float>: true_type
+    { /* DUMMY BODY */ };
+
+    template<>
+    struct __is_floating_point<double>: true_type
+    { /* DUMMY BODY */ };
+
+    template<>
+    struct __is_floating_point<long double>: true_type
+    { /* DUMMY BODY */ };
+
+    template<class T>
+    struct is_floating_point: __is_floating_point<remove_cv_t<T>>
+    { /* DUMMY BODY */ };
+
+    template<class>
+    struct is_array: false_type
+    { /* DUMMY BODY */ };
+
+    template<class T>
+    struct is_array<T[]>: true_type
+    { /* DUMMY BODY */ };
+
+    template<class>
+    struct __is_pointer: false_type
+    { /* DUMMY BODY */ };
+
+    template<class T>
+    struct __is_pointer<T*>: true_type
+    { /* DUMMY BODY */ };
+
+    template<class T>
+    struct is_pointer: __is_pointer<remove_cv_t<T>>
+    { /* DUMMY BODY */ };
 
     template<class T>
@@ -276,8 +381,10 @@
 
     template<class T, class U>
-    struct is_same: false_type;
-
-    template<class T>
-    struct is_same<T, T>: true_type;
+    struct is_same: false_type
+    { /* DUMMY BODY */ };
+
+    template<class T>
+    struct is_same<T, T>: true_type
+    { /* DUMMY BODY */ };
 
     template<class Base, class Derived>
Index: pace/lib/cpp/include/internal/meta_helpers.hpp
===================================================================
--- uspace/lib/cpp/include/internal/meta_helpers.hpp	(revision 2084bfcd2218ed50144a23dc3b17bf640d5d23a4)
+++ 	(revision )
@@ -1,101 +1,0 @@
-/*
- * 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.
- */
-
-namespace std
-{
-
-namespace aux
-{
-    template<class T>
-    struct is_void: false_type;
-
-    template<>
-    struct is_void<void>: true_type;
-
-    template<class T>
-    struct is_integral: false_type;
-
-    template<>
-    struct is_integral<bool>: true_type;
-
-    template<>
-    struct is_integral<char>: true_type;
-
-    template<>
-    struct is_integral<signed char>: true_type;
-
-    template<>
-    struct is_integral<unsigned char>: true_type;
-
-    template<>
-    struct is_integral<wchar_t>: true_type;
-
-    template<>
-    struct is_integral<long>: true_type;
-
-    template<>
-    struct is_integral<unsigned long>: true_type;
-
-    template<>
-    struct is_integral<int>: true_type;
-
-    template<>
-    struct is_integral<unsigned int>: true_type;
-
-    template<>
-    struct is_integral<short>: true_type;
-
-    template<>
-    struct is_integral<unsigned short>: true_type;
-
-    template<>
-    struct is_integral<long long>: true_type;
-
-    template<>
-    struct is_integral<unsigned long long>: true_type;
-
-    template<class T>
-    struct is_floating_point: false_type;
-
-    template<>
-    struct is_floating_point<float>: true_type;
-
-    template<>
-    struct is_floating_point<double>: true_type;
-
-    template<>
-    struct is_floating_point<long double>: true_type;
-
-    template<class>
-    struct is_pointer: false_type;
-
-    template<class T>
-    struct is_pointer<T*>: true_type;
-}
-
-}