Index: uspace/lib/cpp/include/cstring
===================================================================
--- uspace/lib/cpp/include/cstring	(revision a1aecb12e1acd6c228cecd2e91a411a9fb169a0c)
+++ uspace/lib/cpp/include/cstring	(revision 79c9e0fd1ca9b5e0f268ca01079a9e1902373314)
@@ -1,4 +1,4 @@
 /*
- * Copyright (c) 2017 Jaroslav Jindrak
+ * Copyright (c) 2018 Jaroslav Jindrak
  * All rights reserved.
  *
@@ -32,12 +32,69 @@
 #include "internal/common.hpp"
 
+namespace std::hel
+{
+    extern "C" {
+        #include <str.h>
+    }
+}
+
 namespace std
 {
+    using std::hel::size_t;
 
-extern "C" {
-#include <str.h>
+    /* using std::hel::strcpy; */
+    /* using std::hel::strncpy; */
+    /* using std::hel::strcat; */
+    /* using std::hel::strncat; */
+    /* using std::hel::strxfrm; */
+
+    /* using std::hel::strlen; */
+    /* using std::hel::strcmp; */
+    /* using std::hel::strncmp; */
+    /* using std::hel::strcoll; */
+    /* using std::hel::strchr; */
+    /* using std::hel::strrchr; */
+    /* using std::hel::strspn; */
+    /* using std::hel::strcspn; */
+    /* using std::hel::strpbrk; */
+    /* using std::hel::strstr; */
+    /* using std::hel::strok; */
+
+    /* using std::hel::memchr; */
+    using std::hel::memcmp;
+    using std::hel::memset;
+    using std::hel::memcpy;
+    using std::hel::memmove;
+
+    /* using std::hel::strerror; */
 }
 
-}
+using std::hel::size_t;
+
+/* using std::hel::strcpy; */
+/* using std::hel::strncpy; */
+/* using std::hel::strcat; */
+/* using std::hel::strncat; */
+/* using std::hel::strxfrm; */
+
+/* using std::hel::strlen; */
+/* using std::hel::strcmp; */
+/* using std::hel::strncmp; */
+/* using std::hel::strcoll; */
+/* using std::hel::strchr; */
+/* using std::hel::strrchr; */
+/* using std::hel::strspn; */
+/* using std::hel::strcspn; */
+/* using std::hel::strpbrk; */
+/* using std::hel::strstr; */
+/* using std::hel::strok; */
+
+/* using std::hel::memchr; */
+using std::hel::memcmp;
+using std::hel::memset;
+using std::hel::memcpy;
+using std::hel::memmove;
+
+/* using std::hel::strerror; */
 
 #endif
