diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7b69523..23ef4bc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -69,7 +69,7 @@ jobs:
             openssl_shared: ON
             curl_shared: ON
           - suite: msvc-integration
-            generator: Visual Studio 17 2022
+            generator: Ninja
             preload_deps: ON
             openssl_shared: ON
             curl_shared: ON
@@ -99,7 +99,7 @@ jobs:
           ninja --version
 
       - name: Set up MSVC
-        if: matrix.generator == 'Visual Studio 17 2022'
+        if: matrix.suite == 'msvc-integration'
         uses: ilammy/msvc-dev-cmd@v1
 
       - name: Configure MinGW integration
@@ -136,6 +136,7 @@ jobs:
                 -DKURLYK_TEST_PRELOAD_DEPS=${{ matrix.preload_deps }} `
                 -DKURLYK_OPENSSL_SHARED=${{ matrix.openssl_shared }} `
                 -DKURLYK_CURL_SHARED=${{ matrix.curl_shared }} `
+                -DCMAKE_BUILD_TYPE=Release `
                 -DCMAKE_CXX_STANDARD=17 `
                 -DCMAKE_CXX_STANDARD_REQUIRED=ON `
                 -Wno-dev
diff --git a/AGENTS.md b/AGENTS.md
index a876ff7..9481495 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -77,6 +77,26 @@ See [guides/critical-defaults.md](guides/critical-defaults.md) for the full
 list of mandatory pre-edit, compatibility, testing, and git rules.
 For branch and PR policy, also see [guides/git-workflow.md](guides/git-workflow.md).
 
+## Header Guards
+
+For every project-owned C/C++ header, use `#pragma once` together with a
+non-reserved include guard. Guard names must be derived from the project prefix
+and header path, and must clearly indicate that the macro is a header guard:
+
+```cpp
+KURLYK_HEADER_<PATH>_<FILE>_<EXT>_INCLUDED
+```
+
+Do not use identifiers reserved for the compiler, standard library, platform SDK,
+or other implementation internals. In particular, do not use include guard names
+that start with an underscore, start with an underscore followed by an uppercase
+letter, or contain a double underscore anywhere.
+
+Implementation fragments such as `.ipp`, `.inl`, or `.tpp` files may remain
+unguarded if they are only included from already guarded headers and are not
+intended for direct inclusion. If they are intended to be included directly, they
+must follow the same non-reserved guard naming rule.
+
 ## Provenance and Honesty
 
 An agent must not:
diff --git a/guides/cpp-development-guidelines.md b/guides/cpp-development-guidelines.md
index 7777844..b8aaacc 100644
--- a/guides/cpp-development-guidelines.md
+++ b/guides/cpp-development-guidelines.md
@@ -53,7 +53,10 @@
 - Do not use `using namespace`; always qualify names such as `std::`.
 - Keep project headers before system headers in include lists.
 - Header files must start with `#pragma once`; if an include guard is also used,
-  prefer a `_KURLYK_*_HPP_INCLUDED` style guard that matches the file.
+  use a non-reserved guard derived from the project prefix and header path:
+  `KURLYK_HEADER_<PATH>_<FILE>_<EXT>_INCLUDED`.
+- Do not use guard names that start with an underscore, start with an
+  underscore followed by an uppercase letter, or contain a double underscore.
 - Keep source and documentation files in UTF-8.
 - Write non-ASCII C++ string literals as `u8"..."`.
 - The default standard is C++11. Guard C++17-only code with
diff --git a/include/kurlyk.hpp b/include/kurlyk.hpp
index 2b1664a..5c82445 100644
--- a/include/kurlyk.hpp
+++ b/include/kurlyk.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_HPP_INCLUDED
-#define _KURLYK_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_HPP_INCLUDED
 
 /// \file kurlyk.hpp
 /// \brief Main header file for the Kurlyk library, providing HTTP and WebSocket support.
@@ -88,4 +88,4 @@ namespace kurlyk {
 
 } // namespace kurlyk
 
-#endif // _KURLYK_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_HPP_INCLUDED
diff --git a/include/kurlyk/core.hpp b/include/kurlyk/core.hpp
index f05d64a..2d3cd4b 100644
--- a/include/kurlyk/core.hpp
+++ b/include/kurlyk/core.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_CORE_HPP_INCLUDED
-#define _KURLYK_CORE_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_CORE_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_CORE_HPP_INCLUDED
 
 /// \file core.hpp
 /// \brief Aggregates core infrastructure components such as task manager interface and the network worker.
@@ -34,4 +34,4 @@
 #include "core/INetworkTaskManager.hpp"
 #include "core/NetworkWorker.hpp"
 
-#endif // _KURLYK_CORE_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_CORE_HPP_INCLUDED
diff --git a/include/kurlyk/core/INetworkTaskManager.hpp b/include/kurlyk/core/INetworkTaskManager.hpp
index e2a16a6..b6cec03 100644
--- a/include/kurlyk/core/INetworkTaskManager.hpp
+++ b/include/kurlyk/core/INetworkTaskManager.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_CORE_INETWORKTASKMANAGER_HPP_INCLUDED
-#define _KURLYK_CORE_INETWORKTASKMANAGER_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_CORE_I_NETWORK_TASK_MANAGER_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_CORE_I_NETWORK_TASK_MANAGER_HPP_INCLUDED
 
 /// \file INetworkTaskManager.hpp
 /// \brief Defines an interface for modules that can register with the NetworkWorker for lifecycle handling.
@@ -25,4 +25,4 @@ namespace kurlyk::core {
 
 } // namespace kurlyk::core
 
-#endif // _KURLYK_CORE_INETWORKTASKMANAGER_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_CORE_I_NETWORK_TASK_MANAGER_HPP_INCLUDED
diff --git a/include/kurlyk/core/NetworkWorker.hpp b/include/kurlyk/core/NetworkWorker.hpp
index 9b6d613..cf64a03 100644
--- a/include/kurlyk/core/NetworkWorker.hpp
+++ b/include/kurlyk/core/NetworkWorker.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_NETWORK_WORKER_HPP_INCLUDED
-#define _KURLYK_NETWORK_WORKER_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_CORE_NETWORK_WORKER_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_CORE_NETWORK_WORKER_HPP_INCLUDED
 
 /// \file NetworkWorker.hpp
 /// \brief Manages and processes network tasks such as HTTP requests and WebSocket events in a separate thread.
@@ -291,4 +291,4 @@ namespace kurlyk::core {
 
 }; // namespace kurlyk
 
-#endif // _KURLYK_NETWORK_WORKER_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_CORE_NETWORK_WORKER_HPP_INCLUDED
diff --git a/include/kurlyk/http.hpp b/include/kurlyk/http.hpp
index 6b7af2f..7f61d77 100644
--- a/include/kurlyk/http.hpp
+++ b/include/kurlyk/http.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_HTTP_HPP_INCLUDED
-#define _KURLYK_HTTP_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_HTTP_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_HTTP_HPP_INCLUDED
 
 /// \file http.hpp
 /// \brief Aggregates main HTTP interfaces and utilities, including client, request manager, and helpers.
@@ -26,4 +26,4 @@
 #include "http/auth.hpp"
 #endif
 
-#endif // _KURLYK_HTTP_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_HTTP_HPP_INCLUDED
diff --git a/include/kurlyk/http/HttpClient.hpp b/include/kurlyk/http/HttpClient.hpp
index e199522..b8d618b 100644
--- a/include/kurlyk/http/HttpClient.hpp
+++ b/include/kurlyk/http/HttpClient.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_HTTP_CLIENT_HPP_INCLUDED
-#define _KURLYK_HTTP_CLIENT_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_HTTP_HTTP_CLIENT_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_HTTP_HTTP_CLIENT_HPP_INCLUDED
 
 /// \file HttpClient.hpp
 /// \brief Contains the definition of the concrete HttpClient class for making HTTP requests to a specific host.
@@ -1088,4 +1088,4 @@ namespace kurlyk {
 
 }; // namespace kurlyk
 
-#endif // _KURLYK_HTTP_CLIENT_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_HTTP_HTTP_CLIENT_HPP_INCLUDED
diff --git a/include/kurlyk/http/HttpRequestManager.hpp b/include/kurlyk/http/HttpRequestManager.hpp
index ebad7b5..a7590dd 100644
--- a/include/kurlyk/http/HttpRequestManager.hpp
+++ b/include/kurlyk/http/HttpRequestManager.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_HTTP_REQUEST_MANAGER_HPP_INCLUDED
-#define _KURLYK_HTTP_REQUEST_MANAGER_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_HTTP_HTTP_REQUEST_MANAGER_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_HTTP_HTTP_REQUEST_MANAGER_HPP_INCLUDED
 
 /// \file HttpRequestManager.hpp
 /// \brief Manages and processes HTTP requests using a singleton pattern.
@@ -643,4 +643,4 @@ namespace kurlyk {
 
 }; // namespace kurlyk
 
-#endif // _KURLYK_HTTP_REQUEST_MANAGER_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_HTTP_HTTP_REQUEST_MANAGER_HPP_INCLUDED
diff --git a/include/kurlyk/http/HttpRequestManager/HttpBatchRequestHandler.hpp b/include/kurlyk/http/HttpRequestManager/HttpBatchRequestHandler.hpp
index cafb49d..c847cd2 100644
--- a/include/kurlyk/http/HttpRequestManager/HttpBatchRequestHandler.hpp
+++ b/include/kurlyk/http/HttpRequestManager/HttpBatchRequestHandler.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_HTTP_MULTI_REQUEST_HANDLER_HPP_INCLUDED
-#define _KURLYK_HTTP_MULTI_REQUEST_HANDLER_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_HTTP_HTTP_REQUEST_MANAGER_HTTP_BATCH_REQUEST_HANDLER_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_HTTP_HTTP_REQUEST_MANAGER_HTTP_BATCH_REQUEST_HANDLER_HPP_INCLUDED
 
 /// \file HttpBatchRequestHandler.hpp
 /// \brief Manages multiple asynchronous HTTP requests using libcurl's multi interface.
