diff --git a/sdk/keyvault/azure-security-keyvault-common/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-common/CMakeLists.txt
index 8f2f19488..538488924 100644
--- a/sdk/keyvault/azure-security-keyvault-common/CMakeLists.txt
+++ b/sdk/keyvault/azure-security-keyvault-common/CMakeLists.txt
@@ -32,13 +32,13 @@ set(
     inc/azure/keyvault/common/internal/keyvault_pipeline.hpp
     inc/azure/keyvault/common/internal/single_page.hpp
     inc/azure/keyvault/common/internal/unix_time_helper.hpp
-    inc/azure/keyvault/common/keyvault_constants.hpp
-    inc/azure/keyvault/common/keyvault_exception.hpp
+    inc/azure/keyvault/common/internal/keyvault_exception.hpp
     inc/azure/keyvault/common/sha.hpp
 )
 
 set(
   AZURE_KEYVAULT_COMMON_SOURCE
+    src/private/keyvault_constants.hpp
     src/private/package_version.hpp
     src/keyvault_exception.cpp
     src/keyvault_pipeline.cpp
diff --git a/sdk/keyvault/azure-security-keyvault-common/inc/azure/keyvault/common/keyvault_exception.hpp b/sdk/keyvault/azure-security-keyvault-common/inc/azure/keyvault/common/internal/keyvault_exception.hpp
similarity index 92%
rename from sdk/keyvault/azure-security-keyvault-common/inc/azure/keyvault/common/keyvault_exception.hpp
rename to sdk/keyvault/azure-security-keyvault-common/inc/azure/keyvault/common/internal/keyvault_exception.hpp
index e9a450d0e..2b3988611 100644
--- a/sdk/keyvault/azure-security-keyvault-common/inc/azure/keyvault/common/keyvault_exception.hpp
+++ b/sdk/keyvault/azure-security-keyvault-common/inc/azure/keyvault/common/internal/keyvault_exception.hpp
@@ -15,7 +15,7 @@
 #include <stdexcept>
 #include <string>
 
-namespace Azure { namespace Security { namespace KeyVault { namespace _detail {
+namespace Azure { namespace Security { namespace KeyVault { namespace _internal {
   /**
    * @brief Container for static methods to parse Key Vault payloads to Azure Core Exception.
    *
@@ -31,4 +31,4 @@ namespace Azure { namespace Security { namespace KeyVault { namespace _detail {
     static Azure::Core::RequestFailedException CreateException(
         std::unique_ptr<Azure::Core::Http::RawResponse> rawResponse);
   };
-}}}} // namespace Azure::Security::KeyVault::_detail
+}}}} // namespace Azure::Security::KeyVault::_internal
diff --git a/sdk/keyvault/azure-security-keyvault-common/src/keyvault_exception.cpp b/sdk/keyvault/azure-security-keyvault-common/src/keyvault_exception.cpp
index 5941452ab..a668bb10b 100644
--- a/sdk/keyvault/azure-security-keyvault-common/src/keyvault_exception.cpp
+++ b/sdk/keyvault/azure-security-keyvault-common/src/keyvault_exception.cpp
@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "azure/keyvault/common/keyvault_exception.hpp"
-#include "azure/keyvault/common/keyvault_constants.hpp"
+#include "azure/keyvault/common/internal/keyvault_exception.hpp"
+#include "private/keyvault_constants.hpp"
 
 #include <azure/core/http/policies/policy.hpp>
 
@@ -12,7 +12,7 @@
 using namespace Azure::Security::KeyVault;
 using namespace Azure::Core::Http::_internal;
 
-Azure::Core::RequestFailedException _detail::KeyVaultException::CreateException(
+Azure::Core::RequestFailedException _internal::KeyVaultException::CreateException(
     std::unique_ptr<Azure::Core::Http::RawResponse> rawResponse)
 {
   std::vector<uint8_t> bodyBuffer = std::move(rawResponse->GetBody());
diff --git a/sdk/keyvault/azure-security-keyvault-common/src/keyvault_pipeline.cpp b/sdk/keyvault/azure-security-keyvault-common/src/keyvault_pipeline.cpp
index 93a9bf9b3..c28f91aa5 100644
--- a/sdk/keyvault/azure-security-keyvault-common/src/keyvault_pipeline.cpp
+++ b/sdk/keyvault/azure-security-keyvault-common/src/keyvault_pipeline.cpp
@@ -3,9 +3,9 @@
 
 #include <azure/core/http/http.hpp>
 
+#include "azure/keyvault/common/internal/keyvault_exception.hpp"
 #include "azure/keyvault/common/internal/keyvault_pipeline.hpp"
-#include "azure/keyvault/common/keyvault_constants.hpp"
-#include "azure/keyvault/common/keyvault_exception.hpp"
+#include "private/keyvault_constants.hpp"
 
 using namespace Azure::Security::KeyVault;
 using namespace Azure::Core::Http::_internal;
@@ -70,7 +70,7 @@ std::unique_ptr<Azure::Core::Http::RawResponse> _internal::KeyVaultPipeline::Sen
     case Azure::Core::Http::HttpStatusCode::NoContent:
       break;
     default:
-      throw Azure::Security::KeyVault::_detail::KeyVaultException::CreateException(
+      throw Azure::Security::KeyVault::_internal::KeyVaultException::CreateException(
           std::move(response));
   }
   return response;
diff --git a/sdk/keyvault/azure-security-keyvault-common/inc/azure/keyvault/common/keyvault_constants.hpp b/sdk/keyvault/azure-security-keyvault-common/src/private/keyvault_constants.hpp
similarity index 100%
rename from sdk/keyvault/azure-security-keyvault-common/inc/azure/keyvault/common/keyvault_constants.hpp
rename to sdk/keyvault/azure-security-keyvault-common/src/private/keyvault_constants.hpp
diff --git a/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt
index 5a45b2dfb..b35b1e660 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt
+++ b/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt
@@ -30,31 +30,24 @@ set(
   AZURE_KEYVAULT_KEYS_HEADER
     inc/azure/keyvault/keys/cryptography/cryptography_client_options.hpp
     inc/azure/keyvault/keys/cryptography/cryptography_client.hpp
-    inc/azure/keyvault/keys/cryptography/cryptography_provider.hpp
-    inc/azure/keyvault/keys/cryptography/cryptography_serializers.hpp
     inc/azure/keyvault/keys/cryptography/decrypt_parameters.hpp
     inc/azure/keyvault/keys/cryptography/decrypt_result.hpp
     inc/azure/keyvault/keys/cryptography/encrypt_parameters.hpp
     inc/azure/keyvault/keys/cryptography/encrypt_result.hpp
     inc/azure/keyvault/keys/cryptography/encryption_algorithm.hpp
-    inc/azure/keyvault/keys/cryptography/key_sign_parameters.hpp
-    inc/azure/keyvault/keys/cryptography/key_verify_parameters.hpp
     inc/azure/keyvault/keys/cryptography/key_wrap_algorithm.hpp
-    inc/azure/keyvault/keys/cryptography/key_wrap_parameters.hpp
-    inc/azure/keyvault/keys/cryptography/local_cryptography_provider_factory.hpp
-    inc/azure/keyvault/keys/cryptography/local_cryptography_provider.hpp
-    inc/azure/keyvault/keys/cryptography/remote_cryptography_client.hpp
-    inc/azure/keyvault/keys/cryptography/rsa_cryptography_provider.hpp
     inc/azure/keyvault/keys/cryptography/sign_result.hpp
     inc/azure/keyvault/keys/cryptography/signature_algorithm.hpp
     inc/azure/keyvault/keys/cryptography/wrap_result.hpp
     inc/azure/keyvault/keys/cryptography/unwrap_result.hpp
     inc/azure/keyvault/keys/cryptography/verify_result.hpp
+    inc/azure/keyvault/keys/internal/cryptography/cryptography_provider.hpp
+    inc/azure/keyvault/keys/internal/cryptography/local_cryptography_provider_factory.hpp
+    inc/azure/keyvault/keys/internal/cryptography/local_cryptography_provider.hpp
+    inc/azure/keyvault/keys/internal/cryptography/remote_cryptography_client.hpp
+    inc/azure/keyvault/keys/internal/cryptography/rsa_cryptography_provider.hpp
     inc/azure/keyvault/keys/delete_key_operation.hpp
     inc/azure/keyvault/keys/deleted_key.hpp
-    inc/azure/keyvault/keys/details/key_backup.hpp
-    inc/azure/keyvault/keys/details/key_constants.hpp
-    inc/azure/keyvault/keys/details/key_request_parameters.hpp
     inc/azure/keyvault/keys/import_key_options.hpp
     inc/azure/keyvault/keys/json_web_key.hpp
     inc/azure/keyvault/keys/key_client.hpp
@@ -89,6 +82,14 @@ set(
     src/cryptography/wrap_result.cpp
     src/cryptography/unwrap_result.cpp
     src/cryptography/verify_result.cpp
+    src/private/cryptography_serializers.hpp
+    src/private/key_backup.hpp
+    src/private/key_constants.hpp
+    src/private/key_request_parameters.hpp
+    src/private/key_serializers.hpp
+    src/private/key_sign_parameters.hpp
+    src/private/key_verify_parameters.hpp
+    src/private/key_wrap_parameters.hpp
     src/private/package_version.hpp
     src/delete_key_operation.cpp
     src/deleted_key.cpp
diff --git a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/cryptography/cryptography_client.hpp b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/cryptography/cryptography_client.hpp
index a9d4f1aa9..18f42b8fe 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/cryptography/cryptography_client.hpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/cryptography/cryptography_client.hpp
@@ -14,12 +14,12 @@
 #include <azure/core/io/body_stream.hpp>
 
 #include "azure/keyvault/keys/cryptography/cryptography_client_options.hpp"
-#include "azure/keyvault/keys/cryptography/cryptography_provider.hpp"
 #include "azure/keyvault/keys/cryptography/encrypt_parameters.hpp"
 #include "azure/keyvault/keys/cryptography/encrypt_result.hpp"
-#include "azure/keyvault/keys/cryptography/remote_cryptography_client.hpp"
 #include "azure/keyvault/keys/cryptography/sign_result.hpp"
 #include "azure/keyvault/keys/cryptography/wrap_result.hpp"
+#include "azure/keyvault/keys/internal/cryptography/cryptography_provider.hpp"
+#include "azure/keyvault/keys/internal/cryptography/remote_cryptography_client.hpp"
 
 #include <memory>
 #include <string>
diff --git a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/cryptography/cryptography_provider.hpp b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/internal/cryptography/cryptography_provider.hpp
similarity index 100%
rename from sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/cryptography/cryptography_provider.hpp
rename to sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/internal/cryptography/cryptography_provider.hpp
diff --git a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/cryptography/local_cryptography_provider.hpp b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/internal/cryptography/local_cryptography_provider.hpp
similarity index 94%
rename from sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/cryptography/local_cryptography_provider.hpp
rename to sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/internal/cryptography/local_cryptography_provider.hpp
index 2387c621c..d056256f2 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/cryptography/local_cryptography_provider.hpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/internal/cryptography/local_cryptography_provider.hpp
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "azure/keyvault/keys/cryptography/cryptography_provider.hpp"
+#include "azure/keyvault/keys/internal/cryptography/cryptography_provider.hpp"
 #include "azure/keyvault/keys/key_vault_key.hpp"
 
 #include <memory>
diff --git a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/cryptography/local_cryptography_provider_factory.hpp b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/internal/cryptography/local_cryptography_provider_factory.hpp
similarity index 89%
rename from sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/cryptography/local_cryptography_provider_factory.hpp
rename to sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/internal/cryptography/local_cryptography_provider_factory.hpp
index 5f0765ce8..d07cec220 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/cryptography/local_cryptography_provider_factory.hpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/internal/cryptography/local_cryptography_provider_factory.hpp
@@ -9,8 +9,8 @@
 
 #pragma once
 
-#include "azure/keyvault/keys/cryptography/cryptography_provider.hpp"
-#include "azure/keyvault/keys/cryptography/rsa_cryptography_provider.hpp"
+#include "azure/keyvault/keys/internal/cryptography/cryptography_provider.hpp"
+#include "azure/keyvault/keys/internal/cryptography/rsa_cryptography_provider.hpp"
 #include "azure/keyvault/keys/key_vault_key.hpp"
 
 #include <memory>
diff --git a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/cryptography/remote_cryptography_client.hpp b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/internal/cryptography/remote_cryptography_client.hpp
similarity index 98%
rename from sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/cryptography/remote_cryptography_client.hpp
rename to sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/internal/cryptography/remote_cryptography_client.hpp
index 11b06bfdc..a7a4b2934 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/cryptography/remote_cryptography_client.hpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/internal/cryptography/remote_cryptography_client.hpp
@@ -15,9 +15,9 @@
 #include <azure/keyvault/common/internal/keyvault_pipeline.hpp>
 
 #include "azure/keyvault/keys/cryptography/cryptography_client_options.hpp"
-#include "azure/keyvault/keys/cryptography/cryptography_provider.hpp"
 #include "azure/keyvault/keys/cryptography/encrypt_parameters.hpp"
 #include "azure/keyvault/keys/cryptography/encrypt_result.hpp"
+#include "azure/keyvault/keys/internal/cryptography/cryptography_provider.hpp"
 #include "azure/keyvault/keys/key_vault_key.hpp"
 
 #include <memory>
diff --git a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/cryptography/rsa_cryptography_provider.hpp b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/internal/cryptography/rsa_cryptography_provider.hpp
similarity index 96%
rename from sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/cryptography/rsa_cryptography_provider.hpp
rename to sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/internal/cryptography/rsa_cryptography_provider.hpp
index 5547bfc2f..50662091e 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/cryptography/rsa_cryptography_provider.hpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/internal/cryptography/rsa_cryptography_provider.hpp
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "azure/keyvault/keys/cryptography/local_cryptography_provider.hpp"
+#include "azure/keyvault/keys/internal/cryptography/local_cryptography_provider.hpp"
 
 #include <memory>
 #include <string>
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 81589edd1..2976a36ca 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
@@ -9,7 +9,7 @@
 #include <azure/core/http/policies/policy.hpp>
 
 #include "azure/keyvault/keys/cryptography/cryptography_client.hpp"
-#include "azure/keyvault/keys/cryptography/local_cryptography_provider_factory.hpp"
+#include "azure/keyvault/keys/internal/cryptography/local_cryptography_provider_factory.hpp"
 #include "azure/keyvault/keys/key_operation.hpp"
 
 #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 abe1a46cc..0c4c3405b 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
@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: MIT
 
 #include "azure/keyvault/keys/cryptography/decrypt_parameters.hpp"
-#include "azure/keyvault/keys/cryptography/cryptography_serializers.hpp"
-#include "azure/keyvault/keys/details/key_constants.hpp"
+#include "../private/cryptography_serializers.hpp"
+#include "../private/key_constants.hpp"
 
 #include <azure/keyvault/common/internal/base64url.hpp>
 
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 70b604cd7..77f7d1abc 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
@@ -3,9 +3,9 @@
 
 #include <azure/core/internal/json/json.hpp>
 
-#include "azure/keyvault/keys/cryptography/cryptography_serializers.hpp"
+#include "../private/cryptography_serializers.hpp"
+#include "../private/key_constants.hpp"
 #include "azure/keyvault/keys/cryptography/decrypt_result.hpp"
-#include "azure/keyvault/keys/details/key_constants.hpp"
 
 #include <azure/keyvault/common/internal/base64url.hpp>
 
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 bc6e30dd9..827352d8c 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
@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: MIT
 
 #include "azure/keyvault/keys/cryptography/encrypt_parameters.hpp"
-#include "azure/keyvault/keys/cryptography/cryptography_serializers.hpp"
-#include "azure/keyvault/keys/details/key_constants.hpp"
+#include "../private/cryptography_serializers.hpp"
+#include "../private/key_constants.hpp"
 
 #include <azure/keyvault/common/internal/base64url.hpp>
 
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 78be7f7c5..34cfc80aa 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
@@ -3,9 +3,9 @@
 
 #include <azure/core/internal/json/json.hpp>
 
-#include "azure/keyvault/keys/cryptography/cryptography_serializers.hpp"
+#include "../private/cryptography_serializers.hpp"
+#include "../private/key_constants.hpp"
 #include "azure/keyvault/keys/cryptography/encrypt_result.hpp"
-#include "azure/keyvault/keys/details/key_constants.hpp"
 
 #include <azure/keyvault/common/internal/base64url.hpp>
 
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/encryption_algorithm.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/encryption_algorithm.cpp
index 3b8687278..28ec415f8 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/encryption_algorithm.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/encryption_algorithm.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 
 #include "azure/keyvault/keys/cryptography/encryption_algorithm.hpp"
-#include "azure/keyvault/keys/details/key_constants.hpp"
+#include "../private/key_constants.hpp"
 
 namespace Azure {
   namespace Security {
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 f52a8f39a..9ae3d6941 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,9 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "azure/keyvault/keys/cryptography/key_sign_parameters.hpp"
-#include "azure/keyvault/keys/cryptography/cryptography_serializers.hpp"
-#include "azure/keyvault/keys/details/key_constants.hpp"
+#include "../private/key_sign_parameters.hpp"
+#include "../private/cryptography_serializers.hpp"
+#include "../private/key_constants.hpp"
 
 #include <azure/keyvault/common/internal/base64url.hpp>
 
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 f7a17c855..6a6a77c6c 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,9 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "azure/keyvault/keys/cryptography/key_verify_parameters.hpp"
-#include "azure/keyvault/keys/cryptography/cryptography_serializers.hpp"
-#include "azure/keyvault/keys/details/key_constants.hpp"
+#include "../private/key_verify_parameters.hpp"
+#include "../private/cryptography_serializers.hpp"
+#include "../private/key_constants.hpp"
 
 #include <azure/keyvault/common/internal/base64url.hpp>
 
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/key_wrap_algorithm.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/key_wrap_algorithm.cpp
index a236d4fd9..e38964a92 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/key_wrap_algorithm.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/key_wrap_algorithm.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 
 #include "azure/keyvault/keys/cryptography/key_wrap_algorithm.hpp"
-#include "azure/keyvault/keys/details/key_constants.hpp"
+#include "../private/key_constants.hpp"
 
 namespace Azure {
   namespace Security {
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 afec9ddde..28ff079e8 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,9 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "azure/keyvault/keys/cryptography/cryptography_serializers.hpp"
+#include "../private/cryptography_serializers.hpp"
+#include "../private/key_constants.hpp"
 #include "azure/keyvault/keys/cryptography/encrypt_parameters.hpp"
-#include "azure/keyvault/keys/details/key_constants.hpp"
 
 #include <azure/keyvault/common/internal/base64url.hpp>
 
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/remote_cryptography_client.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/remote_cryptography_client.cpp
index b2f34d68a..294fef36a 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/remote_cryptography_client.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/remote_cryptography_client.cpp
@@ -5,13 +5,13 @@
 #include <azure/core/http/http.hpp>
 #include <azure/core/http/policies/policy.hpp>
 
-#include "azure/keyvault/keys/cryptography/cryptography_serializers.hpp"
-#include "azure/keyvault/keys/cryptography/key_sign_parameters.hpp"
-#include "azure/keyvault/keys/cryptography/key_verify_parameters.hpp"
-#include "azure/keyvault/keys/cryptography/key_wrap_parameters.hpp"
-#include "azure/keyvault/keys/cryptography/remote_cryptography_client.hpp"
-#include "azure/keyvault/keys/details/key_constants.hpp"
-#include "azure/keyvault/keys/details/key_serializers.hpp"
+#include "../private/cryptography_serializers.hpp"
+#include "../private/key_constants.hpp"
+#include "../private/key_serializers.hpp"
+#include "../private/key_sign_parameters.hpp"
+#include "../private/key_verify_parameters.hpp"
+#include "../private/key_wrap_parameters.hpp"
+#include "azure/keyvault/keys/internal/cryptography/remote_cryptography_client.hpp"
 
 #include <memory>
 #include <string>
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/rsa_cryptography_provider.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/rsa_cryptography_provider.cpp
index f253a4e2c..c33e1a975 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/rsa_cryptography_provider.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/cryptography/rsa_cryptography_provider.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "azure/keyvault/keys/cryptography/rsa_cryptography_provider.hpp"
+#include "azure/keyvault/keys/internal/cryptography/rsa_cryptography_provider.hpp"
 
 #include <memory>
 #include <string>
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 91e5febe8..1e29bbe88 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
@@ -3,9 +3,9 @@
 
 #include <azure/core/internal/json/json.hpp>
 
-#include "azure/keyvault/keys/cryptography/cryptography_serializers.hpp"
+#include "../private/cryptography_serializers.hpp"
+#include "../private/key_constants.hpp"
 #include "azure/keyvault/keys/cryptography/sign_result.hpp"
-#include "azure/keyvault/keys/details/key_constants.hpp"
 
 #include <azure/keyvault/common/internal/base64url.hpp>
 
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 e2f0f0aa9..23353a061 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
@@ -3,8 +3,8 @@
 
 #include <azure/keyvault/common/sha.hpp>
 
+#include "../private/key_constants.hpp"
 #include "azure/keyvault/keys/cryptography/signature_algorithm.hpp"
-#include "azure/keyvault/keys/details/key_constants.hpp"
 
 namespace Azure {
   namespace Security {
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 29eb0aced..aa7946eec 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
@@ -3,9 +3,9 @@
 
 #include <azure/core/internal/json/json.hpp>
 
-#include "azure/keyvault/keys/cryptography/cryptography_serializers.hpp"
+#include "../private/cryptography_serializers.hpp"
+#include "../private/key_constants.hpp"
 #include "azure/keyvault/keys/cryptography/unwrap_result.hpp"
-#include "azure/keyvault/keys/details/key_constants.hpp"
 
 #include <azure/keyvault/common/internal/base64url.hpp>
 
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 5078e94fc..6df69ba84 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
@@ -3,9 +3,9 @@
 
 #include <azure/core/internal/json/json.hpp>
 
-#include "azure/keyvault/keys/cryptography/cryptography_serializers.hpp"
+#include "../private/cryptography_serializers.hpp"
+#include "../private/key_constants.hpp"
 #include "azure/keyvault/keys/cryptography/verify_result.hpp"
-#include "azure/keyvault/keys/details/key_constants.hpp"
 
 #include <azure/keyvault/common/internal/base64url.hpp>
 
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 ede3f5625..db3662931 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
@@ -3,9 +3,9 @@
 
 #include <azure/core/internal/json/json.hpp>
 
-#include "azure/keyvault/keys/cryptography/cryptography_serializers.hpp"
+#include "../private/cryptography_serializers.hpp"
+#include "../private/key_constants.hpp"
 #include "azure/keyvault/keys/cryptography/wrap_result.hpp"
-#include "azure/keyvault/keys/details/key_constants.hpp"
 
 #include <azure/keyvault/common/internal/base64url.hpp>
 
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 6966b2229..6e56719a1 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
@@ -3,12 +3,12 @@
 
 #include <azure/core/exception.hpp>
 
-#include <azure/keyvault/common/keyvault_exception.hpp>
+#include <azure/keyvault/common/internal/keyvault_exception.hpp>
 
 #include "azure/keyvault/keys/delete_key_operation.hpp"
-#include "azure/keyvault/keys/details/key_constants.hpp"
-#include "azure/keyvault/keys/details/key_serializers.hpp"
 #include "azure/keyvault/keys/key_client.hpp"
+#include "private/key_constants.hpp"
+#include "private/key_serializers.hpp"
 
 using namespace Azure::Security::KeyVault::Keys;
 using namespace Azure::Security::KeyVault;
@@ -43,7 +43,7 @@ Azure::Security::KeyVault::Keys::DeleteKeyOperation::PollInternal(
         break;
       }
       default:
-        throw Azure::Security::KeyVault::_detail::KeyVaultException::CreateException(
+        throw Azure::Security::KeyVault::_internal::KeyVaultException::CreateException(
             std::move(rawResponse));
     }
 
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 d6dbfe441..9159422aa 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/deleted_key.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/deleted_key.cpp
@@ -7,9 +7,9 @@
 #include <azure/keyvault/common/internal/unix_time_helper.hpp>
 
 #include "azure/keyvault/keys/deleted_key.hpp"
-#include "azure/keyvault/keys/details/key_constants.hpp"
-#include "azure/keyvault/keys/details/key_serializers.hpp"
 #include "azure/keyvault/keys/key_vault_key.hpp"
+#include "private/key_constants.hpp"
+#include "private/key_serializers.hpp"
 
 using namespace Azure::Security::KeyVault::Keys;
 using namespace Azure::Core::Json::_internal;
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 1ac2633b0..ef56d39f7 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
@@ -6,9 +6,9 @@
 
 #include <azure/keyvault/common/internal/unix_time_helper.hpp>
 
-#include "azure/keyvault/keys/details/key_constants.hpp"
-#include "azure/keyvault/keys/details/key_serializers.hpp"
 #include "azure/keyvault/keys/import_key_options.hpp"
+#include "private/key_constants.hpp"
+#include "private/key_serializers.hpp"
 
 #include <string>
 
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 1628c8a59..75c928cbb 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
@@ -4,10 +4,10 @@
 #include <azure/core/internal/json/json_optional.hpp>
 #include <azure/keyvault/common/internal/base64url.hpp>
 
-#include "azure/keyvault/keys/details/key_constants.hpp"
-#include "azure/keyvault/keys/details/key_serializers.hpp"
 #include "azure/keyvault/keys/json_web_key.hpp"
 #include "azure/keyvault/keys/key_curve_name.hpp"
+#include "private/key_constants.hpp"
+#include "private/key_serializers.hpp"
 
 #include <map>
 #include <string>
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 4572e770b..ca983c477 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/key_backup.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/key_backup.cpp
@@ -6,8 +6,8 @@
 
 #include <azure/keyvault/common/internal/base64url.hpp>
 
-#include "azure/keyvault/keys/details/key_backup.hpp"
-#include "azure/keyvault/keys/details/key_constants.hpp"
+#include "private/key_backup.hpp"
+#include "private/key_constants.hpp"
 
 #include <string>
 
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 723493a34..723f7ea30 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/key_client.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/key_client.cpp
@@ -7,11 +7,11 @@
 
 #include <azure/keyvault/common/internal/single_page.hpp>
 
-#include "azure/keyvault/keys/details/key_backup.hpp"
-#include "azure/keyvault/keys/details/key_constants.hpp"
-#include "azure/keyvault/keys/details/key_request_parameters.hpp"
-#include "azure/keyvault/keys/details/key_serializers.hpp"
 #include "azure/keyvault/keys/key_client.hpp"
+#include "private/key_backup.hpp"
+#include "private/key_constants.hpp"
+#include "private/key_request_parameters.hpp"
+#include "private/key_serializers.hpp"
 
 #include <memory>
 #include <string>
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/key_curve_name.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/key_curve_name.cpp
index 43d6ef74b..29c9af833 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/key_curve_name.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/key_curve_name.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 
 #include "azure/keyvault/keys/key_curve_name.hpp"
-#include "azure/keyvault/keys/details/key_constants.hpp"
+#include "private/key_constants.hpp"
 
 namespace Azure { namespace Security { namespace KeyVault { namespace Keys {
 
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 e0f881c4e..fedea33d8 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
@@ -6,8 +6,8 @@
 
 #include <azure/keyvault/common/internal/unix_time_helper.hpp>
 
-#include "azure/keyvault/keys/details/key_constants.hpp"
-#include "azure/keyvault/keys/details/key_request_parameters.hpp"
+#include "private/key_constants.hpp"
+#include "private/key_request_parameters.hpp"
 
 #include <string>
 
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/key_type.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/key_type.cpp
index eae7b3f05..47bc429fb 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/key_type.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/key_type.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 
 #include "azure/keyvault/keys/key_type.hpp"
-#include "azure/keyvault/keys/details/key_constants.hpp"
+#include "private/key_constants.hpp"
 
 #include <stdexcept>
 
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/key_vault_key.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/key_vault_key.cpp
index ba07272fc..8d641cb3b 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/key_vault_key.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/key_vault_key.cpp
@@ -8,9 +8,9 @@
 
 #include <azure/keyvault/common/internal/unix_time_helper.hpp>
 
-#include "azure/keyvault/keys/details/key_constants.hpp"
-#include "azure/keyvault/keys/details/key_serializers.hpp"
 #include "azure/keyvault/keys/key_vault_key.hpp"
+#include "private/key_constants.hpp"
+#include "private/key_serializers.hpp"
 
 using namespace Azure::Security::KeyVault::Keys;
 using namespace Azure::Core::Json::_internal;
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/list_keys_single_page_result.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/list_keys_single_page_result.cpp
index b93f08a6f..6f3d57edf 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/list_keys_single_page_result.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/list_keys_single_page_result.cpp
@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: MIT
 
 #include "azure/keyvault/keys/list_keys_single_page_result.hpp"
-#include "azure/keyvault/keys/details/key_constants.hpp"
-#include "azure/keyvault/keys/details/key_serializers.hpp"
 #include "azure/keyvault/keys/key_client.hpp"
+#include "private/key_constants.hpp"
+#include "private/key_serializers.hpp"
 
 #include <azure/keyvault/common/internal/unix_time_helper.hpp>
 
diff --git a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/cryptography/cryptography_serializers.hpp b/sdk/keyvault/azure-security-keyvault-keys/src/private/cryptography_serializers.hpp
similarity index 94%
rename from sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/cryptography/cryptography_serializers.hpp
rename to sdk/keyvault/azure-security-keyvault-keys/src/private/cryptography_serializers.hpp
index fe40aa641..7cfc2713f 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/cryptography/cryptography_serializers.hpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/private/cryptography_serializers.hpp
@@ -17,13 +17,13 @@
 #include "azure/keyvault/keys/cryptography/decrypt_result.hpp"
 #include "azure/keyvault/keys/cryptography/encrypt_parameters.hpp"
 #include "azure/keyvault/keys/cryptography/encrypt_result.hpp"
-#include "azure/keyvault/keys/cryptography/key_sign_parameters.hpp"
-#include "azure/keyvault/keys/cryptography/key_verify_parameters.hpp"
-#include "azure/keyvault/keys/cryptography/key_wrap_parameters.hpp"
 #include "azure/keyvault/keys/cryptography/sign_result.hpp"
 #include "azure/keyvault/keys/cryptography/unwrap_result.hpp"
 #include "azure/keyvault/keys/cryptography/verify_result.hpp"
 #include "azure/keyvault/keys/cryptography/wrap_result.hpp"
+#include "key_sign_parameters.hpp"
+#include "key_verify_parameters.hpp"
+#include "key_wrap_parameters.hpp"
 
 #include <string>
 
diff --git a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/details/key_backup.hpp b/sdk/keyvault/azure-security-keyvault-keys/src/private/key_backup.hpp
similarity index 100%
rename from sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/details/key_backup.hpp
rename to sdk/keyvault/azure-security-keyvault-keys/src/private/key_backup.hpp
diff --git a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/details/key_constants.hpp b/sdk/keyvault/azure-security-keyvault-keys/src/private/key_constants.hpp
similarity index 100%
rename from sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/details/key_constants.hpp
rename to sdk/keyvault/azure-security-keyvault-keys/src/private/key_constants.hpp
diff --git a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/details/key_request_parameters.hpp b/sdk/keyvault/azure-security-keyvault-keys/src/private/key_request_parameters.hpp
similarity index 100%
rename from sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/details/key_request_parameters.hpp
rename to sdk/keyvault/azure-security-keyvault-keys/src/private/key_request_parameters.hpp
diff --git a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/details/key_serializers.hpp b/sdk/keyvault/azure-security-keyvault-keys/src/private/key_serializers.hpp
similarity index 100%
rename from sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/details/key_serializers.hpp
rename to sdk/keyvault/azure-security-keyvault-keys/src/private/key_serializers.hpp
diff --git a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/cryptography/key_sign_parameters.hpp b/sdk/keyvault/azure-security-keyvault-keys/src/private/key_sign_parameters.hpp
similarity index 100%
rename from sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/cryptography/key_sign_parameters.hpp
rename to sdk/keyvault/azure-security-keyvault-keys/src/private/key_sign_parameters.hpp
diff --git a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/cryptography/key_verify_parameters.hpp b/sdk/keyvault/azure-security-keyvault-keys/src/private/key_verify_parameters.hpp
similarity index 100%
rename from sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/cryptography/key_verify_parameters.hpp
rename to sdk/keyvault/azure-security-keyvault-keys/src/private/key_verify_parameters.hpp
diff --git a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/cryptography/key_wrap_parameters.hpp b/sdk/keyvault/azure-security-keyvault-keys/src/private/key_wrap_parameters.hpp
similarity index 100%
rename from sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/cryptography/key_wrap_parameters.hpp
rename to sdk/keyvault/azure-security-keyvault-keys/src/private/key_wrap_parameters.hpp
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 9dde6bc74..24071d969 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,12 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure/keyvault/common/keyvault_exception.hpp>
+#include <azure/keyvault/common/internal/keyvault_exception.hpp>
 
-#include "azure/keyvault/keys/details/key_constants.hpp"
-#include "azure/keyvault/keys/details/key_serializers.hpp"
 #include "azure/keyvault/keys/key_client.hpp"
 #include "azure/keyvault/keys/recover_deleted_key_operation.hpp"
+#include "private/key_constants.hpp"
+#include "private/key_serializers.hpp"
 
 using namespace Azure::Security::KeyVault::Keys;
 using namespace Azure::Security::KeyVault;
@@ -40,7 +40,7 @@ Azure::Security::KeyVault::Keys::RecoverDeletedKeyOperation::PollInternal(
         break;
       }
       default:
-        throw Azure::Security::KeyVault::_detail::KeyVaultException::CreateException(
+        throw Azure::Security::KeyVault::_internal::KeyVaultException::CreateException(
             std::move(rawResponse));
     }
     if (m_status == Azure::Core::OperationStatus::Succeeded)
diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/ut/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-keys/test/ut/CMakeLists.txt
index dddb2ae66..59d443e18 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/test/ut/CMakeLists.txt
+++ b/sdk/keyvault/azure-security-keyvault-keys/test/ut/CMakeLists.txt
@@ -56,6 +56,9 @@ endif()
 
 target_link_libraries(azure-security-keyvault-keys-test-live PRIVATE azure-security-keyvault-keys azure-identity gtest gmock)
 
+# Adding private headers so we can test the private APIs with no relative paths include.
+target_include_directories (azure-security-keyvault-keys-test-live PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../src>)
+
 # gtest_discover_tests will scan the test from azure-core-test and call add_test
 # for each test to ctest. This enables `ctest -r` to run specific tests directly.
 gtest_discover_tests(azure-security-keyvault-keys-test-live
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 3c7b53a85..7ccfde99e 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
@@ -12,7 +12,7 @@
 #include <azure/core/base64.hpp>
 #include <azure/core/internal/json/json.hpp>
 #include <azure/keyvault/key_vault_keys.hpp>
-#include <azure/keyvault/keys/details/key_constants.hpp>
+#include <private/key_constants.hpp>
 
 #include <iostream>
 #include <string>
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 08a82a5de..fd82372fe 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
@@ -10,7 +10,7 @@
 #include "key_client_base_test.hpp"
 
 #include <azure/keyvault/key_vault_keys.hpp>
-#include <azure/keyvault/keys/details/key_constants.hpp>
+#include <private/key_constants.hpp>
 
 #include <string>
 
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 330ebd20a..d29d58c71 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
@@ -10,7 +10,7 @@
 #include "key_client_base_test.hpp"
 
 #include <azure/keyvault/key_vault_keys.hpp>
-#include <azure/keyvault/keys/details/key_constants.hpp>
+#include <private/key_constants.hpp>
 
 #include <string>
 
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 8e1017aa7..65cba7497 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
@@ -10,7 +10,7 @@
 #include "key_client_base_test.hpp"
 
 #include <azure/keyvault/key_vault_keys.hpp>
-#include <azure/keyvault/keys/details/key_constants.hpp>
+#include <private/key_constants.hpp>
 
 #include <string>
 
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 0c53c8c90..b54f8e786 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
@@ -10,7 +10,6 @@
 #include <azure/core/exception.hpp>
 
 #include <azure/keyvault/common/internal/base64url.hpp>
-#include <azure/keyvault/common/keyvault_exception.hpp>
 #include <azure/keyvault/key_vault_keys.hpp>
 
 #include "key_client_base_test.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 609af9deb..fc4fa870f 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
@@ -11,7 +11,7 @@
 
 #include <azure/core/datetime.hpp>
 #include <azure/keyvault/key_vault_keys.hpp>
-#include <azure/keyvault/keys/details/key_constants.hpp>
+#include <private/key_constants.hpp>
 
 #include <string>