diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 431c632..dcf29d2 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -85,7 +85,7 @@ function(add_examples glob mode lib)
 			if ((${file} MATCHES "^.*liveliness.*$") AND NOT(ZENOHPICO_FEATURE_LIVELINESS))
 				continue()
 			endif()
-			if ((${file} MATCHES "^.*querier.*$") AND NOT(ZENOHPICO_BUILD_WITH_UNSTABLE_API))
+			if ((${file} MATCHES "^.*querier.*$") AND NOT(ZENOHPICO_FEATURE_QUERY) AND NOT(ZENOHPICO_BUILD_WITH_UNSTABLE_API))
 				continue()
 			endif()
 		endif()
diff --git a/include/zenoh/api.hxx b/include/zenoh/api.hxx
index 0cbde6d..9f9bd9f 100644
--- a/include/zenoh/api.hxx
+++ b/include/zenoh/api.hxx
@@ -36,7 +36,7 @@
 #include "api/session.hxx"
 #include "api/subscriber.hxx"
 #include "api/timestamp.hxx"
-#if defined(Z_FEATURE_UNSTABLE_API)
+#if (defined(ZENOHCXX_ZENOHC) || Z_FEATURE_QUERY == 1) && defined(Z_FEATURE_UNSTABLE_API)
 #include "api/querier.hxx"
 #endif
 #if defined(Z_FEATURE_SHARED_MEMORY) && defined(Z_FEATURE_UNSTABLE_API)
diff --git a/include/zenoh/api/querier.hxx b/include/zenoh/api/querier.hxx
index 2337890..73b2b90 100644
--- a/include/zenoh/api/querier.hxx
+++ b/include/zenoh/api/querier.hxx
@@ -13,7 +13,7 @@
 
 #pragma once
 
-#if defined(ZENOHCXX_ZENOHC)
+#if (defined(ZENOHCXX_ZENOHC) || Z_FEATURE_QUERY == 1) && defined(Z_FEATURE_UNSTABLE_API)
 
 #include "../detail/closures_concrete.hxx"
 #include "base.hxx"
diff --git a/include/zenoh/api/session.hxx b/include/zenoh/api/session.hxx
index d1353da..a6721d4 100644
--- a/include/zenoh/api/session.hxx
+++ b/include/zenoh/api/session.hxx
@@ -29,7 +29,7 @@
 #include "query_consolidation.hxx"
 #include "subscriber.hxx"
 #include "timestamp.hxx"
-#if defined(Z_FEATURE_UNSTABLE_API)
+#if (defined(ZENOHCXX_ZENOHC) || Z_FEATURE_QUERY == 1) && defined(Z_FEATURE_UNSTABLE_API)
 #include "querier.hxx"
 #endif
 #if defined(ZENOHCXX_ZENOHC) && defined(Z_FEATURE_SHARED_MEMORY) && defined(Z_FEATURE_UNSTABLE_API)
@@ -702,7 +702,7 @@ class Session : public Owned<::z_owned_session_t> {
     }
 #endif
 
-#if defined(Z_FEATURE_UNSTABLE_API)
+#if (defined(ZENOHCXX_ZENOHC) || Z_FEATURE_QUERY == 1) && defined(Z_FEATURE_UNSTABLE_API)
     /// @warning This API has been marked as unstable: it works as advertised, but it may be changed in a future
     /// release.
     /// @brief Options to be passed when declaring a ``Querier``.