From 949ab83ab2c30b0909414d89fd7778dbabfb6344 Mon Sep 17 00:00:00 2001
From: Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru>
Date: Thu, 19 Oct 2017 14:23:31 +0300
Subject: [PATCH] Minor fixes.

---
 generator/transit_generator.cpp | 4 ++--
 generator/transit_generator.hpp | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/generator/transit_generator.cpp b/generator/transit_generator.cpp
index 96605c5916..bea3e946ce 100644
--- a/generator/transit_generator.cpp
+++ b/generator/transit_generator.cpp
@@ -1,6 +1,5 @@
 #include "generator/transit_generator.hpp"
 
-#include "generator/osm_id.hpp"
 #include "generator/utils.hpp"
 
 #include "traffic/traffic_cache.hpp"
@@ -32,6 +31,7 @@
 #include "base/checked_cast.hpp"
 #include "base/logging.hpp"
 #include "base/macros.hpp"
+#include "base/string_utils.hpp"
 
 #include <algorithm>
 #include <functional>
@@ -220,7 +220,7 @@ void DeserializerFromJson::operator()(m2::PointD & p, char const * name)
 void DeserializerFromJson::operator()(OsmId & osmId, char const * name)
 {
   // Conversion osm id to feature id.
-  std::string osmIdStr;
+  string osmIdStr;
   GetField(osmIdStr, name);
   CHECK(strings::is_number(osmIdStr), ());
   uint64_t osmIdNum;
diff --git a/generator/transit_generator.hpp b/generator/transit_generator.hpp
index 8d3d1fa3ec..61db472ee0 100644
--- a/generator/transit_generator.hpp
+++ b/generator/transit_generator.hpp
@@ -7,7 +7,6 @@
 #include "geometry/point2d.hpp"
 
 #include "base/macros.hpp"
-#include "base/string_utils.hpp"
 
 #include "3party/jansson/myjansson.hpp"