3 files changed, 6 insertions, 5 deletions
diff --git a/src/components/include/transport_manager/error.h b/src/components/include/transport_manager/error.h
index 022ddf0e38..ba357dd54b 100644
--- a/src/components/include/transport_manager/error.h
+++ b/src/components/include/transport_manager/error.h
@@ -34,7 +34,7 @@
 #define SRC_COMPONENTS_INCLUDE_TRANSPORT_MANAGER_ERROR_H_
 
 #include <string>
-#include <utils/shared_ptr.h>
+#include <memory>
 
 namespace transport_manager {
 
@@ -79,7 +79,7 @@ class BaseError {
  private:
   std::string description_;
 };
-typedef utils::SharedPtr<BaseError> BaseErrorPtr;
+typedef std::shared_ptr<BaseError> BaseErrorPtr;
 
 /**
  * @brief Error that originates during device search.
diff --git a/src/components/include/transport_manager/transport_adapter/device.h b/src/components/include/transport_manager/transport_adapter/device.h
index 148e715050..1ac1424477 100644
--- a/src/components/include/transport_manager/transport_adapter/device.h
+++ b/src/components/include/transport_manager/transport_adapter/device.h
@@ -35,9 +35,10 @@
 
 #include <string>
 #include <vector>
+#include <memory>
 
 #include "transport_manager/common.h"
-#include "utils/shared_ptr.h"
+
 #include "utils/macro.h"
 
 namespace transport_manager {
@@ -160,7 +161,7 @@ class Device {
    **/
   bool keep_on_disconnect_;
 };
-typedef utils::SharedPtr<Device> DeviceSptr;
+typedef std::shared_ptr<Device> DeviceSptr;
 typedef std::vector<DeviceSptr> DeviceVector;
 }  // namespace transport_adapter
 }  // namespace transport_manager
diff --git a/src/components/include/transport_manager/transport_adapter/transport_adapter.h b/src/components/include/transport_manager/transport_adapter/transport_adapter.h
index c00adb33b8..630ec4e85f 100644
--- a/src/components/include/transport_manager/transport_adapter/transport_adapter.h
+++ b/src/components/include/transport_manager/transport_adapter/transport_adapter.h
@@ -44,7 +44,7 @@
 #include <list>
 #include <map>
 
-#include "utils/shared_ptr.h"
+
 
 #include "transport_manager/transport_adapter/device.h"
 #include "transport_manager/common.h"