From e09a89138366fdf376b06be55383ae6d8ad12428 Mon Sep 17 00:00:00 2001
From: JinmingHu <jinmhu@microsoft.com>
Date: Fri, 23 Oct 2020 11:39:29 +0800
Subject: [PATCH] move storage headers (#837)

* move blob.hpp

* move headers

* add changelog
---
 sdk/storage/azure-storage-blobs/CHANGELOG.md               | 6 ++++++
 sdk/storage/azure-storage-blobs/CMakeLists.txt             | 2 +-
 .../inc/azure/storage/{blobs/blob.hpp => blobs.hpp}        | 1 +
 .../azure-storage-blobs/sample/blob_getting_started.cpp    | 2 +-
 .../azure-storage-blobs/test/append_blob_client_test.hpp   | 2 +-
 .../azure-storage-blobs/test/blob_batch_client_test.cpp    | 2 +-
 .../test/blob_container_client_test.hpp                    | 2 +-
 .../azure-storage-blobs/test/blob_service_client_test.cpp  | 2 +-
 .../azure-storage-blobs/test/block_blob_client_test.hpp    | 2 +-
 sdk/storage/azure-storage-blobs/test/large_scale_test.cpp  | 2 +-
 .../azure-storage-blobs/test/page_blob_client_test.hpp     | 2 +-
 .../azure-storage-blobs/test/storage_retry_policy_test.cpp | 2 +-
 .../azure-storage-common/test/bearer_token_test.cpp        | 2 +-
 sdk/storage/azure-storage-files-datalake/CHANGELOG.md      | 6 ++++++
 sdk/storage/azure-storage-files-datalake/CMakeLists.txt    | 2 +-
 .../inc/azure/storage/files/{datalake => }/datalake.hpp    | 1 +
 .../sample/datalake_getting_started.cpp                    | 2 +-
 .../test/datalake_directory_client_test.hpp                | 2 +-
 .../test/datalake_file_client_test.hpp                     | 2 +-
 .../test/datalake_file_system_client_test.hpp              | 2 +-
 .../test/datalake_path_client_test.hpp                     | 2 +-
 .../test/datalake_service_client_test.hpp                  | 2 +-
 sdk/storage/azure-storage-files-shares/CHANGELOG.md        | 7 +++++++
 sdk/storage/azure-storage-files-shares/CMakeLists.txt      | 2 +-
 .../inc/azure/storage/files/{shares => }/shares.hpp        | 1 +
 .../sample/file_share_getting_started.cpp                  | 2 +-
 .../azure-storage-files-shares/test/share_client_test.hpp  | 2 +-
 .../test/share_directory_client_test.hpp                   | 2 +-
 .../test/share_file_client_test.hpp                        | 2 +-
 .../test/share_service_client_test.hpp                     | 2 +-
 30 files changed, 46 insertions(+), 24 deletions(-)
 rename sdk/storage/azure-storage-blobs/inc/azure/storage/{blobs/blob.hpp => blobs.hpp} (90%)
 rename sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/{datalake => }/datalake.hpp (87%)
 rename sdk/storage/azure-storage-files-shares/inc/azure/storage/files/{shares => }/shares.hpp (85%)

diff --git a/sdk/storage/azure-storage-blobs/CHANGELOG.md b/sdk/storage/azure-storage-blobs/CHANGELOG.md
index 3838674d6..00376db21 100644
--- a/sdk/storage/azure-storage-blobs/CHANGELOG.md
+++ b/sdk/storage/azure-storage-blobs/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Release History
 
+## 1.0.0-beta.5 (Unreleased)
+
+### Breaking Changes
+
+* Move header `azure/storage/blobs/blob.hpp` to `azure/storage/blobs.hpp`
+
 ## 1.0.0-beta.4 (2020-10-16)
 
 ### Bug Fixes
diff --git a/sdk/storage/azure-storage-blobs/CMakeLists.txt b/sdk/storage/azure-storage-blobs/CMakeLists.txt
index a135e34bb..f3294ba57 100644
--- a/sdk/storage/azure-storage-blobs/CMakeLists.txt
+++ b/sdk/storage/azure-storage-blobs/CMakeLists.txt
@@ -4,8 +4,8 @@
 cmake_minimum_required (VERSION 3.13)
 
 set (AZURE_STORAGE_BLOB_HEADER
+    inc/azure/storage/blobs.hpp
     inc/azure/storage/blobs/append_blob_client.hpp
-    inc/azure/storage/blobs/blob.hpp
     inc/azure/storage/blobs/blob_batch_client.hpp
     inc/azure/storage/blobs/blob_client.hpp
     inc/azure/storage/blobs/blob_container_client.hpp
diff --git a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob.hpp b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs.hpp
similarity index 90%
rename from sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob.hpp
rename to sdk/storage/azure-storage-blobs/inc/azure/storage/blobs.hpp
index 4f49f9253..6f88fe282 100644
--- a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob.hpp
+++ b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs.hpp
@@ -7,6 +7,7 @@
 #include "azure/storage/blobs/blob_batch_client.hpp"
 #include "azure/storage/blobs/blob_client.hpp"
 #include "azure/storage/blobs/blob_container_client.hpp"
+#include "azure/storage/blobs/blob_sas_builder.hpp"
 #include "azure/storage/blobs/blob_service_client.hpp"
 #include "azure/storage/blobs/block_blob_client.hpp"
 #include "azure/storage/blobs/page_blob_client.hpp"
diff --git a/sdk/storage/azure-storage-blobs/sample/blob_getting_started.cpp b/sdk/storage/azure-storage-blobs/sample/blob_getting_started.cpp
index be75d22fe..2503340f6 100644
--- a/sdk/storage/azure-storage-blobs/sample/blob_getting_started.cpp
+++ b/sdk/storage/azure-storage-blobs/sample/blob_getting_started.cpp
@@ -3,7 +3,7 @@
 
 #include <iostream>
 
-#include "azure/storage/blobs/blob.hpp"
+#include "azure/storage/blobs.hpp"
 #include "samples_common.hpp"
 
 SAMPLE(BlobsGettingStarted, BlobsGettingStarted)
diff --git a/sdk/storage/azure-storage-blobs/test/append_blob_client_test.hpp b/sdk/storage/azure-storage-blobs/test/append_blob_client_test.hpp
index 3018dcdc2..872d482f0 100644
--- a/sdk/storage/azure-storage-blobs/test/append_blob_client_test.hpp
+++ b/sdk/storage/azure-storage-blobs/test/append_blob_client_test.hpp
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "azure/storage/blobs/blob.hpp"
+#include "azure/storage/blobs.hpp"
 #include "blob_container_client_test.hpp"
 #include "test_base.hpp"
 
diff --git a/sdk/storage/azure-storage-blobs/test/blob_batch_client_test.cpp b/sdk/storage/azure-storage-blobs/test/blob_batch_client_test.cpp
index 7ec29e515..a5d5ee4a5 100644
--- a/sdk/storage/azure-storage-blobs/test/blob_batch_client_test.cpp
+++ b/sdk/storage/azure-storage-blobs/test/blob_batch_client_test.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "azure/storage/blobs/blob.hpp"
+#include "azure/storage/blobs.hpp"
 #include "azure/storage/blobs/blob_sas_builder.hpp"
 #include "test_base.hpp"
 
diff --git a/sdk/storage/azure-storage-blobs/test/blob_container_client_test.hpp b/sdk/storage/azure-storage-blobs/test/blob_container_client_test.hpp
index cad9c18fa..34d6709b9 100644
--- a/sdk/storage/azure-storage-blobs/test/blob_container_client_test.hpp
+++ b/sdk/storage/azure-storage-blobs/test/blob_container_client_test.hpp
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "azure/storage/blobs/blob.hpp"
+#include "azure/storage/blobs.hpp"
 #include "test_base.hpp"
 
 namespace Azure { namespace Storage { namespace Test {
diff --git a/sdk/storage/azure-storage-blobs/test/blob_service_client_test.cpp b/sdk/storage/azure-storage-blobs/test/blob_service_client_test.cpp
index 6de305b6d..bfa770513 100644
--- a/sdk/storage/azure-storage-blobs/test/blob_service_client_test.cpp
+++ b/sdk/storage/azure-storage-blobs/test/blob_service_client_test.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "azure/storage/blobs/blob.hpp"
+#include "azure/storage/blobs.hpp"
 #include "test_base.hpp"
 
 #include <thread>
diff --git a/sdk/storage/azure-storage-blobs/test/block_blob_client_test.hpp b/sdk/storage/azure-storage-blobs/test/block_blob_client_test.hpp
index 12e1f8050..02c6db901 100644
--- a/sdk/storage/azure-storage-blobs/test/block_blob_client_test.hpp
+++ b/sdk/storage/azure-storage-blobs/test/block_blob_client_test.hpp
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "azure/storage/blobs/blob.hpp"
+#include "azure/storage/blobs.hpp"
 #include "blob_container_client_test.hpp"
 #include "test_base.hpp"
 
diff --git a/sdk/storage/azure-storage-blobs/test/large_scale_test.cpp b/sdk/storage/azure-storage-blobs/test/large_scale_test.cpp
index 018b1c95e..78dc14330 100644
--- a/sdk/storage/azure-storage-blobs/test/large_scale_test.cpp
+++ b/sdk/storage/azure-storage-blobs/test/large_scale_test.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "azure/storage/blobs/blob.hpp"
+#include "azure/storage/blobs.hpp"
 #include "azure/storage/common/file_io.hpp"
 #include "test_base.hpp"
 
diff --git a/sdk/storage/azure-storage-blobs/test/page_blob_client_test.hpp b/sdk/storage/azure-storage-blobs/test/page_blob_client_test.hpp
index 16228c3d8..62f612f78 100644
--- a/sdk/storage/azure-storage-blobs/test/page_blob_client_test.hpp
+++ b/sdk/storage/azure-storage-blobs/test/page_blob_client_test.hpp
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "azure/storage/blobs/blob.hpp"
+#include "azure/storage/blobs.hpp"
 #include "blob_container_client_test.hpp"
 #include "test_base.hpp"
 
diff --git a/sdk/storage/azure-storage-blobs/test/storage_retry_policy_test.cpp b/sdk/storage/azure-storage-blobs/test/storage_retry_policy_test.cpp
index 24e8f5b86..efed4554e 100644
--- a/sdk/storage/azure-storage-blobs/test/storage_retry_policy_test.cpp
+++ b/sdk/storage/azure-storage-blobs/test/storage_retry_policy_test.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "azure/storage/blobs/blob.hpp"
+#include "azure/storage/blobs.hpp"
 #include "test_base.hpp"
 
 #include <chrono>
diff --git a/sdk/storage/azure-storage-common/test/bearer_token_test.cpp b/sdk/storage/azure-storage-common/test/bearer_token_test.cpp
index 0860f971d..c066ac52a 100644
--- a/sdk/storage/azure-storage-common/test/bearer_token_test.cpp
+++ b/sdk/storage/azure-storage-common/test/bearer_token_test.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 
 #include "azure/identity/client_secret_credential.hpp"
-#include "azure/storage/blobs/blob.hpp"
+#include "azure/storage/blobs.hpp"
 #include "test_base.hpp"
 
 namespace Azure { namespace Storage { namespace Test {
diff --git a/sdk/storage/azure-storage-files-datalake/CHANGELOG.md b/sdk/storage/azure-storage-files-datalake/CHANGELOG.md
index eb487e108..5936a1e09 100644
--- a/sdk/storage/azure-storage-files-datalake/CHANGELOG.md
+++ b/sdk/storage/azure-storage-files-datalake/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Release History
 
+## 1.0.0-beta.5 (Unreleased)
+
+### Breaking Changes
+
+* Move header `azure/storage/files/datalake/datalake.hpp` to `azure/storage/files/datalake.hpp`
+
 ## 1.0.0-beta.4 (2020-10-16)
 
 ### Bug Fixes
diff --git a/sdk/storage/azure-storage-files-datalake/CMakeLists.txt b/sdk/storage/azure-storage-files-datalake/CMakeLists.txt
index b02e66781..dd79e05b9 100644
--- a/sdk/storage/azure-storage-files-datalake/CMakeLists.txt
+++ b/sdk/storage/azure-storage-files-datalake/CMakeLists.txt
@@ -4,7 +4,7 @@
 cmake_minimum_required (VERSION 3.13)
 
 set (AZURE_STORAGE_DATALAKE_HEADER
-    inc/azure/storage/files/datalake/datalake.hpp
+    inc/azure/storage/files/datalake.hpp
     inc/azure/storage/files/datalake/datalake_directory_client.hpp
     inc/azure/storage/files/datalake/datalake_file_client.hpp
     inc/azure/storage/files/datalake/datalake_file_system_client.hpp
diff --git a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake.hpp b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake.hpp
similarity index 87%
rename from sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake.hpp
rename to sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake.hpp
index ab22dce52..ce6cf6c29 100644
--- a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake.hpp
+++ b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake.hpp
@@ -7,4 +7,5 @@
 #include "azure/storage/files/datalake/datalake_file_client.hpp"
 #include "azure/storage/files/datalake/datalake_file_system_client.hpp"
 #include "azure/storage/files/datalake/datalake_path_client.hpp"
+#include "azure/storage/files/datalake/datalake_sas_builder.hpp"
 #include "azure/storage/files/datalake/datalake_service_client.hpp"
diff --git a/sdk/storage/azure-storage-files-datalake/sample/datalake_getting_started.cpp b/sdk/storage/azure-storage-files-datalake/sample/datalake_getting_started.cpp
index d6847e428..842f42ff1 100644
--- a/sdk/storage/azure-storage-files-datalake/sample/datalake_getting_started.cpp
+++ b/sdk/storage/azure-storage-files-datalake/sample/datalake_getting_started.cpp
@@ -3,7 +3,7 @@
 
 #include <iostream>
 
-#include "azure/storage/files/datalake/datalake.hpp"
+#include "azure/storage/files/datalake.hpp"
 #include "samples_common.hpp"
 
 SAMPLE(DataLakeGettingStarted, DataLakeGettingStarted)
diff --git a/sdk/storage/azure-storage-files-datalake/test/datalake_directory_client_test.hpp b/sdk/storage/azure-storage-files-datalake/test/datalake_directory_client_test.hpp
index 191a52e59..43305a8e8 100644
--- a/sdk/storage/azure-storage-files-datalake/test/datalake_directory_client_test.hpp
+++ b/sdk/storage/azure-storage-files-datalake/test/datalake_directory_client_test.hpp
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "azure/storage/files/datalake/datalake.hpp"
+#include "azure/storage/files/datalake.hpp"
 #include "datalake_path_client_test.hpp"
 #include "test_base.hpp"
 
diff --git a/sdk/storage/azure-storage-files-datalake/test/datalake_file_client_test.hpp b/sdk/storage/azure-storage-files-datalake/test/datalake_file_client_test.hpp
index 957278bc4..d9871098f 100644
--- a/sdk/storage/azure-storage-files-datalake/test/datalake_file_client_test.hpp
+++ b/sdk/storage/azure-storage-files-datalake/test/datalake_file_client_test.hpp
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "azure/storage/files/datalake/datalake.hpp"
+#include "azure/storage/files/datalake.hpp"
 #include "datalake_file_system_client_test.hpp"
 #include "test_base.hpp"
 
diff --git a/sdk/storage/azure-storage-files-datalake/test/datalake_file_system_client_test.hpp b/sdk/storage/azure-storage-files-datalake/test/datalake_file_system_client_test.hpp
index 3a3ed3c91..1b18fdfbb 100644
--- a/sdk/storage/azure-storage-files-datalake/test/datalake_file_system_client_test.hpp
+++ b/sdk/storage/azure-storage-files-datalake/test/datalake_file_system_client_test.hpp
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "azure/storage/files/datalake/datalake.hpp"
+#include "azure/storage/files/datalake.hpp"
 #include "test_base.hpp"
 
 namespace Azure { namespace Storage { namespace Test {
diff --git a/sdk/storage/azure-storage-files-datalake/test/datalake_path_client_test.hpp b/sdk/storage/azure-storage-files-datalake/test/datalake_path_client_test.hpp
index efe148996..834644497 100644
--- a/sdk/storage/azure-storage-files-datalake/test/datalake_path_client_test.hpp
+++ b/sdk/storage/azure-storage-files-datalake/test/datalake_path_client_test.hpp
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "azure/storage/files/datalake/datalake.hpp"
+#include "azure/storage/files/datalake.hpp"
 #include "datalake_file_system_client_test.hpp"
 #include "test_base.hpp"
 
diff --git a/sdk/storage/azure-storage-files-datalake/test/datalake_service_client_test.hpp b/sdk/storage/azure-storage-files-datalake/test/datalake_service_client_test.hpp
index 603466e8e..f4af7eb7b 100644
--- a/sdk/storage/azure-storage-files-datalake/test/datalake_service_client_test.hpp
+++ b/sdk/storage/azure-storage-files-datalake/test/datalake_service_client_test.hpp
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "azure/storage/files/datalake/datalake.hpp"
+#include "azure/storage/files/datalake.hpp"
 #include "test_base.hpp"
 
 namespace Azure { namespace Storage { namespace Test {
diff --git a/sdk/storage/azure-storage-files-shares/CHANGELOG.md b/sdk/storage/azure-storage-files-shares/CHANGELOG.md
index 89ed8b8aa..6745a5233 100644
--- a/sdk/storage/azure-storage-files-shares/CHANGELOG.md
+++ b/sdk/storage/azure-storage-files-shares/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Release History
 
+## 1.0.0-beta.5 (Unreleased)
+
+### Breaking Changes
+
+* Move header `azure/storage/files/shares/shares.hpp` to `azure/storage/files/shares.hpp`
+
+
 ## 1.0.0-beta.4 (2020-10-16)
 
 ### Bug Fixes
diff --git a/sdk/storage/azure-storage-files-shares/CMakeLists.txt b/sdk/storage/azure-storage-files-shares/CMakeLists.txt
index 3485d2a44..3955009cc 100644
--- a/sdk/storage/azure-storage-files-shares/CMakeLists.txt
+++ b/sdk/storage/azure-storage-files-shares/CMakeLists.txt
@@ -4,6 +4,7 @@
 cmake_minimum_required (VERSION 3.13)
 
 set (AZURE_STORAGE_SHARES_HEADER
+    inc/azure/storage/files/shares.hpp
     inc/azure/storage/files/shares/protocol/share_rest_client.hpp
     inc/azure/storage/files/shares/share_client.hpp
     inc/azure/storage/files/shares/share_constants.hpp
@@ -14,7 +15,6 @@ set (AZURE_STORAGE_SHARES_HEADER
     inc/azure/storage/files/shares/share_responses.hpp
     inc/azure/storage/files/shares/share_sas_builder.hpp
     inc/azure/storage/files/shares/share_service_client.hpp
-    inc/azure/storage/files/shares/shares.hpp
 )
 
 set (AZURE_STORAGE_SHARES_SOURCE
diff --git a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/shares.hpp b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares.hpp
similarity index 85%
rename from sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/shares.hpp
rename to sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares.hpp
index 9d433109a..1714995c1 100644
--- a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/shares.hpp
+++ b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares.hpp
@@ -6,4 +6,5 @@
 #include "azure/storage/files/shares/share_client.hpp"
 #include "azure/storage/files/shares/share_directory_client.hpp"
 #include "azure/storage/files/shares/share_file_client.hpp"
+#include "azure/storage/files/shares/share_sas_builder.hpp"
 #include "azure/storage/files/shares/share_service_client.hpp"
diff --git a/sdk/storage/azure-storage-files-shares/sample/file_share_getting_started.cpp b/sdk/storage/azure-storage-files-shares/sample/file_share_getting_started.cpp
index 3bf522b25..1d99691ad 100644
--- a/sdk/storage/azure-storage-files-shares/sample/file_share_getting_started.cpp
+++ b/sdk/storage/azure-storage-files-shares/sample/file_share_getting_started.cpp
@@ -3,7 +3,7 @@
 
 #include <iostream>
 
-#include "azure/storage/files/shares/shares.hpp"
+#include "azure/storage/files/shares.hpp"
 #include "samples_common.hpp"
 
 SAMPLE(FileShareGettingStarted, FileShareGettingStarted)
diff --git a/sdk/storage/azure-storage-files-shares/test/share_client_test.hpp b/sdk/storage/azure-storage-files-shares/test/share_client_test.hpp
index f6531e942..e4e0e3cd0 100644
--- a/sdk/storage/azure-storage-files-shares/test/share_client_test.hpp
+++ b/sdk/storage/azure-storage-files-shares/test/share_client_test.hpp
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "azure/storage/files/shares/shares.hpp"
+#include "azure/storage/files/shares.hpp"
 #include "test_base.hpp"
 
 namespace Azure { namespace Storage { namespace Test {
diff --git a/sdk/storage/azure-storage-files-shares/test/share_directory_client_test.hpp b/sdk/storage/azure-storage-files-shares/test/share_directory_client_test.hpp
index e2e2e37e9..b01d82cab 100644
--- a/sdk/storage/azure-storage-files-shares/test/share_directory_client_test.hpp
+++ b/sdk/storage/azure-storage-files-shares/test/share_directory_client_test.hpp
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "azure/storage/files/shares/shares.hpp"
+#include "azure/storage/files/shares.hpp"
 #include "share_client_test.hpp"
 #include "test_base.hpp"
 
diff --git a/sdk/storage/azure-storage-files-shares/test/share_file_client_test.hpp b/sdk/storage/azure-storage-files-shares/test/share_file_client_test.hpp
index 6aeb2daaf..86b52f02b 100644
--- a/sdk/storage/azure-storage-files-shares/test/share_file_client_test.hpp
+++ b/sdk/storage/azure-storage-files-shares/test/share_file_client_test.hpp
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "azure/storage/files/shares/shares.hpp"
+#include "azure/storage/files/shares.hpp"
 #include "share_directory_client_test.hpp"
 #include "test_base.hpp"
 
diff --git a/sdk/storage/azure-storage-files-shares/test/share_service_client_test.hpp b/sdk/storage/azure-storage-files-shares/test/share_service_client_test.hpp
index a8298baf7..de6cb6549 100644
--- a/sdk/storage/azure-storage-files-shares/test/share_service_client_test.hpp
+++ b/sdk/storage/azure-storage-files-shares/test/share_service_client_test.hpp
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "azure/storage/files/shares/shares.hpp"
+#include "azure/storage/files/shares.hpp"
 #include "test_base.hpp"
 
 namespace Azure { namespace Storage { namespace Test {