Isolate headers for AMQP internal types into an internal-only header directory. Fixes #5069 (#5079)

* Moved internal AMQP types to internal header directory

* Updated consumers of AMQP headers to match moved headers

* Updated changelog to reflect breaking change in AMQP

* Made includes explicit in event_data.hpp

* Reference non-package headers with angle braces not quotes

sdk/core/azure-core-amqp/CHANGELOG.md

@@ -6,11 +6,12 @@
 
 ### Breaking Changes
 
+- Refactored AMQP headers to isolate internal-only types to "internal" subdirectory in headers.
+
 ### Bugs Fixed
 
 ### Other Changes
 
-- Added several `ostream` insertion operators for AMQP types.
 - Removed public dependency on azure-uamqp-c to enable local bug fixes.
 
 ## 1.0.0-beta.4 (2023-10-05)

sdk/core/azure-core-amqp/CMakeLists.txt

@@ -57,37 +57,37 @@ find_package(azure_c_shared_utility CONFIG REQUIRED)
 
 set (AZURE_CORE_AMQP_HEADER
     inc/azure/core/amqp.hpp
-    inc/azure/core/amqp/cancellable.hpp
-    inc/azure/core/amqp/claims_based_security.hpp
-    inc/azure/core/amqp/connection_string_credential.hpp
-    inc/azure/core/amqp/connection.hpp
     inc/azure/core/amqp/dll_import_export.hpp
-    inc/azure/core/amqp/doxygen_pragma.hpp
-    inc/azure/core/amqp/endpoint.hpp
-    inc/azure/core/amqp/link.hpp
-    inc/azure/core/amqp/management.hpp
-    inc/azure/core/amqp/message_receiver.hpp
-    inc/azure/core/amqp/message_sender.hpp
-    inc/azure/core/amqp/rtti.hpp
-    inc/azure/core/amqp/session.hpp
-    inc/azure/core/amqp/common/async_operation_queue.hpp
-    inc/azure/core/amqp/common/completion_operation.hpp
-    inc/azure/core/amqp/common/global_state.hpp
-    inc/azure/core/amqp/models/amqp_error.hpp
+    inc/azure/core/amqp/internal/cancellable.hpp
+    inc/azure/core/amqp/internal/claims_based_security.hpp
+    inc/azure/core/amqp/internal/common/async_operation_queue.hpp
+    inc/azure/core/amqp/internal/common/completion_operation.hpp
+    inc/azure/core/amqp/internal/common/global_state.hpp
+    inc/azure/core/amqp/internal/connection.hpp
+    inc/azure/core/amqp/internal/connection_string_credential.hpp
+    inc/azure/core/amqp/internal/doxygen_pragma.hpp
+    inc/azure/core/amqp/internal/endpoint.hpp
+    inc/azure/core/amqp/internal/link.hpp
+    inc/azure/core/amqp/internal/management.hpp
+    inc/azure/core/amqp/internal/message_receiver.hpp
+    inc/azure/core/amqp/internal/message_sender.hpp
+    inc/azure/core/amqp/internal/models/amqp_error.hpp
+    inc/azure/core/amqp/internal/models/amqp_protocol.hpp
+    inc/azure/core/amqp/internal/models/message_source.hpp
+    inc/azure/core/amqp/internal/models/message_target.hpp
+    inc/azure/core/amqp/internal/models/messaging_values.hpp
+    inc/azure/core/amqp/internal/network/amqp_header_detect_transport.hpp
+    inc/azure/core/amqp/internal/network/sasl_transport.hpp
+    inc/azure/core/amqp/internal/network/socket_listener.hpp
+    inc/azure/core/amqp/internal/network/socket_transport.hpp
+    inc/azure/core/amqp/internal/network/tls_transport.hpp
+    inc/azure/core/amqp/internal/network/transport.hpp
+    inc/azure/core/amqp/internal/session.hpp
     inc/azure/core/amqp/models/amqp_header.hpp
     inc/azure/core/amqp/models/amqp_message.hpp
     inc/azure/core/amqp/models/amqp_properties.hpp
-    inc/azure/core/amqp/models/amqp_protocol.hpp
     inc/azure/core/amqp/models/amqp_value.hpp
-    inc/azure/core/amqp/models/message_source.hpp
-    inc/azure/core/amqp/models/message_target.hpp
-    inc/azure/core/amqp/models/messaging_values.hpp
-    inc/azure/core/amqp/network/amqp_header_detect_transport.hpp
-    inc/azure/core/amqp/network/sasl_transport.hpp
-    inc/azure/core/amqp/network/socket_listener.hpp
-    inc/azure/core/amqp/network/socket_transport.hpp
-    inc/azure/core/amqp/network/tls_transport.hpp
-    inc/azure/core/amqp/network/transport.hpp
+    inc/azure/core/amqp/rtti.hpp
 )
 
 set(AZURE_CORE_AMQP_SOURCE

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

@@ -2,30 +2,9 @@
 // Licensed under the MIT License.
 #pragma once
 
-#include "azure/core/amqp/cancellable.hpp"
-#include "azure/core/amqp/claims_based_security.hpp"
-#include "azure/core/amqp/common/async_operation_queue.hpp"
-#include "azure/core/amqp/common/completion_operation.hpp"
-#include "azure/core/amqp/connection.hpp"
-#include "azure/core/amqp/connection_string_credential.hpp"
 #include "azure/core/amqp/dll_import_export.hpp"
-#include "azure/core/amqp/link.hpp"
-#include "azure/core/amqp/management.hpp"
-#include "azure/core/amqp/message_receiver.hpp"
-#include "azure/core/amqp/message_sender.hpp"
 #include "azure/core/amqp/models/amqp_header.hpp"
 #include "azure/core/amqp/models/amqp_message.hpp"
 #include "azure/core/amqp/models/amqp_properties.hpp"
-#include "azure/core/amqp/models/amqp_protocol.hpp"
 #include "azure/core/amqp/models/amqp_value.hpp"
-#include "azure/core/amqp/models/message_source.hpp"
-#include "azure/core/amqp/models/message_target.hpp"
-#include "azure/core/amqp/models/messaging_values.hpp"
-#include "azure/core/amqp/network/amqp_header_detect_transport.hpp"
-#include "azure/core/amqp/network/sasl_transport.hpp"
-#include "azure/core/amqp/network/socket_listener.hpp"
-#include "azure/core/amqp/network/socket_transport.hpp"
-#include "azure/core/amqp/network/tls_transport.hpp"
-#include "azure/core/amqp/network/transport.hpp"
 #include "azure/core/amqp/rtti.hpp"
-#include "azure/core/amqp/session.hpp"

sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/claims_based_security.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "azure/core/amqp/session.hpp"
+#include "azure/core/amqp/internal/session.hpp"
 
 #include <azure/core/context.hpp>
 

sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/connection.hpp

@@ -3,10 +3,10 @@
 
 #pragma once
 
-#include "azure/core/amqp/models/amqp_protocol.hpp"
+#include "azure/core/amqp/internal/models/amqp_protocol.hpp"
+#include "azure/core/amqp/models/amqp_value.hpp"
 #include "common/async_operation_queue.hpp"
 #include "connection_string_credential.hpp"
-#include "models/amqp_value.hpp"
 #include "session.hpp"
 
 #include <azure/core/credentials/credentials.hpp>

sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/endpoint.hpp

@@ -3,9 +3,9 @@
 
 #pragma once
 
+#include "azure/core/amqp/models/amqp_value.hpp"
 #include "common/async_operation_queue.hpp"
 #include "connection_string_credential.hpp"
-#include "models/amqp_value.hpp"
 
 #include <chrono>
 #include <memory>

sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/link.hpp

@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include "models/amqp_value.hpp"
-#include "models/message_source.hpp"
-#include "models/message_target.hpp"
+#include "azure/core/amqp/internal/models/message_source.hpp"
+#include "azure/core/amqp/internal/models/message_target.hpp"
+#include "azure/core/amqp/models/amqp_value.hpp"
 
 #include <chrono>
 #include <memory>

sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/management.hpp

@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include "models/amqp_error.hpp"
-#include "models/amqp_message.hpp"
+#include "azure/core/amqp/internal/models/amqp_error.hpp"
+#include "azure/core/amqp/models/amqp_message.hpp"
 #include "session.hpp"
 
 #include <azure/core/context.hpp>

sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/message_receiver.hpp

@@ -3,13 +3,13 @@
 
 #pragma once
 
+#include "azure/core/amqp/internal/models/amqp_error.hpp"
+#include "azure/core/amqp/models/amqp_message.hpp"
+#include "azure/core/amqp/models/amqp_value.hpp"
 #include "claims_based_security.hpp"
 #include "common/async_operation_queue.hpp"
 #include "connection_string_credential.hpp"
 #include "link.hpp"
-#include "models/amqp_error.hpp"
-#include "models/amqp_message.hpp"
-#include "models/amqp_value.hpp"
 #include "session.hpp"
 
 #include <azure/core/credentials/credentials.hpp>

sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/message_sender.hpp

@@ -3,14 +3,14 @@
 
 #pragma once
 
+#include "azure/core/amqp/models/amqp_message.hpp"
+#include "azure/core/amqp/models/amqp_value.hpp"
 #include "cancellable.hpp"
 #include "claims_based_security.hpp"
 #include "common/async_operation_queue.hpp"
 #include "connection.hpp"
 #include "link.hpp"
 #include "models/amqp_error.hpp"
-#include "models/amqp_message.hpp"
-#include "models/amqp_value.hpp"
 
 #include <azure/core/nullable.hpp>
 

sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/models/amqp_error.hpp

@@ -3,10 +3,10 @@
 
 #pragma once
 
-#include "amqp_header.hpp"
-#include "amqp_properties.hpp"
-#include "amqp_value.hpp"
 #include "azure/core/amqp/dll_import_export.hpp"
+#include "azure/core/amqp/models/amqp_header.hpp"
+#include "azure/core/amqp/models/amqp_properties.hpp"
+#include "azure/core/amqp/models/amqp_value.hpp"
 
 #include <azure/core/internal/extendable_enumeration.hpp>
 

sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/models/message_source.hpp

@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include "amqp_header.hpp"
-#include "amqp_properties.hpp"
-#include "amqp_value.hpp"
+#include "azure/core/amqp/models/amqp_header.hpp"
+#include "azure/core/amqp/models/amqp_properties.hpp"
+#include "azure/core/amqp/models/amqp_value.hpp"
 
 struct SOURCE_INSTANCE_TAG;
 

sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/models/message_target.hpp

@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include "amqp_header.hpp"
-#include "amqp_properties.hpp"
-#include "amqp_value.hpp"
+#include "azure/core/amqp/models/amqp_header.hpp"
+#include "azure/core/amqp/models/amqp_properties.hpp"
+#include "azure/core/amqp/models/amqp_value.hpp"
 
 struct TARGET_INSTANCE_TAG;
 

sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/models/messaging_values.hpp

@@ -3,7 +3,8 @@
 
 #pragma once
 
-#include "amqp_value.hpp"
+#include "azure/core/amqp/models/amqp_value.hpp"
+
 namespace Azure { namespace Core { namespace Amqp { namespace Models { namespace _internal {
   class Messaging final {
   public:

sdk/core/azure-core-amqp/inc/azure/core/amqp/internal/session.hpp

@@ -3,10 +3,10 @@
 
 #pragma once
 
+#include "azure/core/amqp/models/amqp_value.hpp"
 #include "common/async_operation_queue.hpp"
 #include "connection_string_credential.hpp"
 #include "endpoint.hpp"
-#include "models/amqp_value.hpp"
 #include "models/message_source.hpp"
 #include "models/message_target.hpp"
 

sdk/core/azure-core-amqp/samples/internal/eventhub_get_properties_sample/eventhub_get_eventhub_properties_sample.cpp

@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-#include <azure/core/amqp/connection.hpp>
-#include <azure/core/amqp/connection_string_credential.hpp>
-#include <azure/core/amqp/management.hpp>
-#include <azure/core/amqp/message_sender.hpp>
+#include <azure/core/amqp/internal/connection.hpp>
+#include <azure/core/amqp/internal/connection_string_credential.hpp>
+#include <azure/core/amqp/internal/management.hpp>
+#include <azure/core/amqp/internal/message_sender.hpp>
 #include <azure/identity/client_secret_credential.hpp>
 
 #include <chrono>

sdk/core/azure-core-amqp/samples/internal/eventhub_sas_reader_sample/eventhub_sas_reader_sample.cpp

@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-#include <azure/core/amqp/connection.hpp>
-#include <azure/core/amqp/message_receiver.hpp>
-#include <azure/core/amqp/network/sasl_transport.hpp>
+#include <azure/core/amqp/internal/connection.hpp>
+#include <azure/core/amqp/internal/message_receiver.hpp>
+#include <azure/core/amqp/internal/network/sasl_transport.hpp>
 
 #include <chrono>
 #include <iostream>

sdk/core/azure-core-amqp/samples/internal/eventhub_sas_writer_sample/eventhub_sas_writer_sample.cpp

@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-#include <azure/core/amqp/connection.hpp>
-#include <azure/core/amqp/connection_string_credential.hpp>
-#include <azure/core/amqp/message_sender.hpp>
+#include <azure/core/amqp/internal/connection.hpp>
+#include <azure/core/amqp/internal/connection_string_credential.hpp>
+#include <azure/core/amqp/internal/message_sender.hpp>
 
 #include <chrono>
 #include <iostream>

sdk/core/azure-core-amqp/samples/internal/eventhub_token_reader_sample/eventhub_token_reader_sample.cpp

@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-#include <azure/core/amqp/connection.hpp>
-#include <azure/core/amqp/message_receiver.hpp>
-#include <azure/core/amqp/network/sasl_transport.hpp>
+#include <azure/core/amqp/internal/connection.hpp>
+#include <azure/core/amqp/internal/message_receiver.hpp>
+#include <azure/core/amqp/internal/network/sasl_transport.hpp>
 
 #include <chrono>
 #include <iostream>

sdk/core/azure-core-amqp/samples/internal/eventhub_token_writer_sample/eventhub_token_writer_sample.cpp

@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-#include <azure/core/amqp/connection.hpp>
-#include <azure/core/amqp/connection_string_credential.hpp>
-#include <azure/core/amqp/message_sender.hpp>
+#include <azure/core/amqp/internal/connection.hpp>
+#include <azure/core/amqp/internal/connection_string_credential.hpp>
+#include <azure/core/amqp/internal/message_sender.hpp>
 #include <azure/core/credentials/credentials.hpp>
 #include <azure/identity/client_secret_credential.hpp>
 

sdk/core/azure-core-amqp/samples/internal/local_client_async_sample/local_client_async_sample.cpp

@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-#include <azure/core/amqp/connection.hpp>
-#include <azure/core/amqp/message_sender.hpp>
-#include <azure/core/amqp/models/messaging_values.hpp>
+#include <azure/core/amqp/internal/connection.hpp>
+#include <azure/core/amqp/internal/message_sender.hpp>
+#include <azure/core/amqp/internal/models/messaging_values.hpp>
 
 #include <chrono>
 #include <iostream>

sdk/core/azure-core-amqp/samples/internal/local_client_sample/local_client_sample.cpp

@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-#include <azure/core/amqp/connection.hpp>
-#include <azure/core/amqp/message_sender.hpp>
+#include <azure/core/amqp/internal/connection.hpp>
+#include <azure/core/amqp/internal/message_sender.hpp>
 
 #include <chrono>
 #include <iostream>

sdk/core/azure-core-amqp/samples/internal/local_server_sample/local_server_sample.cpp

@@ -1,14 +1,14 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-#include <azure/core/amqp/common/async_operation_queue.hpp>
-#include <azure/core/amqp/connection.hpp>
-#include <azure/core/amqp/message_receiver.hpp>
-#include <azure/core/amqp/models/message_source.hpp>
-#include <azure/core/amqp/models/message_target.hpp>
-#include <azure/core/amqp/models/messaging_values.hpp>
-#include <azure/core/amqp/network/amqp_header_detect_transport.hpp>
-#include <azure/core/amqp/network/socket_listener.hpp>
+#include <azure/core/amqp/internal/common/async_operation_queue.hpp>
+#include <azure/core/amqp/internal/connection.hpp>
+#include <azure/core/amqp/internal/message_receiver.hpp>
+#include <azure/core/amqp/internal/models/message_source.hpp>
+#include <azure/core/amqp/internal/models/message_target.hpp>
+#include <azure/core/amqp/internal/models/messaging_values.hpp>
+#include <azure/core/amqp/internal/network/amqp_header_detect_transport.hpp>
+#include <azure/core/amqp/internal/network/socket_listener.hpp>
 
 #include <iostream>
 #include <string>

sdk/core/azure-core-amqp/src/amqp/cancellable.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-#include "azure/core/amqp/cancellable.hpp"
+#include "azure/core/amqp/internal/cancellable.hpp"
 
 #include <azure_uamqp_c/async_operation.h>
 

sdk/core/azure-core-amqp/src/amqp/connection.cpp

@@ -1,13 +1,13 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-#include "azure/core/amqp/connection.hpp"
+#include "azure/core/amqp/internal/connection.hpp"
 
 #include "../network/private/transport_impl.hpp"
-#include "azure/core/amqp/common/global_state.hpp"
+#include "azure/core/amqp/internal/common/global_state.hpp"
+#include "azure/core/amqp/internal/network/socket_transport.hpp"
+#include "azure/core/amqp/internal/network/tls_transport.hpp"
 #include "azure/core/amqp/models/amqp_value.hpp"
-#include "azure/core/amqp/network/socket_transport.hpp"
-#include "azure/core/amqp/network/tls_transport.hpp"
 #include "private/claims_based_security_impl.hpp"
 #include "private/connection_impl.hpp"
 #include "private/session_impl.hpp"

sdk/core/azure-core-amqp/src/amqp/connection_string_credential.cpp

@@ -1,11 +1,11 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-#include "azure/core/amqp/connection_string_credential.hpp"
+#include "azure/core/amqp/internal/connection_string_credential.hpp"
 
-#include "azure/core/amqp/connection.hpp"
-#include "azure/core/amqp/models/amqp_protocol.hpp"
-#include "azure/core/amqp/network/socket_transport.hpp"
+#include "azure/core/amqp/internal/connection.hpp"
+#include "azure/core/amqp/internal/models/amqp_protocol.hpp"
+#include "azure/core/amqp/internal/network/socket_transport.hpp"
 
 #include <azure/core/base64.hpp>
 #include <azure/core/url.hpp>

sdk/core/azure-core-amqp/src/amqp/link.cpp

@@ -1,13 +1,13 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-#include "azure/core/amqp/link.hpp"
+#include "azure/core/amqp/internal/link.hpp"
 
-#include "azure/core/amqp/message_receiver.hpp"
-#include "azure/core/amqp/message_sender.hpp"
-#include "azure/core/amqp/models/message_source.hpp"
-#include "azure/core/amqp/models/message_target.hpp"
-#include "azure/core/amqp/models/messaging_values.hpp"
+#include "azure/core/amqp/internal/message_receiver.hpp"
+#include "azure/core/amqp/internal/message_sender.hpp"
+#include "azure/core/amqp/internal/models/message_source.hpp"
+#include "azure/core/amqp/internal/models/message_target.hpp"
+#include "azure/core/amqp/internal/models/messaging_values.hpp"
 #include "private/link_impl.hpp"
 #include "private/session_impl.hpp"
 

sdk/core/azure-core-amqp/src/amqp/management.cpp

@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-#include "azure/core/amqp/management.hpp"
+#include "azure/core/amqp/internal/management.hpp"
 
-#include "azure/core/amqp/connection.hpp"
+#include "azure/core/amqp/internal/connection.hpp"
+#include "azure/core/amqp/internal/models/messaging_values.hpp"
+#include "azure/core/amqp/internal/session.hpp"
 #include "azure/core/amqp/models/amqp_message.hpp"
-#include "azure/core/amqp/models/messaging_values.hpp"
-#include "azure/core/amqp/session.hpp"
 #include "private/connection_impl.hpp"
 #include "private/management_impl.hpp"
 

sdk/core/azure-core-amqp/src/amqp/message_receiver.cpp

@@ -4,14 +4,14 @@
 // Enable declaration of strerror_s.
 #define __STDC_WANT_LIB_EXT1__ 1
 
-#include "azure/core/amqp/message_receiver.hpp"
+#include "azure/core/amqp/internal/message_receiver.hpp"
 
-#include "azure/core/amqp/connection.hpp"
-#include "azure/core/amqp/connection_string_credential.hpp"
-#include "azure/core/amqp/link.hpp"
+#include "azure/core/amqp/internal/connection.hpp"
+#include "azure/core/amqp/internal/connection_string_credential.hpp"
+#include "azure/core/amqp/internal/link.hpp"
+#include "azure/core/amqp/internal/models/messaging_values.hpp"
+#include "azure/core/amqp/internal/session.hpp"
 #include "azure/core/amqp/models/amqp_message.hpp"
-#include "azure/core/amqp/models/messaging_values.hpp"
-#include "azure/core/amqp/session.hpp"
 #include "private/message_receiver_impl.hpp"
 
 #include <azure/core/credentials/credentials.hpp>

sdk/core/azure-core-amqp/src/amqp/message_sender.cpp

@@ -4,11 +4,11 @@
 // Enable declaration of strerror_s.
 #define __STDC_WANT_LIB_EXT1__ 1
 
-#include "azure/core/amqp/claims_based_security.hpp"
-#include "azure/core/amqp/common/completion_operation.hpp"
+#include "azure/core/amqp/internal/claims_based_security.hpp"
+#include "azure/core/amqp/internal/common/completion_operation.hpp"
+#include "azure/core/amqp/internal/models/messaging_values.hpp"
+#include "azure/core/amqp/internal/session.hpp"
 #include "azure/core/amqp/models/amqp_message.hpp"
-#include "azure/core/amqp/models/messaging_values.hpp"
-#include "azure/core/amqp/session.hpp"
 #include "private/connection_impl.hpp"
 #include "private/message_sender_impl.hpp"
 #include "private/session_impl.hpp"

sdk/core/azure-core-amqp/src/amqp/private/claims_based_security_impl.hpp

@@ -2,8 +2,8 @@
 // Licensed under the MIT License.
 
 #pragma once
-#include "azure/core/amqp/claims_based_security.hpp"
-#include "azure/core/amqp/management.hpp"
+#include "azure/core/amqp/internal/claims_based_security.hpp"
+#include "azure/core/amqp/internal/management.hpp"
 
 #include <azure_uamqp_c/cbs.h>
 

sdk/core/azure-core-amqp/src/amqp/private/connection_impl.hpp

@@ -3,12 +3,12 @@
 
 #pragma once
 
-#include "azure/core/amqp/common/global_state.hpp"
-#include "azure/core/amqp/connection.hpp"
-#include "azure/core/amqp/network/transport.hpp"
-#include "azure/core/platform.hpp"
+#include "azure/core/amqp/internal/common/global_state.hpp"
+#include "azure/core/amqp/internal/connection.hpp"
+#include "azure/core/amqp/internal/network/transport.hpp"
 
 #include <azure/core/credentials/credentials.hpp>
+#include <azure/core/platform.hpp>
 
 #include <azure_uamqp_c/connection.h>
 

sdk/core/azure-core-amqp/src/amqp/private/link_impl.hpp

@@ -3,10 +3,10 @@
 
 #pragma once
 
-#include "azure/core/amqp/models/amqp_error.hpp"
+#include "azure/core/amqp/internal/models/amqp_error.hpp"
+#include "azure/core/amqp/internal/models/message_source.hpp"
+#include "azure/core/amqp/internal/models/message_target.hpp"
 #include "azure/core/amqp/models/amqp_value.hpp"
-#include "azure/core/amqp/models/message_source.hpp"
-#include "azure/core/amqp/models/message_target.hpp"
 
 #include <azure_uamqp_c/link.h>
 

sdk/core/azure-core-amqp/src/amqp/private/management_impl.hpp

@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include "azure/core/amqp/connection.hpp"
-#include "azure/core/amqp/management.hpp"
-#include "azure/core/amqp/session.hpp"
+#include "azure/core/amqp/internal/connection.hpp"
+#include "azure/core/amqp/internal/management.hpp"
+#include "azure/core/amqp/internal/session.hpp"
 #include "connection_impl.hpp"
 #include "message_receiver_impl.hpp"
 #include "message_sender_impl.hpp"

sdk/core/azure-core-amqp/src/amqp/private/message_receiver_impl.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "azure/core/amqp/message_receiver.hpp"
+#include "azure/core/amqp/internal/message_receiver.hpp"
 #include "claims_based_security_impl.hpp"
 #include "connection_impl.hpp"
 #include "link_impl.hpp"

sdk/core/azure-core-amqp/src/amqp/private/message_sender_impl.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "azure/core/amqp/message_sender.hpp"
+#include "azure/core/amqp/internal/message_sender.hpp"
 #include "claims_based_security_impl.hpp"
 #include "link_impl.hpp"
 

sdk/core/azure-core-amqp/src/amqp/private/session_impl.hpp

@@ -3,7 +3,8 @@
 
 #pragma once
 
-#include "azure/core/amqp/session.hpp"
+#include "azure/core/amqp/internal/session.hpp"
+#include "connection_impl.hpp"
 
 #include <azure_uamqp_c/session.h>
 
@@ -58,7 +59,7 @@ namespace Azure { namespace Core { namespace Amqp { namespace _detail {
     SessionImpl& operator=(SessionImpl&&) noexcept = delete;
     operator SESSION_HANDLE() const { return m_session.get(); }
 
-    std::shared_ptr<ConnectionImpl> GetConnection() const { return m_connectionToPoll; }
+    std::shared_ptr<_detail::ConnectionImpl> GetConnection() const { return m_connectionToPoll; }
 
     uint32_t GetIncomingWindow();
     uint32_t GetOutgoingWindow();

sdk/core/azure-core-amqp/src/amqp/session.cpp

@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-#include "azure/core/amqp/session.hpp"
+#include "azure/core/amqp/internal/session.hpp"
 
-#include "azure/core/amqp/connection.hpp"
-#include "azure/core/amqp/link.hpp"
+#include "azure/core/amqp/internal/connection.hpp"
+#include "azure/core/amqp/internal/link.hpp"
 #include "private/claims_based_security_impl.hpp"
 #include "private/connection_impl.hpp"
 #include "private/management_impl.hpp"

sdk/core/azure-core-amqp/src/common/global_state.cpp

@@ -3,7 +3,7 @@
 
 // cspell: words xlogging
 
-#include "azure/core/amqp/common/global_state.hpp"
+#include "azure/core/amqp/internal/common/global_state.hpp"
 
 #include <azure/core/diagnostics/logger.hpp>
 #include <azure/core/internal/diagnostics/log.hpp>

sdk/core/azure-core-amqp/src/models/amqp_error.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-#include "azure/core/amqp/models/amqp_error.hpp"
+#include "azure/core/amqp/internal/models/amqp_error.hpp"
 
 #include "azure/core/amqp/models/amqp_value.hpp"
 

sdk/core/azure-core-amqp/src/models/amqp_message.cpp

@@ -3,8 +3,8 @@
 
 #include "azure/core/amqp/models/amqp_message.hpp"
 
+#include "azure/core/amqp/internal/models/amqp_protocol.hpp"
 #include "azure/core/amqp/models/amqp_header.hpp"
-#include "azure/core/amqp/models/amqp_protocol.hpp"
 #include "azure/core/amqp/models/amqp_value.hpp"
 
 #include <azure_uamqp_c/amqp_definitions_annotations.h>

sdk/core/azure-core-amqp/src/models/amqp_value.cpp

@@ -3,9 +3,9 @@
 
 #include "azure/core/amqp/models/amqp_value.hpp"
 
-#include "azure/core/amqp/doxygen_pragma.hpp"
+#include "azure/core/amqp/internal/doxygen_pragma.hpp"
+#include "azure/core/amqp/internal/models/amqp_protocol.hpp"
 #include "azure/core/amqp/models/amqp_properties.hpp"
-#include "azure/core/amqp/models/amqp_protocol.hpp"
 
 #include <azure/core/internal/diagnostics/log.hpp>
 

sdk/core/azure-core-amqp/src/models/message_source.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-#include "azure/core/amqp/models/message_source.hpp"
+#include "azure/core/amqp/internal/models/message_source.hpp"
 
 #include <azure_uamqp_c/amqp_definitions_fields.h>
 #include <azure_uamqp_c/amqp_definitions_terminus_durability.h>

sdk/core/azure-core-amqp/src/models/message_target.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-#include "azure/core/amqp/models/message_target.hpp"
+#include "azure/core/amqp/internal/models/message_target.hpp"
 
 #include <azure_uamqp_c/amqp_definitions_fields.h>
 #include <azure_uamqp_c/amqp_definitions_terminus_durability.h>

sdk/core/azure-core-amqp/src/models/messaging_values.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-#include "azure/core/amqp/models/messaging_values.hpp"
+#include "azure/core/amqp/internal/models/messaging_values.hpp"
 
 #include <azure_uamqp_c/amqp_definitions_fields.h>
 

sdk/core/azure-core-amqp/src/network/amqp_header_transport.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-#include "azure/core/amqp/network/amqp_header_detect_transport.hpp"
+#include "azure/core/amqp/internal/network/amqp_header_detect_transport.hpp"
 #include "private/transport_impl.hpp"
 
 #include <azure_c_shared_utility/platform.h>

sdk/core/azure-core-amqp/src/network/private/transport_impl.hpp

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 #pragma once
-#include "azure/core/amqp/common/async_operation_queue.hpp"
+#include "azure/core/amqp/internal/common/async_operation_queue.hpp"
 
 #include <azure/core/internal/unique_handle.hpp>
 

sdk/core/azure-core-amqp/src/network/sasl_transport.cpp

@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-#include "azure/core/amqp/network/sasl_transport.hpp"
+#include "azure/core/amqp/internal/network/sasl_transport.hpp"
 
-#include "azure/core/amqp/network/tls_transport.hpp"
+#include "azure/core/amqp/internal/network/tls_transport.hpp"
 #include "private/transport_impl.hpp"
 
 #include <azure_c_shared_utility/platform.h>

sdk/core/azure-core-amqp/src/network/socket_listener.cpp

@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-#include "azure/core/amqp/network/socket_listener.hpp"
+#include "azure/core/amqp/internal/network/socket_listener.hpp"
 
-#include "azure/core/amqp/common/global_state.hpp"
+#include "azure/core/amqp/internal/common/global_state.hpp"
 #include "private/transport_impl.hpp"
 
 #include <azure_c_shared_utility/platform.h>

sdk/core/azure-core-amqp/src/network/socket_transport.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-#include "azure/core/amqp/network/socket_transport.hpp"
+#include "azure/core/amqp/internal/network/socket_transport.hpp"
 
 #include "private/transport_impl.hpp"
 

sdk/core/azure-core-amqp/src/network/tls_transport.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-#include "azure/core/amqp/network/tls_transport.hpp"
+#include "azure/core/amqp/internal/network/tls_transport.hpp"
 
 #include "private/transport_impl.hpp"
 

sdk/core/azure-core-amqp/src/network/transport.cpp

@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-#include "azure/core/amqp/network/transport.hpp"
+#include "azure/core/amqp/internal/network/transport.hpp"
 
-#include "azure/core/amqp/common/completion_operation.hpp"
-#include "azure/core/amqp/common/global_state.hpp"
+#include "azure/core/amqp/internal/common/completion_operation.hpp"
+#include "azure/core/amqp/internal/common/global_state.hpp"
 #include "private/transport_impl.hpp"
 
 #include <azure_c_shared_utility/platform.h>

sdk/core/azure-core-amqp/test/ut/amqp_value_tests.cpp

@@ -1,10 +1,11 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-#include "azure/core/amqp/common/global_state.hpp"
-#include "azure/core/amqp/models/amqp_error.hpp"
+#include "azure/core/amqp/internal/models/amqp_error.hpp"
 #include "azure/core/amqp/models/amqp_value.hpp"
 
+#include <azure/core/amqp/internal/common/global_state.hpp>
+
 #include <algorithm>
 #include <random>
 

sdk/core/azure-core-amqp/test/ut/async_operation_queue_tests.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-#include "azure/core/amqp/common/async_operation_queue.hpp"
+#include "azure/core/amqp/internal/common/async_operation_queue.hpp"
 
 #include <gtest/gtest.h>
 

sdk/core/azure-core-amqp/test/ut/claim_based_security_tests.cpp

@@ -3,16 +3,11 @@
 
 #include "mock_amqp_server.hpp"
 
-#include <azure/core/amqp/claims_based_security.hpp>
-#include <azure/core/amqp/connection.hpp>
-#include <azure/core/amqp/message_receiver.hpp>
-#include <azure/core/amqp/message_sender.hpp>
-#include <azure/core/amqp/models/message_source.hpp>
-#include <azure/core/amqp/models/message_target.hpp>
-#include <azure/core/amqp/models/messaging_values.hpp>
-#include <azure/core/amqp/network/amqp_header_detect_transport.hpp>
-#include <azure/core/amqp/network/socket_listener.hpp>
-#include <azure/core/amqp/session.hpp>
+#include <azure/core/amqp/internal/claims_based_security.hpp>
+#include <azure/core/amqp/internal/connection.hpp>
+#include <azure/core/amqp/internal/message_receiver.hpp>
+#include <azure/core/amqp/internal/message_sender.hpp>
+#include <azure/core/amqp/internal/session.hpp>
 #include <azure/core/platform.hpp>
 
 #include <gtest/gtest.h>

sdk/core/azure-core-amqp/test/ut/connection_string_tests.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-#include "azure/core/amqp/connection_string_credential.hpp"
+#include "azure/core/amqp/internal/connection_string_credential.hpp"
 
 #include <azure/core/platform.hpp>
 

sdk/core/azure-core-amqp/test/ut/connection_tests.cpp

@@ -1,15 +1,15 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-#include "azure/core/amqp/common/async_operation_queue.hpp"
-#include "azure/core/amqp/connection.hpp"
-#include "azure/core/amqp/message_receiver.hpp"
-#include "azure/core/amqp/models/amqp_protocol.hpp"
-#include "azure/core/amqp/models/messaging_values.hpp"
-#include "azure/core/amqp/network/amqp_header_detect_transport.hpp"
-#include "azure/core/amqp/network/socket_listener.hpp"
-#include "azure/core/amqp/network/socket_transport.hpp"
-#include "azure/core/amqp/session.hpp"
+#include "azure/core/amqp/internal/common/async_operation_queue.hpp"
+#include "azure/core/amqp/internal/connection.hpp"
+#include "azure/core/amqp/internal/message_receiver.hpp"
+#include "azure/core/amqp/internal/models/amqp_protocol.hpp"
+#include "azure/core/amqp/internal/models/messaging_values.hpp"
+#include "azure/core/amqp/internal/network/amqp_header_detect_transport.hpp"
+#include "azure/core/amqp/internal/network/socket_listener.hpp"
+#include "azure/core/amqp/internal/network/socket_transport.hpp"
+#include "azure/core/amqp/internal/session.hpp"
 #include "mock_amqp_server.hpp"
 
 #include <azure/core/context.hpp>

sdk/core/azure-core-amqp/test/ut/link_tests.cpp

@@ -1,15 +1,15 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-#include "azure/core/amqp/common/async_operation_queue.hpp"
-#include "azure/core/amqp/connection.hpp"
-#include "azure/core/amqp/message_receiver.hpp"
-#include "azure/core/amqp/message_sender.hpp"
-#include "azure/core/amqp/models/messaging_values.hpp"
-#include "azure/core/amqp/network/amqp_header_detect_transport.hpp"
-#include "azure/core/amqp/network/socket_listener.hpp"
-#include "azure/core/amqp/network/socket_transport.hpp"
-#include "azure/core/amqp/session.hpp"
+#include "azure/core/amqp/internal/common/async_operation_queue.hpp"
+#include "azure/core/amqp/internal/connection.hpp"
+#include "azure/core/amqp/internal/message_receiver.hpp"
+#include "azure/core/amqp/internal/message_sender.hpp"
+#include "azure/core/amqp/internal/models/messaging_values.hpp"
+#include "azure/core/amqp/internal/network/amqp_header_detect_transport.hpp"
+#include "azure/core/amqp/internal/network/socket_listener.hpp"
+#include "azure/core/amqp/internal/network/socket_transport.hpp"
+#include "azure/core/amqp/internal/session.hpp"
 
 #include <azure/core/platform.hpp>
 

sdk/core/azure-core-amqp/test/ut/management_tests.cpp

@@ -3,10 +3,10 @@
 
 #include "mock_amqp_server.hpp"
 
-#include <azure/core/amqp/connection.hpp>
-#include <azure/core/amqp/management.hpp>
-#include <azure/core/amqp/models/messaging_values.hpp>
-#include <azure/core/amqp/session.hpp>
+#include <azure/core/amqp/internal/connection.hpp>
+#include <azure/core/amqp/internal/management.hpp>
+#include <azure/core/amqp/internal/models/messaging_values.hpp>
+#include <azure/core/amqp/internal/session.hpp>
 #include <azure/core/platform.hpp>
 
 #include <gtest/gtest.h>

sdk/core/azure-core-amqp/test/ut/message_sender_receiver.cpp

@@ -1,16 +1,16 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-#include "azure/core/amqp/common/async_operation_queue.hpp"
-#include "azure/core/amqp/connection.hpp"
-#include "azure/core/amqp/message_receiver.hpp"
-#include "azure/core/amqp/message_sender.hpp"
-#include "azure/core/amqp/models/message_source.hpp"
-#include "azure/core/amqp/models/message_target.hpp"
-#include "azure/core/amqp/models/messaging_values.hpp"
-#include "azure/core/amqp/network/amqp_header_detect_transport.hpp"
-#include "azure/core/amqp/network/socket_listener.hpp"
-#include "azure/core/amqp/session.hpp"
+#include "azure/core/amqp/internal/common/async_operation_queue.hpp"
+#include "azure/core/amqp/internal/connection.hpp"
+#include "azure/core/amqp/internal/message_receiver.hpp"
+#include "azure/core/amqp/internal/message_sender.hpp"
+#include "azure/core/amqp/internal/models/message_source.hpp"
+#include "azure/core/amqp/internal/models/message_target.hpp"
+#include "azure/core/amqp/internal/models/messaging_values.hpp"
+#include "azure/core/amqp/internal/network/amqp_header_detect_transport.hpp"
+#include "azure/core/amqp/internal/network/socket_listener.hpp"
+#include "azure/core/amqp/internal/session.hpp"
 #include "mock_amqp_server.hpp"
 
 #include <azure/core/platform.hpp>

sdk/core/azure-core-amqp/test/ut/message_source_target.cpp

@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-#include <azure/core/amqp/models/message_source.hpp>
-#include <azure/core/amqp/models/message_target.hpp>
-#include <azure/core/amqp/models/messaging_values.hpp>
+#include <azure/core/amqp/internal/models/message_source.hpp>
+#include <azure/core/amqp/internal/models/message_target.hpp>
+#include <azure/core/amqp/internal/models/messaging_values.hpp>
 
 #include <gtest/gtest.h>
 

sdk/core/azure-core-amqp/test/ut/mock_amqp_server.hpp

@@ -2,19 +2,20 @@
 // Licensed under the MIT License.
 
 #pragma once
-#include <azure/core/amqp/claims_based_security.hpp>
-#include <azure/core/amqp/connection.hpp>
-#include <azure/core/amqp/message_receiver.hpp>
-#include <azure/core/amqp/message_sender.hpp>
-#include <azure/core/amqp/models/amqp_error.hpp>
-#include <azure/core/amqp/models/amqp_message.hpp>
-#include <azure/core/amqp/models/amqp_protocol.hpp>
-#include <azure/core/amqp/models/message_source.hpp>
-#include <azure/core/amqp/models/message_target.hpp>
-#include <azure/core/amqp/models/messaging_values.hpp>
-#include <azure/core/amqp/network/amqp_header_detect_transport.hpp>
-#include <azure/core/amqp/network/socket_listener.hpp>
-#include <azure/core/amqp/session.hpp>
+#include "azure/core/amqp/internal/models/amqp_error.hpp"
+#include "azure/core/amqp/models/amqp_message.hpp"
+
+#include <azure/core/amqp/internal/claims_based_security.hpp>
+#include <azure/core/amqp/internal/connection.hpp>
+#include <azure/core/amqp/internal/message_receiver.hpp>
+#include <azure/core/amqp/internal/message_sender.hpp>
+#include <azure/core/amqp/internal/models/amqp_protocol.hpp>
+#include <azure/core/amqp/internal/models/message_source.hpp>
+#include <azure/core/amqp/internal/models/message_target.hpp>
+#include <azure/core/amqp/internal/models/messaging_values.hpp>
+#include <azure/core/amqp/internal/network/amqp_header_detect_transport.hpp>
+#include <azure/core/amqp/internal/network/socket_listener.hpp>
+#include <azure/core/amqp/internal/session.hpp>
 
 #include <memory>
 

sdk/core/azure-core-amqp/test/ut/session_tests.cpp

@@ -1,15 +1,15 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-#include "azure/core/amqp/common/async_operation_queue.hpp"
-#include "azure/core/amqp/common/global_state.hpp"
-#include "azure/core/amqp/connection.hpp"
-#include "azure/core/amqp/message_receiver.hpp"
-#include "azure/core/amqp/models/messaging_values.hpp"
-#include "azure/core/amqp/network/amqp_header_detect_transport.hpp"
-#include "azure/core/amqp/network/socket_listener.hpp"
-#include "azure/core/amqp/network/socket_transport.hpp"
-#include "azure/core/amqp/session.hpp"
+#include "azure/core/amqp/internal/common/async_operation_queue.hpp"
+#include "azure/core/amqp/internal/common/global_state.hpp"
+#include "azure/core/amqp/internal/connection.hpp"
+#include "azure/core/amqp/internal/message_receiver.hpp"
+#include "azure/core/amqp/internal/models/messaging_values.hpp"
+#include "azure/core/amqp/internal/network/amqp_header_detect_transport.hpp"
+#include "azure/core/amqp/internal/network/socket_listener.hpp"
+#include "azure/core/amqp/internal/network/socket_transport.hpp"
+#include "azure/core/amqp/internal/session.hpp"
 
 #include <azure/core/context.hpp>
 #include <azure/core/platform.hpp>

sdk/core/azure-core-amqp/test/ut/transport_tests.cpp

@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-#include "azure/core/amqp/connection.hpp"
+#include "azure/core/amqp/internal/connection.hpp"
 
-#include <azure/core/amqp/common/async_operation_queue.hpp>
-#include <azure/core/amqp/network/socket_listener.hpp>
-#include <azure/core/amqp/network/socket_transport.hpp>
-#include <azure/core/amqp/network/tls_transport.hpp>
+#include <azure/core/amqp/internal/common/async_operation_queue.hpp>
+#include <azure/core/amqp/internal/network/socket_listener.hpp>
+#include <azure/core/amqp/internal/network/socket_transport.hpp>
+#include <azure/core/amqp/internal/network/tls_transport.hpp>
 #include <azure/core/platform.hpp>
 
 #include <random>

sdk/core/azure-core-amqp/test/ut_uamqp/amqp_error_tests.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-#include "azure/core/amqp/models/amqp_error.hpp"
+#include "azure/core/amqp/internal/models/amqp_error.hpp"
 
 #include <azure_uamqp_c/amqp_definitions_fields.h>
 

sdk/core/azure-core-amqp/test/ut_uamqp/amqp_insertion_tests.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-#include <azure/core/amqp/connection.hpp>
+#include <azure/core/amqp/internal/connection.hpp>
 
 #include <azure_uamqp_c/amqp_definitions_fields.h>
 

sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/consumer_client.hpp

@@ -9,6 +9,7 @@
 #include "partition_client.hpp"
 
 #include <azure/core/amqp.hpp>
+#include <azure/core/amqp/internal/connection.hpp>
 #include <azure/core/context.hpp>
 #include <azure/core/credentials/credentials.hpp>
 #include <azure/core/diagnostics/logger.hpp>

sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/eventhubs_exception.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <azure/core/amqp/models/amqp_error.hpp>
+#include <azure/core/amqp/internal/models/amqp_error.hpp>
 
 #include <stdexcept>
 #include <string>

sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/models/event_data.hpp

@@ -1,7 +1,17 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 #pragma once
-#include <azure/core/amqp.hpp>
+
+#include <azure/core/amqp/models/amqp_message.hpp>
+#include <azure/core/amqp/models/amqp_value.hpp>
+#include <azure/core/datetime.hpp>
+#include <azure/core/nullable.hpp>
+
+#include <initializer_list>
+#include <iostream>
+#include <map>
+#include <vector>
+
 namespace Azure { namespace Messaging { namespace EventHubs { namespace Models {
 
   /** @brief Represents an event sent to the Azure Event Hubs service.

sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/partition_client.hpp

@@ -6,6 +6,7 @@
 #include "models/partition_client_models.hpp"
 
 #include <azure/core/amqp.hpp>
+#include <azure/core/amqp/internal/message_receiver.hpp>
 #include <azure/core/datetime.hpp>
 #include <azure/core/http/policies/policy.hpp>
 #include <azure/core/nullable.hpp>

sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/processor.hpp

@@ -1,12 +1,14 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 #pragma once
+
 #include "checkpoint_store.hpp"
 #include "consumer_client.hpp"
 #include "models/processor_load_balancer_models.hpp"
 #include "models/processor_models.hpp"
 #include "processor_partition_client.hpp"
 
+#include <azure/core/amqp/internal/common/async_operation_queue.hpp>
 #include <azure/core/context.hpp>
 
 #include <chrono>

sdk/eventhubs/azure-messaging-eventhubs/inc/azure/messaging/eventhubs/producer_client.hpp

@@ -8,7 +8,8 @@
 #include "models/management_models.hpp"
 
 #include <azure/core/amqp.hpp>
-#include <azure/core/amqp/management.hpp>
+#include <azure/core/amqp/internal/management.hpp>
+#include <azure/core/amqp/internal/message_sender.hpp>
 #include <azure/core/context.hpp>
 #include <azure/core/credentials/credentials.hpp>
 #include <azure/core/http/policies/policy.hpp>

sdk/eventhubs/azure-messaging-eventhubs/src/consumer_client.cpp

@@ -5,7 +5,7 @@
 #include "private/eventhubs_utilities.hpp"
 #include "private/package_version.hpp"
 
-#include <azure/core/amqp/message_receiver.hpp>
+#include <azure/core/amqp/internal/message_receiver.hpp>
 #include <azure/core/platform.hpp>
 #include <azure/messaging/eventhubs.hpp>
 

sdk/eventhubs/azure-messaging-eventhubs/src/eventhubs_utilities.cpp

@@ -3,7 +3,7 @@
 
 #include "private/eventhubs_utilities.hpp"
 
-#include <azure/core/amqp/models/amqp_error.hpp>
+#include <azure/core/amqp/internal/models/amqp_error.hpp>
 
 #include <iomanip>
 #include <iostream>

sdk/eventhubs/azure-messaging-eventhubs/src/partition_client.cpp

@@ -9,6 +9,7 @@
 #include "private/retry_operation.hpp"
 
 #include <azure/core/amqp.hpp>
+#include <azure/core/amqp/internal/models/messaging_values.hpp>
 
 using namespace Azure::Core::Diagnostics::_internal;
 using namespace Azure::Core::Diagnostics;

sdk/eventhubs/azure-messaging-eventhubs/src/private/eventhubs_utilities.hpp

@@ -10,8 +10,8 @@
 #include "azure/messaging/eventhubs/partition_client.hpp"
 #include "package_version.hpp"
 
-#include <azure/core/amqp/management.hpp>
-#include <azure/core/amqp/session.hpp>
+#include <azure/core/amqp/internal/management.hpp>
+#include <azure/core/amqp/internal/session.hpp>
 #include <azure/core/context.hpp>
 #include <azure/core/internal/diagnostics/log.hpp>
 #include <azure/core/internal/http/user_agent.hpp>

sdk/eventhubs/azure-messaging-eventhubs/src/producer_client.cpp

@@ -10,6 +10,7 @@
 #include "private/retry_operation.hpp"
 
 #include <azure/core/amqp.hpp>
+#include <azure/core/amqp/internal/message_sender.hpp>
 
 namespace {
 const std::string DefaultAuthScope = "https://eventhubs.azure.net/.default";

sdk/eventhubs/azure-messaging-eventhubs/src/retry_operation.cpp

@@ -2,9 +2,10 @@
 // Licensed under the MIT License.
 #include "private/retry_operation.hpp"
 
-#include "azure/core/internal/diagnostics/log.hpp"
 #include "azure/messaging/eventhubs/eventhubs_exception.hpp"
 
+#include <azure/core/internal/diagnostics/log.hpp>
+
 #include <thread>
 
 namespace {

sdk/eventhubs/azure-messaging-eventhubs/test/ut/processor_test.cpp

@@ -4,7 +4,7 @@
 #include "./test_checkpoint_store.hpp"
 #include "eventhubs_test_base.hpp"
 
-#include <azure/core/amqp/common/global_state.hpp>
+#include <azure/core/amqp/internal/common/global_state.hpp>
 #include <azure/core/context.hpp>
 #include <azure/core/platform.hpp>
 #include <azure/core/test/test_base.hpp>