diff --git a/coding/buffer_reader.hpp b/coding/buffer_reader.hpp
index 8c99d644d1..c35911a29a 100644
--- a/coding/buffer_reader.hpp
+++ b/coding/buffer_reader.hpp
@@ -40,9 +40,10 @@ public:
     return BufferReader(*this, pos, size);
   }
 
-  inline BufferReader * CreateSubReader(uint64_t pos, uint64_t size) const
+  inline unique_ptr<Reader> CreateSubReader(uint64_t pos, uint64_t size) const
   {
-    return new BufferReader(*this, pos, size);
+    // Can't use make_unique with private constructor.
+    return unique_ptr<Reader>(new BufferReader(*this, pos, size));
   }
 
 private:
diff --git a/coding/coding_tests/file_container_test.cpp b/coding/coding_tests/file_container_test.cpp
index e1c657d086..fa473a3802 100644
--- a/coding/coding_tests/file_container_test.cpp
+++ b/coding/coding_tests/file_container_test.cpp
@@ -33,8 +33,8 @@ UNIT_TEST(FilesContainer_Smoke)
 
     for (size_t i = 0; i < count; ++i)
     {
-      FilesContainerR::ReaderT r = reader.GetReader(strings::to_string(i));
-      ReaderSource<FilesContainerR::ReaderT> src(r);
+      FilesContainerR::TReader r = reader.GetReader(strings::to_string(i));
+      ReaderSource<FilesContainerR::TReader> src(r);
 
       for (uint32_t j = 0; j < i; ++j)
       {
@@ -59,8 +59,8 @@ UNIT_TEST(FilesContainer_Smoke)
     {
       FilesContainerR reader(fName);
 
-      FilesContainerR::ReaderT r = reader.GetReader(strings::to_string(arrAppend[i]));
-      ReaderSource<FilesContainerR::ReaderT> src(r);
+      FilesContainerR::TReader r = reader.GetReader(strings::to_string(arrAppend[i]));
+      ReaderSource<FilesContainerR::TReader> src(r);
 
       uint32_t const test = ReadVarUint<uint32_t>(src);
       TEST_EQUAL(arrAppend[i], test, ());
@@ -73,7 +73,7 @@ namespace
 {
   void CheckInvariant(FilesContainerR & reader, string const & tag, int64_t test)
   {
-    FilesContainerR::ReaderT r = reader.GetReader(tag);
+    FilesContainerR::TReader r = reader.GetReader(tag);
     TEST_EQUAL(test, ReadPrimitiveFromPos<int64_t>(r, 0), ());
   }
 }
@@ -107,7 +107,7 @@ UNIT_TEST(FilesContainer_Shared)
     // shared container read and fill
 
     FilesContainerR reader(fName);
-    FilesContainerR::ReaderT r1 = reader.GetReader("5");
+    FilesContainerR::TReader r1 = reader.GetReader("5");
     uint64_t const offset = sizeof(uint32_t);
     r1 = r1.SubReader(offset, r1.Size() - offset);
 
@@ -116,7 +116,7 @@ UNIT_TEST(FilesContainer_Shared)
     FilesContainerW writer(fName, FileWriter::OP_WRITE_EXISTING);
     FileWriter w = writer.GetWriter("3");
 
-    ReaderSource<FilesContainerR::ReaderT> src(r1);
+    ReaderSource<FilesContainerR::TReader> src(r1);
     for (uint32_t i = 0; i < count; ++i)
     {
       uint32_t test = ReadVarUint<uint32_t>(src);
@@ -152,7 +152,7 @@ namespace
 
     for (size_t i = 0; i < count; ++i)
     {
-      FilesContainerR::ReaderT r = reader.GetReader(key[i]);
+      FilesContainerR::TReader r = reader.GetReader(key[i]);
 
       size_t const szBuffer = 100;
       size_t const szS = strlen(value[i]);
diff --git a/coding/coding_tests/reader_test.cpp b/coding/coding_tests/reader_test.cpp
index 94dba654d9..64f910b923 100644
--- a/coding/coding_tests/reader_test.cpp
+++ b/coding/coding_tests/reader_test.cpp
@@ -113,7 +113,7 @@ UNIT_TEST(ReaderStreamBuf)
   }
 
   {
-    ReaderStreamBuf buffer(new FileReader(name));
+    ReaderStreamBuf buffer(make_unique<FileReader>(name));
     istream s(&buffer);
 
     std::string str;
diff --git a/coding/file_container.cpp b/coding/file_container.cpp
index fab8710331..4a1045687a 100644
--- a/coding/file_container.cpp
+++ b/coding/file_container.cpp
@@ -64,18 +64,18 @@ void FilesContainerBase::ReadInfo(ReaderT & reader)
 FilesContainerR::FilesContainerR(string const & filePath,
                                  uint32_t logPageSize,
                                  uint32_t logPageCount)
-  : m_source(new FileReader(filePath, logPageSize, logPageCount))
+  : m_source(make_unique<FileReader>(filePath, logPageSize, logPageCount))
 {
   ReadInfo(m_source);
 }
 
-FilesContainerR::FilesContainerR(ReaderT const & file)
+FilesContainerR::FilesContainerR(TReader const & file)
   : m_source(file)
 {
   ReadInfo(m_source);
 }
 
-FilesContainerR::ReaderT FilesContainerR::GetReader(Tag const & tag) const
+FilesContainerR::TReader FilesContainerR::GetReader(Tag const & tag) const
 {
   Info const * p = GetInfo(tag);
   if (!p)
@@ -413,7 +413,7 @@ FileWriter FilesContainerW::GetWriter(Tag const & tag)
 
 void FilesContainerW::Write(string const & fPath, Tag const & tag)
 {
-  Write(new FileReader(fPath), tag);
+  Write(ModelReaderPtr(make_unique<FileReader>(fPath)), tag);
 }
 
 void FilesContainerW::Write(ModelReaderPtr reader, Tag const & tag)
diff --git a/coding/file_container.hpp b/coding/file_container.hpp
index ea81e7d970..50458450f5 100644
--- a/coding/file_container.hpp
+++ b/coding/file_container.hpp
@@ -105,14 +105,14 @@ public:
 class FilesContainerR : public FilesContainerBase
 {
 public:
-  typedef ModelReaderPtr ReaderT;
+  using TReader = ModelReaderPtr;
 
   explicit FilesContainerR(string const & filePath,
                            uint32_t logPageSize = 10,
                            uint32_t logPageCount = 10);
-  explicit FilesContainerR(ReaderT const & file);
+  explicit FilesContainerR(TReader const & file);
 
-  ReaderT GetReader(Tag const & tag) const;
+  TReader GetReader(Tag const & tag) const;
 
   template <typename F> void ForEachTag(F f) const
   {
@@ -126,12 +126,11 @@ public:
   pair<uint64_t, uint64_t> GetAbsoluteOffsetAndSize(Tag const & tag) const;
 
 private:
-  ReaderT m_source;
+  TReader m_source;
 };
 
 namespace detail
 {
-
 class MappedFile
 {
   DISALLOW_COPY(MappedFile);
diff --git a/coding/file_reader.cpp b/coding/file_reader.cpp
index d0300bccd2..1ca0aff021 100644
--- a/coding/file_reader.cpp
+++ b/coding/file_reader.cpp
@@ -96,10 +96,11 @@ FileReader FileReader::SubReader(uint64_t pos, uint64_t size) const
   return FileReader(*this, m_Offset + pos, size);
 }
 
-FileReader * FileReader::CreateSubReader(uint64_t pos, uint64_t size) const
+unique_ptr<Reader> FileReader::CreateSubReader(uint64_t pos, uint64_t size) const
 {
   ASSERT ( AssertPosAndSize(pos, size), () );
-  return new FileReader(*this, m_Offset + pos, size);
+  // Can't use make_unique with private constructor.
+  return unique_ptr<Reader>(new FileReader(*this, m_Offset + pos, size));
 }
 
 bool FileReader::AssertPosAndSize(uint64_t pos, uint64_t size) const
diff --git a/coding/file_reader.hpp b/coding/file_reader.hpp
index 6008452f33..882b07b019 100644
--- a/coding/file_reader.hpp
+++ b/coding/file_reader.hpp
@@ -17,10 +17,10 @@ public:
 
   class FileReaderData;
 
-  uint64_t Size() const;
-  void Read(uint64_t pos, void * p, size_t size) const;
+  uint64_t Size() const override;
+  void Read(uint64_t pos, void * p, size_t size) const override;
   FileReader SubReader(uint64_t pos, uint64_t size) const;
-  FileReader * CreateSubReader(uint64_t pos, uint64_t size) const;
+  unique_ptr<Reader> CreateSubReader(uint64_t pos, uint64_t size) const override;
 
   inline uint64_t GetOffset() const { return m_Offset; }
 
diff --git a/coding/mmap_reader.cpp b/coding/mmap_reader.cpp
index 4d0f677dbc..53478fba0c 100644
--- a/coding/mmap_reader.cpp
+++ b/coding/mmap_reader.cpp
@@ -79,10 +79,11 @@ void MmapReader::Read(uint64_t pos, void * p, size_t size) const
   memcpy(p, m_data->m_memory + m_offset + pos, size);
 }
 
-MmapReader * MmapReader::CreateSubReader(uint64_t pos, uint64_t size) const
+unique_ptr<Reader> MmapReader::CreateSubReader(uint64_t pos, uint64_t size) const
 {
   ASSERT_LESS_OR_EQUAL(pos + size, Size(), (pos, size));
-  return new MmapReader(*this, m_offset + pos, size);
+  // Can't use make_unique with private constructor.
+  return unique_ptr<Reader>(new MmapReader(*this, m_offset + pos, size));
 }
 
 uint8_t * MmapReader::Data() const
diff --git a/coding/mmap_reader.hpp b/coding/mmap_reader.hpp
index 7e1a9d059b..8b41f66ec1 100644
--- a/coding/mmap_reader.hpp
+++ b/coding/mmap_reader.hpp
@@ -19,9 +19,9 @@ class MmapReader : public ModelReader
 public:
   explicit MmapReader(string const & fileName);
 
-  virtual uint64_t Size() const;
-  virtual void Read(uint64_t pos, void * p, size_t size) const;
-  virtual MmapReader * CreateSubReader(uint64_t pos, uint64_t size) const;
+  uint64_t Size() const override;
+  void Read(uint64_t pos, void * p, size_t size) const override;
+  unique_ptr<Reader> CreateSubReader(uint64_t pos, uint64_t size) const override;
 
   /// Direct file/memory access
   uint8_t * Data() const;
diff --git a/coding/reader.hpp b/coding/reader.hpp
index 09a1b73ec8..968395447e 100644
--- a/coding/reader.hpp
+++ b/coding/reader.hpp
@@ -4,10 +4,11 @@
 #include "base/assert.hpp"
 #include "base/exception.hpp"
 
+#include "std/cstring.hpp"
 #include "std/shared_array.hpp"
 #include "std/shared_ptr.hpp"
 #include "std/string.hpp"
-#include "std/cstring.hpp"
+#include "std/unique_ptr.hpp"
 #include "std/vector.hpp"
 
 // Base class for random-access Reader. Not thread-safe.
@@ -19,10 +20,12 @@ public:
   DECLARE_EXCEPTION(SizeException, Exception);
   DECLARE_EXCEPTION(ReadException, Exception);
 
+  using TReaderPtr = unique_ptr<Reader>;
+
   virtual ~Reader() {}
   virtual uint64_t Size() const = 0;
   virtual void Read(uint64_t pos, void * p, size_t size) const = 0;
-  virtual Reader * CreateSubReader(uint64_t pos, uint64_t size) const = 0;
+  virtual TReaderPtr CreateSubReader(uint64_t pos, uint64_t size) const = 0;
 
   void ReadAsString(string & s) const;
 
@@ -41,12 +44,12 @@ public:
   {
   }
 
-  inline uint64_t Size() const
+  inline uint64_t Size() const override
   {
     return m_size;
   }
 
-  inline void Read(uint64_t pos, void * p, size_t size) const
+  inline void Read(uint64_t pos, void * p, size_t size) const override
   {
     ASSERT ( AssertPosAndSize(pos, size), () );
     memcpy(p, m_pData + pos, size);
@@ -58,10 +61,10 @@ public:
     return MemReader(m_pData + pos, static_cast<size_t>(size));
   }
 
-  inline MemReader * CreateSubReader(uint64_t pos, uint64_t size) const
+  inline unique_ptr<Reader> CreateSubReader(uint64_t pos, uint64_t size) const override
   {
     ASSERT ( AssertPosAndSize(pos, size), () );
-    return new MemReader(m_pData + pos, static_cast<size_t>(size));
+    return make_unique<MemReader>(m_pData + pos, static_cast<size_t>(size));
   }
 
 private:
@@ -92,6 +95,7 @@ public:
     return SharedMemReader(m_data, static_cast<size_t>(pos), static_cast<size_t>(size));
   }
 
+  // TODO(mgsergio): return unique_ptr
   inline SharedMemReader * CreateSubReader(uint64_t pos, uint64_t size) const
   {
     ASSERT ( AssertPosAndSize(pos, size), () );
@@ -117,7 +121,8 @@ protected:
   shared_ptr<TReader> m_p;
 
 public:
-  ReaderPtr(TReader * p = 0) : m_p(p) {}
+  template <typename TReaderDerived>
+  ReaderPtr(unique_ptr<TReaderDerived> p) : m_p(move(p)) {}
 
   uint64_t Size() const
   {
@@ -145,7 +150,7 @@ class ModelReader : public Reader
 public:
   ModelReader(string const & name) : m_name(name) {}
 
-  virtual ModelReader * CreateSubReader(uint64_t pos, uint64_t size) const = 0;
+  virtual unique_ptr<Reader> CreateSubReader(uint64_t pos, uint64_t size) const override = 0;
 
   inline string const & GetName() const { return m_name; }
 };
@@ -153,26 +158,26 @@ public:
 // Reader pointer class for data files.
 class ModelReaderPtr : public ReaderPtr<ModelReader>
 {
-  typedef ReaderPtr<ModelReader> base_type;
+  using TBase = ReaderPtr<ModelReader>;
 
 public:
-  ModelReaderPtr(ModelReader * p) : base_type(p) {}
+  template <typename TReaderDerived>
+  ModelReaderPtr(unique_ptr<TReaderDerived> p) : TBase(move(p)) {}
 
   inline ModelReaderPtr SubReader(uint64_t pos, uint64_t size) const
   {
-    return m_p->CreateSubReader(pos, size);
+    return unique_ptr<ModelReader>(static_cast<ModelReader *>(m_p->CreateSubReader(pos, size).release()));
   }
 
   inline string const & GetName() const { return m_p->GetName(); }
 };
 
-
 // Source that reads from a reader.
 template <typename TReader>
 class ReaderSource
 {
 public:
-  typedef TReader ReaderType;
+  using ReaderType = TReader;
 
   ReaderSource(TReader const & reader) : m_reader(reader), m_pos(0) {}
 
diff --git a/coding/reader_streambuf.cpp b/coding/reader_streambuf.cpp
index 3a023f323e..859af2eb70 100644
--- a/coding/reader_streambuf.cpp
+++ b/coding/reader_streambuf.cpp
@@ -5,15 +5,13 @@
 #include "std/algorithm.hpp"
 
 
-ReaderStreamBuf::ReaderStreamBuf(Reader * p)
-: m_p(p), m_pos(0), m_size(p->Size())
+ReaderStreamBuf::ReaderStreamBuf(unique_ptr<Reader> && p)
+  : m_p(move(p)), m_pos(0), m_size(m_p->Size())
 {
 }
 
-ReaderStreamBuf::~ReaderStreamBuf()
-{
-  delete m_p;
-}
+// Define destructor in .cpp due to using unique_ptr with incomplete type.
+ReaderStreamBuf::~ReaderStreamBuf() = default;
 
 std::streamsize ReaderStreamBuf::xsgetn(char_type * s, std::streamsize n)
 {
diff --git a/coding/reader_streambuf.hpp b/coding/reader_streambuf.hpp
index 6b2ad4db75..a253e9531f 100644
--- a/coding/reader_streambuf.hpp
+++ b/coding/reader_streambuf.hpp
@@ -2,6 +2,7 @@
 
 #include "std/cstdint.hpp"
 #include "std/iostream.hpp"
+#include "std/unique_ptr.hpp"
 
 class Reader;
 class Writer;
@@ -17,12 +18,11 @@ public:
 
 class ReaderStreamBuf : public BaseStreamBuf
 {
-  Reader * m_p;
+  unique_ptr<Reader> m_p;
   uint64_t m_pos, m_size;
 
 public:
-  /// Takes the ownership of p. Reader should be allocated in dynamic memory.
-  ReaderStreamBuf(Reader * p);
+  ReaderStreamBuf(unique_ptr<Reader> && p);
   virtual ~ReaderStreamBuf();
 
 private:
diff --git a/drape_frontend/gui/skin.cpp b/drape_frontend/gui/skin.cpp
index b59b910cf6..a5d2ec015c 100644
--- a/drape_frontend/gui/skin.cpp
+++ b/drape_frontend/gui/skin.cpp
@@ -10,9 +10,9 @@ namespace gui
 
 namespace
 {
-  
+
 #ifdef DEBUG
-  
+
 bool IsSimple(dp::Anchor anchor)
 {
   return anchor >= 0 && anchor <= 8;
@@ -22,7 +22,7 @@ bool IsAnchor(dp::Anchor anchor)
 {
   return anchor >= 0 && anchor <= 10;
 }
-  
+
 #endif
 
 dp::Anchor ParseValueAnchor(string const & value)
@@ -275,7 +275,7 @@ void Skin::Resize(int w, int h)
 ReaderPtr<Reader> ResolveGuiSkinFile(string const & deviceType)
 {
   Platform & pl = GetPlatform();
-  ReaderPtr<Reader> reader;
+  unique_ptr<Reader> reader;
   try
   {
     reader = pl.GetReader("resources-default/" + deviceType + ".ui");
@@ -285,7 +285,7 @@ ReaderPtr<Reader> ResolveGuiSkinFile(string const & deviceType)
     LOG(LINFO, ("Gui skin for : ", deviceType ,"not found"));
   }
 
-  if (reader.GetPtr() == 0)
+  if (!reader)
   {
     try
     {
@@ -298,7 +298,6 @@ ReaderPtr<Reader> ResolveGuiSkinFile(string const & deviceType)
     }
   }
 
-  return reader;
+  return move(reader);
 }
-
 }
diff --git a/generator/dumper.cpp b/generator/dumper.cpp
index baada0154b..3d25aea4c5 100644
--- a/generator/dumper.cpp
+++ b/generator/dumper.cpp
@@ -195,7 +195,7 @@ namespace feature
   {
     using TValue = FeatureIndexValue;
 
-    FilesContainerR container(new FileReader(fPath));
+    FilesContainerR container(make_unique<FileReader>(fPath));
     feature::DataHeader header(container);
     serial::CodingParams codingParams(trie::GetCodingParams(header.GetDefCodingParams()));
 
diff --git a/generator/unpack_mwm.cpp b/generator/unpack_mwm.cpp
index 73fe20651a..7b83479837 100644
--- a/generator/unpack_mwm.cpp
+++ b/generator/unpack_mwm.cpp
@@ -23,7 +23,7 @@ void UnpackMwm(string const & filePath)
   {
     LOG(LINFO, ("Unpacking", tags[i]));
 
-    ReaderSource<FilesContainerR::ReaderT> reader(container.GetReader(tags[i]));
+    ReaderSource<FilesContainerR::TReader> reader(container.GetReader(tags[i]));
     FileWriter writer(filePath + "." + tags[i]);
 
     rw::ReadAndWrite(reader, writer, 1024 * 1024);
diff --git a/indexer/categories_holder.cpp b/indexer/categories_holder.cpp
index 7c84017b3d..9266b01fb9 100644
--- a/indexer/categories_holder.cpp
+++ b/indexer/categories_holder.cpp
@@ -22,9 +22,9 @@ enum State
 }  // unnamed namespace
 
 
-CategoriesHolder::CategoriesHolder(Reader * reader)
+CategoriesHolder::CategoriesHolder(unique_ptr<Reader> && reader)
 {
-  ReaderStreamBuf buffer(reader);
+  ReaderStreamBuf buffer(move(reader));
   istream s(&buffer);
   LoadFromStream(s);
 }
diff --git a/indexer/categories_holder.hpp b/indexer/categories_holder.hpp
index 95e38c7750..97a56733f9 100644
--- a/indexer/categories_holder.hpp
+++ b/indexer/categories_holder.hpp
@@ -1,11 +1,12 @@
 #pragma once
 #include "base/string_utils.hpp"
 
-#include "std/vector.hpp"
-#include "std/map.hpp"
-#include "std/string.hpp"
 #include "std/iostream.hpp"
+#include "std/map.hpp"
 #include "std/shared_ptr.hpp"
+#include "std/string.hpp"
+#include "std/unique_ptr.hpp"
+#include "std/vector.hpp"
 
 
 class Reader;
@@ -44,7 +45,7 @@ private:
   Name2CatContT m_name2type;
 
 public:
-  explicit CategoriesHolder(Reader * reader);
+  explicit CategoriesHolder(unique_ptr<Reader> && reader);
   void LoadFromStream(istream & s);
 
   template <class ToDo>
diff --git a/indexer/classificator_loader.cpp b/indexer/classificator_loader.cpp
index 6387be4d00..54acb5930d 100644
--- a/indexer/classificator_loader.cpp
+++ b/indexer/classificator_loader.cpp
@@ -14,28 +14,28 @@
 
 namespace
 {
-  void ReadCommon(Reader * classificator,
-                  Reader * types)
+void ReadCommon(unique_ptr<Reader> classificator,
+                unique_ptr<Reader> types)
+{
+  Classificator & c = classif();
+  c.Clear();
+
   {
-    Classificator & c = classif();
-    c.Clear();
+    //LOG(LINFO, ("Reading classificator"));
+    ReaderStreamBuf buffer(move(classificator));
 
-    {
-      //LOG(LINFO, ("Reading classificator"));
-      ReaderStreamBuf buffer(classificator);
-
-      istream s(&buffer);
-      c.ReadClassificator(s);
-    }
-
-    {
-      //LOG(LINFO, ("Reading types mapping"));
-      ReaderStreamBuf buffer(types);
-
-      istream s(&buffer);
-      c.ReadTypesMapping(s);
-    }
+    istream s(&buffer);
+    c.ReadClassificator(s);
   }
+
+  {
+    //LOG(LINFO, ("Reading types mapping"));
+    ReaderStreamBuf buffer(move(types));
+
+    istream s(&buffer);
+    c.ReadTypesMapping(s);
+  }
+}
 }
 
 namespace classificator
@@ -55,7 +55,6 @@ namespace classificator
       if (mapStyle != MapStyleMerged || originMapStyle == MapStyleMerged)
       {
         GetStyleReader().SetCurrentStyle(mapStyle);
-
         ReadCommon(p.GetReader("classificator.txt"),
                    p.GetReader("types.txt"));
 
diff --git a/indexer/feature_loader.cpp b/indexer/feature_loader.cpp
index bea87702df..37093182e8 100644
--- a/indexer/feature_loader.cpp
+++ b/indexer/feature_loader.cpp
@@ -195,7 +195,7 @@ uint32_t LoaderCurrent::ParseGeometry(int scale)
       int const ind = GetScaleIndex(scale, m_ptsOffsets);
       if (ind != -1)
       {
-        ReaderSource<FilesContainerR::ReaderT> src(m_Info.GetGeometryReader(ind));
+        ReaderSource<FilesContainerR::TReader> src(m_Info.GetGeometryReader(ind));
         src.Skip(m_ptsOffsets[ind]);
 
         serial::CodingParams cp = GetCodingParams(ind);
@@ -243,7 +243,7 @@ uint32_t LoaderCurrent::ParseTriangles(int scale)
       uint32_t const ind = GetScaleIndex(scale, m_trgOffsets);
       if (ind != -1)
       {
-        ReaderSource<FilesContainerR::ReaderT> src(m_Info.GetTrianglesReader(ind));
+        ReaderSource<FilesContainerR::TReader> src(m_Info.GetTrianglesReader(ind));
         src.Skip(m_trgOffsets[ind]);
         serial::LoadOuterTriangles(src, GetCodingParams(ind), m_pF->m_triangles);
 
@@ -266,7 +266,7 @@ void LoaderCurrent::ParseMetadata()
       uint32_t key;
       uint32_t value;
     };
-    DDVector<TMetadataIndexEntry, FilesContainerR::ReaderT> idx(m_Info.GetMetadataIndexReader());
+    DDVector<TMetadataIndexEntry, FilesContainerR::TReader> idx(m_Info.GetMetadataIndexReader());
 
     auto it = lower_bound(
         idx.begin(), idx.end(),
@@ -278,7 +278,7 @@ void LoaderCurrent::ParseMetadata()
 
     if (it != idx.end() && m_pF->m_id.m_index == it->key)
     {
-      ReaderSource<FilesContainerR::ReaderT> src(m_Info.GetMetadataReader());
+      ReaderSource<FilesContainerR::TReader> src(m_Info.GetMetadataReader());
       src.Skip(it->value);
       if (m_Info.GetMWMFormat() >= version::Format::v8)
         m_pF->m_metadata.Deserialize(src);
diff --git a/indexer/feature_loader_base.cpp b/indexer/feature_loader_base.cpp
index e888ea50da..8aa9d8422e 100644
--- a/indexer/feature_loader_base.cpp
+++ b/indexer/feature_loader_base.cpp
@@ -29,27 +29,27 @@ SharedLoadInfo::~SharedLoadInfo()
   delete m_pLoader;
 }
 
-SharedLoadInfo::ReaderT SharedLoadInfo::GetDataReader() const
+SharedLoadInfo::TReader SharedLoadInfo::GetDataReader() const
 {
   return m_cont.GetReader(DATA_FILE_TAG);
 }
 
-SharedLoadInfo::ReaderT SharedLoadInfo::GetMetadataReader() const
+SharedLoadInfo::TReader SharedLoadInfo::GetMetadataReader() const
 {
   return m_cont.GetReader(METADATA_FILE_TAG);
 }
 
-SharedLoadInfo::ReaderT SharedLoadInfo::GetMetadataIndexReader() const
+SharedLoadInfo::TReader SharedLoadInfo::GetMetadataIndexReader() const
 {
   return m_cont.GetReader(METADATA_INDEX_FILE_TAG);
 }
 
-SharedLoadInfo::ReaderT SharedLoadInfo::GetGeometryReader(int ind) const
+SharedLoadInfo::TReader SharedLoadInfo::GetGeometryReader(int ind) const
 {
   return m_cont.GetReader(GetTagForIndex(GEOMETRY_FILE_TAG, ind));
 }
 
-SharedLoadInfo::ReaderT SharedLoadInfo::GetTrianglesReader(int ind) const
+SharedLoadInfo::TReader SharedLoadInfo::GetTrianglesReader(int ind) const
 {
   return m_cont.GetReader(GetTagForIndex(TRIANGLE_FILE_TAG, ind));
 }
diff --git a/indexer/feature_loader_base.hpp b/indexer/feature_loader_base.hpp
index 7245aa2da2..46f68f1597 100644
--- a/indexer/feature_loader_base.hpp
+++ b/indexer/feature_loader_base.hpp
@@ -20,7 +20,7 @@ namespace feature
     FilesContainerR const & m_cont;
     DataHeader const & m_header;
 
-    typedef FilesContainerR::ReaderT ReaderT;
+    using TReader = FilesContainerR::TReader;
 
     LoaderBase * m_pLoader;
     void CreateLoader();
@@ -29,11 +29,11 @@ namespace feature
     SharedLoadInfo(FilesContainerR const & cont, DataHeader const & header);
     ~SharedLoadInfo();
 
-    ReaderT GetDataReader() const;
-    ReaderT GetMetadataReader() const;
-    ReaderT GetMetadataIndexReader() const;
-    ReaderT GetGeometryReader(int ind) const;
-    ReaderT GetTrianglesReader(int ind) const;
+    TReader GetDataReader() const;
+    TReader GetMetadataReader() const;
+    TReader GetMetadataIndexReader() const;
+    TReader GetGeometryReader(int ind) const;
+    TReader GetTrianglesReader(int ind) const;
 
     LoaderBase * GetLoader() const { return m_pLoader; }
 
@@ -60,7 +60,7 @@ namespace feature
     virtual ~LoaderBase() {}
 
     // It seems like no need to store a copy of buffer (see FeaturesVector).
-    typedef char const * TBuffer;
+    using TBuffer = char const * ;
 
     /// @name Initialize functions.
     //@{
diff --git a/indexer/feature_processor.hpp b/indexer/feature_processor.hpp
index 6db645f9b1..e8b7b636d6 100644
--- a/indexer/feature_processor.hpp
+++ b/indexer/feature_processor.hpp
@@ -23,6 +23,6 @@ void ForEachFromDat(ModelReaderPtr reader, ToDo && toDo)
   template <class ToDo>
   void ForEachFromDat(string const & fPath, ToDo && toDo)
   {
-    ForEachFromDat(new FileReader(fPath), toDo);
+    ForEachFromDat(make_unique<FileReader>(fPath), toDo);
   }
 }
diff --git a/indexer/features_vector.hpp b/indexer/features_vector.hpp
index be38523a73..110a85216d 100644
--- a/indexer/features_vector.hpp
+++ b/indexer/features_vector.hpp
@@ -46,7 +46,7 @@ private:
   friend class FeaturesVectorTest;
 
   feature::SharedLoadInfo m_LoadInfo;
-  VarRecordReader<FilesContainerR::ReaderT, &VarRecordSizeReaderVarint> m_RecordReader;
+  VarRecordReader<FilesContainerR::TReader, &VarRecordSizeReaderVarint> m_RecordReader;
   mutable vector<char> m_buffer;
   feature::FeaturesOffsetsTable const * m_table;
 };
diff --git a/indexer/indexer_tests/categories_test.cpp b/indexer/indexer_tests/categories_test.cpp
index 8174bbdaf8..62ca8df964 100644
--- a/indexer/indexer_tests/categories_test.cpp
+++ b/indexer/indexer_tests/categories_test.cpp
@@ -87,7 +87,7 @@ UNIT_TEST(LoadCategories)
 {
   classificator::Load();
 
-  CategoriesHolder h(new MemReader(TEST_STRING, strlen(TEST_STRING)));
+  CategoriesHolder h(make_unique<MemReader>(TEST_STRING, strlen(TEST_STRING)));
   size_t count = 0;
   Checker f(count);
   h.ForEachCategory(f);
diff --git a/indexer/old/feature_loader_101.cpp b/indexer/old/feature_loader_101.cpp
index af39f3b6ee..55855b221d 100644
--- a/indexer/old/feature_loader_101.cpp
+++ b/indexer/old/feature_loader_101.cpp
@@ -357,7 +357,7 @@ uint32_t LoaderImpl::ParseGeometry(int scale)
       int const ind = GetScaleIndex(scale, m_ptsOffsets);
       if (ind != -1)
       {
-        ReaderSource<FilesContainerR::ReaderT> src(m_Info.GetGeometryReader(ind));
+        ReaderSource<FilesContainerR::TReader> src(m_Info.GetGeometryReader(ind));
         src.Skip(m_ptsOffsets[ind]);
         serial::LoadOuterPath(src, GetDefCodingParams(), m_pF->m_points);
 
@@ -403,7 +403,7 @@ uint32_t LoaderImpl::ParseTriangles(int scale)
       uint32_t const ind = GetScaleIndex(scale, m_trgOffsets);
       if (ind != -1)
       {
-        ReaderSource<FilesContainerR::ReaderT> src(m_Info.GetTrianglesReader(ind));
+        ReaderSource<FilesContainerR::TReader> src(m_Info.GetTrianglesReader(ind));
         src.Skip(m_trgOffsets[ind]);
         serial::LoadOuterTriangles(src, GetDefCodingParams(), m_pF->m_triangles);
 
diff --git a/indexer/rank_table.cpp b/indexer/rank_table.cpp
index d7bdd48fab..8d9d345d1b 100644
--- a/indexer/rank_table.cpp
+++ b/indexer/rank_table.cpp
@@ -101,7 +101,7 @@ unique_ptr<CopiedMemoryRegion> GetMemoryRegionForTag(FilesContainerR const & rco
 {
   if (!rcont.IsExist(tag))
     return unique_ptr<CopiedMemoryRegion>();
-  FilesContainerR::ReaderT reader = rcont.GetReader(tag);
+  FilesContainerR::TReader reader = rcont.GetReader(tag);
   vector<uint8_t> buffer(reader.Size());
   reader.Read(0, buffer.data(), buffer.size());
   return make_unique<CopiedMemoryRegion>(move(buffer));
diff --git a/indexer/succinct_trie_reader.hpp b/indexer/succinct_trie_reader.hpp
index 07a97c9736..fdef154e7e 100644
--- a/indexer/succinct_trie_reader.hpp
+++ b/indexer/succinct_trie_reader.hpp
@@ -221,7 +221,7 @@ private:
       return;
     uint32_t offset = m_common->Offset(m_nodeId);
     uint32_t size = m_common->ValueListSize(m_nodeId);
-    ReaderPtr<TReader> subReaderPtr(m_reader.CreateSubReader(offset, size));
+    ReaderPtr<TReader> subReaderPtr(unique_ptr<TReader>(static_cast<TReader*>(m_reader.CreateSubReader(offset, size).release())));
     ReaderSource<ReaderPtr<TReader>> src(subReaderPtr);
     while (src.Size() > 0)
     {
diff --git a/map/bookmark.cpp b/map/bookmark.cpp
index 7c3a384463..9f51d3ec62 100644
--- a/map/bookmark.cpp
+++ b/map/bookmark.cpp
@@ -592,7 +592,7 @@ BookmarkCategory * BookmarkCategory::CreateFromKMLFile(string const & file, Fram
   auto_ptr<BookmarkCategory> cat(new BookmarkCategory("", framework));
   try
   {
-    if (cat->LoadFromKML(new FileReader(file)))
+    if (cat->LoadFromKML(make_unique<FileReader>(file)))
       cat->m_file = file;
     else
       cat.reset();
diff --git a/map/map_tests/bookmarks_test.cpp b/map/map_tests/bookmarks_test.cpp
index e67577e7f2..95acf67c5f 100644
--- a/map/map_tests/bookmarks_test.cpp
+++ b/map/map_tests/bookmarks_test.cpp
@@ -159,7 +159,7 @@ UNIT_TEST(Bookmarks_ImportKML)
   df::VisualParams::Init(1.0, 1024);
 
   BookmarkCategory cat("Default", framework);
-  TEST(cat.LoadFromKML(new MemReader(kmlString, strlen(kmlString))), ());
+  TEST(cat.LoadFromKML(make_unique<MemReader>(kmlString, strlen(kmlString))), ());
 
   CheckBookmarks(cat);
 
@@ -176,7 +176,7 @@ UNIT_TEST(Bookmarks_ExportKML)
   df::VisualParams::Init(1.0, 1024);
 
   BookmarkCategory cat("Default", framework);
-  TEST(cat.LoadFromKML(new MemReader(kmlString, strlen(kmlString))), ());
+  TEST(cat.LoadFromKML(make_unique<MemReader>(kmlString, strlen(kmlString))), ());
   CheckBookmarks(cat);
 
   {
@@ -198,7 +198,7 @@ UNIT_TEST(Bookmarks_ExportKML)
     TEST_EQUAL(guard.m_controller.GetUserMarkCount(), 0, ());
   }
 
-  TEST(cat.LoadFromKML(new FileReader(BOOKMARKS_FILE_NAME)), ());
+  TEST(cat.LoadFromKML(make_unique<FileReader>(BOOKMARKS_FILE_NAME)), ());
   CheckBookmarks(cat);
   TEST_EQUAL(cat.IsVisible(), true, ());
 
@@ -549,7 +549,7 @@ UNIT_TEST(Bookmarks_InnerFolder)
 {
   Framework framework;
   BookmarkCategory cat("Default", framework);
-  TEST(cat.LoadFromKML(new MemReader(kmlString2, strlen(kmlString2))), ());
+  TEST(cat.LoadFromKML(make_unique<MemReader>(kmlString2, strlen(kmlString2))), ());
 
   TEST_EQUAL(cat.GetUserMarkCount(), 1, ());
 }
@@ -611,7 +611,7 @@ UNIT_TEST(Bookmarks_SpecialXMLNames)
 {
   Framework framework;
   BookmarkCategory cat1("", framework);
-  TEST(cat1.LoadFromKML(new MemReader(kmlString3, strlen(kmlString3))), ());
+  TEST(cat1.LoadFromKML(make_unique<MemReader>(kmlString3, strlen(kmlString3))), ());
 
   TEST_EQUAL(cat1.GetUserMarkCount(), 1, ());
   TEST(cat1.SaveToKMLFile(), ());
@@ -670,4 +670,3 @@ UNIT_TEST(TrackParsingTest_2)
   TEST_GREATER(track->GetLayerCount(), 0, ());
   TEST_EQUAL(track->GetColor(0), dp::Color(57, 255, 32, 255), ());
 }
-
diff --git a/map/map_tests/kmz_unarchive_test.cpp b/map/map_tests/kmz_unarchive_test.cpp
index 3cc6b0eac9..e9fae28ee0 100644
--- a/map/map_tests/kmz_unarchive_test.cpp
+++ b/map/map_tests/kmz_unarchive_test.cpp
@@ -37,7 +37,7 @@ UNIT_TEST(KMZ_UnzipTest)
 
   Framework framework;
   BookmarkCategory cat("Default", framework);
-  TEST(cat.LoadFromKML(new FileReader(kmlFile)), ());
+  TEST(cat.LoadFromKML(make_unique<FileReader>(kmlFile)), ());
 
   TEST_EQUAL(files.size(), 6, ("KMZ file wrong number of files"));
 
diff --git a/platform/local_country_file_utils.cpp b/platform/local_country_file_utils.cpp
index 18b4a3de75..dd538a5cec 100644
--- a/platform/local_country_file_utils.cpp
+++ b/platform/local_country_file_utils.cpp
@@ -346,7 +346,7 @@ string GetFileDownloadPath(int64_t version, string const & dataDir,
   return my::JoinFoldersToPath({dir, strings::to_string(version)}, readyFile);
 }
 
-ModelReader * GetCountryReader(platform::LocalCountryFile const & file, MapOptions options)
+unique_ptr<ModelReader> GetCountryReader(platform::LocalCountryFile const & file, MapOptions options)
 {
   Platform & platform = GetPlatform();
   // See LocalCountryFile comment for explanation.
diff --git a/platform/local_country_file_utils.hpp b/platform/local_country_file_utils.hpp
index aabcd19b2d..3d53918300 100644
--- a/platform/local_country_file_utils.hpp
+++ b/platform/local_country_file_utils.hpp
@@ -5,6 +5,7 @@
 
 #include "std/function.hpp"
 #include "std/shared_ptr.hpp"
+#include "std/unique_ptr.hpp"
 #include "std/utility.hpp"
 #include "std/vector.hpp"
 
@@ -81,7 +82,7 @@ string GetFileDownloadPath(int64_t version, CountryFile const & countryFile, Map
 string GetFileDownloadPath(int64_t version, string const & dataDir,
                            CountryFile const & countryFile, MapOptions file);
 
-ModelReader * GetCountryReader(LocalCountryFile const & file, MapOptions options);
+unique_ptr<ModelReader> GetCountryReader(LocalCountryFile const & file, MapOptions options);
 
 // An API for managing country indexes.
 class CountryIndexes
diff --git a/platform/platform.hpp b/platform/platform.hpp
index 7557f19856..a7575035de 100644
--- a/platform/platform.hpp
+++ b/platform/platform.hpp
@@ -133,10 +133,11 @@ public:
 
   /// @return reader for file decriptor.
   /// @throws FileAbsentException
-  /// @param[in] file name or full path which we want to read, don't forget to free memory or wrap it to ReaderPtr
+  /// @param[in] file name or full path which we want to read
   /// @param[in] searchScope looks for file in dirs in given order: \n
-  ///  [w]ritable, [r]esources, [s]ettings, by [f]ull path, [e]xternal resources,
-  ModelReader * GetReader(string const & file, string const & searchScope = string()) const;
+  /// [w]ritable, [r]esources, [s]ettings, by [f]ull path, [e]xternal resources,
+  unique_ptr<ModelReader>
+  GetReader(string const & file, string const & searchScope = string()) const;
 
   /// @name File operations
   //@{
diff --git a/platform/platform_android.cpp b/platform/platform_android.cpp
index d0cf6843cd..01fd0980c2 100644
--- a/platform/platform_android.cpp
+++ b/platform/platform_android.cpp
@@ -91,7 +91,7 @@ public:
 
 }
 
-ModelReader * Platform::GetReader(string const & file, string const & searchScope) const
+unique_ptr<ModelReader> Platform::GetReader(string const & file, string const & searchScope) const
 {
   string const ext = my::GetFileExtension(file);
   ASSERT(!ext.empty(), ());
@@ -138,7 +138,7 @@ ModelReader * Platform::GetReader(string const & file, string const & searchScop
       {
         try
         {
-          return new ZipFileReader(m_extResFiles[j], file, logPageSize, logPageCount);
+          return make_unique<ZipFileReader>(m_extResFiles[j], file, logPageSize, logPageCount);
         }
         catch (Reader::OpenException const &)
         {
@@ -150,7 +150,7 @@ ModelReader * Platform::GetReader(string const & file, string const & searchScop
     {
       string const path = m_writableDir + file;
       if (IsFileExistsByFullPath(path))
-        return new FileReader(path, logPageSize, logPageCount);
+        return make_unique<FileReader>(path, logPageSize, logPageCount);
       break;
     }
 
@@ -158,20 +158,20 @@ ModelReader * Platform::GetReader(string const & file, string const & searchScop
     {
       string const path = m_settingsDir + file;
       if (IsFileExistsByFullPath(path))
-        return new FileReader(path, logPageSize, logPageCount);
+        return make_unique<FileReader>(path, logPageSize, logPageCount);
       break;
     }
 
     case FULL_PATH:
       if (IsFileExistsByFullPath(file))
-        return new FileReader(file, logPageSize, logPageCount);
+        return make_unique<FileReader>(file, logPageSize, logPageCount);
       break;
 
     case RESOURCE:
       ASSERT_EQUAL(file.find("assets/"), string::npos, ());
       try
       {
-        return new ZipFileReader(m_resourcesDir, "assets/" + file, logPageSize, logPageCount);
+        return make_unique<ZipFileReader>(m_resourcesDir, "assets/" + file, logPageSize, logPageCount);
       }
       catch (Reader::OpenException const &)
       {
@@ -186,7 +186,7 @@ ModelReader * Platform::GetReader(string const & file, string const & searchScop
 
   LOG(LWARNING, ("Can't get reader for:", file));
   MYTHROW(FileAbsentException, ("File not found", file));
-  return 0;
+  return nullptr;
 }
 
 void Platform::GetFilesByRegExp(string const & directory, string const & regexp, FilesList & res)
diff --git a/platform/platform_ios.mm b/platform/platform_ios.mm
index d479637f04..ec0b8058e1 100644
--- a/platform/platform_ios.mm
+++ b/platform/platform_ios.mm
@@ -134,10 +134,10 @@ bool Platform::GetFileSizeByName(string const & fileName, uint64_t & size) const
   }
 }
 
-ModelReader * Platform::GetReader(string const & file, string const & searchScope) const
+unique_ptr<ModelReader> Platform::GetReader(string const & file, string const & searchScope) const
 {
-  return new FileReader(ReadPathForFile(file, searchScope),
-                        READER_CHUNK_LOG_SIZE, READER_CHUNK_LOG_COUNT);
+  return make_unique<FileReader>(ReadPathForFile(file, searchScope),
+                                 READER_CHUNK_LOG_SIZE, READER_CHUNK_LOG_COUNT);
 }
 
 int Platform::VideoMemoryLimit() const
diff --git a/platform/platform_qt.cpp b/platform/platform_qt.cpp
index da784a4bf1..527426a485 100644
--- a/platform/platform_qt.cpp
+++ b/platform/platform_qt.cpp
@@ -17,10 +17,10 @@
 #include <QtCore/QFileInfo>
 #include <QtCore/QLocale>
 
-ModelReader * Platform::GetReader(string const & file, string const & searchScope) const
+unique_ptr<ModelReader> Platform::GetReader(string const & file, string const & searchScope) const
 {
-  return new FileReader(ReadPathForFile(file, searchScope),
-                        READER_CHUNK_LOG_SIZE, READER_CHUNK_LOG_COUNT);
+  return make_unique<FileReader>(ReadPathForFile(file, searchScope),
+                                 READER_CHUNK_LOG_SIZE, READER_CHUNK_LOG_COUNT);
 }
 
 bool Platform::GetFileSizeByName(string const & fileName, uint64_t & size) const
diff --git a/platform/settings.cpp b/platform/settings.cpp
index 86da785031..5accfbe3b3 100644
--- a/platform/settings.cpp
+++ b/platform/settings.cpp
@@ -32,7 +32,7 @@ namespace Settings
     {
       string settingsPath = GetPlatform().SettingsPathForFile(SETTINGS_FILE_NAME);
       LOG(LINFO, ("Settings path:", settingsPath));
-      ReaderStreamBuf buffer(new FileReader(settingsPath));
+      ReaderStreamBuf buffer(make_unique<FileReader>(settingsPath));
       istream stream(&buffer);
 
       string line;
diff --git a/search/query_saver.cpp b/search/query_saver.cpp
index 31c5f54a7c..26fb0d7511 100644
--- a/search/query_saver.cpp
+++ b/search/query_saver.cpp
@@ -51,10 +51,10 @@ public:
     return SecureMemReader(m_pData + pos, static_cast<size_t>(size));
   }
 
-  inline SecureMemReader * CreateSubReader(uint64_t pos, uint64_t size) const
+  inline unique_ptr<Reader> CreateSubReader(uint64_t pos, uint64_t size) const override
   {
     CheckPosAndSize(pos, size);
-    return new SecureMemReader(m_pData + pos, static_cast<size_t>(size));
+    return make_unique<SecureMemReader>(m_pData + pos, static_cast<size_t>(size));
   }
 
 private: