diff --git a/sdk/tables/azure-data-tables/inc/azure/data/tables/internal/cryptography/hmacsha256.hpp b/sdk/tables/azure-data-tables/inc/azure/data/tables/internal/cryptography/hmacsha256.hpp
index 7a821d0ec4..e6e3fe5097 100644
--- a/sdk/tables/azure-data-tables/inc/azure/data/tables/internal/cryptography/hmacsha256.hpp
+++ b/sdk/tables/azure-data-tables/inc/azure/data/tables/internal/cryptography/hmacsha256.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "azure/core/azure_assert.hpp"
+#include <azure/core/azure_assert.hpp>
 
 #include <memory>
 #include <stdexcept>
diff --git a/sdk/tables/azure-data-tables/inc/azure/data/tables/internal/serializers.hpp b/sdk/tables/azure-data-tables/inc/azure/data/tables/internal/serializers.hpp
index f8fbecc6da..0998a1959c 100644
--- a/sdk/tables/azure-data-tables/inc/azure/data/tables/internal/serializers.hpp
+++ b/sdk/tables/azure-data-tables/inc/azure/data/tables/internal/serializers.hpp
@@ -2,8 +2,8 @@
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 #pragma once
-#include <azure/data/tables/internal/xml_wrapper.hpp>
-#include <azure/data/tables/models.hpp>
+#include "azure/data/tables/internal/xml_wrapper.hpp"
+#include "azure/data/tables/models.hpp"
 
 #include <cstdint>
 #include <memory>
diff --git a/sdk/tables/azure-data-tables/inc/azure/data/tables/tables_clients.hpp b/sdk/tables/azure-data-tables/inc/azure/data/tables/tables_clients.hpp
index b556f1a7d5..0a31d0002a 100644
--- a/sdk/tables/azure-data-tables/inc/azure/data/tables/tables_clients.hpp
+++ b/sdk/tables/azure-data-tables/inc/azure/data/tables/tables_clients.hpp
@@ -3,15 +3,16 @@
 
 #pragma once
 
+#include "azure/data/tables/credentials/shared_key_credential.hpp"
+#include "azure/data/tables/models.hpp"
+#include "azure/data/tables/transactions.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/core/internal/json/json.hpp>
 #include <azure/core/response.hpp>
-#include <azure/data/tables/credentials/shared_key_credential.hpp>
-#include <azure/data/tables/models.hpp>
-#include <azure/data/tables/transactions.hpp>
 
 #include <cstdint>
 #include <memory>
diff --git a/sdk/tables/azure-data-tables/inc/azure/data/tables/transactions.hpp b/sdk/tables/azure-data-tables/inc/azure/data/tables/transactions.hpp
index 3a4f2e4b08..22b546c63c 100644
--- a/sdk/tables/azure-data-tables/inc/azure/data/tables/transactions.hpp
+++ b/sdk/tables/azure-data-tables/inc/azure/data/tables/transactions.hpp
@@ -3,9 +3,10 @@
 
 #pragma once
 
+#include "azure/data/tables/models.hpp"
+
 #include <azure/core/url.hpp>
 #include <azure/core/uuid.hpp>
-#include <azure/data/tables/models.hpp>
 
 namespace Azure { namespace Data { namespace Tables {
   /**
diff --git a/sdk/tables/azure-data-tables/test/stress/tables_stress_test.cpp b/sdk/tables/azure-data-tables/test/stress/tables_stress_test.cpp
index fba9b2d0dd..d89716adf7 100644
--- a/sdk/tables/azure-data-tables/test/stress/tables_stress_test.cpp
+++ b/sdk/tables/azure-data-tables/test/stress/tables_stress_test.cpp
@@ -14,7 +14,7 @@
 #define WARMUP 100
 #define ROUNDS 1000
 
-#include <azure/data/tables.hpp>
+#include "azure/data/tables.hpp"
 
 #include <iostream>
 
diff --git a/sdk/tables/azure-data-tables/test/ut/macro_guard.cpp b/sdk/tables/azure-data-tables/test/ut/macro_guard.cpp
index 5b3f0aa623..da9c24daf2 100644
--- a/sdk/tables/azure-data-tables/test/ut/macro_guard.cpp
+++ b/sdk/tables/azure-data-tables/test/ut/macro_guard.cpp
@@ -12,4 +12,4 @@
 #define max(x, y) small
 #define min(x, y) small
 
-#include <azure/data/tables.hpp>
+#include "azure/data/tables.hpp"
diff --git a/sdk/tables/azure-data-tables/test/ut/serializers_test.hpp b/sdk/tables/azure-data-tables/test/ut/serializers_test.hpp
index 115f8c2538..a21c9a8585 100644
--- a/sdk/tables/azure-data-tables/test/ut/serializers_test.hpp
+++ b/sdk/tables/azure-data-tables/test/ut/serializers_test.hpp
@@ -2,11 +2,10 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+#include "azure/data/tables/internal/serializers.hpp"
+#include "azure/data/tables/tables_clients.hpp"
 #include "test/ut/test_base.hpp"
 
-#include <azure/data/tables/internal/serializers.hpp>
-#include <azure/data/tables/tables_clients.hpp>
-
 namespace Azure { namespace Data { namespace Test {
 
   class SerializersTest : public Azure::Storage::Test::StorageTest {
diff --git a/sdk/tables/azure-data-tables/test/ut/table_client_test.hpp b/sdk/tables/azure-data-tables/test/ut/table_client_test.hpp
index e8bee67e70..616115d836 100644
--- a/sdk/tables/azure-data-tables/test/ut/table_client_test.hpp
+++ b/sdk/tables/azure-data-tables/test/ut/table_client_test.hpp
@@ -2,12 +2,11 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+#include "azure/data/tables/models.hpp"
+#include "azure/data/tables/tables_clients.hpp"
+#include "azure/data/tables/transactions.hpp"
 #include "test/ut/test_base.hpp"
 
-#include <azure/data/tables/models.hpp>
-#include <azure/data/tables/tables_clients.hpp>
-#include <azure/data/tables/transactions.hpp>
-
 namespace Azure { namespace Data { namespace Test {
   enum class AuthType
   {
diff --git a/sdk/tables/azure-data-tables/test/ut/transactions_test.hpp b/sdk/tables/azure-data-tables/test/ut/transactions_test.hpp
index 09404d291e..8a99fa7fcc 100644
--- a/sdk/tables/azure-data-tables/test/ut/transactions_test.hpp
+++ b/sdk/tables/azure-data-tables/test/ut/transactions_test.hpp
@@ -2,11 +2,10 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+#include "azure/data/tables/tables_clients.hpp"
+#include "azure/data/tables/transactions.hpp"
 #include "test/ut/test_base.hpp"
 
-#include <azure/data/tables/tables_clients.hpp>
-#include <azure/data/tables/transactions.hpp>
-
 namespace Azure { namespace Data { namespace Test {
 
   class TransactionsBodyTest : public Azure::Storage::Test::StorageTest {