diff --git a/sdk/core/azure-core/inc/azure/core/credentials.hpp b/sdk/core/azure-core/inc/azure/core/credentials.hpp
index 57d0b06e9..aafa47fae 100644
--- a/sdk/core/azure-core/inc/azure/core/credentials.hpp
+++ b/sdk/core/azure-core/inc/azure/core/credentials.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <azure/core/context.hpp>
+#include "azure/core/context.hpp"
 
 #include <chrono>
 #include <memory>
diff --git a/sdk/core/azure-core/inc/azure/core/http/body_stream.hpp b/sdk/core/azure-core/inc/azure/core/http/body_stream.hpp
index 90af9a3db..eaf12b311 100644
--- a/sdk/core/azure-core/inc/azure/core/http/body_stream.hpp
+++ b/sdk/core/azure-core/inc/azure/core/http/body_stream.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <azure/core/platform.hpp>
+#include "azure/core/platform.hpp"
 
 #ifdef AZ_PLATFORM_POSIX
 #include <unistd.h>
diff --git a/sdk/core/azure-core/inc/azure/core/http/policy.hpp b/sdk/core/azure-core/inc/azure/core/http/policy.hpp
index 794e3efee..d70357a5e 100644
--- a/sdk/core/azure-core/inc/azure/core/http/policy.hpp
+++ b/sdk/core/azure-core/inc/azure/core/http/policy.hpp
@@ -16,7 +16,7 @@
 #include "azure/core/uuid.hpp"
 
 #include "azure/core/http/curl/curl.hpp"
-#include <azure/core/http/winhttp/win_http_client.hpp>
+#include "azure/core/http/winhttp/win_http_client.hpp"
 
 #include <chrono>
 #include <utility>
diff --git a/sdk/core/azure-core/src/datetime.cpp b/sdk/core/azure-core/src/datetime.cpp
index 57108470f..0e2d8aa8f 100644
--- a/sdk/core/azure-core/src/datetime.cpp
+++ b/sdk/core/azure-core/src/datetime.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 
 #include "azure/core/datetime.hpp"
-#include <azure/core/platform.hpp>
+#include "azure/core/platform.hpp"
 
 #include <cstdio>
 #include <cstring>
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 30be96a2c..c0badc933 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,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/core/http/policy.hpp>
+#include "azure/core/http/policy.hpp"
 
 using Azure::Core::Context;
 using namespace Azure::Core::Http;
diff --git a/sdk/core/azure-core/src/http/body_stream.cpp b/sdk/core/azure-core/src/http/body_stream.cpp
index a5226e9d0..e25d5c76c 100644
--- a/sdk/core/azure-core/src/http/body_stream.cpp
+++ b/sdk/core/azure-core/src/http/body_stream.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/core/platform.hpp>
+#include "azure/core/platform.hpp"
 
 #ifdef AZ_PLATFORM_POSIX
 #include <errno.h>
diff --git a/sdk/core/azure-core/src/http/curl/curl.cpp b/sdk/core/azure-core/src/http/curl/curl.cpp
index 9ff74dfb2..51da34960 100644
--- a/sdk/core/azure-core/src/http/curl/curl.cpp
+++ b/sdk/core/azure-core/src/http/curl/curl.cpp
@@ -6,7 +6,7 @@
 #include "azure/core/http/policy.hpp"
 #include "azure/core/http/transport.hpp"
 #include "azure/core/internal/log.hpp"
-#include <azure/core/platform.hpp>
+#include "azure/core/platform.hpp"
 
 // Private incude
 #include "curl_connection_pool_private.hpp"
diff --git a/sdk/core/azure-core/src/http/telemetry_policy.cpp b/sdk/core/azure-core/src/http/telemetry_policy.cpp
index 0ee7e22d3..6be8b25aa 100644
--- a/sdk/core/azure-core/src/http/telemetry_policy.cpp
+++ b/sdk/core/azure-core/src/http/telemetry_policy.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 
 #include "azure/core/http/policy.hpp"
-#include <azure/core/platform.hpp>
+#include "azure/core/platform.hpp"
 
 #include <cctype>
 #include <sstream>
