diff --git a/src/encoding/block.cpp b/src/encoding/block.cpp
index 38fb85b..e3730c3 100644
--- a/src/encoding/block.cpp
+++ b/src/encoding/block.cpp
@@ -148,7 +148,7 @@
       throw Tlv::Error("Not enough data in the buffer to fully parse TLV");
     }
 
-  m_buffer = ptr_lib::make_shared<Buffer>(buffer, (tmp_begin - buffer) + length);
+  m_buffer = make_shared<Buffer>(buffer, (tmp_begin - buffer) + length);
 
   m_begin = m_buffer->begin();
   m_end = m_buffer->end();
@@ -173,7 +173,7 @@
       throw Tlv::Error("Not enough data in the buffer to fully parse TLV");
     }
 
-  m_buffer = ptr_lib::make_shared<Buffer>(buffer, (tmp_begin - buffer) + length);
+  m_buffer = make_shared<Buffer>(buffer, (tmp_begin - buffer) + length);
 
   m_begin = m_buffer->begin();
   m_end = m_buffer->end();
diff --git a/src/encoding/buffer.hpp b/src/encoding/buffer.hpp
index 3130a73..d4b14c0 100644
--- a/src/encoding/buffer.hpp
+++ b/src/encoding/buffer.hpp
@@ -175,7 +175,7 @@
  *      OBufferStream obuf;
  *      obuf.put(0);
  *      obuf.write(another_buffer, another_buffer_size);
- *      ptr_lib::shared_ptr<Buffer> buf = obuf.get();
+ *      shared_ptr<Buffer> buf = obuf.get();
  * @endcode
  */
 struct OBufferStream : public boost::iostreams::stream<iostreams::buffer_append_device>
@@ -184,7 +184,7 @@
    * Default constructor
    */
   OBufferStream()
-    : m_buffer(ptr_lib::make_shared<Buffer>())
+    : m_buffer(make_shared<Buffer>())
     , m_device(*m_buffer)
   {
     open(m_device);
@@ -193,7 +193,7 @@
   /**
    * Flush written data to the stream and return shared pointer to the underlying buffer
    */
-  ptr_lib::shared_ptr<Buffer>
+  shared_ptr<Buffer>
   buf()
   {
     flush();