diff --git a/map/framework.cpp b/map/framework.cpp
index 7c0d1d6df6..f145b55b2a 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -1645,7 +1645,7 @@ bool Framework::ShowMapForURL(string const & url)
   m2::PointD point;
   m2::RectD rect;
   string name;
-  UserMark const * apiMark = 0;
+  ApiMarkPoint const * apiMark = nullptr;
 
   enum ResultT { FAILED, NEED_CLICK, NO_NEED_CLICK };
   ResultT result = FAILED;
diff --git a/map/mwm_url.cpp b/map/mwm_url.cpp
index 4b1ff56b06..1c213088d4 100644
--- a/map/mwm_url.cpp
+++ b/map/mwm_url.cpp
@@ -207,7 +207,7 @@ bool ParsedMapApi::GetViewportRect(m2::RectD & rect) const
   }
 }
 
-UserMark const * ParsedMapApi::GetSinglePoint() const
+ApiMarkPoint const * ParsedMapApi::GetSinglePoint() const
 {
   ASSERT(m_bmManager != nullptr, ());
   UserMarkControllerGuard guard(*m_bmManager, UserMarkType::API_MARK);
@@ -215,7 +215,7 @@ UserMark const * ParsedMapApi::GetSinglePoint() const
   if (guard.m_controller.GetUserMarkCount() != 1)
     return nullptr;
 
-  return guard.m_controller.GetUserMark(0);
+  return static_cast<ApiMarkPoint const *>(guard.m_controller.GetUserMark(0));
 }
 
 }
diff --git a/map/mwm_url.hpp b/map/mwm_url.hpp
index edd6e00adb..443f122565 100644
--- a/map/mwm_url.hpp
+++ b/map/mwm_url.hpp
@@ -1,12 +1,10 @@
 #pragma once
 
-#include "map/user_mark.hpp"
-
 #include "geometry/rect2d.hpp"
 
 #include "std/string.hpp"
 
-class ScalesProcessor;
+class ApiMarkPoint;
 class BookmarkManager;
 
 namespace url_scheme
@@ -41,7 +39,7 @@ public:
 
   /// @name Used in settings map viewport after invoking API.
   bool GetViewportRect(m2::RectD & rect) const;
-  UserMark const * GetSinglePoint() const;
+  ApiMarkPoint const * GetSinglePoint() const;
 
 private:
   bool Parse(Uri const & uri);