diff --git a/sdk/core/azure-core/test/ut/context.cpp b/sdk/core/azure-core/test/ut/context.cpp
index 90b061a70..0d53ae374 100644
--- a/sdk/core/azure-core/test/ut/context.cpp
+++ b/sdk/core/azure-core/test/ut/context.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 
 #include <azure/core/context.hpp>
 
diff --git a/sdk/core/azure-core/test/ut/curl_options.cpp b/sdk/core/azure-core/test/ut/curl_options.cpp
index 80c39d530..64f81a388 100644
--- a/sdk/core/azure-core/test/ut/curl_options.cpp
+++ b/sdk/core/azure-core/test/ut/curl_options.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 
 #include <azure/core/context.hpp>
 #include <azure/core/http/http.hpp>
diff --git a/sdk/core/azure-core/test/ut/datetime.cpp b/sdk/core/azure-core/test/ut/datetime.cpp
index 8367300fe..82f01bd41 100644
--- a/sdk/core/azure-core/test/ut/datetime.cpp
+++ b/sdk/core/azure-core/test/ut/datetime.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 
 #include <azure/core/datetime.hpp>
 
diff --git a/sdk/core/azure-core/test/ut/http.cpp b/sdk/core/azure-core/test/ut/http.cpp
index 9cf2dd565..5efc53081 100644
--- a/sdk/core/azure-core/test/ut/http.cpp
+++ b/sdk/core/azure-core/test/ut/http.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 
 #include "http.hpp"
 #include <azure/core/http/http.hpp>
diff --git a/sdk/core/azure-core/test/ut/http.hpp b/sdk/core/azure-core/test/ut/http.hpp
index 98f1ce5f9..0772748ce 100644
--- a/sdk/core/azure-core/test/ut/http.hpp
+++ b/sdk/core/azure-core/test/ut/http.hpp
@@ -7,7 +7,7 @@
  *
  */
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 
 #include <azure/core/http/http.hpp>
 
diff --git a/sdk/core/azure-core/test/ut/json.cpp b/sdk/core/azure-core/test/ut/json.cpp
index 8656066ac..fe2216925 100644
--- a/sdk/core/azure-core/test/ut/json.cpp
+++ b/sdk/core/azure-core/test/ut/json.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
diff --git a/sdk/core/azure-core/test/ut/logging.cpp b/sdk/core/azure-core/test/ut/logging.cpp
index a2dc16f2b..61e532c6b 100644
--- a/sdk/core/azure-core/test/ut/logging.cpp
+++ b/sdk/core/azure-core/test/ut/logging.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include <azure/core/http/pipeline.hpp>
 #include <azure/core/internal/log.hpp>
 #include <azure/core/logging/logging.hpp>
