diff --git a/repertory/librepertory/include/comm/curl/requests/http_request_base.hpp b/repertory/librepertory/include/comm/curl/requests/http_request_base.hpp
index c5eeb1d5..347cd89c 100644
--- a/repertory/librepertory/include/comm/curl/requests/http_request_base.hpp
+++ b/repertory/librepertory/include/comm/curl/requests/http_request_base.hpp
@@ -66,7 +66,7 @@ struct http_request_base {
   std::optional<std::string> decryption_token{};
   http_headers headers{};
   std::string path{};
-  query_parameters query{};
+  http_query_parameters query{};
   std::optional<http_range> range{};
   std::optional<response_callback> response_handler;
   std::optional<http_headers> response_headers;
diff --git a/repertory/librepertory/include/types/repertory.hpp b/repertory/librepertory/include/types/repertory.hpp
index f07d91d4..877c58d9 100644
--- a/repertory/librepertory/include/types/repertory.hpp
+++ b/repertory/librepertory/include/types/repertory.hpp
@@ -263,16 +263,6 @@ from_json(const json &j, host_config &hc) {
   j.at("TimeoutMs").get_to(hc.timeout_ms);
 }
 
-struct http_range {
-  std::uint64_t begin;
-  std::uint64_t end;
-};
-
-struct encrypt_config {
-  std::string encryption_token;
-  std::string path;
-};
-
 struct s3_config {
   std::string access_key;
   std::string bucket;
@@ -290,11 +280,7 @@ using api_file_list = std::vector<api_file>;
 using api_file_provider_callback = std::function<void(api_file &)>;
 using api_item_added_callback = std::function<api_error(bool, api_file &)>;
 using directory_item_list = std::vector<directory_item>;
-using http_headers = std::unordered_map<std::string, std::string>;
-using http_parameters = std::unordered_map<std::string, std::string>;
-using http_ranges = std::vector<http_range>;
 using meta_provider_callback = std::function<void(directory_item &)>;
-using query_parameters = std::map<std::string, std::string>;
 } // namespace repertory
 
 #endif // INCLUDE_TYPES_REPERTORY_HPP_
diff --git a/support/include/utils/config.hpp b/support/include/utils/config.hpp
index 6161bb3f..0e7cbf2a 100644
--- a/support/include/utils/config.hpp
+++ b/support/include/utils/config.hpp
@@ -440,6 +440,22 @@ struct file_deleter final {
   }
 };
 using file_t = std::unique_ptr<FILE, file_deleter>;
+
+#if defined(PROJECT_ENABLE_CURL)
+struct http_range final {
+  std::uint64_t begin{};
+  std::uint64_t end{};
+};
+
+using http_headers = std::unordered_map<std::string, std::string>;
+using http_query_parameters = std::map<std::string, std::string>;
+using http_ranges = std::vector<http_range>;
+
+struct encrypt_config {
+  std::string encryption_token;
+  std::string path;
+};
+#endif // defined(PROJECT_ENABLE_CURL)
 } // namespace repertory
 #endif // defined(__cplusplus)