diff --git a/routing/base/followed_polyline.cpp b/routing/base/followed_polyline.cpp
index ac4d2a6a36..f7aa020708 100644
--- a/routing/base/followed_polyline.cpp
+++ b/routing/base/followed_polyline.cpp
@@ -149,7 +149,7 @@ FollowedPolyline::UpdatedProjectionInfo FollowedPolyline::UpdateMatchedProjectio
   ASSERT(m_current.IsValid(), ());
   ASSERT_LESS(m_current.m_ind, m_poly.GetSize() - 1, ());
 
-  m2::PointD const currPos = posRect.Center();
+  m2::PointD const & currPos = posRect.Center();
   auto res = GetBestMatchedProjection(posRect);
 
   if (res.iter.IsValid())
diff --git a/routing/base/followed_polyline.hpp b/routing/base/followed_polyline.hpp
index ae4b03ad66..31e8e83ee0 100644
--- a/routing/base/followed_polyline.hpp
+++ b/routing/base/followed_polyline.hpp
@@ -93,7 +93,7 @@ public:
   void SetUnmatchedSegmentIndexes(std::vector<size_t> && unmatchedSegmentIndexes);
 
   /// \brief Updates projection to the closest matched segment if it's possible.
-  UpdatedProjectionInfo  UpdateMatchedProjection(m2::RectD const & posRect);
+  UpdatedProjectionInfo UpdateMatchedProjection(m2::RectD const & posRect);
 
   Iter UpdateProjection(m2::RectD const & posRect);
 
diff --git a/routing/route.hpp b/routing/route.hpp
index 39b9ef9f13..dd4fe70e74 100644
--- a/routing/route.hpp
+++ b/routing/route.hpp
@@ -398,13 +398,11 @@ public:
   /// about speed cameras.
   std::vector<platform::CountryFile> const & GetMwmsPartlyProhibitedForSpeedCams() const;
 
-private:
-  friend std::string DebugPrint(Route const & r);
-
-public:
   void SetFakeSegmentsOnPolyline();
 
 private:
+  friend std::string DebugPrint(Route const & r);
+
   double GetPolySegAngle(size_t ind) const;
   void GetClosestTurn(size_t segIdx, turns::TurnItem & turn) const;
   size_t ConvertPointIdxToSegmentIdx(size_t pointIdx) const;
diff --git a/routing/routing_session.cpp b/routing/routing_session.cpp
index 0670765617..fb78e811d9 100644
--- a/routing/routing_session.cpp
+++ b/routing/routing_session.cpp
@@ -15,7 +15,6 @@
 
 #include "3party/Alohalytics/src/alohalytics.h"
 
-#include <tuple>
 
 using namespace location;
 using namespace std;