Index: uspace/lib/cpp/include/impl/mutex.hpp
===================================================================
--- uspace/lib/cpp/include/impl/mutex.hpp	(revision 5e5498e2ce0ea759ec67b9401b28f87219fc3408)
+++ uspace/lib/cpp/include/impl/mutex.hpp	(revision ecb072dd74c6fbab2346a55e1ece4b9ba84ede4e)
@@ -36,6 +36,6 @@
 {
     extern "C" {
-    #include <fibril.h>
-    #include <fibril_synch.h>
+        #include <fibril.h>
+        #include <fibril_synch.h>
     }
 
@@ -57,5 +57,5 @@
             void unlock();
 
-            using native_handle_type = fibril_mutex_t;
+            using native_handle_type = fibril_mutex_t*;
             native_handle_type native_handle();
 
@@ -81,5 +81,5 @@
             void unlock();
 
-            using native_handle_type = fibril_mutex_t;
+            using native_handle_type = fibril_mutex_t*;
             native_handle_type native_handle();
 
Index: uspace/lib/cpp/src/mutex.cpp
===================================================================
--- uspace/lib/cpp/src/mutex.cpp	(revision 5e5498e2ce0ea759ec67b9401b28f87219fc3408)
+++ uspace/lib/cpp/src/mutex.cpp	(revision ecb072dd74c6fbab2346a55e1ece4b9ba84ede4e)
@@ -68,5 +68,5 @@
     mutex::native_handle_type mutex::native_handle()
     {
-        return mtx_;
+        return &mtx_;
     }
 
@@ -121,5 +121,5 @@
     recursive_mutex::native_handle_type recursive_mutex::native_handle()
     {
-        return mtx_;
+        return &mtx_;
     }
 }