Restructure the azure inc folder (#514)

* Restructure the azure inc folder

sdk/core/azure-core/inc/azure/core/azure.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <internal/contract.hpp>
+#include <azure/core/internal/contract.hpp>
 #include <string>
 
 #define AZURE_UNREFERENCED_PARAMETER(x) ((void)(x));

sdk/core/azure-core/inc/azure/core/credentials/credentials.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <context.hpp>
+#include "azure/core/context.hpp"
 
 #include <chrono>
 #include <memory>

sdk/core/azure-core/inc/azure/core/credentials/policy/policies.hpp

@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include <credentials/credentials.hpp>
-#include <http/policy.hpp>
+#include <azure/core/credentials/credentials.hpp>
+#include <azure/core/http/policy.hpp>
 #include <memory>
 #include <mutex>
 #include <string>

sdk/core/azure-core/inc/azure/core/http/body_stream.hpp

@@ -15,8 +15,9 @@
 #include <Windows.h>
 #endif // Windows
 
+#include <azure/core/context.hpp>
+
 #include <algorithm>
-#include <context.hpp>
 #include <cstdint>
 #include <cstdio>
 #include <cstring>

sdk/core/azure-core/inc/azure/core/http/curl/curl.hpp

@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "http/http.hpp"
-#include "http/policy.hpp"
+#include "azure/core/http/http.hpp"
+#include "azure/core/http/policy.hpp"
 
 #include <curl/curl.h>
 #include <list>

sdk/core/azure-core/inc/azure/core/http/http.hpp

@@ -3,10 +3,10 @@
 
 #pragma once
 
-#include "body_stream.hpp"
+#include "azure/core/http/body_stream.hpp"
+#include "azure/core/internal/contract.hpp"
 
 #include <algorithm>
-#include <internal/contract.hpp>
 #include <map>
 #include <memory>
 #include <stdexcept>

sdk/core/azure-core/inc/azure/core/http/pipeline.hpp

@@ -3,10 +3,10 @@
 
 #pragma once
 
-#include "context.hpp"
-#include "http.hpp"
-#include "policy.hpp"
-#include "transport.hpp"
+#include "azure/core/context.hpp"
+#include "azure/core/http/http.hpp"
+#include "azure/core/http/policy.hpp"
+#include "azure/core/http/transport.hpp"
 
 #include <vector>
 

sdk/core/azure-core/inc/azure/core/http/policy.hpp

@@ -3,12 +3,12 @@
 
 #pragma once
 
-#include "azure.hpp"
-#include "context.hpp"
-#include "http.hpp"
-#include "logging/logging.hpp"
-#include "transport.hpp"
-#include "uuid.hpp"
+#include "azure/core/azure.hpp"
+#include "azure/core/context.hpp"
+#include "azure/core/http/http.hpp"
+#include "azure/core/http/transport.hpp"
+#include "azure/core/logging/logging.hpp"
+#include "azure/core/uuid.hpp"
 
 #include <chrono>
 #include <utility>

sdk/core/azure-core/inc/azure/core/http/transport.hpp

@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include "context.hpp"
-#include "http.hpp"
+#include "azure/core/context.hpp"
+#include "azure/core/http/http.hpp"
 
 namespace Azure { namespace Core { namespace Http {
 

sdk/core/azure-core/inc/azure/core/http/winhttp/win_http_client.hpp

@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "http/http.hpp"
-#include "http/policy.hpp"
+#include "azure/core/http/http.hpp"
+#include "azure/core/http/policy.hpp"
 
 #include <type_traits>
 #include <vector>

sdk/core/azure-core/inc/azure/core/internal/log.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "logging/logging.hpp"
+#include "azure/core/logging/logging.hpp"
 
 namespace Azure { namespace Core { namespace Logging { namespace Details {
   bool ShouldWrite(LogClassification const& classification);

sdk/core/azure-core/inc/azure/core/logging/logging.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "azure.hpp"
+#include "azure/core/azure.hpp"
 
 #include <functional>
 #include <initializer_list>

sdk/core/azure-core/inc/azure/core/response.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <http/http.hpp>
+#include <azure/core/http/http.hpp>
 
 namespace Azure { namespace Core {
 

sdk/core/azure-core/src/context.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <context.hpp>
+#include <azure/core/context.hpp>
 
 using namespace Azure::Core;
 using time_point = std::chrono::system_clock::time_point;

sdk/core/azure-core/src/credentials/credentials.cpp

@@ -1,11 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <credentials/credentials.hpp>
-#include <http/body_stream.hpp>
-#include <http/curl/curl.hpp>
-#include <http/http.hpp>
-#include <http/pipeline.hpp>
+#include <azure/core/credentials/credentials.hpp>
+#include <azure/core/http/body_stream.hpp>
+#include <azure/core/http/curl/curl.hpp>
+#include <azure/core/http/http.hpp>
+#include <azure/core/http/pipeline.hpp>
 
 #include <cstdlib>
 #include <iomanip>

sdk/core/azure-core/src/credentials/policy/policies.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <credentials/policy/policies.hpp>
+#include <azure/core/credentials/policy/policies.hpp>
 
 using namespace Azure::Core::Credentials::Policy;
 

sdk/core/azure-core/src/http/body_stream.cpp

@@ -12,12 +12,13 @@
 #include <Windows.h>
 #endif // Windows
 
+#include <azure/core/context.hpp>
+#include <azure/core/http/body_stream.hpp>
+
 #include <algorithm>
-#include <context.hpp>
 #include <cstdint>
 #include <cstdio>
 #include <cstring>
-#include <http/body_stream.hpp>
 #include <memory>
 #include <stdexcept>
 #include <vector>

sdk/core/azure-core/src/http/curl/curl.cpp

@@ -1,8 +1,9 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// SPDX-License-Identifier: MIT
 
-#include "http/curl/curl.hpp"
-
-#include "azure.hpp"
-#include "http/http.hpp"
+#include "azure/core/azure.hpp"
+#include "azure/core/http/curl/curl.hpp"
+#include "azure/core/http/http.hpp"
 
 #include <string>
 

sdk/core/azure-core/src/http/logging_policy.cpp

@@ -1,9 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <http/policy.hpp>
-
-#include <internal/log.hpp>
+#include <azure/core/http/policy.hpp>
+#include <azure/core/internal/log.hpp>
 
 #include <chrono>
 #include <sstream>

sdk/core/azure-core/src/http/policy.cpp

@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <http/http.hpp>
-#include <http/policy.hpp>
+#include <azure/core/http/http.hpp>
+#include <azure/core/http/policy.hpp>
 
 using namespace Azure::Core::Http;
 

sdk/core/azure-core/src/http/raw_response.cpp

@@ -1,9 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure.hpp>
-#include <cctype>
-#include <http/http.hpp>
+#include <azure/core/azure.hpp>
+#include <azure/core/http/http.hpp>
 
 #include <cctype>
 #include <map>

sdk/core/azure-core/src/http/request.cpp

@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <azure.hpp>
-#include <http/http.hpp>
+#include <azure/core/azure.hpp>
+#include <azure/core/http/http.hpp>
 #include <map>
 #include <string>
 #include <vector>

sdk/core/azure-core/src/http/retry_policy.cpp

@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <http/policy.hpp>
+#include <azure/core/http/policy.hpp>
 
-#include <internal/log.hpp>
+#include <azure/core/internal/log.hpp>
 
 #include <algorithm>
 #include <cstdlib>

sdk/core/azure-core/src/http/telemetry_policy.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <http/policy.hpp>
+#include <azure/core/http/policy.hpp>
 
 #include <sstream>
 

sdk/core/azure-core/src/http/transport_policy.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <http/policy.hpp>
+#include <azure/core/http/policy.hpp>
 
 using namespace Azure::Core::Http;
 

sdk/core/azure-core/src/http/url.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include <http/http.hpp>
+#include <azure/core/http/http.hpp>
 
 using namespace Azure::Core::Http;
 

sdk/core/azure-core/src/http/winhttp/win_http_transport.cpp

@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "azure.hpp"
-#include "http/http.hpp"
-#include "http/winhttp/win_http_client.hpp"
+#include "azure/core/azure.hpp"
+#include "azure/core/http/http.hpp"
+#include "azure/core/http/winhttp/win_http_client.hpp"
 
 #include <string>
 

sdk/core/azure-core/src/logging/logging.cpp

@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "logging/logging.hpp"
-#include "internal/log.hpp"
+#include "azure/core/logging/logging.hpp"
+#include "azure/core/internal/log.hpp"
 
 #include <mutex>
 

sdk/core/azure-core/src/strings.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 
 #include <algorithm>
-#include <azure.hpp>
+#include <azure/core/azure.hpp>
 
 namespace {
 // The locale invariant case table is generated with the following program

sdk/core/azure-core/test/e2e/azure_core_storage_list_containers_sample.cpp

@@ -1,11 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "http/pipeline.hpp"
+#include "azure/core/http/http.hpp"
+#include "azure/core/http/pipeline.hpp"
+#include "azure/core/http/curl/curl.hpp"
 
 #include <array>
-#include <http/curl/curl.hpp>
-#include <http/http.hpp>
 #include <iostream>
 #include <memory>
 #include <vector>

sdk/core/azure-core/test/e2e/azure_core_storage_test_sample.cpp

@@ -5,11 +5,11 @@
 #define _CRT_SECURE_NO_WARNINGS
 #endif
 
-#include "http/pipeline.hpp"
+#include "azure/core/http/http.hpp"
+#include "azure/core/http/pipeline.hpp"
+#include "azure/core/http/curl/curl.hpp"
 
 #include <array>
-#include <http/curl/curl.hpp>
-#include <http/http.hpp>
 #include <iostream>
 #include <memory>
 #include <vector>

sdk/core/azure-core/test/e2e/azure_core_with_curl_bodyBuffer.cpp

@@ -6,7 +6,7 @@
  *
  */
 
-#include "http/pipeline.hpp"
+#include "azure/core/http/pipeline.hpp"
 
 #ifdef POSIX
 #include <fcntl.h>
@@ -18,8 +18,9 @@
 #include <Windows.h>
 #endif // Windows
 
-#include <http/curl/curl.hpp>
-#include <http/http.hpp>
+#include <azure/core/http/curl/curl.hpp>
+#include <azure/core/http/http.hpp>
+
 #include <iostream>
 #include <memory>
 

sdk/core/azure-core/test/e2e/azure_core_with_curl_bodyStream.cpp

@@ -7,11 +7,11 @@
  *
  */
 
-#include "http/pipeline.hpp"
+#include "azure/core/http/pipeline.hpp"
+#include <azure/core/http/curl/curl.hpp>
+#include <azure/core/http/http.hpp>
 
 #include <array>
-#include <http/curl/curl.hpp>
-#include <http/http.hpp>
 #include <iostream>
 #include <memory>
 #include <vector>

sdk/core/azure-core/test/ut/context.cpp

@@ -3,7 +3,7 @@
 
 #include "gtest/gtest.h"
 
-#include "context.hpp"
+#include "azure/core/context.hpp"
 
 #include <chrono>
 #include <memory>

sdk/core/azure-core/test/ut/file_upload.cpp

@@ -11,9 +11,10 @@
 #include <Windows.h>
 #endif // Windows
 
+#include "azure/core/http/http.hpp"
+
 #include "transport_adapter.hpp"
-//#include <iostream>
-#include <response.hpp>
+
 #include <string>
 
 namespace Azure { namespace Core { namespace Test {

sdk/core/azure-core/test/ut/http.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 
 #include "gtest/gtest.h"
-#include <http/http.hpp>
+#include <azure/core/http/http.hpp>
 #include <string>
 #include <vector>
 

sdk/core/azure-core/test/ut/logging.cpp

@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: MIT
 
 #include "gtest/gtest.h"
-#include <http/pipeline.hpp>
-#include <internal/log.hpp>
-#include <logging/logging.hpp>
+#include <azure/core/http/pipeline.hpp>
+#include <azure/core/internal/log.hpp>
+#include <azure/core/logging/logging.hpp>
 
 #include <utility>
 #include <vector>

sdk/core/azure-core/test/ut/nullable.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 
 #include "gtest/gtest.h"
-#include <nullable.hpp>
+#include <azure/core/nullable.hpp>
 #include <string>
 #include <vector>
 

sdk/core/azure-core/test/ut/string.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 
 #include "gtest/gtest.h"
-#include <azure.hpp>
+#include <azure/core/azure.hpp>
 #include <string>
 
 TEST(String, invariantCompare)

sdk/core/azure-core/test/ut/telemetry_policy.cpp

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: MIT
 
 #include "gtest/gtest.h"
-#include <http/pipeline.hpp>
-#include <http/policy.hpp>
+#include <azure/core/http/pipeline.hpp>
+#include <azure/core/http/policy.hpp>
 
 using namespace Azure::Core;
 using namespace Azure::Core::Http;

sdk/core/azure-core/test/ut/transport_adapter.cpp

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: MIT
 
 #include "transport_adapter.hpp"
-#include <context.hpp>
-#include <response.hpp>
+#include <azure/core/context.hpp>
+#include <azure/core/response.hpp>
 #include <string>
 #include <thread>
 

sdk/core/azure-core/test/ut/transport_adapter.hpp

@@ -2,10 +2,10 @@
 // SPDX-License-Identifier: MIT
 
 #include "gtest/gtest.h"
-#include <http/body_stream.hpp>
-#include <http/curl/curl.hpp>
-#include <http/http.hpp>
-#include <http/pipeline.hpp>
+#include <azure/core/http/body_stream.hpp>
+#include <azure/core/http/curl/curl.hpp>
+#include <azure/core/http/http.hpp>
+#include <azure/core/http/pipeline.hpp>
 
 #include <memory>
 #include <vector>

sdk/core/azure-core/test/ut/uuid.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 
 #include "gtest/gtest.h"
-#include <uuid.hpp>
+#include <azure/core/uuid.hpp>
 #include <string>
 #include <vector>
 

sdk/storage/inc/blobs/append_blob_client.hpp

@@ -6,7 +6,7 @@
 #include "blob_options.hpp"
 #include "blobs/blob_client.hpp"
 #include "common/storage_credential.hpp"
-#include "credentials/credentials.hpp"
+#include "azure/core/credentials/credentials.hpp"
 #include "protocol/blob_rest_client.hpp"
 
 #include <string>

sdk/storage/inc/blobs/blob_client.hpp

@@ -7,7 +7,7 @@
 #include "blob_responses.hpp"
 #include "common/storage_credential.hpp"
 #include "common/storage_uri_builder.hpp"
-#include "credentials/credentials.hpp"
+#include "azure/core/credentials/credentials.hpp"
 #include "protocol/blob_rest_client.hpp"
 
 #include <map>

sdk/storage/inc/blobs/blob_container_client.hpp

@@ -7,7 +7,7 @@
 #include "blobs/blob_client.hpp"
 #include "common/storage_credential.hpp"
 #include "common/storage_uri_builder.hpp"
-#include "credentials/credentials.hpp"
+#include "azure/core/credentials/credentials.hpp"
 #include "protocol/blob_rest_client.hpp"
 
 #include <map>

sdk/storage/inc/blobs/blob_sas_builder.hpp

@@ -8,7 +8,7 @@
 #include "blobs/blob_responses.hpp"
 #include "blobs/protocol/blob_rest_client.hpp"
 #include "common/account_sas_builder.hpp"
-#include "nullable.hpp"
+#include "azure/core/nullable.hpp"
 
 namespace Azure { namespace Storage { namespace Blobs {
 

sdk/storage/inc/blobs/blob_service_client.hpp

@@ -7,7 +7,7 @@
 #include "blobs/blob_container_client.hpp"
 #include "common/storage_credential.hpp"
 #include "common/storage_uri_builder.hpp"
-#include "credentials/credentials.hpp"
+#include "azure/core/credentials/credentials.hpp"
 #include "protocol/blob_rest_client.hpp"
 
 #include <memory>

sdk/storage/inc/blobs/block_blob_client.hpp

@@ -6,7 +6,7 @@
 #include "blob_options.hpp"
 #include "blobs/blob_client.hpp"
 #include "common/storage_credential.hpp"
-#include "credentials/credentials.hpp"
+#include "azure/core/credentials/credentials.hpp"
 #include "protocol/blob_rest_client.hpp"
 
 #include <map>

sdk/storage/inc/blobs/page_blob_client.hpp

@@ -7,7 +7,7 @@
 #include "blob_responses.hpp"
 #include "blobs/blob_client.hpp"
 #include "common/storage_credential.hpp"
-#include "credentials/credentials.hpp"
+#include "azure/core/credentials/credentials.hpp"
 #include "protocol/blob_rest_client.hpp"
 
 #include <string>

sdk/storage/inc/blobs/protocol/blob_rest_client.hpp

@@ -6,11 +6,11 @@
 #include "common/storage_common.hpp"
 #include "common/storage_error.hpp"
 #include "common/xml_wrapper.hpp"
-#include "context.hpp"
-#include "http/http.hpp"
-#include "http/pipeline.hpp"
-#include "nullable.hpp"
-#include "response.hpp"
+#include "azure/core/context.hpp"
+#include "azure/core/http/http.hpp"
+#include "azure/core/http/pipeline.hpp"
+#include "azure/core/nullable.hpp"
+#include "azure/core/response.hpp"
 
 #include <cstring>
 #include <limits>

sdk/storage/inc/common/access_conditions.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "nullable.hpp"
+#include "azure/core/nullable.hpp"
 
 #include <string>
 

sdk/storage/inc/common/account_sas_builder.hpp

@@ -7,7 +7,7 @@
 
 #include "common/constants.hpp"
 #include "common/storage_credential.hpp"
-#include "nullable.hpp"
+#include "azure/core/nullable.hpp"
 
 namespace Azure { namespace Storage {
 

sdk/storage/inc/common/reliable_stream.hpp

@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "context.hpp"
-#include "http/body_stream.hpp"
+#include "azure/core/context.hpp"
+#include "azure/core/http/body_stream.hpp"
 
 #include <algorithm>
 #include <functional>

sdk/storage/inc/common/shared_key_policy.hpp

@@ -4,7 +4,7 @@
 #pragma once
 
 #include "common/storage_credential.hpp"
-#include "http/policy.hpp"
+#include "azure/core/http/policy.hpp"
 
 namespace Azure { namespace Storage {
 

sdk/storage/inc/common/storage_error.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "http/http.hpp"
+#include "azure/core/http/http.hpp"
 
 #include <map>
 #include <stdexcept>

sdk/storage/inc/common/storage_per_retry_policy.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "http/policy.hpp"
+#include "azure/core/http/policy.hpp"
 
 namespace Azure { namespace Storage {
 

sdk/storage/inc/datalake/datalake_directory_client.hpp

@@ -5,13 +5,13 @@
 
 #include "common/storage_credential.hpp"
 #include "common/storage_uri_builder.hpp"
-#include "credentials/credentials.hpp"
+#include "azure/core/credentials/credentials.hpp"
 #include "datalake/datalake_path_client.hpp"
 #include "datalake_options.hpp"
 #include "datalake_responses.hpp"
-#include "http/pipeline.hpp"
+#include "azure/core/http/pipeline.hpp"
 #include "protocol/datalake_rest_client.hpp"
-#include "response.hpp"
+#include "azure/core/response.hpp"
 
 #include <memory>
 #include <string>

sdk/storage/inc/datalake/datalake_file_client.hpp

@@ -6,13 +6,13 @@
 #include "blobs/block_blob_client.hpp"
 #include "common/storage_credential.hpp"
 #include "common/storage_uri_builder.hpp"
-#include "credentials/credentials.hpp"
+#include "azure/core/credentials/credentials.hpp"
 #include "datalake/datalake_path_client.hpp"
 #include "datalake_options.hpp"
 #include "datalake_responses.hpp"
-#include "http/pipeline.hpp"
+#include "azure/core/http/pipeline.hpp"
 #include "protocol/datalake_rest_client.hpp"
-#include "response.hpp"
+#include "azure/core/response.hpp"
 
 #include <memory>
 #include <string>

sdk/storage/inc/datalake/datalake_file_system_client.hpp

@@ -6,13 +6,13 @@
 #include "blobs/blob_container_client.hpp"
 #include "common/storage_credential.hpp"
 #include "common/storage_uri_builder.hpp"
-#include "credentials/credentials.hpp"
+#include "azure/core/credentials/credentials.hpp"
 #include "datalake/datalake_service_client.hpp"
 #include "datalake_options.hpp"
 #include "datalake_responses.hpp"
-#include "http/pipeline.hpp"
+#include "azure/core/http/pipeline.hpp"
 #include "protocol/datalake_rest_client.hpp"
-#include "response.hpp"
+#include "azure/core/response.hpp"
 
 #include <memory>
 #include <string>

sdk/storage/inc/datalake/datalake_options.hpp

@@ -5,7 +5,7 @@
 
 #include "blobs/blob_options.hpp"
 #include "common/access_conditions.hpp"
-#include "nullable.hpp"
+#include "azure/core/nullable.hpp"
 #include "protocol/datalake_rest_client.hpp"
 
 #include <map>

sdk/storage/inc/datalake/datalake_path_client.hpp

@@ -6,13 +6,13 @@
 #include "blobs/blob_client.hpp"
 #include "common/storage_credential.hpp"
 #include "common/storage_uri_builder.hpp"
-#include "credentials/credentials.hpp"
+#include "azure/core/credentials/credentials.hpp"
 #include "datalake/datalake_file_system_client.hpp"
 #include "datalake_options.hpp"
 #include "datalake_responses.hpp"
-#include "http/pipeline.hpp"
+#include "azure/core/http/pipeline.hpp"
 #include "protocol/datalake_rest_client.hpp"
-#include "response.hpp"
+#include "azure/core/response.hpp"
 
 #include <memory>
 #include <string>

sdk/storage/inc/datalake/datalake_service_client.hpp

@@ -6,12 +6,12 @@
 #include "blobs/blob_service_client.hpp"
 #include "common/storage_credential.hpp"
 #include "common/storage_uri_builder.hpp"
-#include "credentials/credentials.hpp"
+#include "azure/core/credentials/credentials.hpp"
 #include "datalake_options.hpp"
 #include "datalake_responses.hpp"
-#include "http/pipeline.hpp"
+#include "azure/core/http/pipeline.hpp"
 #include "protocol/datalake_rest_client.hpp"
-#include "response.hpp"
+#include "azure/core/response.hpp"
 
 #include <memory>
 #include <string>

sdk/storage/inc/datalake/protocol/datalake_rest_client.hpp

@@ -6,11 +6,11 @@
 
 #include "common/storage_common.hpp"
 #include "common/storage_error.hpp"
-#include "http/http.hpp"
-#include "http/pipeline.hpp"
+#include "azure/core/http/http.hpp"
+#include "azure/core/http/pipeline.hpp"
 #include "json.hpp"
-#include "nullable.hpp"
-#include "response.hpp"
+#include "azure/core/nullable.hpp"
+#include "azure/core/response.hpp"
 
 #include <functional>
 #include <iostream>

sdk/storage/inc/shares/protocol/share_rest_client.hpp

@@ -7,11 +7,11 @@
 #include "common/storage_common.hpp"
 #include "common/storage_error.hpp"
 #include "common/xml_wrapper.hpp"
-#include "http/http.hpp"
-#include "http/pipeline.hpp"
+#include "azure/core/http/http.hpp"
+#include "azure/core/http/pipeline.hpp"
 #include "json.hpp"
-#include "nullable.hpp"
-#include "response.hpp"
+#include "azure/core/nullable.hpp"
+#include "azure/core/response.hpp"
 
 #include <functional>
 #include <iostream>

sdk/storage/inc/shares/share_client.hpp

@@ -5,10 +5,10 @@
 
 #include "common/storage_credential.hpp"
 #include "common/storage_uri_builder.hpp"
-#include "credentials/credentials.hpp"
-#include "http/pipeline.hpp"
+#include "azure/core/credentials/credentials.hpp"
+#include "azure/core/http/pipeline.hpp"
 #include "protocol/share_rest_client.hpp"
-#include "response.hpp"
+#include "azure/core/response.hpp"
 #include "share_options.hpp"
 #include "share_responses.hpp"
 #include "shares/share_service_client.hpp"

sdk/storage/inc/shares/share_directory_client.hpp

@@ -5,10 +5,10 @@
 
 #include "common/storage_credential.hpp"
 #include "common/storage_uri_builder.hpp"
-#include "credentials/credentials.hpp"
-#include "http/pipeline.hpp"
+#include "azure/core/credentials/credentials.hpp"
+#include "azure/core/http/pipeline.hpp"
 #include "protocol/share_rest_client.hpp"
-#include "response.hpp"
+#include "azure/core/response.hpp"
 #include "share_client.hpp"
 #include "share_options.hpp"
 #include "share_responses.hpp"

sdk/storage/inc/shares/share_file_client.hpp

@@ -5,10 +5,10 @@
 
 #include "common/storage_credential.hpp"
 #include "common/storage_uri_builder.hpp"
-#include "credentials/credentials.hpp"
-#include "http/pipeline.hpp"
+#include "azure/core/credentials/credentials.hpp"
+#include "azure/core/http/pipeline.hpp"
 #include "protocol/share_rest_client.hpp"
-#include "response.hpp"
+#include "azure/core/response.hpp"
 #include "share_client.hpp"
 #include "share_directory_client.hpp"
 #include "share_options.hpp"

sdk/storage/inc/shares/share_options.hpp

@@ -4,7 +4,7 @@
 #pragma once
 
 #include "common/access_conditions.hpp"
-#include "nullable.hpp"
+#include "azure/core/nullable.hpp"
 #include "protocol/share_rest_client.hpp"
 #include "share_responses.hpp"
 

sdk/storage/inc/shares/share_service_client.hpp

@@ -5,10 +5,10 @@
 
 #include "common/storage_credential.hpp"
 #include "common/storage_uri_builder.hpp"
-#include "credentials/credentials.hpp"
-#include "http/pipeline.hpp"
+#include "azure/core/credentials/credentials.hpp"
+#include "azure/core/http/pipeline.hpp"
 #include "protocol/share_rest_client.hpp"
-#include "response.hpp"
+#include "azure/core/response.hpp"
 #include "share_options.hpp"
 #include "share_responses.hpp"
 

sdk/storage/src/blobs/blob_client.cpp

@@ -14,8 +14,8 @@
 #include "common/storage_common.hpp"
 #include "common/storage_per_retry_policy.hpp"
 #include "common/storage_version.hpp"
-#include "credentials/policy/policies.hpp"
-#include "http/curl/curl.hpp"
+#include "azure/core/credentials/policy/policies.hpp"
+#include "azure/core/http/curl/curl.hpp"
 
 namespace Azure { namespace Storage { namespace Blobs {
 

sdk/storage/src/blobs/blob_container_client.cpp

@@ -11,8 +11,8 @@
 #include "common/storage_common.hpp"
 #include "common/storage_per_retry_policy.hpp"
 #include "common/storage_version.hpp"
-#include "credentials/policy/policies.hpp"
-#include "http/curl/curl.hpp"
+#include "azure/core/credentials/policy/policies.hpp"
+#include "azure/core/http/curl/curl.hpp"
 
 namespace Azure { namespace Storage { namespace Blobs {
 

sdk/storage/src/blobs/blob_service_client.cpp

@@ -8,8 +8,8 @@
 #include "common/storage_common.hpp"
 #include "common/storage_per_retry_policy.hpp"
 #include "common/storage_version.hpp"
-#include "credentials/policy/policies.hpp"
-#include "http/curl/curl.hpp"
+#include "azure/core/credentials/policy/policies.hpp"
+#include "azure/core/http/curl/curl.hpp"
 
 namespace Azure { namespace Storage { namespace Blobs {
 

sdk/storage/src/common/reliable_stream.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 
 #include "common/reliable_stream.hpp"
-#include "http/http.hpp"
+#include "azure/core/http/http.hpp"
 
 using Azure::Core::Context;
 using Azure::Core::Http::BodyStream;

sdk/storage/src/common/storage_common.cpp

@@ -3,7 +3,7 @@
 
 #include "common/storage_common.hpp"
 
-#include "uuid.hpp"
+#include "azure/core/uuid.hpp"
 
 namespace Azure { namespace Storage {
 

sdk/storage/src/common/storage_error.cpp

@@ -6,7 +6,7 @@
 #include "common/constants.hpp"
 #include "common/storage_common.hpp"
 #include "common/xml_wrapper.hpp"
-#include "http/policy.hpp"
+#include "azure/core/http/policy.hpp"
 #include "json.hpp"
 
 #include <type_traits>

sdk/storage/src/datalake/datalake_directory_client.cpp

@@ -9,10 +9,10 @@
 #include "common/storage_common.hpp"
 #include "common/storage_per_retry_policy.hpp"
 #include "common/storage_version.hpp"
-#include "credentials/policy/policies.hpp"
+#include "azure/core/credentials/policy/policies.hpp"
 #include "datalake/datalake_file_client.hpp"
 #include "datalake/datalake_utilities.hpp"
-#include "http/curl/curl.hpp"
+#include "azure/core/http/curl/curl.hpp"
 
 #include <limits>
 #include <utility> //std::pair

sdk/storage/src/datalake/datalake_file_client.cpp

@@ -9,9 +9,9 @@
 #include "common/storage_common.hpp"
 #include "common/storage_per_retry_policy.hpp"
 #include "common/storage_version.hpp"
-#include "credentials/policy/policies.hpp"
+#include "azure/core/credentials/policy/policies.hpp"
 #include "datalake/datalake_utilities.hpp"
-#include "http/curl/curl.hpp"
+#include "azure/core/http/curl/curl.hpp"
 
 #include <limits>
 #include <utility> //std::pair

sdk/storage/src/datalake/datalake_file_system_client.cpp

@@ -10,12 +10,12 @@
 #include "common/storage_common.hpp"
 #include "common/storage_per_retry_policy.hpp"
 #include "common/storage_version.hpp"
-#include "credentials/policy/policies.hpp"
+#include "azure/core/credentials/policy/policies.hpp"
 #include "datalake/datalake_directory_client.hpp"
 #include "datalake/datalake_file_client.hpp"
 #include "datalake/datalake_path_client.hpp"
 #include "datalake/datalake_utilities.hpp"
-#include "http/curl/curl.hpp"
+#include "azure/core/http/curl/curl.hpp"
 
 namespace Azure { namespace Storage { namespace Files { namespace DataLake {
   namespace {

sdk/storage/src/datalake/datalake_path_client.cpp

@@ -9,9 +9,9 @@
 #include "common/storage_common.hpp"
 #include "common/storage_per_retry_policy.hpp"
 #include "common/storage_version.hpp"
-#include "credentials/policy/policies.hpp"
+#include "azure/core/credentials/policy/policies.hpp"
 #include "datalake/datalake_utilities.hpp"
-#include "http/curl/curl.hpp"
+#include "azure/core/http/curl/curl.hpp"
 
 #include <limits>
 #include <utility> //std::pair

sdk/storage/src/datalake/datalake_service_client.cpp

@@ -10,10 +10,10 @@
 #include "common/storage_credential.hpp"
 #include "common/storage_per_retry_policy.hpp"
 #include "common/storage_version.hpp"
-#include "credentials/policy/policies.hpp"
+#include "azure/core/credentials/policy/policies.hpp"
 #include "datalake/datalake_file_system_client.hpp"
 #include "datalake/datalake_utilities.hpp"
-#include "http/curl/curl.hpp"
+#include "azure/core/http/curl/curl.hpp"
 
 namespace Azure { namespace Storage { namespace Files { namespace DataLake {
   namespace {

sdk/storage/src/shares/share_client.cpp

@@ -9,8 +9,8 @@
 #include "common/storage_common.hpp"
 #include "common/storage_per_retry_policy.hpp"
 #include "common/storage_version.hpp"
-#include "credentials/policy/policies.hpp"
-#include "http/curl/curl.hpp"
+#include "azure/core/credentials/policy/policies.hpp"
+#include "azure/core/http/curl/curl.hpp"
 #include "shares/share_directory_client.hpp"
 #include "shares/share_file_client.hpp"
 

sdk/storage/src/shares/share_directory_client.cpp

@@ -9,8 +9,8 @@
 #include "common/storage_common.hpp"
 #include "common/storage_per_retry_policy.hpp"
 #include "common/storage_version.hpp"
-#include "credentials/policy/policies.hpp"
-#include "http/curl/curl.hpp"
+#include "azure/core/credentials/policy/policies.hpp"
+#include "azure/core/http/curl/curl.hpp"
 #include "shares/share_file_client.hpp"
 
 namespace Azure { namespace Storage { namespace Files { namespace Shares {

sdk/storage/src/shares/share_file_client.cpp

@@ -12,8 +12,8 @@
 #include "common/storage_common.hpp"
 #include "common/storage_per_retry_policy.hpp"
 #include "common/storage_version.hpp"
-#include "credentials/policy/policies.hpp"
-#include "http/curl/curl.hpp"
+#include "azure/core/credentials/policy/policies.hpp"
+#include "azure/core/http/curl/curl.hpp"
 #include "shares/share_constants.hpp"
 
 namespace Azure { namespace Storage { namespace Files { namespace Shares {

sdk/storage/src/shares/share_service_client.cpp

@@ -9,8 +9,8 @@
 #include "common/storage_credential.hpp"
 #include "common/storage_per_retry_policy.hpp"
 #include "common/storage_version.hpp"
-#include "credentials/policy/policies.hpp"
-#include "http/curl/curl.hpp"
+#include "azure/core/credentials/policy/policies.hpp"
+#include "azure/core/http/curl/curl.hpp"
 #include "shares/share_client.hpp"
 
 namespace Azure { namespace Storage { namespace Files { namespace Shares {

sdk/storage/test/common/bearer_token_test.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 
 #include "blobs/blob.hpp"
-#include "credentials/credentials.hpp"
+#include "azure/core/credentials/credentials.hpp"
 #include "test_base.hpp"
 
 namespace Azure { namespace Storage { namespace Test {

sdk/storage/test/test_base.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "http/body_stream.hpp"
+#include "azure/core/http/body_stream.hpp"
 
 #include "common/constants.hpp"