Index: uspace/lib/cpp/include/cstdint
===================================================================
--- uspace/lib/cpp/include/cstdint	(revision 6702d7e4640021e82718f35863e479a17935fbb0)
+++ uspace/lib/cpp/include/cstdint	(revision 921174cb269d86f4db702137db2e1fd8343c9eca)
@@ -1,4 +1,4 @@
 /*
- * Copyright (c) 2017 Jaroslav Jindrak
+ * Copyright (c) 2018 Jaroslav Jindrak
  * All rights reserved.
  *
@@ -32,31 +32,48 @@
 #include "internal/common.hpp"
 
+namespace std::hel
+{
+    extern "C" {
+        #include <stdint.h>
+    }
+}
+
 namespace std
 {
+    using int8_t  = std::hel::int8_t;
+    using int16_t = std::hel::int16_t;
+    using int32_t = std::hel::int32_t;
+    using int64_t = std::hel::int64_t;
 
-extern "C" {
-#include <stdint.h>
-}
+    using intmax_t = std::hel::intmax_t;
+    using intptr_t = std::hel::intptr_t;
 
-using int_fast8_t  = int8_t;
-using int_fast16_t = int16_t;
-using int_fast32_t = int32_t;
-using int_fast64_t = int64_t;
+    using int_fast8_t  = std::hel::int8_t;
+    using int_fast16_t = std::hel::int16_t;
+    using int_fast32_t = std::hel::int32_t;
+    using int_fast64_t = std::hel::int64_t;
 
-using int_least8_t  = int8_t;
-using int_least16_t = int16_t;
-using int_least32_t = int32_t;
-using int_least64_t = int64_t;
+    using int_least8_t  = std::hel::int8_t;
+    using int_least16_t = std::hel::int16_t;
+    using int_least32_t = std::hel::int32_t;
+    using int_least64_t = std::hel::int64_t;
 
-using uint_fast8_t  = uint8_t;
-using uint_fast16_t = uint16_t;
-using uint_fast32_t = uint32_t;
-using uint_fast64_t = uint64_t;
+    using uint8_t  = std::hel::uint8_t;
+    using uint16_t = std::hel::uint16_t;
+    using uint32_t = std::hel::uint32_t;
+    using uint64_t = std::hel::uint64_t;
 
-using uint_least8_t  = uint8_t;
-using uint_least16_t = uint16_t;
-using uint_least32_t = uint32_t;
-using uint_least64_t = uint64_t;
+    using uintmax_t = std::hel::uintmax_t;
+    using uintptr_t = std::hel::uintptr_t;
 
+    using uint_fast8_t  = std::hel::uint8_t;
+    using uint_fast16_t = std::hel::uint16_t;
+    using uint_fast32_t = std::hel::uint32_t;
+    using uint_fast64_t = std::hel::uint64_t;
+
+    using uint_least8_t  = std::hel::uint8_t;
+    using uint_least16_t = std::hel::uint16_t;
+    using uint_least32_t = std::hel::uint32_t;
+    using uint_least64_t = std::hel::uint64_t;
 }