diff --git a/.clang-format b/.clang-format
index b74f533b67..92664c6313 100644
--- a/.clang-format
+++ b/.clang-format
@@ -33,10 +33,26 @@ CompactNamespaces: true
 Cpp11BracedListStyle: true
 FixNamespaceComments: true
 IndentWidth: 2
-IncludeBlocks: Preserve
+IncludeBlocks: Regroup
 IndentCaseLabels: true
 NamespaceIndentation: Inner
 PointerAlignment: Left
 PenaltyReturnTypeOnItsOwnLine: 300
 TabWidth: 2
 UseTab: Never
+IncludeCategories:
+ - Regex: '^<windows.h>$'
+   Priority: 80
+# Note: get_env.hpp must be included before any other Azure SDK headers.
+ - Regex: '^["<]get_env.hpp'
+   Priority: 10
+ - Regex: '<[[:alnum:]_.]+>'
+   Priority: 90
+ - Regex: '<Azure/.*>'
+   Priority: 50
+ - Regex: '^<azure_uamqp_c.*/(amqp_definitions_sequence_no|amqp_definitions_milliseconds|amqp_definitions_terminus_expiry_policy|amqp_definitions_terminus_durability).h>$'
+   Priority: 60
+ - Regex: '<azure_.*>'
+   Priority: 70
+ - Regex: '^".+'
+   Priority: 20
diff --git a/samples/integration/vcpkg-all-smoke/src/main.cpp b/samples/integration/vcpkg-all-smoke/src/main.cpp
index 678fe23126..705a59a436 100644
--- a/samples/integration/vcpkg-all-smoke/src/main.cpp
+++ b/samples/integration/vcpkg-all-smoke/src/main.cpp
@@ -7,6 +7,7 @@
  */
 
 #include "get_env.hpp"
+
 #include <azure/attestation.hpp>
 #include <azure/core.hpp>
 #include <azure/core/internal/json/json.hpp>
@@ -18,6 +19,7 @@
 #include <azure/storage/files/datalake.hpp>
 #include <azure/storage/files/shares.hpp>
 #include <azure/storage/queues.hpp>
+
 #include <iostream>
 
 using namespace Azure::Security::KeyVault::Keys;
diff --git a/sdk/attestation/azure-security-attestation/inc/azure/attestation/attestation_administration_client.hpp b/sdk/attestation/azure-security-attestation/inc/azure/attestation/attestation_administration_client.hpp
index aa17c5a18e..5bc6bd05b2 100644
--- a/sdk/attestation/azure-security-attestation/inc/azure/attestation/attestation_administration_client.hpp
+++ b/sdk/attestation/azure-security-attestation/inc/azure/attestation/attestation_administration_client.hpp
@@ -5,9 +5,11 @@
 
 #include "azure/attestation/attestation_client_models.hpp"
 #include "azure/attestation/attestation_client_options.hpp"
+
 #include <azure/core/context.hpp>
 #include <azure/core/internal/tracing/service_tracing.hpp>
 #include <azure/core/url.hpp>
+
 #include <string>
 
 namespace Azure { namespace Core { namespace Http { namespace _internal {
diff --git a/sdk/attestation/azure-security-attestation/inc/azure/attestation/attestation_client.hpp b/sdk/attestation/azure-security-attestation/inc/azure/attestation/attestation_client.hpp
index d7c44d4941..f3e2706538 100644
--- a/sdk/attestation/azure-security-attestation/inc/azure/attestation/attestation_client.hpp
+++ b/sdk/attestation/azure-security-attestation/inc/azure/attestation/attestation_client.hpp
@@ -5,9 +5,11 @@
 
 #include "azure/attestation/attestation_client_models.hpp"
 #include "azure/attestation/attestation_client_options.hpp"
+
 #include <azure/core/context.hpp>
 #include <azure/core/internal/tracing/service_tracing.hpp>
 #include <azure/core/url.hpp>
+
 #include <string>
 
 namespace Azure { namespace Core { namespace Http { namespace _internal {
diff --git a/sdk/attestation/azure-security-attestation/inc/azure/attestation/attestation_client_models.hpp b/sdk/attestation/azure-security-attestation/inc/azure/attestation/attestation_client_models.hpp
index c4db47e2ae..88817b8304 100644
--- a/sdk/attestation/azure-security-attestation/inc/azure/attestation/attestation_client_models.hpp
+++ b/sdk/attestation/azure-security-attestation/inc/azure/attestation/attestation_client_models.hpp
@@ -10,12 +10,14 @@
 #pragma once
 
 #include "azure/attestation/dll_import_export.hpp"
+
 #include <azure/core/context.hpp>
 #include <azure/core/http/http.hpp>
 #include <azure/core/internal/extendable_enumeration.hpp>
 #include <azure/core/nullable.hpp>
 #include <azure/core/paged_response.hpp>
 #include <azure/core/response.hpp>
+
 #include <iostream>
 #include <memory>
 #include <string>
diff --git a/sdk/attestation/azure-security-attestation/inc/azure/attestation/attestation_client_options.hpp b/sdk/attestation/azure-security-attestation/inc/azure/attestation/attestation_client_options.hpp
index b9f1a2450a..f6cfbc5e51 100644
--- a/sdk/attestation/azure-security-attestation/inc/azure/attestation/attestation_client_options.hpp
+++ b/sdk/attestation/azure-security-attestation/inc/azure/attestation/attestation_client_options.hpp
@@ -11,6 +11,7 @@
 
 #include "azure/attestation/attestation_client_models.hpp"
 #include "dll_import_export.hpp"
+
 #include <azure/core/internal/client_options.hpp>
 #include <azure/core/internal/extendable_enumeration.hpp>
 
diff --git a/sdk/attestation/azure-security-attestation/samples/attestation/attest_openenclave_shared.cpp b/sdk/attestation/azure-security-attestation/samples/attestation/attest_openenclave_shared.cpp
index 6cf6cc47c0..92fa12594e 100644
--- a/sdk/attestation/azure-security-attestation/samples/attestation/attest_openenclave_shared.cpp
+++ b/sdk/attestation/azure-security-attestation/samples/attestation/attest_openenclave_shared.cpp
@@ -24,8 +24,10 @@
 #include <get_env.hpp>
 
 #include "attestation_collateral.hpp"
+
 #include <azure/attestation.hpp>
 #include <azure/core/base64.hpp>
+
 #include <chrono>
 #include <iostream>
 #include <thread>
diff --git a/sdk/attestation/azure-security-attestation/samples/attestation/attest_openenclave_with_draft_policy.cpp b/sdk/attestation/azure-security-attestation/samples/attestation/attest_openenclave_with_draft_policy.cpp
index 2547cf1899..3f0cc91141 100644
--- a/sdk/attestation/azure-security-attestation/samples/attestation/attest_openenclave_with_draft_policy.cpp
+++ b/sdk/attestation/azure-security-attestation/samples/attestation/attest_openenclave_with_draft_policy.cpp
@@ -24,8 +24,10 @@
 #include <get_env.hpp>
 
 #include "attestation_collateral.hpp"
+
 #include <azure/attestation.hpp>
 #include <azure/core/base64.hpp>
+
 #include <chrono>
 #include <iostream>
 #include <thread>
diff --git a/sdk/attestation/azure-security-attestation/samples/attestation/attest_sgxenclave.cpp b/sdk/attestation/azure-security-attestation/samples/attestation/attest_sgxenclave.cpp
index 9b9283c008..cd97b7b684 100644
--- a/sdk/attestation/azure-security-attestation/samples/attestation/attest_sgxenclave.cpp
+++ b/sdk/attestation/azure-security-attestation/samples/attestation/attest_sgxenclave.cpp
@@ -24,8 +24,10 @@
 #include <get_env.hpp>
 
 #include "attestation_collateral.hpp"
+
 #include <azure/attestation.hpp>
 #include <azure/core/base64.hpp>
+
 #include <chrono>
 #include <iostream>
 #include <thread>
diff --git a/sdk/attestation/azure-security-attestation/samples/attestation/attest_sgxenclave_with_runtime_binary.cpp b/sdk/attestation/azure-security-attestation/samples/attestation/attest_sgxenclave_with_runtime_binary.cpp
index 2ecc6ddacd..cb9ff6bd83 100644
--- a/sdk/attestation/azure-security-attestation/samples/attestation/attest_sgxenclave_with_runtime_binary.cpp
+++ b/sdk/attestation/azure-security-attestation/samples/attestation/attest_sgxenclave_with_runtime_binary.cpp
@@ -24,8 +24,10 @@
 #include <get_env.hpp>
 
 #include "attestation_collateral.hpp"
+
 #include <azure/attestation.hpp>
 #include <azure/core/base64.hpp>
+
 #include <chrono>
 #include <iostream>
 #include <thread>
diff --git a/sdk/attestation/azure-security-attestation/samples/attestation/attest_sgxenclave_with_runtime_json.cpp b/sdk/attestation/azure-security-attestation/samples/attestation/attest_sgxenclave_with_runtime_json.cpp
index d70c5f43a3..b7a18a96fe 100644
--- a/sdk/attestation/azure-security-attestation/samples/attestation/attest_sgxenclave_with_runtime_json.cpp
+++ b/sdk/attestation/azure-security-attestation/samples/attestation/attest_sgxenclave_with_runtime_json.cpp
@@ -24,8 +24,10 @@
 #include <get_env.hpp>
 
 #include "attestation_collateral.hpp"
+
 #include <azure/attestation.hpp>
 #include <azure/core/base64.hpp>
+
 #include <chrono>
 #include <iostream>
 #include <thread>
diff --git a/sdk/attestation/azure-security-attestation/samples/attestation/attestation_collateral.cpp b/sdk/attestation/azure-security-attestation/samples/attestation/attestation_collateral.cpp
index 909183566a..53231ab42a 100644
--- a/sdk/attestation/azure-security-attestation/samples/attestation/attestation_collateral.cpp
+++ b/sdk/attestation/azure-security-attestation/samples/attestation/attestation_collateral.cpp
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: MIT
 
 #include "attestation_collateral.hpp"
+
 #include <azure/core/base64.hpp>
 
 // cspell:disable
diff --git a/sdk/attestation/azure-security-attestation/samples/basic-operations/create_admin_client.cpp b/sdk/attestation/azure-security-attestation/samples/basic-operations/create_admin_client.cpp
index 652f955970..394d9cb799 100644
--- a/sdk/attestation/azure-security-attestation/samples/basic-operations/create_admin_client.cpp
+++ b/sdk/attestation/azure-security-attestation/samples/basic-operations/create_admin_client.cpp
@@ -21,6 +21,7 @@
 
 #include <azure/attestation.hpp>
 #include <azure/identity.hpp>
+
 #include <chrono>
 #include <iostream>
 #include <memory>
diff --git a/sdk/attestation/azure-security-attestation/samples/basic-operations/create_client.cpp b/sdk/attestation/azure-security-attestation/samples/basic-operations/create_client.cpp
index 9c6d0a4c5f..eeaa32ce60 100644
--- a/sdk/attestation/azure-security-attestation/samples/basic-operations/create_client.cpp
+++ b/sdk/attestation/azure-security-attestation/samples/basic-operations/create_client.cpp
@@ -16,6 +16,7 @@
 #include <get_env.hpp>
 
 #include <azure/attestation.hpp>
+
 #include <chrono>
 #include <iostream>
 #include <thread>
diff --git a/sdk/attestation/azure-security-attestation/samples/policy-certificates/add_policy_certificate.cpp b/sdk/attestation/azure-security-attestation/samples/policy-certificates/add_policy_certificate.cpp
index 2103a441a5..d81e7fbed7 100644
--- a/sdk/attestation/azure-security-attestation/samples/policy-certificates/add_policy_certificate.cpp
+++ b/sdk/attestation/azure-security-attestation/samples/policy-certificates/add_policy_certificate.cpp
@@ -26,6 +26,7 @@
 #include <get_env.hpp>
 
 #include "cryptohelpers.hpp"
+
 #include <azure/attestation.hpp>
 #include <azure/identity.hpp>
 
diff --git a/sdk/attestation/azure-security-attestation/samples/policy-certificates/cryptohelpers.hpp b/sdk/attestation/azure-security-attestation/samples/policy-certificates/cryptohelpers.hpp
index edf87acf48..a55b3d5dc9 100644
--- a/sdk/attestation/azure-security-attestation/samples/policy-certificates/cryptohelpers.hpp
+++ b/sdk/attestation/azure-security-attestation/samples/policy-certificates/cryptohelpers.hpp
@@ -7,16 +7,17 @@
 #include <algorithm>
 #include <cstring>
 #include <memory>
-#include <openssl/bio.h>
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/pem.h>
-#include <openssl/x509.h>
 #include <stdexcept>
 #include <string>
 #include <type_traits>
 #include <utility>
 #include <vector>
+
+#include <openssl/bio.h>
+#include <openssl/err.h>
+#include <openssl/evp.h>
+#include <openssl/pem.h>
+#include <openssl/x509.h>
 /**
  * @brief The Cryptography class provides a set of basic cryptographic primatives required
  * by the attestation samples.
diff --git a/sdk/attestation/azure-security-attestation/samples/policy-certificates/get_policy_certificates.cpp b/sdk/attestation/azure-security-attestation/samples/policy-certificates/get_policy_certificates.cpp
index a5cbcd5cf4..d289751dc8 100644
--- a/sdk/attestation/azure-security-attestation/samples/policy-certificates/get_policy_certificates.cpp
+++ b/sdk/attestation/azure-security-attestation/samples/policy-certificates/get_policy_certificates.cpp
@@ -21,6 +21,7 @@
 #include <get_env.hpp>
 
 #include "cryptohelpers.hpp"
+
 #include <azure/attestation.hpp>
 #include <azure/identity.hpp>
 
diff --git a/sdk/attestation/azure-security-attestation/samples/policy/reset_sealed_policy.cpp b/sdk/attestation/azure-security-attestation/samples/policy/reset_sealed_policy.cpp
index 4ebdd8c80e..757b37e4c7 100644
--- a/sdk/attestation/azure-security-attestation/samples/policy/reset_sealed_policy.cpp
+++ b/sdk/attestation/azure-security-attestation/samples/policy/reset_sealed_policy.cpp
@@ -20,11 +20,13 @@
 #include <get_env.hpp>
 
 #include "cryptohelpers.hpp"
+
 #include <azure/attestation.hpp>
 #include <azure/core/base64.hpp>
 #include <azure/core/cryptography/hash.hpp>
 #include <azure/core/internal/cryptography/sha_hash.hpp>
 #include <azure/identity.hpp>
+
 #include <chrono>
 #include <iomanip>
 #include <iostream>
diff --git a/sdk/attestation/azure-security-attestation/samples/policy/set_policy.cpp b/sdk/attestation/azure-security-attestation/samples/policy/set_policy.cpp
index 063ab26a79..4c45487d0e 100644
--- a/sdk/attestation/azure-security-attestation/samples/policy/set_policy.cpp
+++ b/sdk/attestation/azure-security-attestation/samples/policy/set_policy.cpp
@@ -23,6 +23,7 @@
 #include <azure/core/cryptography/hash.hpp>
 #include <azure/core/internal/cryptography/sha_hash.hpp>
 #include <azure/identity.hpp>
+
 #include <chrono>
 #include <iomanip>
 #include <iostream>
diff --git a/sdk/attestation/azure-security-attestation/samples/policy/set_sealed_policy.cpp b/sdk/attestation/azure-security-attestation/samples/policy/set_sealed_policy.cpp
index b65f24ef72..c736d8a0dc 100644
--- a/sdk/attestation/azure-security-attestation/samples/policy/set_sealed_policy.cpp
+++ b/sdk/attestation/azure-security-attestation/samples/policy/set_sealed_policy.cpp
@@ -20,11 +20,13 @@
 #include <get_env.hpp>
 
 #include "cryptohelpers.hpp"
+
 #include <azure/attestation.hpp>
 #include <azure/core/base64.hpp>
 #include <azure/core/cryptography/hash.hpp>
 #include <azure/core/internal/cryptography/sha_hash.hpp>
 #include <azure/identity.hpp>
+
 #include <cassert>
 #include <chrono>
 #include <iomanip>
diff --git a/sdk/attestation/azure-security-attestation/src/attestation_administration_client.cpp b/sdk/attestation/azure-security-attestation/src/attestation_administration_client.cpp
index 30fb8dbf9e..488f20b615 100644
--- a/sdk/attestation/azure-security-attestation/src/attestation_administration_client.cpp
+++ b/sdk/attestation/azure-security-attestation/src/attestation_administration_client.cpp
@@ -2,18 +2,20 @@
 // SPDX-License-Identifier: MIT
 
 #include "azure/attestation/attestation_administration_client.hpp"
+
 #include "azure/attestation/attestation_client.hpp"
 #include "private/attestation_client_models_private.hpp"
 #include "private/attestation_client_private.hpp"
 #include "private/attestation_common_request.hpp"
 #include "private/attestation_deserializers_private.hpp"
 #include "private/package_version.hpp"
+
 #include <azure/core/base64.hpp>
 #include <azure/core/http/policies/policy.hpp>
 #include <azure/core/internal/diagnostics/log.hpp>
 #include <azure/core/internal/http/pipeline.hpp>
-#include <shared_mutex>
 
+#include <shared_mutex>
 #include <string>
 
 // cspell: words jwks
diff --git a/sdk/attestation/azure-security-attestation/src/attestation_client.cpp b/sdk/attestation/azure-security-attestation/src/attestation_client.cpp
index 667f4bb916..9f616ebf23 100644
--- a/sdk/attestation/azure-security-attestation/src/attestation_client.cpp
+++ b/sdk/attestation/azure-security-attestation/src/attestation_client.cpp
@@ -2,19 +2,21 @@
 // SPDX-License-Identifier: MIT
 
 #include "azure/attestation/attestation_client.hpp"
+
 #include "azure/attestation/attestation_administration_client.hpp"
 #include "private/attestation_client_models_private.hpp"
 #include "private/attestation_client_private.hpp"
 #include "private/attestation_common_request.hpp"
 #include "private/attestation_deserializers_private.hpp"
 #include "private/package_version.hpp"
+
 #include <azure/core/base64.hpp>
 #include <azure/core/credentials/credentials.hpp>
 #include <azure/core/http/policies/policy.hpp>
 #include <azure/core/internal/diagnostics/log.hpp>
 #include <azure/core/internal/http/pipeline.hpp>
-#include <shared_mutex>
 
+#include <shared_mutex>
 #include <string>
 
 using namespace Azure::Security::Attestation;
diff --git a/sdk/attestation/azure-security-attestation/src/private/attestation_client_models_private.hpp b/sdk/attestation/azure-security-attestation/src/private/attestation_client_models_private.hpp
index ac81128938..585f1f993e 100644
--- a/sdk/attestation/azure-security-attestation/src/private/attestation_client_models_private.hpp
+++ b/sdk/attestation/azure-security-attestation/src/private/attestation_client_models_private.hpp
@@ -12,7 +12,9 @@
 
 #include "azure/attestation/attestation_client_models.hpp"
 #include "azure/attestation/attestation_client_options.hpp"
+
 #include <azure/core/nullable.hpp>
+
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/sdk/attestation/azure-security-attestation/src/private/attestation_client_private.cpp b/sdk/attestation/azure-security-attestation/src/private/attestation_client_private.cpp
index c3237bde0a..11d81c6073 100644
--- a/sdk/attestation/azure-security-attestation/src/private/attestation_client_private.cpp
+++ b/sdk/attestation/azure-security-attestation/src/private/attestation_client_private.cpp
@@ -9,7 +9,9 @@
  */
 #include "attestation_client_models_private.hpp"
 #include "crypto/inc/crypto.hpp"
+
 #include <azure/core/internal/json/json.hpp>
+
 #include <chrono>
 #include <memory>
 #include <sstream>
diff --git a/sdk/attestation/azure-security-attestation/src/private/attestation_client_private.hpp b/sdk/attestation/azure-security-attestation/src/private/attestation_client_private.hpp
index bfc68430b3..ba71f4ddd0 100644
--- a/sdk/attestation/azure-security-attestation/src/private/attestation_client_private.hpp
+++ b/sdk/attestation/azure-security-attestation/src/private/attestation_client_private.hpp
@@ -16,10 +16,12 @@
 #include "azure/attestation/attestation_client_options.hpp"
 #include "crypto/inc/crypto.hpp"
 #include "jsonhelpers_private.hpp"
+
 #include <azure/core/base64.hpp>
 #include <azure/core/diagnostics/logger.hpp>
 #include <azure/core/internal/json/json.hpp>
 #include <azure/core/internal/json/json_optional.hpp>
+
 #include <chrono>
 #include <memory>
 #include <sstream>
diff --git a/sdk/attestation/azure-security-attestation/src/private/attestation_common_request.cpp b/sdk/attestation/azure-security-attestation/src/private/attestation_common_request.cpp
index f8893a6300..060d4ef5e3 100644
--- a/sdk/attestation/azure-security-attestation/src/private/attestation_common_request.cpp
+++ b/sdk/attestation/azure-security-attestation/src/private/attestation_common_request.cpp
@@ -2,8 +2,10 @@
 // SPDX-License-Identifier: MIT
 
 #include "attestation_common_request.hpp"
+
 #include <azure/core/exception.hpp>
 #include <azure/core/http/http.hpp>
+
 #include <memory>
 
 using namespace Azure::Security::Attestation;
diff --git a/sdk/attestation/azure-security-attestation/src/private/attestation_common_request.hpp b/sdk/attestation/azure-security-attestation/src/private/attestation_common_request.hpp
index 57722311b6..53ef9d8138 100644
--- a/sdk/attestation/azure-security-attestation/src/private/attestation_common_request.hpp
+++ b/sdk/attestation/azure-security-attestation/src/private/attestation_common_request.hpp
@@ -11,6 +11,7 @@
 
 #include <azure/core/http/http.hpp>
 #include <azure/core/internal/http/pipeline.hpp>
+
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/sdk/attestation/azure-security-attestation/src/private/attestation_deserializers_private.cpp b/sdk/attestation/azure-security-attestation/src/private/attestation_deserializers_private.cpp
index 684cec9432..366856f0cc 100644
--- a/sdk/attestation/azure-security-attestation/src/private/attestation_deserializers_private.cpp
+++ b/sdk/attestation/azure-security-attestation/src/private/attestation_deserializers_private.cpp
@@ -12,10 +12,12 @@
  */
 
 #include "attestation_deserializers_private.hpp"
+
 #include "attestation_client_models_private.hpp"
 #include "attestation_client_private.hpp"
 #include "azure/attestation/attestation_client_models.hpp"
 #include "jsonhelpers_private.hpp"
+
 #include <azure/core/base64.hpp>
 #include <azure/core/context.hpp>
 #include <azure/core/http/http.hpp>
@@ -25,6 +27,7 @@
 #include <azure/core/internal/json/json_serializable.hpp>
 #include <azure/core/nullable.hpp>
 #include <azure/core/response.hpp>
+
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/sdk/attestation/azure-security-attestation/src/private/attestation_deserializers_private.hpp b/sdk/attestation/azure-security-attestation/src/private/attestation_deserializers_private.hpp
index 9b72f35fac..4526bea823 100644
--- a/sdk/attestation/azure-security-attestation/src/private/attestation_deserializers_private.hpp
+++ b/sdk/attestation/azure-security-attestation/src/private/attestation_deserializers_private.hpp
@@ -16,7 +16,9 @@
 #include "attestation_client_models_private.hpp"
 #include "azure/attestation/attestation_client.hpp"
 #include "azure/attestation/attestation_client_models.hpp"
+
 #include <azure/core/internal/json/json.hpp>
+
 #include <memory>
 #include <string>
 
diff --git a/sdk/attestation/azure-security-attestation/src/private/crypto/openssl/openssl_helpers.hpp b/sdk/attestation/azure-security-attestation/src/private/crypto/openssl/openssl_helpers.hpp
index 691328ec21..cb6f956d2c 100644
--- a/sdk/attestation/azure-security-attestation/src/private/crypto/openssl/openssl_helpers.hpp
+++ b/sdk/attestation/azure-security-attestation/src/private/crypto/openssl/openssl_helpers.hpp
@@ -3,12 +3,13 @@
 #pragma once
 
 #include <memory>
-#include <openssl/bio.h>
-#include <openssl/evp.h>
 #include <stdexcept>
 #include <type_traits>
 #include <utility>
 
+#include <openssl/bio.h>
+#include <openssl/evp.h>
+
 namespace Azure { namespace Security { namespace Attestation { namespace _detail {
 
   // Helpers to provide RAII wrappers for OpenSSL types.
diff --git a/sdk/attestation/azure-security-attestation/src/private/crypto/openssl/opensslcert.cpp b/sdk/attestation/azure-security-attestation/src/private/crypto/openssl/opensslcert.cpp
index 3f16e58521..66abd5cd5b 100644
--- a/sdk/attestation/azure-security-attestation/src/private/crypto/openssl/opensslcert.cpp
+++ b/sdk/attestation/azure-security-attestation/src/private/crypto/openssl/opensslcert.cpp
@@ -9,13 +9,21 @@
  */
 
 #include "opensslcert.hpp"
+
 #include "../inc/crypto.hpp"
 #include "openssl_helpers.hpp"
 #include "opensslkeys.hpp"
+
 #include <azure/core/platform.hpp>
+
 #include <cstring>
 #include <ctime>
 #include <memory>
+#include <string>
+#include <type_traits>
+#include <utility>
+#include <vector>
+
 #include <openssl/asn1.h>
 #include <openssl/bio.h>
 #include <openssl/ecdsa.h>
@@ -24,10 +32,6 @@
 #include <openssl/pem.h>
 #include <openssl/rsa.h>
 #include <openssl/x509v3.h>
-#include <string>
-#include <type_traits>
-#include <utility>
-#include <vector>
 
 // cspell::words OpenSSL X509 OpenSSLX509
 
diff --git a/sdk/attestation/azure-security-attestation/src/private/crypto/openssl/opensslcert.hpp b/sdk/attestation/azure-security-attestation/src/private/crypto/openssl/opensslcert.hpp
index e703260042..ce7efa2e7d 100644
--- a/sdk/attestation/azure-security-attestation/src/private/crypto/openssl/opensslcert.hpp
+++ b/sdk/attestation/azure-security-attestation/src/private/crypto/openssl/opensslcert.hpp
@@ -13,18 +13,20 @@
 #include "../../jsonhelpers_private.hpp"
 #include "../inc/crypto.hpp"
 #include "openssl_helpers.hpp"
+
 #include <memory>
-#include <openssl/bio.h>
-#include <openssl/evp.h>
-#include <openssl/pem.h>
-#include <openssl/rsa.h>
-#include <openssl/x509.h>
 #include <sstream>
 #include <string>
 #include <type_traits>
 #include <utility>
 #include <vector>
 
+#include <openssl/bio.h>
+#include <openssl/evp.h>
+#include <openssl/pem.h>
+#include <openssl/rsa.h>
+#include <openssl/x509.h>
+
 // cspell::words OpenSSL X509 OpenSSLX509
 
 namespace Azure { namespace Security { namespace Attestation { namespace _detail {
diff --git a/sdk/attestation/azure-security-attestation/src/private/crypto/openssl/opensslcrypto.cpp b/sdk/attestation/azure-security-attestation/src/private/crypto/openssl/opensslcrypto.cpp
index a5b2efc353..e6aa9be0d7 100644
--- a/sdk/attestation/azure-security-attestation/src/private/crypto/openssl/opensslcrypto.cpp
+++ b/sdk/attestation/azure-security-attestation/src/private/crypto/openssl/opensslcrypto.cpp
@@ -11,7 +11,9 @@
 #include "../inc/crypto.hpp"
 #include "opensslcert.hpp"
 #include "opensslkeys.hpp"
+
 #include <azure/core/platform.hpp>
+
 #include <memory>
 #include <string>
 #include <type_traits>
diff --git a/sdk/attestation/azure-security-attestation/src/private/crypto/openssl/opensslkeys.cpp b/sdk/attestation/azure-security-attestation/src/private/crypto/openssl/opensslkeys.cpp
index 916c76a487..b01fc93d1c 100644
--- a/sdk/attestation/azure-security-attestation/src/private/crypto/openssl/opensslkeys.cpp
+++ b/sdk/attestation/azure-security-attestation/src/private/crypto/openssl/opensslkeys.cpp
@@ -9,22 +9,26 @@
  */
 
 #include "opensslkeys.hpp"
+
 #include "../inc/crypto.hpp"
 #include "openssl_helpers.hpp"
+
 #include <azure/core/azure_assert.hpp>
+
 #include <cassert>
 #include <cstring>
 #include <memory>
+#include <string>
+#include <type_traits>
+#include <utility>
+#include <vector>
+
 #include <openssl/bio.h>
 #include <openssl/ecdsa.h>
 #include <openssl/err.h>
 #include <openssl/evp.h>
 #include <openssl/pem.h>
 #include <openssl/rsa.h>
-#include <string>
-#include <type_traits>
-#include <utility>
-#include <vector>
 
 namespace Azure { namespace Security { namespace Attestation { namespace _detail {
 
diff --git a/sdk/attestation/azure-security-attestation/src/private/crypto/openssl/opensslkeys.hpp b/sdk/attestation/azure-security-attestation/src/private/crypto/openssl/opensslkeys.hpp
index 3526b3e58a..3b60ae334c 100644
--- a/sdk/attestation/azure-security-attestation/src/private/crypto/openssl/opensslkeys.hpp
+++ b/sdk/attestation/azure-security-attestation/src/private/crypto/openssl/opensslkeys.hpp
@@ -12,16 +12,18 @@
 
 #include "../inc/crypto.hpp"
 #include "openssl_helpers.hpp"
+
 #include <memory>
-#include <openssl/bio.h>
-#include <openssl/evp.h>
-#include <openssl/pem.h>
-#include <openssl/rsa.h>
 #include <string>
 #include <type_traits>
 #include <utility>
 #include <vector>
 
+#include <openssl/bio.h>
+#include <openssl/evp.h>
+#include <openssl/pem.h>
+#include <openssl/rsa.h>
+
 namespace Azure { namespace Security { namespace Attestation { namespace _detail {
 
   /** Represents an Asymmetric Key.
diff --git a/sdk/attestation/azure-security-attestation/src/private/jsonhelpers.cpp b/sdk/attestation/azure-security-attestation/src/private/jsonhelpers.cpp
index ffbb3247ce..e263e7600b 100644
--- a/sdk/attestation/azure-security-attestation/src/private/jsonhelpers.cpp
+++ b/sdk/attestation/azure-security-attestation/src/private/jsonhelpers.cpp
@@ -12,6 +12,7 @@
  */
 
 #include "jsonhelpers_private.hpp"
+
 #include <azure/core/base64.hpp>
 #include <azure/core/datetime.hpp>
 #include <azure/core/internal/json/json.hpp>
diff --git a/sdk/attestation/azure-security-attestation/src/private/jsonhelpers_private.hpp b/sdk/attestation/azure-security-attestation/src/private/jsonhelpers_private.hpp
index 9bba0704ac..20f936d188 100644
--- a/sdk/attestation/azure-security-attestation/src/private/jsonhelpers_private.hpp
+++ b/sdk/attestation/azure-security-attestation/src/private/jsonhelpers_private.hpp
@@ -14,9 +14,11 @@
 #pragma once
 
 #include "azure/attestation/attestation_client.hpp"
+
 #include <azure/core/datetime.hpp>
 #include <azure/core/internal/json/json.hpp>
 #include <azure/core/nullable.hpp>
+
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/sdk/attestation/azure-security-attestation/test/ut/attestation_collateral.cpp b/sdk/attestation/azure-security-attestation/test/ut/attestation_collateral.cpp
index a83527f805..a08e5f1512 100644
--- a/sdk/attestation/azure-security-attestation/test/ut/attestation_collateral.cpp
+++ b/sdk/attestation/azure-security-attestation/test/ut/attestation_collateral.cpp
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: MIT
 
 #include "attestation_collateral.hpp"
+
 #include <azure/core/base64.hpp>
 
 namespace Azure { namespace Security { namespace Attestation { namespace Test {
diff --git a/sdk/attestation/azure-security-attestation/test/ut/attestation_metadata.cpp b/sdk/attestation/azure-security-attestation/test/ut/attestation_metadata.cpp
index e6dad5d89f..be0c3cc528 100644
--- a/sdk/attestation/azure-security-attestation/test/ut/attestation_metadata.cpp
+++ b/sdk/attestation/azure-security-attestation/test/ut/attestation_metadata.cpp
@@ -3,12 +3,15 @@
 
 #include "attestation_collateral.hpp"
 #include "azure/attestation/attestation_client.hpp"
+
 #include <azure/core/internal/json/json.hpp>
 #include <azure/core/test/test_base.hpp>
 #include <azure/identity/client_secret_credential.hpp>
-#include <gtest/gtest.h>
+
 #include <tuple>
 
+#include <gtest/gtest.h>
+
 using namespace Azure::Security::Attestation;
 using namespace Azure::Security::Attestation::Models;
 using namespace Azure::Core;
diff --git a/sdk/attestation/azure-security-attestation/test/ut/attestation_test.cpp b/sdk/attestation/azure-security-attestation/test/ut/attestation_test.cpp
index 1a4ff40f4f..3e74a40409 100644
--- a/sdk/attestation/azure-security-attestation/test/ut/attestation_test.cpp
+++ b/sdk/attestation/azure-security-attestation/test/ut/attestation_test.cpp
@@ -4,12 +4,15 @@
 #include "../src/private/crypto/inc/crypto.hpp"
 #include "attestation_collateral.hpp"
 #include "azure/attestation/attestation_client.hpp"
+
 #include <azure/core/internal/json/json.hpp>
 #include <azure/core/test/test_base.hpp>
 #include <azure/identity/client_secret_credential.hpp>
-#include <gtest/gtest.h>
+
 #include <tuple>
 
+#include <gtest/gtest.h>
+
 using namespace Azure::Security::Attestation;
 using namespace Azure::Security::Attestation::Models;
 using namespace Azure::Core;
diff --git a/sdk/attestation/azure-security-attestation/test/ut/crypto_test.cpp b/sdk/attestation/azure-security-attestation/test/ut/crypto_test.cpp
index a988b22613..ba6912b2a1 100644
--- a/sdk/attestation/azure-security-attestation/test/ut/crypto_test.cpp
+++ b/sdk/attestation/azure-security-attestation/test/ut/crypto_test.cpp
@@ -3,10 +3,13 @@
 
 #include "../../src/private/crypto/inc/crypto.hpp"
 #include "crypto_test_collateral.hpp"
+
 #include <azure/core/test/test_base.hpp>
-#include <gtest/gtest.h>
+
 #include <random>
 
+#include <gtest/gtest.h>
+
 namespace Azure { namespace Security { namespace Attestation { namespace Test {
   using namespace Azure::Security::Attestation::_detail;
   using namespace Azure::Core::Diagnostics::_internal;
diff --git a/sdk/attestation/azure-security-attestation/test/ut/policycertmgmt_test.cpp b/sdk/attestation/azure-security-attestation/test/ut/policycertmgmt_test.cpp
index 27c3ce57b4..51f8842f58 100644
--- a/sdk/attestation/azure-security-attestation/test/ut/policycertmgmt_test.cpp
+++ b/sdk/attestation/azure-security-attestation/test/ut/policycertmgmt_test.cpp
@@ -5,14 +5,17 @@
 #include "attestation_collateral.hpp"
 #include "azure/attestation/attestation_administration_client.hpp"
 #include "azure/identity/client_secret_credential.hpp"
+
 #include <azure/attestation/attestation_client_models.hpp>
 #include <azure/core/internal/cryptography/sha_hash.hpp>
 #include <azure/core/test/test_base.hpp>
+
 #include <cstdlib>
-#include <gtest/gtest.h>
 #include <string>
 #include <tuple>
 
+#include <gtest/gtest.h>
+
 using namespace Azure::Security::Attestation;
 using namespace Azure::Security::Attestation::Models;
 using namespace Azure::Security::Attestation::_detail;
diff --git a/sdk/attestation/azure-security-attestation/test/ut/policygetset_test.cpp b/sdk/attestation/azure-security-attestation/test/ut/policygetset_test.cpp
index cf266ffa09..a7b65973a7 100644
--- a/sdk/attestation/azure-security-attestation/test/ut/policygetset_test.cpp
+++ b/sdk/attestation/azure-security-attestation/test/ut/policygetset_test.cpp
@@ -5,14 +5,17 @@
 #include "attestation_collateral.hpp"
 #include "azure/attestation/attestation_administration_client.hpp"
 #include "azure/identity/client_secret_credential.hpp"
+
 #include <azure/attestation/attestation_client_models.hpp>
 #include <azure/core/internal/cryptography/sha_hash.hpp>
 #include <azure/core/test/test_base.hpp>
+
 #include <cstdlib>
-#include <gtest/gtest.h>
 #include <string>
 #include <tuple>
 
+#include <gtest/gtest.h>
+
 using namespace Azure::Security::Attestation;
 using namespace Azure::Security::Attestation::Models;
 using namespace Azure::Security::Attestation::_detail;
diff --git a/sdk/attestation/azure-security-attestation/test/ut/token_test.cpp b/sdk/attestation/azure-security-attestation/test/ut/token_test.cpp
index 7725792062..0e128a7ba8 100644
--- a/sdk/attestation/azure-security-attestation/test/ut/token_test.cpp
+++ b/sdk/attestation/azure-security-attestation/test/ut/token_test.cpp
@@ -6,10 +6,12 @@
 #include "../../src/private/attestation_deserializers_private.hpp"
 #include "../../src/private/crypto/inc/crypto.hpp"
 #include "azure/attestation/attestation_client.hpp"
+
 #include <azure/core/datetime.hpp>
 #include <azure/core/internal/json/json.hpp>
 #include <azure/core/internal/json/json_optional.hpp>
 #include <azure/core/test/test_base.hpp>
+
 #include <gtest/gtest.h>
 
 // cspell:words jwk jwks
diff --git a/sdk/attestation/azure-security-attestation/test/ut/tpmattestation_test.cpp b/sdk/attestation/azure-security-attestation/test/ut/tpmattestation_test.cpp
index d8ba1c091c..4a15b4076e 100644
--- a/sdk/attestation/azure-security-attestation/test/ut/tpmattestation_test.cpp
+++ b/sdk/attestation/azure-security-attestation/test/ut/tpmattestation_test.cpp
@@ -4,12 +4,15 @@
 #include "attestation_collateral.hpp"
 #include "azure/attestation/attestation_administration_client.hpp"
 #include "azure/attestation/attestation_client.hpp"
+
 #include <azure/core/internal/json/json.hpp>
 #include <azure/core/test/test_base.hpp>
 #include <azure/identity/client_secret_credential.hpp>
-#include <gtest/gtest.h>
+
 #include <tuple>
 
+#include <gtest/gtest.h>
+
 using namespace Azure::Security::Attestation;
 using namespace Azure::Security::Attestation::Models;
 using namespace Azure::Core;
diff --git a/sdk/core/azure-core-amqp/inc/azure/core/amqp/claims_based_security.hpp b/sdk/core/azure-core-amqp/inc/azure/core/amqp/claims_based_security.hpp
index 8451cb52d3..c8b595025b 100644
--- a/sdk/core/azure-core-amqp/inc/azure/core/amqp/claims_based_security.hpp
+++ b/sdk/core/azure-core-amqp/inc/azure/core/amqp/claims_based_security.hpp
@@ -4,6 +4,7 @@
 #pragma once
 
 #include "azure/core/amqp/session.hpp"
+
 #include <azure/core/context.hpp>
 
 namespace Azure { namespace Core { namespace Amqp { namespace _detail {
diff --git a/sdk/core/azure-core-amqp/inc/azure/core/amqp/common/async_operation_queue.hpp b/sdk/core/azure-core-amqp/inc/azure/core/amqp/common/async_operation_queue.hpp
index 399872910e..421006d3aa 100644
--- a/sdk/core/azure-core-amqp/inc/azure/core/amqp/common/async_operation_queue.hpp
+++ b/sdk/core/azure-core-amqp/inc/azure/core/amqp/common/async_operation_queue.hpp
@@ -4,6 +4,7 @@
 #pragma once
 
 #include <azure/core/context.hpp>
+
 #include <condition_variable>
 #include <list>
 #include <mutex>
diff --git a/sdk/core/azure-core-amqp/inc/azure/core/amqp/connection.hpp b/sdk/core/azure-core-amqp/inc/azure/core/amqp/connection.hpp
index 4e73b519d2..785634a69b 100644
--- a/sdk/core/azure-core-amqp/inc/azure/core/amqp/connection.hpp
+++ b/sdk/core/azure-core-amqp/inc/azure/core/amqp/connection.hpp
@@ -8,7 +8,9 @@
 #include "connection_string_credential.hpp"
 #include "models/amqp_value.hpp"
 #include "session.hpp"
+
 #include <azure/core/credentials/credentials.hpp>
+
 #include <chrono>
 #include <limits>
 #include <memory>
diff --git a/sdk/core/azure-core-amqp/inc/azure/core/amqp/connection_string_credential.hpp b/sdk/core/azure-core-amqp/inc/azure/core/amqp/connection_string_credential.hpp
index 8c19cd7d85..f83c602ba8 100644
--- a/sdk/core/azure-core-amqp/inc/azure/core/amqp/connection_string_credential.hpp
+++ b/sdk/core/azure-core-amqp/inc/azure/core/amqp/connection_string_credential.hpp
@@ -4,7 +4,9 @@
 #pragma once
 
 #include "network/sasl_transport.hpp"
+
 #include <azure/core/credentials/credentials.hpp>
+
 #include <chrono>
 #include <memory>
 #include <stdexcept>
diff --git a/sdk/core/azure-core-amqp/inc/azure/core/amqp/management.hpp b/sdk/core/azure-core-amqp/inc/azure/core/amqp/management.hpp
index f79620c75a..c22a77a862 100644
--- a/sdk/core/azure-core-amqp/inc/azure/core/amqp/management.hpp
+++ b/sdk/core/azure-core-amqp/inc/azure/core/amqp/management.hpp
@@ -5,7 +5,9 @@
 
 #include "models/amqp_message.hpp"
 #include "session.hpp"
+
 #include <azure/core/context.hpp>
+
 #include <string>
 #include <tuple>
 #include <vector>
diff --git a/sdk/core/azure-core-amqp/inc/azure/core/amqp/message_receiver.hpp b/sdk/core/azure-core-amqp/inc/azure/core/amqp/message_receiver.hpp
index f0565c3917..31d3139a03 100644
--- a/sdk/core/azure-core-amqp/inc/azure/core/amqp/message_receiver.hpp
+++ b/sdk/core/azure-core-amqp/inc/azure/core/amqp/message_receiver.hpp
@@ -10,8 +10,10 @@
 #include "models/amqp_message.hpp"
 #include "models/amqp_value.hpp"
 #include "session.hpp"
+
 #include <azure/core/credentials/credentials.hpp>
 #include <azure/core/nullable.hpp>
+
 #include <vector>
 
 namespace Azure { namespace Core { namespace Amqp { namespace _detail {
diff --git a/sdk/core/azure-core-amqp/inc/azure/core/amqp/message_sender.hpp b/sdk/core/azure-core-amqp/inc/azure/core/amqp/message_sender.hpp
index cb0845df26..18afb81a85 100644
--- a/sdk/core/azure-core-amqp/inc/azure/core/amqp/message_sender.hpp
+++ b/sdk/core/azure-core-amqp/inc/azure/core/amqp/message_sender.hpp
@@ -10,7 +10,9 @@
 #include "link.hpp"
 #include "models/amqp_message.hpp"
 #include "models/amqp_value.hpp"
+
 #include <azure/core/nullable.hpp>
+
 #include <tuple>
 
 namespace Azure { namespace Core { namespace Amqp { namespace _detail {
diff --git a/sdk/core/azure-core-amqp/inc/azure/core/amqp/models/amqp_header.hpp b/sdk/core/azure-core-amqp/inc/azure/core/amqp/models/amqp_header.hpp
index 6bdb5b18df..a3d5b27e7a 100644
--- a/sdk/core/azure-core-amqp/inc/azure/core/amqp/models/amqp_header.hpp
+++ b/sdk/core/azure-core-amqp/inc/azure/core/amqp/models/amqp_header.hpp
@@ -5,6 +5,7 @@
 
 #include <azure/core/internal/unique_handle.hpp>
 #include <azure/core/nullable.hpp>
+
 #include <chrono>
 #include <cstddef>
 #include <cstdint>
diff --git a/sdk/core/azure-core-amqp/inc/azure/core/amqp/models/amqp_message.hpp b/sdk/core/azure-core-amqp/inc/azure/core/amqp/models/amqp_message.hpp
index 1671104c7e..8d4670fe85 100644
--- a/sdk/core/azure-core-amqp/inc/azure/core/amqp/models/amqp_message.hpp
+++ b/sdk/core/azure-core-amqp/inc/azure/core/amqp/models/amqp_message.hpp
@@ -6,8 +6,10 @@
 #include "amqp_header.hpp"
 #include "amqp_properties.hpp"
 #include "amqp_value.hpp"
+
 #include <azure/core/internal/unique_handle.hpp>
 #include <azure/core/nullable.hpp>
+
 #include <map>
 #include <vector>
 
diff --git a/sdk/core/azure-core-amqp/inc/azure/core/amqp/models/amqp_properties.hpp b/sdk/core/azure-core-amqp/inc/azure/core/amqp/models/amqp_properties.hpp
index 7de4bf8925..d1d7d7a136 100644
--- a/sdk/core/azure-core-amqp/inc/azure/core/amqp/models/amqp_properties.hpp
+++ b/sdk/core/azure-core-amqp/inc/azure/core/amqp/models/amqp_properties.hpp
@@ -4,8 +4,10 @@
 #pragma once
 
 #include "amqp_value.hpp"
+
 #include <azure/core/internal/unique_handle.hpp>
 #include <azure/core/nullable.hpp>
+
 #include <chrono>
 #include <vector>
 
diff --git a/sdk/core/azure-core-amqp/inc/azure/core/amqp/models/amqp_protocol.hpp b/sdk/core/azure-core-amqp/inc/azure/core/amqp/models/amqp_protocol.hpp
index 15f3b622ff..3943001b68 100644
--- a/sdk/core/azure-core-amqp/inc/azure/core/amqp/models/amqp_protocol.hpp
+++ b/sdk/core/azure-core-amqp/inc/azure/core/amqp/models/amqp_protocol.hpp
@@ -7,6 +7,7 @@
 #pragma once
 
 #include <azure/core/internal/unique_handle.hpp>
+
 #include <cstdint>
 
 struct AMQPVALUE_DECODER_HANDLE_DATA_TAG;
diff --git a/sdk/core/azure-core-amqp/inc/azure/core/amqp/models/amqp_value.hpp b/sdk/core/azure-core-amqp/inc/azure/core/amqp/models/amqp_value.hpp
index 8176d24efc..2842928f85 100644
--- a/sdk/core/azure-core-amqp/inc/azure/core/amqp/models/amqp_value.hpp
+++ b/sdk/core/azure-core-amqp/inc/azure/core/amqp/models/amqp_value.hpp
@@ -5,9 +5,10 @@
 
 #include "amqp_header.hpp"
 
-#include <array>
 #include <azure/core/internal/unique_handle.hpp>
 #include <azure/core/uuid.hpp>
+
+#include <array>
 #include <chrono>
 #include <cstddef>
 #include <cstdint>
diff --git a/sdk/core/azure-core-amqp/inc/azure/core/amqp/network/amqp_header_detect_transport.hpp b/sdk/core/azure-core-amqp/inc/azure/core/amqp/network/amqp_header_detect_transport.hpp
index 2eb60a117c..d3971e0233 100644
--- a/sdk/core/azure-core-amqp/inc/azure/core/amqp/network/amqp_header_detect_transport.hpp
+++ b/sdk/core/azure-core-amqp/inc/azure/core/amqp/network/amqp_header_detect_transport.hpp
@@ -4,6 +4,7 @@
 #pragma once
 
 #include "transport.hpp"
+
 #include <exception>
 
 namespace Azure { namespace Core { namespace Amqp { namespace Network { namespace _internal {
diff --git a/sdk/core/azure-core-amqp/inc/azure/core/amqp/network/sasl_transport.hpp b/sdk/core/azure-core-amqp/inc/azure/core/amqp/network/sasl_transport.hpp
index e9a5332c43..3d089e63ef 100644
--- a/sdk/core/azure-core-amqp/inc/azure/core/amqp/network/sasl_transport.hpp
+++ b/sdk/core/azure-core-amqp/inc/azure/core/amqp/network/sasl_transport.hpp
@@ -4,6 +4,7 @@
 #pragma once
 
 #include "transport.hpp"
+
 #include <string>
 
 namespace Azure { namespace Core { namespace Amqp { namespace Network { namespace _internal {
diff --git a/sdk/core/azure-core-amqp/inc/azure/core/amqp/network/socket_listener.hpp b/sdk/core/azure-core-amqp/inc/azure/core/amqp/network/socket_listener.hpp
index 435be64688..6fe5860d49 100644
--- a/sdk/core/azure-core-amqp/inc/azure/core/amqp/network/socket_listener.hpp
+++ b/sdk/core/azure-core-amqp/inc/azure/core/amqp/network/socket_listener.hpp
@@ -4,6 +4,7 @@
 #pragma once
 
 #include "transport.hpp"
+
 #include <atomic>
 #include <functional>
 #include <memory>
diff --git a/sdk/core/azure-core-amqp/inc/azure/core/amqp/network/socket_transport.hpp b/sdk/core/azure-core-amqp/inc/azure/core/amqp/network/socket_transport.hpp
index fe1f53b54e..61ff9da59c 100644
--- a/sdk/core/azure-core-amqp/inc/azure/core/amqp/network/socket_transport.hpp
+++ b/sdk/core/azure-core-amqp/inc/azure/core/amqp/network/socket_transport.hpp
@@ -4,7 +4,9 @@
 #pragma once
 
 #include "transport.hpp"
+
 #include <azure/core/platform.hpp>
+
 #include <exception>
 
 namespace Azure { namespace Core { namespace Amqp { namespace Network { namespace _internal {
diff --git a/sdk/core/azure-core-amqp/inc/azure/core/amqp/network/tls_transport.hpp b/sdk/core/azure-core-amqp/inc/azure/core/amqp/network/tls_transport.hpp
index 4fbcd8a13a..5ee93bbe8d 100644
--- a/sdk/core/azure-core-amqp/inc/azure/core/amqp/network/tls_transport.hpp
+++ b/sdk/core/azure-core-amqp/inc/azure/core/amqp/network/tls_transport.hpp
@@ -4,6 +4,7 @@
 #pragma once
 
 #include "transport.hpp"
+
 #include <string>
 
 namespace Azure { namespace Core { namespace Amqp { namespace Network { namespace _internal {
diff --git a/sdk/core/azure-core-amqp/inc/azure/core/amqp/network/transport.hpp b/sdk/core/azure-core-amqp/inc/azure/core/amqp/network/transport.hpp
index 2b344866f8..6c7ed51680 100644
--- a/sdk/core/azure-core-amqp/inc/azure/core/amqp/network/transport.hpp
+++ b/sdk/core/azure-core-amqp/inc/azure/core/amqp/network/transport.hpp
@@ -6,6 +6,7 @@
 
 #pragma once
 #include <azure/core/context.hpp>
+
 #include <exception>
 #include <functional>
 #include <memory>
diff --git a/sdk/core/azure-core-amqp/samples/internal/eventhub_async_writer_sample/eventhub_async_writer_sample.cpp b/sdk/core/azure-core-amqp/samples/internal/eventhub_async_writer_sample/eventhub_async_writer_sample.cpp
index 0fa33fd831..ea6ee56c63 100644
--- a/sdk/core/azure-core-amqp/samples/internal/eventhub_async_writer_sample/eventhub_async_writer_sample.cpp
+++ b/sdk/core/azure-core-amqp/samples/internal/eventhub_async_writer_sample/eventhub_async_writer_sample.cpp
@@ -6,6 +6,7 @@
 
 #include <azure/core/amqp/connection.hpp>
 #include <azure/core/amqp/message_sender.hpp>
+
 #include <chrono>
 #include <iostream>
 #include <limits>
diff --git a/sdk/core/azure-core-amqp/samples/internal/eventhub_get_properties_sample/eventhub_get_eventhub_properties_sample.cpp b/sdk/core/azure-core-amqp/samples/internal/eventhub_get_properties_sample/eventhub_get_eventhub_properties_sample.cpp
index a5c201af08..dbecd6cd72 100644
--- a/sdk/core/azure-core-amqp/samples/internal/eventhub_get_properties_sample/eventhub_get_eventhub_properties_sample.cpp
+++ b/sdk/core/azure-core-amqp/samples/internal/eventhub_get_properties_sample/eventhub_get_eventhub_properties_sample.cpp
@@ -9,6 +9,7 @@
 #include <azure/core/amqp/management.hpp>
 #include <azure/core/amqp/message_sender.hpp>
 #include <azure/identity/client_secret_credential.hpp>
+
 #include <chrono>
 #include <iostream>
 #include <limits>
diff --git a/sdk/core/azure-core-amqp/samples/internal/eventhub_reader_sample/eventhub_reader_sample.cpp b/sdk/core/azure-core-amqp/samples/internal/eventhub_reader_sample/eventhub_reader_sample.cpp
index eaffb74f5f..cf52fed4d0 100644
--- a/sdk/core/azure-core-amqp/samples/internal/eventhub_reader_sample/eventhub_reader_sample.cpp
+++ b/sdk/core/azure-core-amqp/samples/internal/eventhub_reader_sample/eventhub_reader_sample.cpp
@@ -3,6 +3,7 @@
 
 #include <azure/core/amqp/connection.hpp>
 #include <azure/core/amqp/message_receiver.hpp>
+
 #include <chrono>
 #include <iostream>
 #include <limits>
diff --git a/sdk/core/azure-core-amqp/samples/internal/eventhub_sas_reader_sample/eventhub_sas_reader_sample.cpp b/sdk/core/azure-core-amqp/samples/internal/eventhub_sas_reader_sample/eventhub_sas_reader_sample.cpp
index 41da4ad7a1..346b2e09b7 100644
--- a/sdk/core/azure-core-amqp/samples/internal/eventhub_sas_reader_sample/eventhub_sas_reader_sample.cpp
+++ b/sdk/core/azure-core-amqp/samples/internal/eventhub_sas_reader_sample/eventhub_sas_reader_sample.cpp
@@ -7,6 +7,7 @@
 #include <azure/core/amqp/connection.hpp>
 #include <azure/core/amqp/message_receiver.hpp>
 #include <azure/core/amqp/network/sasl_transport.hpp>
+
 #include <chrono>
 #include <iostream>
 #include <limits>
diff --git a/sdk/core/azure-core-amqp/samples/internal/eventhub_sas_writer_sample/eventhub_sas_writer_sample.cpp b/sdk/core/azure-core-amqp/samples/internal/eventhub_sas_writer_sample/eventhub_sas_writer_sample.cpp
index 2af34caff3..41ed5d545b 100644
--- a/sdk/core/azure-core-amqp/samples/internal/eventhub_sas_writer_sample/eventhub_sas_writer_sample.cpp
+++ b/sdk/core/azure-core-amqp/samples/internal/eventhub_sas_writer_sample/eventhub_sas_writer_sample.cpp
@@ -7,6 +7,7 @@
 #include <azure/core/amqp/connection.hpp>
 #include <azure/core/amqp/connection_string_credential.hpp>
 #include <azure/core/amqp/message_sender.hpp>
+
 #include <chrono>
 #include <iostream>
 #include <limits>
diff --git a/sdk/core/azure-core-amqp/samples/internal/eventhub_token_reader_sample/eventhub_token_reader_sample.cpp b/sdk/core/azure-core-amqp/samples/internal/eventhub_token_reader_sample/eventhub_token_reader_sample.cpp
index 4bcae31648..d4f6fb7449 100644
--- a/sdk/core/azure-core-amqp/samples/internal/eventhub_token_reader_sample/eventhub_token_reader_sample.cpp
+++ b/sdk/core/azure-core-amqp/samples/internal/eventhub_token_reader_sample/eventhub_token_reader_sample.cpp
@@ -7,6 +7,7 @@
 #include <azure/core/amqp/connection.hpp>
 #include <azure/core/amqp/message_receiver.hpp>
 #include <azure/core/amqp/network/sasl_transport.hpp>
+
 #include <chrono>
 #include <iostream>
 #include <limits>
diff --git a/sdk/core/azure-core-amqp/samples/internal/eventhub_token_writer_sample/eventhub_token_writer_sample.cpp b/sdk/core/azure-core-amqp/samples/internal/eventhub_token_writer_sample/eventhub_token_writer_sample.cpp
index a5430c2041..2cb50a67ce 100644
--- a/sdk/core/azure-core-amqp/samples/internal/eventhub_token_writer_sample/eventhub_token_writer_sample.cpp
+++ b/sdk/core/azure-core-amqp/samples/internal/eventhub_token_writer_sample/eventhub_token_writer_sample.cpp
@@ -9,6 +9,7 @@
 #include <azure/core/amqp/message_sender.hpp>
 #include <azure/core/credentials/credentials.hpp>
 #include <azure/identity/client_secret_credential.hpp>
+
 #include <chrono>
 #include <iostream>
 #include <limits>
diff --git a/sdk/core/azure-core-amqp/samples/internal/eventhub_writer_sample/eventhub_writer_sample.cpp b/sdk/core/azure-core-amqp/samples/internal/eventhub_writer_sample/eventhub_writer_sample.cpp
index 808d30a20b..830fed2f59 100644
--- a/sdk/core/azure-core-amqp/samples/internal/eventhub_writer_sample/eventhub_writer_sample.cpp
+++ b/sdk/core/azure-core-amqp/samples/internal/eventhub_writer_sample/eventhub_writer_sample.cpp
@@ -4,6 +4,7 @@
 #include <azure/core/amqp/connection.hpp>
 #include <azure/core/amqp/connection_string_credential.hpp>
 #include <azure/core/amqp/message_sender.hpp>
+
 #include <chrono>
 #include <iostream>
 #include <limits>
diff --git a/sdk/core/azure-core-amqp/samples/internal/local_client_async_sample/local_client_async_sample.cpp b/sdk/core/azure-core-amqp/samples/internal/local_client_async_sample/local_client_async_sample.cpp
index b797c5de87..374fc60613 100644
--- a/sdk/core/azure-core-amqp/samples/internal/local_client_async_sample/local_client_async_sample.cpp
+++ b/sdk/core/azure-core-amqp/samples/internal/local_client_async_sample/local_client_async_sample.cpp
@@ -4,6 +4,7 @@
 #include <azure/core/amqp/connection.hpp>
 #include <azure/core/amqp/message_sender.hpp>
 #include <azure/core/amqp/models/messaging_values.hpp>
+
 #include <chrono>
 #include <iostream>
 #include <limits>
diff --git a/sdk/core/azure-core-amqp/samples/internal/local_client_sample/local_client_sample.cpp b/sdk/core/azure-core-amqp/samples/internal/local_client_sample/local_client_sample.cpp
index 6a60e5e1f2..a48ec9fbe3 100644
--- a/sdk/core/azure-core-amqp/samples/internal/local_client_sample/local_client_sample.cpp
+++ b/sdk/core/azure-core-amqp/samples/internal/local_client_sample/local_client_sample.cpp
@@ -3,6 +3,7 @@
 
 #include <azure/core/amqp/connection.hpp>
 #include <azure/core/amqp/message_sender.hpp>
+
 #include <chrono>
 #include <iostream>
 #include <limits>
diff --git a/sdk/core/azure-core-amqp/samples/internal/local_server_sample/local_server_sample.cpp b/sdk/core/azure-core-amqp/samples/internal/local_server_sample/local_server_sample.cpp
index 26a6d9da44..32e90dc2da 100644
--- a/sdk/core/azure-core-amqp/samples/internal/local_server_sample/local_server_sample.cpp
+++ b/sdk/core/azure-core-amqp/samples/internal/local_server_sample/local_server_sample.cpp
@@ -9,6 +9,7 @@
 #include <azure/core/amqp/models/messaging_values.hpp>
 #include <azure/core/amqp/network/amqp_header_detect_transport.hpp>
 #include <azure/core/amqp/network/socket_listener.hpp>
+
 #include <iostream>
 #include <string>
 
diff --git a/sdk/core/azure-core-amqp/src/amqp/cancellable.cpp b/sdk/core/azure-core-amqp/src/amqp/cancellable.cpp
index 1becb809b5..b7a7861b65 100644
--- a/sdk/core/azure-core-amqp/src/amqp/cancellable.cpp
+++ b/sdk/core/azure-core-amqp/src/amqp/cancellable.cpp
@@ -2,9 +2,10 @@
 // SPDX-Licence-Identifier: MIT
 
 #include "azure/core/amqp/cancellable.hpp"
-#include <memory>
 
 #include <azure_uamqp_c/async_operation.h>
+
+#include <memory>
 #if 0
 namespace Azure { namespace Core { namespace Amqp { namespace _internal {
   Cancellable::~Cancellable()
diff --git a/sdk/core/azure-core-amqp/src/amqp/claim_based_security.cpp b/sdk/core/azure-core-amqp/src/amqp/claim_based_security.cpp
index 2e2687c207..a37d8b1b98 100644
--- a/sdk/core/azure-core-amqp/src/amqp/claim_based_security.cpp
+++ b/sdk/core/azure-core-amqp/src/amqp/claim_based_security.cpp
@@ -6,8 +6,10 @@
 #include "private/claims_based_security_impl.hpp"
 #include "private/connection_impl.hpp"
 #include "private/session_impl.hpp"
+
 #include <azure/core/diagnostics/logger.hpp>
 #include <azure/core/internal/diagnostics/log.hpp>
+
 #include <iostream>
 #include <sstream>
 
diff --git a/sdk/core/azure-core-amqp/src/amqp/connection.cpp b/sdk/core/azure-core-amqp/src/amqp/connection.cpp
index bae60492b9..cfafc6cb07 100644
--- a/sdk/core/azure-core-amqp/src/amqp/connection.cpp
+++ b/sdk/core/azure-core-amqp/src/amqp/connection.cpp
@@ -2,6 +2,7 @@
 // SPDX-Licence-Identifier: MIT
 
 #include "azure/core/amqp/connection.hpp"
+
 #include "../network/private/transport_impl.hpp"
 #include "azure/core/amqp/common/global_state.hpp"
 #include "azure/core/amqp/models/amqp_value.hpp"
@@ -9,11 +10,14 @@
 #include "azure/core/amqp/network/tls_transport.hpp"
 #include "private/claims_based_security_impl.hpp"
 #include "private/connection_impl.hpp"
+
 #include <azure/core/diagnostics/logger.hpp>
 #include <azure/core/internal/diagnostics/log.hpp>
 #include <azure/core/url.hpp>
 #include <azure/core/uuid.hpp>
+
 #include <azure_uamqp_c/connection.h>
+
 #include <memory>
 
 void Azure::Core::_internal::UniqueHandleHelper<CONNECTION_INSTANCE_TAG>::FreeAmqpConnection(
diff --git a/sdk/core/azure-core-amqp/src/amqp/connection_string_credential.cpp b/sdk/core/azure-core-amqp/src/amqp/connection_string_credential.cpp
index fbd2d992c2..c4fe4dd0bc 100644
--- a/sdk/core/azure-core-amqp/src/amqp/connection_string_credential.cpp
+++ b/sdk/core/azure-core-amqp/src/amqp/connection_string_credential.cpp
@@ -2,17 +2,21 @@
 // SPDX-Licence-Identifier: MIT
 
 #include "azure/core/amqp/connection_string_credential.hpp"
+
 #include "azure/core/amqp/connection.hpp"
 #include "azure/core/amqp/models/amqp_protocol.hpp"
 #include "azure/core/amqp/network/socket_transport.hpp"
-#include <algorithm>
+
 #include <azure/core/base64.hpp>
 #include <azure/core/url.hpp>
+
 #include <azure_c_shared_utility/azure_base64.h>
 #include <azure_c_shared_utility/buffer_.h>
 #include <azure_c_shared_utility/sastoken.h>
 #include <azure_c_shared_utility/strings.h>
 #include <azure_c_shared_utility/urlencode.h>
+
+#include <algorithm>
 #include <iostream>
 #include <iterator>
 #include <unordered_map>
diff --git a/sdk/core/azure-core-amqp/src/amqp/link.cpp b/sdk/core/azure-core-amqp/src/amqp/link.cpp
index ff1959d7b6..848d9b3bd8 100644
--- a/sdk/core/azure-core-amqp/src/amqp/link.cpp
+++ b/sdk/core/azure-core-amqp/src/amqp/link.cpp
@@ -2,6 +2,7 @@
 // SPDX-Licence-Identifier: MIT
 
 #include "azure/core/amqp/link.hpp"
+
 #include "azure/core/amqp/message_receiver.hpp"
 #include "azure/core/amqp/message_sender.hpp"
 #include "azure/core/amqp/models/message_source.hpp"
diff --git a/sdk/core/azure-core-amqp/src/amqp/management.cpp b/sdk/core/azure-core-amqp/src/amqp/management.cpp
index 6af8e4ca68..8d5cf31c5e 100644
--- a/sdk/core/azure-core-amqp/src/amqp/management.cpp
+++ b/sdk/core/azure-core-amqp/src/amqp/management.cpp
@@ -2,15 +2,19 @@
 // SPDX-Licence-Identifier: MIT
 
 #include "azure/core/amqp/management.hpp"
+
 #include "azure/core/amqp/connection.hpp"
 #include "azure/core/amqp/models/amqp_message.hpp"
 #include "azure/core/amqp/session.hpp"
 #include "private/connection_impl.hpp"
 #include "private/management_impl.hpp"
+
 #include <azure/core/diagnostics/logger.hpp>
 #include <azure/core/internal/diagnostics/log.hpp>
 #include <azure/core/internal/unique_handle.hpp>
+
 #include <azure_uamqp_c/amqp_management.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
diff --git a/sdk/core/azure-core-amqp/src/amqp/message_receiver.cpp b/sdk/core/azure-core-amqp/src/amqp/message_receiver.cpp
index 2f83a12a5e..807cec25a2 100644
--- a/sdk/core/azure-core-amqp/src/amqp/message_receiver.cpp
+++ b/sdk/core/azure-core-amqp/src/amqp/message_receiver.cpp
@@ -2,6 +2,7 @@
 // SPDX-Licence-Identifier: MIT
 
 #include "azure/core/amqp/message_receiver.hpp"
+
 #include "azure/core/amqp/connection.hpp"
 #include "azure/core/amqp/connection_string_credential.hpp"
 #include "azure/core/amqp/link.hpp"
@@ -9,10 +10,13 @@
 #include "azure/core/amqp/models/messaging_values.hpp"
 #include "azure/core/amqp/session.hpp"
 #include "private/message_receiver_impl.hpp"
+
 #include <azure/core/credentials/credentials.hpp>
 #include <azure/core/diagnostics/logger.hpp>
 #include <azure/core/internal/diagnostics/log.hpp>
+
 #include <azure_uamqp_c/message_receiver.h>
+
 #include <iostream>
 #include <memory>
 #include <sstream>
diff --git a/sdk/core/azure-core-amqp/src/amqp/message_sender.cpp b/sdk/core/azure-core-amqp/src/amqp/message_sender.cpp
index c20fc79bff..e55d1052e1 100644
--- a/sdk/core/azure-core-amqp/src/amqp/message_sender.cpp
+++ b/sdk/core/azure-core-amqp/src/amqp/message_sender.cpp
@@ -9,11 +9,13 @@
 #include "private/connection_impl.hpp"
 #include "private/message_sender_impl.hpp"
 #include "private/session_impl.hpp"
+
 #include <azure/core/credentials/credentials.hpp>
 #include <azure/core/diagnostics/logger.hpp>
 #include <azure/core/internal/diagnostics/log.hpp>
 
 #include <azure_uamqp_c/message_sender.h>
+
 #include <memory>
 
 using namespace Azure::Core::Diagnostics;
diff --git a/sdk/core/azure-core-amqp/src/amqp/private/claims_based_security_impl.hpp b/sdk/core/azure-core-amqp/src/amqp/private/claims_based_security_impl.hpp
index cc35522cfd..43eecb3a4d 100644
--- a/sdk/core/azure-core-amqp/src/amqp/private/claims_based_security_impl.hpp
+++ b/sdk/core/azure-core-amqp/src/amqp/private/claims_based_security_impl.hpp
@@ -3,6 +3,7 @@
 
 #pragma once
 #include "azure/core/amqp/claims_based_security.hpp"
+
 #include <azure_uamqp_c/cbs.h>
 
 struct CBS_INSTANCE_TAG;
diff --git a/sdk/core/azure-core-amqp/src/amqp/private/connection_impl.hpp b/sdk/core/azure-core-amqp/src/amqp/private/connection_impl.hpp
index b0ec711c27..1bae727957 100644
--- a/sdk/core/azure-core-amqp/src/amqp/private/connection_impl.hpp
+++ b/sdk/core/azure-core-amqp/src/amqp/private/connection_impl.hpp
@@ -5,8 +5,11 @@
 
 #include "azure/core/amqp/connection.hpp"
 #include "azure/core/amqp/network/transport.hpp"
+
 #include <azure/core/credentials/credentials.hpp>
+
 #include <azure_uamqp_c/connection.h>
+
 #include <chrono>
 #include <memory>
 #include <string>
diff --git a/sdk/core/azure-core-amqp/src/amqp/private/link_impl.hpp b/sdk/core/azure-core-amqp/src/amqp/private/link_impl.hpp
index 6d137c290c..40cca22ff9 100644
--- a/sdk/core/azure-core-amqp/src/amqp/private/link_impl.hpp
+++ b/sdk/core/azure-core-amqp/src/amqp/private/link_impl.hpp
@@ -6,7 +6,9 @@
 #include "azure/core/amqp/models/amqp_value.hpp"
 #include "azure/core/amqp/models/message_source.hpp"
 #include "azure/core/amqp/models/message_target.hpp"
+
 #include <azure_uamqp_c/link.h>
+
 #include <chrono>
 #include <memory>
 #include <string>
diff --git a/sdk/core/azure-core-amqp/src/amqp/private/management_impl.hpp b/sdk/core/azure-core-amqp/src/amqp/private/management_impl.hpp
index 7629e9f2ca..f39ed66e1b 100644
--- a/sdk/core/azure-core-amqp/src/amqp/private/management_impl.hpp
+++ b/sdk/core/azure-core-amqp/src/amqp/private/management_impl.hpp
@@ -11,7 +11,9 @@
 #include "session_impl.hpp"
 
 #include <azure/core/credentials/credentials.hpp>
+
 #include <azure_uamqp_c/amqp_management.h>
+
 #include <memory>
 #include <vector>
 
diff --git a/sdk/core/azure-core-amqp/src/amqp/private/message_receiver_impl.hpp b/sdk/core/azure-core-amqp/src/amqp/private/message_receiver_impl.hpp
index 460d30627a..68302f08ea 100644
--- a/sdk/core/azure-core-amqp/src/amqp/private/message_receiver_impl.hpp
+++ b/sdk/core/azure-core-amqp/src/amqp/private/message_receiver_impl.hpp
@@ -11,9 +11,11 @@
 #include "session_impl.hpp"
 
 #include <azure/core/credentials/credentials.hpp>
+
 #include <azure_uamqp_c/amqpvalue.h>
 #include <azure_uamqp_c/message.h>
 #include <azure_uamqp_c/message_receiver.h>
+
 #include <memory>
 #include <vector>
 
diff --git a/sdk/core/azure-core-amqp/src/amqp/private/message_sender_impl.hpp b/sdk/core/azure-core-amqp/src/amqp/private/message_sender_impl.hpp
index eed7dd01da..ca2c46fff4 100644
--- a/sdk/core/azure-core-amqp/src/amqp/private/message_sender_impl.hpp
+++ b/sdk/core/azure-core-amqp/src/amqp/private/message_sender_impl.hpp
@@ -6,7 +6,9 @@
 #include "azure/core/amqp/message_sender.hpp"
 #include "claims_based_security_impl.hpp"
 #include "link_impl.hpp"
+
 #include <azure_uamqp_c/message_sender.h>
+
 #include <tuple>
 
 template <> struct Azure::Core::_internal::UniqueHandleHelper<MESSAGE_SENDER_INSTANCE_TAG>
diff --git a/sdk/core/azure-core-amqp/src/amqp/private/session_impl.hpp b/sdk/core/azure-core-amqp/src/amqp/private/session_impl.hpp
index d7b3dca258..3aa91faca5 100644
--- a/sdk/core/azure-core-amqp/src/amqp/private/session_impl.hpp
+++ b/sdk/core/azure-core-amqp/src/amqp/private/session_impl.hpp
@@ -4,13 +4,14 @@
 #pragma once
 
 #include "azure/core/amqp/session.hpp"
+
+#include <azure_uamqp_c/session.h>
+
 #include <chrono>
 #include <memory>
 #include <string>
 #include <vector>
 
-#include <azure_uamqp_c/session.h>
-
 template <> struct Azure::Core::_internal::UniqueHandleHelper<SESSION_INSTANCE_TAG>
 {
   static void FreeAmqpSession(SESSION_HANDLE obj);
diff --git a/sdk/core/azure-core-amqp/src/amqp/session.cpp b/sdk/core/azure-core-amqp/src/amqp/session.cpp
index e4157b0d07..da1b70044b 100644
--- a/sdk/core/azure-core-amqp/src/amqp/session.cpp
+++ b/sdk/core/azure-core-amqp/src/amqp/session.cpp
@@ -2,6 +2,7 @@
 // SPDX-Licence-Identifier: MIT
 
 #include "azure/core/amqp/session.hpp"
+
 #include "azure/core/amqp/connection.hpp"
 #include "azure/core/amqp/link.hpp"
 #include "private/claims_based_security_impl.hpp"
@@ -10,6 +11,7 @@
 
 #include <azure/core/diagnostics/logger.hpp>
 #include <azure/core/internal/diagnostics/log.hpp>
+
 #include <azure_uamqp_c/session.h>
 
 using namespace Azure::Core::Diagnostics::_internal;
diff --git a/sdk/core/azure-core-amqp/src/common/global_state.cpp b/sdk/core/azure-core-amqp/src/common/global_state.cpp
index cfd169acfa..17596f0e11 100644
--- a/sdk/core/azure-core-amqp/src/common/global_state.cpp
+++ b/sdk/core/azure-core-amqp/src/common/global_state.cpp
@@ -4,10 +4,13 @@
 // cspell: words xlogging
 
 #include "azure/core/amqp/common/global_state.hpp"
+
 #include <azure/core/diagnostics/logger.hpp>
 #include <azure/core/internal/diagnostics/log.hpp>
+
 #include <azure_c_shared_utility/platform.h>
 #include <azure_c_shared_utility/xlogging.h>
+
 #include <cassert>
 #include <iomanip>
 #include <mutex>
diff --git a/sdk/core/azure-core-amqp/src/models/amqp_header.cpp b/sdk/core/azure-core-amqp/src/models/amqp_header.cpp
index f773e0be9b..4498e30777 100644
--- a/sdk/core/azure-core-amqp/src/models/amqp_header.cpp
+++ b/sdk/core/azure-core-amqp/src/models/amqp_header.cpp
@@ -2,11 +2,13 @@
 // SPDX-Licence-Identifier: MIT
 
 #include "azure/core/amqp/models/amqp_header.hpp"
+
 #include "azure/core/amqp/models/amqp_value.hpp"
 
 #include <azure_uamqp_c/amqp_definitions_milliseconds.h>
 
 #include <azure_uamqp_c/amqp_definitions_header.h>
+
 #include <chrono>
 #include <iostream>
 
diff --git a/sdk/core/azure-core-amqp/src/models/amqp_message.cpp b/sdk/core/azure-core-amqp/src/models/amqp_message.cpp
index 3b4941834c..0084bf3583 100644
--- a/sdk/core/azure-core-amqp/src/models/amqp_message.cpp
+++ b/sdk/core/azure-core-amqp/src/models/amqp_message.cpp
@@ -2,6 +2,7 @@
 // SPDX-Licence-Identifier: MIT
 
 #include "azure/core/amqp/models/amqp_message.hpp"
+
 #include "azure/core/amqp/models/amqp_header.hpp"
 #include "azure/core/amqp/models/amqp_protocol.hpp"
 #include "azure/core/amqp/models/amqp_value.hpp"
@@ -10,6 +11,7 @@
 #include <azure_uamqp_c/amqp_definitions_application_properties.h>
 #include <azure_uamqp_c/amqp_definitions_footer.h>
 #include <azure_uamqp_c/message.h>
+
 #include <iostream>
 #include <set>
 
diff --git a/sdk/core/azure-core-amqp/src/models/amqp_properties.cpp b/sdk/core/azure-core-amqp/src/models/amqp_properties.cpp
index f738c58016..a8fc82bea9 100644
--- a/sdk/core/azure-core-amqp/src/models/amqp_properties.cpp
+++ b/sdk/core/azure-core-amqp/src/models/amqp_properties.cpp
@@ -2,11 +2,13 @@
 // SPDX-Licence-Identifier: MIT
 
 #include "azure/core/amqp/models/amqp_properties.hpp"
+
 #include "azure/core/amqp/models/amqp_value.hpp"
 
 #include <azure_uamqp_c/amqp_definitions_sequence_no.h>
 
 #include <azure_uamqp_c/amqp_definitions_properties.h>
+
 #include <iomanip>
 #include <iostream>
 #include <sstream>
diff --git a/sdk/core/azure-core-amqp/src/models/amqp_value.cpp b/sdk/core/azure-core-amqp/src/models/amqp_value.cpp
index 2b9dd6e4b9..353395286a 100644
--- a/sdk/core/azure-core-amqp/src/models/amqp_value.cpp
+++ b/sdk/core/azure-core-amqp/src/models/amqp_value.cpp
@@ -2,6 +2,7 @@
 // SPDX-Licence-Identifier: MIT
 
 #include "azure/core/amqp/models/amqp_value.hpp"
+
 #include "azure/core/amqp/models/amqp_properties.hpp"
 #include "azure/core/amqp/models/amqp_protocol.hpp"
 
@@ -14,6 +15,7 @@
 #include <azure_uamqp_c/amqp_definitions_properties.h>
 #include <azure_uamqp_c/amqpvalue.h>
 #include <azure_uamqp_c/amqpvalue_to_string.h>
+
 #include <iomanip>
 #include <iostream>
 #include <sstream>
diff --git a/sdk/core/azure-core-amqp/src/models/message_source.cpp b/sdk/core/azure-core-amqp/src/models/message_source.cpp
index 0a8154130e..1edfcd2d9d 100644
--- a/sdk/core/azure-core-amqp/src/models/message_source.cpp
+++ b/sdk/core/azure-core-amqp/src/models/message_source.cpp
@@ -3,16 +3,17 @@
 
 #include "azure/core/amqp/models/message_source.hpp"
 
+#include <azure_uamqp_c/amqp_definitions_terminus_durability.h>
+#include <azure_uamqp_c/amqp_definitions_terminus_expiry_policy.h>
+
 #include <azure_uamqp_c/amqp_definitions_fields.h>
 #include <azure_uamqp_c/amqp_definitions_filter_set.h>
 #include <azure_uamqp_c/amqp_definitions_node_properties.h>
 #include <azure_uamqp_c/amqp_definitions_seconds.h>
-#include <azure_uamqp_c/amqp_definitions_terminus_durability.h>
-#include <azure_uamqp_c/amqp_definitions_terminus_expiry_policy.h>
+#include <azure_uamqp_c/amqp_definitions_source.h>
 #include <azure_uamqp_c/amqpvalue.h>
-#include <iostream>
 
-#include <azure_uamqp_c/amqp_definitions_source.h>
+#include <iostream>
 
 void Azure::Core::_internal::UniqueHandleHelper<SOURCE_INSTANCE_TAG>::FreeMessageSource(
     SOURCE_HANDLE value)
diff --git a/sdk/core/azure-core-amqp/src/models/message_target.cpp b/sdk/core/azure-core-amqp/src/models/message_target.cpp
index df1778475c..d4e91f8d40 100644
--- a/sdk/core/azure-core-amqp/src/models/message_target.cpp
+++ b/sdk/core/azure-core-amqp/src/models/message_target.cpp
@@ -3,16 +3,17 @@
 
 #include "azure/core/amqp/models/message_target.hpp"
 
+#include <azure_uamqp_c/amqp_definitions_terminus_durability.h>
+#include <azure_uamqp_c/amqp_definitions_terminus_expiry_policy.h>
+
 #include <azure_uamqp_c/amqp_definitions_fields.h>
 #include <azure_uamqp_c/amqp_definitions_filter_set.h>
 #include <azure_uamqp_c/amqp_definitions_node_properties.h>
 #include <azure_uamqp_c/amqp_definitions_seconds.h>
-#include <azure_uamqp_c/amqp_definitions_terminus_durability.h>
-#include <azure_uamqp_c/amqp_definitions_terminus_expiry_policy.h>
+#include <azure_uamqp_c/amqp_definitions_target.h>
 #include <azure_uamqp_c/amqpvalue.h>
-#include <iostream>
 
-#include <azure_uamqp_c/amqp_definitions_target.h>
+#include <iostream>
 
 void Azure::Core::_internal::UniqueHandleHelper<TARGET_INSTANCE_TAG>::FreeMessageTarget(
     TARGET_HANDLE value)
diff --git a/sdk/core/azure-core-amqp/src/network/amqp_header_transport.cpp b/sdk/core/azure-core-amqp/src/network/amqp_header_transport.cpp
index b747d36b2c..56dd48a369 100644
--- a/sdk/core/azure-core-amqp/src/network/amqp_header_transport.cpp
+++ b/sdk/core/azure-core-amqp/src/network/amqp_header_transport.cpp
@@ -8,6 +8,7 @@
 #include <azure_c_shared_utility/socketio.h>
 #include <azure_uamqp_c/header_detect_io.h>
 #include <azure_uamqp_c/socket_listener.h>
+
 #include <exception>
 #include <memory>
 #include <stdexcept>
diff --git a/sdk/core/azure-core-amqp/src/network/private/transport_impl.hpp b/sdk/core/azure-core-amqp/src/network/private/transport_impl.hpp
index f8cca2c787..68d9ed14e1 100644
--- a/sdk/core/azure-core-amqp/src/network/private/transport_impl.hpp
+++ b/sdk/core/azure-core-amqp/src/network/private/transport_impl.hpp
@@ -3,8 +3,11 @@
 
 #pragma once
 #include "azure/core/amqp/common/async_operation_queue.hpp"
+
 #include <azure/core/internal/unique_handle.hpp>
+
 #include <azure_c_shared_utility/xio.h>
+
 #include <exception>
 #include <functional>
 #include <stdexcept>
diff --git a/sdk/core/azure-core-amqp/src/network/sasl_transport.cpp b/sdk/core/azure-core-amqp/src/network/sasl_transport.cpp
index 339070894b..1b44e03c46 100644
--- a/sdk/core/azure-core-amqp/src/network/sasl_transport.cpp
+++ b/sdk/core/azure-core-amqp/src/network/sasl_transport.cpp
@@ -3,8 +3,10 @@
 
 // LCOV_EXCL_START
 #include "azure/core/amqp/network/sasl_transport.hpp"
+
 #include "azure/core/amqp/network/tls_transport.hpp"
 #include "private/transport_impl.hpp"
+
 #include <azure_c_shared_utility/platform.h>
 #include <azure_c_shared_utility/socketio.h>
 #include <azure_c_shared_utility/tlsio.h>
diff --git a/sdk/core/azure-core-amqp/src/network/socket_listener.cpp b/sdk/core/azure-core-amqp/src/network/socket_listener.cpp
index 15c06ad2b8..1b50fc7d5d 100644
--- a/sdk/core/azure-core-amqp/src/network/socket_listener.cpp
+++ b/sdk/core/azure-core-amqp/src/network/socket_listener.cpp
@@ -2,12 +2,15 @@
 // SPDX-Licence-Identifier: MIT
 
 #include "azure/core/amqp/network/socket_listener.hpp"
+
 #include "azure/core/amqp/common/global_state.hpp"
 #include "private/transport_impl.hpp"
+
 #include <azure_c_shared_utility/platform.h>
 #include <azure_c_shared_utility/xio.h>
 #include <azure_uamqp_c/header_detect_io.h>
 #include <azure_uamqp_c/socket_listener.h>
+
 #include <cassert>
 #include <functional>
 #include <stdexcept>
diff --git a/sdk/core/azure-core-amqp/src/network/socket_transport.cpp b/sdk/core/azure-core-amqp/src/network/socket_transport.cpp
index 4f5039526a..441f73e917 100644
--- a/sdk/core/azure-core-amqp/src/network/socket_transport.cpp
+++ b/sdk/core/azure-core-amqp/src/network/socket_transport.cpp
@@ -2,11 +2,15 @@
 // SPDX-Licence-Identifier: MIT
 
 #include "azure/core/amqp/network/socket_transport.hpp"
+
 #include "private/transport_impl.hpp"
+
 #include <azure/core/diagnostics/logger.hpp>
 #include <azure/core/internal/diagnostics/log.hpp>
+
 #include <azure_c_shared_utility/platform.h>
 #include <azure_c_shared_utility/socketio.h>
+
 #include <exception>
 #include <stdexcept>
 
diff --git a/sdk/core/azure-core-amqp/src/network/tls_transport.cpp b/sdk/core/azure-core-amqp/src/network/tls_transport.cpp
index e863c1cbfe..2428c68b3f 100644
--- a/sdk/core/azure-core-amqp/src/network/tls_transport.cpp
+++ b/sdk/core/azure-core-amqp/src/network/tls_transport.cpp
@@ -2,10 +2,12 @@
 // SPDX-Licence-Identifier: MIT
 
 #include "azure/core/amqp/network/tls_transport.hpp"
+
 #include "private/transport_impl.hpp"
 
 #include <azure_c_shared_utility/platform.h>
 #include <azure_c_shared_utility/tlsio.h>
+
 #include <string>
 
 namespace Azure { namespace Core { namespace Amqp { namespace Network { namespace _internal {
diff --git a/sdk/core/azure-core-amqp/src/network/transport.cpp b/sdk/core/azure-core-amqp/src/network/transport.cpp
index 393d677d13..f868b065df 100644
--- a/sdk/core/azure-core-amqp/src/network/transport.cpp
+++ b/sdk/core/azure-core-amqp/src/network/transport.cpp
@@ -2,11 +2,14 @@
 // SPDX-Licence-Identifier: MIT
 
 #include "azure/core/amqp/network/transport.hpp"
+
 #include "azure/core/amqp/common/completion_operation.hpp"
 #include "azure/core/amqp/common/global_state.hpp"
 #include "private/transport_impl.hpp"
+
 #include <azure_c_shared_utility/platform.h>
 #include <azure_c_shared_utility/xio.h>
+
 #include <cassert>
 
 void Azure::Core::_internal::UniqueHandleHelper<XIO_INSTANCE_TAG>::FreeXio(XIO_HANDLE value)
diff --git a/sdk/core/azure-core-amqp/test/ut/amqp_header_tests.cpp b/sdk/core/azure-core-amqp/test/ut/amqp_header_tests.cpp
index 3248f88f74..653eedc141 100644
--- a/sdk/core/azure-core-amqp/test/ut/amqp_header_tests.cpp
+++ b/sdk/core/azure-core-amqp/test/ut/amqp_header_tests.cpp
@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-Licence-Identifier: MIT
 
-#include <gtest/gtest.h>
-
 #include "azure/core/amqp/models/amqp_header.hpp"
 
+#include <gtest/gtest.h>
+
 using namespace Azure::Core::Amqp::Models;
 
 class TestHeaders : public testing::Test {
diff --git a/sdk/core/azure-core-amqp/test/ut/amqp_message_tests.cpp b/sdk/core/azure-core-amqp/test/ut/amqp_message_tests.cpp
index 3ff6ce6a54..e60b8b410a 100644
--- a/sdk/core/azure-core-amqp/test/ut/amqp_message_tests.cpp
+++ b/sdk/core/azure-core-amqp/test/ut/amqp_message_tests.cpp
@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-Licence-Identifier: MIT
 
-#include <gtest/gtest.h>
-
 #include "azure/core/amqp/models/amqp_message.hpp"
 
+#include <gtest/gtest.h>
+
 using namespace Azure::Core::Amqp::Models;
 
 class TestMessage : public testing::Test {
diff --git a/sdk/core/azure-core-amqp/test/ut/amqp_properties_tests.cpp b/sdk/core/azure-core-amqp/test/ut/amqp_properties_tests.cpp
index 515f7ea9ee..0a610ab4d6 100644
--- a/sdk/core/azure-core-amqp/test/ut/amqp_properties_tests.cpp
+++ b/sdk/core/azure-core-amqp/test/ut/amqp_properties_tests.cpp
@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-Licence-Identifier: MIT
 
-#include <gtest/gtest.h>
-
 #include "azure/core/amqp/models/amqp_properties.hpp"
 
+#include <gtest/gtest.h>
+
 using namespace Azure::Core::Amqp::Models;
 
 class TestProperties : public testing::Test {
diff --git a/sdk/core/azure-core-amqp/test/ut/amqp_value_tests.cpp b/sdk/core/azure-core-amqp/test/ut/amqp_value_tests.cpp
index 512e463d9a..4d13b4578d 100644
--- a/sdk/core/azure-core-amqp/test/ut/amqp_value_tests.cpp
+++ b/sdk/core/azure-core-amqp/test/ut/amqp_value_tests.cpp
@@ -1,13 +1,14 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-Licence-Identifier: MIT
 
-#include <gtest/gtest.h>
-
 #include "azure/core/amqp/common/global_state.hpp"
 #include "azure/core/amqp/models/amqp_value.hpp"
+
 #include <algorithm>
 #include <random>
 
+#include <gtest/gtest.h>
+
 using namespace Azure::Core::Amqp::Models;
 
 class TestValues : public testing::Test {
diff --git a/sdk/core/azure-core-amqp/test/ut/azure_core_amqp_tests.cpp b/sdk/core/azure-core-amqp/test/ut/azure_core_amqp_tests.cpp
index 1b257efd75..a80ec4e072 100644
--- a/sdk/core/azure-core-amqp/test/ut/azure_core_amqp_tests.cpp
+++ b/sdk/core/azure-core-amqp/test/ut/azure_core_amqp_tests.cpp
@@ -1,13 +1,14 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <gtest/gtest.h>
-
 #include "azure/core/internal/diagnostics/global_exception.hpp"
 #include "azure/core/platform.hpp"
+
 #include <csignal>
 #include <iostream>
 
+#include <gtest/gtest.h>
+
 int main(int argc, char** argv)
 {
 #if defined(AZ_PLATFORM_POSIX)
diff --git a/sdk/core/azure-core-amqp/test/ut/claim_based_security_tests.cpp b/sdk/core/azure-core-amqp/test/ut/claim_based_security_tests.cpp
index 45b64874cf..e101ae4669 100644
--- a/sdk/core/azure-core-amqp/test/ut/claim_based_security_tests.cpp
+++ b/sdk/core/azure-core-amqp/test/ut/claim_based_security_tests.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-Licence-Identifier: MIT
 
-#include <gtest/gtest.h>
+#include "mock_amqp_server.hpp"
 
 #include <azure/core/amqp/claims_based_security.hpp>
 #include <azure/core/amqp/connection.hpp>
@@ -15,7 +15,7 @@
 #include <azure/core/amqp/session.hpp>
 #include <azure/core/platform.hpp>
 
-#include "mock_amqp_server.hpp"
+#include <gtest/gtest.h>
 
 // extern uint16_t FindAvailableSocket();
 
diff --git a/sdk/core/azure-core-amqp/test/ut/connection_string_tests.cpp b/sdk/core/azure-core-amqp/test/ut/connection_string_tests.cpp
index 41ec6e7b1c..fee8c00147 100644
--- a/sdk/core/azure-core-amqp/test/ut/connection_string_tests.cpp
+++ b/sdk/core/azure-core-amqp/test/ut/connection_string_tests.cpp
@@ -2,10 +2,13 @@
 // SPDX-Licence-Identifier: MIT
 
 #include "azure/core/amqp/connection_string_credential.hpp"
+
 #include <azure/core/platform.hpp>
-#include <gtest/gtest.h>
+
 #include <utility>
 
+#include <gtest/gtest.h>
+
 class ConnectionStringTest : public testing::Test {
 protected:
   void SetUp() override {}
diff --git a/sdk/core/azure-core-amqp/test/ut/connection_tests.cpp b/sdk/core/azure-core-amqp/test/ut/connection_tests.cpp
index da3964d1aa..e945a4b34a 100644
--- a/sdk/core/azure-core-amqp/test/ut/connection_tests.cpp
+++ b/sdk/core/azure-core-amqp/test/ut/connection_tests.cpp
@@ -10,12 +10,15 @@
 #include "azure/core/amqp/network/socket_listener.hpp"
 #include "azure/core/amqp/network/socket_transport.hpp"
 #include "azure/core/amqp/session.hpp"
+
 #include <azure/core/context.hpp>
 #include <azure/core/platform.hpp>
+
 #include <functional>
-#include <gtest/gtest.h>
 #include <random>
 
+#include <gtest/gtest.h>
+
 extern uint16_t FindAvailableSocket();
 
 class TestConnections : public testing::Test {
diff --git a/sdk/core/azure-core-amqp/test/ut/link_tests.cpp b/sdk/core/azure-core-amqp/test/ut/link_tests.cpp
index 492c0eb984..b0290f7355 100644
--- a/sdk/core/azure-core-amqp/test/ut/link_tests.cpp
+++ b/sdk/core/azure-core-amqp/test/ut/link_tests.cpp
@@ -10,11 +10,14 @@
 #include "azure/core/amqp/network/socket_listener.hpp"
 #include "azure/core/amqp/network/socket_transport.hpp"
 #include "azure/core/amqp/session.hpp"
+
 #include <azure/core/platform.hpp>
+
 #include <functional>
-#include <gtest/gtest.h>
 #include <random>
 
+#include <gtest/gtest.h>
+
 extern uint16_t FindAvailableSocket();
 
 class TestLinks : public testing::Test {
diff --git a/sdk/core/azure-core-amqp/test/ut/management_tests.cpp b/sdk/core/azure-core-amqp/test/ut/management_tests.cpp
index 0f9d75ae92..bb4b95d16a 100644
--- a/sdk/core/azure-core-amqp/test/ut/management_tests.cpp
+++ b/sdk/core/azure-core-amqp/test/ut/management_tests.cpp
@@ -2,11 +2,13 @@
 // SPDX-Licence-Identifier: MIT
 
 #include "mock_amqp_server.hpp"
+
 #include <azure/core/amqp/connection.hpp>
 #include <azure/core/amqp/management.hpp>
 #include <azure/core/amqp/models/messaging_values.hpp>
 #include <azure/core/amqp/session.hpp>
 #include <azure/core/platform.hpp>
+
 #include <gtest/gtest.h>
 
 class TestManagement : public testing::Test {
diff --git a/sdk/core/azure-core-amqp/test/ut/message_sender_receiver.cpp b/sdk/core/azure-core-amqp/test/ut/message_sender_receiver.cpp
index 9a825a21d4..b4f7d08a54 100644
--- a/sdk/core/azure-core-amqp/test/ut/message_sender_receiver.cpp
+++ b/sdk/core/azure-core-amqp/test/ut/message_sender_receiver.cpp
@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-Licence-Identifier: MIT
 
-#include <gtest/gtest.h>
-
 #include "azure/core/amqp/common/async_operation_queue.hpp"
 #include "azure/core/amqp/connection.hpp"
 #include "azure/core/amqp/message_receiver.hpp"
@@ -14,11 +12,13 @@
 #include "azure/core/amqp/network/socket_listener.hpp"
 #include "azure/core/amqp/session.hpp"
 #include "mock_amqp_server.hpp"
+
 #include <azure/core/platform.hpp>
+
 #include <functional>
 #include <random>
 
-#include "mock_amqp_server.hpp"
+#include <gtest/gtest.h>
 
 extern uint16_t FindAvailableSocket();
 
diff --git a/sdk/core/azure-core-amqp/test/ut/message_source_target.cpp b/sdk/core/azure-core-amqp/test/ut/message_source_target.cpp
index 82d0878650..94955a973c 100644
--- a/sdk/core/azure-core-amqp/test/ut/message_source_target.cpp
+++ b/sdk/core/azure-core-amqp/test/ut/message_source_target.cpp
@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-Licence-Identifier: MIT
 
-#include <gtest/gtest.h>
-
 #include <azure/core/amqp/models/message_source.hpp>
 #include <azure/core/amqp/models/message_target.hpp>
 #include <azure/core/amqp/models/messaging_values.hpp>
 
+#include <gtest/gtest.h>
+
 class TestSourceTarget : public testing::Test {
 protected:
   void SetUp() override {}
diff --git a/sdk/core/azure-core-amqp/test/ut/mock_amqp_server.hpp b/sdk/core/azure-core-amqp/test/ut/mock_amqp_server.hpp
index 64de5d0811..e2ad6d00fa 100644
--- a/sdk/core/azure-core-amqp/test/ut/mock_amqp_server.hpp
+++ b/sdk/core/azure-core-amqp/test/ut/mock_amqp_server.hpp
@@ -14,9 +14,11 @@
 #include <azure/core/amqp/network/amqp_header_detect_transport.hpp>
 #include <azure/core/amqp/network/socket_listener.hpp>
 #include <azure/core/amqp/session.hpp>
-#include <gtest/gtest.h>
+
 #include <memory>
 
+#include <gtest/gtest.h>
+
 extern uint16_t FindAvailableSocket();
 namespace MessageTests {
 
diff --git a/sdk/core/azure-core-amqp/test/ut/session_tests.cpp b/sdk/core/azure-core-amqp/test/ut/session_tests.cpp
index d615250d2b..2bb9af4d55 100644
--- a/sdk/core/azure-core-amqp/test/ut/session_tests.cpp
+++ b/sdk/core/azure-core-amqp/test/ut/session_tests.cpp
@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-Licence-Identifier: MIT
 
-#include <gtest/gtest.h>
-
 #include "azure/core/amqp/common/async_operation_queue.hpp"
 #include "azure/core/amqp/common/global_state.hpp"
 #include "azure/core/amqp/connection.hpp"
@@ -12,14 +10,18 @@
 #include "azure/core/amqp/network/socket_listener.hpp"
 #include "azure/core/amqp/network/socket_transport.hpp"
 #include "azure/core/amqp/session.hpp"
+
 #include <azure/core/context.hpp>
+#include <azure/core/platform.hpp>
+
 #include <functional>
 #include <random>
 
-#include <azure/core/platform.hpp>
+#include <gtest/gtest.h>
 #if defined(AZ_PLATFORM_POSIX)
-#include <netinet/in.h> // for sockaddr_in
 #include <poll.h> // for poll()
+
+#include <netinet/in.h> // for sockaddr_in
 #include <sys/socket.h> // for socket shutdown
 #elif defined(AZ_PLATFORM_WINDOWS)
 #include <winsock2.h> // for WSAPoll();
diff --git a/sdk/core/azure-core-amqp/test/ut/transport_tests.cpp b/sdk/core/azure-core-amqp/test/ut/transport_tests.cpp
index 4a3e2b18c8..5472afea9e 100644
--- a/sdk/core/azure-core-amqp/test/ut/transport_tests.cpp
+++ b/sdk/core/azure-core-amqp/test/ut/transport_tests.cpp
@@ -2,15 +2,18 @@
 // SPDX-Licence-Identifier: MIT
 
 #include "azure/core/amqp/connection.hpp"
+
 #include <azure/core/amqp/common/async_operation_queue.hpp>
 #include <azure/core/amqp/network/socket_listener.hpp>
 #include <azure/core/amqp/network/socket_transport.hpp>
 #include <azure/core/amqp/network/tls_transport.hpp>
 #include <azure/core/platform.hpp>
-#include <gtest/gtest.h>
+
 #include <random>
 #include <utility>
 
+#include <gtest/gtest.h>
+
 extern uint16_t FindAvailableSocket();
 
 using namespace Azure::Core::Amqp::Network::_internal;
diff --git a/sdk/core/azure-core-test/inc/azure/core/test/test_base.hpp b/sdk/core/azure-core-test/inc/azure/core/test/test_base.hpp
index de0cbc342c..9de37d6045 100644
--- a/sdk/core/azure-core-test/inc/azure/core/test/test_base.hpp
+++ b/sdk/core/azure-core-test/inc/azure/core/test/test_base.hpp
@@ -5,11 +5,10 @@
  * Base class for running live and playback tests using the interceptor manager
  */
 
-#include <gtest/gtest.h>
-
 #include "azure/core/test/network_models.hpp"
 #include "azure/core/test/test_context_manager.hpp"
 #include "azure/core/test/test_proxy_manager.hpp"
+
 #include <azure/core/credentials/credentials.hpp>
 #include <azure/core/credentials/token_credential_options.hpp>
 #include <azure/core/internal/client_options.hpp>
@@ -22,6 +21,8 @@
 #include <regex>
 #include <thread>
 
+#include <gtest/gtest.h>
+
 using namespace std::chrono_literals;
 
 namespace Azure { namespace Core { namespace Test {
diff --git a/sdk/core/azure-core-test/inc/azure/core/test/test_context_manager.hpp b/sdk/core/azure-core-test/inc/azure/core/test/test_context_manager.hpp
index fb21c5e543..8ea214ab42 100644
--- a/sdk/core/azure-core-test/inc/azure/core/test/test_context_manager.hpp
+++ b/sdk/core/azure-core-test/inc/azure/core/test/test_context_manager.hpp
@@ -7,10 +7,11 @@
 
 #pragma once
 
-#include <gtest/gtest.h>
+#include "azure/core/test/network_models.hpp"
+
 #include <string>
 
-#include "azure/core/test/network_models.hpp"
+#include <gtest/gtest.h>
 
 namespace Azure { namespace Core { namespace Test {
   /**
diff --git a/sdk/core/azure-core-test/inc/azure/core/test/test_proxy_manager.hpp b/sdk/core/azure-core-test/inc/azure/core/test/test_proxy_manager.hpp
index f1097c9bb3..ed98e6b29b 100644
--- a/sdk/core/azure-core-test/inc/azure/core/test/test_proxy_manager.hpp
+++ b/sdk/core/azure-core-test/inc/azure/core/test/test_proxy_manager.hpp
@@ -7,15 +7,16 @@
 
 #pragma once
 
+#include "azure/core/test/network_models.hpp"
+#include "azure/core/test/test_context_manager.hpp"
+#include "azure/core/test/test_proxy_policy.hpp"
+
 #include <azure/core/credentials/credentials.hpp>
 #include <azure/core/http/http.hpp>
 #include <azure/core/http/policies/policy.hpp>
+
 #include <memory>
 #include <string>
-
-#include "azure/core/test/network_models.hpp"
-#include "azure/core/test/test_context_manager.hpp"
-#include "azure/core/test/test_proxy_policy.hpp"
 #if defined(BUILD_CURL_HTTP_TRANSPORT_ADAPTER)
 #include <azure/core/http/curl_transport.hpp>
 #endif
diff --git a/sdk/core/azure-core-test/inc/azure/core/test/test_proxy_policy.hpp b/sdk/core/azure-core-test/inc/azure/core/test/test_proxy_policy.hpp
index e003b0ebd2..26cdceed56 100644
--- a/sdk/core/azure-core-test/inc/azure/core/test/test_proxy_policy.hpp
+++ b/sdk/core/azure-core-test/inc/azure/core/test/test_proxy_policy.hpp
@@ -8,9 +8,6 @@
 
 #pragma once
 
-#include <memory>
-#include <string>
-
 #include "azure/core/test/network_models.hpp"
 #include "azure/core/test/test_proxy_manager.hpp"
 
@@ -19,6 +16,9 @@
 #include <azure/core/http/policies/policy.hpp>
 #include <azure/core/response.hpp>
 
+#include <memory>
+#include <string>
+
 namespace Azure { namespace Core { namespace Test {
 
   // Partial class. Required to reference the Interceptor that is defined in the implementation.
diff --git a/sdk/core/azure-core-test/src/test_base.cpp b/sdk/core/azure-core-test/src/test_base.cpp
index 286fd16873..2d88478ad9 100644
--- a/sdk/core/azure-core-test/src/test_base.cpp
+++ b/sdk/core/azure-core-test/src/test_base.cpp
@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/core/internal/json/json.hpp>
-
 #include "azure/core/test/test_base.hpp"
 
+#include <azure/core/internal/json/json.hpp>
+
 #include <fstream>
 #include <iostream>
 
diff --git a/sdk/core/azure-core-test/src/test_proxy_manager.cpp b/sdk/core/azure-core-test/src/test_proxy_manager.cpp
index 2c12182317..2dc84f6967 100644
--- a/sdk/core/azure-core-test/src/test_proxy_manager.cpp
+++ b/sdk/core/azure-core-test/src/test_proxy_manager.cpp
@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
+#include "azure/core/test/test_proxy_manager.hpp"
+
 #include <azure/core/internal/environment.hpp>
 #include <azure/core/internal/json/json.hpp>
 #include <azure/core/internal/strings.hpp>
 
-#include "azure/core/test/test_proxy_manager.hpp"
-
 #include <fstream>
 #include <iostream>
 #include <regex>
diff --git a/sdk/core/azure-core-test/src/test_proxy_policy.cpp b/sdk/core/azure-core-test/src/test_proxy_policy.cpp
index 826e8f7a2b..7e07ca18d1 100644
--- a/sdk/core/azure-core-test/src/test_proxy_policy.cpp
+++ b/sdk/core/azure-core-test/src/test_proxy_policy.cpp
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: MIT
 
 #include "azure/core/test/test_proxy_policy.hpp"
+
 #include "azure/core/test/network_models.hpp"
 #include "azure/core/test/test_context_manager.hpp"
 
diff --git a/sdk/core/azure-core-tracing-opentelemetry/src/opentelemetry.cpp b/sdk/core/azure-core-tracing-opentelemetry/src/opentelemetry.cpp
index 692b3472f0..fba6833dbd 100644
--- a/sdk/core/azure-core-tracing-opentelemetry/src/opentelemetry.cpp
+++ b/sdk/core/azure-core-tracing-opentelemetry/src/opentelemetry.cpp
@@ -2,10 +2,13 @@
 // SPDX-License-Identifier: MIT
 
 #include "azure/core/tracing/opentelemetry/opentelemetry.hpp"
+
 #include "opentelemetry_private.hpp"
+
 #include <azure/core/http/http.hpp>
 #include <azure/core/internal/tracing/tracing_impl.hpp>
 #include <azure/core/nullable.hpp>
+
 #include <memory>
 #if defined(_MSC_VER)
 // The OpenTelemetry headers generate a couple of warnings on MSVC in the OTel 1.2 package, suppress
diff --git a/sdk/core/azure-core-tracing-opentelemetry/src/opentelemetry_private.hpp b/sdk/core/azure-core-tracing-opentelemetry/src/opentelemetry_private.hpp
index a733ee2b34..d52b566c1c 100644
--- a/sdk/core/azure-core-tracing-opentelemetry/src/opentelemetry_private.hpp
+++ b/sdk/core/azure-core-tracing-opentelemetry/src/opentelemetry_private.hpp
@@ -4,6 +4,7 @@
 #pragma once
 
 #include "azure/core/tracing/opentelemetry/opentelemetry.hpp"
+
 #include <azure/core/internal/tracing/tracing_impl.hpp>
 #if defined(_MSC_VER)
 // The OpenTelemetry headers generate a couple of warnings on MSVC in the OTel 1.2 package, suppress
diff --git a/sdk/core/azure-core-tracing-opentelemetry/test/ut/azure_core_otel_test.cpp b/sdk/core/azure-core-tracing-opentelemetry/test/ut/azure_core_otel_test.cpp
index ded42c49d3..ef3c823948 100644
--- a/sdk/core/azure-core-tracing-opentelemetry/test/ut/azure_core_otel_test.cpp
+++ b/sdk/core/azure-core-tracing-opentelemetry/test/ut/azure_core_otel_test.cpp
@@ -4,6 +4,7 @@
 #define USE_MEMORY_EXPORTER 1
 #include "../src/opentelemetry_private.hpp"
 #include "azure/core/tracing/opentelemetry/opentelemetry.hpp"
+
 #include <azure/core/test/test_base.hpp>
 
 #if defined(_MSC_VER)
@@ -27,6 +28,7 @@
 #endif
 
 #include <chrono>
+
 #include <gtest/gtest.h>
 
 class OpenTelemetryTests : public Azure::Core::Test::TestBase {
diff --git a/sdk/core/azure-core-tracing-opentelemetry/test/ut/azure_core_test.cpp b/sdk/core/azure-core-tracing-opentelemetry/test/ut/azure_core_test.cpp
index 959703daba..454c20eab6 100644
--- a/sdk/core/azure-core-tracing-opentelemetry/test/ut/azure_core_test.cpp
+++ b/sdk/core/azure-core-tracing-opentelemetry/test/ut/azure_core_test.cpp
@@ -5,6 +5,7 @@
 #include "azure/core/platform.hpp"
 
 #include <csignal>
+
 #include <gtest/gtest.h>
 
 int main(int argc, char** argv)
diff --git a/sdk/core/azure-core-tracing-opentelemetry/test/ut/service_support_test.cpp b/sdk/core/azure-core-tracing-opentelemetry/test/ut/service_support_test.cpp
index 10684d7a1b..d882ac2701 100644
--- a/sdk/core/azure-core-tracing-opentelemetry/test/ut/service_support_test.cpp
+++ b/sdk/core/azure-core-tracing-opentelemetry/test/ut/service_support_test.cpp
@@ -1,10 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <gtest/gtest.h>
-
-#include <chrono>
-#include <regex>
+#include "test_exporter.hpp" // Span Exporter used for OpenTelemetry tests.
 
 #include <azure/core/internal/http/pipeline.hpp>
 #include <azure/core/internal/json/json.hpp>
@@ -12,7 +9,10 @@
 #include <azure/core/test/test_base.hpp>
 #include <azure/core/tracing/opentelemetry/opentelemetry.hpp>
 
-#include "test_exporter.hpp" // Span Exporter used for OpenTelemetry tests.
+#include <chrono>
+#include <regex>
+
+#include <gtest/gtest.h>
 #if defined(_MSC_VER)
 // The OpenTelemetry headers generate a couple of warnings on MSVC in the OTel 1.2 package, suppress
 // the warnings across the includes.
diff --git a/sdk/core/azure-core-tracing-opentelemetry/test/ut/test_exporter.hpp b/sdk/core/azure-core-tracing-opentelemetry/test/ut/test_exporter.hpp
index 4339fe2c70..b446ca351d 100644
--- a/sdk/core/azure-core-tracing-opentelemetry/test/ut/test_exporter.hpp
+++ b/sdk/core/azure-core-tracing-opentelemetry/test/ut/test_exporter.hpp
@@ -4,6 +4,7 @@
 #pragma once
 
 #include <memory>
+
 #include <opentelemetry/sdk/trace/exporter.h>
 
 class RecordedSpan : public opentelemetry::sdk::trace::Recordable {
diff --git a/sdk/core/azure-core/inc/azure/core/context.hpp b/sdk/core/azure-core/inc/azure/core/context.hpp
index 0e19c9bf12..624ee49d25 100644
--- a/sdk/core/azure-core/inc/azure/core/context.hpp
+++ b/sdk/core/azure-core/inc/azure/core/context.hpp
@@ -12,6 +12,7 @@
 #include "azure/core/datetime.hpp"
 #include "azure/core/dll_import_export.hpp"
 #include "azure/core/rtti.hpp"
+
 #include <atomic>
 #include <chrono>
 #include <memory>
diff --git a/sdk/core/azure-core/inc/azure/core/internal/http/http_sanitizer.hpp b/sdk/core/azure-core/inc/azure/core/internal/http/http_sanitizer.hpp
index 4068012ea0..97a03f1264 100644
--- a/sdk/core/azure-core/inc/azure/core/internal/http/http_sanitizer.hpp
+++ b/sdk/core/azure-core/inc/azure/core/internal/http/http_sanitizer.hpp
@@ -4,6 +4,7 @@
 #pragma once
 
 #include "azure/core/url.hpp"
+
 #include <string>
 
 namespace Azure { namespace Core { namespace Http { namespace _internal {
diff --git a/sdk/core/azure-core/inc/azure/core/internal/json/json.hpp b/sdk/core/azure-core/inc/azure/core/internal/json/json.hpp
index 048154a9e8..391c300771 100644
--- a/sdk/core/azure-core/inc/azure/core/internal/json/json.hpp
+++ b/sdk/core/azure-core/inc/azure/core/internal/json/json.hpp
@@ -2176,10 +2176,7 @@ _az_JSON_HEDLEY_DIAGNOSTIC_PUSH
     class exception : public std::exception {
     public:
       /// returns the explanatory string
-      const char* what() const noexcept override
-      {
-        return m.what();
-      }
+      const char* what() const noexcept override { return m.what(); }
 
       /// the id of the exception
       const int id;
@@ -15737,125 +15734,141 @@ namespace Azure { namespace Core { namespace Json { namespace _internal { namesp
 #pragma warning(disable : 28020)
 #endif
 
-    /*!
-    @brief check whether a string is UTF-8 encoded
-
-    The function checks each byte of a string whether it is UTF-8 encoded. The
-    result of the check is stored in the @a state parameter. The function must
-    be called initially with state 0 (accept). State 1 means the string must
-    be rejected, because the current byte is not allowed. If the string is
-    completely processed, but the state is non-zero, the string ended
-    prematurely; that is, the last byte indicated more bytes should have
-    followed.
-
-    @param[in,out] state  the state of the decoding
-    @param[in,out] codep  codepoint (valid only if resulting state is UTF8_ACCEPT)
-    @param[in] byte       next byte to decode
-    @return               new state
-
-    @note The function has been edited: a std::array is used.
-
-    @copyright Copyright (c) 2008-2009 Bjoern Hoehrmann <bjoern\@hoehrmann.de>
-    @sa http://bjoern.hoehrmann.de/utf-8/decoder/dfa/
-    */
-    static std::uint8_t decode(
-        std::uint8_t& state,
-        std::uint32_t& codep,
-        const std::uint8_t byte) noexcept
-    {
-      static const std::array<std::uint8_t, 400> utf8d = {{
-          0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-          0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, // 00..1F
-          0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-          0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, // 20..3F
-          0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-          0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, // 40..5F
-          0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-          0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, // 60..7F
-          1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,
-          9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9, // 80..9F
-          7,   7,   7,   7,   7,   7,   7,   7,   7,   7,   7,   7,   7,   7,   7,   7,
-          7,   7,   7,   7,   7,   7,   7,   7,   7,   7,   7,   7,   7,   7,   7,   7, // A0..BF
-          8,   8,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,
-          2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2, // C0..DF
-          0xA, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x4, 0x3, 0x3, // E0..EF
-          0xB, 0x6, 0x6, 0x6, 0x5, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, // F0..FF
-          0x0, 0x1, 0x2, 0x3, 0x5, 0x8, 0x7, 0x1, 0x1, 0x1, 0x4, 0x6, 0x1, 0x1, 0x1, 0x1, // s0..s0
-          1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,
-          1,   0,   1,   1,   1,   1,   1,   0,   1,   0,   1,   1,   1,   1,   1,   1, // s1..s2
-          1,   2,   1,   1,   1,   1,   1,   2,   1,   2,   1,   1,   1,   1,   1,   1,
-          1,   1,   1,   1,   1,   1,   1,   2,   1,   1,   1,   1,   1,   1,   1,   1, // s3..s4
-          1,   2,   1,   1,   1,   1,   1,   1,   1,   2,   1,   1,   1,   1,   1,   1,
-          1,   1,   1,   1,   1,   1,   1,   3,   1,   3,   1,   1,   1,   1,   1,   1, // s5..s6
-          1,   3,   1,   1,   1,   1,   1,   3,   1,   3,   1,   1,   1,   1,   1,   1,
-          1,   3,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1 // s7..s8
-      }};
+          /*!
+          @brief check whether a string is UTF-8 encoded
 
-      const std::uint8_t type = utf8d[byte];
+          The function checks each byte of a string whether it is UTF-8 encoded. The
+          result of the check is stored in the @a state parameter. The function must
+          be called initially with state 0 (accept). State 1 means the string must
+          be rejected, because the current byte is not allowed. If the string is
+          completely processed, but the state is non-zero, the string ended
+          prematurely; that is, the last byte indicated more bytes should have
+          followed.
 
-      codep = (state != UTF8_ACCEPT) ? (byte & 0x3fu) | (codep << 6u) : (0xFFu >> type) & (byte);
+          @param[in,out] state  the state of the decoding
+          @param[in,out] codep  codepoint (valid only if resulting state is UTF8_ACCEPT)
+          @param[in] byte       next byte to decode
+          @return               new state
 
-      std::size_t index = 256u + static_cast<size_t>(state) * 16u + static_cast<size_t>(type);
-      assert(index < 400);
-      state = utf8d[index];
-      return state;
-    }
+          @note The function has been edited: a std::array is used.
+
+          @copyright Copyright (c) 2008-2009 Bjoern Hoehrmann <bjoern\@hoehrmann.de>
+          @sa http://bjoern.hoehrmann.de/utf-8/decoder/dfa/
+          */
+          static std::uint8_t decode(
+              std::uint8_t& state,
+              std::uint32_t& codep,
+              const std::uint8_t byte) noexcept
+          {
+            static const std::array<std::uint8_t, 400> utf8d
+                = {{
+                    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+                    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+                    0,   0,   0,   0,   0,   0,   0,   0,   0,   0, // 00..1F
+                    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+                    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+                    0,   0,   0,   0,   0,   0,   0,   0,   0,   0, // 20..3F
+                    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+                    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+                    0,   0,   0,   0,   0,   0,   0,   0,   0,   0, // 40..5F
+                    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+                    0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+                    0,   0,   0,   0,   0,   0,   0,   0,   0,   0, // 60..7F
+                    1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,
+                    1,   1,   1,   1,   1,   9,   9,   9,   9,   9,   9,
+                    9,   9,   9,   9,   9,   9,   9,   9,   9,   9, // 80..9F
+                    7,   7,   7,   7,   7,   7,   7,   7,   7,   7,   7,
+                    7,   7,   7,   7,   7,   7,   7,   7,   7,   7,   7,
+                    7,   7,   7,   7,   7,   7,   7,   7,   7,   7, // A0..BF
+                    8,   8,   2,   2,   2,   2,   2,   2,   2,   2,   2,
+                    2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,
+                    2,   2,   2,   2,   2,   2,   2,   2,   2,   2, // C0..DF
+                    0xA, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3,
+                    0x3, 0x3, 0x4, 0x3, 0x3, // E0..EF
+                    0xB, 0x6, 0x6, 0x6, 0x5, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8,
+                    0x8, 0x8, 0x8, 0x8, 0x8, // F0..FF
+                    0x0, 0x1, 0x2, 0x3, 0x5, 0x8, 0x7, 0x1, 0x1, 0x1, 0x4,
+                    0x6, 0x1, 0x1, 0x1, 0x1, // s0..s0
+                    1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,
+                    1,   1,   1,   1,   1,   1,   0,   1,   1,   1,   1,
+                    1,   0,   1,   0,   1,   1,   1,   1,   1,   1, // s1..s2
+                    1,   2,   1,   1,   1,   1,   1,   2,   1,   2,   1,
+                    1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,
+                    1,   2,   1,   1,   1,   1,   1,   1,   1,   1, // s3..s4
+                    1,   2,   1,   1,   1,   1,   1,   1,   1,   2,   1,
+                    1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,
+                    1,   3,   1,   3,   1,   1,   1,   1,   1,   1, // s5..s6
+                    1,   3,   1,   1,   1,   1,   1,   3,   1,   3,   1,
+                    1,   1,   1,   1,   1,   1,   3,   1,   1,   1,   1,
+                    1,   1,   1,   1,   1,   1,   1,   1,   1,   1 // s7..s8
+                }};
+
+            const std::uint8_t type = utf8d[byte];
+
+            codep = (state != UTF8_ACCEPT) ? (byte & 0x3fu) | (codep << 6u)
+                                           : (0xFFu >> type) & (byte);
+
+            std::size_t index = 256u + static_cast<size_t>(state) * 16u + static_cast<size_t>(type);
+            assert(index < 400);
+            state = utf8d[index];
+            return state;
+          }
 
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif
 
-    /*
-     * Overload to make the compiler happy while it is instantiating
-     * dump_integer for number_unsigned_t.
-     * Must never be called.
-     */
-    number_unsigned_t remove_sign(number_unsigned_t x)
-    {
-      assert(false); // LCOV_EXCL_LINE
-      return x; // LCOV_EXCL_LINE
-    }
+          /*
+           * Overload to make the compiler happy while it is instantiating
+           * dump_integer for number_unsigned_t.
+           * Must never be called.
+           */
+          number_unsigned_t remove_sign(number_unsigned_t x)
+          {
+            assert(false); // LCOV_EXCL_LINE
+            return x; // LCOV_EXCL_LINE
+          }
 
-    /*
-     * Helper function for dump_integer
-     *
-     * This function takes a negative signed integer and returns its absolute
-     * value as unsigned integer. The plus/minus shuffling is necessary as we can
-     * not directly remove the sign of an arbitrary signed integer as the
-     * absolute values of INT_MIN and INT_MAX are usually not the same. See
-     * `#1708` for details.
-     */
-    inline number_unsigned_t remove_sign(number_integer_t x) noexcept
-    {
-      assert(x < 0 && x < (std::numeric_limits<number_integer_t>::max)());
-      return static_cast<number_unsigned_t>(-(x + 1)) + 1;
-    }
+          /*
+           * Helper function for dump_integer
+           *
+           * This function takes a negative signed integer and returns its absolute
+           * value as unsigned integer. The plus/minus shuffling is necessary as we can
+           * not directly remove the sign of an arbitrary signed integer as the
+           * absolute values of INT_MIN and INT_MAX are usually not the same. See
+           * `#1708` for details.
+           */
+          inline number_unsigned_t remove_sign(number_integer_t x) noexcept
+          {
+            assert(x < 0 && x < (std::numeric_limits<number_integer_t>::max)());
+            return static_cast<number_unsigned_t>(-(x + 1)) + 1;
+          }
 
-  private:
-    /// the output of the serializer
-    output_adapter_t<char> o = nullptr;
+        private:
+          /// the output of the serializer
+          output_adapter_t<char> o = nullptr;
 
-    /// a (hopefully) large enough character buffer
-    std::array<char, 64> number_buffer{{}};
+          /// a (hopefully) large enough character buffer
+          std::array<char, 64> number_buffer{{}};
 
-    /// the locale
-    const std::lconv* loc = nullptr;
-    /// the locale's thousand separator character
-    const char thousands_sep = '\0';
-    /// the locale's decimal point character
-    const char decimal_point = '\0';
+          /// the locale
+          const std::lconv* loc = nullptr;
+          /// the locale's thousand separator character
+          const char thousands_sep = '\0';
+          /// the locale's decimal point character
+          const char decimal_point = '\0';
 
-    /// string buffer
-    std::array<char, 512> string_buffer{{}};
+          /// string buffer
+          std::array<char, 512> string_buffer{{}};
 
-    /// the indentation character
-    const char indent_char;
-    /// the indentation string
-    string_t indent_string;
+          /// the indentation character
+          const char indent_char;
+          /// the indentation string
+          string_t indent_string;
 
-    /// error_handler how to react on decoding errors
-    const error_handler_t error_handler;
-  };
+          /// error_handler how to react on decoding errors
+          const error_handler_t error_handler;
+        };
 }}}}} // namespace Azure::Core::Json::_internal::detail
 
 // #include <nlohmann/detail/value_t.hpp>
diff --git a/sdk/core/azure-core/inc/azure/core/internal/tracing/tracing_impl.hpp b/sdk/core/azure-core/inc/azure/core/internal/tracing/tracing_impl.hpp
index 0401d2fdce..98111f50c4 100644
--- a/sdk/core/azure-core/inc/azure/core/internal/tracing/tracing_impl.hpp
+++ b/sdk/core/azure-core/inc/azure/core/internal/tracing/tracing_impl.hpp
@@ -11,6 +11,7 @@
 #include "azure/core/datetime.hpp"
 #include "azure/core/nullable.hpp"
 #include "azure/core/tracing/tracing.hpp"
+
 #include <map>
 #include <memory>
 #include <string>
diff --git a/sdk/core/azure-core/inc/azure/core/operation_status.hpp b/sdk/core/azure-core/inc/azure/core/operation_status.hpp
index fd969bd0bc..73535faef3 100644
--- a/sdk/core/azure-core/inc/azure/core/operation_status.hpp
+++ b/sdk/core/azure-core/inc/azure/core/operation_status.hpp
@@ -10,12 +10,11 @@
 #pragma once
 
 #include "azure/core/dll_import_export.hpp"
+#include "azure/core/internal/strings.hpp"
 
 #include <string>
 #include <utility> // for std::move
 
-#include "azure/core/internal/strings.hpp"
-
 namespace Azure { namespace Core {
 
   /**
diff --git a/sdk/core/azure-core/inc/azure/core/paged_response.hpp b/sdk/core/azure-core/inc/azure/core/paged_response.hpp
index a4d279542c..925509886d 100644
--- a/sdk/core/azure-core/inc/azure/core/paged_response.hpp
+++ b/sdk/core/azure-core/inc/azure/core/paged_response.hpp
@@ -8,13 +8,13 @@
 
 #pragma once
 
-#include <cstdlib>
-#include <string>
-
 #include "azure/core/context.hpp"
 #include "azure/core/http/raw_response.hpp"
 #include "azure/core/nullable.hpp"
 
+#include <cstdlib>
+#include <string>
+
 namespace Azure { namespace Core {
 
   /**
diff --git a/sdk/core/azure-core/inc/azure/core/response.hpp b/sdk/core/azure-core/inc/azure/core/response.hpp
index f8460c26ec..3bb13c6374 100644
--- a/sdk/core/azure-core/inc/azure/core/response.hpp
+++ b/sdk/core/azure-core/inc/azure/core/response.hpp
@@ -11,6 +11,7 @@
 
 #include "azure/core/http/http.hpp"
 #include "azure/core/nullable.hpp"
+
 #include <memory> // for unique_ptr
 #include <stdexcept>
 #include <utility> // for move
diff --git a/sdk/core/azure-core/inc/azure/core/tracing/tracing.hpp b/sdk/core/azure-core/inc/azure/core/tracing/tracing.hpp
index 470f10e481..6b7be7f677 100644
--- a/sdk/core/azure-core/inc/azure/core/tracing/tracing.hpp
+++ b/sdk/core/azure-core/inc/azure/core/tracing/tracing.hpp
@@ -9,6 +9,7 @@
 #pragma once
 
 #include <azure/core/context.hpp>
+
 #include <memory>
 #include <string>
 
diff --git a/sdk/core/azure-core/src/base64.cpp b/sdk/core/azure-core/src/base64.cpp
index ab485cc8d3..9e9803acef 100644
--- a/sdk/core/azure-core/src/base64.cpp
+++ b/sdk/core/azure-core/src/base64.cpp
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: MIT
 
 #include "azure/core/base64.hpp"
+
 #include "azure/core/platform.hpp"
 
 #include <string>
diff --git a/sdk/core/azure-core/src/datetime.cpp b/sdk/core/azure-core/src/datetime.cpp
index f70c125e47..f1d2c11f9d 100644
--- a/sdk/core/azure-core/src/datetime.cpp
+++ b/sdk/core/azure-core/src/datetime.cpp
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: MIT
 
 #include "azure/core/datetime.hpp"
+
 #include "azure/core/internal/strings.hpp"
 #include "azure/core/platform.hpp"
 
diff --git a/sdk/core/azure-core/src/environment.cpp b/sdk/core/azure-core/src/environment.cpp
index cb4c9c47bd..b5e43c712b 100644
--- a/sdk/core/azure-core/src/environment.cpp
+++ b/sdk/core/azure-core/src/environment.cpp
@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "azure/core/platform.hpp"
-
 #include "azure/core/internal/environment.hpp"
 
+#include "azure/core/platform.hpp"
+
 #if defined(AZ_PLATFORM_WINDOWS)
 #if !defined(WIN32_LEAN_AND_MEAN)
 #define WIN32_LEAN_AND_MEAN
@@ -13,9 +13,9 @@
 #define NOMINMAX
 #endif
 
-#include <vector>
-
 #include <windows.h>
+
+#include <vector>
 #else
 #include <stdlib.h>
 #endif
diff --git a/sdk/core/azure-core/src/exception.cpp b/sdk/core/azure-core/src/exception.cpp
index 330bb60018..3a03c1ba10 100644
--- a/sdk/core/azure-core/src/exception.cpp
+++ b/sdk/core/azure-core/src/exception.cpp
@@ -2,9 +2,11 @@
 // SPDX-License-Identifier: MIT
 
 #include "azure/core/exception.hpp"
+
 #include "azure/core/http/http.hpp"
 #include "azure/core/http/policies/policy.hpp"
 #include "azure/core/internal/json/json.hpp"
+
 #include <memory>
 #include <stdexcept>
 #include <string>
diff --git a/sdk/core/azure-core/src/http/bearer_token_authentication_policy.cpp b/sdk/core/azure-core/src/http/bearer_token_authentication_policy.cpp
index e8fd9ffc65..924b2d1fc9 100644
--- a/sdk/core/azure-core/src/http/bearer_token_authentication_policy.cpp
+++ b/sdk/core/azure-core/src/http/bearer_token_authentication_policy.cpp
@@ -1,9 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "azure/core/http/policies/policy.hpp"
-
 #include "azure/core/credentials/credentials.hpp"
+#include "azure/core/http/policies/policy.hpp"
 #include "azure/core/internal/credentials/authorization_challenge_parser.hpp"
 
 #include <chrono>
diff --git a/sdk/core/azure-core/src/http/curl/curl.cpp b/sdk/core/azure-core/src/http/curl/curl.cpp
index 80309f8936..89c0ade9de 100644
--- a/sdk/core/azure-core/src/http/curl/curl.cpp
+++ b/sdk/core/azure-core/src/http/curl/curl.cpp
@@ -63,6 +63,7 @@
 
 #if defined(AZ_PLATFORM_POSIX)
 #include <poll.h> // for poll()
+
 #include <sys/socket.h> // for socket shutdown
 #elif defined(AZ_PLATFORM_WINDOWS)
 #include <winsock2.h> // for WSAPoll();
diff --git a/sdk/core/azure-core/src/http/curl/curl_connection_pool_private.hpp b/sdk/core/azure-core/src/http/curl/curl_connection_pool_private.hpp
index df455984e3..fff264bb21 100644
--- a/sdk/core/azure-core/src/http/curl/curl_connection_pool_private.hpp
+++ b/sdk/core/azure-core/src/http/curl/curl_connection_pool_private.hpp
@@ -11,11 +11,11 @@
 
 #include "azure/core/dll_import_export.hpp"
 #include "azure/core/http/http.hpp"
-
 #include "curl_connection_private.hpp"
 
-#include <atomic>
 #include <azure/core/http/curl_transport.hpp>
+
+#include <atomic>
 #include <condition_variable>
 #include <list>
 #include <memory>
diff --git a/sdk/core/azure-core/src/http/curl/curl_connection_private.hpp b/sdk/core/azure-core/src/http/curl/curl_connection_private.hpp
index ce6354a6c1..f2ce456b23 100644
--- a/sdk/core/azure-core/src/http/curl/curl_connection_private.hpp
+++ b/sdk/core/azure-core/src/http/curl/curl_connection_private.hpp
@@ -11,6 +11,7 @@
 
 #include "azure/core/http/http.hpp"
 #include "azure/core/internal/unique_handle.hpp"
+
 #include <chrono>
 #include <string>
 
diff --git a/sdk/core/azure-core/src/http/curl/curl_session_private.hpp b/sdk/core/azure-core/src/http/curl/curl_session_private.hpp
index 9c5ba99fab..25b3f00f1b 100644
--- a/sdk/core/azure-core/src/http/curl/curl_session_private.hpp
+++ b/sdk/core/azure-core/src/http/curl/curl_session_private.hpp
@@ -12,7 +12,6 @@
 #pragma once
 
 #include "azure/core/http/http.hpp"
-
 #include "curl_connection_pool_private.hpp"
 #include "curl_connection_private.hpp"
 
diff --git a/sdk/core/azure-core/src/http/http.cpp b/sdk/core/azure-core/src/http/http.cpp
index 0cd34fc89f..b8850f618a 100644
--- a/sdk/core/azure-core/src/http/http.cpp
+++ b/sdk/core/azure-core/src/http/http.cpp
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: MIT
 
 #include "azure/core/http/http.hpp"
+
 #include "azure/core/http/policies/policy.hpp"
 #include "azure/core/internal/strings.hpp"
 #include "azure/core/url.hpp"
diff --git a/sdk/core/azure-core/src/http/http_sanitizer.cpp b/sdk/core/azure-core/src/http/http_sanitizer.cpp
index 66792761ea..4aceede23f 100644
--- a/sdk/core/azure-core/src/http/http_sanitizer.cpp
+++ b/sdk/core/azure-core/src/http/http_sanitizer.cpp
@@ -2,7 +2,9 @@
 // SPDX-License-Identifier: MIT
 
 #include "azure/core/internal/http/http_sanitizer.hpp"
+
 #include "azure/core/url.hpp"
+
 #include <regex>
 #include <sstream>
 
diff --git a/sdk/core/azure-core/src/http/policy.cpp b/sdk/core/azure-core/src/http/policy.cpp
index 9202267f54..b1096a1ee0 100644
--- a/sdk/core/azure-core/src/http/policy.cpp
+++ b/sdk/core/azure-core/src/http/policy.cpp
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: MIT
 
 #include "azure/core/http/policies/policy.hpp"
+
 #include "azure/core/http/http.hpp"
 
 using Azure::Core::Context;
diff --git a/sdk/core/azure-core/src/http/raw_response.cpp b/sdk/core/azure-core/src/http/raw_response.cpp
index f3316d3b35..f2bca95cfe 100644
--- a/sdk/core/azure-core/src/http/raw_response.cpp
+++ b/sdk/core/azure-core/src/http/raw_response.cpp
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: MIT
 
 #include "azure/core/http/raw_response.hpp"
+
 #include "azure/core/http/http.hpp"
 
 using namespace Azure::Core::IO;
diff --git a/sdk/core/azure-core/src/http/url.cpp b/sdk/core/azure-core/src/http/url.cpp
index 9ef2faa46e..1ae3850268 100644
--- a/sdk/core/azure-core/src/http/url.cpp
+++ b/sdk/core/azure-core/src/http/url.cpp
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: MIT
 
 #include "azure/core/url.hpp"
+
 #include "azure/core/internal/strings.hpp"
 
 #include <algorithm>
diff --git a/sdk/core/azure-core/src/http/user_agent.cpp b/sdk/core/azure-core/src/http/user_agent.cpp
index 3e5ae5128b..71e829941e 100644
--- a/sdk/core/azure-core/src/http/user_agent.cpp
+++ b/sdk/core/azure-core/src/http/user_agent.cpp
@@ -7,13 +7,14 @@
  * @remark See #policy.hpp
  */
 
-#include <azure/core/internal/http/user_agent.hpp>
-
 #include "azure/core/context.hpp"
 #include "azure/core/http/policies/policy.hpp"
 #include "azure/core/internal/strings.hpp"
 #include "azure/core/internal/tracing/service_tracing.hpp"
 #include "azure/core/platform.hpp"
+
+#include <azure/core/internal/http/user_agent.hpp>
+
 #include <sstream>
 
 #if defined(AZ_PLATFORM_WINDOWS)
diff --git a/sdk/core/azure-core/src/http/winhttp/win_http_request.hpp b/sdk/core/azure-core/src/http/winhttp/win_http_request.hpp
index 97e083bff9..1eb637ee3e 100644
--- a/sdk/core/azure-core/src/http/winhttp/win_http_request.hpp
+++ b/sdk/core/azure-core/src/http/winhttp/win_http_request.hpp
@@ -12,7 +12,9 @@
 
 #include "azure/core/http/win_http_transport.hpp"
 #include "azure/core/url.hpp"
+
 #include <Windows.h>
+
 #include <memory>
 #include <mutex>
 #pragma warning(push)
diff --git a/sdk/core/azure-core/src/http/winhttp/win_http_transport.cpp b/sdk/core/azure-core/src/http/winhttp/win_http_transport.cpp
index f0276fddca..f9181f49ed 100644
--- a/sdk/core/azure-core/src/http/winhttp/win_http_transport.cpp
+++ b/sdk/core/azure-core/src/http/winhttp/win_http_transport.cpp
@@ -2,10 +2,9 @@
 // SPDX-License-Identifier: MIT
 // cspell:words HCERTIFICATECHAIN PCCERT CCERT HCERTCHAINENGINE HCERTSTORE
 
-#include "azure/core/http/http.hpp"
-
 #include "azure/core/base64.hpp"
 #include "azure/core/diagnostics/logger.hpp"
+#include "azure/core/http/http.hpp"
 #include "azure/core/internal/diagnostics/log.hpp"
 #include "azure/core/internal/strings.hpp"
 #include "azure/core/internal/unique_handle.hpp"
@@ -16,6 +15,7 @@
 #endif
 
 #include <Windows.h>
+
 #include <algorithm>
 #include <sstream>
 #include <string>
diff --git a/sdk/core/azure-core/src/io/body_stream.cpp b/sdk/core/azure-core/src/io/body_stream.cpp
index 2c2e036676..fe64affa6a 100644
--- a/sdk/core/azure-core/src/io/body_stream.cpp
+++ b/sdk/core/azure-core/src/io/body_stream.cpp
@@ -6,8 +6,9 @@
 #if defined(AZ_PLATFORM_POSIX)
 #include <errno.h>
 #include <fcntl.h> // for open and _O_RDONLY
-#include <sys/types.h> // for lseek
 #include <unistd.h> // for lseek
+
+#include <sys/types.h> // for lseek
 #elif defined(AZ_PLATFORM_WINDOWS)
 #if !defined(WIN32_LEAN_AND_MEAN)
 #define WIN32_LEAN_AND_MEAN
diff --git a/sdk/core/azure-core/src/logger.cpp b/sdk/core/azure-core/src/logger.cpp
index e502e5be99..ded80a4352 100644
--- a/sdk/core/azure-core/src/logger.cpp
+++ b/sdk/core/azure-core/src/logger.cpp
@@ -2,13 +2,13 @@
 // SPDX-License-Identifier: MIT
 
 #include "azure/core/diagnostics/logger.hpp"
+
 #include "azure/core/internal/diagnostics/log.hpp"
+#include "private/environment_log_level_listener.hpp"
 
 #include <mutex>
 #include <shared_mutex>
 
-#include "private/environment_log_level_listener.hpp"
-
 using namespace Azure::Core::Diagnostics;
 using namespace Azure::Core::Diagnostics::_internal;
 
diff --git a/sdk/core/azure-core/src/tracing/tracing.cpp b/sdk/core/azure-core/src/tracing/tracing.cpp
index f3453f78b3..a37d350d02 100644
--- a/sdk/core/azure-core/src/tracing/tracing.cpp
+++ b/sdk/core/azure-core/src/tracing/tracing.cpp
@@ -5,6 +5,7 @@
 #include "azure/core/http/policies/policy.hpp"
 #include "azure/core/internal/tracing/service_tracing.hpp"
 #include "azure/core/internal/tracing/tracing_impl.hpp"
+
 #include <sstream>
 
 namespace Azure { namespace Core { namespace Tracing { namespace _internal {
diff --git a/sdk/core/azure-core/test/libcurl-stress-test/libcurl_stress_test.cpp b/sdk/core/azure-core/test/libcurl-stress-test/libcurl_stress_test.cpp
index 06a4b4709b..e5c74247d4 100644
--- a/sdk/core/azure-core/test/libcurl-stress-test/libcurl_stress_test.cpp
+++ b/sdk/core/azure-core/test/libcurl-stress-test/libcurl_stress_test.cpp
@@ -16,6 +16,7 @@
 
 #include <azure/core.hpp>
 #include <azure/core/http/curl_transport.hpp>
+
 #include <iostream>
 
 void SendRequest(std::string target)
diff --git a/sdk/core/azure-core/test/perf/src/azure_core_perf_test.cpp b/sdk/core/azure-core/test/perf/src/azure_core_perf_test.cpp
index 880eab2584..e512b23473 100644
--- a/sdk/core/azure-core/test/perf/src/azure_core_perf_test.cpp
+++ b/sdk/core/azure-core/test/perf/src/azure_core_perf_test.cpp
@@ -1,11 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/perf.hpp>
-
 #include "azure/core/test/nullable_test.hpp"
 #include "azure/core/test/uuid_test.hpp"
 
+#include <azure/perf.hpp>
+
 #include <vector>
 
 int main(int argc, char** argv)
diff --git a/sdk/core/azure-core/test/ut/azure_core_test.cpp b/sdk/core/azure-core/test/ut/azure_core_test.cpp
index 1b257efd75..a80ec4e072 100644
--- a/sdk/core/azure-core/test/ut/azure_core_test.cpp
+++ b/sdk/core/azure-core/test/ut/azure_core_test.cpp
@@ -1,13 +1,14 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <gtest/gtest.h>
-
 #include "azure/core/internal/diagnostics/global_exception.hpp"
 #include "azure/core/platform.hpp"
+
 #include <csignal>
 #include <iostream>
 
+#include <gtest/gtest.h>
+
 int main(int argc, char** argv)
 {
 #if defined(AZ_PLATFORM_POSIX)
diff --git a/sdk/core/azure-core/test/ut/azure_libcurl_core_main_test.cpp b/sdk/core/azure-core/test/ut/azure_libcurl_core_main_test.cpp
index 169919e835..2f50d25f16 100644
--- a/sdk/core/azure-core/test/ut/azure_libcurl_core_main_test.cpp
+++ b/sdk/core/azure-core/test/ut/azure_libcurl_core_main_test.cpp
@@ -13,11 +13,6 @@
 #if !defined(NOMINMAX)
 #define NOMINMAX
 #endif
-#include <csignal>
-#include <cstdlib>
-
-#include <gtest/gtest.h>
-
 #include "azure/core/context.hpp"
 #include "azure/core/http/curl_transport.hpp"
 #include "azure/core/http/http.hpp"
@@ -29,6 +24,11 @@
 #include "http/curl/curl_connection_private.hpp"
 #include "http/curl/curl_session_private.hpp"
 
+#include <csignal>
+#include <cstdlib>
+
+#include <gtest/gtest.h>
+
 namespace Azure { namespace Core { namespace Test {
   TEST(SdkWithLibcurl, globalCleanUp)
   {
diff --git a/sdk/core/azure-core/test/ut/base64_test.cpp b/sdk/core/azure-core/test/ut/base64_test.cpp
index bb11e7a159..c36f82a9ae 100644
--- a/sdk/core/azure-core/test/ut/base64_test.cpp
+++ b/sdk/core/azure-core/test/ut/base64_test.cpp
@@ -2,11 +2,13 @@
 // SPDX-License-Identifier: MIT
 
 #include <azure/core/base64.hpp>
-#include <gtest/gtest.h>
+
 #include <random>
 #include <string>
 #include <vector>
 
+#include <gtest/gtest.h>
+
 using namespace Azure::Core;
 
 TEST(Base64, Basic)
diff --git a/sdk/core/azure-core/test/ut/bearer_token_authentication_policy_test.cpp b/sdk/core/azure-core/test/ut/bearer_token_authentication_policy_test.cpp
index 7f62e91c88..cec24d5a38 100644
--- a/sdk/core/azure-core/test/ut/bearer_token_authentication_policy_test.cpp
+++ b/sdk/core/azure-core/test/ut/bearer_token_authentication_policy_test.cpp
@@ -1,9 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/core/http/policies/policy.hpp>
-
 #include <azure/core/credentials/credentials.hpp>
+#include <azure/core/http/policies/policy.hpp>
 #include <azure/core/internal/http/pipeline.hpp>
 
 #include <gtest/gtest.h>
diff --git a/sdk/core/azure-core/test/ut/bodystream_test.cpp b/sdk/core/azure-core/test/ut/bodystream_test.cpp
index 446a435ea3..0f3de5b6b5 100644
--- a/sdk/core/azure-core/test/ut/bodystream_test.cpp
+++ b/sdk/core/azure-core/test/ut/bodystream_test.cpp
@@ -17,10 +17,10 @@
 #include <windows.h>
 #endif
 
-#include <gtest/gtest.h>
-
 #include <azure/core/io/body_stream.hpp>
 
+#include <gtest/gtest.h>
+
 using namespace Azure::Core::IO;
 using namespace Azure::Core;
 
diff --git a/sdk/core/azure-core/test/ut/case_insensitive_containers_test.cpp b/sdk/core/azure-core/test/ut/case_insensitive_containers_test.cpp
index e02b99cd4b..6193978425 100644
--- a/sdk/core/azure-core/test/ut/case_insensitive_containers_test.cpp
+++ b/sdk/core/azure-core/test/ut/case_insensitive_containers_test.cpp
@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <gtest/gtest.h>
-
 #include <azure/core/case_insensitive_containers.hpp>
 
+#include <gtest/gtest.h>
+
 using namespace Azure::Core;
 
 TEST(CaseInsensitiveMap, Find)
diff --git a/sdk/core/azure-core/test/ut/client_options_test.cpp b/sdk/core/azure-core/test/ut/client_options_test.cpp
index 367c40e3ed..b8060af0a7 100644
--- a/sdk/core/azure-core/test/ut/client_options_test.cpp
+++ b/sdk/core/azure-core/test/ut/client_options_test.cpp
@@ -6,11 +6,12 @@
 #include <azure/core/http/policies/policy.hpp>
 #include <azure/core/http/transport.hpp>
 #include <azure/core/internal/client_options.hpp>
-#include <gtest/gtest.h>
 
 #include <memory>
 #include <vector>
 
+#include <gtest/gtest.h>
+
 using namespace Azure::Core;
 using namespace Azure::Core::_internal;
 using namespace Azure::Core::Http;
diff --git a/sdk/core/azure-core/test/ut/context_test.cpp b/sdk/core/azure-core/test/ut/context_test.cpp
index 0eb9e72df0..5d54102556 100644
--- a/sdk/core/azure-core/test/ut/context_test.cpp
+++ b/sdk/core/azure-core/test/ut/context_test.cpp
@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <gtest/gtest.h>
-
 #include <azure/core/context.hpp>
 #include <azure/core/tracing/tracing.hpp>
 
@@ -12,6 +10,8 @@
 #include <thread>
 #include <vector>
 
+#include <gtest/gtest.h>
+
 using namespace Azure::Core;
 
 TEST(Context, Basic)
diff --git a/sdk/core/azure-core/test/ut/curl_connection_pool_test.cpp b/sdk/core/azure-core/test/ut/curl_connection_pool_test.cpp
index a02b2eec1d..23b43b48b3 100644
--- a/sdk/core/azure-core/test/ut/curl_connection_pool_test.cpp
+++ b/sdk/core/azure-core/test/ut/curl_connection_pool_test.cpp
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: MIT
 
 #include "transport_adapter_base_test.hpp"
+
 #include <azure/core/context.hpp>
 #include <azure/core/http/policies/policy.hpp>
 #include <azure/core/response.hpp>
@@ -16,12 +17,12 @@
 
 // The next includes are from Azure Core private headers.
 // They are included to test the connection pool from the libcurl transport adapter implementation.
+#include "curl_session_test.hpp"
+
 #include <http/curl/curl_connection_pool_private.hpp>
 #include <http/curl/curl_connection_private.hpp>
 #include <http/curl/curl_session_private.hpp>
 
-#include "curl_session_test.hpp"
-
 using testing::ValuesIn;
 using namespace Azure::Core::Http::_detail;
 using namespace std::chrono_literals;
diff --git a/sdk/core/azure-core/test/ut/curl_options_test.cpp b/sdk/core/azure-core/test/ut/curl_options_test.cpp
index a1ffdf3aab..34e76a5fee 100644
--- a/sdk/core/azure-core/test/ut/curl_options_test.cpp
+++ b/sdk/core/azure-core/test/ut/curl_options_test.cpp
@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <gtest/gtest.h>
-
 #include <azure/core/context.hpp>
 #include <azure/core/http/http.hpp>
 #include <azure/core/http/policies/policy.hpp>
@@ -10,19 +8,21 @@
 #include <azure/core/internal/http/pipeline.hpp>
 #include <azure/core/response.hpp>
 
+#include <gtest/gtest.h>
+
 #if defined(BUILD_CURL_HTTP_TRANSPORT_ADAPTER)
 #include "azure/core/http/curl_transport.hpp"
 #endif
 
-#include <http/curl/curl_connection_pool_private.hpp>
-#include <http/curl/curl_connection_private.hpp>
-#include <http/curl/curl_session_private.hpp>
-
 #include "transport_adapter_base_test.hpp"
 
 #include <string>
 #include <vector>
 
+#include <http/curl/curl_connection_pool_private.hpp>
+#include <http/curl/curl_connection_private.hpp>
+#include <http/curl/curl_session_private.hpp>
+
 namespace Azure { namespace Core { namespace Test {
 
   // proxy server can take some minutes to handle the request. Only testing HTTP proxy
diff --git a/sdk/core/azure-core/test/ut/curl_session_test.hpp b/sdk/core/azure-core/test/ut/curl_session_test.hpp
index f84c11398e..936fb206cb 100644
--- a/sdk/core/azure-core/test/ut/curl_session_test.hpp
+++ b/sdk/core/azure-core/test/ut/curl_session_test.hpp
@@ -19,10 +19,11 @@
 #endif // _MSC_VER
 
 #include <azure/core/http/curl_transport.hpp>
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+
 #include <string>
 
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
 #include <http/curl/curl_connection_pool_private.hpp>
 
 namespace Azure { namespace Core { namespace Test {
diff --git a/sdk/core/azure-core/test/ut/datetime_test.cpp b/sdk/core/azure-core/test/ut/datetime_test.cpp
index eaf59d0186..99bcc83c39 100644
--- a/sdk/core/azure-core/test/ut/datetime_test.cpp
+++ b/sdk/core/azure-core/test/ut/datetime_test.cpp
@@ -1,14 +1,14 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <gtest/gtest.h>
-
 #include <azure/core/datetime.hpp>
 
 #include <chrono>
 #include <ctime>
 #include <limits>
 
+#include <gtest/gtest.h>
+
 using namespace Azure;
 
 // cspell:words AGMT, CEST
diff --git a/sdk/core/azure-core/test/ut/environment_log_level_listener_test.cpp b/sdk/core/azure-core/test/ut/environment_log_level_listener_test.cpp
index 85f3b009fe..dae8a371f5 100644
--- a/sdk/core/azure-core/test/ut/environment_log_level_listener_test.cpp
+++ b/sdk/core/azure-core/test/ut/environment_log_level_listener_test.cpp
@@ -1,11 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <private/environment_log_level_listener.hpp>
-
 #include <azure/core/internal/environment.hpp>
 
 #include <gtest/gtest.h>
+#include <private/environment_log_level_listener.hpp>
 
 using Azure::Core::Diagnostics::Logger;
 using Azure::Core::Diagnostics::_detail::EnvironmentLogLevelListener;
diff --git a/sdk/core/azure-core/test/ut/etag_test.cpp b/sdk/core/azure-core/test/ut/etag_test.cpp
index 07db77bfc5..bc5cb3d983 100644
--- a/sdk/core/azure-core/test/ut/etag_test.cpp
+++ b/sdk/core/azure-core/test/ut/etag_test.cpp
@@ -1,12 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 #include "test_traits.hpp"
-#include <gtest/gtest.h>
 
 #include <azure/core/etag.hpp>
 
 #include <limits>
 
+#include <gtest/gtest.h>
+
 using namespace Azure;
 
 TEST(ETag, ToString)
diff --git a/sdk/core/azure-core/test/ut/exception_test.cpp b/sdk/core/azure-core/test/ut/exception_test.cpp
index 023d1e0457..4077cfdd33 100644
--- a/sdk/core/azure-core/test/ut/exception_test.cpp
+++ b/sdk/core/azure-core/test/ut/exception_test.cpp
@@ -3,9 +3,11 @@
 
 #include <azure/core/exception.hpp>
 #include <azure/core/http/http.hpp>
-#include <gtest/gtest.h>
+
 #include <string>
 
+#include <gtest/gtest.h>
+
 using namespace Azure::Core;
 using namespace Azure::Core::Http::_internal;
 
diff --git a/sdk/core/azure-core/test/ut/extendable_enumeration_test.cpp b/sdk/core/azure-core/test/ut/extendable_enumeration_test.cpp
index 2747466f40..01af12da40 100644
--- a/sdk/core/azure-core/test/ut/extendable_enumeration_test.cpp
+++ b/sdk/core/azure-core/test/ut/extendable_enumeration_test.cpp
@@ -2,9 +2,11 @@
 // SPDX-License-Identifier: MIT
 
 #include <azure/core/internal/extendable_enumeration.hpp>
-#include <gtest/gtest.h>
+
 #include <string>
 
+#include <gtest/gtest.h>
+
 using namespace Azure::Core;
 
 class MyEnum : public Azure::Core::_internal::ExtendableEnumeration<MyEnum> {
diff --git a/sdk/core/azure-core/test/ut/global_context_test.cpp b/sdk/core/azure-core/test/ut/global_context_test.cpp
index c642b3acb5..ce2a7d1754 100644
--- a/sdk/core/azure-core/test/ut/global_context_test.cpp
+++ b/sdk/core/azure-core/test/ut/global_context_test.cpp
@@ -10,14 +10,14 @@
  *
  */
 
-#include <gtest/gtest.h>
-
 #include <azure/core/context.hpp>
 
 #include <chrono>
 #include <string>
 #include <thread>
 
+#include <gtest/gtest.h>
+
 using namespace Azure::Core;
 
 TEST(Context, ApplicationContext)
diff --git a/sdk/core/azure-core/test/ut/http_method_test.cpp b/sdk/core/azure-core/test/ut/http_method_test.cpp
index a5ad171b69..45f05da8b3 100644
--- a/sdk/core/azure-core/test/ut/http_method_test.cpp
+++ b/sdk/core/azure-core/test/ut/http_method_test.cpp
@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <gtest/gtest.h>
-
 #include <azure/core/http/http.hpp>
 
+#include <gtest/gtest.h>
+
 using namespace Azure::Core::Http;
 
 // cSpell:words humuhumunukunukuapuaa
diff --git a/sdk/core/azure-core/test/ut/http_test.cpp b/sdk/core/azure-core/test/ut/http_test.cpp
index 9a90c23d4c..2f30f33afd 100644
--- a/sdk/core/azure-core/test/ut/http_test.cpp
+++ b/sdk/core/azure-core/test/ut/http_test.cpp
@@ -1,9 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <gtest/gtest.h>
-
 #include "http_test.hpp"
+
 #include <azure/core/http/http.hpp>
 #include <azure/core/internal/io/null_body_stream.hpp>
 #include <azure/core/rtti.hpp>
@@ -12,6 +11,8 @@
 #include <utility>
 #include <vector>
 
+#include <gtest/gtest.h>
+
 using namespace Azure::Core;
 
 namespace Azure { namespace Core { namespace Test {
diff --git a/sdk/core/azure-core/test/ut/http_test.hpp b/sdk/core/azure-core/test/ut/http_test.hpp
index 0772748ce1..102d2e5686 100644
--- a/sdk/core/azure-core/test/ut/http_test.hpp
+++ b/sdk/core/azure-core/test/ut/http_test.hpp
@@ -7,10 +7,10 @@
  *
  */
 
-#include <gtest/gtest.h>
-
 #include <azure/core/http/http.hpp>
 
+#include <gtest/gtest.h>
+
 namespace Azure { namespace Core { namespace Test {
 
   class TestHttp : public ::testing::Test {
diff --git a/sdk/core/azure-core/test/ut/json_test.cpp b/sdk/core/azure-core/test/ut/json_test.cpp
index 7fdf2c21d4..cf9850f00c 100644
--- a/sdk/core/azure-core/test/ut/json_test.cpp
+++ b/sdk/core/azure-core/test/ut/json_test.cpp
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: MIT
 
 #include <azure/core/internal/json/json.hpp>
+
 #include <gtest/gtest.h>
 
 using json = Azure::Core::Json::_internal::json;
diff --git a/sdk/core/azure-core/test/ut/logging_test.cpp b/sdk/core/azure-core/test/ut/logging_test.cpp
index 90c01e851d..d71e7250b2 100644
--- a/sdk/core/azure-core/test/ut/logging_test.cpp
+++ b/sdk/core/azure-core/test/ut/logging_test.cpp
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: MIT
 
 #include <azure/core/internal/diagnostics/log.hpp>
+
 #include <gtest/gtest.h>
 
 using Azure::Core::Diagnostics::Logger;
diff --git a/sdk/core/azure-core/test/ut/match_conditions_test.cpp b/sdk/core/azure-core/test/ut/match_conditions_test.cpp
index f588cb01a9..95575be089 100644
--- a/sdk/core/azure-core/test/ut/match_conditions_test.cpp
+++ b/sdk/core/azure-core/test/ut/match_conditions_test.cpp
@@ -3,9 +3,11 @@
 
 #include <azure/core/etag.hpp>
 #include <azure/core/match_conditions.hpp>
-#include <gtest/gtest.h>
+
 #include <string>
 
+#include <gtest/gtest.h>
+
 using namespace Azure;
 
 TEST(MatchConditions, Basic)
diff --git a/sdk/core/azure-core/test/ut/md5_test.cpp b/sdk/core/azure-core/test/ut/md5_test.cpp
index 792fa3d75c..dc19426272 100644
--- a/sdk/core/azure-core/test/ut/md5_test.cpp
+++ b/sdk/core/azure-core/test/ut/md5_test.cpp
@@ -1,16 +1,18 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <algorithm>
 #include <azure/core/base64.hpp>
 #include <azure/core/cryptography/hash.hpp>
+
+#include <algorithm>
 #include <chrono>
-#include <gtest/gtest.h>
 #include <random>
 #include <string>
 #include <thread>
 #include <vector>
 
+#include <gtest/gtest.h>
+
 using namespace Azure::Core::Cryptography;
 
 static std::vector<uint8_t> ComputeHash(const std::string& data)
diff --git a/sdk/core/azure-core/test/ut/modified_conditions_test.cpp b/sdk/core/azure-core/test/ut/modified_conditions_test.cpp
index 676f591289..8486ff7a19 100644
--- a/sdk/core/azure-core/test/ut/modified_conditions_test.cpp
+++ b/sdk/core/azure-core/test/ut/modified_conditions_test.cpp
@@ -3,10 +3,12 @@
 
 #include <azure/core/datetime.hpp>
 #include <azure/core/modified_conditions.hpp>
-#include <gtest/gtest.h>
+
 #include <string>
 #include <vector>
 
+#include <gtest/gtest.h>
+
 using namespace Azure;
 
 TEST(ModifiedConditions, Basic)
diff --git a/sdk/core/azure-core/test/ut/nullable_test.cpp b/sdk/core/azure-core/test/ut/nullable_test.cpp
index adee4830d3..a9f05a320f 100644
--- a/sdk/core/azure-core/test/ut/nullable_test.cpp
+++ b/sdk/core/azure-core/test/ut/nullable_test.cpp
@@ -2,10 +2,12 @@
 // SPDX-License-Identifier: MIT
 
 #include <azure/core/nullable.hpp>
-#include <gtest/gtest.h>
+
 #include <string>
 #include <vector>
 
+#include <gtest/gtest.h>
+
 using namespace Azure;
 
 TEST(Nullable, Basic)
diff --git a/sdk/core/azure-core/test/ut/operation_status_test.cpp b/sdk/core/azure-core/test/ut/operation_status_test.cpp
index a613a7e37d..2274a25d84 100644
--- a/sdk/core/azure-core/test/ut/operation_status_test.cpp
+++ b/sdk/core/azure-core/test/ut/operation_status_test.cpp
@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <gtest/gtest.h>
-
 #include <azure/core/operation_status.hpp>
 
+#include <gtest/gtest.h>
+
 using namespace Azure::Core;
 
 TEST(OperationStatus, Basic)
diff --git a/sdk/core/azure-core/test/ut/operation_test.cpp b/sdk/core/azure-core/test/ut/operation_test.cpp
index f76755d939..03dd493a5f 100644
--- a/sdk/core/azure-core/test/ut/operation_test.cpp
+++ b/sdk/core/azure-core/test/ut/operation_test.cpp
@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <gtest/gtest.h>
-
 #include "operation_test.hpp"
 
 #include <azure/core/context.hpp>
@@ -11,6 +9,8 @@
 
 #include <chrono>
 
+#include <gtest/gtest.h>
+
 using namespace Azure::Core;
 using namespace Azure::Core::Test;
 using namespace std::literals;
diff --git a/sdk/core/azure-core/test/ut/operation_test.hpp b/sdk/core/azure-core/test/ut/operation_test.hpp
index b585eeb798..21c8923b89 100644
--- a/sdk/core/azure-core/test/ut/operation_test.hpp
+++ b/sdk/core/azure-core/test/ut/operation_test.hpp
@@ -8,10 +8,13 @@
 #include <azure/core/operation.hpp>
 #include <azure/core/operation_status.hpp>
 #include <azure/core/response.hpp>
+
 #include <memory>
 #include <string>
 #include <thread>
 
+#include <gtest/gtest.h>
+
 namespace Azure { namespace Core { namespace Test {
 
   class StringClient;
diff --git a/sdk/core/azure-core/test/ut/pipeline_test.cpp b/sdk/core/azure-core/test/ut/pipeline_test.cpp
index cabd6c5d04..43478ce378 100644
--- a/sdk/core/azure-core/test/ut/pipeline_test.cpp
+++ b/sdk/core/azure-core/test/ut/pipeline_test.cpp
@@ -3,10 +3,11 @@
 
 #include <azure/core/http/policies/policy.hpp>
 #include <azure/core/internal/http/pipeline.hpp>
-#include <gtest/gtest.h>
 
 #include <vector>
 
+#include <gtest/gtest.h>
+
 TEST(Pipeline, createPipeline)
 {
   // Construct pipeline without exception
diff --git a/sdk/core/azure-core/test/ut/policy_test.cpp b/sdk/core/azure-core/test/ut/policy_test.cpp
index 3b57dd00c9..8971cf6edc 100644
--- a/sdk/core/azure-core/test/ut/policy_test.cpp
+++ b/sdk/core/azure-core/test/ut/policy_test.cpp
@@ -3,10 +3,11 @@
 
 #include <azure/core/http/policies/policy.hpp>
 #include <azure/core/internal/http/pipeline.hpp>
-#include <gtest/gtest.h>
 
 #include <vector>
 
+#include <gtest/gtest.h>
+
 namespace {
 class NoOpPolicy final : public Azure::Core::Http::Policies::HttpPolicy {
 public:
diff --git a/sdk/core/azure-core/test/ut/request_activity_policy_test.cpp b/sdk/core/azure-core/test/ut/request_activity_policy_test.cpp
index 2af4ddb13a..16af896dcb 100644
--- a/sdk/core/azure-core/test/ut/request_activity_policy_test.cpp
+++ b/sdk/core/azure-core/test/ut/request_activity_policy_test.cpp
@@ -5,9 +5,11 @@
 #include "azure/core/internal/http/pipeline.hpp"
 #include "azure/core/internal/tracing/service_tracing.hpp"
 #include "azure/core/tracing/tracing.hpp"
-#include <gtest/gtest.h>
+
 #include <list>
 
+#include <gtest/gtest.h>
+
 using namespace Azure::Core;
 using namespace Azure::Core::Http;
 using namespace Azure::Core::Http::Policies;
diff --git a/sdk/core/azure-core/test/ut/response_t_test.cpp b/sdk/core/azure-core/test/ut/response_t_test.cpp
index ee7f89595e..d368ce1424 100644
--- a/sdk/core/azure-core/test/ut/response_t_test.cpp
+++ b/sdk/core/azure-core/test/ut/response_t_test.cpp
@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <gtest/gtest.h>
-
 #include <azure/core/http/http.hpp>
 #include <azure/core/response.hpp>
 
@@ -10,6 +8,8 @@
 #include <stdexcept>
 #include <string>
 
+#include <gtest/gtest.h>
+
 using namespace Azure::Core;
 using namespace Azure::Core::Http;
 
diff --git a/sdk/core/azure-core/test/ut/retry_policy_test.cpp b/sdk/core/azure-core/test/ut/retry_policy_test.cpp
index da2db233da..10bab673c8 100644
--- a/sdk/core/azure-core/test/ut/retry_policy_test.cpp
+++ b/sdk/core/azure-core/test/ut/retry_policy_test.cpp
@@ -5,10 +5,10 @@
 #include "azure/core/http/policies/policy.hpp"
 #include "azure/core/internal/http/pipeline.hpp"
 
-#include <gtest/gtest.h>
-
 #include <functional>
 
+#include <gtest/gtest.h>
+
 using namespace Azure::Core::Http;
 using namespace Azure::Core::Http::Policies;
 using namespace Azure::Core::Http::Policies::_internal;
diff --git a/sdk/core/azure-core/test/ut/service_tracing_test.cpp b/sdk/core/azure-core/test/ut/service_tracing_test.cpp
index 1823938f5c..b8d109d8b7 100644
--- a/sdk/core/azure-core/test/ut/service_tracing_test.cpp
+++ b/sdk/core/azure-core/test/ut/service_tracing_test.cpp
@@ -2,7 +2,9 @@
 // SPDX-License-Identifier: MIT
 
 #include "azure/core/internal/tracing/tracing_impl.hpp"
+
 #include <azure/core/internal/tracing/service_tracing.hpp>
+
 #include <gtest/gtest.h>
 
 using namespace Azure::Core;
@@ -39,6 +41,7 @@ TEST(TracingContextFactory, ServiceTraceEnums)
 
 #include <azure/core/http/policies/policy.hpp>
 #include <azure/core/internal/http/pipeline.hpp>
+
 #include <gtest/gtest.h>
 
 using namespace Azure::Core;
diff --git a/sdk/core/azure-core/test/ut/sha_test.cpp b/sdk/core/azure-core/test/ut/sha_test.cpp
index 826f805503..868df62379 100644
--- a/sdk/core/azure-core/test/ut/sha_test.cpp
+++ b/sdk/core/azure-core/test/ut/sha_test.cpp
@@ -1,9 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "gtest/gtest.h"
-
 #include "azure/core/internal/cryptography/sha_hash.hpp"
+#include "gtest/gtest.h"
 
 using namespace Azure::Core::Cryptography::_internal;
 
diff --git a/sdk/core/azure-core/test/ut/simplified_header_test.cpp b/sdk/core/azure-core/test/ut/simplified_header_test.cpp
index e5db883674..3f396340b5 100644
--- a/sdk/core/azure-core/test/ut/simplified_header_test.cpp
+++ b/sdk/core/azure-core/test/ut/simplified_header_test.cpp
@@ -18,10 +18,11 @@
 #endif // _MSC_VER
 
 #include <azure/core.hpp>
-#include <gtest/gtest.h>
 
 #include <vector>
 
+#include <gtest/gtest.h>
+
 class DllExportTest final {
   AZ_CORE_DLLEXPORT static const bool DllExportHIncluded;
 };
diff --git a/sdk/core/azure-core/test/ut/string_test.cpp b/sdk/core/azure-core/test/ut/string_test.cpp
index acc0d252ab..d4da2e8c6e 100644
--- a/sdk/core/azure-core/test/ut/string_test.cpp
+++ b/sdk/core/azure-core/test/ut/string_test.cpp
@@ -2,11 +2,12 @@
 // SPDX-License-Identifier: MIT
 
 #include <azure/core/internal/strings.hpp>
-#include <gtest/gtest.h>
 
 #include <locale>
 #include <string>
 
+#include <gtest/gtest.h>
+
 TEST(String, invariantCompare)
 {
   using Azure::Core::_internal::StringExtensions;
diff --git a/sdk/core/azure-core/test/ut/telemetry_policy_test.cpp b/sdk/core/azure-core/test/ut/telemetry_policy_test.cpp
index ee4e4b6756..348483b592 100644
--- a/sdk/core/azure-core/test/ut/telemetry_policy_test.cpp
+++ b/sdk/core/azure-core/test/ut/telemetry_policy_test.cpp
@@ -3,6 +3,7 @@
 
 #include <azure/core/http/policies/policy.hpp>
 #include <azure/core/internal/http/pipeline.hpp>
+
 #include <gtest/gtest.h>
 
 using namespace Azure::Core;
diff --git a/sdk/core/azure-core/test/ut/transport_adapter_base_test.cpp b/sdk/core/azure-core/test/ut/transport_adapter_base_test.cpp
index f1ad6dca73..df7a333e42 100644
--- a/sdk/core/azure-core/test/ut/transport_adapter_base_test.cpp
+++ b/sdk/core/azure-core/test/ut/transport_adapter_base_test.cpp
@@ -17,8 +17,10 @@
 #endif
 
 #include "transport_adapter_base_test.hpp"
+
 #include <azure/core/context.hpp>
 #include <azure/core/response.hpp>
+
 #include <iostream>
 #include <string>
 #include <thread>
diff --git a/sdk/core/azure-core/test/ut/transport_adapter_base_test.hpp b/sdk/core/azure-core/test/ut/transport_adapter_base_test.hpp
index 768ba51175..ec108b8ba3 100644
--- a/sdk/core/azure-core/test/ut/transport_adapter_base_test.hpp
+++ b/sdk/core/azure-core/test/ut/transport_adapter_base_test.hpp
@@ -12,11 +12,12 @@
 #include <azure/core/http/http.hpp>
 #include <azure/core/internal/http/pipeline.hpp>
 #include <azure/core/io/body_stream.hpp>
-#include <gtest/gtest.h>
 
 #include <memory>
 #include <vector>
 
+#include <gtest/gtest.h>
+
 namespace Azure { namespace Core { namespace Test {
 
   namespace _detail {
diff --git a/sdk/core/azure-core/test/ut/transport_policy_options.cpp b/sdk/core/azure-core/test/ut/transport_policy_options.cpp
index ee11723a9c..1a6b13a5cd 100644
--- a/sdk/core/azure-core/test/ut/transport_policy_options.cpp
+++ b/sdk/core/azure-core/test/ut/transport_policy_options.cpp
@@ -13,11 +13,13 @@
 #include "azure/core/internal/json/json.hpp"
 #include "azure/core/platform.hpp"
 #include "azure/core/response.hpp"
-#include <gtest/gtest.h>
+
 #include <iostream>
 #include <string>
 #include <thread>
 
+#include <gtest/gtest.h>
+
 using namespace std::chrono_literals;
 
 namespace Azure { namespace Core { namespace Test {
diff --git a/sdk/core/azure-core/test/ut/url_test.cpp b/sdk/core/azure-core/test/ut/url_test.cpp
index a15a715b04..7eb0e780ca 100644
--- a/sdk/core/azure-core/test/ut/url_test.cpp
+++ b/sdk/core/azure-core/test/ut/url_test.cpp
@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <gtest/gtest.h>
-
 #include <azure/core/http/http.hpp>
 
+#include <gtest/gtest.h>
+
 namespace Azure { namespace Core { namespace Test {
 
   class TestURL : public ::testing::Test {
diff --git a/sdk/core/azure-core/test/ut/uuid_test.cpp b/sdk/core/azure-core/test/ut/uuid_test.cpp
index 1f47839da3..71b118ddca 100644
--- a/sdk/core/azure-core/test/ut/uuid_test.cpp
+++ b/sdk/core/azure-core/test/ut/uuid_test.cpp
@@ -2,10 +2,12 @@
 // SPDX-License-Identifier: MIT
 
 #include <azure/core/uuid.hpp>
-#include <gtest/gtest.h>
+
 #include <set>
 #include <string>
 
+#include <gtest/gtest.h>
+
 using namespace Azure::Core;
 
 TEST(Uuid, Basic)
diff --git a/sdk/core/perf/inc/azure/perf/base_test.hpp b/sdk/core/perf/inc/azure/perf/base_test.hpp
index 18a0e9ee9f..d4a300dde9 100644
--- a/sdk/core/perf/inc/azure/perf/base_test.hpp
+++ b/sdk/core/perf/inc/azure/perf/base_test.hpp
@@ -11,6 +11,7 @@
 
 #include "azure/perf/options.hpp"
 #include "azure/perf/test_options.hpp"
+
 #include <azure/core/context.hpp>
 #include <azure/core/internal/client_options.hpp>
 #include <azure/core/url.hpp>
diff --git a/sdk/core/perf/inc/azure/perf/options.hpp b/sdk/core/perf/inc/azure/perf/options.hpp
index 6c54433fa0..fc0b45be2c 100644
--- a/sdk/core/perf/inc/azure/perf/options.hpp
+++ b/sdk/core/perf/inc/azure/perf/options.hpp
@@ -9,8 +9,6 @@
 
 #pragma once
 
-#include <string>
-
 #include "azure/core/nullable.hpp"
 #include "azure/perf/argagg.hpp"
 #include "azure/perf/dynamic_test_options.hpp"
@@ -19,6 +17,7 @@
 #include <azure/core/internal/json/json.hpp>
 
 #include <iostream>
+#include <string>
 #include <vector>
 
 namespace Azure { namespace Perf {
diff --git a/sdk/core/perf/src/program.cpp b/sdk/core/perf/src/program.cpp
index c788388c72..8c0c1ce2ff 100644
--- a/sdk/core/perf/src/program.cpp
+++ b/sdk/core/perf/src/program.cpp
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: MIT
 
 #include "azure/perf/program.hpp"
+
 #include "azure/perf/argagg.hpp"
 
 #include <azure/core/internal/diagnostics/global_exception.hpp>
diff --git a/sdk/core/perf/src/random_stream.cpp b/sdk/core/perf/src/random_stream.cpp
index a32e3ec58a..93f05f1651 100644
--- a/sdk/core/perf/src/random_stream.cpp
+++ b/sdk/core/perf/src/random_stream.cpp
@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/core/platform.hpp>
-
 #include "azure/perf/random_stream.hpp"
 
+#include <azure/core/platform.hpp>
+
 #if defined(AZ_PLATFORM_WINDOWS)
 #if !defined(WIN32_LEAN_AND_MEAN)
 #define WIN32_LEAN_AND_MEAN
diff --git a/sdk/core/perf/test/inc/azure/perf/test/http_client_get_test.hpp b/sdk/core/perf/test/inc/azure/perf/test/http_client_get_test.hpp
index 7e206e8de9..f65dc7e3de 100644
--- a/sdk/core/perf/test/inc/azure/perf/test/http_client_get_test.hpp
+++ b/sdk/core/perf/test/inc/azure/perf/test/http_client_get_test.hpp
@@ -9,11 +9,10 @@
 
 #pragma once
 
-#include <azure/perf.hpp>
-
 #include <azure/core/http/http.hpp>
 #include <azure/core/http/transport.hpp>
 #include <azure/core/io/body_stream.hpp>
+#include <azure/perf.hpp>
 
 #include <memory>
 #include <vector>
diff --git a/sdk/core/perf/test/inc/azure/perf/test/http_pipeline_get_test.hpp b/sdk/core/perf/test/inc/azure/perf/test/http_pipeline_get_test.hpp
index 6fe16f62b0..c89d9e7b7d 100644
--- a/sdk/core/perf/test/inc/azure/perf/test/http_pipeline_get_test.hpp
+++ b/sdk/core/perf/test/inc/azure/perf/test/http_pipeline_get_test.hpp
@@ -9,12 +9,11 @@
 
 #pragma once
 
-#include <azure/perf.hpp>
-
 #include <azure/core/http/http.hpp>
 #include <azure/core/http/transport.hpp>
 #include <azure/core/internal/http/pipeline.hpp>
 #include <azure/core/io/body_stream.hpp>
+#include <azure/perf.hpp>
 
 #include <memory>
 #include <vector>
diff --git a/sdk/core/perf/test/src/perf_test.cpp b/sdk/core/perf/test/src/perf_test.cpp
index bbe9cd2d46..f91bec8db1 100644
--- a/sdk/core/perf/test/src/perf_test.cpp
+++ b/sdk/core/perf/test/src/perf_test.cpp
@@ -1,11 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/perf.hpp>
-
 #include "azure/perf/test/delay_test.hpp"
 #include "azure/perf/test/extended_options_test.hpp"
 #include "azure/perf/test/http_pipeline_get_test.hpp"
+
+#include <azure/perf.hpp>
 #if defined(BUILD_CURL_HTTP_TRANSPORT_ADAPTER)
 #include "azure/perf/test/curl_http_client_get_test.hpp"
 #endif
diff --git a/sdk/core/perf/test/src/random_stream_test.cpp b/sdk/core/perf/test/src/random_stream_test.cpp
index ea495f36dd..863aa6cd72 100644
--- a/sdk/core/perf/test/src/random_stream_test.cpp
+++ b/sdk/core/perf/test/src/random_stream_test.cpp
@@ -1,11 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <gtest/gtest.h>
-
 #include <azure/perf/random_stream.hpp>
+
 #include <vector>
 
+#include <gtest/gtest.h>
+
 TEST(circular_stream, basic)
 {
   size_t const totalSize = 1024 * 1024 * 3; // should give 5 loops
diff --git a/sdk/eventhubs/azure-messaging-eventhubs/src/eventhubs.cpp b/sdk/eventhubs/azure-messaging-eventhubs/src/eventhubs.cpp
index 3996624565..acc9ac3a26 100644
--- a/sdk/eventhubs/azure-messaging-eventhubs/src/eventhubs.cpp
+++ b/sdk/eventhubs/azure-messaging-eventhubs/src/eventhubs.cpp
@@ -2,6 +2,8 @@
 // SPDX-License-Identifier: MIT
 
 #include "azure/messaging/eventhubs.hpp"
+
 #include "private/package_version.hpp"
+
 #include <azure/core/exception.hpp>
 #include <azure/core/http/http.hpp>
diff --git a/sdk/identity/azure-identity/inc/azure/identity/azure_cli_credential.hpp b/sdk/identity/azure-identity/inc/azure/identity/azure_cli_credential.hpp
index 0de97ff2f0..a47fd828be 100644
--- a/sdk/identity/azure-identity/inc/azure/identity/azure_cli_credential.hpp
+++ b/sdk/identity/azure-identity/inc/azure/identity/azure_cli_credential.hpp
@@ -12,7 +12,6 @@
 
 #include <azure/core/credentials/credentials.hpp>
 #include <azure/core/credentials/token_credential_options.hpp>
-
 #include <azure/core/datetime.hpp>
 
 #include <chrono>
diff --git a/sdk/identity/azure-identity/samples/azure_cli_credential.cpp b/sdk/identity/azure-identity/samples/azure_cli_credential.cpp
index 93c84f0c21..ff70a5e679 100644
--- a/sdk/identity/azure-identity/samples/azure_cli_credential.cpp
+++ b/sdk/identity/azure-identity/samples/azure_cli_credential.cpp
@@ -1,12 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <iostream>
-
 #include <azure/identity/azure_cli_credential.hpp>
-
 #include <azure/service/client.hpp>
 
+#include <iostream>
+
 int main()
 {
   try
diff --git a/sdk/identity/azure-identity/samples/chained_token_credential.cpp b/sdk/identity/azure-identity/samples/chained_token_credential.cpp
index 758892d1ea..dbfdc108d2 100644
--- a/sdk/identity/azure-identity/samples/chained_token_credential.cpp
+++ b/sdk/identity/azure-identity/samples/chained_token_credential.cpp
@@ -1,16 +1,14 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <iostream>
-
-#include <azure/identity/chained_token_credential.hpp>
-
 #include <azure/identity/azure_cli_credential.hpp>
+#include <azure/identity/chained_token_credential.hpp>
 #include <azure/identity/environment_credential.hpp>
 #include <azure/identity/managed_identity_credential.hpp>
-
 #include <azure/service/client.hpp>
 
+#include <iostream>
+
 int main()
 {
   try
diff --git a/sdk/identity/azure-identity/samples/client_certificate_credential.cpp b/sdk/identity/azure-identity/samples/client_certificate_credential.cpp
index 2cca8a0780..92034ddebb 100644
--- a/sdk/identity/azure-identity/samples/client_certificate_credential.cpp
+++ b/sdk/identity/azure-identity/samples/client_certificate_credential.cpp
@@ -3,12 +3,11 @@
 
 #include <get_env.hpp>
 
-#include <iostream>
-
 #include <azure/identity/client_certificate_credential.hpp>
-
 #include <azure/service/client.hpp>
 
+#include <iostream>
+
 // The following environment variables must be set before running the sample.
 // * AZURE_TENANT_ID: Tenant ID for the Azure account.
 // * AZURE_CLIENT_ID: The Client ID to authenticate the request.
diff --git a/sdk/identity/azure-identity/samples/client_secret_credential.cpp b/sdk/identity/azure-identity/samples/client_secret_credential.cpp
index 3f92f1630c..9ca9795348 100644
--- a/sdk/identity/azure-identity/samples/client_secret_credential.cpp
+++ b/sdk/identity/azure-identity/samples/client_secret_credential.cpp
@@ -3,12 +3,11 @@
 
 #include <get_env.hpp>
 
-#include <iostream>
-
 #include <azure/identity/client_secret_credential.hpp>
-
 #include <azure/service/client.hpp>
 
+#include <iostream>
+
 // The following environment variables must be set before running the sample.
 // * AZURE_TENANT_ID: Tenant ID for the Azure account.
 // * AZURE_CLIENT_ID: The Client ID to authenticate the request.
diff --git a/sdk/identity/azure-identity/samples/default_azure_credential.cpp b/sdk/identity/azure-identity/samples/default_azure_credential.cpp
index da2f590905..475397f60f 100644
--- a/sdk/identity/azure-identity/samples/default_azure_credential.cpp
+++ b/sdk/identity/azure-identity/samples/default_azure_credential.cpp
@@ -1,12 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <iostream>
-
 #include <azure/identity/default_azure_credential.hpp>
-
 #include <azure/service/client.hpp>
 
+#include <iostream>
+
 int main()
 {
   try
diff --git a/sdk/identity/azure-identity/samples/environment_credential.cpp b/sdk/identity/azure-identity/samples/environment_credential.cpp
index d41e89c390..c94d498fcf 100644
--- a/sdk/identity/azure-identity/samples/environment_credential.cpp
+++ b/sdk/identity/azure-identity/samples/environment_credential.cpp
@@ -1,12 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <iostream>
-
 #include <azure/identity/environment_credential.hpp>
-
 #include <azure/service/client.hpp>
 
+#include <iostream>
+
 int main()
 {
   try
diff --git a/sdk/identity/azure-identity/samples/managed_identity_credential.cpp b/sdk/identity/azure-identity/samples/managed_identity_credential.cpp
index b83336bc79..54e4a2cc06 100644
--- a/sdk/identity/azure-identity/samples/managed_identity_credential.cpp
+++ b/sdk/identity/azure-identity/samples/managed_identity_credential.cpp
@@ -1,12 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <iostream>
-
 #include <azure/identity/managed_identity_credential.hpp>
-
 #include <azure/service/client.hpp>
 
+#include <iostream>
+
 int main()
 {
   try
diff --git a/sdk/identity/azure-identity/src/azure_cli_credential.cpp b/sdk/identity/azure-identity/src/azure_cli_credential.cpp
index d4fc308ac3..775594b226 100644
--- a/sdk/identity/azure-identity/src/azure_cli_credential.cpp
+++ b/sdk/identity/azure-identity/src/azure_cli_credential.cpp
@@ -32,8 +32,9 @@
 #include <fcntl.h>
 #include <signal.h>
 #include <spawn.h>
-#include <sys/wait.h>
 #include <unistd.h>
+
+#include <sys/wait.h>
 #endif
 
 using Azure::Identity::AzureCliCredential;
diff --git a/sdk/identity/azure-identity/src/chained_token_credential.cpp b/sdk/identity/azure-identity/src/chained_token_credential.cpp
index c7b441bac3..3a53bf450d 100644
--- a/sdk/identity/azure-identity/src/chained_token_credential.cpp
+++ b/sdk/identity/azure-identity/src/chained_token_credential.cpp
@@ -3,11 +3,10 @@
 
 #include "azure/identity/chained_token_credential.hpp"
 
+#include "azure/core/internal/diagnostics/log.hpp"
 #include "private/chained_token_credential_impl.hpp"
 #include "private/identity_log.hpp"
 
-#include "azure/core/internal/diagnostics/log.hpp"
-
 #include <utility>
 
 using namespace Azure::Identity;
diff --git a/sdk/identity/azure-identity/src/default_azure_credential.cpp b/sdk/identity/azure-identity/src/default_azure_credential.cpp
index 79bebb9970..8c1c7825f5 100644
--- a/sdk/identity/azure-identity/src/default_azure_credential.cpp
+++ b/sdk/identity/azure-identity/src/default_azure_credential.cpp
@@ -6,7 +6,6 @@
 #include "azure/identity/azure_cli_credential.hpp"
 #include "azure/identity/environment_credential.hpp"
 #include "azure/identity/managed_identity_credential.hpp"
-
 #include "private/chained_token_credential_impl.hpp"
 #include "private/identity_log.hpp"
 
diff --git a/sdk/identity/azure-identity/src/environment_credential.cpp b/sdk/identity/azure-identity/src/environment_credential.cpp
index 5c1fbcf499..30ad944796 100644
--- a/sdk/identity/azure-identity/src/environment_credential.cpp
+++ b/sdk/identity/azure-identity/src/environment_credential.cpp
@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: MIT
 
 #include "azure/identity/environment_credential.hpp"
+
 #include "azure/identity/client_certificate_credential.hpp"
 #include "azure/identity/client_secret_credential.hpp"
-
 #include "private/identity_log.hpp"
 
 #include <azure/core/azure_assert.hpp>
diff --git a/sdk/identity/azure-identity/src/managed_identity_credential.cpp b/sdk/identity/azure-identity/src/managed_identity_credential.cpp
index 7b64abcaf1..de6666621c 100644
--- a/sdk/identity/azure-identity/src/managed_identity_credential.cpp
+++ b/sdk/identity/azure-identity/src/managed_identity_credential.cpp
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: MIT
 
 #include "azure/identity/managed_identity_credential.hpp"
+
 #include "private/managed_identity_source.hpp"
 
 using namespace Azure::Identity;
diff --git a/sdk/identity/azure-identity/src/private/managed_identity_source.hpp b/sdk/identity/azure-identity/src/private/managed_identity_source.hpp
index 146da297bf..a4f7d9d181 100644
--- a/sdk/identity/azure-identity/src/private/managed_identity_source.hpp
+++ b/sdk/identity/azure-identity/src/private/managed_identity_source.hpp
@@ -4,13 +4,12 @@
 #pragma once
 
 #include "azure/identity/detail/token_cache.hpp"
+#include "token_credential_impl.hpp"
 
 #include <azure/core/credentials/credentials.hpp>
 #include <azure/core/credentials/token_credential_options.hpp>
 #include <azure/core/url.hpp>
 
-#include "token_credential_impl.hpp"
-
 #include <memory>
 #include <string>
 #include <utility>
diff --git a/sdk/identity/azure-identity/src/token_credential_impl.cpp b/sdk/identity/azure-identity/src/token_credential_impl.cpp
index 114d16f811..9a496dab47 100644
--- a/sdk/identity/azure-identity/src/token_credential_impl.cpp
+++ b/sdk/identity/azure-identity/src/token_credential_impl.cpp
@@ -3,11 +3,11 @@
 
 #include "private/token_credential_impl.hpp"
 
+#include "private/package_version.hpp"
+
 #include <azure/core/internal/json/json.hpp>
 #include <azure/core/url.hpp>
 
-#include "private/package_version.hpp"
-
 #include <chrono>
 #include <type_traits>
 
diff --git a/sdk/identity/azure-identity/test/e2e/azure_identity_e2e_test.cpp b/sdk/identity/azure-identity/test/e2e/azure_identity_e2e_test.cpp
index 329348a3ab..cbc2df0400 100644
--- a/sdk/identity/azure-identity/test/e2e/azure_identity_e2e_test.cpp
+++ b/sdk/identity/azure-identity/test/e2e/azure_identity_e2e_test.cpp
@@ -1,9 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/identity/managed_identity_credential.hpp>
-
 #include <azure/core/internal/environment.hpp>
+#include <azure/identity/managed_identity_credential.hpp>
 
 #include <chrono>
 #include <cstdlib>
diff --git a/sdk/identity/azure-identity/test/perf/inc/azure/identity/test/secret_credential_test.hpp b/sdk/identity/azure-identity/test/perf/inc/azure/identity/test/secret_credential_test.hpp
index c7861c5e48..04c772d734 100644
--- a/sdk/identity/azure-identity/test/perf/inc/azure/identity/test/secret_credential_test.hpp
+++ b/sdk/identity/azure-identity/test/perf/inc/azure/identity/test/secret_credential_test.hpp
@@ -9,9 +9,8 @@
 
 #pragma once
 
-#include <azure/perf.hpp>
-
 #include <azure/identity.hpp>
+#include <azure/perf.hpp>
 
 #include <memory>
 #include <string>
diff --git a/sdk/identity/azure-identity/test/perf/src/azure_identity_perf_test.cpp b/sdk/identity/azure-identity/test/perf/src/azure_identity_perf_test.cpp
index 2844cee015..a15ad18374 100644
--- a/sdk/identity/azure-identity/test/perf/src/azure_identity_perf_test.cpp
+++ b/sdk/identity/azure-identity/test/perf/src/azure_identity_perf_test.cpp
@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/perf.hpp>
-
 #include "azure/identity/test/secret_credential_test.hpp"
 
+#include <azure/perf.hpp>
+
 int main(int argc, char** argv)
 {
 
diff --git a/sdk/identity/azure-identity/test/ut/client_certificate_credential_test.cpp b/sdk/identity/azure-identity/test/ut/client_certificate_credential_test.cpp
index f67963ab35..c34957dfc2 100644
--- a/sdk/identity/azure-identity/test/ut/client_certificate_credential_test.cpp
+++ b/sdk/identity/azure-identity/test/ut/client_certificate_credential_test.cpp
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: MIT
 
 #include "azure/identity/client_certificate_credential.hpp"
-
 #include "credential_test_helper.hpp"
 
 #include <azure/core/base64.hpp>
diff --git a/sdk/identity/azure-identity/test/ut/client_secret_credential_test.cpp b/sdk/identity/azure-identity/test/ut/client_secret_credential_test.cpp
index 81d354bf1f..6943cc3a40 100644
--- a/sdk/identity/azure-identity/test/ut/client_secret_credential_test.cpp
+++ b/sdk/identity/azure-identity/test/ut/client_secret_credential_test.cpp
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: MIT
 
 #include "azure/identity/client_secret_credential.hpp"
-
 #include "credential_test_helper.hpp"
 
 #include <gtest/gtest.h>
diff --git a/sdk/identity/azure-identity/test/ut/default_azure_credential_test.cpp b/sdk/identity/azure-identity/test/ut/default_azure_credential_test.cpp
index 7ab26d4b50..1790f0a3d6 100644
--- a/sdk/identity/azure-identity/test/ut/default_azure_credential_test.cpp
+++ b/sdk/identity/azure-identity/test/ut/default_azure_credential_test.cpp
@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: MIT
 
 #include "azure/identity/default_azure_credential.hpp"
-
 #include "credential_test_helper.hpp"
+
 #include <azure/core/diagnostics/logger.hpp>
 
 #include <gtest/gtest.h>
diff --git a/sdk/identity/azure-identity/test/ut/environment_credential_test.cpp b/sdk/identity/azure-identity/test/ut/environment_credential_test.cpp
index 71f4b6c063..1e984aa270 100644
--- a/sdk/identity/azure-identity/test/ut/environment_credential_test.cpp
+++ b/sdk/identity/azure-identity/test/ut/environment_credential_test.cpp
@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: MIT
 
 #include "azure/identity/environment_credential.hpp"
-
 #include "credential_test_helper.hpp"
+
 #include <azure/core/diagnostics/logger.hpp>
 
 #include <gtest/gtest.h>
diff --git a/sdk/identity/azure-identity/test/ut/managed_identity_credential_test.cpp b/sdk/identity/azure-identity/test/ut/managed_identity_credential_test.cpp
index 31deb38bbf..569354fc2a 100644
--- a/sdk/identity/azure-identity/test/ut/managed_identity_credential_test.cpp
+++ b/sdk/identity/azure-identity/test/ut/managed_identity_credential_test.cpp
@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: MIT
 
 #include "azure/identity/managed_identity_credential.hpp"
-
 #include "credential_test_helper.hpp"
+
 #include <azure/core/diagnostics/logger.hpp>
 
 #include <fstream>
diff --git a/sdk/identity/azure-identity/test/ut/tenant_id_resolver_test.cpp b/sdk/identity/azure-identity/test/ut/tenant_id_resolver_test.cpp
index ab0f839b5f..16acc704dd 100644
--- a/sdk/identity/azure-identity/test/ut/tenant_id_resolver_test.cpp
+++ b/sdk/identity/azure-identity/test/ut/tenant_id_resolver_test.cpp
@@ -1,9 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "private/tenant_id_resolver.hpp"
-
 #include "credential_test_helper.hpp"
+#include "private/tenant_id_resolver.hpp"
 
 #include <gtest/gtest.h>
 
diff --git a/sdk/identity/azure-identity/test/ut/token_cache_test.cpp b/sdk/identity/azure-identity/test/ut/token_cache_test.cpp
index 4731db56c9..114a22460b 100644
--- a/sdk/identity/azure-identity/test/ut/token_cache_test.cpp
+++ b/sdk/identity/azure-identity/test/ut/token_cache_test.cpp
@@ -1,9 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "azure/identity/detail/token_cache.hpp"
-
 #include "azure/identity/client_secret_credential.hpp"
+#include "azure/identity/detail/token_cache.hpp"
 
 #include <mutex>
 
diff --git a/sdk/identity/azure-identity/test/ut/token_credential_impl_test.cpp b/sdk/identity/azure-identity/test/ut/token_credential_impl_test.cpp
index 567bba73aa..d8c210bda3 100644
--- a/sdk/identity/azure-identity/test/ut/token_credential_impl_test.cpp
+++ b/sdk/identity/azure-identity/test/ut/token_credential_impl_test.cpp
@@ -1,9 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "private/token_credential_impl.hpp"
-
 #include "credential_test_helper.hpp"
+#include "private/token_credential_impl.hpp"
 
 #include <memory>
 #include <utility>
diff --git a/sdk/identity/azure-identity/test/ut/token_credential_test.cpp b/sdk/identity/azure-identity/test/ut/token_credential_test.cpp
index bfe57d7c02..b3bdb7e6b6 100644
--- a/sdk/identity/azure-identity/test/ut/token_credential_test.cpp
+++ b/sdk/identity/azure-identity/test/ut/token_credential_test.cpp
@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <gtest/gtest.h>
-
 #include <azure/core/test/test_base.hpp>
 #include <azure/identity/client_secret_credential.hpp>
 #include <azure/identity/environment_credential.hpp>
@@ -10,6 +8,8 @@
 #include <chrono>
 #include <thread>
 
+#include <gtest/gtest.h>
+
 namespace Azure { namespace Identity { namespace Test {
   class TokenCredentialTest : public Azure::Core::Test::TestBase {
 
diff --git a/sdk/keyvault/azure-security-keyvault-administration/inc/azure/keyvault/administration/rest_client_models.hpp b/sdk/keyvault/azure-security-keyvault-administration/inc/azure/keyvault/administration/rest_client_models.hpp
index 09104b7ea6..19d8017a48 100644
--- a/sdk/keyvault/azure-security-keyvault-administration/inc/azure/keyvault/administration/rest_client_models.hpp
+++ b/sdk/keyvault/azure-security-keyvault-administration/inc/azure/keyvault/administration/rest_client_models.hpp
@@ -13,6 +13,7 @@
 #include <azure/core/response.hpp>
 #include <azure/core/url.hpp>
 #include <azure/keyvault/administration/dll_import_export.hpp>
+
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/sdk/keyvault/azure-security-keyvault-administration/inc/azure/keyvault/administration/settings_client.hpp b/sdk/keyvault/azure-security-keyvault-administration/inc/azure/keyvault/administration/settings_client.hpp
index 1968c28ed4..a10864681f 100644
--- a/sdk/keyvault/azure-security-keyvault-administration/inc/azure/keyvault/administration/settings_client.hpp
+++ b/sdk/keyvault/azure-security-keyvault-administration/inc/azure/keyvault/administration/settings_client.hpp
@@ -14,6 +14,7 @@
 #include <azure/core/response.hpp>
 #include <azure/keyvault/administration/rest_client_models.hpp>
 #include <azure/keyvault/administration/settings_client_options.hpp>
+
 #include <memory>
 #include <string>
 
diff --git a/sdk/keyvault/azure-security-keyvault-administration/inc/azure/keyvault/administration/settings_client_options.hpp b/sdk/keyvault/azure-security-keyvault-administration/inc/azure/keyvault/administration/settings_client_options.hpp
index fef1f468c5..3cd10aed3d 100644
--- a/sdk/keyvault/azure-security-keyvault-administration/inc/azure/keyvault/administration/settings_client_options.hpp
+++ b/sdk/keyvault/azure-security-keyvault-administration/inc/azure/keyvault/administration/settings_client_options.hpp
@@ -10,8 +10,8 @@
 #pragma once
 
 #include <azure/core/internal/client_options.hpp>
-
 #include <azure/keyvault/administration/dll_import_export.hpp>
+
 #include <memory>
 #include <string>
 
diff --git a/sdk/keyvault/azure-security-keyvault-administration/src/keyvault_settings_common_request.cpp b/sdk/keyvault/azure-security-keyvault-administration/src/keyvault_settings_common_request.cpp
index 41b161fd29..3632dda55d 100644
--- a/sdk/keyvault/azure-security-keyvault-administration/src/keyvault_settings_common_request.cpp
+++ b/sdk/keyvault/azure-security-keyvault-administration/src/keyvault_settings_common_request.cpp
@@ -2,10 +2,12 @@
 // SPDX-License-Identifier: MIT
 
 #include "private/keyvault_settings_common_request.hpp"
+
 #include "private/administration_constants.hpp"
 
 #include <azure/core/exception.hpp>
 #include <azure/core/http/http.hpp>
+
 #include <memory>
 
 using namespace Azure::Security::KeyVault;
diff --git a/sdk/keyvault/azure-security-keyvault-administration/src/settings_client.cpp b/sdk/keyvault/azure-security-keyvault-administration/src/settings_client.cpp
index 195876bd71..4d661d4b66 100644
--- a/sdk/keyvault/azure-security-keyvault-administration/src/settings_client.cpp
+++ b/sdk/keyvault/azure-security-keyvault-administration/src/settings_client.cpp
@@ -4,6 +4,7 @@
 #include "private/administration_constants.hpp"
 #include "private/keyvault_settings_common_request.hpp"
 #include "private/package_version.hpp"
+
 #include <azure/core/exception.hpp>
 #include <azure/core/http/http.hpp>
 #include <azure/core/internal/json/json.hpp>
@@ -12,6 +13,7 @@
 #include <azure/keyvault/administration/settings_client.hpp>
 #include <azure/keyvault/shared/keyvault_challenge_based_authentication_policy.hpp>
 #include <azure/keyvault/shared/keyvault_shared.hpp>
+
 #include <memory>
 
 using namespace Azure::Core::Http;
diff --git a/sdk/keyvault/azure-security-keyvault-administration/test/ut/settings_client_base_test.hpp b/sdk/keyvault/azure-security-keyvault-administration/test/ut/settings_client_base_test.hpp
index 5dd4d4ed13..3a9f7f7dfc 100644
--- a/sdk/keyvault/azure-security-keyvault-administration/test/ut/settings_client_base_test.hpp
+++ b/sdk/keyvault/azure-security-keyvault-administration/test/ut/settings_client_base_test.hpp
@@ -7,14 +7,15 @@
  *
  */
 
-#include <gtest/gtest.h>
-
 #include <azure/core/test/test_base.hpp>
 #include <azure/identity/client_secret_credential.hpp>
 #include <azure/keyvault/administration.hpp>
+
 #include <chrono>
 #include <thread>
 
+#include <gtest/gtest.h>
+
 namespace Azure {
   namespace Security {
     namespace KeyVault {
diff --git a/sdk/keyvault/azure-security-keyvault-administration/test/ut/settings_client_test.cpp b/sdk/keyvault/azure-security-keyvault-administration/test/ut/settings_client_test.cpp
index 4462635b1d..1e75f8d48b 100644
--- a/sdk/keyvault/azure-security-keyvault-administration/test/ut/settings_client_test.cpp
+++ b/sdk/keyvault/azure-security-keyvault-administration/test/ut/settings_client_test.cpp
@@ -1,17 +1,19 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/identity/client_secret_credential.hpp>
-
 #include "azure/keyvault/administration/settings_client.hpp"
 #include "settings_client_base_test.hpp"
+
 #include <azure/core/base64.hpp>
+#include <azure/identity/client_secret_credential.hpp>
 #include <azure/keyvault/administration/rest_client_models.hpp>
+
 #include <cstddef>
-#include <gtest/gtest.h>
 #include <string>
 #include <thread>
 
+#include <gtest/gtest.h>
+
 using namespace Azure::Security::KeyVault::Administration;
 using namespace Azure::Security::KeyVault::Administration::Models;
 using namespace Azure::Security::KeyVault::Administration::Test;
diff --git a/sdk/keyvault/azure-security-keyvault-certificates/inc/azure/keyvault/certificates.hpp b/sdk/keyvault/azure-security-keyvault-certificates/inc/azure/keyvault/certificates.hpp
index 0ad17566ea..137a2cd34f 100644
--- a/sdk/keyvault/azure-security-keyvault-certificates/inc/azure/keyvault/certificates.hpp
+++ b/sdk/keyvault/azure-security-keyvault-certificates/inc/azure/keyvault/certificates.hpp
@@ -8,11 +8,9 @@
 
 #pragma once
 
-#include "azure/keyvault/certificates/dll_import_export.hpp"
-
 #include "azure/keyvault/certificates/certificate_client.hpp"
 #include "azure/keyvault/certificates/certificate_client_models.hpp"
 #include "azure/keyvault/certificates/certificate_client_operations.hpp"
 #include "azure/keyvault/certificates/certificate_client_options.hpp"
-
+#include "azure/keyvault/certificates/dll_import_export.hpp"
 #include "azure/keyvault/certificates/rtti.hpp"
diff --git a/sdk/keyvault/azure-security-keyvault-certificates/inc/azure/keyvault/certificates/certificate_client.hpp b/sdk/keyvault/azure-security-keyvault-certificates/inc/azure/keyvault/certificates/certificate_client.hpp
index 3999b8ab1c..f54f9125ad 100644
--- a/sdk/keyvault/azure-security-keyvault-certificates/inc/azure/keyvault/certificates/certificate_client.hpp
+++ b/sdk/keyvault/azure-security-keyvault-certificates/inc/azure/keyvault/certificates/certificate_client.hpp
@@ -12,6 +12,7 @@
 #include "azure/keyvault/certificates/certificate_client_models.hpp"
 #include "azure/keyvault/certificates/certificate_client_operations.hpp"
 #include "azure/keyvault/certificates/certificate_client_options.hpp"
+
 #include <azure/core/context.hpp>
 #include <azure/core/http/http.hpp>
 #include <azure/core/internal/http/pipeline.hpp>
diff --git a/sdk/keyvault/azure-security-keyvault-certificates/inc/azure/keyvault/certificates/certificate_client_models.hpp b/sdk/keyvault/azure-security-keyvault-certificates/inc/azure/keyvault/certificates/certificate_client_models.hpp
index 7c43324bb2..4a79c66012 100644
--- a/sdk/keyvault/azure-security-keyvault-certificates/inc/azure/keyvault/certificates/certificate_client_models.hpp
+++ b/sdk/keyvault/azure-security-keyvault-certificates/inc/azure/keyvault/certificates/certificate_client_models.hpp
@@ -16,6 +16,7 @@
 #include <azure/core/nullable.hpp>
 #include <azure/core/paged_response.hpp>
 #include <azure/core/response.hpp>
+
 #include <memory>
 #include <string>
 #include <unordered_map>
diff --git a/sdk/keyvault/azure-security-keyvault-certificates/inc/azure/keyvault/certificates/certificate_client_options.hpp b/sdk/keyvault/azure-security-keyvault-certificates/inc/azure/keyvault/certificates/certificate_client_options.hpp
index 6d5fcc69fd..60b906e2ff 100644
--- a/sdk/keyvault/azure-security-keyvault-certificates/inc/azure/keyvault/certificates/certificate_client_options.hpp
+++ b/sdk/keyvault/azure-security-keyvault-certificates/inc/azure/keyvault/certificates/certificate_client_options.hpp
@@ -9,10 +9,11 @@
 
 #pragma once
 
-#include <azure/core/internal/client_options.hpp>
-
 #include "azure/keyvault/certificates/certificate_client_models.hpp"
 #include "azure/keyvault/certificates/dll_import_export.hpp"
+
+#include <azure/core/internal/client_options.hpp>
+
 #include <memory>
 #include <string>
 
diff --git a/sdk/keyvault/azure-security-keyvault-certificates/src/certificate_client.cpp b/sdk/keyvault/azure-security-keyvault-certificates/src/certificate_client.cpp
index 58ad90b024..66aa3af43c 100644
--- a/sdk/keyvault/azure-security-keyvault-certificates/src/certificate_client.cpp
+++ b/sdk/keyvault/azure-security-keyvault-certificates/src/certificate_client.cpp
@@ -9,8 +9,8 @@
 #include "private/certificate_serializers.hpp"
 #include "private/keyvault_certificates_common_request.hpp"
 #include "private/package_version.hpp"
-#include <azure/core/base64.hpp>
 
+#include <azure/core/base64.hpp>
 #include <azure/core/credentials/credentials.hpp>
 #include <azure/core/http/http.hpp>
 #include <azure/core/http/policies/policy.hpp>
diff --git a/sdk/keyvault/azure-security-keyvault-certificates/src/certificate_client_operations.cpp b/sdk/keyvault/azure-security-keyvault-certificates/src/certificate_client_operations.cpp
index 0d6d72971b..8697668d7b 100644
--- a/sdk/keyvault/azure-security-keyvault-certificates/src/certificate_client_operations.cpp
+++ b/sdk/keyvault/azure-security-keyvault-certificates/src/certificate_client_operations.cpp
@@ -1,10 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 #include "azure/keyvault/certificates/certificate_client_operations.hpp"
+
 #include "azure/keyvault/certificates/certificate_client.hpp"
 #include "azure/keyvault/certificates/certificate_client_models.hpp"
 #include "private/certificate_constants.hpp"
 #include "private/certificate_serializers.hpp"
+
 #include <thread>
 
 using namespace Azure::Security::KeyVault::Certificates;
diff --git a/sdk/keyvault/azure-security-keyvault-certificates/src/certificate_serializers.cpp b/sdk/keyvault/azure-security-keyvault-certificates/src/certificate_serializers.cpp
index 83fc81e982..877d261609 100644
--- a/sdk/keyvault/azure-security-keyvault-certificates/src/certificate_serializers.cpp
+++ b/sdk/keyvault/azure-security-keyvault-certificates/src/certificate_serializers.cpp
@@ -1,17 +1,18 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
+#include "private/certificate_serializers.hpp"
+
+#include "azure/keyvault/certificates/certificate_client_models.hpp"
+#include "private/certificate_constants.hpp"
+#include "private/certificate_key_usage.hpp"
+
 #include <azure/core/base64.hpp>
 #include <azure/core/internal/json/json.hpp>
 #include <azure/core/internal/json/json_optional.hpp>
 #include <azure/core/internal/json/json_serializable.hpp>
 #include <azure/core/url.hpp>
 
-#include "azure/keyvault/certificates/certificate_client_models.hpp"
-#include "private/certificate_constants.hpp"
-#include "private/certificate_key_usage.hpp"
-#include "private/certificate_serializers.hpp"
-
 using namespace Azure::Security::KeyVault::Certificates::_detail;
 using namespace Azure::Security::KeyVault::Certificates;
 using namespace Azure::Core::Json::_internal;
diff --git a/sdk/keyvault/azure-security-keyvault-certificates/src/keyvault_certificates_common_request.cpp b/sdk/keyvault/azure-security-keyvault-certificates/src/keyvault_certificates_common_request.cpp
index 840173cd9f..b2075a9734 100644
--- a/sdk/keyvault/azure-security-keyvault-certificates/src/keyvault_certificates_common_request.cpp
+++ b/sdk/keyvault/azure-security-keyvault-certificates/src/keyvault_certificates_common_request.cpp
@@ -2,10 +2,12 @@
 // SPDX-License-Identifier: MIT
 
 #include "private/keyvault_certificates_common_request.hpp"
+
 #include "private/certificate_constants.hpp"
 
 #include <azure/core/exception.hpp>
 #include <azure/core/http/http.hpp>
+
 #include <memory>
 
 using namespace Azure::Security::KeyVault;
diff --git a/sdk/keyvault/azure-security-keyvault-certificates/src/private/certificate_serializers.hpp b/sdk/keyvault/azure-security-keyvault-certificates/src/private/certificate_serializers.hpp
index 414c2d6ea5..bdb20fa1e2 100644
--- a/sdk/keyvault/azure-security-keyvault-certificates/src/private/certificate_serializers.hpp
+++ b/sdk/keyvault/azure-security-keyvault-certificates/src/private/certificate_serializers.hpp
@@ -11,6 +11,7 @@
 
 #include "azure/keyvault/certificates/certificate_client_models.hpp"
 #include "azure/keyvault/certificates/certificate_client_options.hpp"
+
 #include <azure/core/internal/json/json.hpp>
 
 #include <string>
diff --git a/sdk/keyvault/azure-security-keyvault-certificates/test/perf/inc/azure/keyvault/certificates/test/get_certificate_test.hpp b/sdk/keyvault/azure-security-keyvault-certificates/test/perf/inc/azure/keyvault/certificates/test/get_certificate_test.hpp
index fc48c3dae7..ddff618057 100644
--- a/sdk/keyvault/azure-security-keyvault-certificates/test/perf/inc/azure/keyvault/certificates/test/get_certificate_test.hpp
+++ b/sdk/keyvault/azure-security-keyvault-certificates/test/perf/inc/azure/keyvault/certificates/test/get_certificate_test.hpp
@@ -9,11 +9,11 @@
 
 #pragma once
 
-#include <azure/perf.hpp>
-
 #include <azure/core/internal/environment.hpp>
 #include <azure/identity.hpp>
 #include <azure/keyvault/certificates.hpp>
+#include <azure/perf.hpp>
+
 #include <chrono>
 #include <memory>
 #include <string>
diff --git a/sdk/keyvault/azure-security-keyvault-certificates/test/perf/src/azure_security_keyvault_certificates_perf_test.cpp b/sdk/keyvault/azure-security-keyvault-certificates/test/perf/src/azure_security_keyvault_certificates_perf_test.cpp
index e0c2e4486d..d1bdfd92fd 100644
--- a/sdk/keyvault/azure-security-keyvault-certificates/test/perf/src/azure_security_keyvault_certificates_perf_test.cpp
+++ b/sdk/keyvault/azure-security-keyvault-certificates/test/perf/src/azure_security_keyvault_certificates_perf_test.cpp
@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/perf.hpp>
-
 #include "azure/keyvault/certificates/test/get_certificate_test.hpp"
 
+#include <azure/perf.hpp>
+
 int main(int argc, char** argv)
 {
 
diff --git a/sdk/keyvault/azure-security-keyvault-certificates/test/samples/certificate-import-certificate/certificate_import_certificate.cpp b/sdk/keyvault/azure-security-keyvault-certificates/test/samples/certificate-import-certificate/certificate_import_certificate.cpp
index 79a8576ebd..3e7102663c 100644
--- a/sdk/keyvault/azure-security-keyvault-certificates/test/samples/certificate-import-certificate/certificate_import_certificate.cpp
+++ b/sdk/keyvault/azure-security-keyvault-certificates/test/samples/certificate-import-certificate/certificate_import_certificate.cpp
@@ -18,6 +18,7 @@
 #include <azure/core.hpp>
 #include <azure/identity.hpp>
 #include <azure/keyvault/certificates.hpp>
+
 #include <chrono>
 #include <iostream>
 
diff --git a/sdk/keyvault/azure-security-keyvault-certificates/test/ut/certificate_client_base_test.hpp b/sdk/keyvault/azure-security-keyvault-certificates/test/ut/certificate_client_base_test.hpp
index f5073271ce..64022b91e4 100644
--- a/sdk/keyvault/azure-security-keyvault-certificates/test/ut/certificate_client_base_test.hpp
+++ b/sdk/keyvault/azure-security-keyvault-certificates/test/ut/certificate_client_base_test.hpp
@@ -7,15 +7,17 @@
  *
  */
 
-#include <gtest/gtest.h>
-
 #include "../src/private/certificate_serializers.hpp"
+
 #include <azure/core/test/test_base.hpp>
 #include <azure/identity/client_secret_credential.hpp>
 #include <azure/keyvault/certificates.hpp>
+
 #include <chrono>
 #include <thread>
 
+#include <gtest/gtest.h>
+
 namespace Azure {
   namespace Security {
     namespace KeyVault {
diff --git a/sdk/keyvault/azure-security-keyvault-certificates/test/ut/certificate_client_test.cpp b/sdk/keyvault/azure-security-keyvault-certificates/test/ut/certificate_client_test.cpp
index bb6295d1ea..b2d9744192 100644
--- a/sdk/keyvault/azure-security-keyvault-certificates/test/ut/certificate_client_test.cpp
+++ b/sdk/keyvault/azure-security-keyvault-certificates/test/ut/certificate_client_test.cpp
@@ -1,15 +1,17 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/identity/client_secret_credential.hpp>
-
 #include "certificate_client_base_test.hpp"
+
 #include <azure/core/base64.hpp>
+#include <azure/identity/client_secret_credential.hpp>
+
 #include <cstddef>
-#include <gtest/gtest.h>
 #include <string>
 #include <thread>
 
+#include <gtest/gtest.h>
+
 using namespace std::chrono_literals;
 using namespace Azure::Security::KeyVault::Certificates;
 using namespace Azure::Security::KeyVault::Certificates::Test;
diff --git a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/cryptography/cryptography_client_models.hpp b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/cryptography/cryptography_client_models.hpp
index 7e05eb33c5..0573a6daf2 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/cryptography/cryptography_client_models.hpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/cryptography/cryptography_client_models.hpp
@@ -9,10 +9,10 @@
 
 #pragma once
 
-#include <azure/core/cryptography/hash.hpp>
-
 #include "azure/keyvault/keys/dll_import_export.hpp"
 
+#include <azure/core/cryptography/hash.hpp>
+
 #include <memory>
 #include <stdexcept>
 #include <string>
diff --git a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/cryptography/cryptography_client_options.hpp b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/cryptography/cryptography_client_options.hpp
index 5adfc81cee..058fc813f2 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/cryptography/cryptography_client_options.hpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/cryptography/cryptography_client_options.hpp
@@ -10,10 +10,10 @@
 
 #pragma once
 
-#include <azure/core/internal/client_options.hpp>
-
 #include "azure/keyvault/keys/dll_import_export.hpp"
 
+#include <azure/core/internal/client_options.hpp>
+
 namespace Azure {
   namespace Security {
     namespace KeyVault {
diff --git a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_client_options.hpp b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_client_options.hpp
index 8912beddcd..ed837ad6f4 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_client_options.hpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_client_options.hpp
@@ -9,11 +9,11 @@
 
 #pragma once
 
-#include <azure/core/internal/client_options.hpp>
-
 #include "azure/keyvault/keys/dll_import_export.hpp"
 #include "azure/keyvault/keys/key_client_models.hpp"
 
+#include <azure/core/internal/client_options.hpp>
+
 namespace Azure { namespace Security { namespace KeyVault { namespace Keys {
 
   /**
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/cryptography_client.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/cryptography_client.cpp
index 1df12afca1..497aec3d80 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/cryptography_client.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/cryptography_client.cpp
@@ -1,16 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/core/cryptography/hash.hpp>
-#include <azure/core/exception.hpp>
-#include <azure/core/http/http.hpp>
-#include <azure/core/http/policies/policy.hpp>
-
-#include <azure/keyvault/shared/keyvault_challenge_based_authentication_policy.hpp>
-#include <azure/keyvault/shared/keyvault_shared.hpp>
-
 #include "azure/keyvault/keys/cryptography/cryptography_client.hpp"
-#include "azure/keyvault/keys/key_client_models.hpp"
 
 #include "../private/cryptography_serializers.hpp"
 #include "../private/key_constants.hpp"
@@ -20,6 +11,14 @@
 #include "../private/key_wrap_parameters.hpp"
 #include "../private/keyvault_protocol.hpp"
 #include "../private/package_version.hpp"
+#include "azure/keyvault/keys/key_client_models.hpp"
+
+#include <azure/core/cryptography/hash.hpp>
+#include <azure/core/exception.hpp>
+#include <azure/core/http/http.hpp>
+#include <azure/core/http/policies/policy.hpp>
+#include <azure/keyvault/shared/keyvault_challenge_based_authentication_policy.hpp>
+#include <azure/keyvault/shared/keyvault_shared.hpp>
 
 #include <algorithm>
 #include <memory>
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/decrypt_parameters.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/decrypt_parameters.cpp
index 8e986cf961..dd7d73c8c3 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/decrypt_parameters.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/decrypt_parameters.cpp
@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/core/base64.hpp>
-
 #include "../private/cryptography_serializers.hpp"
 #include "../private/key_constants.hpp"
 #include "azure/keyvault/keys/cryptography/cryptography_client_models.hpp"
 
+#include <azure/core/base64.hpp>
+
 #include <string>
 #include <vector>
 
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/decrypt_result.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/decrypt_result.cpp
index bbec38e0ce..b24f73624e 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/decrypt_result.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/decrypt_result.cpp
@@ -1,13 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/core/base64.hpp>
-#include <azure/core/internal/json/json.hpp>
-
 #include "../private/cryptography_serializers.hpp"
 #include "../private/key_constants.hpp"
 #include "azure/keyvault/keys/cryptography/cryptography_client_models.hpp"
 
+#include <azure/core/base64.hpp>
+#include <azure/core/internal/json/json.hpp>
+
 #include <string>
 #include <vector>
 
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/encrypt_parameters.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/encrypt_parameters.cpp
index 2efc8c29fc..64a33bfdc5 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/encrypt_parameters.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/encrypt_parameters.cpp
@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/core/base64.hpp>
-
 #include "../private/cryptography_serializers.hpp"
 #include "../private/key_constants.hpp"
 #include "azure/keyvault/keys/cryptography/cryptography_client_models.hpp"
 
+#include <azure/core/base64.hpp>
+
 #include <string>
 #include <vector>
 
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/encrypt_result.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/encrypt_result.cpp
index 601136bc36..21b9f12c4b 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/encrypt_result.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/encrypt_result.cpp
@@ -1,13 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/core/base64.hpp>
-#include <azure/core/internal/json/json.hpp>
-
 #include "../private/cryptography_serializers.hpp"
 #include "../private/key_constants.hpp"
 #include "azure/keyvault/keys/cryptography/cryptography_client_models.hpp"
 
+#include <azure/core/base64.hpp>
+#include <azure/core/internal/json/json.hpp>
+
 #include <string>
 #include <vector>
 
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/key_sign_parameters.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/key_sign_parameters.cpp
index 6e35811695..9c399ae6e4 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/key_sign_parameters.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/key_sign_parameters.cpp
@@ -1,11 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/core/base64.hpp>
+#include "../private/key_sign_parameters.hpp"
 
 #include "../private/cryptography_serializers.hpp"
 #include "../private/key_constants.hpp"
-#include "../private/key_sign_parameters.hpp"
+
+#include <azure/core/base64.hpp>
 
 #include <string>
 #include <vector>
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/key_verify_parameters.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/key_verify_parameters.cpp
index 2b55efc336..5b4f40c6d2 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/key_verify_parameters.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/key_verify_parameters.cpp
@@ -1,11 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/core/base64.hpp>
+#include "../private/key_verify_parameters.hpp"
 
 #include "../private/cryptography_serializers.hpp"
 #include "../private/key_constants.hpp"
-#include "../private/key_verify_parameters.hpp"
+
+#include <azure/core/base64.hpp>
 
 #include <string>
 #include <vector>
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/key_wrap_parameters.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/key_wrap_parameters.cpp
index aa7e444cf8..56200b1823 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/key_wrap_parameters.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/key_wrap_parameters.cpp
@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/core/base64.hpp>
-
 #include "../private/cryptography_serializers.hpp"
 #include "../private/key_constants.hpp"
 #include "azure/keyvault/keys/cryptography/cryptography_client_models.hpp"
 
+#include <azure/core/base64.hpp>
+
 #include <string>
 #include <vector>
 
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/sign_result.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/sign_result.cpp
index 5b8ae22811..b3850ab549 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/sign_result.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/sign_result.cpp
@@ -1,13 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/core/base64.hpp>
-#include <azure/core/internal/json/json.hpp>
-
 #include "../private/cryptography_serializers.hpp"
 #include "../private/key_constants.hpp"
 #include "azure/keyvault/keys/cryptography/cryptography_client_models.hpp"
 
+#include <azure/core/base64.hpp>
+#include <azure/core/internal/json/json.hpp>
+
 #include <string>
 #include <vector>
 
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/signature_algorithm.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/signature_algorithm.cpp
index 498adc107b..27fb365d15 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/signature_algorithm.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/signature_algorithm.cpp
@@ -1,11 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/core/internal/cryptography/sha_hash.hpp>
-
 #include "../private/key_constants.hpp"
 #include "azure/keyvault/keys/cryptography/cryptography_client_models.hpp"
 
+#include <azure/core/internal/cryptography/sha_hash.hpp>
+
 namespace Azure {
   namespace Security {
     namespace KeyVault {
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/unwrap_result.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/unwrap_result.cpp
index d99136d698..0cf931517a 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/unwrap_result.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/unwrap_result.cpp
@@ -1,13 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/core/base64.hpp>
-#include <azure/core/internal/json/json.hpp>
-
 #include "../private/cryptography_serializers.hpp"
 #include "../private/key_constants.hpp"
 #include "azure/keyvault/keys/cryptography/cryptography_client_models.hpp"
 
+#include <azure/core/base64.hpp>
+#include <azure/core/internal/json/json.hpp>
+
 #include <string>
 #include <vector>
 
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/verify_result.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/verify_result.cpp
index 225a898ff0..bcef5240b6 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/verify_result.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/verify_result.cpp
@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/core/internal/json/json.hpp>
-
 #include "../private/cryptography_serializers.hpp"
 #include "../private/key_constants.hpp"
 #include "azure/keyvault/keys/cryptography/cryptography_client_models.hpp"
 
+#include <azure/core/internal/json/json.hpp>
+
 #include <string>
 #include <vector>
 
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/wrap_result.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/wrap_result.cpp
index e68293d87f..35815e8e37 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/wrap_result.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/wrap_result.cpp
@@ -1,13 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/core/base64.hpp>
-#include <azure/core/internal/json/json.hpp>
-
 #include "../private/cryptography_serializers.hpp"
 #include "../private/key_constants.hpp"
 #include "azure/keyvault/keys/cryptography/cryptography_client_models.hpp"
 
+#include <azure/core/base64.hpp>
+#include <azure/core/internal/json/json.hpp>
+
 #include <string>
 #include <vector>
 
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/delete_key_operation.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/delete_key_operation.cpp
index eebce6b742..9d698012af 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/delete_key_operation.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/delete_key_operation.cpp
@@ -1,15 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/core/exception.hpp>
-
-#include <azure/core/exception.hpp>
-
 #include "azure/keyvault/keys/key_client.hpp"
 #include "azure/keyvault/keys/key_client_models.hpp"
 #include "private/key_constants.hpp"
 #include "private/key_serializers.hpp"
 
+#include <azure/core/exception.hpp>
+
 using namespace Azure::Security::KeyVault::Keys;
 using namespace Azure::Security::KeyVault;
 
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/deleted_key.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/deleted_key.cpp
index faa5206acb..8a78dacdcb 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/deleted_key.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/deleted_key.cpp
@@ -1,13 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/core/internal/json/json.hpp>
-#include <azure/core/internal/json/json_optional.hpp>
-
 #include "azure/keyvault/keys/key_client_models.hpp"
 #include "private/key_constants.hpp"
 #include "private/key_serializers.hpp"
 
+#include <azure/core/internal/json/json.hpp>
+#include <azure/core/internal/json/json_optional.hpp>
+
 using namespace Azure::Security::KeyVault::Keys;
 using namespace Azure::Core::Json::_internal;
 using Azure::Core::_internal::PosixTimeConverter;
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/import_key_options.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/import_key_options.cpp
index 013e65fab8..83e76e0a41 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/import_key_options.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/import_key_options.cpp
@@ -1,13 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/core/internal/json/json.hpp>
-#include <azure/core/internal/json/json_optional.hpp>
-
 #include "azure/keyvault/keys/key_client_options.hpp"
 #include "private/key_constants.hpp"
 #include "private/key_serializers.hpp"
 
+#include <azure/core/internal/json/json.hpp>
+#include <azure/core/internal/json/json_optional.hpp>
+
 #include <string>
 
 using namespace Azure::Security::KeyVault::Keys;
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/json_web_key.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/json_web_key.cpp
index df5a6368ad..df68760bfa 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/json_web_key.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/json_web_key.cpp
@@ -1,13 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/core/base64.hpp>
-#include <azure/core/internal/json/json_optional.hpp>
-
 #include "azure/keyvault/keys/key_client_models.hpp"
 #include "private/key_constants.hpp"
 #include "private/key_serializers.hpp"
 
+#include <azure/core/base64.hpp>
+#include <azure/core/internal/json/json_optional.hpp>
+
 #include <map>
 #include <string>
 #include <vector>
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/key_backup.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/key_backup.cpp
index 76d1fe9164..fda44978ce 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/key_backup.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/key_backup.cpp
@@ -1,13 +1,14 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
+#include "private/key_backup.hpp"
+
+#include "private/key_constants.hpp"
+
 #include <azure/core/base64.hpp>
 #include <azure/core/internal/json/json.hpp>
 #include <azure/core/internal/json/json_optional.hpp>
 
-#include "private/key_backup.hpp"
-#include "private/key_constants.hpp"
-
 #include <string>
 
 using namespace Azure::Security::KeyVault::Keys::_detail;
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/key_client.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/key_client.cpp
index 0dae980d10..685bc4b3f7 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/key_client.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/key_client.cpp
@@ -1,14 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/core/credentials/credentials.hpp>
-#include <azure/core/http/http.hpp>
-#include <azure/core/http/policies/policy.hpp>
-#include <azure/core/internal/http/pipeline.hpp>
-#include <azure/keyvault/shared/keyvault_challenge_based_authentication_policy.hpp>
-#include <azure/keyvault/shared/keyvault_shared.hpp>
-
 #include "azure/keyvault/keys/key_client.hpp"
+
 #include "private/cryptography_internal_access.hpp"
 #include "private/key_backup.hpp"
 #include "private/key_constants.hpp"
@@ -17,6 +11,13 @@
 #include "private/keyvault_protocol.hpp"
 #include "private/package_version.hpp"
 
+#include <azure/core/credentials/credentials.hpp>
+#include <azure/core/http/http.hpp>
+#include <azure/core/http/policies/policy.hpp>
+#include <azure/core/internal/http/pipeline.hpp>
+#include <azure/keyvault/shared/keyvault_challenge_based_authentication_policy.hpp>
+#include <azure/keyvault/shared/keyvault_shared.hpp>
+
 #include <algorithm>
 #include <memory>
 #include <string>
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/key_get_random_bytes.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/key_get_random_bytes.cpp
index 7e5c9746ff..d194a91361 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/key_get_random_bytes.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/key_get_random_bytes.cpp
@@ -4,6 +4,7 @@
 #include "azure/keyvault/keys/key_client_models.hpp"
 #include "private/key_constants.hpp"
 #include "private/key_serializers.hpp"
+
 #include <azure/core/base64.hpp>
 #include <azure/core/internal/json/json.hpp>
 #include <azure/core/internal/json/json_optional.hpp>
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/key_release_options.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/key_release_options.cpp
index 8363a05b6b..3a0436b3d8 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/key_release_options.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/key_release_options.cpp
@@ -1,13 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/core/base64.hpp>
-#include <azure/core/internal/json/json_optional.hpp>
-
 #include "azure/keyvault/keys/key_client_options.hpp"
 #include "private/key_constants.hpp"
 #include "private/key_serializers.hpp"
 
+#include <azure/core/base64.hpp>
+#include <azure/core/internal/json/json_optional.hpp>
+
 #include <map>
 #include <string>
 #include <vector>
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/key_release_policy.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/key_release_policy.cpp
index 1ac616f01e..a87b291da4 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/key_release_policy.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/key_release_policy.cpp
@@ -1,13 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/core/base64.hpp>
-#include <azure/core/internal/json/json_optional.hpp>
-
 #include "azure/keyvault/keys/key_client_options.hpp"
 #include "private/key_constants.hpp"
 #include "private/key_serializers.hpp"
 
+#include <azure/core/base64.hpp>
+#include <azure/core/internal/json/json_optional.hpp>
+
 #include <map>
 #include <string>
 #include <vector>
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/key_request_parameters.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/key_request_parameters.cpp
index df8f8d15ea..8bb446f1e3 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/key_request_parameters.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/key_request_parameters.cpp
@@ -1,13 +1,14 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/core/internal/json/json.hpp>
-#include <azure/core/internal/json/json_optional.hpp>
+#include "private/key_request_parameters.hpp"
 
 #include "private/key_constants.hpp"
-#include "private/key_request_parameters.hpp"
 #include "private/key_serializers.hpp"
 
+#include <azure/core/internal/json/json.hpp>
+#include <azure/core/internal/json/json_optional.hpp>
+
 #include <string>
 
 using namespace Azure::Security::KeyVault::Keys::_detail;
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/key_rotation_policy.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/key_rotation_policy.cpp
index dbeae29ba1..adc1626f62 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/key_rotation_policy.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/key_rotation_policy.cpp
@@ -1,13 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/core/internal/json/json.hpp>
-#include <azure/core/internal/json/json_optional.hpp>
-
 #include "azure/keyvault/keys/key_client_models.hpp"
 #include "private/key_constants.hpp"
 #include "private/key_serializers.hpp"
 
+#include <azure/core/internal/json/json.hpp>
+#include <azure/core/internal/json/json_optional.hpp>
+
 using namespace Azure::Security::KeyVault::Keys;
 using namespace Azure::Core::Json::_internal;
 using Azure::Core::_internal::PosixTimeConverter;
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/keyvault_key.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/keyvault_key.cpp
index e14f5c92b2..2150180275 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/keyvault_key.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/keyvault_key.cpp
@@ -1,15 +1,15 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
+#include "azure/keyvault/keys/key_client_models.hpp"
+#include "private/key_constants.hpp"
+#include "private/key_serializers.hpp"
+
 #include <azure/core/internal/json/json.hpp>
 #include <azure/core/internal/json/json_optional.hpp>
 #include <azure/core/internal/json/json_serializable.hpp>
 #include <azure/core/url.hpp>
 
-#include "azure/keyvault/keys/key_client_models.hpp"
-#include "private/key_constants.hpp"
-#include "private/key_serializers.hpp"
-
 using namespace Azure::Security::KeyVault::Keys;
 using namespace Azure::Core::Json::_internal;
 using Azure::Core::_internal::PosixTimeConverter;
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/keyvault_protocol.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/keyvault_protocol.cpp
index 9e0c4ca069..6dbc3b5ba4 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/keyvault_protocol.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/keyvault_protocol.cpp
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: MIT
 
 #include "private/keyvault_protocol.hpp"
+
 #include "private/key_constants.hpp"
 #include "private/keyvault_constants.hpp"
 
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/private/cryptography_internal_access.hpp b/sdk/keyvault/azure-security-keyvault-keys/src/private/cryptography_internal_access.hpp
index c7a5cad091..070c2d933b 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/private/cryptography_internal_access.hpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/private/cryptography_internal_access.hpp
@@ -9,10 +9,10 @@
 
 #pragma once
 
-#include <azure/core/http/http.hpp>
-
 #include "azure/keyvault/keys/cryptography/cryptography_client.hpp"
 
+#include <azure/core/http/http.hpp>
+
 #include <string>
 
 namespace Azure {
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/private/cryptography_serializers.hpp b/sdk/keyvault/azure-security-keyvault-keys/src/private/cryptography_serializers.hpp
index fd05ad27a6..da5f7605d5 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/private/cryptography_serializers.hpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/private/cryptography_serializers.hpp
@@ -10,15 +10,14 @@
 
 #pragma once
 
-#include <azure/core/http/http.hpp>
-#include <azure/core/internal/json/json.hpp>
-
 #include "azure/keyvault/keys/cryptography/cryptography_client_models.hpp"
-
 #include "key_sign_parameters.hpp"
 #include "key_verify_parameters.hpp"
 #include "key_wrap_parameters.hpp"
 
+#include <azure/core/http/http.hpp>
+#include <azure/core/internal/json/json.hpp>
+
 #include <string>
 
 namespace Azure {
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/private/key_request_parameters.hpp b/sdk/keyvault/azure-security-keyvault-keys/src/private/key_request_parameters.hpp
index e23536243d..3a9d8e1653 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/private/key_request_parameters.hpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/private/key_request_parameters.hpp
@@ -9,12 +9,12 @@
 
 #pragma once
 
-#include <azure/core/internal/json/json_serializable.hpp>
-#include <azure/core/nullable.hpp>
-
 #include "azure/keyvault/keys/key_client_models.hpp"
 #include "azure/keyvault/keys/key_client_options.hpp"
 
+#include <azure/core/internal/json/json_serializable.hpp>
+#include <azure/core/nullable.hpp>
+
 #include <functional>
 #include <memory>
 #include <string>
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/private/key_serializers.hpp b/sdk/keyvault/azure-security-keyvault-keys/src/private/key_serializers.hpp
index dc95902cd2..5662acbb22 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/private/key_serializers.hpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/private/key_serializers.hpp
@@ -9,11 +9,11 @@
 
 #pragma once
 
-#include <azure/core/internal/json/json.hpp>
-
 #include "azure/keyvault/keys/key_client_models.hpp"
 #include "azure/keyvault/keys/key_client_options.hpp"
 
+#include <azure/core/internal/json/json.hpp>
+
 #include <string>
 
 namespace Azure { namespace Security { namespace KeyVault { namespace Keys { namespace _detail {
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/recover_deleted_key_operation.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/recover_deleted_key_operation.cpp
index f16d0ee959..c43df7c7aa 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/recover_deleted_key_operation.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/recover_deleted_key_operation.cpp
@@ -1,13 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/core/exception.hpp>
-
 #include "azure/keyvault/keys/key_client.hpp"
 #include "azure/keyvault/keys/key_client_models.hpp"
 #include "private/key_constants.hpp"
 #include "private/key_serializers.hpp"
 
+#include <azure/core/exception.hpp>
+
 using namespace Azure::Security::KeyVault::Keys;
 using namespace Azure::Security::KeyVault;
 
diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/perf/inc/azure/keyvault/keys/test/get_key_test.hpp b/sdk/keyvault/azure-security-keyvault-keys/test/perf/inc/azure/keyvault/keys/test/get_key_test.hpp
index 339afc5291..956851418c 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/test/perf/inc/azure/keyvault/keys/test/get_key_test.hpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/test/perf/inc/azure/keyvault/keys/test/get_key_test.hpp
@@ -9,11 +9,10 @@
 
 #pragma once
 
-#include <azure/perf.hpp>
-
 #include <azure/core/internal/environment.hpp>
 #include <azure/identity.hpp>
 #include <azure/keyvault/keys.hpp>
+#include <azure/perf.hpp>
 
 #include <memory>
 #include <string>
diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/perf/src/azure_security_keyvault_keys_perf_test.cpp b/sdk/keyvault/azure-security-keyvault-keys/test/perf/src/azure_security_keyvault_keys_perf_test.cpp
index e32fcb7bc3..c8e330a2d4 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/test/perf/src/azure_security_keyvault_keys_perf_test.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/test/perf/src/azure_security_keyvault_keys_perf_test.cpp
@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/perf.hpp>
-
 #include "azure/keyvault/keys/test/get_key_test.hpp"
 
+#include <azure/perf.hpp>
+
 int main(int argc, char** argv)
 {
 
diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/ut-hsm/key_client_test_hsm_live.cpp b/sdk/keyvault/azure-security-keyvault-keys/test/ut-hsm/key_client_test_hsm_live.cpp
index b0a3a514c1..778a43bc62 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/test/ut-hsm/key_client_test_hsm_live.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/test/ut-hsm/key_client_test_hsm_live.cpp
@@ -4,6 +4,7 @@
 #include "key_client_test_hsm_live.hpp"
 
 #include "gtest/gtest.h"
+
 #include <azure/keyvault/keys.hpp>
 
 using namespace Azure::Security::KeyVault::Keys;
diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/ut-hsm/key_client_test_hsm_live.hpp b/sdk/keyvault/azure-security-keyvault-keys/test/ut-hsm/key_client_test_hsm_live.hpp
index 5c4d3dd2fc..99c7f31d4e 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/test/ut-hsm/key_client_test_hsm_live.hpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/test/ut-hsm/key_client_test_hsm_live.hpp
@@ -6,11 +6,11 @@
  * @brief The base class to construct and init a Key Vault HSM client.
  *
  */
-#include <gtest/gtest.h>
-
 #include <azure/core/test/test_base.hpp>
 #include <azure/keyvault/keys.hpp>
 
+#include <gtest/gtest.h>
+
 namespace Azure { namespace Security { namespace KeyVault { namespace Keys { namespace Test {
 
   class KeyVaultKeyHSMClient : public Azure::Core::Test::TestBase {
diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_backup_test_live.cpp b/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_backup_test_live.cpp
index d3536f79f3..40f6389593 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_backup_test_live.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_backup_test_live.cpp
@@ -2,18 +2,18 @@
 // SPDX-License-Identifier: MIT
 
 #include "gtest/gtest.h"
-
 #include "key_client_base_test.hpp"
 
 #include <azure/core/base64.hpp>
 #include <azure/core/internal/json/json.hpp>
 #include <azure/keyvault/keys.hpp>
-#include <private/key_constants.hpp>
 
 #include <iostream>
 #include <string>
 #include <thread>
 
+#include <private/key_constants.hpp>
+
 using namespace Azure::Security::KeyVault::Keys::Test;
 using namespace Azure::Security::KeyVault::Keys;
 using namespace Azure::Core::Json::_internal;
diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_base_test.hpp b/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_base_test.hpp
index a47a2756ec..df77d3ece1 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_base_test.hpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_base_test.hpp
@@ -6,8 +6,6 @@
  * @brief The base class to construct and init a Key Vault client.
  *
  */
-#include <gtest/gtest.h>
-
 #include <azure/core/context.hpp>
 #include <azure/core/test/test_base.hpp>
 #include <azure/core/uuid.hpp>
@@ -20,6 +18,8 @@
 #include <iostream>
 #include <thread>
 
+#include <gtest/gtest.h>
+
 namespace Azure { namespace Security { namespace KeyVault { namespace Keys { namespace Test {
 
   class KeyVaultKeyClient : public Azure::Core::Test::TestBase {
diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_create_test_live.cpp b/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_create_test_live.cpp
index 89d6150a42..d9cd4f184b 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_create_test_live.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_create_test_live.cpp
@@ -1,20 +1,22 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
+#include "gtest/gtest.h"
 #include "key_client_base_test.hpp"
-
 #include "private/key_constants.hpp"
 #include "private/key_serializers.hpp"
 #include "test_consts.hpp"
-#include "gtest/gtest.h"
+
 #include <azure/attestation.hpp>
 #include <azure/attestation/attestation_client_options.hpp>
 #include <azure/core/base64.hpp>
 #include <azure/core/internal/json/json.hpp>
 #include <azure/keyvault/keys.hpp>
-#include <private/key_constants.hpp>
+
 #include <string>
 
+#include <private/key_constants.hpp>
+
 using namespace Azure::Core::_internal;
 using namespace Azure::Security::KeyVault::Keys;
 using namespace Azure::Security::KeyVault::Keys::Test;
diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_delete_test_live.cpp b/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_delete_test_live.cpp
index 752d323a29..0005380442 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_delete_test_live.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_delete_test_live.cpp
@@ -2,14 +2,14 @@
 // SPDX-License-Identifier: MIT
 
 #include "gtest/gtest.h"
-
 #include "key_client_base_test.hpp"
 
 #include <azure/keyvault/keys.hpp>
-#include <private/key_constants.hpp>
 
 #include <string>
 
+#include <private/key_constants.hpp>
+
 namespace {
 
 std::string GetConflictErrorMsg(std::string const& keyName)
diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_get_test_live.cpp b/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_get_test_live.cpp
index dacc326455..6fbf9ef24f 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_get_test_live.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_get_test_live.cpp
@@ -2,14 +2,14 @@
 // SPDX-License-Identifier: MIT
 
 #include "gtest/gtest.h"
-
 #include "key_client_base_test.hpp"
 
 #include <azure/keyvault/keys.hpp>
-#include <private/key_constants.hpp>
 
 #include <string>
 
+#include <private/key_constants.hpp>
+
 using namespace Azure::Security::KeyVault::Keys::Test;
 using namespace Azure::Security::KeyVault::Keys;
 
diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_import_test_live.cpp b/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_import_test_live.cpp
index 756336584b..0586f4f211 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_import_test_live.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_import_test_live.cpp
@@ -2,14 +2,12 @@
 // SPDX-License-Identifier: MIT
 
 #include "gtest/gtest.h"
+#include "key_client_base_test.hpp"
 
 #include <azure/core/base64.hpp>
 #include <azure/core/exception.hpp>
-
 #include <azure/keyvault/keys.hpp>
 
-#include "key_client_base_test.hpp"
-
 #include <string>
 #include <thread>
 
diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_test.cpp b/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_test.cpp
index 5b924c9f92..55c8bdf6a4 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_test.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_test.cpp
@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: MIT
 
 #include "gtest/gtest.h"
-
 #include "private/key_constants.hpp"
 #include "private/key_serializers.hpp"
+
 #include <azure/core/context.hpp>
 #include <azure/identity/client_secret_credential.hpp>
 #include <azure/keyvault/keys.hpp>
diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_update_test_live.cpp b/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_update_test_live.cpp
index 691e5793a5..3bfde0a8b3 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_update_test_live.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_update_test_live.cpp
@@ -2,15 +2,15 @@
 // SPDX-License-Identifier: MIT
 
 #include "gtest/gtest.h"
-
 #include "key_client_base_test.hpp"
 
 #include <azure/core/datetime.hpp>
 #include <azure/keyvault/keys.hpp>
-#include <private/key_constants.hpp>
 
 #include <string>
 
+#include <private/key_constants.hpp>
+
 using namespace Azure::Security::KeyVault::Keys::Test;
 using namespace Azure;
 using namespace Azure::Security::KeyVault::Keys;
diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_cryptographic_client_test_live.cpp b/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_cryptographic_client_test_live.cpp
index 9d67decca3..8dc23a23b4 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_cryptographic_client_test_live.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_cryptographic_client_test_live.cpp
@@ -2,11 +2,9 @@
 // SPDX-License-Identifier: MIT
 
 #include "gtest/gtest.h"
-
-#include <azure/core/internal/cryptography/sha_hash.hpp>
-
 #include "key_client_base_test.hpp"
 
+#include <azure/core/internal/cryptography/sha_hash.hpp>
 #include <azure/keyvault/keys.hpp>
 
 #include <string>
diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_rotation_policy_test_live.cpp b/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_rotation_policy_test_live.cpp
index 104616fc03..49ac6e81b2 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_rotation_policy_test_live.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_rotation_policy_test_live.cpp
@@ -2,16 +2,17 @@
 // SPDX-License-Identifier: MIT
 
 #include "gtest/gtest.h"
-
 #include "key_client_base_test.hpp"
 #include "private/key_serializers.hpp"
+
 #include <azure/core/base64.hpp>
 #include <azure/core/datetime.hpp>
 #include <azure/keyvault/keyvault_keys.hpp>
-#include <private/key_constants.hpp>
 
 #include <string>
 
+#include <private/key_constants.hpp>
+
 using namespace Azure::Security::KeyVault::Keys::Test;
 using namespace Azure;
 using namespace Azure::Security::KeyVault::Keys;
diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/ut/mocked_client_test.cpp b/sdk/keyvault/azure-security-keyvault-keys/test/ut/mocked_client_test.cpp
index 7587463624..013dadf936 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/test/ut/mocked_client_test.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/test/ut/mocked_client_test.cpp
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: MIT
 
 #include "gtest/gtest.h"
-
 #include "mocked_transport_adapter_test.hpp"
 
 #include <azure/core/internal/strings.hpp>
diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/ut/mocked_transport_adapter_test.hpp b/sdk/keyvault/azure-security-keyvault-keys/test/ut/mocked_transport_adapter_test.hpp
index cd6cf66dc1..1277fa97c9 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/test/ut/mocked_transport_adapter_test.hpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/test/ut/mocked_transport_adapter_test.hpp
@@ -7,8 +7,6 @@
  *
  */
 
-#include <gtest/gtest.h>
-
 #include "./../../src/private/key_serializers.hpp"
 #include "./../../src/private/keyvault_protocol.hpp"
 #include "./../../src/private/package_version.hpp"
@@ -20,6 +18,8 @@
 #include <cstdio>
 #include <string>
 
+#include <gtest/gtest.h>
+
 namespace Azure { namespace Security { namespace KeyVault { namespace Keys { namespace Test {
 
   namespace _detail {
diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/ut/test_consts.hpp b/sdk/keyvault/azure-security-keyvault-keys/test/ut/test_consts.hpp
index 55c7014d34..edd18a429d 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/test/ut/test_consts.hpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/test/ut/test_consts.hpp
@@ -8,6 +8,7 @@
  */
 
 #include <azure/core/internal/environment.hpp>
+
 #include <string>
 
 // cspell:disable
diff --git a/sdk/keyvault/azure-security-keyvault-secrets/inc/azure/keyvault/secrets/keyvault_operations.hpp b/sdk/keyvault/azure-security-keyvault-secrets/inc/azure/keyvault/secrets/keyvault_operations.hpp
index 270b641a41..8f5c355947 100644
--- a/sdk/keyvault/azure-security-keyvault-secrets/inc/azure/keyvault/secrets/keyvault_operations.hpp
+++ b/sdk/keyvault/azure-security-keyvault-secrets/inc/azure/keyvault/secrets/keyvault_operations.hpp
@@ -9,10 +9,12 @@
 #pragma once
 #include "azure/keyvault/secrets/keyvault_deleted_secret.hpp"
 #include "azure/keyvault/secrets/keyvault_secret.hpp"
+
 #include <azure/core/http/http.hpp>
 #include <azure/core/operation.hpp>
 #include <azure/core/operation_status.hpp>
 #include <azure/core/response.hpp>
+
 #include <thread>
 
 namespace Azure { namespace Security { namespace KeyVault { namespace Secrets {
diff --git a/sdk/keyvault/azure-security-keyvault-secrets/inc/azure/keyvault/secrets/keyvault_options.hpp b/sdk/keyvault/azure-security-keyvault-secrets/inc/azure/keyvault/secrets/keyvault_options.hpp
index 6b3e26a575..30967dfbea 100644
--- a/sdk/keyvault/azure-security-keyvault-secrets/inc/azure/keyvault/secrets/keyvault_options.hpp
+++ b/sdk/keyvault/azure-security-keyvault-secrets/inc/azure/keyvault/secrets/keyvault_options.hpp
@@ -7,6 +7,7 @@
  */
 #pragma once
 #include "dll_import_export.hpp"
+
 #include <azure/core/internal/client_options.hpp>
 
 namespace Azure { namespace Security { namespace KeyVault { namespace Secrets {
diff --git a/sdk/keyvault/azure-security-keyvault-secrets/inc/azure/keyvault/secrets/keyvault_secret_paged_response.hpp b/sdk/keyvault/azure-security-keyvault-secrets/inc/azure/keyvault/secrets/keyvault_secret_paged_response.hpp
index 69639755b9..c92950d2f1 100644
--- a/sdk/keyvault/azure-security-keyvault-secrets/inc/azure/keyvault/secrets/keyvault_secret_paged_response.hpp
+++ b/sdk/keyvault/azure-security-keyvault-secrets/inc/azure/keyvault/secrets/keyvault_secret_paged_response.hpp
@@ -10,7 +10,9 @@
 
 #include "azure/keyvault/secrets/keyvault_deleted_secret.hpp"
 #include "azure/keyvault/secrets/keyvault_secret_properties.hpp"
+
 #include <azure/core/paged_response.hpp>
+
 #include <memory>
 #include <vector>
 
diff --git a/sdk/keyvault/azure-security-keyvault-secrets/inc/azure/keyvault/secrets/keyvault_secret_properties.hpp b/sdk/keyvault/azure-security-keyvault-secrets/inc/azure/keyvault/secrets/keyvault_secret_properties.hpp
index 0973d53e0d..1a08f60be7 100644
--- a/sdk/keyvault/azure-security-keyvault-secrets/inc/azure/keyvault/secrets/keyvault_secret_properties.hpp
+++ b/sdk/keyvault/azure-security-keyvault-secrets/inc/azure/keyvault/secrets/keyvault_secret_properties.hpp
@@ -11,6 +11,7 @@
 #include <azure/core/datetime.hpp>
 #include <azure/core/nullable.hpp>
 #include <azure/core/url.hpp>
+
 #include <unordered_map>
 
 namespace Azure { namespace Security { namespace KeyVault { namespace Secrets {
diff --git a/sdk/keyvault/azure-security-keyvault-secrets/inc/azure/keyvault/secrets/secret_client.hpp b/sdk/keyvault/azure-security-keyvault-secrets/inc/azure/keyvault/secrets/secret_client.hpp
index 473a060d53..c5df7bcf34 100644
--- a/sdk/keyvault/azure-security-keyvault-secrets/inc/azure/keyvault/secrets/secret_client.hpp
+++ b/sdk/keyvault/azure-security-keyvault-secrets/inc/azure/keyvault/secrets/secret_client.hpp
@@ -15,9 +15,11 @@
 #include "azure/keyvault/secrets/keyvault_secret.hpp"
 #include "azure/keyvault/secrets/keyvault_secret_paged_response.hpp"
 #include "dll_import_export.hpp"
+
 #include <azure/core/http/http.hpp>
 #include <azure/core/internal/http/pipeline.hpp>
 #include <azure/core/response.hpp>
+
 #include <stdint.h>
 #include <string>
 
diff --git a/sdk/keyvault/azure-security-keyvault-secrets/src/keyvault_operations.cpp b/sdk/keyvault/azure-security-keyvault-secrets/src/keyvault_operations.cpp
index df82aee251..5625f599e4 100644
--- a/sdk/keyvault/azure-security-keyvault-secrets/src/keyvault_operations.cpp
+++ b/sdk/keyvault/azure-security-keyvault-secrets/src/keyvault_operations.cpp
@@ -7,6 +7,7 @@
  */
 
 #include "azure/keyvault/secrets/keyvault_operations.hpp"
+
 #include "azure/keyvault/secrets/secret_client.hpp"
 #include "private/secret_serializers.hpp"
 
diff --git a/sdk/keyvault/azure-security-keyvault-secrets/src/keyvault_protocol.cpp b/sdk/keyvault/azure-security-keyvault-secrets/src/keyvault_protocol.cpp
index 12cc6c4028..3aa02cb870 100644
--- a/sdk/keyvault/azure-security-keyvault-secrets/src/keyvault_protocol.cpp
+++ b/sdk/keyvault/azure-security-keyvault-secrets/src/keyvault_protocol.cpp
@@ -2,7 +2,9 @@
 // SPDX-License-Identifier: MIT
 
 #include "private/keyvault_protocol.hpp"
+
 #include "private/secret_constants.hpp"
+
 #include <azure/core/exception.hpp>
 #include <azure/core/http/http.hpp>
 
diff --git a/sdk/keyvault/azure-security-keyvault-secrets/src/keyvault_secret_paged_response.cpp b/sdk/keyvault/azure-security-keyvault-secrets/src/keyvault_secret_paged_response.cpp
index ff2617ebe9..822e779eee 100644
--- a/sdk/keyvault/azure-security-keyvault-secrets/src/keyvault_secret_paged_response.cpp
+++ b/sdk/keyvault/azure-security-keyvault-secrets/src/keyvault_secret_paged_response.cpp
@@ -7,6 +7,7 @@
  */
 
 #include "azure/keyvault/secrets/keyvault_secret_paged_response.hpp"
+
 #include "azure/keyvault/secrets/secret_client.hpp"
 
 using namespace Azure::Security::KeyVault::Secrets;
diff --git a/sdk/keyvault/azure-security-keyvault-secrets/src/keyvault_secrets_common_request.cpp b/sdk/keyvault/azure-security-keyvault-secrets/src/keyvault_secrets_common_request.cpp
index ed350bfed4..d616ad7841 100644
--- a/sdk/keyvault/azure-security-keyvault-secrets/src/keyvault_secrets_common_request.cpp
+++ b/sdk/keyvault/azure-security-keyvault-secrets/src/keyvault_secrets_common_request.cpp
@@ -5,6 +5,7 @@
 
 #include <azure/core/exception.hpp>
 #include <azure/core/http/http.hpp>
+
 #include <memory>
 
 using namespace Azure::Security::KeyVault::Secrets;
diff --git a/sdk/keyvault/azure-security-keyvault-secrets/src/private/secret_serializers.hpp b/sdk/keyvault/azure-security-keyvault-secrets/src/private/secret_serializers.hpp
index 9b9424e507..f2da060607 100644
--- a/sdk/keyvault/azure-security-keyvault-secrets/src/private/secret_serializers.hpp
+++ b/sdk/keyvault/azure-security-keyvault-secrets/src/private/secret_serializers.hpp
@@ -12,8 +12,10 @@
 #include "azure/keyvault/secrets/keyvault_deleted_secret.hpp"
 #include "azure/keyvault/secrets/keyvault_secret.hpp"
 #include "azure/keyvault/secrets/keyvault_secret_paged_response.hpp"
+
 #include <azure/core/http/http.hpp>
 #include <azure/core/internal/json/json.hpp>
+
 #include <stdint.h>
 #include <vector>
 
diff --git a/sdk/keyvault/azure-security-keyvault-secrets/src/secret_client.cpp b/sdk/keyvault/azure-security-keyvault-secrets/src/secret_client.cpp
index 24f485c9db..15c069a308 100644
--- a/sdk/keyvault/azure-security-keyvault-secrets/src/secret_client.cpp
+++ b/sdk/keyvault/azure-security-keyvault-secrets/src/secret_client.cpp
@@ -7,6 +7,7 @@
  */
 
 #include "azure/keyvault/secrets/secret_client.hpp"
+
 #include "azure/keyvault/secrets/keyvault_operations.hpp"
 #include "private/keyvault_protocol.hpp"
 #include "private/keyvault_secrets_common_request.hpp"
diff --git a/sdk/keyvault/azure-security-keyvault-secrets/src/secret_serializers.cpp b/sdk/keyvault/azure-security-keyvault-secrets/src/secret_serializers.cpp
index a3435af6d1..b103738f9d 100644
--- a/sdk/keyvault/azure-security-keyvault-secrets/src/secret_serializers.cpp
+++ b/sdk/keyvault/azure-security-keyvault-secrets/src/secret_serializers.cpp
@@ -7,7 +7,9 @@
  */
 
 #include "private/secret_serializers.hpp"
+
 #include "private/secret_constants.hpp"
+
 #include <azure/core/base64.hpp>
 #include <azure/core/internal/json/json.hpp>
 #include <azure/core/internal/json/json_optional.hpp>
diff --git a/sdk/keyvault/azure-security-keyvault-secrets/test/perf/inc/azure/keyvault/secrets/test/get_secret_test.hpp b/sdk/keyvault/azure-security-keyvault-secrets/test/perf/inc/azure/keyvault/secrets/test/get_secret_test.hpp
index d169193115..56a755fb2d 100644
--- a/sdk/keyvault/azure-security-keyvault-secrets/test/perf/inc/azure/keyvault/secrets/test/get_secret_test.hpp
+++ b/sdk/keyvault/azure-security-keyvault-secrets/test/perf/inc/azure/keyvault/secrets/test/get_secret_test.hpp
@@ -9,11 +9,10 @@
 
 #pragma once
 
-#include <azure/perf.hpp>
-
 #include <azure/core/internal/environment.hpp>
 #include <azure/identity.hpp>
 #include <azure/keyvault/secrets.hpp>
+#include <azure/perf.hpp>
 
 #include <memory>
 #include <string>
diff --git a/sdk/keyvault/azure-security-keyvault-secrets/test/perf/src/azure_security_keyvault_secrets_perf_test.cpp b/sdk/keyvault/azure-security-keyvault-secrets/test/perf/src/azure_security_keyvault_secrets_perf_test.cpp
index 75d4376cf3..4cb18d3446 100644
--- a/sdk/keyvault/azure-security-keyvault-secrets/test/perf/src/azure_security_keyvault_secrets_perf_test.cpp
+++ b/sdk/keyvault/azure-security-keyvault-secrets/test/perf/src/azure_security_keyvault_secrets_perf_test.cpp
@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/perf.hpp>
-
 #include "azure/keyvault/secrets/test/get_secret_test.hpp"
 
+#include <azure/perf.hpp>
+
 int main(int argc, char** argv)
 {
 
diff --git a/sdk/keyvault/azure-security-keyvault-secrets/test/test-app/test_app.cpp b/sdk/keyvault/azure-security-keyvault-secrets/test/test-app/test_app.cpp
index 972cd41887..16a647da9a 100644
--- a/sdk/keyvault/azure-security-keyvault-secrets/test/test-app/test_app.cpp
+++ b/sdk/keyvault/azure-security-keyvault-secrets/test/test-app/test_app.cpp
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: MIT
 
 #include "azure/keyvault/secrets.hpp"
+
 #include <azure/core/internal/environment.hpp>
 #include <azure/identity.hpp>
 
diff --git a/sdk/keyvault/azure-security-keyvault-secrets/test/ut/challenge_based_authentication_policy_test.cpp b/sdk/keyvault/azure-security-keyvault-secrets/test/ut/challenge_based_authentication_policy_test.cpp
index 80f1dbfa25..dab1a03665 100644
--- a/sdk/keyvault/azure-security-keyvault-secrets/test/ut/challenge_based_authentication_policy_test.cpp
+++ b/sdk/keyvault/azure-security-keyvault-secrets/test/ut/challenge_based_authentication_policy_test.cpp
@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: MIT
 
 #include "azure/keyvault/shared/keyvault_challenge_based_authentication_policy.hpp"
-
 #include "azure/keyvault/shared/keyvault_shared.hpp"
+
 #include <azure/core/internal/http/pipeline.hpp>
 #include <azure/identity/client_secret_credential.hpp>
 
diff --git a/sdk/keyvault/azure-security-keyvault-secrets/test/ut/secret_backup_deserialize_test.cpp b/sdk/keyvault/azure-security-keyvault-secrets/test/ut/secret_backup_deserialize_test.cpp
index 070a36fa3c..a5cc799f88 100644
--- a/sdk/keyvault/azure-security-keyvault-secrets/test/ut/secret_backup_deserialize_test.cpp
+++ b/sdk/keyvault/azure-security-keyvault-secrets/test/ut/secret_backup_deserialize_test.cpp
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: MIT
 
 #include "secret_backup_deserialize_test.hpp"
+
 #include "../src/private/secret_serializers.hpp"
 #include "azure/keyvault/secrets/secret_client.hpp"
 
diff --git a/sdk/keyvault/azure-security-keyvault-secrets/test/ut/secret_backup_deserialize_test.hpp b/sdk/keyvault/azure-security-keyvault-secrets/test/ut/secret_backup_deserialize_test.hpp
index 2a4c541ac7..7d4009443a 100644
--- a/sdk/keyvault/azure-security-keyvault-secrets/test/ut/secret_backup_deserialize_test.hpp
+++ b/sdk/keyvault/azure-security-keyvault-secrets/test/ut/secret_backup_deserialize_test.hpp
@@ -3,11 +3,14 @@
 
 #include "azure/keyvault/secrets/keyvault_deleted_secret.hpp"
 #include "azure/keyvault/secrets/keyvault_secret.hpp"
+
 #include <azure/core/http/http.hpp>
 #include <azure/core/http/policies/policy.hpp>
-#include <gtest/gtest.h>
+
 #include <string>
 
+#include <gtest/gtest.h>
+
 using namespace Azure::Security::KeyVault::Secrets;
 using namespace Azure::Core::Http::_internal;
 
diff --git a/sdk/keyvault/azure-security-keyvault-secrets/test/ut/secret_client_base_test.hpp b/sdk/keyvault/azure-security-keyvault-secrets/test/ut/secret_client_base_test.hpp
index e78f8c2c13..5c4faddf4a 100644
--- a/sdk/keyvault/azure-security-keyvault-secrets/test/ut/secret_client_base_test.hpp
+++ b/sdk/keyvault/azure-security-keyvault-secrets/test/ut/secret_client_base_test.hpp
@@ -6,12 +6,12 @@
  * @brief The base class to construct and init a Key Vault client.
  *
  */
-#include <gtest/gtest.h>
-
 #include <azure/core/test/test_base.hpp>
 #include <azure/identity/client_secret_credential.hpp>
 #include <azure/keyvault/secrets.hpp>
 
+#include <gtest/gtest.h>
+
 using namespace std::chrono_literals;
 
 namespace Azure { namespace Security { namespace KeyVault { namespace Secrets { namespace _test {
diff --git a/sdk/keyvault/azure-security-keyvault-secrets/test/ut/secret_client_test.cpp b/sdk/keyvault/azure-security-keyvault-secrets/test/ut/secret_client_test.cpp
index 4327f910a7..7d2f351c10 100644
--- a/sdk/keyvault/azure-security-keyvault-secrets/test/ut/secret_client_test.cpp
+++ b/sdk/keyvault/azure-security-keyvault-secrets/test/ut/secret_client_test.cpp
@@ -3,7 +3,9 @@
 
 #include "azure/identity/client_secret_credential.hpp"
 #include "secret_client_base_test.hpp"
+
 #include <cstddef>
+
 #include <gtest/gtest.h>
 
 using namespace std::chrono_literals;
diff --git a/sdk/keyvault/azure-security-keyvault-secrets/test/ut/secret_get_client_deserialize_test.cpp b/sdk/keyvault/azure-security-keyvault-secrets/test/ut/secret_get_client_deserialize_test.cpp
index a710238bcd..9f308083eb 100644
--- a/sdk/keyvault/azure-security-keyvault-secrets/test/ut/secret_get_client_deserialize_test.cpp
+++ b/sdk/keyvault/azure-security-keyvault-secrets/test/ut/secret_get_client_deserialize_test.cpp
@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: MIT
 
 #include "secret_get_client_deserialize_test.hpp"
-#include "../src/private/secret_serializers.hpp"
 
+#include "../src/private/secret_serializers.hpp"
 #include "azure/keyvault/secrets/secret_client.hpp"
 
 using namespace Azure::Security::KeyVault::Secrets;
diff --git a/sdk/keyvault/azure-security-keyvault-secrets/test/ut/secret_get_client_deserialize_test.hpp b/sdk/keyvault/azure-security-keyvault-secrets/test/ut/secret_get_client_deserialize_test.hpp
index 166dce9cf0..fadf700466 100644
--- a/sdk/keyvault/azure-security-keyvault-secrets/test/ut/secret_get_client_deserialize_test.hpp
+++ b/sdk/keyvault/azure-security-keyvault-secrets/test/ut/secret_get_client_deserialize_test.hpp
@@ -3,11 +3,14 @@
 
 #include "azure/keyvault/secrets/keyvault_deleted_secret.hpp"
 #include "azure/keyvault/secrets/keyvault_secret.hpp"
+
 #include <azure/core/http/http.hpp>
 #include <azure/core/http/policies/policy.hpp>
-#include <gtest/gtest.h>
+
 #include <string>
 
+#include <gtest/gtest.h>
+
 using namespace Azure::Security::KeyVault::Secrets;
 using namespace Azure::Core::Http::_internal;
 
diff --git a/sdk/keyvault/azure-security-keyvault-secrets/test/ut/secret_paged_deserialize_test.hpp b/sdk/keyvault/azure-security-keyvault-secrets/test/ut/secret_paged_deserialize_test.hpp
index c3fbeae388..bcc578f040 100644
--- a/sdk/keyvault/azure-security-keyvault-secrets/test/ut/secret_paged_deserialize_test.hpp
+++ b/sdk/keyvault/azure-security-keyvault-secrets/test/ut/secret_paged_deserialize_test.hpp
@@ -1,22 +1,23 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
+#include "../src/private/secret_serializers.hpp"
+#include "azure/keyvault/secrets/keyvault_secret_paged_response.hpp"
+#include "azure/keyvault/secrets/secret_client.hpp"
 #include "private/secret_constants.hpp"
 #include "private/secret_serializers.hpp"
 
-#include "../src/private/secret_serializers.hpp"
-#include "azure/keyvault/secrets/secret_client.hpp"
+#include <azure/core/http/http.hpp>
+#include <azure/core/http/policies/policy.hpp>
 #include <azure/core/internal/json/json.hpp>
 #include <azure/core/internal/json/json_optional.hpp>
 #include <azure/core/internal/json/json_serializable.hpp>
 
-#include "azure/keyvault/secrets/keyvault_secret_paged_response.hpp"
-#include <azure/core/http/http.hpp>
-#include <azure/core/http/policies/policy.hpp>
 #include <cstddef>
-#include <gtest/gtest.h>
 #include <string>
 
+#include <gtest/gtest.h>
+
 using namespace Azure::Security::KeyVault::Secrets;
 using namespace Azure::Core::Http::_internal;
 
diff --git a/sdk/keyvault/azure-security-keyvault-secrets/test/ut/secret_set_parameters_serializer_test.cpp b/sdk/keyvault/azure-security-keyvault-secrets/test/ut/secret_set_parameters_serializer_test.cpp
index 8ee85f998f..bd1fff48f5 100644
--- a/sdk/keyvault/azure-security-keyvault-secrets/test/ut/secret_set_parameters_serializer_test.cpp
+++ b/sdk/keyvault/azure-security-keyvault-secrets/test/ut/secret_set_parameters_serializer_test.cpp
@@ -1,14 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "private/secret_constants.hpp"
-#include "private/secret_serializers.hpp"
-
 #include "../src/private/secret_serializers.hpp"
 #include "azure/core/internal/json/json.hpp"
 #include "azure/core/internal/json/json_optional.hpp"
 #include "azure/core/internal/json/json_serializable.hpp"
 #include "azure/keyvault/secrets/secret_client.hpp"
+#include "private/secret_constants.hpp"
+#include "private/secret_serializers.hpp"
 #include "secret_get_client_deserialize_test.hpp"
 
 using namespace Azure::Security::KeyVault::Secrets;
diff --git a/sdk/keyvault/tools/cleanup/src/cleanup.cpp b/sdk/keyvault/tools/cleanup/src/cleanup.cpp
index c49f9afb84..de2aa286ef 100644
--- a/sdk/keyvault/tools/cleanup/src/cleanup.cpp
+++ b/sdk/keyvault/tools/cleanup/src/cleanup.cpp
@@ -19,6 +19,7 @@
 #include <azure/keyvault/certificates.hpp>
 #include <azure/keyvault/keys.hpp>
 #include <azure/keyvault/secrets.hpp>
+
 #include <chrono>
 #include <iostream>
 
diff --git a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs.hpp b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs.hpp
index 98d75e56cb..c80fcd682d 100644
--- a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs.hpp
+++ b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs.hpp
@@ -8,8 +8,6 @@
 
 #pragma once
 
-#include <azure/storage/common/storage_exception.hpp>
-
 #include "azure/storage/blobs/append_blob_client.hpp"
 #include "azure/storage/blobs/blob_batch.hpp"
 #include "azure/storage/blobs/blob_client.hpp"
@@ -24,3 +22,5 @@
 #include "azure/storage/blobs/page_blob_client.hpp"
 #include "azure/storage/blobs/rest_client.hpp"
 #include "azure/storage/blobs/rtti.hpp"
+
+#include <azure/storage/common/storage_exception.hpp>
diff --git a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/append_blob_client.hpp b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/append_blob_client.hpp
index 4abe08375a..d487e1a742 100644
--- a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/append_blob_client.hpp
+++ b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/append_blob_client.hpp
@@ -3,11 +3,11 @@
 
 #pragma once
 
+#include "azure/storage/blobs/blob_client.hpp"
+
 #include <memory>
 #include <string>
 
-#include "azure/storage/blobs/blob_client.hpp"
-
 namespace Azure { namespace Storage { namespace Blobs {
 
   /**
diff --git a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_batch.hpp b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_batch.hpp
index 3655cab17b..b6809097cd 100644
--- a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_batch.hpp
+++ b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_batch.hpp
@@ -3,15 +3,15 @@
 
 #pragma once
 
-#include <memory>
-#include <string>
-#include <vector>
-
 #include "azure/storage/blobs/blob_client.hpp"
 #include "azure/storage/blobs/blob_container_client.hpp"
 #include "azure/storage/blobs/blob_service_client.hpp"
 #include "azure/storage/blobs/deferred_response.hpp"
 
+#include <memory>
+#include <string>
+#include <vector>
+
 namespace Azure { namespace Storage { namespace Blobs {
 
   namespace _detail {
diff --git a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_client.hpp b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_client.hpp
index a704d034e1..12c53c32ba 100644
--- a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_client.hpp
+++ b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_client.hpp
@@ -3,16 +3,16 @@
 
 #pragma once
 
-#include <cstdint>
-#include <map>
-#include <memory>
-#include <string>
+#include "azure/storage/blobs/blob_options.hpp"
+#include "azure/storage/blobs/blob_responses.hpp"
 
 #include <azure/core/credentials/credentials.hpp>
 #include <azure/storage/common/storage_credential.hpp>
 
-#include "azure/storage/blobs/blob_options.hpp"
-#include "azure/storage/blobs/blob_responses.hpp"
+#include <cstdint>
+#include <map>
+#include <memory>
+#include <string>
 
 namespace Azure { namespace Storage { namespace Files { namespace DataLake {
   class DataLakeFileSystemClient;
diff --git a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_container_client.hpp b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_container_client.hpp
index f77b34b94c..dee80d092d 100644
--- a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_container_client.hpp
+++ b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_container_client.hpp
@@ -3,12 +3,12 @@
 
 #pragma once
 
+#include "azure/storage/blobs/blob_client.hpp"
+
 #include <cstdint>
 #include <memory>
 #include <string>
 
-#include "azure/storage/blobs/blob_client.hpp"
-
 namespace Azure { namespace Storage { namespace Blobs {
 
   class BlobLeaseClient;
diff --git a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_lease_client.hpp b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_lease_client.hpp
index 63d69685c3..7b364b2ee6 100644
--- a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_lease_client.hpp
+++ b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_lease_client.hpp
@@ -3,13 +3,13 @@
 
 #pragma once
 
+#include "azure/storage/blobs/blob_client.hpp"
+#include "azure/storage/blobs/blob_container_client.hpp"
+
 #include <chrono>
 #include <mutex>
 #include <string>
 
-#include "azure/storage/blobs/blob_client.hpp"
-#include "azure/storage/blobs/blob_container_client.hpp"
-
 namespace Azure { namespace Storage { namespace Blobs {
 
   /**
diff --git a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_options.hpp b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_options.hpp
index a1e4171be2..fc5535d45c 100644
--- a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_options.hpp
+++ b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_options.hpp
@@ -3,12 +3,7 @@
 
 #pragma once
 
-#include <chrono>
-#include <cstdint>
-#include <memory>
-#include <numeric>
-#include <string>
-#include <vector>
+#include "azure/storage/blobs/rest_client.hpp"
 
 #include <azure/core/internal/client_options.hpp>
 #include <azure/core/match_conditions.hpp>
@@ -16,7 +11,12 @@
 #include <azure/storage/common/access_conditions.hpp>
 #include <azure/storage/common/crypt.hpp>
 
-#include "azure/storage/blobs/rest_client.hpp"
+#include <chrono>
+#include <cstdint>
+#include <memory>
+#include <numeric>
+#include <string>
+#include <vector>
 
 namespace Azure { namespace Storage { namespace Blobs {
 
diff --git a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_responses.hpp b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_responses.hpp
index b0bf4fdd64..8bc13bb655 100644
--- a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_responses.hpp
+++ b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_responses.hpp
@@ -3,16 +3,16 @@
 
 #pragma once
 
-#include <cstdint>
-#include <string>
-#include <thread>
-#include <vector>
+#include "azure/storage/blobs/blob_options.hpp"
 
 #include <azure/core/azure_assert.hpp>
 #include <azure/core/operation.hpp>
 #include <azure/core/paged_response.hpp>
 
-#include "azure/storage/blobs/blob_options.hpp"
+#include <cstdint>
+#include <string>
+#include <thread>
+#include <vector>
 
 namespace Azure { namespace Storage {
 
diff --git a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_sas_builder.hpp b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_sas_builder.hpp
index 16c27507a3..e7f6044264 100644
--- a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_sas_builder.hpp
+++ b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_sas_builder.hpp
@@ -3,11 +3,11 @@
 
 #pragma once
 
-#include <string>
+#include "azure/storage/blobs/blob_responses.hpp"
 
 #include <azure/storage/common/account_sas_builder.hpp>
 
-#include "azure/storage/blobs/blob_responses.hpp"
+#include <string>
 
 namespace Azure { namespace Storage { namespace Sas {
 
diff --git a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_service_client.hpp b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_service_client.hpp
index b433bdfd6e..5007297172 100644
--- a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_service_client.hpp
+++ b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_service_client.hpp
@@ -3,13 +3,13 @@
 
 #pragma once
 
-#include <memory>
-#include <string>
+#include "azure/storage/blobs/blob_container_client.hpp"
 
 #include <azure/core/credentials/credentials.hpp>
 #include <azure/storage/common/storage_credential.hpp>
 
-#include "azure/storage/blobs/blob_container_client.hpp"
+#include <memory>
+#include <string>
 
 namespace Azure { namespace Storage { namespace Blobs {
 
diff --git a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/block_blob_client.hpp b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/block_blob_client.hpp
index 33b7b39d1b..1349e40526 100644
--- a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/block_blob_client.hpp
+++ b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/block_blob_client.hpp
@@ -3,12 +3,12 @@
 
 #pragma once
 
+#include "azure/storage/blobs/blob_client.hpp"
+
 #include <cstdint>
 #include <string>
 #include <vector>
 
-#include "azure/storage/blobs/blob_client.hpp"
-
 namespace Azure { namespace Storage { namespace Files { namespace DataLake {
   class FileClient;
 }}}} // namespace Azure::Storage::Files::DataLake
diff --git a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/deferred_response.hpp b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/deferred_response.hpp
index bcce2f37ec..9016b95aa7 100644
--- a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/deferred_response.hpp
+++ b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/deferred_response.hpp
@@ -3,10 +3,10 @@
 
 #pragma once
 
-#include <functional>
-
 #include <azure/core/response.hpp>
 
+#include <functional>
+
 namespace Azure { namespace Storage {
   namespace Blobs {
     class BlobServiceBatch;
diff --git a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/page_blob_client.hpp b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/page_blob_client.hpp
index 80f90fa7bd..691aa57018 100644
--- a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/page_blob_client.hpp
+++ b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/page_blob_client.hpp
@@ -3,12 +3,12 @@
 
 #pragma once
 
+#include "azure/storage/blobs/blob_client.hpp"
+
 #include <cstdint>
 #include <memory>
 #include <string>
 
-#include "azure/storage/blobs/blob_client.hpp"
-
 namespace Azure { namespace Storage { namespace Blobs {
 
   /**
diff --git a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/rest_client.hpp b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/rest_client.hpp
index de2b65f104..3a638afa24 100644
--- a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/rest_client.hpp
+++ b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/rest_client.hpp
@@ -6,13 +6,6 @@
 // Changes may cause incorrect behavior and will be lost if the code is regenerated.
 #pragma once
 
-#include <cstdint>
-#include <map>
-#include <memory>
-#include <string>
-#include <type_traits>
-#include <vector>
-
 #include <azure/core/case_insensitive_containers.hpp>
 #include <azure/core/context.hpp>
 #include <azure/core/datetime.hpp>
@@ -26,6 +19,13 @@
 #include <azure/storage/blobs/dll_import_export.hpp>
 #include <azure/storage/common/storage_common.hpp>
 
+#include <cstdint>
+#include <map>
+#include <memory>
+#include <string>
+#include <type_traits>
+#include <vector>
+
 namespace Azure { namespace Storage { namespace Blobs {
   namespace _detail {
     /**
diff --git a/sdk/storage/azure-storage-blobs/samples/blob_getting_started.cpp b/sdk/storage/azure-storage-blobs/samples/blob_getting_started.cpp
index 04886e4382..38fa26a789 100644
--- a/sdk/storage/azure-storage-blobs/samples/blob_getting_started.cpp
+++ b/sdk/storage/azure-storage-blobs/samples/blob_getting_started.cpp
@@ -3,12 +3,12 @@
 
 #include "get_env.hpp"
 
+#include <azure/storage/blobs.hpp>
+
 #include <cstdio>
 #include <iostream>
 #include <stdexcept>
 
-#include <azure/storage/blobs.hpp>
-
 std::string GetConnectionString()
 {
   const static std::string ConnectionString = "";
diff --git a/sdk/storage/azure-storage-blobs/samples/blob_list_operation.cpp b/sdk/storage/azure-storage-blobs/samples/blob_list_operation.cpp
index 697615a68c..f27b35c192 100644
--- a/sdk/storage/azure-storage-blobs/samples/blob_list_operation.cpp
+++ b/sdk/storage/azure-storage-blobs/samples/blob_list_operation.cpp
@@ -3,12 +3,12 @@
 
 #include "get_env.hpp"
 
+#include <azure/storage/blobs.hpp>
+
 #include <cstdio>
 #include <iostream>
 #include <stdexcept>
 
-#include <azure/storage/blobs.hpp>
-
 std::string GetConnectionString()
 {
   const static std::string ConnectionString = "";
diff --git a/sdk/storage/azure-storage-blobs/samples/blob_query.cpp b/sdk/storage/azure-storage-blobs/samples/blob_query.cpp
index f01c0de632..fab1b7bc2b 100644
--- a/sdk/storage/azure-storage-blobs/samples/blob_query.cpp
+++ b/sdk/storage/azure-storage-blobs/samples/blob_query.cpp
@@ -3,10 +3,10 @@
 
 #include "get_env.hpp"
 
-#include <iostream>
-
 #include <azure/storage/blobs.hpp>
 
+#include <iostream>
+
 std::string GetConnectionString()
 {
   const static std::string ConnectionString = "";
diff --git a/sdk/storage/azure-storage-blobs/samples/blob_sas.cpp b/sdk/storage/azure-storage-blobs/samples/blob_sas.cpp
index cbb43a2bbb..d851a2e609 100644
--- a/sdk/storage/azure-storage-blobs/samples/blob_sas.cpp
+++ b/sdk/storage/azure-storage-blobs/samples/blob_sas.cpp
@@ -3,13 +3,13 @@
 
 #include "get_env.hpp"
 
+#include <azure/storage/blobs.hpp>
+#include <azure/storage/common/storage_exception.hpp>
+
 #include <cstdio>
 #include <iostream>
 #include <stdexcept>
 
-#include <azure/storage/blobs.hpp>
-#include <azure/storage/common/storage_exception.hpp>
-
 std::string GetConnectionString()
 {
   const static std::string ConnectionString = "";
diff --git a/sdk/storage/azure-storage-blobs/samples/transactional_checksum.cpp b/sdk/storage/azure-storage-blobs/samples/transactional_checksum.cpp
index 85bf8b6090..b725a8fe05 100644
--- a/sdk/storage/azure-storage-blobs/samples/transactional_checksum.cpp
+++ b/sdk/storage/azure-storage-blobs/samples/transactional_checksum.cpp
@@ -3,13 +3,13 @@
 
 #include "get_env.hpp"
 
+#include <azure/storage/blobs.hpp>
+#include <azure/storage/common/crypt.hpp>
+
 #include <cstdio>
 #include <iostream>
 #include <stdexcept>
 
-#include <azure/storage/blobs.hpp>
-#include <azure/storage/common/crypt.hpp>
-
 std::string GetConnectionString()
 {
   const static std::string ConnectionString = "";
diff --git a/sdk/storage/azure-storage-blobs/src/blob_batch.cpp b/sdk/storage/azure-storage-blobs/src/blob_batch.cpp
index 40dcbc76c2..6ce10f6413 100644
--- a/sdk/storage/azure-storage-blobs/src/blob_batch.cpp
+++ b/sdk/storage/azure-storage-blobs/src/blob_batch.cpp
@@ -3,11 +3,7 @@
 
 #include "azure/storage/blobs/blob_batch.hpp"
 
-#include <algorithm>
-#include <cstring>
-#include <functional>
-#include <future>
-#include <stdexcept>
+#include "private/package_version.hpp"
 
 #include <azure/core/azure_assert.hpp>
 #include <azure/core/http/policies/policy.hpp>
@@ -17,7 +13,11 @@
 #include <azure/storage/common/internal/constants.hpp>
 #include <azure/storage/common/internal/shared_key_policy.hpp>
 
-#include "private/package_version.hpp"
+#include <algorithm>
+#include <cstring>
+#include <functional>
+#include <future>
+#include <stdexcept>
 
 namespace Azure { namespace Storage { namespace Blobs {
 
diff --git a/sdk/storage/azure-storage-blobs/src/blob_client.cpp b/sdk/storage/azure-storage-blobs/src/blob_client.cpp
index 9ee05b2c7f..7498bc51ff 100644
--- a/sdk/storage/azure-storage-blobs/src/blob_client.cpp
+++ b/sdk/storage/azure-storage-blobs/src/blob_client.cpp
@@ -3,6 +3,11 @@
 
 #include "azure/storage/blobs/blob_client.hpp"
 
+#include "azure/storage/blobs/append_blob_client.hpp"
+#include "azure/storage/blobs/block_blob_client.hpp"
+#include "azure/storage/blobs/page_blob_client.hpp"
+#include "private/package_version.hpp"
+
 #include <azure/core/azure_assert.hpp>
 #include <azure/core/http/policies/policy.hpp>
 #include <azure/storage/common/crypt.hpp>
@@ -17,12 +22,6 @@
 #include <azure/storage/common/storage_common.hpp>
 #include <azure/storage/common/storage_exception.hpp>
 
-#include "azure/storage/blobs/append_blob_client.hpp"
-#include "azure/storage/blobs/block_blob_client.hpp"
-#include "azure/storage/blobs/page_blob_client.hpp"
-
-#include "private/package_version.hpp"
-
 #include <algorithm>
 
 namespace Azure { namespace Storage { namespace Blobs {
diff --git a/sdk/storage/azure-storage-blobs/src/blob_container_client.cpp b/sdk/storage/azure-storage-blobs/src/blob_container_client.cpp
index 806a753aaf..4ed5fcc93d 100644
--- a/sdk/storage/azure-storage-blobs/src/blob_container_client.cpp
+++ b/sdk/storage/azure-storage-blobs/src/blob_container_client.cpp
@@ -3,6 +3,12 @@
 
 #include "azure/storage/blobs/blob_container_client.hpp"
 
+#include "azure/storage/blobs/append_blob_client.hpp"
+#include "azure/storage/blobs/blob_batch.hpp"
+#include "azure/storage/blobs/block_blob_client.hpp"
+#include "azure/storage/blobs/page_blob_client.hpp"
+#include "private/package_version.hpp"
+
 #include <azure/core/http/policies/policy.hpp>
 #include <azure/storage/common/crypt.hpp>
 #include <azure/storage/common/internal/constants.hpp>
@@ -13,13 +19,6 @@
 #include <azure/storage/common/storage_common.hpp>
 #include <azure/storage/common/storage_exception.hpp>
 
-#include "azure/storage/blobs/append_blob_client.hpp"
-#include "azure/storage/blobs/blob_batch.hpp"
-#include "azure/storage/blobs/block_blob_client.hpp"
-#include "azure/storage/blobs/page_blob_client.hpp"
-
-#include "private/package_version.hpp"
-
 namespace Azure { namespace Storage { namespace Blobs {
 
   namespace {
diff --git a/sdk/storage/azure-storage-blobs/src/blob_service_client.cpp b/sdk/storage/azure-storage-blobs/src/blob_service_client.cpp
index d6c3b428d2..a868bc62b3 100644
--- a/sdk/storage/azure-storage-blobs/src/blob_service_client.cpp
+++ b/sdk/storage/azure-storage-blobs/src/blob_service_client.cpp
@@ -3,6 +3,9 @@
 
 #include "azure/storage/blobs/blob_service_client.hpp"
 
+#include "azure/storage/blobs/blob_batch.hpp"
+#include "private/package_version.hpp"
+
 #include <azure/core/http/policies/policy.hpp>
 #include <azure/storage/common/crypt.hpp>
 #include <azure/storage/common/internal/constants.hpp>
@@ -12,9 +15,6 @@
 #include <azure/storage/common/internal/storage_switch_to_secondary_policy.hpp>
 #include <azure/storage/common/storage_common.hpp>
 
-#include "azure/storage/blobs/blob_batch.hpp"
-#include "private/package_version.hpp"
-
 namespace Azure { namespace Storage { namespace Blobs {
 
   BlobServiceClient BlobServiceClient::CreateFromConnectionString(
diff --git a/sdk/storage/azure-storage-blobs/src/block_blob_client.cpp b/sdk/storage/azure-storage-blobs/src/block_blob_client.cpp
index 9aefdafc0e..44adb2657c 100644
--- a/sdk/storage/azure-storage-blobs/src/block_blob_client.cpp
+++ b/sdk/storage/azure-storage-blobs/src/block_blob_client.cpp
@@ -15,6 +15,8 @@
 #include <windows.h>
 #endif
 
+#include "private/avro_parser.hpp"
+
 #include <azure/core/io/body_stream.hpp>
 #include <azure/storage/common/crypt.hpp>
 #include <azure/storage/common/internal/concurrent_transfer.hpp>
@@ -24,8 +26,6 @@
 #include <azure/storage/common/storage_common.hpp>
 #include <azure/storage/common/storage_exception.hpp>
 
-#include "private/avro_parser.hpp"
-
 namespace Azure { namespace Storage { namespace Blobs {
 
   BlockBlobClient BlockBlobClient::CreateFromConnectionString(
diff --git a/sdk/storage/azure-storage-blobs/src/private/avro_parser.cpp b/sdk/storage/azure-storage-blobs/src/private/avro_parser.cpp
index 5ff4846023..22822e85c6 100644
--- a/sdk/storage/azure-storage-blobs/src/private/avro_parser.cpp
+++ b/sdk/storage/azure-storage-blobs/src/private/avro_parser.cpp
@@ -3,12 +3,12 @@
 
 #include "avro_parser.hpp"
 
-#include <algorithm>
-#include <cstring>
-
 #include <azure/core/azure_assert.hpp>
 #include <azure/core/internal/json/json.hpp>
 
+#include <algorithm>
+#include <cstring>
+
 namespace Azure { namespace Storage { namespace Blobs { namespace _detail {
 
   namespace {
diff --git a/sdk/storage/azure-storage-blobs/src/private/avro_parser.hpp b/sdk/storage/azure-storage-blobs/src/private/avro_parser.hpp
index 0d6554053a..cd41e49910 100644
--- a/sdk/storage/azure-storage-blobs/src/private/avro_parser.hpp
+++ b/sdk/storage/azure-storage-blobs/src/private/avro_parser.hpp
@@ -3,13 +3,13 @@
 
 #pragma once
 
-#include <map>
-#include <memory>
-#include <type_traits>
+#include "azure/storage/blobs/blob_options.hpp"
 
 #include <azure/core/io/body_stream.hpp>
 
-#include "azure/storage/blobs/blob_options.hpp"
+#include <map>
+#include <memory>
+#include <type_traits>
 
 namespace Azure { namespace Storage { namespace Blobs { namespace _detail {
   enum class AvroDatumType
diff --git a/sdk/storage/azure-storage-blobs/src/rest_client.cpp b/sdk/storage/azure-storage-blobs/src/rest_client.cpp
index d89db5d144..aadb302899 100644
--- a/sdk/storage/azure-storage-blobs/src/rest_client.cpp
+++ b/sdk/storage/azure-storage-blobs/src/rest_client.cpp
@@ -4,13 +4,6 @@
 //
 // Code generated by Microsoft (R) AutoRest C++ Code Generator.
 // Changes may cause incorrect behavior and will be lost if the code is regenerated.
-#include <azure/storage/blobs/rest_client.hpp>
-
-#include <map>
-#include <string>
-#include <unordered_map>
-#include <vector>
-
 #include <azure/core/base64.hpp>
 #include <azure/core/context.hpp>
 #include <azure/core/datetime.hpp>
@@ -21,11 +14,17 @@
 #include <azure/core/io/body_stream.hpp>
 #include <azure/core/response.hpp>
 #include <azure/core/url.hpp>
+#include <azure/storage/blobs/rest_client.hpp>
 #include <azure/storage/common/crypt.hpp>
 #include <azure/storage/common/internal/xml_wrapper.hpp>
 #include <azure/storage/common/storage_common.hpp>
 #include <azure/storage/common/storage_exception.hpp>
 
+#include <map>
+#include <string>
+#include <unordered_map>
+#include <vector>
+
 namespace {
 std::string ListBlobContainersIncludeFlagsToString(
     const Azure::Storage::Blobs::Models::ListBlobContainersIncludeFlags& val)
diff --git a/sdk/storage/azure-storage-blobs/test/fault-injector/azure_storage_blobs_fault_injector_test.cpp b/sdk/storage/azure-storage-blobs/test/fault-injector/azure_storage_blobs_fault_injector_test.cpp
index 51eed8b7a8..03370e7a6c 100644
--- a/sdk/storage/azure-storage-blobs/test/fault-injector/azure_storage_blobs_fault_injector_test.cpp
+++ b/sdk/storage/azure-storage-blobs/test/fault-injector/azure_storage_blobs_fault_injector_test.cpp
@@ -11,7 +11,6 @@
  */
 
 #include <azure/core/internal/environment.hpp>
-
 #include <azure/storage/blobs.hpp>
 
 #if defined(BUILD_CURL_HTTP_TRANSPORT_ADAPTER)
diff --git a/sdk/storage/azure-storage-blobs/test/perf/inc/azure/storage/blobs/test/blob_base_test.hpp b/sdk/storage/azure-storage-blobs/test/perf/inc/azure/storage/blobs/test/blob_base_test.hpp
index f218608384..a5a8464a2d 100644
--- a/sdk/storage/azure-storage-blobs/test/perf/inc/azure/storage/blobs/test/blob_base_test.hpp
+++ b/sdk/storage/azure-storage-blobs/test/perf/inc/azure/storage/blobs/test/blob_base_test.hpp
@@ -12,7 +12,6 @@
 #include <azure/core/internal/environment.hpp>
 #include <azure/core/uuid.hpp>
 #include <azure/perf.hpp>
-
 #include <azure/storage/blobs.hpp>
 
 #include <memory>
diff --git a/sdk/storage/azure-storage-blobs/test/perf/inc/azure/storage/blobs/test/download_blob_from_sas.hpp b/sdk/storage/azure-storage-blobs/test/perf/inc/azure/storage/blobs/test/download_blob_from_sas.hpp
index b96a19bc5f..030d8a0f62 100644
--- a/sdk/storage/azure-storage-blobs/test/perf/inc/azure/storage/blobs/test/download_blob_from_sas.hpp
+++ b/sdk/storage/azure-storage-blobs/test/perf/inc/azure/storage/blobs/test/download_blob_from_sas.hpp
@@ -9,11 +9,11 @@
 
 #pragma once
 
+#include "azure/storage/blobs/test/blob_base_test.hpp"
+
 #include <azure/core/io/body_stream.hpp>
 #include <azure/perf.hpp>
 
-#include "azure/storage/blobs/test/blob_base_test.hpp"
-
 #include <iostream>
 #include <memory>
 #include <string>
diff --git a/sdk/storage/azure-storage-blobs/test/perf/inc/azure/storage/blobs/test/download_blob_pipeline_only.hpp b/sdk/storage/azure-storage-blobs/test/perf/inc/azure/storage/blobs/test/download_blob_pipeline_only.hpp
index 3ba318a212..9d10277ff0 100644
--- a/sdk/storage/azure-storage-blobs/test/perf/inc/azure/storage/blobs/test/download_blob_pipeline_only.hpp
+++ b/sdk/storage/azure-storage-blobs/test/perf/inc/azure/storage/blobs/test/download_blob_pipeline_only.hpp
@@ -10,12 +10,12 @@
 
 #pragma once
 
+#include "azure/storage/blobs/test/blob_base_test.hpp"
+
 #include <azure/core/http/curl_transport.hpp>
 #include <azure/core/io/body_stream.hpp>
 #include <azure/perf.hpp>
 
-#include "azure/storage/blobs/test/blob_base_test.hpp"
-
 #include <iostream>
 #include <memory>
 #include <string>
diff --git a/sdk/storage/azure-storage-blobs/test/perf/inc/azure/storage/blobs/test/download_blob_test.hpp b/sdk/storage/azure-storage-blobs/test/perf/inc/azure/storage/blobs/test/download_blob_test.hpp
index f7d5b40ca6..77b6a90c2f 100644
--- a/sdk/storage/azure-storage-blobs/test/perf/inc/azure/storage/blobs/test/download_blob_test.hpp
+++ b/sdk/storage/azure-storage-blobs/test/perf/inc/azure/storage/blobs/test/download_blob_test.hpp
@@ -9,11 +9,11 @@
 
 #pragma once
 
+#include "azure/storage/blobs/test/blob_base_test.hpp"
+
 #include <azure/core/io/body_stream.hpp>
 #include <azure/perf.hpp>
 
-#include "azure/storage/blobs/test/blob_base_test.hpp"
-
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/sdk/storage/azure-storage-blobs/test/perf/inc/azure/storage/blobs/test/download_blob_transport_only.hpp b/sdk/storage/azure-storage-blobs/test/perf/inc/azure/storage/blobs/test/download_blob_transport_only.hpp
index e576b1d1cf..f6f966a7f8 100644
--- a/sdk/storage/azure-storage-blobs/test/perf/inc/azure/storage/blobs/test/download_blob_transport_only.hpp
+++ b/sdk/storage/azure-storage-blobs/test/perf/inc/azure/storage/blobs/test/download_blob_transport_only.hpp
@@ -10,12 +10,12 @@
 
 #pragma once
 
+#include "azure/storage/blobs/test/blob_base_test.hpp"
+
 #include <azure/core/http/curl_transport.hpp>
 #include <azure/core/io/body_stream.hpp>
 #include <azure/perf.hpp>
 
-#include "azure/storage/blobs/test/blob_base_test.hpp"
-
 #include <iostream>
 #include <memory>
 #include <string>
diff --git a/sdk/storage/azure-storage-blobs/test/perf/inc/azure/storage/blobs/test/list_blob_test.hpp b/sdk/storage/azure-storage-blobs/test/perf/inc/azure/storage/blobs/test/list_blob_test.hpp
index b938efd50b..0cb40cd464 100644
--- a/sdk/storage/azure-storage-blobs/test/perf/inc/azure/storage/blobs/test/list_blob_test.hpp
+++ b/sdk/storage/azure-storage-blobs/test/perf/inc/azure/storage/blobs/test/list_blob_test.hpp
@@ -9,12 +9,12 @@
 
 #pragma once
 
+#include "azure/storage/blobs/test/blob_base_test.hpp"
+
 #include <azure/core/io/body_stream.hpp>
 #include <azure/core/uuid.hpp>
 #include <azure/perf.hpp>
 
-#include "azure/storage/blobs/test/blob_base_test.hpp"
-
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/sdk/storage/azure-storage-blobs/test/perf/inc/azure/storage/blobs/test/upload_blob_test.hpp b/sdk/storage/azure-storage-blobs/test/perf/inc/azure/storage/blobs/test/upload_blob_test.hpp
index bcca1b4bce..b788e2762b 100644
--- a/sdk/storage/azure-storage-blobs/test/perf/inc/azure/storage/blobs/test/upload_blob_test.hpp
+++ b/sdk/storage/azure-storage-blobs/test/perf/inc/azure/storage/blobs/test/upload_blob_test.hpp
@@ -9,12 +9,12 @@
 
 #pragma once
 
+#include "azure/storage/blobs/test/blob_base_test.hpp"
+
 #include <azure/core/io/body_stream.hpp>
 #include <azure/perf.hpp>
 #include <azure/perf/random_stream.hpp>
 
-#include "azure/storage/blobs/test/blob_base_test.hpp"
-
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/sdk/storage/azure-storage-blobs/test/perf/src/azure_storage_blobs_perf_test.cpp b/sdk/storage/azure-storage-blobs/test/perf/src/azure_storage_blobs_perf_test.cpp
index 996f4e9607..c2edaadf39 100644
--- a/sdk/storage/azure-storage-blobs/test/perf/src/azure_storage_blobs_perf_test.cpp
+++ b/sdk/storage/azure-storage-blobs/test/perf/src/azure_storage_blobs_perf_test.cpp
@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/perf.hpp>
-
 #include "azure/storage/blobs/test/download_blob_from_sas.hpp"
 #include "azure/storage/blobs/test/download_blob_pipeline_only.hpp"
 #include "azure/storage/blobs/test/download_blob_test.hpp"
 
+#include <azure/perf.hpp>
+
 #if defined(BUILD_CURL_HTTP_TRANSPORT_ADAPTER)
 #include "azure/storage/blobs/test/download_blob_transport_only.hpp"
 #endif
diff --git a/sdk/storage/azure-storage-blobs/test/ut/append_blob_client_test.hpp b/sdk/storage/azure-storage-blobs/test/ut/append_blob_client_test.hpp
index 797f57bc68..ac66302139 100644
--- a/sdk/storage/azure-storage-blobs/test/ut/append_blob_client_test.hpp
+++ b/sdk/storage/azure-storage-blobs/test/ut/append_blob_client_test.hpp
@@ -1,11 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/storage/blobs.hpp>
-
 #include "blob_container_client_test.hpp"
 #include "test/ut/test_base.hpp"
 
+#include <azure/storage/blobs.hpp>
+
 namespace Azure { namespace Storage { namespace Test {
 
   class AppendBlobClientTest : public BlobContainerClientTest {
diff --git a/sdk/storage/azure-storage-blobs/test/ut/blob_batch_client_test.cpp b/sdk/storage/azure-storage-blobs/test/ut/blob_batch_client_test.cpp
index 0814f4de8d..c13348d0e9 100644
--- a/sdk/storage/azure-storage-blobs/test/ut/blob_batch_client_test.cpp
+++ b/sdk/storage/azure-storage-blobs/test/ut/blob_batch_client_test.cpp
@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/storage/blobs.hpp>
-
 #include "blob_container_client_test.hpp"
 
+#include <azure/storage/blobs.hpp>
+
 namespace Azure { namespace Storage { namespace Test {
 
   TEST_F(BlobContainerClientTest, BatchSubmitDelete_LIVEONLY_)
diff --git a/sdk/storage/azure-storage-blobs/test/ut/blob_container_client_test.cpp b/sdk/storage/azure-storage-blobs/test/ut/blob_container_client_test.cpp
index 1dc17f88a8..18594d5617 100644
--- a/sdk/storage/azure-storage-blobs/test/ut/blob_container_client_test.cpp
+++ b/sdk/storage/azure-storage-blobs/test/ut/blob_container_client_test.cpp
@@ -3,14 +3,14 @@
 
 #include "blob_container_client_test.hpp"
 
-#include <chrono>
-#include <thread>
-
 #include <azure/core/internal/cryptography/sha_hash.hpp>
 #include <azure/storage/blobs/blob_lease_client.hpp>
 #include <azure/storage/blobs/blob_sas_builder.hpp>
 #include <azure/storage/common/crypt.hpp>
 
+#include <chrono>
+#include <thread>
+
 namespace Azure { namespace Storage { namespace Blobs { namespace Models {
 
   bool operator==(const SignedIdentifier& lhs, const SignedIdentifier& rhs);
diff --git a/sdk/storage/azure-storage-blobs/test/ut/blob_container_client_test.hpp b/sdk/storage/azure-storage-blobs/test/ut/blob_container_client_test.hpp
index 3976f0b2f5..12ac676aee 100644
--- a/sdk/storage/azure-storage-blobs/test/ut/blob_container_client_test.hpp
+++ b/sdk/storage/azure-storage-blobs/test/ut/blob_container_client_test.hpp
@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/storage/blobs.hpp>
-
 #include "blob_service_client_test.hpp"
 
+#include <azure/storage/blobs.hpp>
+
 namespace Azure { namespace Storage { namespace Test {
 
   class BlobContainerClientTest : public BlobServiceClientTest {
diff --git a/sdk/storage/azure-storage-blobs/test/ut/blob_sas_test.cpp b/sdk/storage/azure-storage-blobs/test/ut/blob_sas_test.cpp
index f82e26b408..5c4ec92489 100644
--- a/sdk/storage/azure-storage-blobs/test/ut/blob_sas_test.cpp
+++ b/sdk/storage/azure-storage-blobs/test/ut/blob_sas_test.cpp
@@ -1,13 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
+#include "blob_container_client_test.hpp"
+
 #include <azure/identity/client_secret_credential.hpp>
 #include <azure/storage/blobs/blob_sas_builder.hpp>
 
 #include <chrono>
 
-#include "blob_container_client_test.hpp"
-
 namespace Azure { namespace Storage { namespace Test {
 
   TEST_F(BlobContainerClientTest, BlobSasTest_LIVEONLY_)
diff --git a/sdk/storage/azure-storage-blobs/test/ut/blob_service_client_test.cpp b/sdk/storage/azure-storage-blobs/test/ut/blob_service_client_test.cpp
index 0bd9e5d921..bd66dea38d 100644
--- a/sdk/storage/azure-storage-blobs/test/ut/blob_service_client_test.cpp
+++ b/sdk/storage/azure-storage-blobs/test/ut/blob_service_client_test.cpp
@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <thread>
+#include "blob_service_client_test.hpp"
 
 #include <azure/identity/client_secret_credential.hpp>
 #include <azure/storage/blobs.hpp>
 
-#include "blob_service_client_test.hpp"
+#include <thread>
 
 namespace Azure { namespace Storage { namespace Blobs { namespace Models {
 
diff --git a/sdk/storage/azure-storage-blobs/test/ut/blob_service_client_test.hpp b/sdk/storage/azure-storage-blobs/test/ut/blob_service_client_test.hpp
index f3e30e6576..9f0cea4110 100644
--- a/sdk/storage/azure-storage-blobs/test/ut/blob_service_client_test.hpp
+++ b/sdk/storage/azure-storage-blobs/test/ut/blob_service_client_test.hpp
@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/storage/blobs.hpp>
-
 #include "test/ut/test_base.hpp"
 
+#include <azure/storage/blobs.hpp>
+
 namespace Azure { namespace Storage { namespace Test {
 
   class BlobServiceClientTest : public StorageTest {
diff --git a/sdk/storage/azure-storage-blobs/test/ut/block_blob_client_test.cpp b/sdk/storage/azure-storage-blobs/test/ut/block_blob_client_test.cpp
index 38588144ee..c9764b245b 100644
--- a/sdk/storage/azure-storage-blobs/test/ut/block_blob_client_test.cpp
+++ b/sdk/storage/azure-storage-blobs/test/ut/block_blob_client_test.cpp
@@ -3,13 +3,13 @@
 
 #include "block_blob_client_test.hpp"
 
+#include <azure/core/cryptography/hash.hpp>
+#include <azure/storage/common/crypt.hpp>
+
 #include <future>
 #include <random>
 #include <vector>
 
-#include <azure/core/cryptography/hash.hpp>
-#include <azure/storage/common/crypt.hpp>
-
 namespace Azure { namespace Storage { namespace Blobs { namespace Models {
 
   bool operator==(const BlobHttpHeaders& lhs, const BlobHttpHeaders& rhs)
diff --git a/sdk/storage/azure-storage-blobs/test/ut/block_blob_client_test.hpp b/sdk/storage/azure-storage-blobs/test/ut/block_blob_client_test.hpp
index 5b15b2a4d0..4e51d937ad 100644
--- a/sdk/storage/azure-storage-blobs/test/ut/block_blob_client_test.hpp
+++ b/sdk/storage/azure-storage-blobs/test/ut/block_blob_client_test.hpp
@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/storage/blobs.hpp>
-
 #include "blob_container_client_test.hpp"
 
+#include <azure/storage/blobs.hpp>
+
 namespace Azure { namespace Storage { namespace Test {
 
   class BlockBlobClientTest : public BlobContainerClientTest {
diff --git a/sdk/storage/azure-storage-blobs/test/ut/page_blob_client_test.cpp b/sdk/storage/azure-storage-blobs/test/ut/page_blob_client_test.cpp
index 0401e4dd51..28f3f6b7d5 100644
--- a/sdk/storage/azure-storage-blobs/test/ut/page_blob_client_test.cpp
+++ b/sdk/storage/azure-storage-blobs/test/ut/page_blob_client_test.cpp
@@ -3,14 +3,14 @@
 
 #include "page_blob_client_test.hpp"
 
-#include <future>
-#include <vector>
-
 #include <azure/core/cryptography/hash.hpp>
 #include <azure/storage/blobs/blob_lease_client.hpp>
 #include <azure/storage/common/crypt.hpp>
 #include <azure/storage/common/internal/file_io.hpp>
 
+#include <future>
+#include <vector>
+
 namespace Azure { namespace Storage { namespace Blobs { namespace Models {
 
   bool operator==(const BlobHttpHeaders& lhs, const BlobHttpHeaders& rhs);
diff --git a/sdk/storage/azure-storage-blobs/test/ut/page_blob_client_test.hpp b/sdk/storage/azure-storage-blobs/test/ut/page_blob_client_test.hpp
index a9fb009c99..421e8d6555 100644
--- a/sdk/storage/azure-storage-blobs/test/ut/page_blob_client_test.hpp
+++ b/sdk/storage/azure-storage-blobs/test/ut/page_blob_client_test.hpp
@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/storage/blobs.hpp>
-
 #include "blob_container_client_test.hpp"
 
+#include <azure/storage/blobs.hpp>
+
 namespace Azure { namespace Storage { namespace Test {
 
   class PageBlobClientTest : public BlobContainerClientTest {
diff --git a/sdk/storage/azure-storage-blobs/test/ut/storage_retry_policy_test.cpp b/sdk/storage/azure-storage-blobs/test/ut/storage_retry_policy_test.cpp
index a18063b5b5..48d22f9ebc 100644
--- a/sdk/storage/azure-storage-blobs/test/ut/storage_retry_policy_test.cpp
+++ b/sdk/storage/azure-storage-blobs/test/ut/storage_retry_policy_test.cpp
@@ -1,13 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <chrono>
-#include <memory>
-#include <vector>
+#include "test/ut/test_base.hpp"
 
 #include <azure/storage/blobs.hpp>
 
-#include "test/ut/test_base.hpp"
+#include <chrono>
+#include <memory>
+#include <vector>
 
 namespace Azure { namespace Storage { namespace Test {
 
diff --git a/sdk/storage/azure-storage-blobs/test/ut/storage_timeout_test.cpp b/sdk/storage/azure-storage-blobs/test/ut/storage_timeout_test.cpp
index 13c7d08026..7ab7bb73ce 100644
--- a/sdk/storage/azure-storage-blobs/test/ut/storage_timeout_test.cpp
+++ b/sdk/storage/azure-storage-blobs/test/ut/storage_timeout_test.cpp
@@ -1,13 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <chrono>
-#include <memory>
-#include <vector>
+#include "test/ut/test_base.hpp"
 
 #include <azure/storage/blobs.hpp>
 
-#include "test/ut/test_base.hpp"
+#include <chrono>
+#include <memory>
+#include <vector>
 
 namespace Azure { namespace Storage { namespace Test {
 
diff --git a/sdk/storage/azure-storage-common/inc/azure/storage/common/access_conditions.hpp b/sdk/storage/azure-storage-common/inc/azure/storage/common/access_conditions.hpp
index 968f9dce24..086c0868d4 100644
--- a/sdk/storage/azure-storage-common/inc/azure/storage/common/access_conditions.hpp
+++ b/sdk/storage/azure-storage-common/inc/azure/storage/common/access_conditions.hpp
@@ -3,12 +3,12 @@
 
 #pragma once
 
-#include <string>
+#include "azure/storage/common/storage_common.hpp"
 
 #include <azure/core/etag.hpp>
 #include <azure/core/nullable.hpp>
 
-#include "azure/storage/common/storage_common.hpp"
+#include <string>
 
 namespace Azure { namespace Storage {
 
diff --git a/sdk/storage/azure-storage-common/inc/azure/storage/common/account_sas_builder.hpp b/sdk/storage/azure-storage-common/inc/azure/storage/common/account_sas_builder.hpp
index 359f16a389..d5431c5113 100644
--- a/sdk/storage/azure-storage-common/inc/azure/storage/common/account_sas_builder.hpp
+++ b/sdk/storage/azure-storage-common/inc/azure/storage/common/account_sas_builder.hpp
@@ -3,14 +3,14 @@
 
 #pragma once
 
-#include <string>
-#include <type_traits>
+#include "azure/storage/common/internal/constants.hpp"
+#include "azure/storage/common/storage_credential.hpp"
 
 #include <azure/core/datetime.hpp>
 #include <azure/core/nullable.hpp>
 
-#include "azure/storage/common/internal/constants.hpp"
-#include "azure/storage/common/storage_credential.hpp"
+#include <string>
+#include <type_traits>
 
 namespace Azure { namespace Storage { namespace Sas {
 
diff --git a/sdk/storage/azure-storage-common/inc/azure/storage/common/crypt.hpp b/sdk/storage/azure-storage-common/inc/azure/storage/common/crypt.hpp
index e697b7e7cf..8d2a7a2a25 100644
--- a/sdk/storage/azure-storage-common/inc/azure/storage/common/crypt.hpp
+++ b/sdk/storage/azure-storage-common/inc/azure/storage/common/crypt.hpp
@@ -3,13 +3,13 @@
 
 #pragma once
 
+#include <azure/core/base64.hpp>
+#include <azure/core/cryptography/hash.hpp>
+
 #include <cstdint>
 #include <string>
 #include <vector>
 
-#include <azure/core/base64.hpp>
-#include <azure/core/cryptography/hash.hpp>
-
 namespace Azure { namespace Storage {
 
   /**
diff --git a/sdk/storage/azure-storage-common/inc/azure/storage/common/internal/reliable_stream.hpp b/sdk/storage/azure-storage-common/inc/azure/storage/common/internal/reliable_stream.hpp
index 3710d7cd53..2a34f2174f 100644
--- a/sdk/storage/azure-storage-common/inc/azure/storage/common/internal/reliable_stream.hpp
+++ b/sdk/storage/azure-storage-common/inc/azure/storage/common/internal/reliable_stream.hpp
@@ -1,13 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
+#include <azure/core/context.hpp>
+#include <azure/core/io/body_stream.hpp>
+
 #include <algorithm>
 #include <functional>
 #include <memory>
 
-#include <azure/core/context.hpp>
-#include <azure/core/io/body_stream.hpp>
-
 namespace Azure { namespace Storage { namespace _internal {
 
   // Options used by reliable stream
diff --git a/sdk/storage/azure-storage-common/inc/azure/storage/common/internal/shared_key_policy.hpp b/sdk/storage/azure-storage-common/inc/azure/storage/common/internal/shared_key_policy.hpp
index 8db6ede975..f8b1002a2f 100644
--- a/sdk/storage/azure-storage-common/inc/azure/storage/common/internal/shared_key_policy.hpp
+++ b/sdk/storage/azure-storage-common/inc/azure/storage/common/internal/shared_key_policy.hpp
@@ -3,12 +3,12 @@
 
 #pragma once
 
-#include <memory>
-#include <string>
+#include "azure/storage/common/storage_credential.hpp"
 
 #include <azure/core/http/policies/policy.hpp>
 
-#include "azure/storage/common/storage_credential.hpp"
+#include <memory>
+#include <string>
 
 namespace Azure { namespace Storage { namespace _internal {
 
diff --git a/sdk/storage/azure-storage-common/inc/azure/storage/common/internal/storage_per_retry_policy.hpp b/sdk/storage/azure-storage-common/inc/azure/storage/common/internal/storage_per_retry_policy.hpp
index 9ab7248edc..a0645fc7f0 100644
--- a/sdk/storage/azure-storage-common/inc/azure/storage/common/internal/storage_per_retry_policy.hpp
+++ b/sdk/storage/azure-storage-common/inc/azure/storage/common/internal/storage_per_retry_policy.hpp
@@ -3,10 +3,10 @@
 
 #pragma once
 
-#include <memory>
-
 #include <azure/core/http/policies/policy.hpp>
 
+#include <memory>
+
 namespace Azure { namespace Storage { namespace _internal {
 
   class StoragePerRetryPolicy final : public Core::Http::Policies::HttpPolicy {
diff --git a/sdk/storage/azure-storage-common/inc/azure/storage/common/internal/storage_service_version_policy.hpp b/sdk/storage/azure-storage-common/inc/azure/storage/common/internal/storage_service_version_policy.hpp
index 40401239e9..3be656fb21 100644
--- a/sdk/storage/azure-storage-common/inc/azure/storage/common/internal/storage_service_version_policy.hpp
+++ b/sdk/storage/azure-storage-common/inc/azure/storage/common/internal/storage_service_version_policy.hpp
@@ -3,11 +3,11 @@
 
 #pragma once
 
+#include <azure/core/http/policies/policy.hpp>
+
 #include <memory>
 #include <string>
 
-#include <azure/core/http/policies/policy.hpp>
-
 namespace Azure { namespace Storage { namespace _internal {
 
   class StorageServiceVersionPolicy final : public Azure::Core::Http::Policies::HttpPolicy {
diff --git a/sdk/storage/azure-storage-common/inc/azure/storage/common/internal/storage_switch_to_secondary_policy.hpp b/sdk/storage/azure-storage-common/inc/azure/storage/common/internal/storage_switch_to_secondary_policy.hpp
index 681ba8e22f..d6a1baa63f 100644
--- a/sdk/storage/azure-storage-common/inc/azure/storage/common/internal/storage_switch_to_secondary_policy.hpp
+++ b/sdk/storage/azure-storage-common/inc/azure/storage/common/internal/storage_switch_to_secondary_policy.hpp
@@ -3,12 +3,12 @@
 
 #pragma once
 
-#include <memory>
-#include <string>
+#include "azure/storage/common/dll_import_export.hpp"
 
 #include <azure/core/http/policies/policy.hpp>
 
-#include "azure/storage/common/dll_import_export.hpp"
+#include <memory>
+#include <string>
 
 namespace Azure { namespace Storage { namespace _internal {
 
diff --git a/sdk/storage/azure-storage-common/inc/azure/storage/common/storage_common.hpp b/sdk/storage/azure-storage-common/inc/azure/storage/common/storage_common.hpp
index 776b1c4461..6a7f8c1d65 100644
--- a/sdk/storage/azure-storage-common/inc/azure/storage/common/storage_common.hpp
+++ b/sdk/storage/azure-storage-common/inc/azure/storage/common/storage_common.hpp
@@ -3,6 +3,12 @@
 
 #pragma once
 
+#include "azure/storage/common/internal/constants.hpp"
+#include "azure/storage/common/internal/storage_per_retry_policy.hpp"
+
+#include <azure/core/case_insensitive_containers.hpp>
+#include <azure/core/http/policies/policy.hpp>
+
 #include <algorithm>
 #include <cstdint>
 #include <map>
@@ -10,12 +16,6 @@
 #include <string>
 #include <vector>
 
-#include <azure/core/case_insensitive_containers.hpp>
-#include <azure/core/http/policies/policy.hpp>
-
-#include "azure/storage/common/internal/constants.hpp"
-#include "azure/storage/common/internal/storage_per_retry_policy.hpp"
-
 namespace Azure { namespace Storage {
 
   constexpr static const char* AccountEncryptionKey = "$account-encryption-key";
diff --git a/sdk/storage/azure-storage-common/inc/azure/storage/common/storage_credential.hpp b/sdk/storage/azure-storage-common/inc/azure/storage/common/storage_credential.hpp
index 6ddc1dfbb1..ab8bc172c3 100644
--- a/sdk/storage/azure-storage-common/inc/azure/storage/common/storage_credential.hpp
+++ b/sdk/storage/azure-storage-common/inc/azure/storage/common/storage_credential.hpp
@@ -3,12 +3,12 @@
 
 #pragma once
 
+#include <azure/core/http/http.hpp>
+
 #include <memory>
 #include <mutex>
 #include <string>
 
-#include <azure/core/http/http.hpp>
-
 namespace Azure { namespace Storage {
 
   namespace Sas {
diff --git a/sdk/storage/azure-storage-common/inc/azure/storage/common/storage_exception.hpp b/sdk/storage/azure-storage-common/inc/azure/storage/common/storage_exception.hpp
index f8a026480a..155027f639 100644
--- a/sdk/storage/azure-storage-common/inc/azure/storage/common/storage_exception.hpp
+++ b/sdk/storage/azure-storage-common/inc/azure/storage/common/storage_exception.hpp
@@ -3,14 +3,14 @@
 
 #pragma once
 
+#include <azure/core/exception.hpp>
+#include <azure/core/http/http.hpp>
+
 #include <map>
 #include <memory>
 #include <stdexcept>
 #include <string>
 
-#include <azure/core/exception.hpp>
-#include <azure/core/http/http.hpp>
-
 namespace Azure { namespace Storage {
 
   /**
diff --git a/sdk/storage/azure-storage-common/src/account_sas_builder.cpp b/sdk/storage/azure-storage-common/src/account_sas_builder.cpp
index e3d436a5cb..00d474300a 100644
--- a/sdk/storage/azure-storage-common/src/account_sas_builder.cpp
+++ b/sdk/storage/azure-storage-common/src/account_sas_builder.cpp
@@ -3,10 +3,10 @@
 
 #include "azure/storage/common/account_sas_builder.hpp"
 
-#include <azure/core/http/http.hpp>
-
 #include "azure/storage/common/crypt.hpp"
 
+#include <azure/core/http/http.hpp>
+
 namespace Azure { namespace Storage { namespace Sas {
   namespace {
     constexpr static const char* SasVersion = "2022-11-02";
diff --git a/sdk/storage/azure-storage-common/src/crypt.cpp b/sdk/storage/azure-storage-common/src/crypt.cpp
index 89d24dd086..e6618aaf7f 100644
--- a/sdk/storage/azure-storage-common/src/crypt.cpp
+++ b/sdk/storage/azure-storage-common/src/crypt.cpp
@@ -21,13 +21,13 @@
 #include <openssl/sha.h>
 #endif
 
-#include <algorithm>
-#include <stdexcept>
-#include <vector>
+#include "azure/storage/common/storage_common.hpp"
 
 #include <azure/core/http/http.hpp>
 
-#include "azure/storage/common/storage_common.hpp"
+#include <algorithm>
+#include <stdexcept>
+#include <vector>
 
 namespace Azure { namespace Storage {
 
diff --git a/sdk/storage/azure-storage-common/src/file_io.cpp b/sdk/storage/azure-storage-common/src/file_io.cpp
index 96cb8e1792..137a726fc0 100644
--- a/sdk/storage/azure-storage-common/src/file_io.cpp
+++ b/sdk/storage/azure-storage-common/src/file_io.cpp
@@ -7,9 +7,10 @@
 
 #if defined(AZ_PLATFORM_POSIX)
 #include <fcntl.h>
+#include <unistd.h>
+
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <unistd.h>
 #endif
 
 #if defined(AZ_PLATFORM_WINDOWS)
diff --git a/sdk/storage/azure-storage-common/src/shared_key_policy.cpp b/sdk/storage/azure-storage-common/src/shared_key_policy.cpp
index c6546502a0..80ab00c394 100644
--- a/sdk/storage/azure-storage-common/src/shared_key_policy.cpp
+++ b/sdk/storage/azure-storage-common/src/shared_key_policy.cpp
@@ -3,12 +3,12 @@
 
 #include "azure/storage/common/internal/shared_key_policy.hpp"
 
-#include <algorithm>
+#include "azure/storage/common/crypt.hpp"
 
 #include <azure/core/http/http.hpp>
 #include <azure/core/internal/strings.hpp>
 
-#include "azure/storage/common/crypt.hpp"
+#include <algorithm>
 
 namespace Azure { namespace Storage { namespace _internal {
 
diff --git a/sdk/storage/azure-storage-common/src/storage_exception.cpp b/sdk/storage/azure-storage-common/src/storage_exception.cpp
index d1f43129c8..7b53a6594a 100644
--- a/sdk/storage/azure-storage-common/src/storage_exception.cpp
+++ b/sdk/storage/azure-storage-common/src/storage_exception.cpp
@@ -3,13 +3,13 @@
 
 #include "azure/storage/common/storage_exception.hpp"
 
-#include <type_traits>
+#include "azure/storage/common/internal/constants.hpp"
+#include "azure/storage/common/internal/xml_wrapper.hpp"
 
 #include <azure/core/http/policies/policy.hpp>
 #include <azure/core/internal/json/json.hpp>
 
-#include "azure/storage/common/internal/constants.hpp"
-#include "azure/storage/common/internal/xml_wrapper.hpp"
+#include <type_traits>
 
 namespace Azure { namespace Storage {
   StorageException StorageException::CreateFromResponse(
diff --git a/sdk/storage/azure-storage-common/src/xml_wrapper.cpp b/sdk/storage/azure-storage-common/src/xml_wrapper.cpp
index 4190240c45..cebb54a769 100644
--- a/sdk/storage/azure-storage-common/src/xml_wrapper.cpp
+++ b/sdk/storage/azure-storage-common/src/xml_wrapper.cpp
@@ -3,13 +3,13 @@
 
 #include "azure/storage/common/internal/xml_wrapper.hpp"
 
+#include <azure/core/platform.hpp>
+
 #include <cstring>
 #include <limits>
 #include <memory>
 #include <stdexcept>
 
-#include <azure/core/platform.hpp>
-
 #if defined(AZ_PLATFORM_WINDOWS)
 #if !defined(WIN32_LEAN_AND_MEAN)
 #define WIN32_LEAN_AND_MEAN
diff --git a/sdk/storage/azure-storage-common/test/ut/crypt_functions_test.cpp b/sdk/storage/azure-storage-common/test/ut/crypt_functions_test.cpp
index c01c23e3a7..1ccef9f1f6 100644
--- a/sdk/storage/azure-storage-common/test/ut/crypt_functions_test.cpp
+++ b/sdk/storage/azure-storage-common/test/ut/crypt_functions_test.cpp
@@ -1,11 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <cstring>
+#include "test_base.hpp"
 
 #include <azure/storage/common/crypt.hpp>
 
-#include "test_base.hpp"
+#include <cstring>
 
 namespace Azure { namespace Storage { namespace Test {
 
diff --git a/sdk/storage/azure-storage-common/test/ut/metadata_test.cpp b/sdk/storage/azure-storage-common/test/ut/metadata_test.cpp
index 89c3521f9b..72909da74f 100644
--- a/sdk/storage/azure-storage-common/test/ut/metadata_test.cpp
+++ b/sdk/storage/azure-storage-common/test/ut/metadata_test.cpp
@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/storage/common/storage_common.hpp>
-
 #include "test_base.hpp"
 
+#include <azure/storage/common/storage_common.hpp>
+
 namespace Azure { namespace Storage { namespace Test {
 
   TEST(MetadataTest, CaseInsensitive)
diff --git a/sdk/storage/azure-storage-common/test/ut/storage_credential_test.cpp b/sdk/storage/azure-storage-common/test/ut/storage_credential_test.cpp
index 913a658726..d05fbe03f9 100644
--- a/sdk/storage/azure-storage-common/test/ut/storage_credential_test.cpp
+++ b/sdk/storage/azure-storage-common/test/ut/storage_credential_test.cpp
@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/storage/common/storage_credential.hpp>
-
 #include "test_base.hpp"
 
+#include <azure/storage/common/storage_credential.hpp>
+
 namespace Azure { namespace Storage { namespace Test {
 
   TEST(StorageCredentialTest, DefaultHostCorrect)
diff --git a/sdk/storage/azure-storage-common/test/ut/test_base.cpp b/sdk/storage/azure-storage-common/test/ut/test_base.cpp
index 98c2b08cc6..6a075ce738 100644
--- a/sdk/storage/azure-storage-common/test/ut/test_base.cpp
+++ b/sdk/storage/azure-storage-common/test/ut/test_base.cpp
@@ -3,6 +3,10 @@
 
 #include "test_base.hpp"
 
+#include <azure/core/http/http.hpp>
+#include <azure/core/internal/strings.hpp>
+#include <azure/core/platform.hpp>
+
 #include <algorithm>
 #include <chrono>
 #include <cstdio>
@@ -15,10 +19,6 @@
 #include <sstream>
 #include <string>
 
-#include <azure/core/http/http.hpp>
-#include <azure/core/internal/strings.hpp>
-#include <azure/core/platform.hpp>
-
 namespace Azure { namespace Storage { namespace Blobs { namespace Models {
 
   bool operator==(const SignedIdentifier& lhs, const SignedIdentifier& rhs)
diff --git a/sdk/storage/azure-storage-common/test/ut/test_base.hpp b/sdk/storage/azure-storage-common/test/ut/test_base.hpp
index 3955b896ca..c9c0a2c653 100644
--- a/sdk/storage/azure-storage-common/test/ut/test_base.hpp
+++ b/sdk/storage/azure-storage-common/test/ut/test_base.hpp
@@ -3,23 +3,23 @@
 
 #pragma once
 
-#include <azure/core/platform.hpp>
-
-#include <chrono>
-#include <cstdint>
-#include <limits>
-#include <random>
-#include <vector>
-
 #include <azure/core/base64.hpp>
 #include <azure/core/datetime.hpp>
 #include <azure/core/etag.hpp>
 #include <azure/core/io/body_stream.hpp>
+#include <azure/core/platform.hpp>
 #include <azure/core/test/test_base.hpp>
 #include <azure/identity/client_secret_credential.hpp>
 #include <azure/storage/blobs.hpp>
 #include <azure/storage/common/internal/constants.hpp>
 #include <azure/storage/common/storage_common.hpp>
+
+#include <chrono>
+#include <cstdint>
+#include <limits>
+#include <random>
+#include <vector>
+
 #include <gtest/gtest.h>
 
 namespace Azure { namespace Storage {
diff --git a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake.hpp b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake.hpp
index aaa0f7ae82..76290debd7 100644
--- a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake.hpp
+++ b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake.hpp
@@ -8,8 +8,6 @@
 
 #pragma once
 
-#include <azure/storage/common/storage_exception.hpp>
-
 #include "azure/storage/files/datalake/datalake_directory_client.hpp"
 #include "azure/storage/files/datalake/datalake_file_client.hpp"
 #include "azure/storage/files/datalake/datalake_file_system_client.hpp"
@@ -22,3 +20,5 @@
 #include "azure/storage/files/datalake/dll_import_export.hpp"
 #include "azure/storage/files/datalake/rest_client.hpp"
 #include "azure/storage/files/datalake/rtti.hpp"
+
+#include <azure/storage/common/storage_exception.hpp>
diff --git a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_directory_client.hpp b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_directory_client.hpp
index d8d2f4defd..02ce16dbfa 100644
--- a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_directory_client.hpp
+++ b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_directory_client.hpp
@@ -3,18 +3,18 @@
 
 #pragma once
 
-#include <memory>
-#include <string>
-#include <vector>
+#include "azure/storage/files/datalake/datalake_options.hpp"
+#include "azure/storage/files/datalake/datalake_path_client.hpp"
+#include "azure/storage/files/datalake/datalake_responses.hpp"
 
 #include <azure/core/credentials/credentials.hpp>
 #include <azure/core/internal/http/pipeline.hpp>
 #include <azure/core/response.hpp>
 #include <azure/storage/common/storage_credential.hpp>
 
-#include "azure/storage/files/datalake/datalake_options.hpp"
-#include "azure/storage/files/datalake/datalake_path_client.hpp"
-#include "azure/storage/files/datalake/datalake_responses.hpp"
+#include <memory>
+#include <string>
+#include <vector>
 
 namespace Azure { namespace Storage { namespace Files { namespace DataLake {
 
diff --git a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_file_client.hpp b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_file_client.hpp
index 40dc3856b8..2806c0222d 100644
--- a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_file_client.hpp
+++ b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_file_client.hpp
@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include <cstdint>
-#include <memory>
-#include <string>
+#include "azure/storage/files/datalake/datalake_options.hpp"
+#include "azure/storage/files/datalake/datalake_path_client.hpp"
+#include "azure/storage/files/datalake/datalake_responses.hpp"
 
 #include <azure/core/credentials/credentials.hpp>
 #include <azure/core/internal/http/pipeline.hpp>
@@ -13,9 +13,9 @@
 #include <azure/storage/blobs/block_blob_client.hpp>
 #include <azure/storage/common/storage_credential.hpp>
 
-#include "azure/storage/files/datalake/datalake_options.hpp"
-#include "azure/storage/files/datalake/datalake_path_client.hpp"
-#include "azure/storage/files/datalake/datalake_responses.hpp"
+#include <cstdint>
+#include <memory>
+#include <string>
 
 namespace Azure { namespace Storage { namespace Files { namespace DataLake {
 
diff --git a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_file_system_client.hpp b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_file_system_client.hpp
index 4e390b13b5..41f5438f38 100644
--- a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_file_system_client.hpp
+++ b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_file_system_client.hpp
@@ -3,8 +3,9 @@
 
 #pragma once
 
-#include <memory>
-#include <string>
+#include "azure/storage/files/datalake/datalake_options.hpp"
+#include "azure/storage/files/datalake/datalake_responses.hpp"
+#include "azure/storage/files/datalake/datalake_service_client.hpp"
 
 #include <azure/core/credentials/credentials.hpp>
 #include <azure/core/internal/http/pipeline.hpp>
@@ -12,9 +13,8 @@
 #include <azure/storage/blobs/blob_container_client.hpp>
 #include <azure/storage/common/storage_credential.hpp>
 
-#include "azure/storage/files/datalake/datalake_options.hpp"
-#include "azure/storage/files/datalake/datalake_responses.hpp"
-#include "azure/storage/files/datalake/datalake_service_client.hpp"
+#include <memory>
+#include <string>
 
 namespace Azure { namespace Storage { namespace Files { namespace DataLake {
 
diff --git a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_lease_client.hpp b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_lease_client.hpp
index 014ea7aab8..4ab0788652 100644
--- a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_lease_client.hpp
+++ b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_lease_client.hpp
@@ -3,12 +3,12 @@
 
 #pragma once
 
-#include <chrono>
+#include "azure/storage/files/datalake/datalake_file_system_client.hpp"
+#include "azure/storage/files/datalake/datalake_path_client.hpp"
 
 #include <azure/storage/blobs/blob_lease_client.hpp>
 
-#include "azure/storage/files/datalake/datalake_file_system_client.hpp"
-#include "azure/storage/files/datalake/datalake_path_client.hpp"
+#include <chrono>
 
 namespace Azure { namespace Storage { namespace Files { namespace DataLake {
 
diff --git a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_options.hpp b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_options.hpp
index 5318df89ed..bfac843431 100644
--- a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_options.hpp
+++ b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_options.hpp
@@ -3,17 +3,17 @@
 
 #pragma once
 
-#include <cstdint>
-#include <memory>
-#include <string>
-#include <vector>
+#include "azure/storage/blobs/rest_client.hpp"
+#include "azure/storage/files/datalake/rest_client.hpp"
 
 #include <azure/core/nullable.hpp>
 #include <azure/storage/blobs/blob_options.hpp>
 #include <azure/storage/common/access_conditions.hpp>
 
-#include "azure/storage/blobs/rest_client.hpp"
-#include "azure/storage/files/datalake/rest_client.hpp"
+#include <cstdint>
+#include <memory>
+#include <string>
+#include <vector>
 
 namespace Azure { namespace Storage { namespace Files { namespace DataLake {
 
diff --git a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_path_client.hpp b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_path_client.hpp
index 497b36ac0a..b7e767b36d 100644
--- a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_path_client.hpp
+++ b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_path_client.hpp
@@ -3,10 +3,9 @@
 
 #pragma once
 
-#include <cstdint>
-#include <memory>
-#include <string>
-#include <vector>
+#include "azure/storage/files/datalake/datalake_file_system_client.hpp"
+#include "azure/storage/files/datalake/datalake_options.hpp"
+#include "azure/storage/files/datalake/datalake_responses.hpp"
 
 #include <azure/core/credentials/credentials.hpp>
 #include <azure/core/internal/http/pipeline.hpp>
@@ -14,9 +13,10 @@
 #include <azure/storage/blobs/blob_client.hpp>
 #include <azure/storage/common/storage_credential.hpp>
 
-#include "azure/storage/files/datalake/datalake_file_system_client.hpp"
-#include "azure/storage/files/datalake/datalake_options.hpp"
-#include "azure/storage/files/datalake/datalake_responses.hpp"
+#include <cstdint>
+#include <memory>
+#include <string>
+#include <vector>
 
 namespace Azure { namespace Storage { namespace Files { namespace DataLake {
 
diff --git a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_responses.hpp b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_responses.hpp
index 0c5e14e04c..fa018f046d 100644
--- a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_responses.hpp
+++ b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_responses.hpp
@@ -3,13 +3,13 @@
 
 #pragma once
 
-#include <cstdint>
-#include <string>
-#include <vector>
+#include "azure/storage/files/datalake/datalake_options.hpp"
 
 #include <azure/storage/blobs/blob_responses.hpp>
 
-#include "azure/storage/files/datalake/datalake_options.hpp"
+#include <cstdint>
+#include <string>
+#include <vector>
 
 namespace Azure { namespace Storage { namespace Files { namespace DataLake {
 
diff --git a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_sas_builder.hpp b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_sas_builder.hpp
index dba43e533e..d093252c5a 100644
--- a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_sas_builder.hpp
+++ b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_sas_builder.hpp
@@ -3,14 +3,14 @@
 
 #pragma once
 
-#include <cstdint>
-#include <string>
-#include <type_traits>
+#include "azure/storage/files/datalake/datalake_responses.hpp"
 
 #include <azure/core/nullable.hpp>
 #include <azure/storage/common/account_sas_builder.hpp>
 
-#include "azure/storage/files/datalake/datalake_responses.hpp"
+#include <cstdint>
+#include <string>
+#include <type_traits>
 
 namespace Azure { namespace Storage { namespace Sas {
 
diff --git a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_service_client.hpp b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_service_client.hpp
index 1cb927ff3f..8c5d0abff6 100644
--- a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_service_client.hpp
+++ b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_service_client.hpp
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <memory>
-#include <string>
+#include "azure/storage/files/datalake/datalake_options.hpp"
+#include "azure/storage/files/datalake/datalake_responses.hpp"
 
 #include <azure/core/credentials/credentials.hpp>
 #include <azure/core/internal/http/pipeline.hpp>
@@ -12,8 +12,8 @@
 #include <azure/storage/blobs/blob_service_client.hpp>
 #include <azure/storage/common/storage_credential.hpp>
 
-#include "azure/storage/files/datalake/datalake_options.hpp"
-#include "azure/storage/files/datalake/datalake_responses.hpp"
+#include <memory>
+#include <string>
 
 namespace Azure { namespace Storage { namespace Files { namespace DataLake {
 
diff --git a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/rest_client.hpp b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/rest_client.hpp
index 8cf70b3eb8..47c70e2cbc 100644
--- a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/rest_client.hpp
+++ b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/rest_client.hpp
@@ -6,10 +6,6 @@
 // Changes may cause incorrect behavior and will be lost if the code is regenerated.
 #pragma once
 
-#include <cstdint>
-#include <string>
-#include <vector>
-
 #include <azure/core/context.hpp>
 #include <azure/core/datetime.hpp>
 #include <azure/core/etag.hpp>
@@ -21,6 +17,10 @@
 #include <azure/storage/common/storage_common.hpp>
 #include <azure/storage/files/datalake/dll_import_export.hpp>
 
+#include <cstdint>
+#include <string>
+#include <vector>
+
 namespace Azure { namespace Storage { namespace Files { namespace DataLake {
   namespace _detail {
     /**
diff --git a/sdk/storage/azure-storage-files-datalake/samples/datalake_getting_started.cpp b/sdk/storage/azure-storage-files-datalake/samples/datalake_getting_started.cpp
index 67f9810a1d..127ffab8bf 100644
--- a/sdk/storage/azure-storage-files-datalake/samples/datalake_getting_started.cpp
+++ b/sdk/storage/azure-storage-files-datalake/samples/datalake_getting_started.cpp
@@ -3,12 +3,12 @@
 
 #include "get_env.hpp"
 
+#include <azure/storage/files/datalake.hpp>
+
 #include <cstdio>
 #include <iostream>
 #include <stdexcept>
 
-#include <azure/storage/files/datalake.hpp>
-
 std::string GetConnectionString()
 {
   const static std::string ConnectionString = "";
diff --git a/sdk/storage/azure-storage-files-datalake/src/datalake_directory_client.cpp b/sdk/storage/azure-storage-files-datalake/src/datalake_directory_client.cpp
index ec704e1513..c496089b1c 100644
--- a/sdk/storage/azure-storage-files-datalake/src/datalake_directory_client.cpp
+++ b/sdk/storage/azure-storage-files-datalake/src/datalake_directory_client.cpp
@@ -3,6 +3,9 @@
 
 #include "azure/storage/files/datalake/datalake_directory_client.hpp"
 
+#include "azure/storage/files/datalake/datalake_file_client.hpp"
+#include "private/datalake_utilities.hpp"
+
 #include <azure/core/http/policies/policy.hpp>
 #include <azure/storage/common/crypt.hpp>
 #include <azure/storage/common/internal/constants.hpp>
@@ -10,9 +13,6 @@
 #include <azure/storage/common/internal/storage_switch_to_secondary_policy.hpp>
 #include <azure/storage/common/storage_common.hpp>
 
-#include "azure/storage/files/datalake/datalake_file_client.hpp"
-#include "private/datalake_utilities.hpp"
-
 namespace Azure { namespace Storage { namespace Files { namespace DataLake {
 
   DataLakeDirectoryClient DataLakeDirectoryClient::CreateFromConnectionString(
diff --git a/sdk/storage/azure-storage-files-datalake/src/datalake_file_client.cpp b/sdk/storage/azure-storage-files-datalake/src/datalake_file_client.cpp
index 6edca7ea3e..898d964da1 100644
--- a/sdk/storage/azure-storage-files-datalake/src/datalake_file_client.cpp
+++ b/sdk/storage/azure-storage-files-datalake/src/datalake_file_client.cpp
@@ -3,15 +3,15 @@
 
 #include "azure/storage/files/datalake/datalake_file_client.hpp"
 
+#include "private/datalake_constants.hpp"
+#include "private/datalake_utilities.hpp"
+
 #include <azure/core/http/policies/policy.hpp>
 #include <azure/storage/common/crypt.hpp>
 #include <azure/storage/common/internal/constants.hpp>
 #include <azure/storage/common/internal/shared_key_policy.hpp>
 #include <azure/storage/common/storage_common.hpp>
 
-#include "private/datalake_constants.hpp"
-#include "private/datalake_utilities.hpp"
-
 namespace Azure { namespace Storage { namespace Files { namespace DataLake {
 
   DataLakeFileClient DataLakeFileClient::CreateFromConnectionString(
diff --git a/sdk/storage/azure-storage-files-datalake/src/datalake_file_system_client.cpp b/sdk/storage/azure-storage-files-datalake/src/datalake_file_system_client.cpp
index 5e7b089490..1760d99d77 100644
--- a/sdk/storage/azure-storage-files-datalake/src/datalake_file_system_client.cpp
+++ b/sdk/storage/azure-storage-files-datalake/src/datalake_file_system_client.cpp
@@ -3,6 +3,13 @@
 
 #include "azure/storage/files/datalake/datalake_file_system_client.hpp"
 
+#include "azure/storage/files/datalake/datalake_directory_client.hpp"
+#include "azure/storage/files/datalake/datalake_file_client.hpp"
+#include "azure/storage/files/datalake/datalake_path_client.hpp"
+#include "private/datalake_constants.hpp"
+#include "private/datalake_utilities.hpp"
+#include "private/package_version.hpp"
+
 #include <azure/core/http/policies/policy.hpp>
 #include <azure/storage/common/crypt.hpp>
 #include <azure/storage/common/internal/constants.hpp>
@@ -13,13 +20,6 @@
 #include <azure/storage/common/storage_common.hpp>
 #include <azure/storage/common/storage_exception.hpp>
 
-#include "azure/storage/files/datalake/datalake_directory_client.hpp"
-#include "azure/storage/files/datalake/datalake_file_client.hpp"
-#include "azure/storage/files/datalake/datalake_path_client.hpp"
-#include "private/datalake_constants.hpp"
-#include "private/datalake_utilities.hpp"
-#include "private/package_version.hpp"
-
 namespace Azure { namespace Storage { namespace Files { namespace DataLake {
 
   DataLakeFileSystemClient DataLakeFileSystemClient::CreateFromConnectionString(
diff --git a/sdk/storage/azure-storage-files-datalake/src/datalake_path_client.cpp b/sdk/storage/azure-storage-files-datalake/src/datalake_path_client.cpp
index fd7a884ce5..536f120010 100644
--- a/sdk/storage/azure-storage-files-datalake/src/datalake_path_client.cpp
+++ b/sdk/storage/azure-storage-files-datalake/src/datalake_path_client.cpp
@@ -3,6 +3,10 @@
 
 #include "azure/storage/files/datalake/datalake_path_client.hpp"
 
+#include "private/datalake_constants.hpp"
+#include "private/datalake_utilities.hpp"
+#include "private/package_version.hpp"
+
 #include <azure/core/http/policies/policy.hpp>
 #include <azure/storage/common/crypt.hpp>
 #include <azure/storage/common/internal/constants.hpp>
@@ -13,10 +17,6 @@
 #include <azure/storage/common/storage_common.hpp>
 #include <azure/storage/common/storage_exception.hpp>
 
-#include "private/datalake_constants.hpp"
-#include "private/datalake_utilities.hpp"
-#include "private/package_version.hpp"
-
 namespace Azure { namespace Storage { namespace Files { namespace DataLake {
 
   DataLakePathClient DataLakePathClient::CreateFromConnectionString(
diff --git a/sdk/storage/azure-storage-files-datalake/src/datalake_service_client.cpp b/sdk/storage/azure-storage-files-datalake/src/datalake_service_client.cpp
index fd344115c4..0aa2c20db6 100644
--- a/sdk/storage/azure-storage-files-datalake/src/datalake_service_client.cpp
+++ b/sdk/storage/azure-storage-files-datalake/src/datalake_service_client.cpp
@@ -3,6 +3,10 @@
 
 #include "azure/storage/files/datalake/datalake_service_client.hpp"
 
+#include "azure/storage/files/datalake/datalake_file_system_client.hpp"
+#include "private/datalake_utilities.hpp"
+#include "private/package_version.hpp"
+
 #include <azure/core/http/policies/policy.hpp>
 #include <azure/storage/common/crypt.hpp>
 #include <azure/storage/common/internal/constants.hpp>
@@ -13,10 +17,6 @@
 #include <azure/storage/common/storage_common.hpp>
 #include <azure/storage/common/storage_credential.hpp>
 
-#include "azure/storage/files/datalake/datalake_file_system_client.hpp"
-#include "private/datalake_utilities.hpp"
-#include "private/package_version.hpp"
-
 namespace Azure { namespace Storage { namespace Files { namespace DataLake {
 
   DataLakeServiceClient DataLakeServiceClient::CreateFromConnectionString(
diff --git a/sdk/storage/azure-storage-files-datalake/src/datalake_utilities.cpp b/sdk/storage/azure-storage-files-datalake/src/datalake_utilities.cpp
index 76a96546bb..c54447d6c9 100644
--- a/sdk/storage/azure-storage-files-datalake/src/datalake_utilities.cpp
+++ b/sdk/storage/azure-storage-files-datalake/src/datalake_utilities.cpp
@@ -3,10 +3,10 @@
 
 #include "private/datalake_utilities.hpp"
 
-#include <azure/storage/common/crypt.hpp>
-
 #include "private/datalake_constants.hpp"
 
+#include <azure/storage/common/crypt.hpp>
+
 namespace Azure { namespace Storage { namespace Files { namespace DataLake { namespace _detail {
 
   const static std::string DfsEndPointIdentifier = ".dfs.";
diff --git a/sdk/storage/azure-storage-files-datalake/src/private/datalake_utilities.hpp b/sdk/storage/azure-storage-files-datalake/src/private/datalake_utilities.hpp
index d0d006882d..0788cff31d 100644
--- a/sdk/storage/azure-storage-files-datalake/src/private/datalake_utilities.hpp
+++ b/sdk/storage/azure-storage-files-datalake/src/private/datalake_utilities.hpp
@@ -3,13 +3,13 @@
 
 #pragma once
 
-#include <string>
+#include "azure/storage/files/datalake/datalake_options.hpp"
 
 #include <azure/core/datetime.hpp>
 #include <azure/storage/blobs/blob_options.hpp>
 #include <azure/storage/common/storage_common.hpp>
 
-#include "azure/storage/files/datalake/datalake_options.hpp"
+#include <string>
 
 namespace Azure { namespace Storage { namespace Files { namespace DataLake { namespace _detail {
 
diff --git a/sdk/storage/azure-storage-files-datalake/src/rest_client.cpp b/sdk/storage/azure-storage-files-datalake/src/rest_client.cpp
index 6aaf59f61b..b0451ec914 100644
--- a/sdk/storage/azure-storage-files-datalake/src/rest_client.cpp
+++ b/sdk/storage/azure-storage-files-datalake/src/rest_client.cpp
@@ -4,11 +4,6 @@
 //
 // Code generated by Microsoft (R) AutoRest C++ Code Generator.
 // Changes may cause incorrect behavior and will be lost if the code is regenerated.
-#include <azure/storage/files/datalake/rest_client.hpp>
-
-#include <cstdint>
-#include <string>
-
 #include <azure/core/base64.hpp>
 #include <azure/core/context.hpp>
 #include <azure/core/datetime.hpp>
@@ -23,6 +18,10 @@
 #include <azure/storage/common/crypt.hpp>
 #include <azure/storage/common/storage_common.hpp>
 #include <azure/storage/common/storage_exception.hpp>
+#include <azure/storage/files/datalake/rest_client.hpp>
+
+#include <cstdint>
+#include <string>
 
 namespace Azure { namespace Storage { namespace Files { namespace DataLake {
   namespace Models {
diff --git a/sdk/storage/azure-storage-files-datalake/test/ut/datalake_directory_client_test.cpp b/sdk/storage/azure-storage-files-datalake/test/ut/datalake_directory_client_test.cpp
index b891792a4b..30ba4321be 100644
--- a/sdk/storage/azure-storage-files-datalake/test/ut/datalake_directory_client_test.cpp
+++ b/sdk/storage/azure-storage-files-datalake/test/ut/datalake_directory_client_test.cpp
@@ -3,12 +3,12 @@
 
 #include "datalake_directory_client_test.hpp"
 
-#include <algorithm>
-#include <thread>
-
 #include <azure/identity/client_secret_credential.hpp>
 #include <azure/storage/common/internal/shared_key_policy.hpp>
 
+#include <algorithm>
+#include <thread>
+
 namespace Azure { namespace Storage { namespace Test {
 
   void DataLakeDirectoryClientTest::SetUp()
diff --git a/sdk/storage/azure-storage-files-datalake/test/ut/datalake_directory_client_test.hpp b/sdk/storage/azure-storage-files-datalake/test/ut/datalake_directory_client_test.hpp
index c80ab4c3c7..0164d64e1b 100644
--- a/sdk/storage/azure-storage-files-datalake/test/ut/datalake_directory_client_test.hpp
+++ b/sdk/storage/azure-storage-files-datalake/test/ut/datalake_directory_client_test.hpp
@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/storage/files/datalake.hpp>
-
 #include "datalake_path_client_test.hpp"
 
+#include <azure/storage/files/datalake.hpp>
+
 namespace Azure { namespace Storage { namespace Test {
 
   class DataLakeDirectoryClientTest : public DataLakePathClientTest {
diff --git a/sdk/storage/azure-storage-files-datalake/test/ut/datalake_file_client_test.cpp b/sdk/storage/azure-storage-files-datalake/test/ut/datalake_file_client_test.cpp
index a8574dbf8f..bc4e7a3257 100644
--- a/sdk/storage/azure-storage-files-datalake/test/ut/datalake_file_client_test.cpp
+++ b/sdk/storage/azure-storage-files-datalake/test/ut/datalake_file_client_test.cpp
@@ -3,16 +3,16 @@
 
 #include "datalake_file_client_test.hpp"
 
+#include <azure/identity/client_secret_credential.hpp>
+#include <azure/storage/blobs.hpp>
+#include <azure/storage/common/internal/shared_key_policy.hpp>
+
 #include <algorithm>
 #include <future>
 #include <random>
 #include <thread>
 #include <vector>
 
-#include <azure/identity/client_secret_credential.hpp>
-#include <azure/storage/blobs.hpp>
-#include <azure/storage/common/internal/shared_key_policy.hpp>
-
 namespace Azure { namespace Storage { namespace Blobs { namespace Models {
 
   bool operator==(const BlobHttpHeaders& lhs, const BlobHttpHeaders& rhs)
diff --git a/sdk/storage/azure-storage-files-datalake/test/ut/datalake_file_client_test.hpp b/sdk/storage/azure-storage-files-datalake/test/ut/datalake_file_client_test.hpp
index 9a57c2276f..af62fce95f 100644
--- a/sdk/storage/azure-storage-files-datalake/test/ut/datalake_file_client_test.hpp
+++ b/sdk/storage/azure-storage-files-datalake/test/ut/datalake_file_client_test.hpp
@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/storage/files/datalake.hpp>
-
 #include "datalake_file_system_client_test.hpp"
 
+#include <azure/storage/files/datalake.hpp>
+
 namespace Azure { namespace Storage { namespace Test {
 
   class DataLakeFileClientTest : public DataLakeFileSystemClientTest {
diff --git a/sdk/storage/azure-storage-files-datalake/test/ut/datalake_file_system_client_test.cpp b/sdk/storage/azure-storage-files-datalake/test/ut/datalake_file_system_client_test.cpp
index 9b6f255704..69a4b77fdb 100644
--- a/sdk/storage/azure-storage-files-datalake/test/ut/datalake_file_system_client_test.cpp
+++ b/sdk/storage/azure-storage-files-datalake/test/ut/datalake_file_system_client_test.cpp
@@ -3,12 +3,12 @@
 
 #include "datalake_file_system_client_test.hpp"
 
-#include <algorithm>
-
 #include <azure/core/internal/cryptography/sha_hash.hpp>
 #include <azure/identity/client_secret_credential.hpp>
 #include <azure/storage/common/crypt.hpp>
 
+#include <algorithm>
+
 namespace Azure { namespace Storage { namespace Blobs { namespace Models {
 
   bool operator==(const SignedIdentifier& lhs, const SignedIdentifier& rhs);
diff --git a/sdk/storage/azure-storage-files-datalake/test/ut/datalake_file_system_client_test.hpp b/sdk/storage/azure-storage-files-datalake/test/ut/datalake_file_system_client_test.hpp
index 359e38784a..2240b7cdae 100644
--- a/sdk/storage/azure-storage-files-datalake/test/ut/datalake_file_system_client_test.hpp
+++ b/sdk/storage/azure-storage-files-datalake/test/ut/datalake_file_system_client_test.hpp
@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/storage/files/datalake.hpp>
-
 #include "datalake_service_client_test.hpp"
 
+#include <azure/storage/files/datalake.hpp>
+
 namespace Azure { namespace Storage { namespace Test {
 
   class DataLakeFileSystemClientTest : public DataLakeServiceClientTest {
diff --git a/sdk/storage/azure-storage-files-datalake/test/ut/datalake_path_client_test.cpp b/sdk/storage/azure-storage-files-datalake/test/ut/datalake_path_client_test.cpp
index d6213cef87..0246ca2ef3 100644
--- a/sdk/storage/azure-storage-files-datalake/test/ut/datalake_path_client_test.cpp
+++ b/sdk/storage/azure-storage-files-datalake/test/ut/datalake_path_client_test.cpp
@@ -3,11 +3,11 @@
 
 #include "datalake_path_client_test.hpp"
 
+#include <azure/identity/client_secret_credential.hpp>
+
 #include <algorithm>
 #include <thread>
 
-#include <azure/identity/client_secret_credential.hpp>
-
 namespace Azure { namespace Storage { namespace Test {
 
   void DataLakePathClientTest::SetUp()
diff --git a/sdk/storage/azure-storage-files-datalake/test/ut/datalake_path_client_test.hpp b/sdk/storage/azure-storage-files-datalake/test/ut/datalake_path_client_test.hpp
index 004e8aea41..54d94069ec 100644
--- a/sdk/storage/azure-storage-files-datalake/test/ut/datalake_path_client_test.hpp
+++ b/sdk/storage/azure-storage-files-datalake/test/ut/datalake_path_client_test.hpp
@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/storage/files/datalake.hpp>
-
 #include "datalake_file_system_client_test.hpp"
 
+#include <azure/storage/files/datalake.hpp>
+
 namespace Azure { namespace Storage { namespace Test {
 
   class DataLakePathClientTest : public DataLakeFileSystemClientTest {
diff --git a/sdk/storage/azure-storage-files-datalake/test/ut/datalake_sas_test.cpp b/sdk/storage/azure-storage-files-datalake/test/ut/datalake_sas_test.cpp
index 234d54cd09..f477c7f396 100644
--- a/sdk/storage/azure-storage-files-datalake/test/ut/datalake_sas_test.cpp
+++ b/sdk/storage/azure-storage-files-datalake/test/ut/datalake_sas_test.cpp
@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
+#include "datalake_file_system_client_test.hpp"
+
 #include <azure/identity/client_secret_credential.hpp>
 #include <azure/storage/blobs/blob_sas_builder.hpp>
 #include <azure/storage/files/datalake/datalake_sas_builder.hpp>
 
-#include "datalake_file_system_client_test.hpp"
-
 #include <chrono>
 
 namespace Azure { namespace Storage { namespace Test {
diff --git a/sdk/storage/azure-storage-files-datalake/test/ut/datalake_service_client_test.hpp b/sdk/storage/azure-storage-files-datalake/test/ut/datalake_service_client_test.hpp
index 408e426166..aa88bca13d 100644
--- a/sdk/storage/azure-storage-files-datalake/test/ut/datalake_service_client_test.hpp
+++ b/sdk/storage/azure-storage-files-datalake/test/ut/datalake_service_client_test.hpp
@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/storage/files/datalake.hpp>
-
 #include "test/ut/test_base.hpp"
 
+#include <azure/storage/files/datalake.hpp>
+
 namespace Azure { namespace Storage { namespace Test {
 
   class DataLakeServiceClientTest : public Azure::Storage::Test::StorageTest {
diff --git a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares.hpp b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares.hpp
index fe99ed8c9a..887f9c41cf 100644
--- a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares.hpp
+++ b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares.hpp
@@ -8,8 +8,6 @@
 
 #pragma once
 
-#include <azure/storage/common/storage_exception.hpp>
-
 #include "azure/storage/files/shares/dll_import_export.hpp"
 #include "azure/storage/files/shares/rest_client.hpp"
 #include "azure/storage/files/shares/rtti.hpp"
@@ -22,3 +20,5 @@
 #include "azure/storage/files/shares/share_responses.hpp"
 #include "azure/storage/files/shares/share_sas_builder.hpp"
 #include "azure/storage/files/shares/share_service_client.hpp"
+
+#include <azure/storage/common/storage_exception.hpp>
diff --git a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/rest_client.hpp b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/rest_client.hpp
index 9223ae3cfc..279e5317d2 100644
--- a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/rest_client.hpp
+++ b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/rest_client.hpp
@@ -6,13 +6,6 @@
 // Changes may cause incorrect behavior and will be lost if the code is regenerated.
 #pragma once
 
-#include <cstdint>
-#include <map>
-#include <memory>
-#include <string>
-#include <type_traits>
-#include <vector>
-
 #include <azure/core/case_insensitive_containers.hpp>
 #include <azure/core/context.hpp>
 #include <azure/core/datetime.hpp>
@@ -26,6 +19,13 @@
 #include <azure/storage/common/storage_common.hpp>
 #include <azure/storage/files/shares/dll_import_export.hpp>
 
+#include <cstdint>
+#include <map>
+#include <memory>
+#include <string>
+#include <type_traits>
+#include <vector>
+
 namespace Azure { namespace Storage { namespace Files { namespace Shares {
   namespace _detail {
     /**
diff --git a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_client.hpp b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_client.hpp
index c832291420..3f5bbb63aa 100644
--- a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_client.hpp
+++ b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_client.hpp
@@ -3,15 +3,15 @@
 
 #pragma once
 
-#include <memory>
-#include <string>
+#include "azure/storage/files/shares/share_options.hpp"
+#include "azure/storage/files/shares/share_responses.hpp"
+#include "azure/storage/files/shares/share_service_client.hpp"
 
 #include <azure/core/response.hpp>
 #include <azure/storage/common/storage_credential.hpp>
 
-#include "azure/storage/files/shares/share_options.hpp"
-#include "azure/storage/files/shares/share_responses.hpp"
-#include "azure/storage/files/shares/share_service_client.hpp"
+#include <memory>
+#include <string>
 
 namespace Azure { namespace Storage { namespace Files { namespace Shares {
 
diff --git a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_directory_client.hpp b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_directory_client.hpp
index 182a689b8b..cc1a9727c3 100644
--- a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_directory_client.hpp
+++ b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_directory_client.hpp
@@ -3,16 +3,16 @@
 
 #pragma once
 
-#include <memory>
-#include <string>
+#include "azure/storage/files/shares/share_client.hpp"
+#include "azure/storage/files/shares/share_options.hpp"
+#include "azure/storage/files/shares/share_responses.hpp"
 
 #include <azure/core/internal/http/pipeline.hpp>
 #include <azure/core/response.hpp>
 #include <azure/storage/common/storage_credential.hpp>
 
-#include "azure/storage/files/shares/share_client.hpp"
-#include "azure/storage/files/shares/share_options.hpp"
-#include "azure/storage/files/shares/share_responses.hpp"
+#include <memory>
+#include <string>
 
 namespace Azure { namespace Storage { namespace Files { namespace Shares {
 
diff --git a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_file_client.hpp b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_file_client.hpp
index ee77fcf8b5..f79a28cad8 100644
--- a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_file_client.hpp
+++ b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_file_client.hpp
@@ -3,17 +3,17 @@
 
 #pragma once
 
-#include <memory>
-#include <string>
+#include "azure/storage/files/shares/share_client.hpp"
+#include "azure/storage/files/shares/share_directory_client.hpp"
+#include "azure/storage/files/shares/share_options.hpp"
+#include "azure/storage/files/shares/share_responses.hpp"
 
 #include <azure/core/internal/http/pipeline.hpp>
 #include <azure/core/response.hpp>
 #include <azure/storage/common/storage_credential.hpp>
 
-#include "azure/storage/files/shares/share_client.hpp"
-#include "azure/storage/files/shares/share_directory_client.hpp"
-#include "azure/storage/files/shares/share_options.hpp"
-#include "azure/storage/files/shares/share_responses.hpp"
+#include <memory>
+#include <string>
 
 namespace Azure { namespace Storage { namespace Files { namespace Shares {
 
diff --git a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_lease_client.hpp b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_lease_client.hpp
index 44b4a19632..1cf2b34414 100644
--- a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_lease_client.hpp
+++ b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_lease_client.hpp
@@ -3,13 +3,13 @@
 
 #pragma once
 
+#include "azure/storage/files/shares/share_client.hpp"
+#include "azure/storage/files/shares/share_file_client.hpp"
+
 #include <chrono>
 #include <mutex>
 #include <string>
 
-#include "azure/storage/files/shares/share_client.hpp"
-#include "azure/storage/files/shares/share_file_client.hpp"
-
 namespace Azure { namespace Storage { namespace Files { namespace Shares {
 
   /**
diff --git a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_options.hpp b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_options.hpp
index 6f39304ddf..a332519f1e 100644
--- a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_options.hpp
+++ b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_options.hpp
@@ -3,15 +3,15 @@
 
 #pragma once
 
-#include <memory>
-#include <string>
-#include <vector>
+#include "azure/storage/files/shares/rest_client.hpp"
 
 #include <azure/core/internal/client_options.hpp>
 #include <azure/core/nullable.hpp>
 #include <azure/storage/common/access_conditions.hpp>
 
-#include "azure/storage/files/shares/rest_client.hpp"
+#include <memory>
+#include <string>
+#include <vector>
 
 /* cSpell:ignore dacl */
 
diff --git a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_responses.hpp b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_responses.hpp
index d2c219caf5..8f28f7af72 100644
--- a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_responses.hpp
+++ b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_responses.hpp
@@ -3,13 +3,13 @@
 
 #pragma once
 
+#include "azure/storage/files/shares/share_constants.hpp"
+#include "azure/storage/files/shares/share_options.hpp"
+
 #include <azure/core/azure_assert.hpp>
 #include <azure/core/operation.hpp>
 #include <azure/core/paged_response.hpp>
 
-#include "azure/storage/files/shares/share_constants.hpp"
-#include "azure/storage/files/shares/share_options.hpp"
-
 namespace Azure { namespace Storage { namespace Files { namespace Shares {
 
   class ShareServiceClient;
diff --git a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_sas_builder.hpp b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_sas_builder.hpp
index e25171a6ac..9817077943 100644
--- a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_sas_builder.hpp
+++ b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_sas_builder.hpp
@@ -3,13 +3,13 @@
 
 #pragma once
 
-#include <string>
-#include <type_traits>
-
 #include <azure/core/nullable.hpp>
 #include <azure/storage/common/account_sas_builder.hpp>
 #include <azure/storage/common/internal/constants.hpp>
 
+#include <string>
+#include <type_traits>
+
 namespace Azure { namespace Storage { namespace Sas {
 
   /**
diff --git a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_service_client.hpp b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_service_client.hpp
index 8fca51c3a0..d639b00c27 100644
--- a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_service_client.hpp
+++ b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_service_client.hpp
@@ -3,15 +3,15 @@
 
 #pragma once
 
-#include <memory>
-#include <string>
+#include "azure/storage/files/shares/share_options.hpp"
+#include "azure/storage/files/shares/share_responses.hpp"
 
 #include <azure/core/internal/http/pipeline.hpp>
 #include <azure/core/response.hpp>
 #include <azure/storage/common/storage_credential.hpp>
 
-#include "azure/storage/files/shares/share_options.hpp"
-#include "azure/storage/files/shares/share_responses.hpp"
+#include <memory>
+#include <string>
 
 namespace Azure { namespace Storage { namespace Files { namespace Shares {
 
diff --git a/sdk/storage/azure-storage-files-shares/samples/file_share_getting_started.cpp b/sdk/storage/azure-storage-files-shares/samples/file_share_getting_started.cpp
index 5a7cf241e6..aad9cb3546 100644
--- a/sdk/storage/azure-storage-files-shares/samples/file_share_getting_started.cpp
+++ b/sdk/storage/azure-storage-files-shares/samples/file_share_getting_started.cpp
@@ -3,12 +3,12 @@
 
 #include "get_env.hpp"
 
+#include <azure/storage/files/shares.hpp>
+
 #include <cstdio>
 #include <iostream>
 #include <stdexcept>
 
-#include <azure/storage/files/shares.hpp>
-
 std::string GetConnectionString()
 {
   const static std::string ConnectionString = "";
diff --git a/sdk/storage/azure-storage-files-shares/src/rest_client.cpp b/sdk/storage/azure-storage-files-shares/src/rest_client.cpp
index a8881dda0c..865cb0eb62 100644
--- a/sdk/storage/azure-storage-files-shares/src/rest_client.cpp
+++ b/sdk/storage/azure-storage-files-shares/src/rest_client.cpp
@@ -4,14 +4,6 @@
 //
 // Code generated by Microsoft (R) AutoRest C++ Code Generator.
 // Changes may cause incorrect behavior and will be lost if the code is regenerated.
-#include <azure/storage/files/shares/rest_client.hpp>
-
-#include <algorithm>
-#include <iterator>
-#include <string>
-#include <unordered_map>
-#include <vector>
-
 #include <azure/core/base64.hpp>
 #include <azure/core/context.hpp>
 #include <azure/core/datetime.hpp>
@@ -26,6 +18,13 @@
 #include <azure/storage/common/crypt.hpp>
 #include <azure/storage/common/internal/xml_wrapper.hpp>
 #include <azure/storage/common/storage_exception.hpp>
+#include <azure/storage/files/shares/rest_client.hpp>
+
+#include <algorithm>
+#include <iterator>
+#include <string>
+#include <unordered_map>
+#include <vector>
 
 namespace {
 std::string ListSharesIncludeFlagsToString(
diff --git a/sdk/storage/azure-storage-files-shares/src/share_client.cpp b/sdk/storage/azure-storage-files-shares/src/share_client.cpp
index d9acab2b17..55db776b67 100644
--- a/sdk/storage/azure-storage-files-shares/src/share_client.cpp
+++ b/sdk/storage/azure-storage-files-shares/src/share_client.cpp
@@ -3,6 +3,10 @@
 
 #include "azure/storage/files/shares/share_client.hpp"
 
+#include "azure/storage/files/shares/share_directory_client.hpp"
+#include "azure/storage/files/shares/share_file_client.hpp"
+#include "private/package_version.hpp"
+
 #include <azure/core/credentials/credentials.hpp>
 #include <azure/core/http/policies/policy.hpp>
 #include <azure/storage/common/crypt.hpp>
@@ -13,11 +17,6 @@
 #include <azure/storage/common/storage_common.hpp>
 #include <azure/storage/common/storage_exception.hpp>
 
-#include "azure/storage/files/shares/share_directory_client.hpp"
-#include "azure/storage/files/shares/share_file_client.hpp"
-
-#include "private/package_version.hpp"
-
 namespace Azure { namespace Storage { namespace Files { namespace Shares {
 
   ShareClient ShareClient::CreateFromConnectionString(
diff --git a/sdk/storage/azure-storage-files-shares/src/share_directory_client.cpp b/sdk/storage/azure-storage-files-shares/src/share_directory_client.cpp
index 08e78d96b5..33398431fa 100644
--- a/sdk/storage/azure-storage-files-shares/src/share_directory_client.cpp
+++ b/sdk/storage/azure-storage-files-shares/src/share_directory_client.cpp
@@ -3,6 +3,9 @@
 
 #include "azure/storage/files/shares/share_directory_client.hpp"
 
+#include "azure/storage/files/shares/share_file_client.hpp"
+#include "private/package_version.hpp"
+
 #include <azure/core/credentials/credentials.hpp>
 #include <azure/core/http/policies/policy.hpp>
 #include <azure/storage/common/crypt.hpp>
@@ -13,10 +16,6 @@
 #include <azure/storage/common/storage_common.hpp>
 #include <azure/storage/common/storage_exception.hpp>
 
-#include "azure/storage/files/shares/share_file_client.hpp"
-
-#include "private/package_version.hpp"
-
 namespace Azure { namespace Storage { namespace Files { namespace Shares {
 
   ShareDirectoryClient ShareDirectoryClient::CreateFromConnectionString(
diff --git a/sdk/storage/azure-storage-files-shares/src/share_file_client.cpp b/sdk/storage/azure-storage-files-shares/src/share_file_client.cpp
index 6f56d65c67..7748cb24c4 100644
--- a/sdk/storage/azure-storage-files-shares/src/share_file_client.cpp
+++ b/sdk/storage/azure-storage-files-shares/src/share_file_client.cpp
@@ -3,6 +3,9 @@
 
 #include "azure/storage/files/shares/share_file_client.hpp"
 
+#include "azure/storage/files/shares/share_constants.hpp"
+#include "private/package_version.hpp"
+
 #include <azure/core/credentials/credentials.hpp>
 #include <azure/core/http/policies/policy.hpp>
 #include <azure/core/internal/io/null_body_stream.hpp>
@@ -18,10 +21,6 @@
 #include <azure/storage/common/storage_common.hpp>
 #include <azure/storage/common/storage_exception.hpp>
 
-#include "azure/storage/files/shares/share_constants.hpp"
-
-#include "private/package_version.hpp"
-
 namespace Azure { namespace Storage { namespace Files { namespace Shares {
 
   ShareFileClient ShareFileClient::CreateFromConnectionString(
diff --git a/sdk/storage/azure-storage-files-shares/src/share_responses.cpp b/sdk/storage/azure-storage-files-shares/src/share_responses.cpp
index 4a2e78ccdc..807bf5a2bc 100644
--- a/sdk/storage/azure-storage-files-shares/src/share_responses.cpp
+++ b/sdk/storage/azure-storage-files-shares/src/share_responses.cpp
@@ -3,11 +3,11 @@
 
 #include "azure/storage/files/shares/share_responses.hpp"
 
-#include <thread>
-
 #include "azure/storage/files/shares/share_directory_client.hpp"
 #include "azure/storage/files/shares/share_file_client.hpp"
 
+#include <thread>
+
 namespace Azure { namespace Storage { namespace Files { namespace Shares {
   namespace Models {
     ShareFileHandleAccessRights::ShareFileHandleAccessRights(const std::string& value)
diff --git a/sdk/storage/azure-storage-files-shares/src/share_sas_builder.cpp b/sdk/storage/azure-storage-files-shares/src/share_sas_builder.cpp
index 448fba6057..09b561ef7d 100644
--- a/sdk/storage/azure-storage-files-shares/src/share_sas_builder.cpp
+++ b/sdk/storage/azure-storage-files-shares/src/share_sas_builder.cpp
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: MIT
 
 #include "azure/storage/files/shares/share_sas_builder.hpp"
+
 #include "azure/storage/files/shares/rest_client.hpp"
 
 #include <azure/core/http/http.hpp>
diff --git a/sdk/storage/azure-storage-files-shares/src/share_service_client.cpp b/sdk/storage/azure-storage-files-shares/src/share_service_client.cpp
index 89340f519a..f0d4309698 100644
--- a/sdk/storage/azure-storage-files-shares/src/share_service_client.cpp
+++ b/sdk/storage/azure-storage-files-shares/src/share_service_client.cpp
@@ -3,6 +3,9 @@
 
 #include "azure/storage/files/shares/share_service_client.hpp"
 
+#include "azure/storage/files/shares/share_client.hpp"
+#include "private/package_version.hpp"
+
 #include <azure/core/credentials/credentials.hpp>
 #include <azure/core/http/policies/policy.hpp>
 #include <azure/storage/common/crypt.hpp>
@@ -13,10 +16,6 @@
 #include <azure/storage/common/storage_common.hpp>
 #include <azure/storage/common/storage_credential.hpp>
 
-#include "azure/storage/files/shares/share_client.hpp"
-
-#include "private/package_version.hpp"
-
 namespace Azure { namespace Storage { namespace Files { namespace Shares {
   ShareServiceClient ShareServiceClient::CreateFromConnectionString(
       const std::string& connectionString,
diff --git a/sdk/storage/azure-storage-files-shares/test/ut/share_client_test.cpp b/sdk/storage/azure-storage-files-shares/test/ut/share_client_test.cpp
index 5a18a1ecc4..a7e42b605d 100644
--- a/sdk/storage/azure-storage-files-shares/test/ut/share_client_test.cpp
+++ b/sdk/storage/azure-storage-files-shares/test/ut/share_client_test.cpp
@@ -3,12 +3,12 @@
 
 #include "share_client_test.hpp"
 
+#include <azure/storage/common/crypt.hpp>
+
 #include <algorithm>
 #include <chrono>
 #include <unordered_map>
 
-#include <azure/storage/common/crypt.hpp>
-
 namespace Azure { namespace Storage { namespace Files { namespace Shares { namespace Models {
 
   bool operator==(
diff --git a/sdk/storage/azure-storage-files-shares/test/ut/share_client_test.hpp b/sdk/storage/azure-storage-files-shares/test/ut/share_client_test.hpp
index c54d80b301..29c5e5c5bb 100644
--- a/sdk/storage/azure-storage-files-shares/test/ut/share_client_test.hpp
+++ b/sdk/storage/azure-storage-files-shares/test/ut/share_client_test.hpp
@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/storage/files/shares.hpp>
-
 #include "share_service_client_test.hpp"
 
+#include <azure/storage/files/shares.hpp>
+
 namespace Azure { namespace Storage { namespace Test {
 
   class FileShareClientTest : public FileShareServiceClientTest {
diff --git a/sdk/storage/azure-storage-files-shares/test/ut/share_directory_client_test.hpp b/sdk/storage/azure-storage-files-shares/test/ut/share_directory_client_test.hpp
index 1ab9fdccbb..9742bea8e5 100644
--- a/sdk/storage/azure-storage-files-shares/test/ut/share_directory_client_test.hpp
+++ b/sdk/storage/azure-storage-files-shares/test/ut/share_directory_client_test.hpp
@@ -1,11 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/storage/files/shares.hpp>
-
 #include "share_client_test.hpp"
 #include "test/ut/test_base.hpp"
 
+#include <azure/storage/files/shares.hpp>
+
 namespace Azure { namespace Storage { namespace Test {
 
   class FileShareDirectoryClientTest : public FileShareClientTest {
diff --git a/sdk/storage/azure-storage-files-shares/test/ut/share_file_attributes_test.cpp b/sdk/storage/azure-storage-files-shares/test/ut/share_file_attributes_test.cpp
index 69f2c4eac5..3df20f369e 100644
--- a/sdk/storage/azure-storage-files-shares/test/ut/share_file_attributes_test.cpp
+++ b/sdk/storage/azure-storage-files-shares/test/ut/share_file_attributes_test.cpp
@@ -1,9 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "test/ut/test_base.hpp"
-
 #include "azure/storage/files/shares/rest_client.hpp"
+#include "test/ut/test_base.hpp"
 
 namespace Azure { namespace Storage { namespace Test {
 
diff --git a/sdk/storage/azure-storage-files-shares/test/ut/share_file_client_test.cpp b/sdk/storage/azure-storage-files-shares/test/ut/share_file_client_test.cpp
index 7b9ec9c1a8..536984b2fd 100644
--- a/sdk/storage/azure-storage-files-shares/test/ut/share_file_client_test.cpp
+++ b/sdk/storage/azure-storage-files-shares/test/ut/share_file_client_test.cpp
@@ -3,16 +3,16 @@
 
 #include "share_file_client_test.hpp"
 
-#include <algorithm>
-#include <chrono>
-#include <future>
-#include <random>
-
 #include <azure/core/cryptography/hash.hpp>
 #include <azure/storage/common/crypt.hpp>
 #include <azure/storage/common/internal/file_io.hpp>
 #include <azure/storage/common/storage_common.hpp>
 
+#include <algorithm>
+#include <chrono>
+#include <future>
+#include <random>
+
 namespace Azure { namespace Storage { namespace Test {
 
   void FileShareFileClientTest::SetUp()
diff --git a/sdk/storage/azure-storage-files-shares/test/ut/share_file_client_test.hpp b/sdk/storage/azure-storage-files-shares/test/ut/share_file_client_test.hpp
index 9c0451cb4b..86edcdf8f6 100644
--- a/sdk/storage/azure-storage-files-shares/test/ut/share_file_client_test.hpp
+++ b/sdk/storage/azure-storage-files-shares/test/ut/share_file_client_test.hpp
@@ -1,11 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/storage/files/shares.hpp>
-
 #include "share_directory_client_test.hpp"
 #include "test/ut/test_base.hpp"
 
+#include <azure/storage/files/shares.hpp>
+
 namespace Azure { namespace Storage { namespace Test {
 
   class FileShareFileClientTest : public FileShareDirectoryClientTest {
diff --git a/sdk/storage/azure-storage-files-shares/test/ut/share_sas_test.cpp b/sdk/storage/azure-storage-files-shares/test/ut/share_sas_test.cpp
index b121f7defb..b18a8f3e00 100644
--- a/sdk/storage/azure-storage-files-shares/test/ut/share_sas_test.cpp
+++ b/sdk/storage/azure-storage-files-shares/test/ut/share_sas_test.cpp
@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/storage/files/shares/share_sas_builder.hpp>
-
 #include "share_client_test.hpp"
 
+#include <azure/storage/files/shares/share_sas_builder.hpp>
+
 #include <chrono>
 
 namespace Azure { namespace Storage { namespace Test {
diff --git a/sdk/storage/azure-storage-files-shares/test/ut/share_service_client_test.hpp b/sdk/storage/azure-storage-files-shares/test/ut/share_service_client_test.hpp
index ab042aabb1..09eb986c7a 100644
--- a/sdk/storage/azure-storage-files-shares/test/ut/share_service_client_test.hpp
+++ b/sdk/storage/azure-storage-files-shares/test/ut/share_service_client_test.hpp
@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/storage/files/shares.hpp>
-
 #include "test/ut/test_base.hpp"
 
+#include <azure/storage/files/shares.hpp>
+
 namespace Azure { namespace Storage { namespace Test {
 
   class FileShareServiceClientTest : public Azure::Storage::Test::StorageTest {
diff --git a/sdk/storage/azure-storage-queues/inc/azure/storage/queues.hpp b/sdk/storage/azure-storage-queues/inc/azure/storage/queues.hpp
index 294cd425c6..7d39e1b8e6 100644
--- a/sdk/storage/azure-storage-queues/inc/azure/storage/queues.hpp
+++ b/sdk/storage/azure-storage-queues/inc/azure/storage/queues.hpp
@@ -8,8 +8,6 @@
 
 #pragma once
 
-#include <azure/storage/common/storage_exception.hpp>
-
 #include "azure/storage/queues/dll_import_export.hpp"
 #include "azure/storage/queues/queue_client.hpp"
 #include "azure/storage/queues/queue_options.hpp"
@@ -18,3 +16,5 @@
 #include "azure/storage/queues/queue_service_client.hpp"
 #include "azure/storage/queues/rest_client.hpp"
 #include "azure/storage/queues/rtti.hpp"
+
+#include <azure/storage/common/storage_exception.hpp>
diff --git a/sdk/storage/azure-storage-queues/inc/azure/storage/queues/queue_client.hpp b/sdk/storage/azure-storage-queues/inc/azure/storage/queues/queue_client.hpp
index 2670e66817..98bee74bc3 100644
--- a/sdk/storage/azure-storage-queues/inc/azure/storage/queues/queue_client.hpp
+++ b/sdk/storage/azure-storage-queues/inc/azure/storage/queues/queue_client.hpp
@@ -8,13 +8,13 @@
 
 #pragma once
 
-#include <memory>
-#include <string>
+#include "azure/storage/queues/queue_options.hpp"
 
 #include <azure/core/credentials/credentials.hpp>
 #include <azure/storage/common/storage_credential.hpp>
 
-#include "azure/storage/queues/queue_options.hpp"
+#include <memory>
+#include <string>
 
 namespace Azure { namespace Storage { namespace Queues {
 
diff --git a/sdk/storage/azure-storage-queues/inc/azure/storage/queues/queue_options.hpp b/sdk/storage/azure-storage-queues/inc/azure/storage/queues/queue_options.hpp
index bb157bb0ae..2e268d0034 100644
--- a/sdk/storage/azure-storage-queues/inc/azure/storage/queues/queue_options.hpp
+++ b/sdk/storage/azure-storage-queues/inc/azure/storage/queues/queue_options.hpp
@@ -8,13 +8,13 @@
 
 #pragma once
 
-#include <chrono>
-#include <string>
+#include "azure/storage/queues/rest_client.hpp"
 
 #include <azure/core/internal/client_options.hpp>
 #include <azure/storage/common/storage_common.hpp>
 
-#include "azure/storage/queues/rest_client.hpp"
+#include <chrono>
+#include <string>
 
 namespace Azure { namespace Storage { namespace Queues {
 
diff --git a/sdk/storage/azure-storage-queues/inc/azure/storage/queues/queue_responses.hpp b/sdk/storage/azure-storage-queues/inc/azure/storage/queues/queue_responses.hpp
index fab8f91959..25d35a22d6 100644
--- a/sdk/storage/azure-storage-queues/inc/azure/storage/queues/queue_responses.hpp
+++ b/sdk/storage/azure-storage-queues/inc/azure/storage/queues/queue_responses.hpp
@@ -8,13 +8,13 @@
 
 #pragma once
 
-#include <memory>
-#include <string>
+#include "azure/storage/queues/queue_options.hpp"
+#include "azure/storage/queues/rest_client.hpp"
 
 #include <azure/core/paged_response.hpp>
 
-#include "azure/storage/queues/queue_options.hpp"
-#include "azure/storage/queues/rest_client.hpp"
+#include <memory>
+#include <string>
 
 namespace Azure { namespace Storage { namespace Queues {
 
diff --git a/sdk/storage/azure-storage-queues/inc/azure/storage/queues/queue_sas_builder.hpp b/sdk/storage/azure-storage-queues/inc/azure/storage/queues/queue_sas_builder.hpp
index b6fcead3e3..6c4e7a98c2 100644
--- a/sdk/storage/azure-storage-queues/inc/azure/storage/queues/queue_sas_builder.hpp
+++ b/sdk/storage/azure-storage-queues/inc/azure/storage/queues/queue_sas_builder.hpp
@@ -8,13 +8,13 @@
 
 #pragma once
 
-#include <string>
-#include <type_traits>
-
 #include <azure/core/nullable.hpp>
 #include <azure/storage/common/account_sas_builder.hpp>
 #include <azure/storage/common/internal/constants.hpp>
 
+#include <string>
+#include <type_traits>
+
 namespace Azure { namespace Storage { namespace Sas {
 
   /**
diff --git a/sdk/storage/azure-storage-queues/inc/azure/storage/queues/queue_service_client.hpp b/sdk/storage/azure-storage-queues/inc/azure/storage/queues/queue_service_client.hpp
index 8c9685b3ed..c459b223bc 100644
--- a/sdk/storage/azure-storage-queues/inc/azure/storage/queues/queue_service_client.hpp
+++ b/sdk/storage/azure-storage-queues/inc/azure/storage/queues/queue_service_client.hpp
@@ -8,15 +8,15 @@
 
 #pragma once
 
-#include <memory>
-#include <string>
+#include "azure/storage/queues/queue_client.hpp"
+#include "azure/storage/queues/queue_options.hpp"
+#include "azure/storage/queues/queue_responses.hpp"
 
 #include <azure/core/credentials/credentials.hpp>
 #include <azure/storage/common/storage_credential.hpp>
 
-#include "azure/storage/queues/queue_client.hpp"
-#include "azure/storage/queues/queue_options.hpp"
-#include "azure/storage/queues/queue_responses.hpp"
+#include <memory>
+#include <string>
 
 namespace Azure { namespace Storage { namespace Queues {
 
diff --git a/sdk/storage/azure-storage-queues/inc/azure/storage/queues/rest_client.hpp b/sdk/storage/azure-storage-queues/inc/azure/storage/queues/rest_client.hpp
index c7347f8a1b..4d016f256c 100644
--- a/sdk/storage/azure-storage-queues/inc/azure/storage/queues/rest_client.hpp
+++ b/sdk/storage/azure-storage-queues/inc/azure/storage/queues/rest_client.hpp
@@ -6,12 +6,6 @@
 // Changes may cause incorrect behavior and will be lost if the code is regenerated.
 #pragma once
 
-#include <cstdint>
-#include <map>
-#include <string>
-#include <type_traits>
-#include <vector>
-
 #include <azure/core/case_insensitive_containers.hpp>
 #include <azure/core/context.hpp>
 #include <azure/core/datetime.hpp>
@@ -21,6 +15,12 @@
 #include <azure/core/url.hpp>
 #include <azure/storage/queues/dll_import_export.hpp>
 
+#include <cstdint>
+#include <map>
+#include <string>
+#include <type_traits>
+#include <vector>
+
 namespace Azure { namespace Storage { namespace Queues {
   namespace _detail {
     /**
diff --git a/sdk/storage/azure-storage-queues/samples/queue_encode_message.cpp b/sdk/storage/azure-storage-queues/samples/queue_encode_message.cpp
index b4d8904a39..3c16c2de95 100644
--- a/sdk/storage/azure-storage-queues/samples/queue_encode_message.cpp
+++ b/sdk/storage/azure-storage-queues/samples/queue_encode_message.cpp
@@ -3,14 +3,14 @@
 
 #include "get_env.hpp"
 
+#include <azure/core/base64.hpp>
+#include <azure/storage/queues.hpp>
+
 #include <cassert>
 #include <cstdio>
 #include <iostream>
 #include <stdexcept>
 
-#include <azure/core/base64.hpp>
-#include <azure/storage/queues.hpp>
-
 std::string GetConnectionString()
 {
   const static std::string ConnectionString = "";
diff --git a/sdk/storage/azure-storage-queues/samples/queue_getting_started.cpp b/sdk/storage/azure-storage-queues/samples/queue_getting_started.cpp
index d621571a73..00b8311c38 100644
--- a/sdk/storage/azure-storage-queues/samples/queue_getting_started.cpp
+++ b/sdk/storage/azure-storage-queues/samples/queue_getting_started.cpp
@@ -3,13 +3,13 @@
 
 #include "get_env.hpp"
 
+#include <azure/storage/queues.hpp>
+
 #include <cstdio>
 #include <iostream>
 #include <stdexcept>
 #include <thread>
 
-#include <azure/storage/queues.hpp>
-
 std::string GetConnectionString()
 {
   const static std::string ConnectionString = "";
diff --git a/sdk/storage/azure-storage-queues/src/queue_client.cpp b/sdk/storage/azure-storage-queues/src/queue_client.cpp
index c96c8bbcd7..3b55818480 100644
--- a/sdk/storage/azure-storage-queues/src/queue_client.cpp
+++ b/sdk/storage/azure-storage-queues/src/queue_client.cpp
@@ -3,6 +3,8 @@
 
 #include "azure/storage/queues/queue_client.hpp"
 
+#include "private/package_version.hpp"
+
 #include <azure/core/http/policies/policy.hpp>
 #include <azure/storage/common/crypt.hpp>
 #include <azure/storage/common/internal/shared_key_policy.hpp>
@@ -12,8 +14,6 @@
 #include <azure/storage/common/storage_common.hpp>
 #include <azure/storage/common/storage_exception.hpp>
 
-#include "private/package_version.hpp"
-
 namespace Azure { namespace Storage { namespace Queues {
 
   QueueClient QueueClient::CreateFromConnectionString(
diff --git a/sdk/storage/azure-storage-queues/src/queue_service_client.cpp b/sdk/storage/azure-storage-queues/src/queue_service_client.cpp
index 882aaba5ab..4ebd5a297b 100644
--- a/sdk/storage/azure-storage-queues/src/queue_service_client.cpp
+++ b/sdk/storage/azure-storage-queues/src/queue_service_client.cpp
@@ -3,6 +3,8 @@
 
 #include "azure/storage/queues/queue_service_client.hpp"
 
+#include "private/package_version.hpp"
+
 #include <azure/core/http/policies/policy.hpp>
 #include <azure/storage/common/crypt.hpp>
 #include <azure/storage/common/internal/shared_key_policy.hpp>
@@ -11,8 +13,6 @@
 #include <azure/storage/common/internal/storage_switch_to_secondary_policy.hpp>
 #include <azure/storage/common/storage_common.hpp>
 
-#include "private/package_version.hpp"
-
 namespace Azure { namespace Storage { namespace Queues {
 
   QueueServiceClient QueueServiceClient::CreateFromConnectionString(
diff --git a/sdk/storage/azure-storage-queues/src/rest_client.cpp b/sdk/storage/azure-storage-queues/src/rest_client.cpp
index 495b3fcb0c..9e2d30af8f 100644
--- a/sdk/storage/azure-storage-queues/src/rest_client.cpp
+++ b/sdk/storage/azure-storage-queues/src/rest_client.cpp
@@ -4,12 +4,6 @@
 //
 // Code generated by Microsoft (R) AutoRest C++ Code Generator.
 // Changes may cause incorrect behavior and will be lost if the code is regenerated.
-#include <azure/storage/queues/rest_client.hpp>
-
-#include <string>
-#include <unordered_map>
-#include <vector>
-
 #include <azure/core/context.hpp>
 #include <azure/core/datetime.hpp>
 #include <azure/core/http/http.hpp>
@@ -21,6 +15,11 @@
 #include <azure/storage/common/crypt.hpp>
 #include <azure/storage/common/internal/xml_wrapper.hpp>
 #include <azure/storage/common/storage_exception.hpp>
+#include <azure/storage/queues/rest_client.hpp>
+
+#include <string>
+#include <unordered_map>
+#include <vector>
 
 namespace {
 std::string ListQueuesIncludeFlagsToString(
diff --git a/sdk/storage/azure-storage-queues/test/ut/queue_client_test.hpp b/sdk/storage/azure-storage-queues/test/ut/queue_client_test.hpp
index f08cfe468b..ca89db3b59 100644
--- a/sdk/storage/azure-storage-queues/test/ut/queue_client_test.hpp
+++ b/sdk/storage/azure-storage-queues/test/ut/queue_client_test.hpp
@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/storage/queues.hpp>
-
 #include "test/ut/test_base.hpp"
 
+#include <azure/storage/queues.hpp>
+
 namespace Azure { namespace Storage { namespace Test {
 
   class QueueClientTest : public Azure::Storage::Test::StorageTest {
diff --git a/sdk/storage/azure-storage-queues/test/ut/queue_sas_test.cpp b/sdk/storage/azure-storage-queues/test/ut/queue_sas_test.cpp
index 06cfb47e34..08d329f866 100644
--- a/sdk/storage/azure-storage-queues/test/ut/queue_sas_test.cpp
+++ b/sdk/storage/azure-storage-queues/test/ut/queue_sas_test.cpp
@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/storage/queues/queue_sas_builder.hpp>
-
 #include "queue_client_test.hpp"
 
+#include <azure/storage/queues/queue_sas_builder.hpp>
+
 #include <chrono>
 
 namespace Azure { namespace Storage { namespace Test {
diff --git a/sdk/storage/azure-storage-queues/test/ut/queue_service_client_test.cpp b/sdk/storage/azure-storage-queues/test/ut/queue_service_client_test.cpp
index 1be6664b5a..68c993c39b 100644
--- a/sdk/storage/azure-storage-queues/test/ut/queue_service_client_test.cpp
+++ b/sdk/storage/azure-storage-queues/test/ut/queue_service_client_test.cpp
@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <thread>
+#include "test/ut/test_base.hpp"
 
 #include <azure/identity/client_secret_credential.hpp>
 #include <azure/storage/queues.hpp>
 
-#include "test/ut/test_base.hpp"
+#include <thread>
 
 namespace Azure { namespace Storage { namespace Queues { namespace Models {
 
diff --git a/sdk/template/azure-template/inc/azure/template/template_client.hpp b/sdk/template/azure-template/inc/azure/template/template_client.hpp
index 6ee21c0f31..651414fb26 100644
--- a/sdk/template/azure-template/inc/azure/template/template_client.hpp
+++ b/sdk/template/azure-template/inc/azure/template/template_client.hpp
@@ -5,6 +5,7 @@
 
 #include <azure/core/internal/client_options.hpp>
 #include <azure/core/internal/tracing/service_tracing.hpp>
+
 #include <string>
 
 namespace Azure { namespace Template {
diff --git a/sdk/template/azure-template/test/ut/template_test.cpp b/sdk/template/azure-template/test/ut/template_test.cpp
index 5e07d27bd0..da76c9ef8d 100644
--- a/sdk/template/azure-template/test/ut/template_test.cpp
+++ b/sdk/template/azure-template/test/ut/template_test.cpp
@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <gtest/gtest.h>
-
 #include <azure/template/template_client.hpp>
 
+#include <gtest/gtest.h>
+
 using namespace Azure::Template;
 
 TEST(Template, Basic) { TemplateClient templateClient; }