Index: uspace/lib/cpp/include/impl/utility.hpp
===================================================================
--- uspace/lib/cpp/include/impl/utility.hpp	(revision 2841b4f9e131da184916148443e811543d076e46)
+++ uspace/lib/cpp/include/impl/utility.hpp	(revision add816c71ff22ca10ecbce5cc96a1367b73f3c03)
@@ -62,4 +62,28 @@
 
     /**
+     * 20.2.4, forward/move helpers:
+     */
+
+    template<class T>
+    inline constexpr T&& forward(remove_reference_t<T>& t) noexcept
+    {
+        return static_cast<T&&>(t);
+    }
+
+    template<class T>
+    inline constexpr T&& forward(remove_reference_t<T>&& t) noexcept
+    {
+        // TODO: check if t is lvalue reference, if it is, the program
+        //       is ill-formed according to the standard
+        return static_cast<T&&>(t);
+    }
+
+    template<class T>
+    inline constexpr remove_reference_t<T>&& move(T&& t) noexcept
+    {
+        return static_cast<remove_reference_t<T>&&>(t);
+    }
+
+    /**
      * 20.2.2, swap:
      */
@@ -70,7 +94,7 @@
                  is_nothrow_move_assignable<T>::value)
     {
-        T tmp{std::move(x)};
-        x = std::move(y);
-        y = std::move(tmp);
+        T tmp{move(x)};
+        x = move(y);
+        y = move(tmp);
     }
 
@@ -88,32 +112,8 @@
     T exchange(T& obj, U&& new_val)
     {
-        T old_val = std::move(obj);
-        obj = std::forward<U>(new_val);
+        T old_val = move(obj);
+        obj = forward<U>(new_val);
 
         return old_val;
-    }
-
-    /**
-     * 20.2.4, forward/move helpers:
-     */
-
-    template<class T>
-    inline constexpr T&& forward(remove_reference_t<T>& t) noexcept
-    {
-        return static_cast<T&&>(t);
-    }
-
-    template<class T>
-    inline constexpr T&& forward(remove_reference_t<T>&& t) noexcept
-    {
-        // TODO: check if t is lvalue reference, if it is, the program
-        //       is ill-formed according to the standard
-        return static_cast<T&&>(t);
-    }
-
-    template<class T>
-    inline constexpr remove_reference_t<T>&& move(T&& t) noexcept
-    {
-        return static_cast<remove_reference_t<T>&&>(t);
     }