1 files changed, 13 insertions, 9 deletions
diff --git a/search/query_saver.hpp b/search/query_saver.hpp
index 5c93f1b1c3..57f36468cd 100644
--- a/search/query_saver.hpp
+++ b/search/query_saver.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "std/list.hpp"
-#include "std/string.hpp"
-#include "std/vector.hpp"
-#include "std/utility.hpp"
+#include <list>
+#include <string>
+#include <utility>
+#include <vector>
 
 namespace search
 {
@@ -12,24 +12,28 @@ class QuerySaver
 {
 public:
   /// Search request <locale, request>.
-  using TSearchRequest = pair<string, string>;
+  using TSearchRequest = std::pair<std::string, std::string>;
+
   QuerySaver();
+
   void Add(TSearchRequest const & query);
+
   /// Returns several last saved queries from newest to oldest query.
   /// @see kMaxSuggestCount in implementation file.
-  list<TSearchRequest> const & Get() const { return m_topQueries; }
+  std::list<TSearchRequest> const & Get() const { return m_topQueries; }
+
   /// Clear last queries storage. All data will be lost.
   void Clear();
 
 private:
   friend void UnitTest_QuerySaverSerializerTest();
   friend void UnitTest_QuerySaverCorruptedStringTest();
-  void Serialize(string & data) const;
-  void Deserialize(string const & data);
+  void Serialize(std::string & data) const;
+  void Deserialize(std::string const & data);
 
   void Save();
   void Load();
 
-  list<TSearchRequest> m_topQueries;
+  std::list<TSearchRequest> m_topQueries;
 };
 }  // namespace search