diff --git a/src/dataencode.cpp b/src/dataencode.cpp
index edbdfac..eacea33 100644
--- a/src/dataencode.cpp
+++ b/src/dataencode.cpp
@@ -530,7 +530,7 @@ void from_wire_field(Buffer& buf, TypeStore& ctxt,  const FieldDesc* desc, const
             break;
 
         case TypeCode::Any: {
-            std::shared_ptr<std::vector<FieldDesc>> descs(new std::vector<FieldDesc>);
+            auto descs(std::make_shared<std::vector<FieldDesc>>());
             TypeDeserContext dc{*descs, ctxt};
 
             from_wire(buf, dc);
@@ -641,7 +641,7 @@ void from_wire_field(Buffer& buf, TypeStore& ctxt,  const FieldDesc* desc, const
 
             for(auto& elem : arr) {
                 if(from_wire_as<uint8_t>(buf)!=0) { // strictly 1 or 0
-                    std::shared_ptr<std::vector<FieldDesc>> descs(new std::vector<FieldDesc>);
+                    auto descs(std::make_shared<std::vector<FieldDesc>>());
                     TypeDeserContext dc{*descs, ctxt};
 
                     from_wire(buf, dc);
@@ -703,7 +703,7 @@ void from_wire_valid(Buffer& buf, TypeStore& ctxt, Value& val)
 
 void from_wire_type_value(Buffer& buf, TypeStore& ctxt, Value& val)
 {
-    std::shared_ptr<std::vector<FieldDesc>> descs(new std::vector<FieldDesc>);
+    auto descs(std::make_shared<std::vector<FieldDesc>>());
     TypeDeserContext dc{*descs, ctxt};
 
     from_wire(buf, dc);
diff --git a/src/server.cpp b/src/server.cpp
index 3da0990..60da784 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -110,7 +110,7 @@ Server::Server(Config&& conf)
      * Which need to safely access server storage, but should not
      * prevent a server from stopping.
      */
-    std::shared_ptr<Pvt> internal(new Pvt(std::move(conf)));
+    auto internal(std::make_shared<Pvt>(std::move(conf)));
     internal->internal_self = internal;
 
     // external
diff --git a/src/serverchan.cpp b/src/serverchan.cpp
index fbbb78f..bb33750 100644
--- a/src/serverchan.cpp
+++ b/src/serverchan.cpp
@@ -275,7 +275,7 @@ void ServerConn::handle_CREATE_CHANNEL()
                 sid = nextSID++;
             } while(chanBySID.find(sid)!=chanBySID.end());
 
-            std::shared_ptr<ServerChan> chan(new ServerChan(self, sid, cid, name));
+            auto chan(std::make_shared<ServerChan>(self, sid, cid, name));
             std::unique_ptr<server::ChannelControl> op(new ServerChannelControl(self, chan));
 
             for(auto& pair : iface->server->sources) {
diff --git a/src/serverconn.cpp b/src/serverconn.cpp
index 1b57fb2..d097abb 100644
--- a/src/serverconn.cpp
+++ b/src/serverconn.cpp
@@ -524,7 +524,7 @@ void ServIface::onConnS(struct evconnlistener *listener, evutil_socket_t sock, s
             evutil_closesocket(sock);
             return;
         }
-        std::shared_ptr<ServerConn> conn(new ServerConn(self, sock, peer, socklen));
+        auto conn(std::make_shared<ServerConn>(self, sock, peer, socklen));
         self->server->connections[conn.get()] = std::move(conn);
     }catch(std::exception& e){
         log_printf(connsetup, PLVL_CRIT, "Interface %s Unhandled error in accept callback: %s\n", self->name.c_str(), e.what());
diff --git a/src/serverget.cpp b/src/serverget.cpp
index 4b59e04..89d8031 100644
--- a/src/serverget.cpp
+++ b/src/serverget.cpp
@@ -319,7 +319,7 @@ void ServerConn::handle_GPR(pva_app_msg_t cmd)
             return;
         }
 
-        std::shared_ptr<ServerGPR> op(new ServerGPR(chan, ioid));
+        auto op(std::make_shared<ServerGPR>(chan, ioid));
         op->cmd = cmd;
         std::unique_ptr<ServerGPRConnect> ctrl(new ServerGPRConnect(this, iface->server->internal_self, chan->name, pvRequest, op));
 
diff --git a/src/serverintrospect.cpp b/src/serverintrospect.cpp
index fefc612..3baf66a 100644
--- a/src/serverintrospect.cpp
+++ b/src/serverintrospect.cpp
@@ -137,7 +137,7 @@ void ServerConn::handle_GET_FIELD()
         return;
     }
 
-    std::shared_ptr<ServerIntrospect> op(new ServerIntrospect(chan, ioid));
+    auto op(std::make_shared<ServerIntrospect>(chan, ioid));
     std::unique_ptr<ServerIntrospectControl> ctrl(new ServerIntrospectControl(this, chan.get(), iface->server->internal_self, op));
 
     op->state = ServerOp::Executing; // this is a one-shot operation
diff --git a/src/type.cpp b/src/type.cpp
index 849c220..10c1cf1 100644
--- a/src/type.cpp
+++ b/src/type.cpp
@@ -134,7 +134,7 @@ Member::Member(TypeCode code, const std::string& name, const std::string& id, st
 
 TypeDef::TypeDef(TypeCode code, const std::string& id, std::initializer_list<Member> children)
 {
-    decltype (top) temp(new Member(code, "", id, children));
+    auto temp(std::make_shared<Member>(code, "", id, children));
     top = std::move(temp);
 }
 
@@ -154,7 +154,7 @@ void copy_tree(const FieldDesc* desc, Member& node)
 TypeDef::TypeDef(const Value& o)
 {
     if(o.desc) {
-        std::shared_ptr<Member> root(new Member(o.desc->code, o.desc->id));
+        auto root(std::make_shared<Member>(o.desc->code, o.desc->id));
 
         copy_tree(o.desc, *root);
         top = std::move(root);