@@ -205,4 +205,4 @@ namespace kurlyk {
 
 } // namespace kurlyk
 
-#endif // _KURLYK_HTTP_MULTI_REQUEST_HANDLER_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_HTTP_HTTP_REQUEST_MANAGER_HTTP_BATCH_REQUEST_HANDLER_HPP_INCLUDED
diff --git a/include/kurlyk/http/HttpRequestManager/HttpRateLimitDelay.hpp b/include/kurlyk/http/HttpRequestManager/HttpRateLimitDelay.hpp
index 699f109..587bb29 100644
--- a/include/kurlyk/http/HttpRequestManager/HttpRateLimitDelay.hpp
+++ b/include/kurlyk/http/HttpRequestManager/HttpRateLimitDelay.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_HTTP_RATE_LIMIT_DELAY_HPP_INCLUDED
-#define _KURLYK_HTTP_RATE_LIMIT_DELAY_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_HTTP_HTTP_REQUEST_MANAGER_HTTP_RATE_LIMIT_DELAY_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_HTTP_HTTP_REQUEST_MANAGER_HTTP_RATE_LIMIT_DELAY_HPP_INCLUDED
 
 /// \file HttpRateLimitDelay.hpp
 /// \brief Defines the RateLimitDelay result type for time-until-allowed queries.
@@ -26,4 +26,4 @@ namespace kurlyk {
 
 } // namespace kurlyk
 
-#endif // _KURLYK_HTTP_RATE_LIMIT_DELAY_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_HTTP_HTTP_REQUEST_MANAGER_HTTP_RATE_LIMIT_DELAY_HPP_INCLUDED
diff --git a/include/kurlyk/http/HttpRequestManager/HttpRateLimitHandle.hpp b/include/kurlyk/http/HttpRequestManager/HttpRateLimitHandle.hpp
index 754253b..6ab9ee5 100644
--- a/include/kurlyk/http/HttpRequestManager/HttpRateLimitHandle.hpp
+++ b/include/kurlyk/http/HttpRequestManager/HttpRateLimitHandle.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_HTTP_RATE_LIMIT_HANDLE_HPP_INCLUDED
-#define _KURLYK_HTTP_RATE_LIMIT_HANDLE_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_HTTP_HTTP_REQUEST_MANAGER_HTTP_RATE_LIMIT_HANDLE_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_HTTP_HTTP_REQUEST_MANAGER_HTTP_RATE_LIMIT_HANDLE_HPP_INCLUDED
 
 /// \file HttpRateLimitHandle.hpp
 /// \brief Defines RAII handle for keeping HTTP rate limits alive.
@@ -79,4 +79,4 @@ namespace kurlyk {
 
 } // namespace kurlyk
 
-#endif // _KURLYK_HTTP_RATE_LIMIT_HANDLE_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_HTTP_HTTP_REQUEST_MANAGER_HTTP_RATE_LIMIT_HANDLE_HPP_INCLUDED
diff --git a/include/kurlyk/http/HttpRequestManager/HttpRateLimiter.hpp b/include/kurlyk/http/HttpRequestManager/HttpRateLimiter.hpp
index 346891e..5ef9f52 100644
--- a/include/kurlyk/http/HttpRequestManager/HttpRateLimiter.hpp
+++ b/include/kurlyk/http/HttpRequestManager/HttpRateLimiter.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_HTTP_RATE_LIMITER_HPP_INCLUDED
-#define _KURLYK_HTTP_RATE_LIMITER_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_HTTP_HTTP_REQUEST_MANAGER_HTTP_RATE_LIMITER_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_HTTP_HTTP_REQUEST_MANAGER_HTTP_RATE_LIMITER_HPP_INCLUDED
 
 /// \file HttpRateLimiter.hpp
 /// \brief Defines the HttpRateLimiter class for managing rate limits on HTTP requests.
@@ -619,4 +619,4 @@ namespace kurlyk {
 
 } // namespace kurlyk
 
-#endif // _KURLYK_HTTP_RATE_LIMITER_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_HTTP_HTTP_REQUEST_MANAGER_HTTP_RATE_LIMITER_HPP_INCLUDED
diff --git a/include/kurlyk/http/HttpRequestManager/HttpRequestContext.hpp b/include/kurlyk/http/HttpRequestManager/HttpRequestContext.hpp
index 20f4010..ac3a83b 100644
--- a/include/kurlyk/http/HttpRequestManager/HttpRequestContext.hpp
+++ b/include/kurlyk/http/HttpRequestManager/HttpRequestContext.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_HTTP_REQUEST_CONTEXT_HPP_INCLUDED
-#define _KURLYK_HTTP_REQUEST_CONTEXT_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_HTTP_HTTP_REQUEST_MANAGER_HTTP_REQUEST_CONTEXT_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_HTTP_HTTP_REQUEST_MANAGER_HTTP_REQUEST_CONTEXT_HPP_INCLUDED
 
 /// \file HttpRequestContext.hpp
 /// \brief Defines the HttpRequestContext class for managing HTTP request context, including retries and timing.
@@ -50,4 +50,4 @@ namespace kurlyk {
 
 } // namespace kurlyk
 
-#endif // _KURLYK_HTTP_REQUEST_CONTEXT_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_HTTP_HTTP_REQUEST_MANAGER_HTTP_REQUEST_CONTEXT_HPP_INCLUDED
diff --git a/include/kurlyk/http/HttpRequestManager/HttpRequestHandler.hpp b/include/kurlyk/http/HttpRequestManager/HttpRequestHandler.hpp
index 0b60a37..88a2b90 100644
--- a/include/kurlyk/http/HttpRequestManager/HttpRequestHandler.hpp
+++ b/include/kurlyk/http/HttpRequestManager/HttpRequestHandler.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_HTTP_REQUEST_HANDLER_HPP_INCLUDED
-#define _KURLYK_HTTP_REQUEST_HANDLER_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_HTTP_HTTP_REQUEST_MANAGER_HTTP_REQUEST_HANDLER_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_HTTP_HTTP_REQUEST_MANAGER_HTTP_REQUEST_HANDLER_HPP_INCLUDED
 
 /// \file RequestHandler.hpp
 /// \brief Defines the HttpRequestHandler class for managing asynchronous HTTP requests.
@@ -362,4 +362,4 @@ namespace kurlyk {
 
 } // namespace kurlyk
 
-#endif // _KURLYK_HTTP_REQUEST_HANDLER_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_HTTP_HTTP_REQUEST_MANAGER_HTTP_REQUEST_HANDLER_HPP_INCLUDED
diff --git a/include/kurlyk/http/auth.hpp b/include/kurlyk/http/auth.hpp
index 1062f29..ea76b49 100644
--- a/include/kurlyk/http/auth.hpp
+++ b/include/kurlyk/http/auth.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_HTTP_AUTH_HPP_INCLUDED
-#define _KURLYK_HTTP_AUTH_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_HTTP_AUTH_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_HTTP_AUTH_HPP_INCLUDED
 
 /// \file auth.hpp
 /// \brief Aggregates HTTP authentication providers and OAuth2 PKCE client.
@@ -15,4 +15,4 @@
 #include "auth/OAuthPkceClient.hpp"
 #endif
 
-#endif // _KURLYK_HTTP_AUTH_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_HTTP_AUTH_HPP_INCLUDED
diff --git a/include/kurlyk/http/auth/ApiKeyAuthProvider.hpp b/include/kurlyk/http/auth/ApiKeyAuthProvider.hpp
index 039b336..cf0e194 100644
--- a/include/kurlyk/http/auth/ApiKeyAuthProvider.hpp
+++ b/include/kurlyk/http/auth/ApiKeyAuthProvider.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_HTTP_AUTH_API_KEY_AUTH_PROVIDER_HPP_INCLUDED
-#define _KURLYK_HTTP_AUTH_API_KEY_AUTH_PROVIDER_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_HTTP_AUTH_API_KEY_AUTH_PROVIDER_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_HTTP_AUTH_API_KEY_AUTH_PROVIDER_HPP_INCLUDED
 
 /// \file ApiKeyAuthProvider.hpp
 /// \brief Provides API key authentication via header or query parameter.
@@ -83,4 +83,4 @@ namespace auth {
 } // namespace http
 } // namespace kurlyk
 
-#endif // _KURLYK_HTTP_AUTH_API_KEY_AUTH_PROVIDER_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_HTTP_AUTH_API_KEY_AUTH_PROVIDER_HPP_INCLUDED
diff --git a/include/kurlyk/http/auth/BearerTokenAuthProvider.hpp b/include/kurlyk/http/auth/BearerTokenAuthProvider.hpp
index c18acdc..b9b4123 100644
--- a/include/kurlyk/http/auth/BearerTokenAuthProvider.hpp
+++ b/include/kurlyk/http/auth/BearerTokenAuthProvider.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_HTTP_AUTH_BEARER_TOKEN_AUTH_PROVIDER_HPP_INCLUDED
-#define _KURLYK_HTTP_AUTH_BEARER_TOKEN_AUTH_PROVIDER_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_HTTP_AUTH_BEARER_TOKEN_AUTH_PROVIDER_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_HTTP_AUTH_BEARER_TOKEN_AUTH_PROVIDER_HPP_INCLUDED
 
 /// \file BearerTokenAuthProvider.hpp
 /// \brief Provides Bearer token authentication for HTTP requests.
@@ -49,4 +49,4 @@ namespace auth {
 } // namespace http
 } // namespace kurlyk
 
