Index: uspace/lib/cpp/include/internal/locale.hpp
===================================================================
--- uspace/lib/cpp/include/internal/locale.hpp	(revision c729a60b4f499d18d9755e92e7587ac632b7fd47)
+++ uspace/lib/cpp/include/internal/locale.hpp	(revision f2ba4c79fa9e024ce49cbe808076a054e9cd2dd8)
@@ -35,10 +35,4 @@
 {
     class locale;
-
-    template<class Facet>
-    const Facet& use_facet(const locale& loc);
-
-    template<class Facet>
-    bool has_facet(const locale& loc);
 
     /**
@@ -152,18 +146,18 @@
 
             template<class Facet>
-            friend const Facet& use_facet(const locale&);
+            /* friend const Facet& use_facet(const locale&); */
+            friend Facet use_facet(const locale&);
 
             template<class Facet>
-            const Facet& get_() const
+            /* const Facet& get_() const */
+            Facet get_() const
             {
-                // TODO: A VERY ugly hack, when we have map/shared ptr,
-                //       we should implement facets and store them in a map
-                //       and return them here by their IDs.
-                return *(new Facet{0u});
+                return Facet{0U};
             }
     };
 
     template<class Facet>
-    const Facet& use_facet(const locale& loc)
+    /* const Facet& use_facet(const locale& loc) */
+    Facet use_facet(const locale& loc)
     {
         return loc.get_<Facet>();