diff --git a/sdk/core/azure-core/test/ut/main.cpp b/sdk/core/azure-core/test/ut/main.cpp
index d63ef744b..79661728f 100644
--- a/sdk/core/azure-core/test/ut/main.cpp
+++ b/sdk/core/azure-core/test/ut/main.cpp
@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "gtest/gtest.h"
-#include "curl/curl.h"
+#include <gtest/gtest.h>
+#include <curl/curl.h>
 
 int main(int argc, char** argv)
 {
diff --git a/sdk/core/azure-core/test/ut/nullable.cpp b/sdk/core/azure-core/test/ut/nullable.cpp
index 8db42bae5..739c7d9f8 100644
--- a/sdk/core/azure-core/test/ut/nullable.cpp
+++ b/sdk/core/azure-core/test/ut/nullable.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include <azure/core/nullable.hpp>
 #include <string>
 #include <vector>
diff --git a/sdk/core/azure-core/test/ut/pipeline.cpp b/sdk/core/azure-core/test/ut/pipeline.cpp
index 9ae0be292..2018c08b1 100644
--- a/sdk/core/azure-core/test/ut/pipeline.cpp
+++ b/sdk/core/azure-core/test/ut/pipeline.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include <azure/core/http/pipeline.hpp>
 #include <azure/core/http/policy.hpp>
 
diff --git a/sdk/core/azure-core/test/ut/policy.cpp b/sdk/core/azure-core/test/ut/policy.cpp
index d993eb039..4855f6da2 100644
--- a/sdk/core/azure-core/test/ut/policy.cpp
+++ b/sdk/core/azure-core/test/ut/policy.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include <azure/core/http/pipeline.hpp>
 #include <azure/core/http/policy.hpp>
 
diff --git a/sdk/core/azure-core/test/ut/simplified_header.cpp b/sdk/core/azure-core/test/ut/simplified_header.cpp
index 9faf21a73..733594442 100644
--- a/sdk/core/azure-core/test/ut/simplified_header.cpp
+++ b/sdk/core/azure-core/test/ut/simplified_header.cpp
@@ -8,7 +8,7 @@
  *
  */
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include <azure/core.hpp>
 
 #include <vector>
diff --git a/sdk/core/azure-core/test/ut/string.cpp b/sdk/core/azure-core/test/ut/string.cpp
index 8e0e8d9ae..d15f44fe2 100644
--- a/sdk/core/azure-core/test/ut/string.cpp
+++ b/sdk/core/azure-core/test/ut/string.cpp
@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "azure/core/strings.hpp"
-#include "gtest/gtest.h"
+#include <azure/core/strings.hpp>
+#include <gtest/gtest.h>
 #include <string>
 
 TEST(String, invariantCompare)
diff --git a/sdk/core/azure-core/test/ut/telemetry_policy.cpp b/sdk/core/azure-core/test/ut/telemetry_policy.cpp
index 3c61bc047..7aa11ba0a 100644
--- a/sdk/core/azure-core/test/ut/telemetry_policy.cpp
+++ b/sdk/core/azure-core/test/ut/telemetry_policy.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include <azure/core/http/pipeline.hpp>
 #include <azure/core/http/policy.hpp>
 
diff --git a/sdk/core/azure-core/test/ut/transport_adapter_base.hpp b/sdk/core/azure-core/test/ut/transport_adapter_base.hpp
index fee402f1b..a4efa7848 100644
--- a/sdk/core/azure-core/test/ut/transport_adapter_base.hpp
+++ b/sdk/core/azure-core/test/ut/transport_adapter_base.hpp
@@ -9,7 +9,7 @@
  *
  */
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include <azure/core/http/body_stream.hpp>
 #include <azure/core/http/http.hpp>
 #include <azure/core/http/pipeline.hpp>
diff --git a/sdk/core/azure-core/test/ut/url.cpp b/sdk/core/azure-core/test/ut/url.cpp
index ebc188725..c7e4025a0 100644
--- a/sdk/core/azure-core/test/ut/url.cpp
+++ b/sdk/core/azure-core/test/ut/url.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 
 #include <azure/core/http/http.hpp>
 
diff --git a/sdk/core/azure-core/test/ut/uuid.cpp b/sdk/core/azure-core/test/ut/uuid.cpp
index 74a4f7139..63ac40887 100644
--- a/sdk/core/azure-core/test/ut/uuid.cpp
+++ b/sdk/core/azure-core/test/ut/uuid.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include <azure/core/uuid.hpp>
 #include <string>
 #include <set>
diff --git a/sdk/storage/azure-storage-common/src/xml_wrapper.cpp b/sdk/storage/azure-storage-common/src/xml_wrapper.cpp
index 95ac0588f..0049bccde 100644
--- a/sdk/storage/azure-storage-common/src/xml_wrapper.cpp
+++ b/sdk/storage/azure-storage-common/src/xml_wrapper.cpp
@@ -3,8 +3,8 @@
 
 #include "azure/storage/common/xml_wrapper.hpp"
 
-#include "libxml/xmlreader.h"
-#include "libxml/xmlwriter.h"
+#include <libxml/xmlreader.h>
+#include <libxml/xmlwriter.h>
 
 #include <limits>
 #include <stdexcept>
diff --git a/sdk/template/azure-template/test/ut/template_test.cpp b/sdk/template/azure-template/test/ut/template_test.cpp
index cd013cc2c..53918116f 100644
--- a/sdk/template/azure-template/test/ut/template_test.cpp
+++ b/sdk/template/azure-template/test/ut/template_test.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 
 #include <azure/template/template_client.hpp>