-#endif // _KURLYK_HTTP_AUTH_BEARER_TOKEN_AUTH_PROVIDER_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_HTTP_AUTH_BEARER_TOKEN_AUTH_PROVIDER_HPP_INCLUDED
diff --git a/include/kurlyk/http/auth/IAuthProvider.hpp b/include/kurlyk/http/auth/IAuthProvider.hpp
index 439f4c4..1a30ecc 100644
--- a/include/kurlyk/http/auth/IAuthProvider.hpp
+++ b/include/kurlyk/http/auth/IAuthProvider.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_HTTP_AUTH_IAUTH_PROVIDER_HPP_INCLUDED
-#define _KURLYK_HTTP_AUTH_IAUTH_PROVIDER_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_HTTP_AUTH_I_AUTH_PROVIDER_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_HTTP_AUTH_I_AUTH_PROVIDER_HPP_INCLUDED
 
 /// \file IAuthProvider.hpp
 /// \brief Defines the IAuthProvider interface for HTTP authentication strategies.
@@ -33,4 +33,4 @@ namespace auth {
 } // namespace http
 } // namespace kurlyk
 
-#endif // _KURLYK_HTTP_AUTH_IAUTH_PROVIDER_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_HTTP_AUTH_I_AUTH_PROVIDER_HPP_INCLUDED
diff --git a/include/kurlyk/http/auth/OAuthPkceClient.hpp b/include/kurlyk/http/auth/OAuthPkceClient.hpp
index 43d7f79..8db4806 100644
--- a/include/kurlyk/http/auth/OAuthPkceClient.hpp
+++ b/include/kurlyk/http/auth/OAuthPkceClient.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_HTTP_AUTH_OAUTH_PKCE_CLIENT_HPP_INCLUDED
-#define _KURLYK_HTTP_AUTH_OAUTH_PKCE_CLIENT_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_HTTP_AUTH_O_AUTH_PKCE_CLIENT_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_HTTP_AUTH_O_AUTH_PKCE_CLIENT_HPP_INCLUDED
 
 /// \file OAuthPkceClient.hpp
 /// \brief OAuth2 Authorization Code + PKCE client using standalone HTTP helpers.
@@ -305,4 +305,4 @@ namespace auth {
 } // namespace http
 } // namespace kurlyk
 
-#endif // _KURLYK_HTTP_AUTH_OAUTH_PKCE_CLIENT_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_HTTP_AUTH_O_AUTH_PKCE_CLIENT_HPP_INCLUDED
diff --git a/include/kurlyk/http/auth/data.hpp b/include/kurlyk/http/auth/data.hpp
index 745c011..7992b6a 100644
--- a/include/kurlyk/http/auth/data.hpp
+++ b/include/kurlyk/http/auth/data.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_HTTP_AUTH_DATA_HPP_INCLUDED
-#define _KURLYK_HTTP_AUTH_DATA_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_HTTP_AUTH_DATA_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_HTTP_AUTH_DATA_HPP_INCLUDED
 
 /// \file data.hpp
 /// \brief Aggregates OAuth2 authentication data structures.
@@ -9,4 +9,4 @@
 #include "data/OAuthConfig.hpp"
 #include "data/AuthResult.hpp"
 
-#endif // _KURLYK_HTTP_AUTH_DATA_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_HTTP_AUTH_DATA_HPP_INCLUDED
diff --git a/include/kurlyk/http/auth/data/AuthResult.hpp b/include/kurlyk/http/auth/data/AuthResult.hpp
index c673e9e..4b80f40 100644
--- a/include/kurlyk/http/auth/data/AuthResult.hpp
+++ b/include/kurlyk/http/auth/data/AuthResult.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_HTTP_AUTH_DATA_AUTH_RESULT_HPP_INCLUDED
-#define _KURLYK_HTTP_AUTH_DATA_AUTH_RESULT_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_HTTP_AUTH_DATA_AUTH_RESULT_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_HTTP_AUTH_DATA_AUTH_RESULT_HPP_INCLUDED
 
 /// \file AuthResult.hpp
 /// \brief Defines authentication result types and error codes.
