Unused includes clear

base/base.cpp

@@ -1,10 +1,7 @@
-#include "base/base.hpp"
 
 #include "base/assert.hpp"
-#include "base/exception.hpp"
 #include "base/src_point.hpp"
 
-#include "platform/target_os.hpp"
 
 #include <iostream>
 

base/base_tests/assert_test.cpp

@@ -1,6 +1,5 @@
 #include "testing/testing.hpp"
 
-#include "base/base.hpp"
 #include "base/exception.hpp"
 #include "base/logging.hpp"
 

base/base_tests/bidirectional_map_tests.cpp

@@ -1,7 +1,6 @@
 #include "testing/testing.hpp"
 
 #include "base/bidirectional_map.hpp"
-#include "base/macros.hpp"
 
 #include <string>
 

base/base_tests/condition_test.cpp

@@ -2,8 +2,6 @@
 
 #include "base/thread.hpp"
 #include "base/threaded_list.hpp"
-#include "base/condition.hpp"
-#include "base/logging.hpp"
 
 #include <memory>
 

base/base_tests/levenshtein_dfa_test.cpp

@@ -3,7 +3,6 @@
 #include "base/dfa_helpers.hpp"
 #include "base/levenshtein_dfa.hpp"
 
-#include <sstream>
 #include <string>
 #include <vector>
 

base/base_tests/logging_test.cpp

@@ -2,7 +2,6 @@
 
 #include "base/logging.hpp"
 
-#include <utility>
 #include <vector>
 
 

base/base_tests/ref_counted_tests.cpp

@@ -22,7 +22,7 @@ UNIT_TEST(RefCounted_Smoke)
   }
 
   {
-    bool destroyed;
+    bool destroyed = false;
     {
       RefCountPtr<Resource> p(new Resource(destroyed));
       TEST_EQUAL(1, p->NumRefs(), ());

base/base_tests/string_utils_test.cpp

@@ -50,7 +50,7 @@ UNIT_TEST(LowerUniChar)
       continue;
     std::string const capital = *semicolon;
     std::istringstream stream(capital);
-    strings::UniChar uc;
+    strings::UniChar uc{};
     stream >> std::hex >> uc;
     ++semicolon;
     std::string const type = *semicolon;

base/base_tests/thread_pool_computational_tests.cpp

@@ -5,7 +5,6 @@
 #include <atomic>
 #include <chrono>
 #include <future>
-#include <mutex>
 #include <thread>
 #include <vector>
 

base/condition.cpp

@@ -1,7 +1,6 @@
 #include "base/condition.hpp"
 #include "base/mutex.hpp"
 
-#include "platform/target_os.hpp"
 
 #include <pthread.h>
 

base/file_name_utils.cpp

@@ -1,6 +1,5 @@
 #include "base/file_name_utils.hpp"
 
-#include "platform/target_os.hpp"
 
 using namespace std;
 

base/geo_object_id.cpp

@@ -3,7 +3,6 @@
 #include "base/assert.hpp"
 
 #include <iostream>
-#include <sstream>
 
 namespace
 {

base/levenshtein_dfa.cpp

@@ -7,7 +7,6 @@
 #include <iterator>
 #include <queue>
 #include <set>
-#include <sstream>
 #include <vector>
 
 namespace strings

base/logging.cpp

@@ -1,21 +1,17 @@
 #include "base/logging.hpp"
 
 #include "base/assert.hpp"
-#include "base/macros.hpp"
 #include "base/thread.hpp"
 #include "base/timer.hpp"
 
-#include "platform/target_os.hpp"
 
 #include <algorithm>
 #include <cassert>
 #include <cstring>
 #include <iomanip>
 #include <iostream>
-#include <iterator>
 #include <map>
 #include <mutex>
-#include <sstream>
 
 using namespace std;
 

base/normalize_unicode.cpp

@@ -18,6 +18,7 @@ static void w(strings::UniString & r, uint16_t startIndex, int count)
     r.push_back(normSymbols[startIndex + i]);
 }
 
+// LCOV_EXCL_START
 void NormalizeInplace(strings::UniString & s)
 {
   size_t const size = s.size();
@@ -4595,5 +4596,5 @@ void NormalizeInplace(strings::UniString & s)
 
   s.swap(r);
 }
-
+// LCOV_EXCL_STOP
 }

base/threaded_list.hpp

@@ -89,10 +89,7 @@ public:
       m_Cond.Wait();
     }
 
-    if (IsCancelled())
-      return true;
-
-    return false;
+    return IsCancelled();
   }
 
   T const Front(bool doPop)

base/timegm.cpp

