Minor #include cleanup

include/zenoh/api/base.hxx

@@ -13,10 +13,9 @@
 
 #pragma once
 
-#include <cstddef>
-#include <cstdint>
 #include <stdexcept>
 #include <string>
+#include <utility>
 
 #include "../detail/availability_checks.hxx"
 #include "../zenohc.hxx"

include/zenoh/api/bytes.hxx

@@ -14,18 +14,17 @@
 #pragma once
 
 #include "../detail/closures.hxx"
-#include "../detail/commons.hxx"
 #include "base.hxx"
-#include "closures.hxx"
 #include "interop.hxx"
 #if (defined(Z_FEATURE_SHARED_MEMORY) && defined(Z_FEATURE_UNSTABLE_API))
 #include "shm/buffer/buffer.hxx"
 #endif
 
-#include <memory>
 #include <optional>
 #include <string>
 #include <string_view>
+#include <type_traits>
+#include <utility>
 #include <vector>
 
 namespace zenoh {
@@ -81,10 +80,10 @@ class Bytes : public Owned<::z_owned_bytes_t> {
     }
 
     /// @brief Construct by copying sequence of charactes.
-    Bytes(const char* v) : Bytes(std::string_view(v)){};
+    Bytes(const char* v) : Bytes(std::string_view(v)) {};
 
     /// @brief Construct by copying sequence of charactes.
-    Bytes(const std::string& v) : Bytes(std::string_view(v)){};
+    Bytes(const std::string& v) : Bytes(std::string_view(v)) {};
 
     /// @brief Construct by moving a string.
     Bytes(std::string&& v) : Bytes() {

include/zenoh/api/channels.hxx

@@ -16,6 +16,8 @@
 //
 
 #pragma once
+
+#include <utility>
 #include <variant>
 
 #include "base.hxx"
@@ -111,7 +113,7 @@ class FifoChannel;
 /// @tparam T data entry type.
 template <class T>
 class FifoHandler : public Owned<typename detail::FifoHandlerData<T>::handler_type> {
-    FifoHandler(zenoh::detail::null_object_t) : Owned<typename detail::FifoHandlerData<T>::handler_type>(nullptr){};
+    FifoHandler(zenoh::detail::null_object_t) : Owned<typename detail::FifoHandlerData<T>::handler_type>(nullptr) {};
 
    public:
     /// @name Methods
@@ -152,7 +154,7 @@ class RingChannel;
 /// @tparam T data entry type.
 template <class T>
 class RingHandler : public Owned<typename detail::RingHandlerData<T>::handler_type> {
-    RingHandler(zenoh::detail::null_object_t) : Owned<typename detail::RingHandlerData<T>::handler_type>(nullptr){};
+    RingHandler(zenoh::detail::null_object_t) : Owned<typename detail::RingHandlerData<T>::handler_type>(nullptr) {};
 
    public:
     /// @name Methods
@@ -242,4 +244,4 @@ class RingChannel {
     }
 };
 
-}  // namespace zenoh::channels
+}  // namespace zenoh::channels

include/zenoh/api/config.hxx

@@ -14,15 +14,15 @@
 #pragma once
 
 #include <string>
-#include <vector>
+#include <string_view>
 
 #include "base.hxx"
 #include "interop.hxx"
 
 namespace zenoh {
 /// A Zenoh Session config.
 class Config : public Owned<::z_owned_config_t> {
-    Config(zenoh::detail::null_object_t) : Owned(nullptr){};
+    Config(zenoh::detail::null_object_t) : Owned(nullptr) {};
 
    public:
     /// @name Constructors

include/zenoh/api/encoding.hxx

@@ -12,7 +12,9 @@
 //   ZettaScale Zenoh Team, <[email protected]>
 
 #pragma once
+
 #include <string>
+#include <string_view>
 
 #include "../zenohc.hxx"
 #include "base.hxx"
@@ -360,4 +362,4 @@ class Encoding : public Owned<::z_owned_encoding_t> {
     };
 #endif
 };
-}  // namespace zenoh
+}  // namespace zenoh

include/zenoh/api/enums.hxx

@@ -12,6 +12,7 @@
 //   ZettaScale Zenoh Team, <[email protected]>
 
 #pragma once
+
 #include <string_view>
 
 #include "../zenohc.hxx"
@@ -127,4 +128,4 @@ typedef ::z_locality_t Locality;
 typedef ::zc_reply_keyexpr_t ReplyKeyExpr;
 #endif
 
-}  // namespace zenoh
+}  // namespace zenoh

include/zenoh/api/id.hxx

@@ -14,7 +14,6 @@
 #pragma once
 
 #include <array>
-#include <iomanip>
 #include <iostream>
 #include <string_view>
 
@@ -62,4 +61,4 @@ inline std::ostream& operator<<(std::ostream& os, const Id& id) {
     ::z_drop(::z_move(s));
     return os;
 }