@@ -89,4 +89,4 @@ namespace kurlyk {
 
 #endif // KURLYK_JSON_SUPPORT
 
-#endif // _KURLYK_HTTP_AUTH_DATA_AUTH_RESULT_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_HTTP_AUTH_DATA_AUTH_RESULT_HPP_INCLUDED
diff --git a/include/kurlyk/http/auth/data/OAuthConfig.hpp b/include/kurlyk/http/auth/data/OAuthConfig.hpp
index e66f853..997d1b8 100644
--- a/include/kurlyk/http/auth/data/OAuthConfig.hpp
+++ b/include/kurlyk/http/auth/data/OAuthConfig.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_HTTP_AUTH_DATA_OAUTH_CONFIG_HPP_INCLUDED
-#define _KURLYK_HTTP_AUTH_DATA_OAUTH_CONFIG_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_HTTP_AUTH_DATA_O_AUTH_CONFIG_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_HTTP_AUTH_DATA_O_AUTH_CONFIG_HPP_INCLUDED
 
 /// \file OAuthConfig.hpp
 /// \brief Defines the OAuthConfig structure for OAuth2 client configuration.
@@ -66,4 +66,4 @@ namespace kurlyk {
 
 #endif // KURLYK_JSON_SUPPORT
 
-#endif // _KURLYK_HTTP_AUTH_DATA_OAUTH_CONFIG_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_HTTP_AUTH_DATA_O_AUTH_CONFIG_HPP_INCLUDED
diff --git a/include/kurlyk/http/auth/data/OAuthToken.hpp b/include/kurlyk/http/auth/data/OAuthToken.hpp
index 08aa04f..3ed59c3 100644
--- a/include/kurlyk/http/auth/data/OAuthToken.hpp
+++ b/include/kurlyk/http/auth/data/OAuthToken.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_HTTP_AUTH_DATA_OAUTH_TOKEN_HPP_INCLUDED
-#define _KURLYK_HTTP_AUTH_DATA_OAUTH_TOKEN_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_HTTP_AUTH_DATA_O_AUTH_TOKEN_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_HTTP_AUTH_DATA_O_AUTH_TOKEN_HPP_INCLUDED
 
 /// \file OAuthToken.hpp
 /// \brief Defines the OAuthToken structure for storing OAuth2 token data.
@@ -65,4 +65,4 @@ namespace kurlyk {
 
 #endif // KURLYK_JSON_SUPPORT
 
-#endif // _KURLYK_HTTP_AUTH_DATA_OAUTH_TOKEN_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_HTTP_AUTH_DATA_O_AUTH_TOKEN_HPP_INCLUDED
diff --git a/include/kurlyk/http/auth/storage.hpp b/include/kurlyk/http/auth/storage.hpp
index 55302c3..6934b54 100644
--- a/include/kurlyk/http/auth/storage.hpp
+++ b/include/kurlyk/http/auth/storage.hpp
@@ -1,10 +1,10 @@
 #pragma once
-#ifndef _KURLYK_HTTP_AUTH_STORAGE_HPP_INCLUDED
-#define _KURLYK_HTTP_AUTH_STORAGE_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_HTTP_AUTH_STORAGE_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_HTTP_AUTH_STORAGE_HPP_INCLUDED
 
 /// \file storage.hpp
 /// \brief Aggregates authentication storage interfaces.
 
 #include "storage/TokenStorage.hpp"
 
-#endif // _KURLYK_HTTP_AUTH_STORAGE_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_HTTP_AUTH_STORAGE_HPP_INCLUDED
diff --git a/include/kurlyk/http/auth/storage/TokenStorage.hpp b/include/kurlyk/http/auth/storage/TokenStorage.hpp
index 7d3f10b..2a117ce 100644
--- a/include/kurlyk/http/auth/storage/TokenStorage.hpp
+++ b/include/kurlyk/http/auth/storage/TokenStorage.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_HTTP_AUTH_TOKEN_STORAGE_HPP_INCLUDED
-#define _KURLYK_HTTP_AUTH_TOKEN_STORAGE_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_HTTP_AUTH_STORAGE_TOKEN_STORAGE_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_HTTP_AUTH_STORAGE_TOKEN_STORAGE_HPP_INCLUDED
 
 /// \file TokenStorage.hpp
 /// \brief Defines the ITokenStorage interface for persisting and retrieving OAuth tokens.
@@ -41,4 +41,4 @@ namespace auth {
 } // namespace http
 } // namespace kurlyk
 
-#endif // _KURLYK_HTTP_AUTH_TOKEN_STORAGE_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_HTTP_AUTH_STORAGE_TOKEN_STORAGE_HPP_INCLUDED
diff --git a/include/kurlyk/http/data.hpp b/include/kurlyk/http/data.hpp
index 6a40991..9bf9612 100644
--- a/include/kurlyk/http/data.hpp
+++ b/include/kurlyk/http/data.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_HTTP_DATA_HPP_INCLUDED
-#define _KURLYK_HTTP_DATA_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_HTTP_DATA_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_HTTP_DATA_HPP_INCLUDED
 
 /// \file data.hpp
 /// \brief Aggregates core HTTP data structures such as request, response, and cookie.
@@ -9,4 +9,4 @@
 #include "data/HttpRequest.hpp"
 #include "data/HttpResponse.hpp"
 
-#endif // _KURLYK_HTTP_DATA_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_HTTP_DATA_HPP_INCLUDED
diff --git a/include/kurlyk/http/data/HttpRequest.hpp b/include/kurlyk/http/data/HttpRequest.hpp
index faf193d..6a04332 100644
--- a/include/kurlyk/http/data/HttpRequest.hpp
+++ b/include/kurlyk/http/data/HttpRequest.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_HTTP_REQUEST_HPP_INCLUDED
-#define _KURLYK_HTTP_REQUEST_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_HTTP_DATA_HTTP_REQUEST_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_HTTP_DATA_HTTP_REQUEST_HPP_INCLUDED
 
 /// \file HttpRequest.hpp
 /// \brief Defines the HttpRequest class for configuring HTTP requests.
@@ -294,4 +294,4 @@ namespace kurlyk {
 
 }; // namespace kurlyk
 
-#endif // _KURLYK_HTTP_REQUEST_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_HTTP_DATA_HTTP_REQUEST_HPP_INCLUDED
diff --git a/include/kurlyk/http/data/HttpResponse.hpp b/include/kurlyk/http/data/HttpResponse.hpp
index c0b8463..48863fe 100644
--- a/include/kurlyk/http/data/HttpResponse.hpp
+++ b/include/kurlyk/http/data/HttpResponse.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_HTTP_RESPONSE_HPP_INCLUDED
-#define _KURLYK_HTTP_RESPONSE_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_HTTP_DATA_HTTP_RESPONSE_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_HTTP_DATA_HTTP_RESPONSE_HPP_INCLUDED
 
 /// \file HttpResponse.hpp
 /// \brief Defines the HttpResponse class and related HTTP response types.
@@ -41,5 +41,5 @@ namespace kurlyk {
 
 } // namespace kurlyk
 
-#endif // _KURLYK_HTTP_RESPONSE_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_HTTP_DATA_HTTP_RESPONSE_HPP_INCLUDED
 
diff --git a/include/kurlyk/http/utils.hpp b/include/kurlyk/http/utils.hpp
index d744e77..680c4b0 100644
--- a/include/kurlyk/http/utils.hpp
+++ b/include/kurlyk/http/utils.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_HTTP_UTILS_HPP_INCLUDED
-#define _KURLYK_HTTP_UTILS_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_HTTP_UTILS_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_HTTP_UTILS_HPP_INCLUDED
 
 /// \file utils.hpp
 /// \brief Contains utility functions for handling HTTP requests, rate limiting, and request cancellation.
@@ -555,4 +555,4 @@ namespace kurlyk {
 
 } // namespace kurlyk
 
-#endif // _KURLYK_HTTP_UTILS_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_HTTP_UTILS_HPP_INCLUDED
diff --git a/include/kurlyk/startup.hpp b/include/kurlyk/startup.hpp
index 6a4a2d7..b06abb5 100644
--- a/include/kurlyk/startup.hpp
+++ b/include/kurlyk/startup.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_STARTUP_HPP_INCLUDED
-#define _KURLYK_STARTUP_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_STARTUP_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_STARTUP_HPP_INCLUDED
 
 /// \file startup.hpp
 /// \brief Provides centralized startup and shutdown routines for the Kurlyk library.
@@ -21,4 +21,4 @@
 
 #include "startup/runtime.hpp"
 
-#endif // _KURLYK_STARTUP_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_STARTUP_HPP_INCLUDED
diff --git a/include/kurlyk/startup/AutoInitializer.hpp b/include/kurlyk/startup/AutoInitializer.hpp
index e401704..0dce6b7 100644
--- a/include/kurlyk/startup/AutoInitializer.hpp
+++ b/include/kurlyk/startup/AutoInitializer.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_STARTUP_AUTO_INITIALIZER_HPP_INCLUDED
-#define _KURLYK_STARTUP_AUTO_INITIALIZER_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_STARTUP_AUTO_INITIALIZER_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_STARTUP_AUTO_INITIALIZER_HPP_INCLUDED
 
 /// \file AutoInitializer.hpp
 /// \brief Provides automatic initialization and shutdown for the Kurlyk network system.
@@ -49,4 +49,4 @@ namespace kurlyk::startup {
 
 } // namespace kurlyk::startup
 
-#endif // _KURLYK_STARTUP_AUTO_INITIALIZER_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_STARTUP_AUTO_INITIALIZER_HPP_INCLUDED
diff --git a/include/kurlyk/startup/runtime.hpp b/include/kurlyk/startup/runtime.hpp
index 212fbfa..4f97b87 100644
--- a/include/kurlyk/startup/runtime.hpp
+++ b/include/kurlyk/startup/runtime.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_STARTUP_RUNTIME_HPP_INCLUDED
-#define _KURLYK_STARTUP_RUNTIME_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_STARTUP_RUNTIME_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_STARTUP_RUNTIME_HPP_INCLUDED
 
 /// \file runtime.hpp
 /// \brief Provides manual initialization and shutdown functions for the Kurlyk network system.
@@ -47,4 +47,4 @@ namespace kurlyk {
 
 } // namespace kurlyk
 
-#endif // _KURLYK_STARTUP_RUNTIME_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_STARTUP_RUNTIME_HPP_INCLUDED
diff --git a/include/kurlyk/types.hpp b/include/kurlyk/types.hpp
index dc2a7af..810d292 100644
--- a/include/kurlyk/types.hpp
+++ b/include/kurlyk/types.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_TYPES_HPP_INCLUDED
-#define _KURLYK_TYPES_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_TYPES_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_TYPES_HPP_INCLUDED
 
 /// \file types.hpp
 /// \brief Aggregates type enumerations and utilities used throughout the Kurlyk library.
@@ -27,4 +27,4 @@
 #include "types/type_utils.hpp"
 #include "types/Cookie.hpp"
 
-#endif // _KURLYK_TYPES_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_TYPES_HPP_INCLUDED
diff --git a/include/kurlyk/types/Cookie.hpp b/include/kurlyk/types/Cookie.hpp
index b2efee8..aafbcd2 100644
--- a/include/kurlyk/types/Cookie.hpp
+++ b/include/kurlyk/types/Cookie.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_TYPES_COOKIE_HPP_INCLUDED
-#define _KURLYK_TYPES_COOKIE_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_TYPES_COOKIE_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_TYPES_COOKIE_HPP_INCLUDED
 
 /// \file Cookie.hpp
 /// \brief Defines the Cookie class for managing HTTP cookies.
@@ -30,4 +30,4 @@ namespace kurlyk {
 
 }; // namespace kurlyk
 
-#endif // _KURLYK_TYPES_COOKIE_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_TYPES_COOKIE_HPP_INCLUDED
diff --git a/include/kurlyk/types/ProxyConfig.hpp b/include/kurlyk/types/ProxyConfig.hpp
index 7c3edd4..b36fe6b 100644
--- a/include/kurlyk/types/ProxyConfig.hpp
+++ b/include/kurlyk/types/ProxyConfig.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _CRYPTOX_DATA_CONNECTION_PROXY_CONFIG_HPP_INCLUDED
-#define _CRYPTOX_DATA_CONNECTION_PROXY_CONFIG_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_TYPES_PROXY_CONFIG_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_TYPES_PROXY_CONFIG_HPP_INCLUDED
 
 /// \file ProxyConfig.hpp
 /// \brief Defines the ProxyConfig structure for proxy server settings.
@@ -122,4 +122,4 @@ namespace cryptox {
 
 } // namespace cryptox
 
-#endif // _CRYPTOX_DATA_CONNECTION_PROXY_CONFIG_HPP_INCLUDED
\ No newline at end of file
+#endif // KURLYK_HEADER_KURLYK_TYPES_PROXY_CONFIG_HPP_INCLUDED
\ No newline at end of file
diff --git a/include/kurlyk/types/SubmitResult.hpp b/include/kurlyk/types/SubmitResult.hpp
index 7b32854..65abe62 100644
--- a/include/kurlyk/types/SubmitResult.hpp
+++ b/include/kurlyk/types/SubmitResult.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_TYPES_SUBMIT_RESULT_HPP_INCLUDED
-#define _KURLYK_TYPES_SUBMIT_RESULT_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_TYPES_SUBMIT_RESULT_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_TYPES_SUBMIT_RESULT_HPP_INCLUDED
 
 /// \file SubmitResult.hpp
 /// \brief Defines the SubmitResult structure for synchronous admission results.
@@ -23,4 +23,4 @@ namespace kurlyk {
 
 } // namespace kurlyk
 
-#endif // _KURLYK_TYPES_SUBMIT_RESULT_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_TYPES_SUBMIT_RESULT_HPP_INCLUDED
diff --git a/include/kurlyk/types/enums.hpp b/include/kurlyk/types/enums.hpp
index 740df93..ec71d9c 100644
--- a/include/kurlyk/types/enums.hpp
+++ b/include/kurlyk/types/enums.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_TYPES_ENUMS_HPP_INCLUDED
-#define _KURLYK_TYPES_ENUMS_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_TYPES_ENUMS_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_TYPES_ENUMS_HPP_INCLUDED
 
 /// \file enums.hpp
 /// \brief Defines enums used across the Kurlyk library, including proxy types, rate limits, and WebSocket events.
@@ -37,4 +37,4 @@ namespace kurlyk {
 
 } // namespace kurlyk
 
-#endif // _KURLYK_TYPES_ENUMS_HPP_INCLUDED
\ No newline at end of file
+#endif // KURLYK_HEADER_KURLYK_TYPES_ENUMS_HPP_INCLUDED
\ No newline at end of file
diff --git a/include/kurlyk/types/type_utils.hpp b/include/kurlyk/types/type_utils.hpp
index 653609a..8f5915f 100644
--- a/include/kurlyk/types/type_utils.hpp
+++ b/include/kurlyk/types/type_utils.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_TYPES_TYPE_UTILS_HPP_INCLUDED
-#define _KURLYK_TYPES_TYPE_UTILS_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_TYPES_TYPE_UTILS_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_TYPES_TYPE_UTILS_HPP_INCLUDED
 
 /// \file type_utils.hpp
 /// \brief Provides utilities for enum-to-string conversion, parsing, JSON (if enabled), and stream output.
@@ -138,4 +138,4 @@ namespace kurlyk {
 
 } // namespace kurlyk
 
-#endif // _KURLYK_TYPES_TYPE_UTILS_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_TYPES_TYPE_UTILS_HPP_INCLUDED
diff --git a/include/kurlyk/utils.hpp b/include/kurlyk/utils.hpp
index 2bc2162..bcea121 100644
--- a/include/kurlyk/utils.hpp
+++ b/include/kurlyk/utils.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_UTILIS_HPP_INCLUDED
-#define _KURLYK_UTILIS_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_UTILS_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_UTILS_HPP_INCLUDED
 
 /// \file utils.hpp
 /// \brief Contains utility functions and classes for handling HTTP requests and responses.
@@ -56,4 +56,4 @@
 #include "utils/encoding_utils.hpp"
 #include "utils/string_utils.hpp"
 
-#endif // _KURLYK_UTILIS_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_UTILS_HPP_INCLUDED
diff --git a/include/kurlyk/utils/Base64Url.hpp b/include/kurlyk/utils/Base64Url.hpp
index aeb21cc..036fc93 100644
--- a/include/kurlyk/utils/Base64Url.hpp
+++ b/include/kurlyk/utils/Base64Url.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_UTILS_BASE64URL_HPP_INCLUDED
-#define _KURLYK_UTILS_BASE64URL_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_UTILS_BASE64_URL_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_UTILS_BASE64_URL_HPP_INCLUDED
 
 /// \file Base64Url.hpp
 /// \brief Provides Base64url encoding and decoding (RFC 4648, no padding).
@@ -118,4 +118,4 @@ namespace utils {
 } // namespace utils
 } // namespace kurlyk
 
-#endif // _KURLYK_UTILS_BASE64URL_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_UTILS_BASE64_URL_HPP_INCLUDED
diff --git a/include/kurlyk/utils/CaseInsensitiveMultimap.hpp b/include/kurlyk/utils/CaseInsensitiveMultimap.hpp
index dd1254f..c8f3ce3 100644
--- a/include/kurlyk/utils/CaseInsensitiveMultimap.hpp
+++ b/include/kurlyk/utils/CaseInsensitiveMultimap.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_UTILS_CASE_INSENSITIVE_MULTIMAP_HPP_INCLUDED
-#define _KURLYK_UTILS_CASE_INSENSITIVE_MULTIMAP_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_UTILS_CASE_INSENSITIVE_MULTIMAP_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_UTILS_CASE_INSENSITIVE_MULTIMAP_HPP_INCLUDED
 
 /// \file CaseInsensitiveMultimap.hpp
 /// \brief Defines case-insensitive utilities and data structures for HTTP headers, cookies, and query parameters.
@@ -69,4 +69,4 @@ namespace kurlyk {
 
 } // namespace kurlyk
 
-#endif // _KURLYK_UTILS_CASE_INSENSITIVE_MULTIMAP_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_UTILS_CASE_INSENSITIVE_MULTIMAP_HPP_INCLUDED
diff --git a/include/kurlyk/utils/ClientErrorCategory.hpp b/include/kurlyk/utils/ClientErrorCategory.hpp
index a21955a..e3e9a8a 100644
--- a/include/kurlyk/utils/ClientErrorCategory.hpp
+++ b/include/kurlyk/utils/ClientErrorCategory.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_UTILS_CLIENT_ERROR_CATEGORY_HPP_INCLUDED
-#define _KURLYK_UTILS_CLIENT_ERROR_CATEGORY_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_UTILS_CLIENT_ERROR_CATEGORY_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_UTILS_CLIENT_ERROR_CATEGORY_HPP_INCLUDED
 
 /// \file ClientErrorCategory.hpp
 /// \brief Declares the ClientError enumeration and error category for internal client-side failures.
@@ -71,4 +71,4 @@ namespace std {
     struct is_error_code_enum<kurlyk::utils::ClientError> : true_type {};
 }
 
-#endif // _KURLYK_UTILS_CLIENT_ERROR_CATEGORY_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_UTILS_CLIENT_ERROR_CATEGORY_HPP_INCLUDED
diff --git a/include/kurlyk/utils/CurlErrorCategory.hpp b/include/kurlyk/utils/CurlErrorCategory.hpp
index 34960dd..6972589 100644
--- a/include/kurlyk/utils/CurlErrorCategory.hpp
+++ b/include/kurlyk/utils/CurlErrorCategory.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_UTILS_CURL_ERROR_CATEGORY_HPP_INCLUDED
-#define _KURLYK_UTILS_CURL_ERROR_CATEGORY_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_UTILS_CURL_ERROR_CATEGORY_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_UTILS_CURL_ERROR_CATEGORY_HPP_INCLUDED
 
 /// \file CurlErrorCategory.hpp
 /// \brief Defines the CurlErrorCategory class for handling CURL error codes.
@@ -35,4 +35,4 @@ namespace kurlyk::utils {
 
 } // namespace kurlyk::utils
 
-#endif // _KURLYK_UTILS_CURL_ERROR_CATEGORY_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_UTILS_CURL_ERROR_CATEGORY_HPP_INCLUDED
diff --git a/include/kurlyk/utils/EventQueue.hpp b/include/kurlyk/utils/EventQueue.hpp
index 43a3dd1..d00e1e7 100644
--- a/include/kurlyk/utils/EventQueue.hpp
+++ b/include/kurlyk/utils/EventQueue.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_EVENT_QUEUE_HPP_INCLUDED
-#define _KURLYK_EVENT_QUEUE_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_UTILS_EVENT_QUEUE_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_UTILS_EVENT_QUEUE_HPP_INCLUDED
 
 /// \file EventQueue.hpp
 /// \brief Defines the EventQueue class for managing a thread-safe event queue.
@@ -57,4 +57,4 @@ namespace kurlyk::utils {
 
 } // namespace kurlyk::utils
 
-#endif // _KURLYK_EVENT_QUEUE_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_UTILS_EVENT_QUEUE_HPP_INCLUDED
diff --git a/include/kurlyk/utils/HttpErrorCategory.hpp b/include/kurlyk/utils/HttpErrorCategory.hpp
index 36380be..7b4c79e 100644
--- a/include/kurlyk/utils/HttpErrorCategory.hpp
+++ b/include/kurlyk/utils/HttpErrorCategory.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_UTILS_HTTP_ERROR_CATEGORY_HPP_INCLUDED
-#define _KURLYK_UTILS_HTTP_ERROR_CATEGORY_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_UTILS_HTTP_ERROR_CATEGORY_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_UTILS_HTTP_ERROR_CATEGORY_HPP_INCLUDED
 
 /// \file HttpErrorCategory.hpp
 /// \brief Defines the HttpErrorCategory class for interpreting HTTP status codes as std::error_code values.
@@ -49,4 +49,4 @@ namespace kurlyk::utils {
 
 } // namespace kurlyk::utils
 
-#endif // _KURLYK_UTILS_HTTP_ERROR_CATEGORY_HPP_INCLUDED
\ No newline at end of file
+#endif // KURLYK_HEADER_KURLYK_UTILS_HTTP_ERROR_CATEGORY_HPP_INCLUDED
\ No newline at end of file
diff --git a/include/kurlyk/utils/Pkce.hpp b/include/kurlyk/utils/Pkce.hpp
index 5e9cb66..b6851e9 100644
--- a/include/kurlyk/utils/Pkce.hpp
+++ b/include/kurlyk/utils/Pkce.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_UTILS_PKCE_HPP_INCLUDED
-#define _KURLYK_UTILS_PKCE_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_UTILS_PKCE_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_UTILS_PKCE_HPP_INCLUDED
 
 /// \file Pkce.hpp
 /// \brief Provides PKCE (Proof Key for Code Exchange) utilities per RFC 7636.
@@ -66,4 +66,4 @@ namespace utils {
 } // namespace utils
 } // namespace kurlyk
 