@@ -3,7 +3,6 @@
 #include "base/assert.hpp"
 #include "base/timer.hpp"
 
-#include <chrono>
 
 // There are issues with this implementation due to absence
 // of time_t fromat specification. There are no guarantees

base/timer.cpp

@@ -2,10 +2,8 @@
 
 #include "base/assert.hpp"
 #include "base/gmtime.hpp"
-#include "base/macros.hpp"
 #include "base/timegm.hpp"
 
-#include "platform/target_os.hpp"
 
 #include <algorithm>
 #include <array>
@@ -136,7 +134,7 @@ time_t StringToTimestamp(std::string const & s)
   {
     // Parse custom time zone offset format: 2012-12-03T00:38:34+03:30
     tm t1{}, t2{};
-    char sign;
+    char sign = 0;
     std::istringstream ss(s);
     ss >> base::get_time(&t1, "%Y-%m-%dT%H:%M:%S") >> sign >> base::get_time(&t2, "%H:%M");
 

coding/coding_tests/compressed_bit_vector_test.cpp

@@ -5,7 +5,6 @@
 
 #include <algorithm>
 #include <cstdint>
-#include <iterator>
 #include <memory>
 #include <set>
 #include <vector>

coding/coding_tests/file_data_test.cpp

@@ -1,9 +1,7 @@
 #include "testing/testing.hpp"
 
 #include "coding/internal/file_data.hpp"
-#include "coding/writer.hpp"
 
-#include "base/logging.hpp"
 
 #include <cstddef>
 #include <cstdint>

coding/coding_tests/geometry_serialization_test.cpp

@@ -7,7 +7,6 @@
 
 #include "geometry/mercator.hpp"
 
-#include "base/logging.hpp"
 #include "base/math.hpp"
 
 #include <vector>

coding/coding_tests/mem_file_writer_test.cpp

@@ -1,7 +1,6 @@
 #include "testing/testing.hpp"
 
 #include "coding/writer.hpp"
-#include "coding/file_writer.hpp"
 
 #include "base/macros.hpp"
 

coding/coding_tests/point_coding_tests.cpp

@@ -4,7 +4,6 @@
 
 #include "coding/point_coding.hpp"
 
-#include "geometry/mercator.hpp"
 
 #include "base/logging.hpp"
 

coding/coding_tests/reader_cache_test.cpp

@@ -3,7 +3,6 @@
 #include "coding/reader_cache.hpp"
 #include "coding/reader.hpp"
 
-#include <algorithm>
 #include <random>
 #include <string>
 #include <vector>

coding/coding_tests/traffic_test.cpp

@@ -3,7 +3,6 @@
 #include "coding/traffic.hpp"
 
 #include "geometry/mercator.hpp"
-#include "geometry/point2d.hpp"
 
 #include "base/logging.hpp"
 #include "base/math.hpp"

coding/coding_tests/value_opt_string_test.cpp

@@ -4,9 +4,7 @@
 #include "coding/value_opt_string.hpp"
 #include "coding/writer.hpp"
 
-#include <algorithm>
 #include <cstddef>
-#include <cstdint>
 #include <string>
 #include <vector>
 

coding/file_container.cpp

@@ -8,10 +8,8 @@
 #include <cstring>
 #include <sstream>
 
-#include <stdio.h>
 #include <unistd.h>
 #include <sys/mman.h>
-#include <sys/stat.h>
 #include <sys/fcntl.h>
 
 #include <errno.h>

coding/internal/file_data.cpp

@@ -8,7 +8,6 @@
 #include "base/logging.hpp"
 #include "base/string_utils.hpp"
 
-#include "platform/target_os.hpp"
 
 #include <algorithm>
 #include <cerrno>

coding/mmap_reader.cpp

@@ -1,6 +1,5 @@
 #include "coding/mmap_reader.hpp"
 
-#include "platform/target_os.hpp"
 
 #include <cstring>
 

coding/string_utf8_multilang.cpp

@@ -3,7 +3,6 @@
 #include <algorithm>
 #include <array>
 
-#include "defines.hpp"
 
 using namespace std;
 

generator/check_model.cpp

@@ -1,6 +1,5 @@
 #include "generator/check_model.hpp"
 
-#include "defines.hpp"
 
 #include "indexer/features_vector.hpp"
 #include "indexer/classificator.hpp"

generator/collector_city_area.cpp

@@ -1,6 +1,5 @@
 #include "generator/collector_city_area.hpp"
 
-#include "generator/feature_generator.hpp"
 #include "generator/intermediate_data.hpp"
 
 #include "indexer/ftypes_matcher.hpp"
@@ -11,7 +10,6 @@
 
 #include "base/assert.hpp"
 
-#include <algorithm>
 #include <iterator>
 
 using namespace feature;

generator/collector_tag.cpp

@@ -9,7 +9,6 @@
 
 #include "base/assert.hpp"
 #include "base/geo_object_id.hpp"
-#include "base/logging.hpp"
 
 namespace generator
 {

generator/dumper.cpp

@@ -2,7 +2,6 @@
 
 #include "indexer/classificator.hpp"
 #include "indexer/feature_processor.hpp"
-#include "indexer/trie_reader.hpp"
 #include "indexer/search_delimiters.hpp"
 #include "indexer/search_string_utils.hpp"
 
@@ -16,7 +15,6 @@
 #include <map>
 #include <vector>
 
-#include "defines.hpp"
 
 using namespace std;
 

generator/feature_builder.cpp

@@ -8,13 +8,11 @@
 #include "coding/byte_stream.hpp"
 #include "coding/geometry_coding.hpp"
 #include "coding/read_write_utils.hpp"
-#include "coding/reader.hpp"
 
 #include "geometry/region2d.hpp"
 
 #include "base/logging.hpp"
 #include "base/math.hpp"
-#include "base/string_utils.hpp"
 
 #include <algorithm>
 #include <cstring>

generator/feature_generator.cpp

@@ -1,25 +1,19 @@
 #include "generator/feature_generator.hpp"
 
 #include "generator/feature_builder.hpp"
-#include "generator/generate_info.hpp"
 #include "generator/intermediate_data.hpp"
 #include "generator/intermediate_elements.hpp"
 
-#include "indexer/cell_id.hpp"
 #include "indexer/data_header.hpp"
-#include "geometry/mercator.hpp"
 
-#include "coding/varint.hpp"
 
 #include "base/assert.hpp"
 #include "base/logging.hpp"
 #include "base/stl_helpers.hpp"
 
 #include <functional>
-#include <unordered_map>
 #include <utility>
 
-#include "platform/target_os.hpp"
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // FeaturesCollector implementation

generator/feature_maker.cpp

@@ -3,11 +3,9 @@
 #include "generator/holes.hpp"
 #include "generator/osm2type.hpp"
 #include "generator/osm_element.hpp"
-#include "generator/type_helper.hpp"
 
 #include "indexer/classificator.hpp"
 #include "indexer/feature_visibility.hpp"
-#include "indexer/ftypes_matcher.hpp"
 
 #include <utility>
 

generator/feature_processing_layers.cpp

@@ -2,8 +2,6 @@
 
 #include "generator/coastlines_generator.hpp"
 #include "generator/feature_maker.hpp"
-#include "generator/generate_info.hpp"
-#include "generator/type_helper.hpp"
 
 #include "indexer/classificator.hpp"
 #include "indexer/feature_visibility.hpp"

generator/generator_tests/feature_builder_test.cpp

@@ -5,7 +5,6 @@
 #include "generator/feature_builder.hpp"
 #include "generator/generator_tests_support/test_with_classificator.hpp"
 #include "generator/geometry_holder.hpp"
-#include "generator/osm2type.hpp"
 
 #include "indexer/data_header.cpp"
 #include "indexer/classificator_loader.hpp"

generator/generator_tests/geo_objects_tests.cpp

@@ -11,7 +11,6 @@
 
 #include "indexer/classificator_loader.hpp"
 
-#include <iostream>
 
 using namespace generator_tests;
 using namespace platform::tests_support;

generator/generator_tests/intermediate_data_test.cpp

@@ -8,21 +8,15 @@
 
 #include "testing/testing.hpp"
 
-#include "generator/generate_info.hpp"
-#include "generator/intermediate_data.hpp"
 #include "generator/intermediate_elements.hpp"
 
 #include "coding/reader.hpp"
 #include "coding/writer.hpp"
 
-#include "defines.hpp"
 
 #include <cstdint>
-#include <string>
-#include <utility>
 #include <vector>
 
-using namespace generator;
 using namespace std;
 
 UNIT_TEST(Intermediate_Data_empty_way_element_save_load_test)

generator/generator_tests/merge_collectors_tests.cpp

@@ -3,10 +3,8 @@
 #include "generator/generator_tests/common.hpp"
 
 #include "generator/collector_collection.hpp"
-#include "generator/collector_interface.hpp"
 #include "generator/collector_tag.hpp"
 
-#include "platform/platform.hpp"
 
 #include "base/geo_object_id.hpp"
 

generator/generator_tests/metadata_parser_test.cpp

@@ -4,7 +4,6 @@
 
 #include "indexer/classificator_loader.hpp"
 
-#include "base/logging.hpp"
 
 using feature::Metadata;
 

generator/generator_tests/osm_type_test.cpp

@@ -8,7 +8,6 @@
 
 #include "indexer/feature_data.hpp"
 #include "indexer/classificator.hpp"
-#include "indexer/classificator_loader.hpp"
 
 #include "platform/platform.hpp"
 

generator/generator_tests/region_info_collector_tests.cpp

@@ -8,15 +8,12 @@
 
 #include "platform/platform.hpp"
 
-#include "base/file_name_utils.hpp"
 #include "base/geo_object_id.hpp"
 #include "base/scope_guard.hpp"
 
 #include <cstdint>
 #include <limits>
 #include <memory>
-#include <string>
-#include <utility>
 #include <vector>
 
 using namespace generator_tests;

generator/generator_tests/regions_tests.cpp

@@ -6,7 +6,6 @@
 #include "generator/osm_element.hpp"
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/place_point.hpp"
-#include "generator/regions/regions.hpp"
 #include "generator/regions/regions_builder.hpp"
 
 #include "indexer/classificator.hpp"
@@ -14,15 +13,12 @@
 
 #include "platform/platform.hpp"
 
-#include "coding/transliteration.hpp"
 
-#include "base/file_name_utils.hpp"
 #include "base/macros.hpp"
 #include "base/scope_guard.hpp"
 
 #include <algorithm>
 #include <cstdint>
-#include <limits>
 #include <memory>
 #include <sstream>
 #include <string>

generator/generator_tests/source_to_element_test.cpp

@@ -8,8 +8,6 @@
 
 #include <cstddef>
 #include <iostream>
-#include <iterator>
-#include <sstream>
 #include <string>
 #include <vector>
 

generator/generator_tests/tag_admixer_test.cpp

@@ -4,7 +4,6 @@
 
 #include <map>
 #include <set>
-#include <sstream>
 
 UNIT_TEST(WaysParserTests)
 {

generator/generator_tests_support/test_feature.cpp

@@ -6,10 +6,7 @@
 #include "indexer/editable_map_object.hpp"
 #include "indexer/feature.hpp"
 #include "indexer/feature_algo.hpp"
-#include "indexer/feature_decl.hpp"
 #include "indexer/feature_meta.hpp"
-#include "indexer/ftypes_matcher.hpp"
-#include "indexer/mwm_set.hpp"
 
 #include "coding/string_utf8_multilang.hpp"
 

generator/generator_tool/generator_tool.cpp

@@ -1,7 +1,4 @@
-#include "generator/check_model.hpp"
 #include "generator/data_version.hpp"
-#include "generator/dumper.hpp"
-#include "generator/feature_generator.hpp"
 #include "generator/generate_info.hpp"
 #include "generator/geo_objects/geo_objects_generator.hpp"
 #include "generator/locality_sorter.hpp"
@@ -14,7 +11,6 @@
 #include "generator/streets/streets.hpp"
 #include "generator/translator_collection.hpp"
 #include "generator/translator_factory.hpp"
-#include "generator/unpack_mwm.hpp"
 
 #include "geocoder/geocoder.hpp"
 
@@ -28,7 +24,6 @@
 #include "coding/endianness.hpp"
 
 #include "base/file_name_utils.hpp"
-#include "base/timer.hpp"
 
 #include <boost/program_options.hpp>
 
@@ -40,7 +35,6 @@
 #define BOOST_STACKTRACE_GNU_SOURCE_NOT_REQUIRED
 #include <boost/stacktrace.hpp>
 
-#include "build_version.hpp"
 #include "defines.hpp"
 
 using namespace std;

generator/locality_sorter.cpp

@@ -6,26 +6,20 @@
 
 #include "indexer/data_header.hpp"
 #include "indexer/scales.hpp"
-#include "indexer/scales_patch.hpp"
 
 #include "coding/file_container.hpp"
 #include "coding/internal/file_data.hpp"
 
 #include "geometry/convex_hull.hpp"
 
-#include "platform/platform.hpp"
 
-#include "base/assert.hpp"
-#include "base/file_name_utils.hpp"
 #include "base/logging.hpp"
-#include "base/scope_guard.hpp"
 #include "base/string_utils.hpp"
 #include "base/timer.hpp"
 
 #include "defines.hpp"
 
 #include <cstdint>
-#include <fstream>
 #include <functional>
 #include <limits>
 #include <set>

generator/metalines_builder.cpp

@@ -12,7 +12,6 @@
 
 #include "base/checked_cast.hpp"
 #include "base/logging.hpp"
-#include "base/string_utils.hpp"
 
 #include "defines.hpp"
 

generator/osm_element.cpp

@@ -4,7 +4,6 @@
 #include "coding/parse_xml.hpp"
 
 #include <algorithm>
-#include <cstdio>
 #include <cstring>
 #include <sstream>
 

generator/osm_source.cpp

@@ -9,7 +9,6 @@
 #include "platform/platform.hpp"
 
 #include "geometry/mercator.hpp"
-#include "geometry/tree4d.hpp"
 
 #include "base/assert.hpp"
 #include "base/stl_helpers.hpp"

generator/raw_generator.cpp

@@ -8,7 +8,6 @@
 
 #include "base/thread_pool_computational.hpp"
 
-#include "defines.hpp"
 
 #include <string>
 #include <vector>

generator/regions/region_info.cpp

@@ -5,8 +5,6 @@
 #include "coding/file_reader.hpp"
 
 #include "base/assert.hpp"
-#include "base/logging.hpp"
-#include "base/macros.hpp"
 
 namespace generator
 {

generator/regions/regions.cpp

@@ -3,20 +3,15 @@
 
 #include "generator/feature_builder.hpp"
 #include "generator/feature_generator.hpp"
-#include "generator/generate_info.hpp"
 #include "generator/regions/node.hpp"
 #include "generator/regions/place_point.hpp"
-#include "generator/regions/regions.hpp"
 #include "generator/regions/regions_builder.hpp"
 
 #include "geometry/mercator.hpp"
 
-#include "coding/transliteration.hpp"
 
 #include "base/assert.hpp"
-#include "base/file_name_utils.hpp"
 #include "base/logging.hpp"
-#include "base/stl_helpers.hpp"
 #include "base/timer.hpp"
 
 #include <algorithm>
@@ -24,15 +19,10 @@
 #include <map>
 #include <memory>
 #include <numeric>
-#include <queue>
 #include <set>
-#include <thread>
 #include <tuple>
-#include <unordered_map>
-#include <unordered_set>
 #include <vector>
 
-#include "defines.hpp"
 
 using namespace feature;
 

generator/regions/regions_builder.cpp

@@ -11,7 +11,6 @@
 
 #include <algorithm>
 #include <chrono>
-#include <fstream>
 #include <functional>
 #include <numeric>
 #include <queue>

generator/routing_helpers.cpp

@@ -2,8 +2,6 @@
 
 #include "generator/utils.hpp"
 
-#include "coding/file_reader.hpp"
-#include "coding/reader.hpp"
 
 #include "base/logging.hpp"
 

generator/statistics.cpp

@@ -12,7 +12,6 @@
 
 #include <iomanip>
 #include <iostream>
-#include <iterator>
 
 using namespace feature;
 using namespace std;

generator/streets/street_geometry.cpp

@@ -9,7 +9,6 @@
 #include "base/exception.hpp"
 
 #include <algorithm>
-#include <iterator>
 #include <utility>
 
 #include <boost/geometry.hpp>
@@ -159,7 +158,7 @@ void HighwayGeometry::ExtendLimitRect(std::vector<m2::PointD> const & points)
 
 void HighwayGeometry::MultiLine::Add(LineSegment && segment)
 {
-  for (auto line = m_lines.begin(), end = m_lines.end(); line != end; ++line) 
+  for (auto line = m_lines.begin(), end = m_lines.end(); line != end; ++line)
   {
     if (line->Add(std::move(segment)))
     {

generator/streets/street_regions_tracing.cpp

@@ -3,7 +3,6 @@
 #include "geometry/mercator.hpp"
 
 #include <algorithm>
-#include <iterator>
 
 #include <boost/optional.hpp>
 

generator/streets/streets.cpp

@@ -7,7 +7,6 @@
 #include "base/scope_guard.hpp"
 #include "base/timer.hpp"
 
-#include <fstream>
 
 namespace generator
 {

geocoder/geocoder_tests/geocoder_tests.cpp

@@ -3,7 +3,6 @@
 #include "geocoder/geocoder.hpp"
 #include "geocoder/hierarchy_reader.hpp"
 
-#include "indexer/search_string_utils.hpp"
 
 #include "platform/platform_tests_support/scoped_file.hpp"
 

geocoder/hierarchy_reader.cpp

@@ -7,7 +7,6 @@
 #include <iomanip>
 #include <list>
 #include <sstream>
-#include <thread>
 #include <vector>
 
 using namespace std;

geometry/geometry_tests/parametrized_segment_tests.cpp

@@ -4,7 +4,6 @@
 #include "geometry/point2d.hpp"
 
 #include "base/macros.hpp"
-#include "base/math.hpp"
 
 template <typename Point>
 void FloatingPointsTest()
@@ -53,17 +52,17 @@ UNIT_TEST(ParametrizedSegment2D_DegenerateSection)
 UNIT_TEST(ParametrizedSegment2D_ClosestPoint)
 {
   using P = m2::PointD;
- 
+
   P arr[][4] =
   {
     { P(3, 4), P(0, 0), P(10, 0), P(3, 0) },
     { P(3, 4), P(0, 0), P(0, 10), P(0, 4) },
- 
+
     { P(3, 5), P(2, 2), P(5, 5), P(4, 4) },
     { P(5, 3), P(2, 2), P(5, 5), P(4, 4) },
     { P(2, 4), P(2, 2), P(5, 5), P(3, 3) },
     { P(4, 2), P(2, 2), P(5, 5), P(3, 3) },
- 
+
     { P(5, 6), P(2, 2), P(5, 5), P(5, 5) },
     { P(1, 0), P(2, 2), P(5, 5), P(2, 2) }
   };

geometry/geometry_tests/simplification_test.cpp

@@ -5,11 +5,9 @@
 #include "geometry/point2d.hpp"
 #include "geometry/simplification.hpp"
 
-#include "base/logging.hpp"
 #include "base/macros.hpp"
 #include "base/stl_helpers.hpp"
 
-#include <cstdint>
 #include <limits>
 #include <vector>
 

geometry/robust_orientation.cpp

@@ -2,7 +2,6 @@
 
 #include "base/macros.hpp"
 
-#include <algorithm>
 
 extern "C" {
 #if defined(__clang__)

geometry/screenbase.cpp

@@ -3,7 +3,6 @@
 #include "geometry/transformations.hpp"
 
 #include "base/assert.hpp"
-#include "base/logging.hpp"
 
 #include <cmath>
 

geometry/triangle2d.cpp

@@ -4,7 +4,6 @@
 #include "geometry/robust_orientation.hpp"
 #include "geometry/segment2d.hpp"
 
-#include "base/math.hpp"
 
 #include <chrono>
 #include <limits>

indexer/altitude_loader.cpp

@@ -7,13 +7,11 @@
 
 #include "base/logging.hpp"
 #include "base/stl_helpers.hpp"
-#include "base/thread.hpp"
 
 #include "defines.hpp"
 
 #include <algorithm>
 
-#include "3party/succinct/mapper.hpp"
 
 using namespace std;
 

indexer/centers_table.cpp

@@ -1,26 +1,17 @@
 #include "indexer/centers_table.hpp"
 
-#include "indexer/feature_processor.hpp"
 
 #include "coding/endianness.hpp"
-#include "coding/file_container.hpp"
 #include "coding/geometry_coding.hpp"
-#include "coding/memory_region.hpp"
 #include "coding/point_coding.hpp"
 #include "coding/reader.hpp"
-#include "coding/succinct_mapper.hpp"
 #include "coding/varint.hpp"
-#include "coding/write_to_sink.hpp"
 #include "coding/writer.hpp"
 
 #include "base/assert.hpp"
-#include "base/checked_cast.hpp"
-#include "base/logging.hpp"
 
 #include <unordered_map>
 
-#include "3party/succinct/elias_fano.hpp"
-#include "3party/succinct/rs_bit_vector.hpp"
 
 using namespace std;
 

indexer/classificator_loader.cpp

@@ -1,4 +1,3 @@
-#include "indexer/classificator_loader.hpp"
 #include "indexer/classificator.hpp"
 #include "indexer/drawing_rules.hpp"
 #include "indexer/map_style_reader.hpp"
@@ -10,7 +9,6 @@
 
 #include "base/logging.hpp"
 
-#include <iostream>
 #include <memory>
 #include <string>
 

indexer/data_source.cpp

@@ -3,7 +3,6 @@
 #include "base/logging.hpp"
 
 #include <algorithm>
-#include <limits>
 
 using platform::CountryFile;
 using platform::LocalCountryFile;

indexer/drawing_rules.cpp

@@ -4,9 +4,7 @@
 #include "indexer/map_style_reader.hpp"
 #include "indexer/scales.hpp"
 
-#include "defines.hpp"
 
-#include "platform/platform.hpp"
 
 #include "base/logging.hpp"
 

indexer/feature.cpp

@@ -4,15 +4,12 @@
 #include "indexer/feature_algo.hpp"
 #include "indexer/feature_impl.hpp"
 #include "indexer/feature_utils.hpp"
-#include "indexer/feature_visibility.hpp"
 #include "indexer/map_object.hpp"
-#include "indexer/scales.hpp"
 #include "indexer/shared_load_info.hpp"
 
 #include "platform/preferred_languages.hpp"
 
 #include "geometry/parametrized_segment.hpp"
-#include "geometry/robust_orientation.hpp"
 
 #include "coding/byte_stream.hpp"
 #include "coding/dd_vector.hpp"
@@ -25,7 +22,6 @@
 #include <exception>
 #include <limits>
 
-#include "defines.hpp"
 
 using namespace feature;
 using namespace std;

indexer/feature_algo.cpp

@@ -1,4 +1,3 @@
-#include "indexer/feature_algo.hpp"
 #include "indexer/feature.hpp"
 
 #include "geometry/algorithm.hpp"

indexer/feature_data.cpp

@@ -3,7 +3,6 @@
 #include "indexer/classificator.hpp"
 #include "indexer/feature.hpp"
 #include "indexer/feature_impl.hpp"
-#include "indexer/feature_visibility.hpp"
 #include "indexer/ftypes_matcher.hpp"
 
 #include "base/assert.hpp"

indexer/feature_impl.cpp

@@ -1,4 +1,3 @@
-#include "indexer/feature_impl.hpp"
 
 #include "base/string_utils.hpp"
 #include "base/logging.hpp"

indexer/feature_meta.cpp

@@ -1,6 +1,5 @@
 #include "indexer/feature_meta.hpp"
 
-#include "platform/target_os.hpp"
 
 #include <sstream>
 

indexer/feature_utils.cpp

@@ -1,11 +1,8 @@
 #include "indexer/classificator.hpp"
-#include "indexer/feature.hpp"
 #include "indexer/feature_data.hpp"
-#include "indexer/feature_utils.hpp"
 #include "indexer/feature_visibility.hpp"
 #include "indexer/scales.hpp"
 
-#include "geometry/point2d.hpp"
 
 #include "coding/string_utf8_multilang.hpp"
 #include "coding/transliteration.hpp"
@@ -97,7 +94,7 @@ bool GetBestName(StringUtf8Multilang const & src, vector<int8_t> const & priorit
 }
 
 vector<int8_t> GetSimilarToDeviceLanguages(int8_t deviceLang)
-{  
+{
   auto const it = kSimilarToDeviceLanguages.find(deviceLang);
   if (it != kSimilarToDeviceLanguages.cend())
     return it->second;

indexer/ftypes_matcher.cpp

@@ -14,8 +14,6 @@
 #include <functional>
 #include <iterator>
 #include <map>
-#include <sstream>
-#include <unordered_map>
 
 using namespace std;
 

indexer/indexer_tests/categories_test.cpp

@@ -6,9 +6,7 @@
 #include "indexer/classificator_loader.hpp"
 
 #include "coding/reader.hpp"
-#include "coding/string_utf8_multilang.hpp"
 
-#include "base/stl_helpers.hpp"
 #include "base/string_utils.hpp"
 
 #include <memory>

indexer/indexer_tests/cell_coverer_test.cpp

@@ -1,13 +1,10 @@
 #include "testing/testing.hpp"
 
-#include "geometry/covering_utils.hpp"
 
 #include "indexer/cell_coverer.hpp"
 #include "indexer/indexer_tests/bounds.hpp"
 
-#include "coding/hex.hpp"
 
-#include "base/logging.hpp"
 
 #include <vector>
 

indexer/indexer_tests/cell_id_test.cpp

@@ -3,7 +3,6 @@
 #include "indexer/cell_id.hpp"
 #include "indexer/indexer_tests/bounds.hpp"
 
-#include "coding/hex.hpp"
 
 #include <cmath>
 #include <random>

indexer/indexer_tests/centers_table_test.cpp

@@ -3,10 +3,7 @@
 #include "indexer/centers_table.hpp"
 #include "indexer/classificator_loader.hpp"
 #include "indexer/data_header.hpp"
-#include "indexer/feature_algo.hpp"
-#include "indexer/features_vector.hpp"
 
-#include "platform/platform.hpp"
 
 #include "coding/reader.hpp"
 #include "coding/writer.hpp"
@@ -14,10 +11,8 @@
 #include "geometry/mercator.hpp"
 #include "geometry/point2d.hpp"
 
-#include "base/file_name_utils.hpp"
 
 #include <cstdint>
-#include <string>
 #include <utility>
 #include <vector>
 

indexer/indexer_tests/feature_metadata_test.cpp

@@ -5,7 +5,6 @@
 #include "coding/reader.hpp"
 #include "coding/writer.hpp"
 
-#include "platform/target_os.hpp"
 
 #include <map>
 #include <string>

indexer/indexer_tests/index_builder_test.cpp

@@ -4,7 +4,6 @@
 #include "indexer/data_source.hpp"
 #include "indexer/features_vector.hpp"
 #include "indexer/index_builder.hpp"
-#include "indexer/scales.hpp"
 
 #include "defines.hpp"
 

indexer/indexer_tests/interval_index_test.cpp

@@ -9,7 +9,6 @@
 #include "base/macros.hpp"
 #include "base/stl_helpers.hpp"
 
-#include <utility>
 #include <vector>
 
 using namespace std;

indexer/indexer_tests/locality_index_test.cpp

@@ -6,7 +6,6 @@
 #include "indexer/locality_object.hpp"
 
 #include "coding/file_container.hpp"
-#include "coding/mmap_reader.hpp"
 #include "coding/reader.hpp"
 
 #include "geometry/rect2d.hpp"

indexer/indexer_tests/postcodes_matcher_tests.cpp

@@ -1,11 +1,8 @@
 #include "../../testing/testing.hpp"
 
 #include "indexer/postcodes_matcher.hpp"
-#include "indexer/search_delimiters.hpp"
-#include "indexer/search_string_utils.hpp"
 
 #include "base/stl_helpers.hpp"
-#include "base/string_utils.hpp"
 
 using namespace strings;
 

indexer/indexer_tests/search_string_utils_test.cpp

@@ -4,7 +4,6 @@
 
 #include "base/string_utils.hpp"
 
-#include <cstdint>
 #include <string>
 #include <utility>
 #include <vector>

indexer/indexer_tests/string_slice_tests.cpp

@@ -4,7 +4,6 @@
 
 #include "base/string_utils.hpp"
 
-#include <iterator>
 #include <vector>
 
 using namespace search;

indexer/indexer_tests/succinct_trie_test.cpp

@@ -6,7 +6,6 @@
 #include "indexer/succinct_trie_builder.hpp"
 #include "indexer/succinct_trie_reader.hpp"
 #include "indexer/trie.hpp"
-#include "indexer/trie_builder.hpp"
 #include "indexer/trie_reader.hpp"
 
 #include "base/string_utils.hpp"

indexer/indexer_tests/trie_test.cpp

@@ -13,7 +13,6 @@
 #include <algorithm>
 #include <cstring>
 #include <string>
-#include <type_traits>
 #include <utility>
 #include <vector>
 

indexer/indexer_tests/visibility_test.cpp

@@ -1,6 +1,5 @@
 #include "testing/testing.hpp"
 
-#include "indexer/feature_data.hpp"
 #include "indexer/feature_visibility.hpp"
 #include "indexer/classificator.hpp"
 #include "indexer/classificator_loader.hpp"

indexer/map_object.cpp

@@ -6,7 +6,6 @@
 
 #include "platform/localization.hpp"
 #include "platform/measurement_utils.hpp"
-#include "platform/preferred_languages.hpp"
 
 #include "base/logging.hpp"
 #include "base/string_utils.hpp"

indexer/mwm_set.cpp

@@ -6,7 +6,6 @@
 #include "platform/local_country_file_utils.hpp"
 
 #include "base/assert.hpp"
-#include "base/exception.hpp"
 #include "base/logging.hpp"
 #include "base/stl_helpers.hpp"
 
@@ -14,7 +13,6 @@
 #include <exception>
 #include <sstream>
 
-#include "defines.hpp"
 
 using namespace std;
 using platform::CountryFile;

indexer/postcodes_matcher.cpp

@@ -10,7 +10,6 @@
 
 #include <algorithm>
 #include <memory>
-#include <utility>
 #include <vector>
 
 #include <boost/iterator/transform_iterator.hpp>

indexer/rank_table.cpp

@@ -1,10 +1,7 @@
 #include "indexer/rank_table.hpp"
 
-#include "indexer/classificator.hpp"
 #include "indexer/data_header.hpp"
-#include "indexer/feature_algo.hpp"
 #include "indexer/feature_impl.hpp"
-#include "indexer/feature_utils.hpp"
 #include "indexer/features_vector.hpp"
 #include "indexer/ftypes_matcher.hpp"
 
@@ -22,7 +19,6 @@
 
 #include "base/assert.hpp"
 #include "base/logging.hpp"
-#include "base/macros.hpp"
 #include "base/math.hpp"
 
 #include <algorithm>