diff --git a/sdk/tables/azure-data-tables/inc/azure/data/tables/internal/policies/switch_to_secondary_policy.hpp b/sdk/tables/azure-data-tables/inc/azure/data/tables/internal/policies/switch_to_secondary_policy.hpp
index 9d33a92103..93aa7b145a 100644
--- a/sdk/tables/azure-data-tables/inc/azure/data/tables/internal/policies/switch_to_secondary_policy.hpp
+++ b/sdk/tables/azure-data-tables/inc/azure/data/tables/internal/policies/switch_to_secondary_policy.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "azure/core/dll_import_export.hpp"
+#include "azure/data/tables/dll_import_export.hpp"
 
 #include <azure/core/http/policies/policy.hpp>
 
@@ -12,7 +12,7 @@
 
 namespace Azure { namespace Data { namespace Tables { namespace _detail { namespace Policies {
 
-  AZ_CORE_DLLEXPORT extern const Azure::Core::Context::Key SecondaryHostReplicaStatusKey;
+  AZ_DATA_TABLES_DLLEXPORT extern const Azure::Core::Context::Key SecondaryHostReplicaStatusKey;
 
   inline Azure::Core::Context WithReplicaStatus(const Azure::Core::Context& context)
   {
diff --git a/sdk/tables/azure-data-tables/inc/azure/data/tables/models.hpp b/sdk/tables/azure-data-tables/inc/azure/data/tables/models.hpp
index d34ee96bdb..c077ec74e8 100644
--- a/sdk/tables/azure-data-tables/inc/azure/data/tables/models.hpp
+++ b/sdk/tables/azure-data-tables/inc/azure/data/tables/models.hpp
@@ -3,11 +3,12 @@
 
 #pragma once
 
+#include "azure/data/tables/dll_import_export.hpp"
+
 #include <azure/core/datetime.hpp>
 #include <azure/core/internal/extendable_enumeration.hpp>
 #include <azure/core/nullable.hpp>
 #include <azure/core/paged_response.hpp>
-#include <azure/data/tables/dll_import_export.hpp>
 
 #include <cstdint>
 #include <map>
diff --git a/sdk/tables/azure-data-tables/src/policies/switch_to_secondary_policy.cpp b/sdk/tables/azure-data-tables/src/policies/switch_to_secondary_policy.cpp
index d07d0f4cdb..e35eba7458 100644
--- a/sdk/tables/azure-data-tables/src/policies/switch_to_secondary_policy.cpp
+++ b/sdk/tables/azure-data-tables/src/policies/switch_to_secondary_policy.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-#include <azure/data/tables/internal/policies/switch_to_secondary_policy.hpp>
+#include "azure/data/tables/internal/policies/switch_to_secondary_policy.hpp"
 
 namespace Azure { namespace Data { namespace Tables { namespace _detail { namespace Policies {
 
diff --git a/sdk/tables/azure-data-tables/src/serializers.cpp b/sdk/tables/azure-data-tables/src/serializers.cpp
index e9df8bcae9..533ec50276 100644
--- a/sdk/tables/azure-data-tables/src/serializers.cpp
+++ b/sdk/tables/azure-data-tables/src/serializers.cpp
@@ -1,8 +1,9 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+#include "azure/data/tables/internal/serializers.hpp"
+
 #include <azure/core/internal/json/json.hpp>
-#include <azure/data/tables/internal/serializers.hpp>
 
 using namespace Azure::Data::Tables::_detail::Xml;
 using namespace Azure::Data::Tables;
diff --git a/sdk/tables/azure-data-tables/src/tables_clients.cpp b/sdk/tables/azure-data-tables/src/tables_clients.cpp
index b4a2aaf762..78693cd7bd 100644
--- a/sdk/tables/azure-data-tables/src/tables_clients.cpp
+++ b/sdk/tables/azure-data-tables/src/tables_clients.cpp
@@ -1,14 +1,15 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-#include <azure/data/tables/internal/policies/service_version_policy.hpp>
-#include <azure/data/tables/internal/policies/shared_key_lite_policy.hpp>
-#include <azure/data/tables/internal/policies/shared_key_policy.hpp>
-#include <azure/data/tables/internal/policies/switch_to_secondary_policy.hpp>
-#include <azure/data/tables/internal/policies/tenant_bearer_token_policy.hpp>
-#include <azure/data/tables/internal/policies/timeout_policy.hpp>
-#include <azure/data/tables/internal/serializers.hpp>
-#include <azure/data/tables/tables_clients.hpp>
+#include "azure/data/tables/tables_clients.hpp"
+
+#include "azure/data/tables/internal/policies/service_version_policy.hpp"
+#include "azure/data/tables/internal/policies/shared_key_lite_policy.hpp"
+#include "azure/data/tables/internal/policies/shared_key_policy.hpp"
+#include "azure/data/tables/internal/policies/switch_to_secondary_policy.hpp"
+#include "azure/data/tables/internal/policies/tenant_bearer_token_policy.hpp"
+#include "azure/data/tables/internal/policies/timeout_policy.hpp"
+#include "azure/data/tables/internal/serializers.hpp"
 
 #include <sstream>
 #include <string>
diff --git a/sdk/tables/azure-data-tables/src/transactions.cpp b/sdk/tables/azure-data-tables/src/transactions.cpp
index 81cd27bc81..d7de54812a 100644
--- a/sdk/tables/azure-data-tables/src/transactions.cpp
+++ b/sdk/tables/azure-data-tables/src/transactions.cpp
@@ -1,8 +1,9 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-#include <azure/data/tables/internal/serializers.hpp>
-#include <azure/data/tables/transactions.hpp>
+#include "azure/data/tables/transactions.hpp"
+
+#include "azure/data/tables/internal/serializers.hpp"
 
 using namespace Azure::Data::Tables;
 using namespace Azure::Data::Tables::_detail;