-#endif // _KURLYK_UTILS_PKCE_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_UTILS_PKCE_HPP_INCLUDED
diff --git a/include/kurlyk/utils/WebSocketErrorCategory.hpp b/include/kurlyk/utils/WebSocketErrorCategory.hpp
index b383005..48a5ca9 100644
--- a/include/kurlyk/utils/WebSocketErrorCategory.hpp
+++ b/include/kurlyk/utils/WebSocketErrorCategory.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_UTILS_WEBSOCKET_ERROR_CATEGORY_HPP_INCLUDED
-#define _KURLYK_UTILS_WEBSOCKET_ERROR_CATEGORY_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_UTILS_WEB_SOCKET_ERROR_CATEGORY_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_UTILS_WEB_SOCKET_ERROR_CATEGORY_HPP_INCLUDED
 
 /// \file WebSocketErrorCategory.hpp
 /// \brief Defines the WebSocketError enumeration and corresponding error category for WebSocket-level failures.
@@ -65,4 +65,4 @@ namespace std {
     struct is_error_code_enum<kurlyk::utils::WebSocketError> : true_type {};
 }
 
-#endif // _KURLYK_UTILS_WEBSOCKET_ERROR_CATEGORY_HPP_INCLUDED
\ No newline at end of file
+#endif // KURLYK_HEADER_KURLYK_UTILS_WEB_SOCKET_ERROR_CATEGORY_HPP_INCLUDED
\ No newline at end of file
diff --git a/include/kurlyk/utils/email_utils.hpp b/include/kurlyk/utils/email_utils.hpp
index 6d1cad8..7bc2f4d 100644
--- a/include/kurlyk/utils/email_utils.hpp
+++ b/include/kurlyk/utils/email_utils.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_UTILS_EMAIL_UTILS_HPP_INCLUDED
-#define _KURLYK_UTILS_EMAIL_UTILS_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_UTILS_EMAIL_UTILS_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_UTILS_EMAIL_UTILS_HPP_INCLUDED
 
 /// \file email_utils.hpp
 /// \brief Provides utility functions for validating email address formats.
