1 files changed, 13 insertions, 13 deletions

diff --git a/generator/feature_builder.hpp b/generator/feature_builder.hpp
index 54216a5cd2..cbaf91acb1 100644
--- a/generator/feature_builder.hpp
+++ b/generator/feature_builder.hpp
@@ -7,8 +7,8 @@
 #include "coding/file_reader.hpp"
 #include "coding/read_write_utils.hpp"
 
-#include "std/bind.hpp"
-#include "std/list.hpp"
+#include <functional>
+#include <list>
 
 
 namespace serial { class CodingParams; }
@@ -17,11 +17,11 @@ namespace serial { class CodingParams; }
 class FeatureBuilder1
 {
   /// For debugging
-  friend string DebugPrint(FeatureBuilder1 const & f);
+  friend std::string DebugPrint(FeatureBuilder1 const & f);
 
 public:
   using TPointSeq = vector<m2::PointD>;
-  using TGeometry = list<TPointSeq>;
+  using TGeometry = std::list<TPointSeq>;
 
   using TBuffer = vector<char>;
 
@@ -34,11 +34,11 @@ public:
 
   void SetRank(uint8_t rank);
 
-  void AddHouseNumber(string const & houseNumber);
+  void AddHouseNumber(std::string const & houseNumber);
 
-  void AddStreet(string const & streetName);
+  void AddStreet(std::string const & streetName);
 
-  void AddPostcode(string const & postcode);
+  void AddPostcode(std::string const & postcode);
 
   /// Add point to geometry.
   void AddPoint(m2::PointD const & p);
@@ -100,7 +100,7 @@ public:
   //@{
   inline m2::RectD GetLimitRect() const { return m_limitRect; }
 
-  bool FormatFullAddress(string & res) const;
+  bool FormatFullAddress(std::string & res) const;
 
   /// Get common parameters of feature.
   FeatureBase GetFeatureBase() const;
@@ -171,7 +171,7 @@ public:
   /// area's one if there is no relation, and relation id otherwise.
   osm::Id GetMostGenericOsmId() const;
   bool HasOsmId(osm::Id const & id) const;
-  string GetOsmIdsString() const;
+  std::string GetOsmIdsString() const;
   vector<osm::Id> const & GetOsmIds() const { return m_osmIds; }
   //@}
 
@@ -183,8 +183,8 @@ public:
   void SetCoastCell(int64_t iCell) { m_coastCell = iCell; }
   inline bool IsCoastCell() const { return (m_coastCell != -1); }
 
-  bool AddName(string const & lang, string const & name);
-  string GetName(int8_t lang = StringUtf8Multilang::kDefaultCode) const;
+  bool AddName(std::string const & lang, std::string const & name);
+  std::string GetName(int8_t lang = StringUtf8Multilang::kDefaultCode) const;
 
   uint8_t GetRank() const { return m_params.rank; }
 
@@ -227,7 +227,7 @@ class FeatureBuilder2 : public FeatureBuilder1
   static void SerializeOffsets(uint32_t mask, TOffsets const & offsets, TBuffer & buffer);
 
   /// For debugging
-  friend string DebugPrint(FeatureBuilder2 const & f);
+  friend std::string DebugPrint(FeatureBuilder2 const & f);
 
 public:
   struct SupportingData
@@ -274,7 +274,7 @@ namespace feature
 
   /// Process features in .dat file.
   template <class ToDo>
-  void ForEachFromDatRawFormat(string const & fName, ToDo && toDo)
+  void ForEachFromDatRawFormat(std::string const & fName, ToDo && toDo)
   {
     FileReader reader(fName);
     ReaderSource<FileReader> src(reader);