diff --git a/src/requester.cpp b/src/requester.cpp
index 9bafeb8..de2d1a6 100644
--- a/src/requester.cpp
+++ b/src/requester.cpp
@@ -91,7 +91,7 @@
 {
   Name interestName = ca.m_caPrefix;
   interestName.append("CA").append("PROBE");
-  auto interest = make_shared<Interest>(interestName);
+  auto interest =std::make_shared<Interest>(interestName);
   interest->setMustBeFresh(true);
   interest->setCanBePrefix(false);
   interest->setApplicationParameters(PROBE::encodeApplicationParameters(std::move(probeInfo)));
@@ -160,7 +160,7 @@
   // generate Interest packet
   Name interestName = state.m_caItem.m_caPrefix;
   interestName.append("CA").append("NEW");
-  auto interest = make_shared<Interest>(interestName);
+  auto interest =std::make_shared<Interest>(interestName);
   interest->setMustBeFresh(true);
   interest->setCanBePrefix(false);
   interest->setApplicationParameters(
@@ -180,7 +180,7 @@
   // generate Interest packet
   Name interestName = state.m_caItem.m_caPrefix;
   interestName.append("CA").append("REVOKE");
-  auto interest = make_shared<Interest>(interestName);
+  auto interest =std::make_shared<Interest>(interestName);
   interest->setMustBeFresh(true);
   interest->setCanBePrefix(false);
   interest->setApplicationParameters(
@@ -237,7 +237,7 @@
 
   Name interestName = state.m_caItem.m_caPrefix;
   interestName.append("CA").append("CHALLENGE").append(state.m_requestId);
-  auto interest = make_shared<Interest>(interestName);
+  auto interest =std::make_shared<Interest>(interestName);
   interest->setMustBeFresh(true);
   interest->setCanBePrefix(false);
 
@@ -267,7 +267,7 @@
 Requester::genCertFetchInterest(const RequesterState& state)
 {
   Name interestName = state.m_issuedCertName;
-  auto interest = make_shared<Interest>(interestName);
+  auto interest =std::make_shared<Interest>(interestName);
   interest->setMustBeFresh(false);
   interest->setCanBePrefix(false);
   return interest;