@@ -20,4 +20,4 @@ namespace kurlyk::utils {
 
 } // namespace kurlyk::utils
 
-#endif // _KURLYK_UTILS_EMAIL_UTILS_HPP_INCLUDED
\ No newline at end of file
+#endif // KURLYK_HEADER_KURLYK_UTILS_EMAIL_UTILS_HPP_INCLUDED
\ No newline at end of file
diff --git a/include/kurlyk/utils/encoding_utils.hpp b/include/kurlyk/utils/encoding_utils.hpp
index 3986798..451c3f8 100644
--- a/include/kurlyk/utils/encoding_utils.hpp
+++ b/include/kurlyk/utils/encoding_utils.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_UTILS_ENCODING_UTILS_HPP_INCLUDED
-#define _KURLYK_UTILS_ENCODING_UTILS_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_UTILS_ENCODING_UTILS_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_UTILS_ENCODING_UTILS_HPP_INCLUDED
 
 /// \file encoding_utils.hpp
 /// \brief Provides character encoding conversion utilities (e.g., UTF-8 to ANSI).
@@ -29,4 +29,4 @@ namespace kurlyk::utils {
 
 } // namespace kurlyk::utils
 
-#endif // _KURLYK_UTILS_ENCODING_UTILS_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_UTILS_ENCODING_UTILS_HPP_INCLUDED
diff --git a/include/kurlyk/utils/http_parser.hpp b/include/kurlyk/utils/http_parser.hpp
index 1897a0e..824db73 100644
--- a/include/kurlyk/utils/http_parser.hpp
+++ b/include/kurlyk/utils/http_parser.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_UTILS_HTTP_PARSER_HPP_INCLUDED
-#define _KURLYK_UTILS_HTTP_PARSER_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_UTILS_HTTP_PARSER_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_UTILS_HTTP_PARSER_HPP_INCLUDED
 
 /// \file http_parser.hpp
 /// \brief Provides utility functions for parsing HTTP headers and cookies.
@@ -188,4 +188,4 @@ namespace kurlyk::utils {
 
 } // namespace kurlyk::utils
 
-#endif // _KURLYK_UTILS_HTTP_PARSER_HPP_INCLUDED
\ No newline at end of file
+#endif // KURLYK_HEADER_KURLYK_UTILS_HTTP_PARSER_HPP_INCLUDED
\ No newline at end of file
diff --git a/include/kurlyk/utils/http_utils.hpp b/include/kurlyk/utils/http_utils.hpp
index b3ea263..70875b2 100644
--- a/include/kurlyk/utils/http_utils.hpp
+++ b/include/kurlyk/utils/http_utils.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_UTILS_HTTP_UTILS_HPP_INCLUDED
-#define _KURLYK_UTILS_HTTP_UTILS_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_UTILS_HTTP_UTILS_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_UTILS_HTTP_UTILS_HPP_INCLUDED
 
 /// \file http_utils.hpp
 /// \brief Provides utility functions for working with HTTP headers, cookies, and query strings.
@@ -36,4 +36,4 @@ namespace kurlyk::utils {
 
 } // namespace kurlyk::utils
 
-#endif // _KURLYK_UTILS_HTTP_UTILS_HPP_INCLUDED
\ No newline at end of file
+#endif // KURLYK_HEADER_KURLYK_UTILS_HTTP_UTILS_HPP_INCLUDED
\ No newline at end of file
diff --git a/include/kurlyk/utils/path_utils.hpp b/include/kurlyk/utils/path_utils.hpp
index 017b75f..5e124ca 100644
--- a/include/kurlyk/utils/path_utils.hpp
+++ b/include/kurlyk/utils/path_utils.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_UTILS_PATH_UTILS_HPP_INCLUDED
-#define _KURLYK_UTILS_PATH_UTILS_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_UTILS_PATH_UTILS_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_UTILS_PATH_UTILS_HPP_INCLUDED
 
 /// \file path_utils.hpp
 /// \brief Provides platform-specific utilities for obtaining paths and file locations.
@@ -66,4 +66,4 @@ namespace kurlyk::utils {
 
 } // namespace kurlyk::utils
 
-#endif // _KURLYK_UTILS_PATH_UTILS_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_UTILS_PATH_UTILS_HPP_INCLUDED
diff --git a/include/kurlyk/utils/percent_encoding.hpp b/include/kurlyk/utils/percent_encoding.hpp
index 53f09fb..d4f929d 100644
--- a/include/kurlyk/utils/percent_encoding.hpp
+++ b/include/kurlyk/utils/percent_encoding.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_UTILS_PERCENT_ENCODING_HPP_INCLUDED
-#define _KURLYK_UTILS_PERCENT_ENCODING_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_UTILS_PERCENT_ENCODING_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_UTILS_PERCENT_ENCODING_HPP_INCLUDED
 
 /// \file percent_encoding.hpp
 /// \brief Provides functions for percent-encoding and decoding strings.
diff --git a/include/kurlyk/utils/print_utils.hpp b/include/kurlyk/utils/print_utils.hpp
index a601b3c..c6c9ec9 100644
--- a/include/kurlyk/utils/print_utils.hpp
+++ b/include/kurlyk/utils/print_utils.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_UTILS_PRINT_UTILS_HPP_INCLUDED
-#define _KURLYK_UTILS_PRINT_UTILS_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_UTILS_PRINT_UTILS_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_UTILS_PRINT_UTILS_HPP_INCLUDED
 
 /// \file print_utils.hpp
 /// \brief Provides thread-safe console output utilities.
@@ -38,4 +38,4 @@ namespace kurlyk::utils {
 
 } // namespace kurlyk::utils
 
-#endif // _KURLYK_UTILS_PRINT_UTILS_HPP_INCLUDED
\ No newline at end of file
+#endif // KURLYK_HEADER_KURLYK_UTILS_PRINT_UTILS_HPP_INCLUDED
\ No newline at end of file
diff --git a/include/kurlyk/utils/string_utils.hpp b/include/kurlyk/utils/string_utils.hpp
index f7d9d79..d5c5642 100644
--- a/include/kurlyk/utils/string_utils.hpp
+++ b/include/kurlyk/utils/string_utils.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_UTILS_STRING_UTILS_HPP_INCLUDED
-#define _KURLYK_UTILS_STRING_UTILS_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_UTILS_STRING_UTILS_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_UTILS_STRING_UTILS_HPP_INCLUDED
 
 /// \file string_utils.hpp
 /// \brief Provides basic string manipulation utilities.
@@ -32,4 +32,4 @@ namespace kurlyk::utils {
 
 } // namespace kurlyk::utils
 
-#endif // _KURLYK_UTILS_STRING_UTILS_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_UTILS_STRING_UTILS_HPP_INCLUDED
diff --git a/include/kurlyk/utils/url_utils.hpp b/include/kurlyk/utils/url_utils.hpp
index cba8292..9a82c8b 100644
--- a/include/kurlyk/utils/url_utils.hpp
+++ b/include/kurlyk/utils/url_utils.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_UTILS_URL_UTILS_HPP_INCLUDED
-#define _KURLYK_UTILS_URL_UTILS_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_UTILS_URL_UTILS_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_UTILS_URL_UTILS_HPP_INCLUDED
 
 /// \file url_utils.hpp
 /// \brief Provides utility functions for parsing and validating URLs and their components.
@@ -169,4 +169,4 @@ namespace kurlyk::utils {
 
 } // namespace kurlyk::utils
 
-#endif // _KURLYK_UTILS_URL_UTILS_HPP_INCLUDED
\ No newline at end of file
+#endif // KURLYK_HEADER_KURLYK_UTILS_URL_UTILS_HPP_INCLUDED
\ No newline at end of file
diff --git a/include/kurlyk/utils/user_agent_utils.hpp b/include/kurlyk/utils/user_agent_utils.hpp
index 102e2be..660199b 100644
--- a/include/kurlyk/utils/user_agent_utils.hpp
+++ b/include/kurlyk/utils/user_agent_utils.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_UTILS_USER_AGENT_UTILS_HPP_INCLUDED
-#define _KURLYK_UTILS_USER_AGENT_UTILS_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_UTILS_USER_AGENT_UTILS_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_UTILS_USER_AGENT_UTILS_HPP_INCLUDED
 
 /// \file user_agent_utils.hpp
 /// \brief Provides functions for converting User-Agent strings to sec-ch-ua format.
@@ -28,4 +28,4 @@ namespace kurlyk::utils {
 
 } // namespace kurlyk::utils
 
-#endif // _KURLYK_UTILS_USER_AGENT_UTILS_HPP_INCLUDED
\ No newline at end of file
+#endif // KURLYK_HEADER_KURLYK_UTILS_USER_AGENT_UTILS_HPP_INCLUDED
\ No newline at end of file
diff --git a/include/kurlyk/websocket.hpp b/include/kurlyk/websocket.hpp
index 24417ed..f1645e4 100644
--- a/include/kurlyk/websocket.hpp
+++ b/include/kurlyk/websocket.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_WEBSOCKET_HPP_INCLUDED
-#define _KURLYK_WEBSOCKET_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_WEBSOCKET_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_WEBSOCKET_HPP_INCLUDED
 
 /// \file websocket.hpp
 /// \brief Aggregates main WebSocket interfaces and utilities.
@@ -13,4 +13,4 @@
 #include "websocket/WebSocketManager.hpp"
 #include "websocket/WebSocketClient.hpp"
 
