diff --git a/protocols/acn/pdu.h b/protocols/acn/pdu.h
index a094579..3eb3228 100644
--- a/protocols/acn/pdu.h
+++ b/protocols/acn/pdu.h
@@ -75,9 +75,7 @@ struct Block
   /**
    * @brief member Messages of this block
    */
-  std::shared_ptr<std::vector<Message<T>>> pdu
-                             = std::shared_ptr<std::vector<Message<T>>>
-                                          (new std::vector<Message<T>>);
+  std::shared_ptr<std::vector<Message<T>>> pdu = std::make_shared<std::vector<Message<T>>>();
   /**
    * @brief setParent
    * @param parent
diff --git a/protocols/otp/advertisement.cpp b/protocols/otp/advertisement.cpp
index 458e18b..b23a191 100644
--- a/protocols/otp/advertisement.cpp
+++ b/protocols/otp/advertisement.cpp
@@ -216,13 +216,13 @@ void pdu::iStream(PDU::Stream stream)
   switch (vector)
     {
     case VECTOR_OTP_ADVERTISEMENT_MODULE:
-      d->payload = std::shared_ptr<Module::pdu>(new Module::pdu());
+      d->payload = std::make_shared<Module::pdu>();
       break;
     case VECTOR_OTP_ADVERTISEMENT_NAME:
-      d->payload = std::shared_ptr<Name::pdu>(new Name::pdu());
+      d->payload = std::make_shared<Name::pdu>();
       break;
     case VECTOR_OTP_ADVERTISEMENT_SYSTEM:
-      d->payload = std::shared_ptr<System::pdu>(new System::pdu());
+      d->payload = std::make_shared<System::pdu>();
       break;
     default:
       return;
diff --git a/protocols/otp/base.cpp b/protocols/otp/base.cpp
index 60ca2f5..22e8e50 100644
--- a/protocols/otp/base.cpp
+++ b/protocols/otp/base.cpp
@@ -137,11 +137,11 @@ void pdu::iStream(PDU::Stream stream)
   switch (vector)
     {
     case VECTOR_OTP_TRANSFORM_MESSAGE:
-      d->payload = std::shared_ptr<Transform::pdu>(new Transform::pdu());
+      d->payload = std::make_shared<Transform::pdu>();
       d->payload->iStream(stream_);
       break;
     case VECTOR_OTP_ADVERTISEMENT_MESSAGE:
-      d->payload = std::shared_ptr<Advertisement::pdu>(new Advertisement::pdu());
+      d->payload = std::make_shared<Advertisement::pdu>();
       d->payload->iStream(stream_);
       break;
     }
diff --git a/protocols/otp/pdu.h b/protocols/otp/pdu.h
index c2e04e1..73aaf61 100644
--- a/protocols/otp/pdu.h
+++ b/protocols/otp/pdu.h
@@ -58,8 +58,7 @@ struct Block
    * @brief Messages contained in the block
    */
   std::shared_ptr<std::vector<std::shared_ptr<T>>> members
-                             = std::shared_ptr<std::vector<std::shared_ptr<T>>>
-                                          (new std::vector<std::shared_ptr<T>>);
+                          = std::make_shared<std::vector<std::shared_ptr<T>>>();
   /**
    * @brief setParent
    * @param parent
diff --git a/protocols/rpt/rpt.cpp b/protocols/rpt/rpt.cpp
index 827c0ad..137c9f2 100644
--- a/protocols/rpt/rpt.cpp
+++ b/protocols/rpt/rpt.cpp
@@ -248,13 +248,13 @@ void Pdu::iStream(ACN::PDU::Stream stream)
   switch (vector())
     {
     case VECTOR_RPT_REQUEST:
-      data->pdu = std::shared_ptr<REQUEST::Pdu>(new REQUEST::Pdu());
+      data->pdu = std::make_shared<REQUEST::Pdu>();
       break;
     case VECTOR_RPT_STATUS:
-      data->pdu = std::shared_ptr<STATUS::Pdu>(new STATUS::Pdu());
+      data->pdu = std::make_shared<STATUS::Pdu>();
       break;
     case VECTOR_RPT_NOTIFICATION:
-      data->pdu = std::shared_ptr<NOTIFICATION::Pdu>(new NOTIFICATION::Pdu());
+      data->pdu = std::make_shared<NOTIFICATION::Pdu>();
       break;
     default:
       return;