diff --git a/generator/city_roads_generator.cpp b/generator/city_roads_generator.cpp
index d11f809a31..a4c4a34f7b 100644
--- a/generator/city_roads_generator.cpp
+++ b/generator/city_roads_generator.cpp
@@ -64,9 +64,9 @@ vector<uint32_t> CalcRoadFeatureIds(string const & dataPath, string const & boun
   CitiesBoundariesChecker const checker(citiesBoundaries);
 
   vector<uint32_t> cityRoadFeatureIds;
-  ForEachFeature(dataPath, [&cityRoadFeatureIds, &checker](FeatureType & ft, uint32_t)
+  feature::ForEachFeature(dataPath, [&cityRoadFeatureIds, &checker](FeatureType & ft, uint32_t)
   {
-    TypesHolder types(ft);
+    feature::TypesHolder types(ft);
     if (!routing::IsCarRoad(types) && !routing::IsBicycleRoad(types))
       return;
 
diff --git a/generator/generator_tests/cross_mwm_osm_ways_collector_tests.cpp b/generator/generator_tests/cross_mwm_osm_ways_collector_tests.cpp
index 98f3a7f872..d4b5f80dd8 100644
--- a/generator/generator_tests/cross_mwm_osm_ways_collector_tests.cpp
+++ b/generator/generator_tests/cross_mwm_osm_ways_collector_tests.cpp
@@ -8,6 +8,7 @@
 
 #include "platform/platform.hpp"
 
+#include "indexer/classificator.hpp"
 #include "indexer/classificator_loader.hpp"
 
 #include "geometry/mercator.hpp"
diff --git a/generator/generator_tests/descriptions_section_builder_tests.cpp b/generator/generator_tests/descriptions_section_builder_tests.cpp
index a27a3afb29..caab171d8d 100644
--- a/generator/generator_tests/descriptions_section_builder_tests.cpp
+++ b/generator/generator_tests/descriptions_section_builder_tests.cpp
@@ -30,6 +30,8 @@
 
 namespace generator_tests
 {
+using namespace generator;
+
 class Feature : public generator::tests_support::TestFeature
 {
 public:
diff --git a/generator/generator_tests/feature_builder_test.cpp b/generator/generator_tests/feature_builder_test.cpp
index 417fcef7f1..8b26834dbe 100644
--- a/generator/generator_tests/feature_builder_test.cpp
+++ b/generator/generator_tests/feature_builder_test.cpp
@@ -19,6 +19,7 @@ namespace feature_builder_test
 {
 using namespace feature;
 using namespace generator::tests_support;
+using namespace std;
 using namespace tests;
 
 UNIT_CLASS_TEST(TestWithClassificator, FBuilder_ManyTypes)
diff --git a/generator/generator_tests/maxspeeds_tests.cpp b/generator/generator_tests/maxspeeds_tests.cpp
index 6c97299b59..13ca1e9b3a 100644
--- a/generator/generator_tests/maxspeeds_tests.cpp
+++ b/generator/generator_tests/maxspeeds_tests.cpp
@@ -16,6 +16,7 @@
 
 #include "routing_common/maxspeed_conversion.hpp"
 
+#include "indexer/classificator.hpp"
 #include "indexer/classificator_loader.hpp"
 #include "indexer/data_source.hpp"
 #include "indexer/feature.hpp"
@@ -405,7 +406,7 @@ UNIT_TEST(MaxspeedCollector_Smoke)
   auto const filename = GetFileName();
   SCOPE_GUARD(_, std::bind(Platform::RemoveFileIfExists, std::cref(filename)));
 
-  FeatureBuilder builder;
+  feature::FeatureBuilder builder;
 
   auto c1 = std::make_shared<MaxspeedsCollector>(filename);
   c1->CollectFeature(builder, MakeOsmElement(1 /* id */, {{"maxspeed:forward", "50"}} /* tags */, OsmElement::EntityType::Way));
diff --git a/routing/routing_tests/restriction_test.cpp b/routing/routing_tests/restriction_test.cpp
index 6d2ae4f6be..facefe3470 100644
--- a/routing/routing_tests/restriction_test.cpp
+++ b/routing/routing_tests/restriction_test.cpp
@@ -17,9 +17,9 @@
 
 namespace restriction_test
 {
-using namespace std;
 using namespace routing;
-using routing_test::TestRestrictions;
+using namespace routing_test;
+using namespace std;
 
 using Algorithm = AStarAlgorithm<Segment, SegmentEdge, RouteWeight>;
 
diff --git a/routing/routing_tests/turns_sound_test.cpp b/routing/routing_tests/turns_sound_test.cpp
index a6429e99d8..d362d9c146 100644
--- a/routing/routing_tests/turns_sound_test.cpp
+++ b/routing/routing_tests/turns_sound_test.cpp
@@ -10,8 +10,11 @@
 namespace turns_sound_test
 {
 using namespace location;
-using namespace routing::turns::sound;
 using namespace std;
+using routing::turns::CarDirection;
+using routing::turns::TurnItemDist;
+using routing::turns::sound::NotificationManager;
+using routing::turns::sound::Settings;
 
 // An error to compare two double after conversion feet to meters.
 double const kEps = 1.;
diff --git a/routing/routing_tests/uturn_restriction_tests.cpp b/routing/routing_tests/uturn_restriction_tests.cpp
index 3e5944c731..fd6132ebf9 100644
--- a/routing/routing_tests/uturn_restriction_tests.cpp
+++ b/routing/routing_tests/uturn_restriction_tests.cpp
@@ -8,6 +8,7 @@
 namespace uturn_restriction_tests
 {
 using namespace routing;
+using namespace routing_test;
 
 using Algorithm = AStarAlgorithm<Segment, SegmentEdge, RouteWeight>;