-#endif // _KURLYK_WEBSOCKET_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_WEBSOCKET_HPP_INCLUDED
diff --git a/include/kurlyk/websocket/WebSocketClient.hpp b/include/kurlyk/websocket/WebSocketClient.hpp
index 0b2d85b..c8d271b 100644
--- a/include/kurlyk/websocket/WebSocketClient.hpp
+++ b/include/kurlyk/websocket/WebSocketClient.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_WEBSOCKET_CLIENT_HPP_INCLUDED
-#define _KURLYK_WEBSOCKET_CLIENT_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_WEBSOCKET_WEB_SOCKET_CLIENT_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_WEBSOCKET_WEB_SOCKET_CLIENT_HPP_INCLUDED
 
 /// \file WebSocketClient.hpp
 /// \brief Defines the WebSocketClient facade for managing WebSocket connections.
@@ -491,4 +491,4 @@ namespace kurlyk {
 
 } // namespace kurlyk
 
-#endif // _KURLYK_WEBSOCKET_CLIENT_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_WEBSOCKET_WEB_SOCKET_CLIENT_HPP_INCLUDED
diff --git a/include/kurlyk/websocket/WebSocketManager.hpp b/include/kurlyk/websocket/WebSocketManager.hpp
index e24850c..f81959d 100644
--- a/include/kurlyk/websocket/WebSocketManager.hpp
+++ b/include/kurlyk/websocket/WebSocketManager.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_WEBSOCKET_MANAGER_HPP_INCLUDED
-#define _KURLYK_WEBSOCKET_MANAGER_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_WEBSOCKET_WEB_SOCKET_MANAGER_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_WEBSOCKET_WEB_SOCKET_MANAGER_HPP_INCLUDED
 
 /// \file WebSocketManager.hpp
 /// \brief Defines the WebSocketManager singleton responsible for backend-specific WebSocket client instances.
@@ -131,4 +131,4 @@ namespace kurlyk {
 
 }
 
-#endif // _KURLYK_WEBSOCKET_MANAGER_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_WEBSOCKET_WEB_SOCKET_MANAGER_HPP_INCLUDED
diff --git a/include/kurlyk/websocket/client/BaseWebSocketClient.hpp b/include/kurlyk/websocket/client/BaseWebSocketClient.hpp
index 6a48ff6..c3bd355 100644
--- a/include/kurlyk/websocket/client/BaseWebSocketClient.hpp
+++ b/include/kurlyk/websocket/client/BaseWebSocketClient.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_BASE_WEB_SOCKET_CLIENT_HPP_INCLUDED
-#define _KURLYK_BASE_WEB_SOCKET_CLIENT_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_WEBSOCKET_CLIENT_BASE_WEB_SOCKET_CLIENT_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_WEBSOCKET_CLIENT_BASE_WEB_SOCKET_CLIENT_HPP_INCLUDED
 
 /// \file BaseWebSocketClient.hpp
 /// \brief Contains the definition of the BaseWebSocketClient class, which provides the base functionality for WebSocket clients.
@@ -844,4 +844,4 @@ namespace kurlyk {
 }; // namespace kurlyk
 
 
-#endif // _KURLYK_BASE_WEB_SOCKET_CLIENT_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_WEBSOCKET_CLIENT_BASE_WEB_SOCKET_CLIENT_HPP_INCLUDED
diff --git a/include/kurlyk/websocket/client/BaseWebSocketClient/IWebSocketClient.hpp b/include/kurlyk/websocket/client/BaseWebSocketClient/IWebSocketClient.hpp
index 6af09db..13812fa 100644
--- a/include/kurlyk/websocket/client/BaseWebSocketClient/IWebSocketClient.hpp
+++ b/include/kurlyk/websocket/client/BaseWebSocketClient/IWebSocketClient.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_IWEBSOCKET_CLIENT_HPP_INCLUDED
-#define _KURLYK_IWEBSOCKET_CLIENT_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_WEBSOCKET_CLIENT_BASE_WEB_SOCKET_CLIENT_I_WEB_SOCKET_CLIENT_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_WEBSOCKET_CLIENT_BASE_WEB_SOCKET_CLIENT_I_WEB_SOCKET_CLIENT_HPP_INCLUDED
 
 /// \file IWebSocketClient.hpp
 /// \brief Defines a legacy internal interface for WebSocket client functionality.
@@ -81,4 +81,4 @@ namespace kurlyk {
 
 } // namespace kurlyk
 
-#endif // _KURLYK_IWEBSOCKET_CLIENT_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_WEBSOCKET_CLIENT_BASE_WEB_SOCKET_CLIENT_I_WEB_SOCKET_CLIENT_HPP_INCLUDED
diff --git a/include/kurlyk/websocket/client/BaseWebSocketClient/IWebSocketSender.hpp b/include/kurlyk/websocket/client/BaseWebSocketClient/IWebSocketSender.hpp
index 7d357aa..1071967 100644
--- a/include/kurlyk/websocket/client/BaseWebSocketClient/IWebSocketSender.hpp
+++ b/include/kurlyk/websocket/client/BaseWebSocketClient/IWebSocketSender.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_IWEBSOCKET_SENDER_HPP_INCLUDED
-#define _KURLYK_IWEBSOCKET_SENDER_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_WEBSOCKET_CLIENT_BASE_WEB_SOCKET_CLIENT_I_WEB_SOCKET_SENDER_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_WEBSOCKET_CLIENT_BASE_WEB_SOCKET_CLIENT_I_WEB_SOCKET_SENDER_HPP_INCLUDED
 
 /// \file IWebSocketSender.hpp
 /// \brief Defines the public sender abstraction exposed through WebSocket events.
@@ -88,4 +88,4 @@ namespace kurlyk {
 
 } // namespace kurlyk
 
-#endif // _KURLYK_IWEBSOCKET_SENDER_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_WEBSOCKET_CLIENT_BASE_WEB_SOCKET_CLIENT_I_WEB_SOCKET_SENDER_HPP_INCLUDED
diff --git a/include/kurlyk/websocket/client/BaseWebSocketClient/WebSocketEventData.hpp b/include/kurlyk/websocket/client/BaseWebSocketClient/WebSocketEventData.hpp
index 317d031..282609c 100644
--- a/include/kurlyk/websocket/client/BaseWebSocketClient/WebSocketEventData.hpp
+++ b/include/kurlyk/websocket/client/BaseWebSocketClient/WebSocketEventData.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_WEBSOCKET_EVENT_DATA_HPP_INCLUDED
-#define _KURLYK_WEBSOCKET_EVENT_DATA_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_WEBSOCKET_CLIENT_BASE_WEB_SOCKET_CLIENT_WEB_SOCKET_EVENT_DATA_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_WEBSOCKET_CLIENT_BASE_WEB_SOCKET_CLIENT_WEB_SOCKET_EVENT_DATA_HPP_INCLUDED
 
 /// \file WebSocketEventData.hpp
 /// \brief Defines the WebSocketEventData class, which encapsulates data related to WebSocket events.
@@ -23,4 +23,4 @@ namespace kurlyk {
 
 }; // namespace kurlyk
 
-#endif // _KURLYK_WEBSOCKET_EVENT_DATA_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_WEBSOCKET_CLIENT_BASE_WEB_SOCKET_CLIENT_WEB_SOCKET_EVENT_DATA_HPP_INCLUDED
diff --git a/include/kurlyk/websocket/client/BaseWebSocketClient/WebSocketRateLimiter.hpp b/include/kurlyk/websocket/client/BaseWebSocketClient/WebSocketRateLimiter.hpp
index 1b9f8b2..9b5e6e1 100644
--- a/include/kurlyk/websocket/client/BaseWebSocketClient/WebSocketRateLimiter.hpp
+++ b/include/kurlyk/websocket/client/BaseWebSocketClient/WebSocketRateLimiter.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_WEBSOCKET_RATE_LIMITER_HPP_INCLUDED
-#define _KURLYK_WEBSOCKET_RATE_LIMITER_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_WEBSOCKET_CLIENT_BASE_WEB_SOCKET_CLIENT_WEB_SOCKET_RATE_LIMITER_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_WEBSOCKET_CLIENT_BASE_WEB_SOCKET_CLIENT_WEB_SOCKET_RATE_LIMITER_HPP_INCLUDED
 
 /// \file WebSocketRateLimiter.hpp
 /// \brief Defines WebSocket rate limiting to control the frequency of WebSocket requests.
@@ -115,4 +115,4 @@ namespace kurlyk {
 
 } // namespace kurlyk
 
-#endif // _KURLYK_WEBSOCKET_RATE_LIMITER_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_WEBSOCKET_CLIENT_BASE_WEB_SOCKET_CLIENT_WEB_SOCKET_RATE_LIMITER_HPP_INCLUDED
diff --git a/include/kurlyk/websocket/client/Emscripten/EmscriptenWebSocketClientAdapter.hpp b/include/kurlyk/websocket/client/Emscripten/EmscriptenWebSocketClientAdapter.hpp
index 208066e..6b0b2aa 100644
--- a/include/kurlyk/websocket/client/Emscripten/EmscriptenWebSocketClientAdapter.hpp
+++ b/include/kurlyk/websocket/client/Emscripten/EmscriptenWebSocketClientAdapter.hpp
@@ -22,8 +22,8 @@
 * SOFTWARE.
 */
 #pragma once
-#ifndef _KURLYK_EMSCRIPTEN_WEB_SOCKET_CLIENT_ADAPTER_HPP_INCLUDED
-#define _KURLYK_EMSCRIPTEN_WEB_SOCKET_CLIENT_ADAPTER_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_WEBSOCKET_CLIENT_EMSCRIPTEN_EMSCRIPTEN_WEB_SOCKET_CLIENT_ADAPTER_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_WEBSOCKET_CLIENT_EMSCRIPTEN_EMSCRIPTEN_WEB_SOCKET_CLIENT_ADAPTER_HPP_INCLUDED
 
 #include <functional>
 #include <string>
