Index: uspace/lib/cpp/include/impl/utility.hpp
===================================================================
--- uspace/lib/cpp/include/impl/utility.hpp	(revision aa0fa86a044654d835de80d41ca4c94258a8374b)
+++ uspace/lib/cpp/include/impl/utility.hpp	(revision 1610aa356dcd6d6030b77210c6c9238bfea98375)
@@ -32,4 +32,5 @@
 #include <cstdint>
 #include <internal/type_transformation.hpp>
+#include <internal/utility/forward_move.hpp>
 #include <type_traits>
 
@@ -65,26 +66,4 @@
             return !(lhs < rhs);
         }
-    }
-
-    /**
-     * 20.2.4, forward/move helpers:
-     */
-
-    template<class T>
-    constexpr T&& forward(remove_reference_t<T>& t) noexcept
-    {
-        return static_cast<T&&>(t);
-    }
-
-    template<class T>
-    constexpr T&& forward(remove_reference_t<T>&& t) noexcept
-    {
-        return static_cast<T&&>(t);
-    }
-
-    template<class T>
-    constexpr remove_reference_t<T>&& move(T&& t) noexcept
-    {
-        return static_cast<remove_reference_t<T>&&>(t);
     }
 
@@ -124,13 +103,4 @@
         return old_val;
     }
-
-    /**
-     * 20.2.5, function template declval:
-     * Note: This function only needs declaration, not
-     *       implementation.
-     */
-
-    template<class T>
-    add_rvalue_reference_t<T> declval() noexcept;
 
     /**