diff --git a/routing_common/vehicle_model.cpp b/routing_common/vehicle_model.cpp
index b755eadade..657598b20d 100644
--- a/routing_common/vehicle_model.cpp
+++ b/routing_common/vehicle_model.cpp
@@ -6,10 +6,6 @@
 
 #include "base/macros.hpp"
 
-#include "std/algorithm.hpp"
-#include "std/initializer_list.hpp"
-#include "std/limits.hpp"
-
 namespace routing
 {
 VehicleModel::AdditionalRoadType::AdditionalRoadType(Classificator const & c,
@@ -31,8 +27,8 @@ VehicleModel::VehicleModel(Classificator const & c, InitListT const & featureTyp
   for (auto const & v : featureTypeLimits)
   {
     m_maxSpeedKMpH = max(m_maxSpeedKMpH, v.m_speedKMpH);
-    m_types.emplace(make_pair(c.GetTypeByPath(vector<string>(v.m_types, v.m_types + 2)),
-                              RoadLimits(v.m_speedKMpH, v.m_isTransitAllowed)));
+    m_types.emplace(c.GetTypeByPath(vector<string>(v.m_types, v.m_types + 2)),
+                              RoadLimits(v.m_speedKMpH, v.m_isTransitAllowed));
   }
 }
 
diff --git a/routing_common/vehicle_model.hpp b/routing_common/vehicle_model.hpp
index e2c0542244..25383b2087 100644
--- a/routing_common/vehicle_model.hpp
+++ b/routing_common/vehicle_model.hpp
@@ -1,12 +1,16 @@
 #pragma once
 
-#include "std/cstdint.hpp"
-#include "std/initializer_list.hpp"
-#include "std/shared_ptr.hpp"
-#include "std/string.hpp"
-#include "std/unordered_map.hpp"
-#include "std/utility.hpp"
-#include "std/vector.hpp"
+#include <initializer_list>
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <vector>
+
+using std::initializer_list;
+using std::shared_ptr;
+using std::string;
+using std::unordered_map;
+using std::vector;
 
 class Classificator;
 class FeatureType;