@@ -595,4 +595,4 @@ namespace kurlyk {
 
 };
 
-#endif // _KURLYK_EMSCRIPTEN_WEB_SOCKET_CLIENT_ADAPTER_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_WEBSOCKET_CLIENT_EMSCRIPTEN_EMSCRIPTEN_WEB_SOCKET_CLIENT_ADAPTER_HPP_INCLUDED
diff --git a/include/kurlyk/websocket/client/SimpleWeb.hpp b/include/kurlyk/websocket/client/SimpleWeb.hpp
index c3d8f1f..81787ff 100644
--- a/include/kurlyk/websocket/client/SimpleWeb.hpp
+++ b/include/kurlyk/websocket/client/SimpleWeb.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_WEBSOCKET_CLIENT_SIMPLEWEB_HPP_INCLUDED
-#define _KURLYK_WEBSOCKET_CLIENT_SIMPLEWEB_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_WEBSOCKET_CLIENT_SIMPLE_WEB_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_WEBSOCKET_CLIENT_SIMPLE_WEB_HPP_INCLUDED
 
 /// \file SimpleWeb.hpp
 /// \brief Declares the SimpleWebSocketClientAdapter implementation for WebSocket communication using Simple-WebSocket-Server.
@@ -9,4 +9,4 @@
 #include "SimpleWeb/SimpleWebSocketWorker.hpp"
 #include "SimpleWeb/SimpleWebSocketClientAdapter.hpp"
 
-#endif // _KURLYK_WEBSOCKET_CLIENT_SIMPLEWEB_HPP_INCLUDED
\ No newline at end of file
+#endif // KURLYK_HEADER_KURLYK_WEBSOCKET_CLIENT_SIMPLE_WEB_HPP_INCLUDED
\ No newline at end of file
diff --git a/include/kurlyk/websocket/client/SimpleWeb/SimpleWebSocketClientAdapter.hpp b/include/kurlyk/websocket/client/SimpleWeb/SimpleWebSocketClientAdapter.hpp
index 58468c2..33ad95a 100644
--- a/include/kurlyk/websocket/client/SimpleWeb/SimpleWebSocketClientAdapter.hpp
+++ b/include/kurlyk/websocket/client/SimpleWeb/SimpleWebSocketClientAdapter.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_SIMPLE_WEB_SOCKET_CLIENT_ADAPTER_HPP_INCLUDED
-#define _KURLYK_SIMPLE_WEB_SOCKET_CLIENT_ADAPTER_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_WEBSOCKET_CLIENT_SIMPLE_WEB_SIMPLE_WEB_SOCKET_CLIENT_ADAPTER_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_WEBSOCKET_CLIENT_SIMPLE_WEB_SIMPLE_WEB_SOCKET_CLIENT_ADAPTER_HPP_INCLUDED
 
 /// \file WebSocketClientAdapter.hpp
 /// \brief Defines the SimpleWebSocketClientAdapter class, an adapter for managing WebSocket connections using the Simple-WebSocket-Server library.
@@ -331,4 +331,4 @@ namespace kurlyk {
 
 }; // namespace kurlyk
 
-#endif // _KURLYK_SIMPLE_WEB_SOCKET_CLIENT_ADAPTER_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_WEBSOCKET_CLIENT_SIMPLE_WEB_SIMPLE_WEB_SOCKET_CLIENT_ADAPTER_HPP_INCLUDED
diff --git a/include/kurlyk/websocket/client/SimpleWeb/SimpleWebSocketWorker.hpp b/include/kurlyk/websocket/client/SimpleWeb/SimpleWebSocketWorker.hpp
index e008e69..0eecfff 100644
--- a/include/kurlyk/websocket/client/SimpleWeb/SimpleWebSocketWorker.hpp
+++ b/include/kurlyk/websocket/client/SimpleWeb/SimpleWebSocketWorker.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_SIMPLE_WEB_SOCKET_WORKER_HPP_INCLUDED
-#define _KURLYK_SIMPLE_WEB_SOCKET_WORKER_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_WEBSOCKET_CLIENT_SIMPLE_WEB_SIMPLE_WEB_SOCKET_WORKER_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_WEBSOCKET_CLIENT_SIMPLE_WEB_SIMPLE_WEB_SOCKET_WORKER_HPP_INCLUDED
 
 /// \file SimpleWebSocketWorker.hpp
 /// \brief Defines the SimpleWebSocketWorker class for managing WebSocket operations in a separate thread.
@@ -120,4 +120,4 @@ namespace kurlyk {
 
 }; // namespace kurlyk
 
-#endif // _KURLYK_SIMPLE_WEB_SOCKET_WORKER_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_WEBSOCKET_CLIENT_SIMPLE_WEB_SIMPLE_WEB_SOCKET_WORKER_HPP_INCLUDED
diff --git a/include/kurlyk/websocket/client/SimpleWeb/SocketClient.hpp b/include/kurlyk/websocket/client/SimpleWeb/SocketClient.hpp
index 95d7fff..f567a3b 100644
--- a/include/kurlyk/websocket/client/SimpleWeb/SocketClient.hpp
+++ b/include/kurlyk/websocket/client/SimpleWeb/SocketClient.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_SIMPLE_WEB_SOCKET_CLIENT_WSS_HPP
-#define _KURLYK_SIMPLE_WEB_SOCKET_CLIENT_WSS_HPP
+#ifndef KURLYK_HEADER_KURLYK_WEBSOCKET_CLIENT_SIMPLE_WEB_SOCKET_CLIENT_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_WEBSOCKET_CLIENT_SIMPLE_WEB_SOCKET_CLIENT_HPP_INCLUDED
 
 /// \file SocketClient.hpp
 /// \brief Defines a WebSocket client with SSL support, extending the functionality of the Simple-Web-Server library.
@@ -232,4 +232,4 @@ namespace SimpleWeb {
 
 } // namespace SimpleWeb
 
-#endif // _KURLYK_SIMPLE_WEB_SOCKET_CLIENT_WSS_HPP
+#endif // KURLYK_HEADER_KURLYK_WEBSOCKET_CLIENT_SIMPLE_WEB_SOCKET_CLIENT_HPP_INCLUDED
diff --git a/include/kurlyk/websocket/data.hpp b/include/kurlyk/websocket/data.hpp
index 1164aaf..7de5dd0 100644
--- a/include/kurlyk/websocket/data.hpp
+++ b/include/kurlyk/websocket/data.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_WEBSOCKET_DATA_HPP_INCLUDED
-#define _KURLYK_WEBSOCKET_DATA_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_WEBSOCKET_DATA_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_WEBSOCKET_DATA_HPP_INCLUDED
 
 /// \file data.hpp
 /// \brief Aggregates core WebSocket data structures such as configuration, events, and send metadata.
@@ -8,4 +8,4 @@
 #include "data/WebSocketConfig.hpp"
 #include "data/WebSocketSendInfo.hpp"
 
-#endif // _KURLYK_WEBSOCKET_DATA_HPP_INCLUDED
\ No newline at end of file
+#endif // KURLYK_HEADER_KURLYK_WEBSOCKET_DATA_HPP_INCLUDED
\ No newline at end of file
diff --git a/include/kurlyk/websocket/data/WebSocketConfig.hpp b/include/kurlyk/websocket/data/WebSocketConfig.hpp
index 7ea1ad0..1429cca 100644
--- a/include/kurlyk/websocket/data/WebSocketConfig.hpp
+++ b/include/kurlyk/websocket/data/WebSocketConfig.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_WEBSOCKET_CONFIG_HPP_INCLUDED
-#define _KURLYK_WEBSOCKET_CONFIG_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_WEBSOCKET_DATA_WEB_SOCKET_CONFIG_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_WEBSOCKET_DATA_WEB_SOCKET_CONFIG_HPP_INCLUDED
 
 /// \file WebSocketConfig.hpp
 /// \brief Defines the configuration options for WebSocket connections.
@@ -236,4 +236,4 @@ namespace kurlyk {
 
 } // namespace kurlyk
 
-#endif // _KURLYK_WEBSOCKET_CONFIG_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_WEBSOCKET_DATA_WEB_SOCKET_CONFIG_HPP_INCLUDED
diff --git a/include/kurlyk/websocket/data/WebSocketSendInfo.hpp b/include/kurlyk/websocket/data/WebSocketSendInfo.hpp
index 34a00e4..9475aa1 100644
--- a/include/kurlyk/websocket/data/WebSocketSendInfo.hpp
+++ b/include/kurlyk/websocket/data/WebSocketSendInfo.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#ifndef _KURLYK_WEBSOCKET_SEND_INFO_HPP_INCLUDED
-#define _KURLYK_WEBSOCKET_SEND_INFO_HPP_INCLUDED
+#ifndef KURLYK_HEADER_KURLYK_WEBSOCKET_DATA_WEB_SOCKET_SEND_INFO_HPP_INCLUDED
+#define KURLYK_HEADER_KURLYK_WEBSOCKET_DATA_WEB_SOCKET_SEND_INFO_HPP_INCLUDED
 
 /// \file WebSocketSendInfo.hpp
 /// \brief Contains the WebSocketSendInfo class, which holds the context for sending WebSocket messages.
@@ -38,4 +38,4 @@ namespace kurlyk {
 
 } // namespace kurlyk
 
-#endif // _KURLYK_WEBSOCKET_SEND_INFO_HPP_INCLUDED
+#endif // KURLYK_HEADER_KURLYK_WEBSOCKET_DATA_WEB_SOCKET_SEND_INFO_HPP_INCLUDED