diff --git a/generator/generator_tests/collector_boundary_postcode_tests.cpp b/generator/generator_tests/collector_boundary_postcode_tests.cpp
index 5f718d7967..148563526c 100644
--- a/generator/generator_tests/collector_boundary_postcode_tests.cpp
+++ b/generator/generator_tests/collector_boundary_postcode_tests.cpp
@@ -22,9 +22,6 @@
 
 namespace collector_boundary_postcode_tests
 {
-//using namespace generator_tests;
-//using namespace generator;
-//using namespace feature;
 using std::string, std::vector, std::unordered_map;
 
 static string const kDumpFileName = "dump.bin";
@@ -56,7 +53,7 @@ unordered_map<uint64_t, WayElement> const kWays = {
     {3, WayElement{3, kPolygon3}},
     {4, WayElement{4, kPolygon4}}};
 
-class IntermediateDataReaderTest : public cache::IntermediateDataReaderInterface
+class IntermediateDataReaderTest : public generator::cache::IntermediateDataReaderInterface
 {
   // IntermediateDataReaderBase overrides:
   bool GetNode(uint64_t id, double & lat, double & lon) const override
@@ -165,7 +162,7 @@ UNIT_TEST(CollectorBoundaryPostcode_1)
   SCOPE_GUARD(rmDump, std::bind(Platform::RemoveFileIfExists, cref(kDumpFileName)));
 
   auto cache = std::make_shared<IntermediateDataReaderTest>();
-  auto collector = std::make_shared<BoundaryPostcodeCollector>(kDumpFileName, cache);
+  auto collector = std::make_shared<generator::BoundaryPostcodeCollector>(kDumpFileName, cache);
   collector->Collect(postcodeAreaRelation1);
   collector->Collect(postcodeAreaRelation2);
   collector->Collect(postcodeAreaRelation3);
@@ -182,7 +179,7 @@ UNIT_TEST(CollectorBoundaryPostcode_2)
   SCOPE_GUARD(rmDump, std::bind(Platform::RemoveFileIfExists, cref(kDumpFileName)));
 
   auto cache = std::make_shared<IntermediateDataReaderTest>();
-  auto collector1 = std::make_shared<BoundaryPostcodeCollector>(kDumpFileName, cache);
+  auto collector1 = std::make_shared<generator::BoundaryPostcodeCollector>(kDumpFileName, cache);
   auto collector2 = collector1->Clone();
 
   collector1->Collect(postcodeAreaRelation1);
diff --git a/generator/generator_tests/intermediate_data_test.cpp b/generator/generator_tests/intermediate_data_test.cpp
index f5d1129c49..14352a7106 100644
--- a/generator/generator_tests/intermediate_data_test.cpp
+++ b/generator/generator_tests/intermediate_data_test.cpp
@@ -19,8 +19,6 @@
 
 namespace intermediate_data_test
 {
-using namespace generator;
-
 UNIT_TEST(Intermediate_Data_empty_way_element_save_load_test)
 {
   WayElement e1(1 /* fake osm id */);
diff --git a/generator/generator_tests/maxspeeds_tests.cpp b/generator/generator_tests/maxspeeds_tests.cpp
index 6654eeaf6a..a989612e0e 100644
--- a/generator/generator_tests/maxspeeds_tests.cpp
+++ b/generator/generator_tests/maxspeeds_tests.cpp
@@ -51,6 +51,7 @@ using namespace platform::tests_support;
 using namespace platform;
 using namespace routing;
 using namespace routing_builder;
+using std::string;
 
 using Features = std::vector<std::vector<m2::PointD>>;
 
diff --git a/generator/generator_tests/road_access_test.cpp b/generator/generator_tests/road_access_test.cpp
index f86e329299..38957acd49 100644
--- a/generator/generator_tests/road_access_test.cpp
+++ b/generator/generator_tests/road_access_test.cpp
@@ -37,7 +37,7 @@ using namespace platform::tests_support;
 using namespace platform;
 using namespace routing;
 using namespace routing_builder;
-using std::fstream, std::ifstream, std::make_pair;
+using std::fstream, std::ifstream, std::make_pair, std::string;
 
 string const kTestDir = "road_access_generation_test";
 string const kTestMwm = "test";
@@ -245,7 +245,7 @@ UNIT_TEST(RoadAccessCoditionalParse)
   AccessConditionalTagParser parser;
 
   using ConditionalVector = std::vector<AccessConditional>;
-  std::vector<pair<string, ConditionalVector>> tests = {
+  std::vector<std::pair<string, ConditionalVector>> const tests = {
       {"no @ Mo-Su",
        {{RoadAccess::Type::No, "Mo-Su"}}},
 
diff --git a/indexer/feature.cpp b/indexer/feature.cpp
index 7ec08d41b1..2332bbe137 100644
--- a/indexer/feature.cpp
+++ b/indexer/feature.cpp
@@ -553,7 +553,7 @@ FeatureType::GeomStat FeatureType::GetOuterTrianglesStats()
   ASSERT(!m_parsed.m_triangles, ("Triangles had been parsed already!"));
   CHECK(m_loadInfo, ());
   int const scalesCount = m_loadInfo->GetScalesCount();
-  ASSERT_LESS_OR_EQUAL(scalesCount, DataHeader::kMaxScalesCount, ("MWM has too many geometry scales!"));
+  ASSERT_LESS_OR_EQUAL(scalesCount, static_cast<int const>(DataHeader::kMaxScalesCount), ("MWM has too many geometry scales!"));
   FeatureType::GeomStat res;
 
   auto const headerGeomType = static_cast<HeaderGeomType>(Header(m_data) & HEADER_MASK_GEOMTYPE);
@@ -561,7 +561,7 @@ FeatureType::GeomStat FeatureType::GetOuterTrianglesStats()
   {
     if (m_triangles.empty())
     {
-      for (size_t ind = 0; ind < scalesCount; ++ind)
+      for (int ind = 0; ind < scalesCount; ++ind)
       {
         if (m_offsets.m_trg[ind] != kInvalidOffset)
         {