1 files changed, 15 insertions, 3 deletions
diff --git a/indexer/ftypes_matcher.hpp b/indexer/ftypes_matcher.hpp
index 751d6de52f..018d0ed932 100644
--- a/indexer/ftypes_matcher.hpp
+++ b/indexer/ftypes_matcher.hpp
@@ -107,6 +107,7 @@ public:
 class IsSquareChecker : public BaseChecker
 {
   IsSquareChecker();
+  friend class IsStreetOrSuburbChecker;
 
 public:
   DECLARE_CHECKER_INSTANCE(IsSquareChecker);
@@ -115,16 +116,27 @@ public:
 class IsSuburbChecker : public BaseChecker
 {
   IsSuburbChecker();
+  friend class IsStreetOrSuburbChecker;
 
 public:
   DECLARE_CHECKER_INSTANCE(IsSuburbChecker);
 };
 
-class IsStreetChecker : public BaseChecker
+class IsWayChecker : public BaseChecker
 {
-  IsStreetChecker();
+  IsWayChecker();
+  friend class IsStreetOrSuburbChecker;
+
+public:
+  DECLARE_CHECKER_INSTANCE(IsWayChecker);
+};
+
+class IsStreetOrSuburbChecker : public BaseChecker
+{
+  IsStreetOrSuburbChecker();
+
 public:
-  DECLARE_CHECKER_INSTANCE(IsStreetChecker);
+  DECLARE_CHECKER_INSTANCE(IsStreetOrSuburbChecker);
 };
 
 class IsAddressObjectChecker : public BaseChecker