-}  // namespace zenoh
+}  // namespace zenoh

include/zenoh/api/keyexpr.hxx

@@ -12,6 +12,8 @@
 //   ZettaScale Zenoh Team, <[email protected]>
 
 #pragma once
+
+#include <string>
 #include <string_view>
 
 #include "../zenohc.hxx"
@@ -27,7 +29,7 @@ namespace zenoh {
 /// when transporting key expressions.
 
 class KeyExpr : public Owned<::z_owned_keyexpr_t> {
-    KeyExpr(zenoh::detail::null_object_t) : Owned(nullptr){};
+    KeyExpr(zenoh::detail::null_object_t) : Owned(nullptr) {};
     friend struct interop::detail::Converter;
 
    public:
@@ -57,7 +59,7 @@ class KeyExpr : public Owned<::z_owned_keyexpr_t> {
     /// @param err if not null, the result code will be written to this location, otherwise ZException exception will be
     /// thrown in case of error.
     KeyExpr(const std::string& key_expr, bool autocanonize = true, ZResult* err = nullptr)
-        : KeyExpr(static_cast<std::string_view>(key_expr), autocanonize, err){};
+        : KeyExpr(static_cast<std::string_view>(key_expr), autocanonize, err) {};
 
     /// @brief Create a new instance from a null-terminated string.
     ///
@@ -66,7 +68,7 @@ class KeyExpr : public Owned<::z_owned_keyexpr_t> {
     /// @param err if not null, the result code will be written to this location, otherwise ZException exception will be
     /// thrown in case of error.
     KeyExpr(const char* key_expr, bool autocanonize = true, ZResult* err = nullptr)
-        : KeyExpr(std::string_view(key_expr), autocanonize, err){};
+        : KeyExpr(std::string_view(key_expr), autocanonize, err) {};
 
     /// @brief Copy constructor.
     KeyExpr(const KeyExpr& other) : KeyExpr(zenoh::detail::null_object) {
@@ -208,4 +210,4 @@ class KeyExpr : public Owned<::z_owned_keyexpr_t> {
     KeyExpr& operator=(KeyExpr&& other) = default;
 };
 
-}  // namespace zenoh
+}  // namespace zenoh

include/zenoh/api/logging.hxx

@@ -12,6 +12,9 @@
 //   ZettaScale Zenoh Team, <[email protected]>
 
 #pragma once
+
+#include <string>
+
 #include "../zenohc.hxx"
 
 namespace zenoh {
@@ -37,4 +40,4 @@ inline void init_log_from_env_or(const std::string& fallback_filter) {
 }
 #endif
 
-}  // namespace zenoh
+}  // namespace zenoh

include/zenoh/api/querier.hxx

@@ -18,7 +18,9 @@
 #include "../detail/closures_concrete.hxx"
 #include "base.hxx"
 #include "bytes.hxx"
+#if defined(Z_FEATURE_UNSTABLE_API)
 #include "cancellation.hxx"
+#endif
 #include "encoding.hxx"
 #include "enums.hxx"
 #include "interop.hxx"

include/zenoh/api/session.hxx

@@ -40,7 +40,9 @@
 #include "shm/client_storage/client_storage.hxx"
 #include "shm/provider/shm_provider.hxx"
 #endif
+#if defined(Z_FEATURE_UNSTABLE_API)
 #include "cancellation.hxx"
+#endif
 
 namespace zenoh {
 namespace ext {

include/zenoh/detail/availability_checks.hxx

@@ -12,7 +12,6 @@
 //   ZettaScale Zenoh Team, <[email protected]>
 #pragma once
 
-#include <optional>
 #include <type_traits>
 
 #include "../zenohc.hxx"

include/zenoh/detail/closures.hxx

@@ -20,7 +20,7 @@ namespace zenoh::detail::closures {
 
 struct IDroppable {
     virtual void drop() = 0;
-    virtual ~IDroppable(){};
+    virtual ~IDroppable() {};
 
     static void delete_from_context(void* context) {
         reinterpret_cast<IDroppable*>(context)->drop();
@@ -80,4 +80,4 @@ class Closure : public IClosure<R, Args...> {
     }
 };
 
-}  // namespace zenoh::detail::closures
+}  // namespace zenoh::detail::closures

include/zenoh/detail/commons.hxx

@@ -14,6 +14,8 @@
 //   ZettaScale Zenoh Team, <[email protected]>
 
 #include <iterator>
+#include <type_traits>
+#include <utility>
 
 namespace zenoh::detail::commons {
 
@@ -63,4 +65,4 @@ struct overloaded : Ts... {
 template <class... Ts>
 overloaded(Ts...) -> overloaded<Ts...>;
 
-}  // namespace zenoh::detail::commons
+}  // namespace zenoh::detail::commons