Remove using std from base

15 files changed, 17 insertions, 7 deletions

diff --git a/coding/coding_tests/coder_util_test.cpp b/coding/coding_tests/coder_util_test.cpp
index 56541c0d61..ff693e3009 100644
--- a/coding/coding_tests/coder_util_test.cpp
+++ b/coding/coding_tests/coder_util_test.cpp
@@ -1,4 +1,3 @@
-#include "base/SRC_FIRST.hpp"
 #include "testing/testing.hpp"
 
 #include "coding/coder_util.hpp"
diff --git a/coding/coding_tests/mem_file_reader_test.cpp b/coding/coding_tests/mem_file_reader_test.cpp
index bfa5311a23..867f522143 100644
--- a/coding/coding_tests/mem_file_reader_test.cpp
+++ b/coding/coding_tests/mem_file_reader_test.cpp
@@ -1,4 +1,3 @@
-#include "base/SRC_FIRST.hpp"
 #include "testing/testing.hpp"
 
 #include "coding/reader.hpp"
diff --git a/coding/coding_tests/mem_file_writer_test.cpp b/coding/coding_tests/mem_file_writer_test.cpp
index 2625649795..bd3a9e2ad4 100644
--- a/coding/coding_tests/mem_file_writer_test.cpp
+++ b/coding/coding_tests/mem_file_writer_test.cpp
@@ -1,4 +1,3 @@
-#include "base/SRC_FIRST.hpp"
 #include "testing/testing.hpp"
 
 #include "coding/writer.hpp"
diff --git a/coding/coding_tests/png_decoder_test.cpp b/coding/coding_tests/png_decoder_test.cpp
index 91a148046f..74e4638535 100644
--- a/coding/coding_tests/png_decoder_test.cpp
+++ b/coding/coding_tests/png_decoder_test.cpp
@@ -2,6 +2,7 @@
 
 #include "std/string.hpp"
 #include "std/fstream.hpp"
+#include "std/vector.hpp"
 
 void loadFile(vector<unsigned char> & buffer, string const & filename) //designed for loading files from hard disk in an std::vector
 {
diff --git a/coding/coding_tests/reader_writer_ops_test.cpp b/coding/coding_tests/reader_writer_ops_test.cpp
index 5b30313f2d..ecf6ff2081 100644
--- a/coding/coding_tests/reader_writer_ops_test.cpp
+++ b/coding/coding_tests/reader_writer_ops_test.cpp
@@ -1,5 +1,3 @@
-#include "base/SRC_FIRST.hpp"
-
 #include "testing/testing.hpp"
 
 #include "coding/reader_writer_ops.hpp"
diff --git a/coding/diff.hpp b/coding/diff.hpp
index 754db84459..4287df422a 100644
--- a/coding/diff.hpp
+++ b/coding/diff.hpp
@@ -1,9 +1,12 @@
 #pragma once
 #include "coding/diff_patch_common.hpp"
+
 #include "base/assert.hpp"
 #include "base/base.hpp"
+
 #include "std/algorithm.hpp"
 #include "std/unordered_map.hpp"
+#include "std/utility.hpp"
 #include "std/vector.hpp"
 
 namespace diff
diff --git a/coding/file_container.cpp b/coding/file_container.cpp
index e37dc86731..2598fa299a 100644
--- a/coding/file_container.cpp
+++ b/coding/file_container.cpp
@@ -4,6 +4,7 @@
 #include "coding/internal/file_data.hpp"
 
 #include "std/cstring.hpp"
+#include "std/sstream.hpp"
 
 #ifndef OMIM_OS_WINDOWS
   #include <stdio.h>
diff --git a/coding/file_container.hpp b/coding/file_container.hpp
index 50458450f5..01e3fd8c0e 100644
--- a/coding/file_container.hpp
+++ b/coding/file_container.hpp
@@ -5,6 +5,7 @@
 #include "std/vector.hpp"
 #include "std/string.hpp"
 #include "std/noncopyable.hpp"
+#include "std/utility.hpp"
 
 
 class FilesContainerBase
diff --git a/coding/fixed_bits_ddvector.hpp b/coding/fixed_bits_ddvector.hpp
index c87a416335..a1b619fb61 100644
--- a/coding/fixed_bits_ddvector.hpp
+++ b/coding/fixed_bits_ddvector.hpp
@@ -8,6 +8,7 @@
 
 #include "std/algorithm.hpp"
 #include "std/unique_ptr.hpp"
+#include "std/utility.hpp"
 #include "std/vector.hpp"
 
 
diff --git a/coding/multilang_utf8_string.hpp b/coding/multilang_utf8_string.hpp
index fc547cd327..db0ffa0f5d 100644
--- a/coding/multilang_utf8_string.hpp
+++ b/coding/multilang_utf8_string.hpp
@@ -4,6 +4,7 @@
 
 #include "base/assert.hpp"
 
+#include "std/array.hpp"
 #include "std/string.hpp"
 
 
diff --git a/coding/parse_xml.hpp b/coding/parse_xml.hpp
index 2fc3cf81c6..ee2b34db10 100644
--- a/coding/parse_xml.hpp
+++ b/coding/parse_xml.hpp
@@ -4,6 +4,8 @@
 
 #include "base/assert.hpp"
 
+#include "std/algorithm.hpp"
+
 
 template <typename XMLDispatcherT, typename SequenceT>
 uint64_t ParseXMLSequence(SequenceT & source, XMLDispatcherT & dispatcher, bool useCharData = false)
diff --git a/coding/read_write_utils.hpp b/coding/read_write_utils.hpp
index 9c0ecd2362..0536894a91 100644
--- a/coding/read_write_utils.hpp
+++ b/coding/read_write_utils.hpp
@@ -4,6 +4,7 @@
 
 #include "base/buffer_vector.hpp"
 
+#include "std/algorithm.hpp"
 #include "std/string.hpp"
 #include "std/vector.hpp"
 #include "std/type_traits.hpp"
diff --git a/coding/reader_cache.hpp b/coding/reader_cache.hpp
index d8e5bdf91c..6f2c758d26 100644
--- a/coding/reader_cache.hpp
+++ b/coding/reader_cache.hpp
@@ -4,9 +4,10 @@
 #include "base/cache.hpp"
 #include "base/stats.hpp"
 
-#include "std/vector.hpp"
-#include "std/cstring.hpp"
 #include "std/algorithm.hpp"
+#include "std/cstring.hpp"
+#include "std/sstream.hpp"
+#include "std/vector.hpp"
 
 
 namespace impl
diff --git a/coding/varint.hpp b/coding/varint.hpp
index 5777085fcc..a22b77e703 100644
--- a/coding/varint.hpp
+++ b/coding/varint.hpp
@@ -7,6 +7,8 @@
 #include "base/bits.hpp"
 #include "base/exception.hpp"
 #include "base/stl_add.hpp"
+
+#include "std/string.hpp"
 #include "std/type_traits.hpp"
 
 
diff --git a/coding/zip_reader.hpp b/coding/zip_reader.hpp
index bea0496ae5..7e6360ffbe 100644
--- a/coding/zip_reader.hpp
+++ b/coding/zip_reader.hpp
@@ -6,6 +6,7 @@
 #include "base/exception.hpp"
 
 #include "std/function.hpp"
+#include "std/utility.hpp"
 
 
 class ZipFileReader : public FileReader