diff --git a/indexer/ftypes_matcher.cpp b/indexer/ftypes_matcher.cpp
index 56471ec22f..821ef0dfec 100644
--- a/indexer/ftypes_matcher.cpp
+++ b/indexer/ftypes_matcher.cpp
@@ -256,9 +256,9 @@ IsWayChecker::IsWayChecker()
 
 IsStreetOrSquareChecker::IsStreetOrSquareChecker()
 {
-  for (auto const t : IsWayChecker::Instance().m_types)
+  for (auto const t : IsWayChecker::Instance().GetTypes())
     m_types.push_back(t);
-  for (auto const t : IsSquareChecker::Instance().m_types)
+  for (auto const t : IsSquareChecker::Instance().GetTypes())
     m_types.push_back(t);
 }
 
diff --git a/indexer/ftypes_matcher.hpp b/indexer/ftypes_matcher.hpp
index 0ca47d5cab..a58d097e3d 100644
--- a/indexer/ftypes_matcher.hpp
+++ b/indexer/ftypes_matcher.hpp
@@ -39,6 +39,8 @@ public:
   virtual bool IsMatched(uint32_t type) const;
   virtual void ForEachType(std::function<void(uint32_t)> && fn) const;
 
+  std::vector<uint32_t> const & GetTypes() const { return m_types; }
+
   bool operator()(feature::TypesHolder const & types) const;
   bool operator()(FeatureType & ft) const;
   bool operator()(std::vector<uint32_t> const & types) const;
@@ -109,7 +111,6 @@ public:
 class IsSquareChecker : public BaseChecker
 {
   IsSquareChecker();
-  friend class IsStreetOrSquareChecker;
 
 public:
   DECLARE_CHECKER_INSTANCE(IsSquareChecker);
@@ -126,7 +127,6 @@ public:
 class IsWayChecker : public BaseChecker
 {
   IsWayChecker();
-  friend class IsStreetOrSquareChecker;
 
 public:
   DECLARE_CHECKER_INSTANCE(IsWayChecker);
@@ -336,7 +336,6 @@ public:
 
   DECLARE_CHECKER_INSTANCE(IsEatChecker);
 
-  std::vector<uint32_t> const & GetTypes() const { return m_types; }
   Type GetType(uint32_t t) const;
 
 private: