diff --git a/generated/tests/AWSMigrationHub-gen-tests/MigrationHubIncludeTests.cpp b/generated/tests/AWSMigrationHub-gen-tests/MigrationHubIncludeTests.cpp
index cff312aeae91..63611c260fdd 100644
--- a/generated/tests/AWSMigrationHub-gen-tests/MigrationHubIncludeTests.cpp
+++ b/generated/tests/AWSMigrationHub-gen-tests/MigrationHubIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/AWSMigrationHub/MigrationHubClient.h>
+#include <aws/AWSMigrationHub/MigrationHubClientPagination.h>
 #include <aws/AWSMigrationHub/MigrationHubEndpointProvider.h>
 #include <aws/AWSMigrationHub/MigrationHubErrorMarshaller.h>
 #include <aws/AWSMigrationHub/MigrationHubErrors.h>
+#include <aws/AWSMigrationHub/MigrationHubPaginationBase.h>
 #include <aws/AWSMigrationHub/MigrationHubRequest.h>
 #include <aws/AWSMigrationHub/MigrationHubServiceClientModel.h>
+#include <aws/AWSMigrationHub/MigrationHubWaiter.h>
 #include <aws/AWSMigrationHub/MigrationHub_EXPORTS.h>
+#include <aws/AWSMigrationHub/internal/MigrationHubEndpointRules.h>
 #include <aws/AWSMigrationHub/model/ApplicationState.h>
 #include <aws/AWSMigrationHub/model/ApplicationStatus.h>
 #include <aws/AWSMigrationHub/model/AssociateCreatedArtifactRequest.h>
@@ -39,18 +43,25 @@
 #include <aws/AWSMigrationHub/model/DiscoveredResource.h>
 #include <aws/AWSMigrationHub/model/ImportMigrationTaskRequest.h>
 #include <aws/AWSMigrationHub/model/ImportMigrationTaskResult.h>
+#include <aws/AWSMigrationHub/model/ListApplicationStatesPaginationTraits.h>
 #include <aws/AWSMigrationHub/model/ListApplicationStatesRequest.h>
 #include <aws/AWSMigrationHub/model/ListApplicationStatesResult.h>
+#include <aws/AWSMigrationHub/model/ListCreatedArtifactsPaginationTraits.h>
 #include <aws/AWSMigrationHub/model/ListCreatedArtifactsRequest.h>
 #include <aws/AWSMigrationHub/model/ListCreatedArtifactsResult.h>
+#include <aws/AWSMigrationHub/model/ListDiscoveredResourcesPaginationTraits.h>
 #include <aws/AWSMigrationHub/model/ListDiscoveredResourcesRequest.h>
 #include <aws/AWSMigrationHub/model/ListDiscoveredResourcesResult.h>
+#include <aws/AWSMigrationHub/model/ListMigrationTaskUpdatesPaginationTraits.h>
 #include <aws/AWSMigrationHub/model/ListMigrationTaskUpdatesRequest.h>
 #include <aws/AWSMigrationHub/model/ListMigrationTaskUpdatesResult.h>
+#include <aws/AWSMigrationHub/model/ListMigrationTasksPaginationTraits.h>
 #include <aws/AWSMigrationHub/model/ListMigrationTasksRequest.h>
 #include <aws/AWSMigrationHub/model/ListMigrationTasksResult.h>
+#include <aws/AWSMigrationHub/model/ListProgressUpdateStreamsPaginationTraits.h>
 #include <aws/AWSMigrationHub/model/ListProgressUpdateStreamsRequest.h>
 #include <aws/AWSMigrationHub/model/ListProgressUpdateStreamsResult.h>
+#include <aws/AWSMigrationHub/model/ListSourceResourcesPaginationTraits.h>
 #include <aws/AWSMigrationHub/model/ListSourceResourcesRequest.h>
 #include <aws/AWSMigrationHub/model/ListSourceResourcesResult.h>
 #include <aws/AWSMigrationHub/model/MigrationTask.h>
diff --git a/generated/tests/accessanalyzer-gen-tests/AccessAnalyzerIncludeTests.cpp b/generated/tests/accessanalyzer-gen-tests/AccessAnalyzerIncludeTests.cpp
index e82b8da63ee7..fbad52d07e92 100644
--- a/generated/tests/accessanalyzer-gen-tests/AccessAnalyzerIncludeTests.cpp
+++ b/generated/tests/accessanalyzer-gen-tests/AccessAnalyzerIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/accessanalyzer/AccessAnalyzerClient.h>
+#include <aws/accessanalyzer/AccessAnalyzerClientPagination.h>
 #include <aws/accessanalyzer/AccessAnalyzerEndpointProvider.h>
 #include <aws/accessanalyzer/AccessAnalyzerErrorMarshaller.h>
 #include <aws/accessanalyzer/AccessAnalyzerErrors.h>
+#include <aws/accessanalyzer/AccessAnalyzerPaginationBase.h>
 #include <aws/accessanalyzer/AccessAnalyzerRequest.h>
 #include <aws/accessanalyzer/AccessAnalyzerServiceClientModel.h>
+#include <aws/accessanalyzer/AccessAnalyzerWaiter.h>
 #include <aws/accessanalyzer/AccessAnalyzer_EXPORTS.h>
+#include <aws/accessanalyzer/internal/AccessAnalyzerEndpointRules.h>
 #include <aws/accessanalyzer/model/Access.h>
 #include <aws/accessanalyzer/model/AccessCheckPolicyType.h>
 #include <aws/accessanalyzer/model/AccessCheckResourceType.h>
@@ -91,10 +95,12 @@
 #include <aws/accessanalyzer/model/GetAnalyzerResult.h>
 #include <aws/accessanalyzer/model/GetArchiveRuleRequest.h>
 #include <aws/accessanalyzer/model/GetArchiveRuleResult.h>
+#include <aws/accessanalyzer/model/GetFindingRecommendationPaginationTraits.h>
 #include <aws/accessanalyzer/model/GetFindingRecommendationRequest.h>
 #include <aws/accessanalyzer/model/GetFindingRecommendationResult.h>
 #include <aws/accessanalyzer/model/GetFindingRequest.h>
 #include <aws/accessanalyzer/model/GetFindingResult.h>
+#include <aws/accessanalyzer/model/GetFindingV2PaginationTraits.h>
 #include <aws/accessanalyzer/model/GetFindingV2Request.h>
 #include <aws/accessanalyzer/model/GetFindingV2Result.h>
 #include <aws/accessanalyzer/model/GetFindingsStatisticsRequest.h>
@@ -120,20 +126,28 @@
 #include <aws/accessanalyzer/model/KmsGrantConstraints.h>
 #include <aws/accessanalyzer/model/KmsGrantOperation.h>
 #include <aws/accessanalyzer/model/KmsKeyConfiguration.h>
+#include <aws/accessanalyzer/model/ListAccessPreviewFindingsPaginationTraits.h>
 #include <aws/accessanalyzer/model/ListAccessPreviewFindingsRequest.h>
 #include <aws/accessanalyzer/model/ListAccessPreviewFindingsResult.h>
+#include <aws/accessanalyzer/model/ListAccessPreviewsPaginationTraits.h>
 #include <aws/accessanalyzer/model/ListAccessPreviewsRequest.h>
 #include <aws/accessanalyzer/model/ListAccessPreviewsResult.h>
+#include <aws/accessanalyzer/model/ListAnalyzedResourcesPaginationTraits.h>
 #include <aws/accessanalyzer/model/ListAnalyzedResourcesRequest.h>
 #include <aws/accessanalyzer/model/ListAnalyzedResourcesResult.h>
+#include <aws/accessanalyzer/model/ListAnalyzersPaginationTraits.h>
 #include <aws/accessanalyzer/model/ListAnalyzersRequest.h>
 #include <aws/accessanalyzer/model/ListAnalyzersResult.h>
+#include <aws/accessanalyzer/model/ListArchiveRulesPaginationTraits.h>
 #include <aws/accessanalyzer/model/ListArchiveRulesRequest.h>
 #include <aws/accessanalyzer/model/ListArchiveRulesResult.h>
+#include <aws/accessanalyzer/model/ListFindingsPaginationTraits.h>
 #include <aws/accessanalyzer/model/ListFindingsRequest.h>
 #include <aws/accessanalyzer/model/ListFindingsResult.h>
+#include <aws/accessanalyzer/model/ListFindingsV2PaginationTraits.h>
 #include <aws/accessanalyzer/model/ListFindingsV2Request.h>
 #include <aws/accessanalyzer/model/ListFindingsV2Result.h>
+#include <aws/accessanalyzer/model/ListPolicyGenerationsPaginationTraits.h>
 #include <aws/accessanalyzer/model/ListPolicyGenerationsRequest.h>
 #include <aws/accessanalyzer/model/ListPolicyGenerationsResult.h>
 #include <aws/accessanalyzer/model/ListTagsForResourceRequest.h>
@@ -204,6 +218,7 @@
 #include <aws/accessanalyzer/model/UpdateFindingsRequest.h>
 #include <aws/accessanalyzer/model/ValidatePolicyFinding.h>
 #include <aws/accessanalyzer/model/ValidatePolicyFindingType.h>
+#include <aws/accessanalyzer/model/ValidatePolicyPaginationTraits.h>
 #include <aws/accessanalyzer/model/ValidatePolicyRequest.h>
 #include <aws/accessanalyzer/model/ValidatePolicyResourceType.h>
 #include <aws/accessanalyzer/model/ValidatePolicyResult.h>
diff --git a/generated/tests/account-access-gen-tests/AccountAccessIncludeTests.cpp b/generated/tests/account-access-gen-tests/AccountAccessIncludeTests.cpp
index 77e2f4889c94..89494dd74a77 100644
--- a/generated/tests/account-access-gen-tests/AccountAccessIncludeTests.cpp
+++ b/generated/tests/account-access-gen-tests/AccountAccessIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/account-access/AccountAccessClient.h>
+#include <aws/account-access/AccountAccessClientPagination.h>
 #include <aws/account-access/AccountAccessEndpointProvider.h>
 #include <aws/account-access/AccountAccessErrorMarshaller.h>
 #include <aws/account-access/AccountAccessErrors.h>
+#include <aws/account-access/AccountAccessPaginationBase.h>
 #include <aws/account-access/AccountAccessRequest.h>
 #include <aws/account-access/AccountAccessServiceClientModel.h>
+#include <aws/account-access/AccountAccessWaiter.h>
 #include <aws/account-access/AccountAccess_EXPORTS.h>
+#include <aws/account-access/internal/AccountAccessEndpointRules.h>
 #include <aws/account-access/model/ApplicationSummary.h>
 #include <aws/account-access/model/CreateApplicationRequest.h>
 #include <aws/account-access/model/CreateApplicationResult.h>
@@ -39,8 +43,10 @@
 #include <aws/account-access/model/IdentityCenterPrincipalFilter.h>
 #include <aws/account-access/model/IdentitySource.h>
 #include <aws/account-access/model/IdentitySourceDetails.h>
+#include <aws/account-access/model/ListApplicationsPaginationTraits.h>
 #include <aws/account-access/model/ListApplicationsRequest.h>
 #include <aws/account-access/model/ListApplicationsResult.h>
+#include <aws/account-access/model/ListEntitlementsPaginationTraits.h>
 #include <aws/account-access/model/ListEntitlementsRequest.h>
 #include <aws/account-access/model/ListEntitlementsResult.h>
 #include <aws/account-access/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/account-gen-tests/AccountIncludeTests.cpp b/generated/tests/account-gen-tests/AccountIncludeTests.cpp
index f92836720e80..db7cf4464bf7 100644
--- a/generated/tests/account-gen-tests/AccountIncludeTests.cpp
+++ b/generated/tests/account-gen-tests/AccountIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/account/AccountClient.h>
+#include <aws/account/AccountClientPagination.h>
 #include <aws/account/AccountEndpointProvider.h>
 #include <aws/account/AccountErrorMarshaller.h>
 #include <aws/account/AccountErrors.h>
+#include <aws/account/AccountPaginationBase.h>
 #include <aws/account/AccountRequest.h>
 #include <aws/account/AccountServiceClientModel.h>
+#include <aws/account/AccountWaiter.h>
 #include <aws/account/Account_EXPORTS.h>
+#include <aws/account/internal/AccountEndpointRules.h>
 #include <aws/account/model/AcceptPrimaryEmailUpdateRequest.h>
 #include <aws/account/model/AcceptPrimaryEmailUpdateResult.h>
 #include <aws/account/model/AccessDeniedException.h>
@@ -40,6 +44,7 @@
 #include <aws/account/model/GetRegionOptStatusRequest.h>
 #include <aws/account/model/GetRegionOptStatusResult.h>
 #include <aws/account/model/InternalServerException.h>
+#include <aws/account/model/ListRegionsPaginationTraits.h>
 #include <aws/account/model/ListRegionsRequest.h>
 #include <aws/account/model/ListRegionsResult.h>
 #include <aws/account/model/PrimaryEmailUpdateStatus.h>
diff --git a/generated/tests/acm-gen-tests/ACMIncludeTests.cpp b/generated/tests/acm-gen-tests/ACMIncludeTests.cpp
index ecb574f866c7..b7949bbce9b4 100644
--- a/generated/tests/acm-gen-tests/ACMIncludeTests.cpp
+++ b/generated/tests/acm-gen-tests/ACMIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/acm/ACMClient.h>
+#include <aws/acm/ACMClientPagination.h>
 #include <aws/acm/ACMEndpointProvider.h>
 #include <aws/acm/ACMErrorMarshaller.h>
 #include <aws/acm/ACMErrors.h>
+#include <aws/acm/ACMPaginationBase.h>
 #include <aws/acm/ACMRequest.h>
 #include <aws/acm/ACMServiceClientModel.h>
+#include <aws/acm/ACMWaiter.h>
 #include <aws/acm/ACM_EXPORTS.h>
+#include <aws/acm/internal/ACMEndpointRules.h>
 #include <aws/acm/model/AcmCertificateMetadata.h>
 #include <aws/acm/model/AcmCertificateMetadataFilter.h>
 #include <aws/acm/model/AcmeAccount.h>
@@ -101,16 +105,22 @@
 #include <aws/acm/model/KeyAlgorithm.h>
 #include <aws/acm/model/KeyUsage.h>
 #include <aws/acm/model/KeyUsageName.h>
+#include <aws/acm/model/ListAcmeAccountsPaginationTraits.h>
 #include <aws/acm/model/ListAcmeAccountsRequest.h>
 #include <aws/acm/model/ListAcmeAccountsResult.h>
+#include <aws/acm/model/ListAcmeDomainValidationsPaginationTraits.h>
 #include <aws/acm/model/ListAcmeDomainValidationsRequest.h>
 #include <aws/acm/model/ListAcmeDomainValidationsResult.h>
+#include <aws/acm/model/ListAcmeEndpointsPaginationTraits.h>
 #include <aws/acm/model/ListAcmeEndpointsRequest.h>
 #include <aws/acm/model/ListAcmeEndpointsResult.h>
+#include <aws/acm/model/ListAcmeExternalAccountBindingsPaginationTraits.h>
 #include <aws/acm/model/ListAcmeExternalAccountBindingsRequest.h>
 #include <aws/acm/model/ListAcmeExternalAccountBindingsResult.h>
+#include <aws/acm/model/ListCertificateDomainValidationsPaginationTraits.h>
 #include <aws/acm/model/ListCertificateDomainValidationsRequest.h>
 #include <aws/acm/model/ListCertificateDomainValidationsResult.h>
+#include <aws/acm/model/ListCertificatesPaginationTraits.h>
 #include <aws/acm/model/ListCertificatesRequest.h>
 #include <aws/acm/model/ListCertificatesResult.h>
 #include <aws/acm/model/ListTagsForCertificateRequest.h>
@@ -139,6 +149,7 @@
 #include <aws/acm/model/RevokeAcmeExternalAccountBindingRequest.h>
 #include <aws/acm/model/RevokeCertificateRequest.h>
 #include <aws/acm/model/RevokeCertificateResult.h>
+#include <aws/acm/model/SearchCertificatesPaginationTraits.h>
 #include <aws/acm/model/SearchCertificatesRequest.h>
 #include <aws/acm/model/SearchCertificatesResult.h>
 #include <aws/acm/model/SearchCertificatesSortBy.h>
diff --git a/generated/tests/acm-pca-gen-tests/ACMPCAIncludeTests.cpp b/generated/tests/acm-pca-gen-tests/ACMPCAIncludeTests.cpp
index 083f9c3e34dd..73eb31f34ee4 100644
--- a/generated/tests/acm-pca-gen-tests/ACMPCAIncludeTests.cpp
+++ b/generated/tests/acm-pca-gen-tests/ACMPCAIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/acm-pca/ACMPCAClient.h>
+#include <aws/acm-pca/ACMPCAClientPagination.h>
 #include <aws/acm-pca/ACMPCAEndpointProvider.h>
 #include <aws/acm-pca/ACMPCAErrorMarshaller.h>
 #include <aws/acm-pca/ACMPCAErrors.h>
+#include <aws/acm-pca/ACMPCAPaginationBase.h>
 #include <aws/acm-pca/ACMPCARequest.h>
 #include <aws/acm-pca/ACMPCAServiceClientModel.h>
+#include <aws/acm-pca/ACMPCAWaiter.h>
 #include <aws/acm-pca/ACMPCA_EXPORTS.h>
+#include <aws/acm-pca/internal/ACMPCAEndpointRules.h>
 #include <aws/acm-pca/model/ASN1Subject.h>
 #include <aws/acm-pca/model/AccessDescription.h>
 #include <aws/acm-pca/model/AccessMethod.h>
@@ -64,10 +68,13 @@
 #include <aws/acm-pca/model/KeyAlgorithm.h>
 #include <aws/acm-pca/model/KeyStorageSecurityStandard.h>
 #include <aws/acm-pca/model/KeyUsage.h>
+#include <aws/acm-pca/model/ListCertificateAuthoritiesPaginationTraits.h>
 #include <aws/acm-pca/model/ListCertificateAuthoritiesRequest.h>
 #include <aws/acm-pca/model/ListCertificateAuthoritiesResult.h>
+#include <aws/acm-pca/model/ListPermissionsPaginationTraits.h>
 #include <aws/acm-pca/model/ListPermissionsRequest.h>
 #include <aws/acm-pca/model/ListPermissionsResult.h>
+#include <aws/acm-pca/model/ListTagsPaginationTraits.h>
 #include <aws/acm-pca/model/ListTagsRequest.h>
 #include <aws/acm-pca/model/ListTagsResult.h>
 #include <aws/acm-pca/model/OcspConfiguration.h>
diff --git a/generated/tests/agent-registry-control-gen-tests/AgentRegistryControlIncludeTests.cpp b/generated/tests/agent-registry-control-gen-tests/AgentRegistryControlIncludeTests.cpp
index 2025f3d9071b..77194c7fd176 100644
--- a/generated/tests/agent-registry-control-gen-tests/AgentRegistryControlIncludeTests.cpp
+++ b/generated/tests/agent-registry-control-gen-tests/AgentRegistryControlIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/agent-registry-control/AgentRegistryControlClient.h>
+#include <aws/agent-registry-control/AgentRegistryControlClientPagination.h>
 #include <aws/agent-registry-control/AgentRegistryControlEndpointProvider.h>
 #include <aws/agent-registry-control/AgentRegistryControlErrorMarshaller.h>
 #include <aws/agent-registry-control/AgentRegistryControlErrors.h>
+#include <aws/agent-registry-control/AgentRegistryControlPaginationBase.h>
 #include <aws/agent-registry-control/AgentRegistryControlRequest.h>
 #include <aws/agent-registry-control/AgentRegistryControlServiceClientModel.h>
+#include <aws/agent-registry-control/AgentRegistryControlWaiter.h>
 #include <aws/agent-registry-control/AgentRegistryControl_EXPORTS.h>
+#include <aws/agent-registry-control/internal/AgentRegistryControlEndpointRules.h>
 #include <aws/agent-registry-control/model/A2aAgentCardDescriptor.h>
 #include <aws/agent-registry-control/model/AgentSkillsAdditionalData.h>
 #include <aws/agent-registry-control/model/AgentSkillsDefinitionDescriptor.h>
@@ -44,8 +48,10 @@
 #include <aws/agent-registry-control/model/GetRegistryRequest.h>
 #include <aws/agent-registry-control/model/GetRegistryResult.h>
 #include <aws/agent-registry-control/model/InboundTokenClaimValueType.h>
+#include <aws/agent-registry-control/model/ListRegistriesPaginationTraits.h>
 #include <aws/agent-registry-control/model/ListRegistriesRequest.h>
 #include <aws/agent-registry-control/model/ListRegistriesResult.h>
+#include <aws/agent-registry-control/model/ListRegistryRecordsPaginationTraits.h>
 #include <aws/agent-registry-control/model/ListRegistryRecordsRequest.h>
 #include <aws/agent-registry-control/model/ListRegistryRecordsResult.h>
 #include <aws/agent-registry-control/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/agent-registry-gen-tests/AgentRegistryIncludeTests.cpp b/generated/tests/agent-registry-gen-tests/AgentRegistryIncludeTests.cpp
index 6852266c7f1a..a12d08eba02e 100644
--- a/generated/tests/agent-registry-gen-tests/AgentRegistryIncludeTests.cpp
+++ b/generated/tests/agent-registry-gen-tests/AgentRegistryIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/agent-registry/AgentRegistryClient.h>
+#include <aws/agent-registry/AgentRegistryClientPagination.h>
 #include <aws/agent-registry/AgentRegistryEndpointProvider.h>
 #include <aws/agent-registry/AgentRegistryErrorMarshaller.h>
 #include <aws/agent-registry/AgentRegistryErrors.h>
+#include <aws/agent-registry/AgentRegistryPaginationBase.h>
 #include <aws/agent-registry/AgentRegistryRequest.h>
 #include <aws/agent-registry/AgentRegistryServiceClientModel.h>
+#include <aws/agent-registry/AgentRegistryWaiter.h>
 #include <aws/agent-registry/AgentRegistry_EXPORTS.h>
+#include <aws/agent-registry/internal/AgentRegistryEndpointRules.h>
 #include <aws/agent-registry/model/A2aAgentCardDescriptor.h>
 #include <aws/agent-registry/model/AgentSkillsAdditionalData.h>
 #include <aws/agent-registry/model/AgentSkillsDefinitionDescriptor.h>
@@ -26,6 +30,7 @@
 #include <aws/agent-registry/model/DescriptorSourceFromUrl.h>
 #include <aws/agent-registry/model/Descriptors.h>
 #include <aws/agent-registry/model/DiscoverableRegistryRecordSummary.h>
+#include <aws/agent-registry/model/ListDiscoverableRegistryRecordsPaginationTraits.h>
 #include <aws/agent-registry/model/ListDiscoverableRegistryRecordsRequest.h>
 #include <aws/agent-registry/model/ListDiscoverableRegistryRecordsResult.h>
 #include <aws/agent-registry/model/McpServerAdditionalData.h>
diff --git a/generated/tests/aiops-gen-tests/AIOpsIncludeTests.cpp b/generated/tests/aiops-gen-tests/AIOpsIncludeTests.cpp
index 18be81e7d090..c654fdd9d2df 100644
--- a/generated/tests/aiops-gen-tests/AIOpsIncludeTests.cpp
+++ b/generated/tests/aiops-gen-tests/AIOpsIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/aiops/AIOpsClient.h>
+#include <aws/aiops/AIOpsClientPagination.h>
 #include <aws/aiops/AIOpsEndpointProvider.h>
 #include <aws/aiops/AIOpsErrorMarshaller.h>
 #include <aws/aiops/AIOpsErrors.h>
+#include <aws/aiops/AIOpsPaginationBase.h>
 #include <aws/aiops/AIOpsRequest.h>
 #include <aws/aiops/AIOpsServiceClientModel.h>
+#include <aws/aiops/AIOpsWaiter.h>
 #include <aws/aiops/AIOps_EXPORTS.h>
+#include <aws/aiops/internal/AIOpsEndpointRules.h>
 #include <aws/aiops/model/CreateInvestigationGroupRequest.h>
 #include <aws/aiops/model/CreateInvestigationGroupResult.h>
 #include <aws/aiops/model/CrossAccountConfiguration.h>
@@ -26,6 +30,7 @@
 #include <aws/aiops/model/GetInvestigationGroupRequest.h>
 #include <aws/aiops/model/GetInvestigationGroupResult.h>
 #include <aws/aiops/model/ListInvestigationGroupsModel.h>
+#include <aws/aiops/model/ListInvestigationGroupsPaginationTraits.h>
 #include <aws/aiops/model/ListInvestigationGroupsRequest.h>
 #include <aws/aiops/model/ListInvestigationGroupsResult.h>
 #include <aws/aiops/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/amp-gen-tests/PrometheusServiceIncludeTests.cpp b/generated/tests/amp-gen-tests/PrometheusServiceIncludeTests.cpp
index f720c00cdbe0..52e564141e1c 100644
--- a/generated/tests/amp-gen-tests/PrometheusServiceIncludeTests.cpp
+++ b/generated/tests/amp-gen-tests/PrometheusServiceIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/amp/PrometheusServiceClient.h>
+#include <aws/amp/PrometheusServiceClientPagination.h>
 #include <aws/amp/PrometheusServiceEndpointProvider.h>
 #include <aws/amp/PrometheusServiceErrorMarshaller.h>
 #include <aws/amp/PrometheusServiceErrors.h>
+#include <aws/amp/PrometheusServicePaginationBase.h>
 #include <aws/amp/PrometheusServiceRequest.h>
 #include <aws/amp/PrometheusServiceServiceClientModel.h>
+#include <aws/amp/PrometheusServiceWaiter.h>
 #include <aws/amp/PrometheusService_EXPORTS.h>
+#include <aws/amp/internal/PrometheusServiceEndpointRules.h>
 #include <aws/amp/model/AlertManagerDefinitionDescription.h>
 #include <aws/amp/model/AlertManagerDefinitionStatus.h>
 #include <aws/amp/model/AlertManagerDefinitionStatusCode.h>
@@ -80,14 +84,18 @@
 #include <aws/amp/model/InternalServerException.h>
 #include <aws/amp/model/LimitsPerLabelSet.h>
 #include <aws/amp/model/LimitsPerLabelSetEntry.h>
+#include <aws/amp/model/ListAnomalyDetectorsPaginationTraits.h>
 #include <aws/amp/model/ListAnomalyDetectorsRequest.h>
 #include <aws/amp/model/ListAnomalyDetectorsResult.h>
+#include <aws/amp/model/ListRuleGroupsNamespacesPaginationTraits.h>
 #include <aws/amp/model/ListRuleGroupsNamespacesRequest.h>
 #include <aws/amp/model/ListRuleGroupsNamespacesResult.h>
+#include <aws/amp/model/ListScrapersPaginationTraits.h>
 #include <aws/amp/model/ListScrapersRequest.h>
 #include <aws/amp/model/ListScrapersResult.h>
 #include <aws/amp/model/ListTagsForResourceRequest.h>
 #include <aws/amp/model/ListTagsForResourceResult.h>
+#include <aws/amp/model/ListWorkspacesPaginationTraits.h>
 #include <aws/amp/model/ListWorkspacesRequest.h>
 #include <aws/amp/model/ListWorkspacesResult.h>
 #include <aws/amp/model/LoggingConfigurationMetadata.h>
diff --git a/generated/tests/amplify-gen-tests/AmplifyIncludeTests.cpp b/generated/tests/amplify-gen-tests/AmplifyIncludeTests.cpp
index 0fb6848756de..31c643efb4ba 100644
--- a/generated/tests/amplify-gen-tests/AmplifyIncludeTests.cpp
+++ b/generated/tests/amplify-gen-tests/AmplifyIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/amplify/AmplifyClient.h>
+#include <aws/amplify/AmplifyClientPagination.h>
 #include <aws/amplify/AmplifyEndpointProvider.h>
 #include <aws/amplify/AmplifyErrorMarshaller.h>
 #include <aws/amplify/AmplifyErrors.h>
+#include <aws/amplify/AmplifyPaginationBase.h>
 #include <aws/amplify/AmplifyRequest.h>
 #include <aws/amplify/AmplifyServiceClientModel.h>
+#include <aws/amplify/AmplifyWaiter.h>
 #include <aws/amplify/Amplify_EXPORTS.h>
+#include <aws/amplify/internal/AmplifyEndpointRules.h>
 #include <aws/amplify/model/App.h>
 #include <aws/amplify/model/Artifact.h>
 #include <aws/amplify/model/AutoBranchCreationConfig.h>
@@ -73,16 +77,20 @@
 #include <aws/amplify/model/JobStatus.h>
 #include <aws/amplify/model/JobSummary.h>
 #include <aws/amplify/model/JobType.h>
+#include <aws/amplify/model/ListAppsPaginationTraits.h>
 #include <aws/amplify/model/ListAppsRequest.h>
 #include <aws/amplify/model/ListAppsResult.h>
 #include <aws/amplify/model/ListArtifactsRequest.h>
 #include <aws/amplify/model/ListArtifactsResult.h>
 #include <aws/amplify/model/ListBackendEnvironmentsRequest.h>
 #include <aws/amplify/model/ListBackendEnvironmentsResult.h>
+#include <aws/amplify/model/ListBranchesPaginationTraits.h>
 #include <aws/amplify/model/ListBranchesRequest.h>
 #include <aws/amplify/model/ListBranchesResult.h>
+#include <aws/amplify/model/ListDomainAssociationsPaginationTraits.h>
 #include <aws/amplify/model/ListDomainAssociationsRequest.h>
 #include <aws/amplify/model/ListDomainAssociationsResult.h>
+#include <aws/amplify/model/ListJobsPaginationTraits.h>
 #include <aws/amplify/model/ListJobsRequest.h>
 #include <aws/amplify/model/ListJobsResult.h>
 #include <aws/amplify/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/amplifybackend-gen-tests/AmplifyBackendIncludeTests.cpp b/generated/tests/amplifybackend-gen-tests/AmplifyBackendIncludeTests.cpp
index ad7f282ac11d..8dea788dd5a1 100644
--- a/generated/tests/amplifybackend-gen-tests/AmplifyBackendIncludeTests.cpp
+++ b/generated/tests/amplifybackend-gen-tests/AmplifyBackendIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/amplifybackend/AmplifyBackendEndpointProvider.h>
 #include <aws/amplifybackend/AmplifyBackendErrorMarshaller.h>
 #include <aws/amplifybackend/AmplifyBackendErrors.h>
+#include <aws/amplifybackend/AmplifyBackendPaginationBase.h>
 #include <aws/amplifybackend/AmplifyBackendRequest.h>
 #include <aws/amplifybackend/AmplifyBackendServiceClientModel.h>
+#include <aws/amplifybackend/AmplifyBackendWaiter.h>
 #include <aws/amplifybackend/AmplifyBackend_EXPORTS.h>
+#include <aws/amplifybackend/internal/AmplifyBackendEndpointRules.h>
 #include <aws/amplifybackend/model/AdditionalConstraintsElement.h>
 #include <aws/amplifybackend/model/AuthResources.h>
 #include <aws/amplifybackend/model/AuthenticatedElement.h>
diff --git a/generated/tests/amplifyuibuilder-gen-tests/AmplifyUIBuilderIncludeTests.cpp b/generated/tests/amplifyuibuilder-gen-tests/AmplifyUIBuilderIncludeTests.cpp
index f22f130ccf51..9eda7804e809 100644
--- a/generated/tests/amplifyuibuilder-gen-tests/AmplifyUIBuilderIncludeTests.cpp
+++ b/generated/tests/amplifyuibuilder-gen-tests/AmplifyUIBuilderIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/amplifyuibuilder/AmplifyUIBuilderClient.h>
+#include <aws/amplifyuibuilder/AmplifyUIBuilderClientPagination.h>
 #include <aws/amplifyuibuilder/AmplifyUIBuilderEndpointProvider.h>
 #include <aws/amplifyuibuilder/AmplifyUIBuilderErrorMarshaller.h>
 #include <aws/amplifyuibuilder/AmplifyUIBuilderErrors.h>
+#include <aws/amplifyuibuilder/AmplifyUIBuilderPaginationBase.h>
 #include <aws/amplifyuibuilder/AmplifyUIBuilderRequest.h>
 #include <aws/amplifyuibuilder/AmplifyUIBuilderServiceClientModel.h>
+#include <aws/amplifyuibuilder/AmplifyUIBuilderWaiter.h>
 #include <aws/amplifyuibuilder/AmplifyUIBuilder_EXPORTS.h>
+#include <aws/amplifyuibuilder/internal/AmplifyUIBuilderEndpointRules.h>
 #include <aws/amplifyuibuilder/model/ActionParameters.h>
 #include <aws/amplifyuibuilder/model/ApiConfiguration.h>
 #include <aws/amplifyuibuilder/model/CodegenDependency.h>
@@ -57,10 +61,13 @@
 #include <aws/amplifyuibuilder/model/ExchangeCodeForTokenRequest.h>
 #include <aws/amplifyuibuilder/model/ExchangeCodeForTokenRequestBody.h>
 #include <aws/amplifyuibuilder/model/ExchangeCodeForTokenResult.h>
+#include <aws/amplifyuibuilder/model/ExportComponentsPaginationTraits.h>
 #include <aws/amplifyuibuilder/model/ExportComponentsRequest.h>
 #include <aws/amplifyuibuilder/model/ExportComponentsResult.h>
+#include <aws/amplifyuibuilder/model/ExportFormsPaginationTraits.h>
 #include <aws/amplifyuibuilder/model/ExportFormsRequest.h>
 #include <aws/amplifyuibuilder/model/ExportFormsResult.h>
+#include <aws/amplifyuibuilder/model/ExportThemesPaginationTraits.h>
 #include <aws/amplifyuibuilder/model/ExportThemesRequest.h>
 #include <aws/amplifyuibuilder/model/ExportThemesResult.h>
 #include <aws/amplifyuibuilder/model/FieldConfig.h>
@@ -100,14 +107,18 @@
 #include <aws/amplifyuibuilder/model/JSScript.h>
 #include <aws/amplifyuibuilder/model/JSTarget.h>
 #include <aws/amplifyuibuilder/model/LabelDecorator.h>
+#include <aws/amplifyuibuilder/model/ListCodegenJobsPaginationTraits.h>
 #include <aws/amplifyuibuilder/model/ListCodegenJobsRequest.h>
 #include <aws/amplifyuibuilder/model/ListCodegenJobsResult.h>
+#include <aws/amplifyuibuilder/model/ListComponentsPaginationTraits.h>
 #include <aws/amplifyuibuilder/model/ListComponentsRequest.h>
 #include <aws/amplifyuibuilder/model/ListComponentsResult.h>
+#include <aws/amplifyuibuilder/model/ListFormsPaginationTraits.h>
 #include <aws/amplifyuibuilder/model/ListFormsRequest.h>
 #include <aws/amplifyuibuilder/model/ListFormsResult.h>
 #include <aws/amplifyuibuilder/model/ListTagsForResourceRequest.h>
 #include <aws/amplifyuibuilder/model/ListTagsForResourceResult.h>
+#include <aws/amplifyuibuilder/model/ListThemesPaginationTraits.h>
 #include <aws/amplifyuibuilder/model/ListThemesRequest.h>
 #include <aws/amplifyuibuilder/model/ListThemesResult.h>
 #include <aws/amplifyuibuilder/model/MutationActionSetStateParameter.h>
diff --git a/generated/tests/apigateway-gen-tests/APIGatewayIncludeTests.cpp b/generated/tests/apigateway-gen-tests/APIGatewayIncludeTests.cpp
index 85cf71fdc84d..2613f7d79005 100644
--- a/generated/tests/apigateway-gen-tests/APIGatewayIncludeTests.cpp
+++ b/generated/tests/apigateway-gen-tests/APIGatewayIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/apigateway/APIGatewayClient.h>
+#include <aws/apigateway/APIGatewayClientPagination.h>
 #include <aws/apigateway/APIGatewayEndpointProvider.h>
 #include <aws/apigateway/APIGatewayErrorMarshaller.h>
 #include <aws/apigateway/APIGatewayErrors.h>
+#include <aws/apigateway/APIGatewayPaginationBase.h>
 #include <aws/apigateway/APIGatewayRequest.h>
 #include <aws/apigateway/APIGatewayServiceClientModel.h>
+#include <aws/apigateway/APIGatewayWaiter.h>
 #include <aws/apigateway/APIGateway_EXPORTS.h>
+#include <aws/apigateway/internal/APIGatewayEndpointRules.h>
 #include <aws/apigateway/model/AccessAssociationSourceType.h>
 #include <aws/apigateway/model/AccessLogSettings.h>
 #include <aws/apigateway/model/ApiKey.h>
@@ -105,6 +109,7 @@
 #include <aws/apigateway/model/GetAccountResult.h>
 #include <aws/apigateway/model/GetApiKeyRequest.h>
 #include <aws/apigateway/model/GetApiKeyResult.h>
+#include <aws/apigateway/model/GetApiKeysPaginationTraits.h>
 #include <aws/apigateway/model/GetApiKeysRequest.h>
 #include <aws/apigateway/model/GetApiKeysResult.h>
 #include <aws/apigateway/model/GetAuthorizerRequest.h>
@@ -113,14 +118,17 @@
 #include <aws/apigateway/model/GetAuthorizersResult.h>
 #include <aws/apigateway/model/GetBasePathMappingRequest.h>
 #include <aws/apigateway/model/GetBasePathMappingResult.h>
+#include <aws/apigateway/model/GetBasePathMappingsPaginationTraits.h>
 #include <aws/apigateway/model/GetBasePathMappingsRequest.h>
 #include <aws/apigateway/model/GetBasePathMappingsResult.h>
 #include <aws/apigateway/model/GetClientCertificateRequest.h>
 #include <aws/apigateway/model/GetClientCertificateResult.h>
+#include <aws/apigateway/model/GetClientCertificatesPaginationTraits.h>
 #include <aws/apigateway/model/GetClientCertificatesRequest.h>
 #include <aws/apigateway/model/GetClientCertificatesResult.h>
 #include <aws/apigateway/model/GetDeploymentRequest.h>
 #include <aws/apigateway/model/GetDeploymentResult.h>
+#include <aws/apigateway/model/GetDeploymentsPaginationTraits.h>
 #include <aws/apigateway/model/GetDeploymentsRequest.h>
 #include <aws/apigateway/model/GetDeploymentsResult.h>
 #include <aws/apigateway/model/GetDocumentationPartRequest.h>
@@ -135,6 +143,7 @@
 #include <aws/apigateway/model/GetDomainNameAccessAssociationsResult.h>
 #include <aws/apigateway/model/GetDomainNameRequest.h>
 #include <aws/apigateway/model/GetDomainNameResult.h>
+#include <aws/apigateway/model/GetDomainNamesPaginationTraits.h>
 #include <aws/apigateway/model/GetDomainNamesRequest.h>
 #include <aws/apigateway/model/GetDomainNamesResult.h>
 #include <aws/apigateway/model/GetExportRequest.h>
@@ -155,6 +164,7 @@
 #include <aws/apigateway/model/GetModelResult.h>
 #include <aws/apigateway/model/GetModelTemplateRequest.h>
 #include <aws/apigateway/model/GetModelTemplateResult.h>
+#include <aws/apigateway/model/GetModelsPaginationTraits.h>
 #include <aws/apigateway/model/GetModelsRequest.h>
 #include <aws/apigateway/model/GetModelsResult.h>
 #include <aws/apigateway/model/GetRequestValidatorRequest.h>
@@ -163,10 +173,12 @@
 #include <aws/apigateway/model/GetRequestValidatorsResult.h>
 #include <aws/apigateway/model/GetResourceRequest.h>
 #include <aws/apigateway/model/GetResourceResult.h>
+#include <aws/apigateway/model/GetResourcesPaginationTraits.h>
 #include <aws/apigateway/model/GetResourcesRequest.h>
 #include <aws/apigateway/model/GetResourcesResult.h>
 #include <aws/apigateway/model/GetRestApiRequest.h>
 #include <aws/apigateway/model/GetRestApiResult.h>
+#include <aws/apigateway/model/GetRestApisPaginationTraits.h>
 #include <aws/apigateway/model/GetRestApisRequest.h>
 #include <aws/apigateway/model/GetRestApisResult.h>
 #include <aws/apigateway/model/GetSdkRequest.h>
@@ -181,18 +193,22 @@
 #include <aws/apigateway/model/GetStagesResult.h>
 #include <aws/apigateway/model/GetTagsRequest.h>
 #include <aws/apigateway/model/GetTagsResult.h>
+#include <aws/apigateway/model/GetUsagePaginationTraits.h>
 #include <aws/apigateway/model/GetUsagePlanKeyRequest.h>
 #include <aws/apigateway/model/GetUsagePlanKeyResult.h>
+#include <aws/apigateway/model/GetUsagePlanKeysPaginationTraits.h>
 #include <aws/apigateway/model/GetUsagePlanKeysRequest.h>
 #include <aws/apigateway/model/GetUsagePlanKeysResult.h>
 #include <aws/apigateway/model/GetUsagePlanRequest.h>
 #include <aws/apigateway/model/GetUsagePlanResult.h>
+#include <aws/apigateway/model/GetUsagePlansPaginationTraits.h>
 #include <aws/apigateway/model/GetUsagePlansRequest.h>
 #include <aws/apigateway/model/GetUsagePlansResult.h>
 #include <aws/apigateway/model/GetUsageRequest.h>
 #include <aws/apigateway/model/GetUsageResult.h>
 #include <aws/apigateway/model/GetVpcLinkRequest.h>
 #include <aws/apigateway/model/GetVpcLinkResult.h>
+#include <aws/apigateway/model/GetVpcLinksPaginationTraits.h>
 #include <aws/apigateway/model/GetVpcLinksRequest.h>
 #include <aws/apigateway/model/GetVpcLinksResult.h>
 #include <aws/apigateway/model/ImportApiKeysRequest.h>
diff --git a/generated/tests/apigatewaymanagementapi-gen-tests/ApiGatewayManagementApiIncludeTests.cpp b/generated/tests/apigatewaymanagementapi-gen-tests/ApiGatewayManagementApiIncludeTests.cpp
index c991f8a93899..53fc728b5bfa 100644
--- a/generated/tests/apigatewaymanagementapi-gen-tests/ApiGatewayManagementApiIncludeTests.cpp
+++ b/generated/tests/apigatewaymanagementapi-gen-tests/ApiGatewayManagementApiIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/apigatewaymanagementapi/ApiGatewayManagementApiEndpointProvider.h>
 #include <aws/apigatewaymanagementapi/ApiGatewayManagementApiErrorMarshaller.h>
 #include <aws/apigatewaymanagementapi/ApiGatewayManagementApiErrors.h>
+#include <aws/apigatewaymanagementapi/ApiGatewayManagementApiPaginationBase.h>
 #include <aws/apigatewaymanagementapi/ApiGatewayManagementApiRequest.h>
 #include <aws/apigatewaymanagementapi/ApiGatewayManagementApiServiceClientModel.h>
+#include <aws/apigatewaymanagementapi/ApiGatewayManagementApiWaiter.h>
 #include <aws/apigatewaymanagementapi/ApiGatewayManagementApi_EXPORTS.h>
+#include <aws/apigatewaymanagementapi/internal/ApiGatewayManagementApiEndpointRules.h>
 #include <aws/apigatewaymanagementapi/model/DeleteConnectionRequest.h>
 #include <aws/apigatewaymanagementapi/model/GetConnectionRequest.h>
 #include <aws/apigatewaymanagementapi/model/GetConnectionResult.h>
diff --git a/generated/tests/apigatewayv2-gen-tests/ApiGatewayV2IncludeTests.cpp b/generated/tests/apigatewayv2-gen-tests/ApiGatewayV2IncludeTests.cpp
index 509241d36e41..ec8f87f58b08 100644
--- a/generated/tests/apigatewayv2-gen-tests/ApiGatewayV2IncludeTests.cpp
+++ b/generated/tests/apigatewayv2-gen-tests/ApiGatewayV2IncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/apigatewayv2/ApiGatewayV2Client.h>
+#include <aws/apigatewayv2/ApiGatewayV2ClientPagination.h>
 #include <aws/apigatewayv2/ApiGatewayV2EndpointProvider.h>
 #include <aws/apigatewayv2/ApiGatewayV2ErrorMarshaller.h>
 #include <aws/apigatewayv2/ApiGatewayV2Errors.h>
+#include <aws/apigatewayv2/ApiGatewayV2PaginationBase.h>
 #include <aws/apigatewayv2/ApiGatewayV2Request.h>
 #include <aws/apigatewayv2/ApiGatewayV2ServiceClientModel.h>
+#include <aws/apigatewayv2/ApiGatewayV2Waiter.h>
 #include <aws/apigatewayv2/ApiGatewayV2_EXPORTS.h>
+#include <aws/apigatewayv2/internal/ApiGatewayV2EndpointRules.h>
 #include <aws/apigatewayv2/model/ACMManaged.h>
 #include <aws/apigatewayv2/model/AccessLogSettings.h>
 #include <aws/apigatewayv2/model/Api.h>
@@ -179,6 +183,7 @@
 #include <aws/apigatewayv2/model/ListProductPagesResult.h>
 #include <aws/apigatewayv2/model/ListProductRestEndpointPagesRequest.h>
 #include <aws/apigatewayv2/model/ListProductRestEndpointPagesResult.h>
+#include <aws/apigatewayv2/model/ListRoutingRulesPaginationTraits.h>
 #include <aws/apigatewayv2/model/ListRoutingRulesRequest.h>
 #include <aws/apigatewayv2/model/ListRoutingRulesResult.h>
 #include <aws/apigatewayv2/model/LoggingLevel.h>
diff --git a/generated/tests/appconfig-gen-tests/AppConfigIncludeTests.cpp b/generated/tests/appconfig-gen-tests/AppConfigIncludeTests.cpp
index dc2d567c3b99..a7d3a4f4d50e 100644
--- a/generated/tests/appconfig-gen-tests/AppConfigIncludeTests.cpp
+++ b/generated/tests/appconfig-gen-tests/AppConfigIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/appconfig/AppConfigClient.h>
+#include <aws/appconfig/AppConfigClientPagination.h>
 #include <aws/appconfig/AppConfigEndpointProvider.h>
 #include <aws/appconfig/AppConfigErrorMarshaller.h>
 #include <aws/appconfig/AppConfigErrors.h>
+#include <aws/appconfig/AppConfigPaginationBase.h>
 #include <aws/appconfig/AppConfigRequest.h>
 #include <aws/appconfig/AppConfigServiceClientModel.h>
+#include <aws/appconfig/AppConfigWaiter.h>
 #include <aws/appconfig/AppConfig_EXPORTS.h>
+#include <aws/appconfig/internal/AppConfigEndpointRules.h>
 #include <aws/appconfig/model/Action.h>
 #include <aws/appconfig/model/ActionInvocation.h>
 #include <aws/appconfig/model/ActionPoint.h>
@@ -96,26 +100,37 @@
 #include <aws/appconfig/model/GrowthType.h>
 #include <aws/appconfig/model/HostedConfigurationVersionSummary.h>
 #include <aws/appconfig/model/InvalidConfigurationDetail.h>
+#include <aws/appconfig/model/ListApplicationsPaginationTraits.h>
 #include <aws/appconfig/model/ListApplicationsRequest.h>
 #include <aws/appconfig/model/ListApplicationsResult.h>
+#include <aws/appconfig/model/ListConfigurationProfilesPaginationTraits.h>
 #include <aws/appconfig/model/ListConfigurationProfilesRequest.h>
 #include <aws/appconfig/model/ListConfigurationProfilesResult.h>
+#include <aws/appconfig/model/ListDeploymentStrategiesPaginationTraits.h>
 #include <aws/appconfig/model/ListDeploymentStrategiesRequest.h>
 #include <aws/appconfig/model/ListDeploymentStrategiesResult.h>
+#include <aws/appconfig/model/ListDeploymentsPaginationTraits.h>
 #include <aws/appconfig/model/ListDeploymentsRequest.h>
 #include <aws/appconfig/model/ListDeploymentsResult.h>
+#include <aws/appconfig/model/ListEnvironmentsPaginationTraits.h>
 #include <aws/appconfig/model/ListEnvironmentsRequest.h>
 #include <aws/appconfig/model/ListEnvironmentsResult.h>
+#include <aws/appconfig/model/ListExperimentDefinitionsPaginationTraits.h>
 #include <aws/appconfig/model/ListExperimentDefinitionsRequest.h>
 #include <aws/appconfig/model/ListExperimentDefinitionsResult.h>
+#include <aws/appconfig/model/ListExperimentRunEventsPaginationTraits.h>
 #include <aws/appconfig/model/ListExperimentRunEventsRequest.h>
 #include <aws/appconfig/model/ListExperimentRunEventsResult.h>
+#include <aws/appconfig/model/ListExperimentRunsPaginationTraits.h>
 #include <aws/appconfig/model/ListExperimentRunsRequest.h>
 #include <aws/appconfig/model/ListExperimentRunsResult.h>
+#include <aws/appconfig/model/ListExtensionAssociationsPaginationTraits.h>
 #include <aws/appconfig/model/ListExtensionAssociationsRequest.h>
 #include <aws/appconfig/model/ListExtensionAssociationsResult.h>
+#include <aws/appconfig/model/ListExtensionsPaginationTraits.h>
 #include <aws/appconfig/model/ListExtensionsRequest.h>
 #include <aws/appconfig/model/ListExtensionsResult.h>
+#include <aws/appconfig/model/ListHostedConfigurationVersionsPaginationTraits.h>
 #include <aws/appconfig/model/ListHostedConfigurationVersionsRequest.h>
 #include <aws/appconfig/model/ListHostedConfigurationVersionsResult.h>
 #include <aws/appconfig/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/appconfigdata-gen-tests/AppConfigDataIncludeTests.cpp b/generated/tests/appconfigdata-gen-tests/AppConfigDataIncludeTests.cpp
index 9aae7a620110..517a2cded274 100644
--- a/generated/tests/appconfigdata-gen-tests/AppConfigDataIncludeTests.cpp
+++ b/generated/tests/appconfigdata-gen-tests/AppConfigDataIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/appconfigdata/AppConfigDataEndpointProvider.h>
 #include <aws/appconfigdata/AppConfigDataErrorMarshaller.h>
 #include <aws/appconfigdata/AppConfigDataErrors.h>
+#include <aws/appconfigdata/AppConfigDataPaginationBase.h>
 #include <aws/appconfigdata/AppConfigDataRequest.h>
 #include <aws/appconfigdata/AppConfigDataServiceClientModel.h>
+#include <aws/appconfigdata/AppConfigDataWaiter.h>
 #include <aws/appconfigdata/AppConfigData_EXPORTS.h>
+#include <aws/appconfigdata/internal/AppConfigDataEndpointRules.h>
 #include <aws/appconfigdata/model/BadRequestDetails.h>
 #include <aws/appconfigdata/model/BadRequestException.h>
 #include <aws/appconfigdata/model/BadRequestReason.h>
diff --git a/generated/tests/appfabric-gen-tests/AppFabricIncludeTests.cpp b/generated/tests/appfabric-gen-tests/AppFabricIncludeTests.cpp
index db92a7c47c83..c23b0f6dab20 100644
--- a/generated/tests/appfabric-gen-tests/AppFabricIncludeTests.cpp
+++ b/generated/tests/appfabric-gen-tests/AppFabricIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/appfabric/AppFabricClient.h>
+#include <aws/appfabric/AppFabricClientPagination.h>
 #include <aws/appfabric/AppFabricEndpointProvider.h>
 #include <aws/appfabric/AppFabricErrorMarshaller.h>
 #include <aws/appfabric/AppFabricErrors.h>
+#include <aws/appfabric/AppFabricPaginationBase.h>
 #include <aws/appfabric/AppFabricRequest.h>
 #include <aws/appfabric/AppFabricServiceClientModel.h>
+#include <aws/appfabric/AppFabricWaiter.h>
 #include <aws/appfabric/AppFabric_EXPORTS.h>
+#include <aws/appfabric/internal/AppFabricEndpointRules.h>
 #include <aws/appfabric/model/ApiKeyCredential.h>
 #include <aws/appfabric/model/AppAuthorization.h>
 #include <aws/appfabric/model/AppAuthorizationStatus.h>
@@ -65,12 +69,16 @@
 #include <aws/appfabric/model/IngestionSummary.h>
 #include <aws/appfabric/model/IngestionType.h>
 #include <aws/appfabric/model/InternalServerException.h>
+#include <aws/appfabric/model/ListAppAuthorizationsPaginationTraits.h>
 #include <aws/appfabric/model/ListAppAuthorizationsRequest.h>
 #include <aws/appfabric/model/ListAppAuthorizationsResult.h>
+#include <aws/appfabric/model/ListAppBundlesPaginationTraits.h>
 #include <aws/appfabric/model/ListAppBundlesRequest.h>
 #include <aws/appfabric/model/ListAppBundlesResult.h>
+#include <aws/appfabric/model/ListIngestionDestinationsPaginationTraits.h>
 #include <aws/appfabric/model/ListIngestionDestinationsRequest.h>
 #include <aws/appfabric/model/ListIngestionDestinationsResult.h>
+#include <aws/appfabric/model/ListIngestionsPaginationTraits.h>
 #include <aws/appfabric/model/ListIngestionsRequest.h>
 #include <aws/appfabric/model/ListIngestionsResult.h>
 #include <aws/appfabric/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/appflow-gen-tests/AppflowIncludeTests.cpp b/generated/tests/appflow-gen-tests/AppflowIncludeTests.cpp
index 7823221becaa..e6a9c165e629 100644
--- a/generated/tests/appflow-gen-tests/AppflowIncludeTests.cpp
+++ b/generated/tests/appflow-gen-tests/AppflowIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/appflow/AppflowClient.h>
+#include <aws/appflow/AppflowClientPagination.h>
 #include <aws/appflow/AppflowEndpointProvider.h>
 #include <aws/appflow/AppflowErrorMarshaller.h>
 #include <aws/appflow/AppflowErrors.h>
+#include <aws/appflow/AppflowPaginationBase.h>
 #include <aws/appflow/AppflowRequest.h>
 #include <aws/appflow/AppflowServiceClientModel.h>
+#include <aws/appflow/AppflowWaiter.h>
 #include <aws/appflow/Appflow_EXPORTS.h>
+#include <aws/appflow/internal/AppflowEndpointRules.h>
 #include <aws/appflow/model/AggregationConfig.h>
 #include <aws/appflow/model/AggregationType.h>
 #include <aws/appflow/model/AmplitudeConnectorOperator.h>
@@ -70,12 +74,15 @@
 #include <aws/appflow/model/DeleteFlowResult.h>
 #include <aws/appflow/model/DescribeConnectorEntityRequest.h>
 #include <aws/appflow/model/DescribeConnectorEntityResult.h>
+#include <aws/appflow/model/DescribeConnectorProfilesPaginationTraits.h>
 #include <aws/appflow/model/DescribeConnectorProfilesRequest.h>
 #include <aws/appflow/model/DescribeConnectorProfilesResult.h>
 #include <aws/appflow/model/DescribeConnectorRequest.h>
 #include <aws/appflow/model/DescribeConnectorResult.h>
+#include <aws/appflow/model/DescribeConnectorsPaginationTraits.h>
 #include <aws/appflow/model/DescribeConnectorsRequest.h>
 #include <aws/appflow/model/DescribeConnectorsResult.h>
+#include <aws/appflow/model/DescribeFlowExecutionRecordsPaginationTraits.h>
 #include <aws/appflow/model/DescribeFlowExecutionRecordsRequest.h>
 #include <aws/appflow/model/DescribeFlowExecutionRecordsResult.h>
 #include <aws/appflow/model/DescribeFlowRequest.h>
@@ -119,8 +126,10 @@
 #include <aws/appflow/model/LambdaConnectorProvisioningConfig.h>
 #include <aws/appflow/model/ListConnectorEntitiesRequest.h>
 #include <aws/appflow/model/ListConnectorEntitiesResult.h>
+#include <aws/appflow/model/ListConnectorsPaginationTraits.h>
 #include <aws/appflow/model/ListConnectorsRequest.h>
 #include <aws/appflow/model/ListConnectorsResult.h>
+#include <aws/appflow/model/ListFlowsPaginationTraits.h>
 #include <aws/appflow/model/ListFlowsRequest.h>
 #include <aws/appflow/model/ListFlowsResult.h>
 #include <aws/appflow/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/appintegrations-gen-tests/AppIntegrationsServiceIncludeTests.cpp b/generated/tests/appintegrations-gen-tests/AppIntegrationsServiceIncludeTests.cpp
index bbdf2a964e8b..d8dacce45f6b 100644
--- a/generated/tests/appintegrations-gen-tests/AppIntegrationsServiceIncludeTests.cpp
+++ b/generated/tests/appintegrations-gen-tests/AppIntegrationsServiceIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/appintegrations/AppIntegrationsServiceClient.h>
+#include <aws/appintegrations/AppIntegrationsServiceClientPagination.h>
 #include <aws/appintegrations/AppIntegrationsServiceEndpointProvider.h>
 #include <aws/appintegrations/AppIntegrationsServiceErrorMarshaller.h>
 #include <aws/appintegrations/AppIntegrationsServiceErrors.h>
+#include <aws/appintegrations/AppIntegrationsServicePaginationBase.h>
 #include <aws/appintegrations/AppIntegrationsServiceRequest.h>
 #include <aws/appintegrations/AppIntegrationsServiceServiceClientModel.h>
+#include <aws/appintegrations/AppIntegrationsServiceWaiter.h>
 #include <aws/appintegrations/AppIntegrationsService_EXPORTS.h>
+#include <aws/appintegrations/internal/AppIntegrationsServiceEndpointRules.h>
 #include <aws/appintegrations/model/ApplicationAssociationSummary.h>
 #include <aws/appintegrations/model/ApplicationConfig.h>
 #include <aws/appintegrations/model/ApplicationSourceConfig.h>
@@ -52,16 +56,22 @@
 #include <aws/appintegrations/model/GetEventIntegrationResult.h>
 #include <aws/appintegrations/model/IframeConfig.h>
 #include <aws/appintegrations/model/LastExecutionStatus.h>
+#include <aws/appintegrations/model/ListApplicationAssociationsPaginationTraits.h>
 #include <aws/appintegrations/model/ListApplicationAssociationsRequest.h>
 #include <aws/appintegrations/model/ListApplicationAssociationsResult.h>
+#include <aws/appintegrations/model/ListApplicationsPaginationTraits.h>
 #include <aws/appintegrations/model/ListApplicationsRequest.h>
 #include <aws/appintegrations/model/ListApplicationsResult.h>
+#include <aws/appintegrations/model/ListDataIntegrationAssociationsPaginationTraits.h>
 #include <aws/appintegrations/model/ListDataIntegrationAssociationsRequest.h>
 #include <aws/appintegrations/model/ListDataIntegrationAssociationsResult.h>
+#include <aws/appintegrations/model/ListDataIntegrationsPaginationTraits.h>
 #include <aws/appintegrations/model/ListDataIntegrationsRequest.h>
 #include <aws/appintegrations/model/ListDataIntegrationsResult.h>
+#include <aws/appintegrations/model/ListEventIntegrationAssociationsPaginationTraits.h>
 #include <aws/appintegrations/model/ListEventIntegrationAssociationsRequest.h>
 #include <aws/appintegrations/model/ListEventIntegrationAssociationsResult.h>
+#include <aws/appintegrations/model/ListEventIntegrationsPaginationTraits.h>
 #include <aws/appintegrations/model/ListEventIntegrationsRequest.h>
 #include <aws/appintegrations/model/ListEventIntegrationsResult.h>
 #include <aws/appintegrations/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/application-autoscaling-gen-tests/ApplicationAutoScalingIncludeTests.cpp b/generated/tests/application-autoscaling-gen-tests/ApplicationAutoScalingIncludeTests.cpp
index c61c99d87788..36e895fac674 100644
--- a/generated/tests/application-autoscaling-gen-tests/ApplicationAutoScalingIncludeTests.cpp
+++ b/generated/tests/application-autoscaling-gen-tests/ApplicationAutoScalingIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/application-autoscaling/ApplicationAutoScalingClient.h>
+#include <aws/application-autoscaling/ApplicationAutoScalingClientPagination.h>
 #include <aws/application-autoscaling/ApplicationAutoScalingEndpointProvider.h>
 #include <aws/application-autoscaling/ApplicationAutoScalingErrorMarshaller.h>
 #include <aws/application-autoscaling/ApplicationAutoScalingErrors.h>
+#include <aws/application-autoscaling/ApplicationAutoScalingPaginationBase.h>
 #include <aws/application-autoscaling/ApplicationAutoScalingRequest.h>
 #include <aws/application-autoscaling/ApplicationAutoScalingServiceClientModel.h>
+#include <aws/application-autoscaling/ApplicationAutoScalingWaiter.h>
 #include <aws/application-autoscaling/ApplicationAutoScaling_EXPORTS.h>
+#include <aws/application-autoscaling/internal/ApplicationAutoScalingEndpointRules.h>
 #include <aws/application-autoscaling/model/AdjustmentType.h>
 #include <aws/application-autoscaling/model/Alarm.h>
 #include <aws/application-autoscaling/model/CapacityForecast.h>
@@ -23,12 +27,16 @@
 #include <aws/application-autoscaling/model/DeleteScheduledActionResult.h>
 #include <aws/application-autoscaling/model/DeregisterScalableTargetRequest.h>
 #include <aws/application-autoscaling/model/DeregisterScalableTargetResult.h>
+#include <aws/application-autoscaling/model/DescribeScalableTargetsPaginationTraits.h>
 #include <aws/application-autoscaling/model/DescribeScalableTargetsRequest.h>
 #include <aws/application-autoscaling/model/DescribeScalableTargetsResult.h>
+#include <aws/application-autoscaling/model/DescribeScalingActivitiesPaginationTraits.h>
 #include <aws/application-autoscaling/model/DescribeScalingActivitiesRequest.h>
 #include <aws/application-autoscaling/model/DescribeScalingActivitiesResult.h>
+#include <aws/application-autoscaling/model/DescribeScalingPoliciesPaginationTraits.h>
 #include <aws/application-autoscaling/model/DescribeScalingPoliciesRequest.h>
 #include <aws/application-autoscaling/model/DescribeScalingPoliciesResult.h>
+#include <aws/application-autoscaling/model/DescribeScheduledActionsPaginationTraits.h>
 #include <aws/application-autoscaling/model/DescribeScheduledActionsRequest.h>
 #include <aws/application-autoscaling/model/DescribeScheduledActionsResult.h>
 #include <aws/application-autoscaling/model/GetPredictiveScalingForecastRequest.h>
diff --git a/generated/tests/application-insights-gen-tests/ApplicationInsightsIncludeTests.cpp b/generated/tests/application-insights-gen-tests/ApplicationInsightsIncludeTests.cpp
index ea16aba4c3c3..579f93d0d47e 100644
--- a/generated/tests/application-insights-gen-tests/ApplicationInsightsIncludeTests.cpp
+++ b/generated/tests/application-insights-gen-tests/ApplicationInsightsIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/application-insights/ApplicationInsightsClient.h>
+#include <aws/application-insights/ApplicationInsightsClientPagination.h>
 #include <aws/application-insights/ApplicationInsightsEndpointProvider.h>
 #include <aws/application-insights/ApplicationInsightsErrorMarshaller.h>
 #include <aws/application-insights/ApplicationInsightsErrors.h>
+#include <aws/application-insights/ApplicationInsightsPaginationBase.h>
 #include <aws/application-insights/ApplicationInsightsRequest.h>
 #include <aws/application-insights/ApplicationInsightsServiceClientModel.h>
+#include <aws/application-insights/ApplicationInsightsWaiter.h>
 #include <aws/application-insights/ApplicationInsights_EXPORTS.h>
+#include <aws/application-insights/internal/ApplicationInsightsEndpointRules.h>
 #include <aws/application-insights/model/AddWorkloadRequest.h>
 #include <aws/application-insights/model/AddWorkloadResult.h>
 #include <aws/application-insights/model/ApplicationComponent.h>
@@ -55,20 +59,27 @@
 #include <aws/application-insights/model/FeedbackKey.h>
 #include <aws/application-insights/model/FeedbackValue.h>
 #include <aws/application-insights/model/GroupingType.h>
+#include <aws/application-insights/model/ListApplicationsPaginationTraits.h>
 #include <aws/application-insights/model/ListApplicationsRequest.h>
 #include <aws/application-insights/model/ListApplicationsResult.h>
+#include <aws/application-insights/model/ListComponentsPaginationTraits.h>
 #include <aws/application-insights/model/ListComponentsRequest.h>
 #include <aws/application-insights/model/ListComponentsResult.h>
+#include <aws/application-insights/model/ListConfigurationHistoryPaginationTraits.h>
 #include <aws/application-insights/model/ListConfigurationHistoryRequest.h>
 #include <aws/application-insights/model/ListConfigurationHistoryResult.h>
+#include <aws/application-insights/model/ListLogPatternSetsPaginationTraits.h>
 #include <aws/application-insights/model/ListLogPatternSetsRequest.h>
 #include <aws/application-insights/model/ListLogPatternSetsResult.h>
+#include <aws/application-insights/model/ListLogPatternsPaginationTraits.h>
 #include <aws/application-insights/model/ListLogPatternsRequest.h>
 #include <aws/application-insights/model/ListLogPatternsResult.h>
+#include <aws/application-insights/model/ListProblemsPaginationTraits.h>
 #include <aws/application-insights/model/ListProblemsRequest.h>
 #include <aws/application-insights/model/ListProblemsResult.h>
 #include <aws/application-insights/model/ListTagsForResourceRequest.h>
 #include <aws/application-insights/model/ListTagsForResourceResult.h>
+#include <aws/application-insights/model/ListWorkloadsPaginationTraits.h>
 #include <aws/application-insights/model/ListWorkloadsRequest.h>
 #include <aws/application-insights/model/ListWorkloadsResult.h>
 #include <aws/application-insights/model/LogFilter.h>
diff --git a/generated/tests/application-signals-gen-tests/ApplicationSignalsIncludeTests.cpp b/generated/tests/application-signals-gen-tests/ApplicationSignalsIncludeTests.cpp
index 5d9837a0f680..203ec66fc94c 100644
--- a/generated/tests/application-signals-gen-tests/ApplicationSignalsIncludeTests.cpp
+++ b/generated/tests/application-signals-gen-tests/ApplicationSignalsIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/application-signals/ApplicationSignalsClient.h>
+#include <aws/application-signals/ApplicationSignalsClientPagination.h>
 #include <aws/application-signals/ApplicationSignalsEndpointProvider.h>
 #include <aws/application-signals/ApplicationSignalsErrorMarshaller.h>
 #include <aws/application-signals/ApplicationSignalsErrors.h>
+#include <aws/application-signals/ApplicationSignalsPaginationBase.h>
 #include <aws/application-signals/ApplicationSignalsRequest.h>
 #include <aws/application-signals/ApplicationSignalsServiceClientModel.h>
+#include <aws/application-signals/ApplicationSignalsWaiter.h>
 #include <aws/application-signals/ApplicationSignals_EXPORTS.h>
+#include <aws/application-signals/internal/ApplicationSignalsEndpointRules.h>
 #include <aws/application-signals/model/AttributeFilter.h>
 #include <aws/application-signals/model/AuditFinding.h>
 #include <aws/application-signals/model/AuditTarget.h>
@@ -65,6 +69,7 @@
 #include <aws/application-signals/model/ExclusionWindow.h>
 #include <aws/application-signals/model/GetInstrumentationConfigurationRequest.h>
 #include <aws/application-signals/model/GetInstrumentationConfigurationResult.h>
+#include <aws/application-signals/model/GetInstrumentationConfigurationStatusPaginationTraits.h>
 #include <aws/application-signals/model/GetInstrumentationConfigurationStatusRequest.h>
 #include <aws/application-signals/model/GetInstrumentationConfigurationStatusResult.h>
 #include <aws/application-signals/model/GetServiceLevelObjectiveRequest.h>
@@ -84,24 +89,33 @@
 #include <aws/application-signals/model/Interval.h>
 #include <aws/application-signals/model/ListAuditFindingsRequest.h>
 #include <aws/application-signals/model/ListAuditFindingsResult.h>
+#include <aws/application-signals/model/ListEntityEventsPaginationTraits.h>
 #include <aws/application-signals/model/ListEntityEventsRequest.h>
 #include <aws/application-signals/model/ListEntityEventsResult.h>
 #include <aws/application-signals/model/ListGroupingAttributeDefinitionsRequest.h>
 #include <aws/application-signals/model/ListGroupingAttributeDefinitionsResult.h>
+#include <aws/application-signals/model/ListInstrumentationConfigurationsPaginationTraits.h>
 #include <aws/application-signals/model/ListInstrumentationConfigurationsRequest.h>
 #include <aws/application-signals/model/ListInstrumentationConfigurationsResult.h>
+#include <aws/application-signals/model/ListServiceDependenciesPaginationTraits.h>
 #include <aws/application-signals/model/ListServiceDependenciesRequest.h>
 #include <aws/application-signals/model/ListServiceDependenciesResult.h>
+#include <aws/application-signals/model/ListServiceDependentsPaginationTraits.h>
 #include <aws/application-signals/model/ListServiceDependentsRequest.h>
 #include <aws/application-signals/model/ListServiceDependentsResult.h>
+#include <aws/application-signals/model/ListServiceLevelObjectiveExclusionWindowsPaginationTraits.h>
 #include <aws/application-signals/model/ListServiceLevelObjectiveExclusionWindowsRequest.h>
 #include <aws/application-signals/model/ListServiceLevelObjectiveExclusionWindowsResult.h>
+#include <aws/application-signals/model/ListServiceLevelObjectivesPaginationTraits.h>
 #include <aws/application-signals/model/ListServiceLevelObjectivesRequest.h>
 #include <aws/application-signals/model/ListServiceLevelObjectivesResult.h>
+#include <aws/application-signals/model/ListServiceOperationsPaginationTraits.h>
 #include <aws/application-signals/model/ListServiceOperationsRequest.h>
 #include <aws/application-signals/model/ListServiceOperationsResult.h>
+#include <aws/application-signals/model/ListServiceStatesPaginationTraits.h>
 #include <aws/application-signals/model/ListServiceStatesRequest.h>
 #include <aws/application-signals/model/ListServiceStatesResult.h>
+#include <aws/application-signals/model/ListServicesPaginationTraits.h>
 #include <aws/application-signals/model/ListServicesRequest.h>
 #include <aws/application-signals/model/ListServicesResult.h>
 #include <aws/application-signals/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/applicationcostprofiler-gen-tests/ApplicationCostProfilerIncludeTests.cpp b/generated/tests/applicationcostprofiler-gen-tests/ApplicationCostProfilerIncludeTests.cpp
index f229a372584a..03c0c751bdea 100644
--- a/generated/tests/applicationcostprofiler-gen-tests/ApplicationCostProfilerIncludeTests.cpp
+++ b/generated/tests/applicationcostprofiler-gen-tests/ApplicationCostProfilerIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/applicationcostprofiler/ApplicationCostProfilerClient.h>
+#include <aws/applicationcostprofiler/ApplicationCostProfilerClientPagination.h>
 #include <aws/applicationcostprofiler/ApplicationCostProfilerEndpointProvider.h>
 #include <aws/applicationcostprofiler/ApplicationCostProfilerErrorMarshaller.h>
 #include <aws/applicationcostprofiler/ApplicationCostProfilerErrors.h>
+#include <aws/applicationcostprofiler/ApplicationCostProfilerPaginationBase.h>
 #include <aws/applicationcostprofiler/ApplicationCostProfilerRequest.h>
 #include <aws/applicationcostprofiler/ApplicationCostProfilerServiceClientModel.h>
+#include <aws/applicationcostprofiler/ApplicationCostProfilerWaiter.h>
 #include <aws/applicationcostprofiler/ApplicationCostProfiler_EXPORTS.h>
+#include <aws/applicationcostprofiler/internal/ApplicationCostProfilerEndpointRules.h>
 #include <aws/applicationcostprofiler/model/DeleteReportDefinitionRequest.h>
 #include <aws/applicationcostprofiler/model/DeleteReportDefinitionResult.h>
 #include <aws/applicationcostprofiler/model/Format.h>
@@ -20,6 +24,7 @@
 #include <aws/applicationcostprofiler/model/GetReportDefinitionResult.h>
 #include <aws/applicationcostprofiler/model/ImportApplicationUsageRequest.h>
 #include <aws/applicationcostprofiler/model/ImportApplicationUsageResult.h>
+#include <aws/applicationcostprofiler/model/ListReportDefinitionsPaginationTraits.h>
 #include <aws/applicationcostprofiler/model/ListReportDefinitionsRequest.h>
 #include <aws/applicationcostprofiler/model/ListReportDefinitionsResult.h>
 #include <aws/applicationcostprofiler/model/PutReportDefinitionRequest.h>
diff --git a/generated/tests/appmesh-gen-tests/AppMeshIncludeTests.cpp b/generated/tests/appmesh-gen-tests/AppMeshIncludeTests.cpp
index 479d36fb59d3..2ebc8e4a2f9b 100644
--- a/generated/tests/appmesh-gen-tests/AppMeshIncludeTests.cpp
+++ b/generated/tests/appmesh-gen-tests/AppMeshIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/appmesh/AppMeshClient.h>
+#include <aws/appmesh/AppMeshClientPagination.h>
 #include <aws/appmesh/AppMeshEndpointProvider.h>
 #include <aws/appmesh/AppMeshErrorMarshaller.h>
 #include <aws/appmesh/AppMeshErrors.h>
+#include <aws/appmesh/AppMeshPaginationBase.h>
 #include <aws/appmesh/AppMeshRequest.h>
 #include <aws/appmesh/AppMeshServiceClientModel.h>
+#include <aws/appmesh/AppMeshWaiter.h>
 #include <aws/appmesh/AppMesh_EXPORTS.h>
+#include <aws/appmesh/internal/AppMeshEndpointRules.h>
 #include <aws/appmesh/model/AccessLog.h>
 #include <aws/appmesh/model/AwsCloudMapInstanceAttribute.h>
 #include <aws/appmesh/model/AwsCloudMapServiceDiscovery.h>
@@ -115,20 +119,28 @@
 #include <aws/appmesh/model/HttpTimeout.h>
 #include <aws/appmesh/model/IpPreference.h>
 #include <aws/appmesh/model/JsonFormatRef.h>
+#include <aws/appmesh/model/ListGatewayRoutesPaginationTraits.h>
 #include <aws/appmesh/model/ListGatewayRoutesRequest.h>
 #include <aws/appmesh/model/ListGatewayRoutesResult.h>
+#include <aws/appmesh/model/ListMeshesPaginationTraits.h>
 #include <aws/appmesh/model/ListMeshesRequest.h>
 #include <aws/appmesh/model/ListMeshesResult.h>
+#include <aws/appmesh/model/ListRoutesPaginationTraits.h>
 #include <aws/appmesh/model/ListRoutesRequest.h>
 #include <aws/appmesh/model/ListRoutesResult.h>
+#include <aws/appmesh/model/ListTagsForResourcePaginationTraits.h>
 #include <aws/appmesh/model/ListTagsForResourceRequest.h>
 #include <aws/appmesh/model/ListTagsForResourceResult.h>
+#include <aws/appmesh/model/ListVirtualGatewaysPaginationTraits.h>
 #include <aws/appmesh/model/ListVirtualGatewaysRequest.h>
 #include <aws/appmesh/model/ListVirtualGatewaysResult.h>
+#include <aws/appmesh/model/ListVirtualNodesPaginationTraits.h>
 #include <aws/appmesh/model/ListVirtualNodesRequest.h>
 #include <aws/appmesh/model/ListVirtualNodesResult.h>
+#include <aws/appmesh/model/ListVirtualRoutersPaginationTraits.h>
 #include <aws/appmesh/model/ListVirtualRoutersRequest.h>
 #include <aws/appmesh/model/ListVirtualRoutersResult.h>
+#include <aws/appmesh/model/ListVirtualServicesPaginationTraits.h>
 #include <aws/appmesh/model/ListVirtualServicesRequest.h>
 #include <aws/appmesh/model/ListVirtualServicesResult.h>
 #include <aws/appmesh/model/Listener.h>
diff --git a/generated/tests/apprunner-gen-tests/AppRunnerIncludeTests.cpp b/generated/tests/apprunner-gen-tests/AppRunnerIncludeTests.cpp
index 589b183014f0..a60b93cf6338 100644
--- a/generated/tests/apprunner-gen-tests/AppRunnerIncludeTests.cpp
+++ b/generated/tests/apprunner-gen-tests/AppRunnerIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/apprunner/AppRunnerClient.h>
+#include <aws/apprunner/AppRunnerClientPagination.h>
 #include <aws/apprunner/AppRunnerEndpointProvider.h>
 #include <aws/apprunner/AppRunnerErrorMarshaller.h>
 #include <aws/apprunner/AppRunnerErrors.h>
+#include <aws/apprunner/AppRunnerPaginationBase.h>
 #include <aws/apprunner/AppRunnerRequest.h>
 #include <aws/apprunner/AppRunnerServiceClientModel.h>
+#include <aws/apprunner/AppRunnerWaiter.h>
 #include <aws/apprunner/AppRunner_EXPORTS.h>
+#include <aws/apprunner/internal/AppRunnerEndpointRules.h>
 #include <aws/apprunner/model/AssociateCustomDomainRequest.h>
 #include <aws/apprunner/model/AssociateCustomDomainResult.h>
 #include <aws/apprunner/model/AuthenticationConfiguration.h>
@@ -56,6 +60,7 @@
 #include <aws/apprunner/model/DeleteVpcIngressConnectionResult.h>
 #include <aws/apprunner/model/DescribeAutoScalingConfigurationRequest.h>
 #include <aws/apprunner/model/DescribeAutoScalingConfigurationResult.h>
+#include <aws/apprunner/model/DescribeCustomDomainsPaginationTraits.h>
 #include <aws/apprunner/model/DescribeCustomDomainsRequest.h>
 #include <aws/apprunner/model/DescribeCustomDomainsResult.h>
 #include <aws/apprunner/model/DescribeObservabilityConfigurationRequest.h>
@@ -80,23 +85,31 @@
 #include <aws/apprunner/model/IngressVpcConfiguration.h>
 #include <aws/apprunner/model/InstanceConfiguration.h>
 #include <aws/apprunner/model/IpAddressType.h>
+#include <aws/apprunner/model/ListAutoScalingConfigurationsPaginationTraits.h>
 #include <aws/apprunner/model/ListAutoScalingConfigurationsRequest.h>
 #include <aws/apprunner/model/ListAutoScalingConfigurationsResult.h>
+#include <aws/apprunner/model/ListConnectionsPaginationTraits.h>
 #include <aws/apprunner/model/ListConnectionsRequest.h>
 #include <aws/apprunner/model/ListConnectionsResult.h>
+#include <aws/apprunner/model/ListObservabilityConfigurationsPaginationTraits.h>
 #include <aws/apprunner/model/ListObservabilityConfigurationsRequest.h>
 #include <aws/apprunner/model/ListObservabilityConfigurationsResult.h>
+#include <aws/apprunner/model/ListOperationsPaginationTraits.h>
 #include <aws/apprunner/model/ListOperationsRequest.h>
 #include <aws/apprunner/model/ListOperationsResult.h>
+#include <aws/apprunner/model/ListServicesForAutoScalingConfigurationPaginationTraits.h>
 #include <aws/apprunner/model/ListServicesForAutoScalingConfigurationRequest.h>
 #include <aws/apprunner/model/ListServicesForAutoScalingConfigurationResult.h>
+#include <aws/apprunner/model/ListServicesPaginationTraits.h>
 #include <aws/apprunner/model/ListServicesRequest.h>
 #include <aws/apprunner/model/ListServicesResult.h>
 #include <aws/apprunner/model/ListTagsForResourceRequest.h>
 #include <aws/apprunner/model/ListTagsForResourceResult.h>
+#include <aws/apprunner/model/ListVpcConnectorsPaginationTraits.h>
 #include <aws/apprunner/model/ListVpcConnectorsRequest.h>
 #include <aws/apprunner/model/ListVpcConnectorsResult.h>
 #include <aws/apprunner/model/ListVpcIngressConnectionsFilter.h>
+#include <aws/apprunner/model/ListVpcIngressConnectionsPaginationTraits.h>
 #include <aws/apprunner/model/ListVpcIngressConnectionsRequest.h>
 #include <aws/apprunner/model/ListVpcIngressConnectionsResult.h>
 #include <aws/apprunner/model/NetworkConfiguration.h>
diff --git a/generated/tests/appstream-gen-tests/AppStreamIncludeTests.cpp b/generated/tests/appstream-gen-tests/AppStreamIncludeTests.cpp
index 9ffbc3a214dd..776be933e81e 100644
--- a/generated/tests/appstream-gen-tests/AppStreamIncludeTests.cpp
+++ b/generated/tests/appstream-gen-tests/AppStreamIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/appstream/AppStreamClient.h>
+#include <aws/appstream/AppStreamClientPagination.h>
 #include <aws/appstream/AppStreamEndpointProvider.h>
 #include <aws/appstream/AppStreamErrorMarshaller.h>
 #include <aws/appstream/AppStreamErrors.h>
+#include <aws/appstream/AppStreamPaginationBase.h>
 #include <aws/appstream/AppStreamRequest.h>
 #include <aws/appstream/AppStreamServiceClientModel.h>
+#include <aws/appstream/AppStreamWaiter.h>
 #include <aws/appstream/AppStream_EXPORTS.h>
+#include <aws/appstream/internal/AppStreamEndpointRules.h>
 #include <aws/appstream/model/AccessEndpoint.h>
 #include <aws/appstream/model/AccessEndpointType.h>
 #include <aws/appstream/model/Action.h>
@@ -120,8 +124,10 @@
 #include <aws/appstream/model/DeleteUsageReportSubscriptionResult.h>
 #include <aws/appstream/model/DeleteUserRequest.h>
 #include <aws/appstream/model/DeleteUserResult.h>
+#include <aws/appstream/model/DescribeAppBlockBuilderAppBlockAssociationsPaginationTraits.h>
 #include <aws/appstream/model/DescribeAppBlockBuilderAppBlockAssociationsRequest.h>
 #include <aws/appstream/model/DescribeAppBlockBuilderAppBlockAssociationsResult.h>
+#include <aws/appstream/model/DescribeAppBlockBuildersPaginationTraits.h>
 #include <aws/appstream/model/DescribeAppBlockBuildersRequest.h>
 #include <aws/appstream/model/DescribeAppBlockBuildersResult.h>
 #include <aws/appstream/model/DescribeAppBlocksRequest.h>
@@ -140,8 +146,10 @@
 #include <aws/appstream/model/DescribeFleetsResult.h>
 #include <aws/appstream/model/DescribeImageBuildersRequest.h>
 #include <aws/appstream/model/DescribeImageBuildersResult.h>
+#include <aws/appstream/model/DescribeImagePermissionsPaginationTraits.h>
 #include <aws/appstream/model/DescribeImagePermissionsRequest.h>
 #include <aws/appstream/model/DescribeImagePermissionsResult.h>
+#include <aws/appstream/model/DescribeImagesPaginationTraits.h>
 #include <aws/appstream/model/DescribeImagesRequest.h>
 #include <aws/appstream/model/DescribeImagesResult.h>
 #include <aws/appstream/model/DescribeSessionsRequest.h>
diff --git a/generated/tests/appsync-gen-tests/AppSyncIncludeTests.cpp b/generated/tests/appsync-gen-tests/AppSyncIncludeTests.cpp
index 39d02a6ec418..a26704a53b9c 100644
--- a/generated/tests/appsync-gen-tests/AppSyncIncludeTests.cpp
+++ b/generated/tests/appsync-gen-tests/AppSyncIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/appsync/AppSyncClient.h>
+#include <aws/appsync/AppSyncClientPagination.h>
 #include <aws/appsync/AppSyncEndpointProvider.h>
 #include <aws/appsync/AppSyncErrorMarshaller.h>
 #include <aws/appsync/AppSyncErrors.h>
+#include <aws/appsync/AppSyncPaginationBase.h>
 #include <aws/appsync/AppSyncRequest.h>
 #include <aws/appsync/AppSyncServiceClientModel.h>
+#include <aws/appsync/AppSyncWaiter.h>
 #include <aws/appsync/AppSync_EXPORTS.h>
+#include <aws/appsync/internal/AppSyncEndpointRules.h>
 #include <aws/appsync/model/AdditionalAuthenticationProvider.h>
 #include <aws/appsync/model/Api.h>
 #include <aws/appsync/model/ApiAssociation.h>
@@ -167,30 +171,42 @@
 #include <aws/appsync/model/LambdaConfig.h>
 #include <aws/appsync/model/LambdaConflictHandlerConfig.h>
 #include <aws/appsync/model/LambdaDataSourceConfig.h>
+#include <aws/appsync/model/ListApiKeysPaginationTraits.h>
 #include <aws/appsync/model/ListApiKeysRequest.h>
 #include <aws/appsync/model/ListApiKeysResult.h>
+#include <aws/appsync/model/ListApisPaginationTraits.h>
 #include <aws/appsync/model/ListApisRequest.h>
 #include <aws/appsync/model/ListApisResult.h>
+#include <aws/appsync/model/ListChannelNamespacesPaginationTraits.h>
 #include <aws/appsync/model/ListChannelNamespacesRequest.h>
 #include <aws/appsync/model/ListChannelNamespacesResult.h>
+#include <aws/appsync/model/ListDataSourcesPaginationTraits.h>
 #include <aws/appsync/model/ListDataSourcesRequest.h>
 #include <aws/appsync/model/ListDataSourcesResult.h>
+#include <aws/appsync/model/ListDomainNamesPaginationTraits.h>
 #include <aws/appsync/model/ListDomainNamesRequest.h>
 #include <aws/appsync/model/ListDomainNamesResult.h>
+#include <aws/appsync/model/ListFunctionsPaginationTraits.h>
 #include <aws/appsync/model/ListFunctionsRequest.h>
 #include <aws/appsync/model/ListFunctionsResult.h>
+#include <aws/appsync/model/ListGraphqlApisPaginationTraits.h>
 #include <aws/appsync/model/ListGraphqlApisRequest.h>
 #include <aws/appsync/model/ListGraphqlApisResult.h>
+#include <aws/appsync/model/ListResolversByFunctionPaginationTraits.h>
 #include <aws/appsync/model/ListResolversByFunctionRequest.h>
 #include <aws/appsync/model/ListResolversByFunctionResult.h>
+#include <aws/appsync/model/ListResolversPaginationTraits.h>
 #include <aws/appsync/model/ListResolversRequest.h>
 #include <aws/appsync/model/ListResolversResult.h>
+#include <aws/appsync/model/ListSourceApiAssociationsPaginationTraits.h>
 #include <aws/appsync/model/ListSourceApiAssociationsRequest.h>
 #include <aws/appsync/model/ListSourceApiAssociationsResult.h>
 #include <aws/appsync/model/ListTagsForResourceRequest.h>
 #include <aws/appsync/model/ListTagsForResourceResult.h>
+#include <aws/appsync/model/ListTypesByAssociationPaginationTraits.h>
 #include <aws/appsync/model/ListTypesByAssociationRequest.h>
 #include <aws/appsync/model/ListTypesByAssociationResult.h>
+#include <aws/appsync/model/ListTypesPaginationTraits.h>
 #include <aws/appsync/model/ListTypesRequest.h>
 #include <aws/appsync/model/ListTypesResult.h>
 #include <aws/appsync/model/LogConfig.h>
diff --git a/generated/tests/arc-region-switch-gen-tests/ARCRegionswitchIncludeTests.cpp b/generated/tests/arc-region-switch-gen-tests/ARCRegionswitchIncludeTests.cpp
index b74a7372a521..cfa840a7ccc1 100644
--- a/generated/tests/arc-region-switch-gen-tests/ARCRegionswitchIncludeTests.cpp
+++ b/generated/tests/arc-region-switch-gen-tests/ARCRegionswitchIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/arc-region-switch/ARCRegionswitchClient.h>
+#include <aws/arc-region-switch/ARCRegionswitchClientPagination.h>
 #include <aws/arc-region-switch/ARCRegionswitchEndpointProvider.h>
 #include <aws/arc-region-switch/ARCRegionswitchErrorMarshaller.h>
 #include <aws/arc-region-switch/ARCRegionswitchErrors.h>
+#include <aws/arc-region-switch/ARCRegionswitchPaginationBase.h>
 #include <aws/arc-region-switch/ARCRegionswitchRequest.h>
 #include <aws/arc-region-switch/ARCRegionswitchServiceClientModel.h>
+#include <aws/arc-region-switch/ARCRegionswitchWaiter.h>
 #include <aws/arc-region-switch/ARCRegionswitch_EXPORTS.h>
+#include <aws/arc-region-switch/internal/ARCRegionswitchEndpointRules.h>
 #include <aws/arc-region-switch/model/AbbreviatedExecution.h>
 #include <aws/arc-region-switch/model/AbbreviatedPlan.h>
 #include <aws/arc-region-switch/model/AlarmCondition.h>
@@ -62,8 +66,10 @@
 #include <aws/arc-region-switch/model/FailedReportErrorCode.h>
 #include <aws/arc-region-switch/model/FailedReportOutput.h>
 #include <aws/arc-region-switch/model/GeneratedReport.h>
+#include <aws/arc-region-switch/model/GetPlanEvaluationStatusPaginationTraits.h>
 #include <aws/arc-region-switch/model/GetPlanEvaluationStatusRequest.h>
 #include <aws/arc-region-switch/model/GetPlanEvaluationStatusResult.h>
+#include <aws/arc-region-switch/model/GetPlanExecutionPaginationTraits.h>
 #include <aws/arc-region-switch/model/GetPlanExecutionRequest.h>
 #include <aws/arc-region-switch/model/GetPlanExecutionResult.h>
 #include <aws/arc-region-switch/model/GetPlanInRegionRequest.h>
@@ -82,16 +88,22 @@
 #include <aws/arc-region-switch/model/LambdaUngraceful.h>
 #include <aws/arc-region-switch/model/LambdaUngracefulBehavior.h>
 #include <aws/arc-region-switch/model/Lambdas.h>
+#include <aws/arc-region-switch/model/ListPlanExecutionEventsPaginationTraits.h>
 #include <aws/arc-region-switch/model/ListPlanExecutionEventsRequest.h>
 #include <aws/arc-region-switch/model/ListPlanExecutionEventsResult.h>
+#include <aws/arc-region-switch/model/ListPlanExecutionsPaginationTraits.h>
 #include <aws/arc-region-switch/model/ListPlanExecutionsRequest.h>
 #include <aws/arc-region-switch/model/ListPlanExecutionsResult.h>
+#include <aws/arc-region-switch/model/ListPlansInRegionPaginationTraits.h>
 #include <aws/arc-region-switch/model/ListPlansInRegionRequest.h>
 #include <aws/arc-region-switch/model/ListPlansInRegionResult.h>
+#include <aws/arc-region-switch/model/ListPlansPaginationTraits.h>
 #include <aws/arc-region-switch/model/ListPlansRequest.h>
 #include <aws/arc-region-switch/model/ListPlansResult.h>
+#include <aws/arc-region-switch/model/ListRoute53HealthChecksInRegionPaginationTraits.h>
 #include <aws/arc-region-switch/model/ListRoute53HealthChecksInRegionRequest.h>
 #include <aws/arc-region-switch/model/ListRoute53HealthChecksInRegionResult.h>
+#include <aws/arc-region-switch/model/ListRoute53HealthChecksPaginationTraits.h>
 #include <aws/arc-region-switch/model/ListRoute53HealthChecksRequest.h>
 #include <aws/arc-region-switch/model/ListRoute53HealthChecksResult.h>
 #include <aws/arc-region-switch/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/arc-zonal-shift-gen-tests/ARCZonalShiftIncludeTests.cpp b/generated/tests/arc-zonal-shift-gen-tests/ARCZonalShiftIncludeTests.cpp
index d40448767272..2398dc77d075 100644
--- a/generated/tests/arc-zonal-shift-gen-tests/ARCZonalShiftIncludeTests.cpp
+++ b/generated/tests/arc-zonal-shift-gen-tests/ARCZonalShiftIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/arc-zonal-shift/ARCZonalShiftClient.h>
+#include <aws/arc-zonal-shift/ARCZonalShiftClientPagination.h>
 #include <aws/arc-zonal-shift/ARCZonalShiftEndpointProvider.h>
 #include <aws/arc-zonal-shift/ARCZonalShiftErrorMarshaller.h>
 #include <aws/arc-zonal-shift/ARCZonalShiftErrors.h>
+#include <aws/arc-zonal-shift/ARCZonalShiftPaginationBase.h>
 #include <aws/arc-zonal-shift/ARCZonalShiftRequest.h>
 #include <aws/arc-zonal-shift/ARCZonalShiftServiceClientModel.h>
+#include <aws/arc-zonal-shift/ARCZonalShiftWaiter.h>
 #include <aws/arc-zonal-shift/ARCZonalShift_EXPORTS.h>
+#include <aws/arc-zonal-shift/internal/ARCZonalShiftEndpointRules.h>
 #include <aws/arc-zonal-shift/model/AppliedStatus.h>
 #include <aws/arc-zonal-shift/model/AutoshiftAppliedStatus.h>
 #include <aws/arc-zonal-shift/model/AutoshiftExecutionStatus.h>
@@ -35,10 +39,13 @@
 #include <aws/arc-zonal-shift/model/GetAutoshiftObserverNotificationStatusResult.h>
 #include <aws/arc-zonal-shift/model/GetManagedResourceRequest.h>
 #include <aws/arc-zonal-shift/model/GetManagedResourceResult.h>
+#include <aws/arc-zonal-shift/model/ListAutoshiftsPaginationTraits.h>
 #include <aws/arc-zonal-shift/model/ListAutoshiftsRequest.h>
 #include <aws/arc-zonal-shift/model/ListAutoshiftsResult.h>
+#include <aws/arc-zonal-shift/model/ListManagedResourcesPaginationTraits.h>
 #include <aws/arc-zonal-shift/model/ListManagedResourcesRequest.h>
 #include <aws/arc-zonal-shift/model/ListManagedResourcesResult.h>
+#include <aws/arc-zonal-shift/model/ListZonalShiftsPaginationTraits.h>
 #include <aws/arc-zonal-shift/model/ListZonalShiftsRequest.h>
 #include <aws/arc-zonal-shift/model/ListZonalShiftsResult.h>
 #include <aws/arc-zonal-shift/model/ManagedResourceSummary.h>
diff --git a/generated/tests/artifact-gen-tests/ArtifactIncludeTests.cpp b/generated/tests/artifact-gen-tests/ArtifactIncludeTests.cpp
index 69c279da7619..f2786e9e1739 100644
--- a/generated/tests/artifact-gen-tests/ArtifactIncludeTests.cpp
+++ b/generated/tests/artifact-gen-tests/ArtifactIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/artifact/ArtifactClient.h>
+#include <aws/artifact/ArtifactClientPagination.h>
 #include <aws/artifact/ArtifactEndpointProvider.h>
 #include <aws/artifact/ArtifactErrorMarshaller.h>
 #include <aws/artifact/ArtifactErrors.h>
+#include <aws/artifact/ArtifactPaginationBase.h>
 #include <aws/artifact/ArtifactRequest.h>
 #include <aws/artifact/ArtifactServiceClientModel.h>
+#include <aws/artifact/ArtifactWaiter.h>
 #include <aws/artifact/Artifact_EXPORTS.h>
+#include <aws/artifact/internal/ArtifactEndpointRules.h>
 #include <aws/artifact/model/AcceptanceType.h>
 #include <aws/artifact/model/AccountSettings.h>
 #include <aws/artifact/model/AgreementType.h>
@@ -45,14 +49,19 @@
 #include <aws/artifact/model/InquirySummary.h>
 #include <aws/artifact/model/InquirySupportMode.h>
 #include <aws/artifact/model/InternalServerException.h>
+#include <aws/artifact/model/ListComplianceInquiriesPaginationTraits.h>
 #include <aws/artifact/model/ListComplianceInquiriesRequest.h>
 #include <aws/artifact/model/ListComplianceInquiriesResult.h>
+#include <aws/artifact/model/ListComplianceInquiryQueriesPaginationTraits.h>
 #include <aws/artifact/model/ListComplianceInquiryQueriesRequest.h>
 #include <aws/artifact/model/ListComplianceInquiryQueriesResult.h>
+#include <aws/artifact/model/ListCustomerAgreementsPaginationTraits.h>
 #include <aws/artifact/model/ListCustomerAgreementsRequest.h>
 #include <aws/artifact/model/ListCustomerAgreementsResult.h>
+#include <aws/artifact/model/ListReportVersionsPaginationTraits.h>
 #include <aws/artifact/model/ListReportVersionsRequest.h>
 #include <aws/artifact/model/ListReportVersionsResult.h>
+#include <aws/artifact/model/ListReportsPaginationTraits.h>
 #include <aws/artifact/model/ListReportsRequest.h>
 #include <aws/artifact/model/ListReportsResult.h>
 #include <aws/artifact/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/athena-gen-tests/AthenaIncludeTests.cpp b/generated/tests/athena-gen-tests/AthenaIncludeTests.cpp
index 6b5c5161b4e6..625d62339f64 100644
--- a/generated/tests/athena-gen-tests/AthenaIncludeTests.cpp
+++ b/generated/tests/athena-gen-tests/AthenaIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/athena/AthenaClient.h>
+#include <aws/athena/AthenaClientPagination.h>
 #include <aws/athena/AthenaEndpointProvider.h>
 #include <aws/athena/AthenaErrorMarshaller.h>
 #include <aws/athena/AthenaErrors.h>
+#include <aws/athena/AthenaPaginationBase.h>
 #include <aws/athena/AthenaRequest.h>
 #include <aws/athena/AthenaServiceClientModel.h>
+#include <aws/athena/AthenaWaiter.h>
 #include <aws/athena/Athena_EXPORTS.h>
+#include <aws/athena/internal/AthenaEndpointRules.h>
 #include <aws/athena/model/AclConfiguration.h>
 #include <aws/athena/model/ApplicationDPUSizes.h>
 #include <aws/athena/model/AthenaError.h>
@@ -107,6 +111,7 @@
 #include <aws/athena/model/GetPreparedStatementResult.h>
 #include <aws/athena/model/GetQueryExecutionRequest.h>
 #include <aws/athena/model/GetQueryExecutionResult.h>
+#include <aws/athena/model/GetQueryResultsPaginationTraits.h>
 #include <aws/athena/model/GetQueryResultsRequest.h>
 #include <aws/athena/model/GetQueryResultsResult.h>
 #include <aws/athena/model/GetQueryRuntimeStatisticsRequest.h>
@@ -127,36 +132,50 @@
 #include <aws/athena/model/ImportNotebookRequest.h>
 #include <aws/athena/model/ImportNotebookResult.h>
 #include <aws/athena/model/InvalidRequestException.h>
+#include <aws/athena/model/ListApplicationDPUSizesPaginationTraits.h>
 #include <aws/athena/model/ListApplicationDPUSizesRequest.h>
 #include <aws/athena/model/ListApplicationDPUSizesResult.h>
+#include <aws/athena/model/ListCalculationExecutionsPaginationTraits.h>
 #include <aws/athena/model/ListCalculationExecutionsRequest.h>
 #include <aws/athena/model/ListCalculationExecutionsResult.h>
+#include <aws/athena/model/ListCapacityReservationsPaginationTraits.h>
 #include <aws/athena/model/ListCapacityReservationsRequest.h>
 #include <aws/athena/model/ListCapacityReservationsResult.h>
+#include <aws/athena/model/ListDataCatalogsPaginationTraits.h>
 #include <aws/athena/model/ListDataCatalogsRequest.h>
 #include <aws/athena/model/ListDataCatalogsResult.h>
+#include <aws/athena/model/ListDatabasesPaginationTraits.h>
 #include <aws/athena/model/ListDatabasesRequest.h>
 #include <aws/athena/model/ListDatabasesResult.h>
+#include <aws/athena/model/ListEngineVersionsPaginationTraits.h>
 #include <aws/athena/model/ListEngineVersionsRequest.h>
 #include <aws/athena/model/ListEngineVersionsResult.h>
+#include <aws/athena/model/ListExecutorsPaginationTraits.h>
 #include <aws/athena/model/ListExecutorsRequest.h>
 #include <aws/athena/model/ListExecutorsResult.h>
+#include <aws/athena/model/ListNamedQueriesPaginationTraits.h>
 #include <aws/athena/model/ListNamedQueriesRequest.h>
 #include <aws/athena/model/ListNamedQueriesResult.h>
 #include <aws/athena/model/ListNotebookMetadataRequest.h>
 #include <aws/athena/model/ListNotebookMetadataResult.h>
 #include <aws/athena/model/ListNotebookSessionsRequest.h>
 #include <aws/athena/model/ListNotebookSessionsResult.h>
+#include <aws/athena/model/ListPreparedStatementsPaginationTraits.h>
 #include <aws/athena/model/ListPreparedStatementsRequest.h>
 #include <aws/athena/model/ListPreparedStatementsResult.h>
+#include <aws/athena/model/ListQueryExecutionsPaginationTraits.h>
 #include <aws/athena/model/ListQueryExecutionsRequest.h>
 #include <aws/athena/model/ListQueryExecutionsResult.h>
+#include <aws/athena/model/ListSessionsPaginationTraits.h>
 #include <aws/athena/model/ListSessionsRequest.h>
 #include <aws/athena/model/ListSessionsResult.h>
+#include <aws/athena/model/ListTableMetadataPaginationTraits.h>
 #include <aws/athena/model/ListTableMetadataRequest.h>
 #include <aws/athena/model/ListTableMetadataResult.h>
+#include <aws/athena/model/ListTagsForResourcePaginationTraits.h>
 #include <aws/athena/model/ListTagsForResourceRequest.h>
 #include <aws/athena/model/ListTagsForResourceResult.h>
+#include <aws/athena/model/ListWorkGroupsPaginationTraits.h>
 #include <aws/athena/model/ListWorkGroupsRequest.h>
 #include <aws/athena/model/ListWorkGroupsResult.h>
 #include <aws/athena/model/ManagedLoggingConfiguration.h>
diff --git a/generated/tests/auditmanager-gen-tests/AuditManagerIncludeTests.cpp b/generated/tests/auditmanager-gen-tests/AuditManagerIncludeTests.cpp
index e1e264108c78..7cd997eb7da5 100644
--- a/generated/tests/auditmanager-gen-tests/AuditManagerIncludeTests.cpp
+++ b/generated/tests/auditmanager-gen-tests/AuditManagerIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/auditmanager/AuditManagerClient.h>
+#include <aws/auditmanager/AuditManagerClientPagination.h>
 #include <aws/auditmanager/AuditManagerEndpointProvider.h>
 #include <aws/auditmanager/AuditManagerErrorMarshaller.h>
 #include <aws/auditmanager/AuditManagerErrors.h>
+#include <aws/auditmanager/AuditManagerPaginationBase.h>
 #include <aws/auditmanager/AuditManagerRequest.h>
 #include <aws/auditmanager/AuditManagerServiceClientModel.h>
+#include <aws/auditmanager/AuditManagerWaiter.h>
 #include <aws/auditmanager/AuditManager_EXPORTS.h>
+#include <aws/auditmanager/internal/AuditManagerEndpointRules.h>
 #include <aws/auditmanager/model/AWSAccount.h>
 #include <aws/auditmanager/model/AWSService.h>
 #include <aws/auditmanager/model/AccountStatus.h>
@@ -114,20 +118,25 @@
 #include <aws/auditmanager/model/GetAssessmentReportUrlResult.h>
 #include <aws/auditmanager/model/GetAssessmentRequest.h>
 #include <aws/auditmanager/model/GetAssessmentResult.h>
+#include <aws/auditmanager/model/GetChangeLogsPaginationTraits.h>
 #include <aws/auditmanager/model/GetChangeLogsRequest.h>
 #include <aws/auditmanager/model/GetChangeLogsResult.h>
 #include <aws/auditmanager/model/GetControlRequest.h>
 #include <aws/auditmanager/model/GetControlResult.h>
+#include <aws/auditmanager/model/GetDelegationsPaginationTraits.h>
 #include <aws/auditmanager/model/GetDelegationsRequest.h>
 #include <aws/auditmanager/model/GetDelegationsResult.h>
+#include <aws/auditmanager/model/GetEvidenceByEvidenceFolderPaginationTraits.h>
 #include <aws/auditmanager/model/GetEvidenceByEvidenceFolderRequest.h>
 #include <aws/auditmanager/model/GetEvidenceByEvidenceFolderResult.h>
 #include <aws/auditmanager/model/GetEvidenceFileUploadUrlRequest.h>
 #include <aws/auditmanager/model/GetEvidenceFileUploadUrlResult.h>
 #include <aws/auditmanager/model/GetEvidenceFolderRequest.h>
 #include <aws/auditmanager/model/GetEvidenceFolderResult.h>
+#include <aws/auditmanager/model/GetEvidenceFoldersByAssessmentControlPaginationTraits.h>
 #include <aws/auditmanager/model/GetEvidenceFoldersByAssessmentControlRequest.h>
 #include <aws/auditmanager/model/GetEvidenceFoldersByAssessmentControlResult.h>
+#include <aws/auditmanager/model/GetEvidenceFoldersByAssessmentPaginationTraits.h>
 #include <aws/auditmanager/model/GetEvidenceFoldersByAssessmentRequest.h>
 #include <aws/auditmanager/model/GetEvidenceFoldersByAssessmentResult.h>
 #include <aws/auditmanager/model/GetEvidenceRequest.h>
@@ -145,26 +154,37 @@
 #include <aws/auditmanager/model/Insights.h>
 #include <aws/auditmanager/model/InsightsByAssessment.h>
 #include <aws/auditmanager/model/KeywordInputType.h>
+#include <aws/auditmanager/model/ListAssessmentControlInsightsByControlDomainPaginationTraits.h>
 #include <aws/auditmanager/model/ListAssessmentControlInsightsByControlDomainRequest.h>
 #include <aws/auditmanager/model/ListAssessmentControlInsightsByControlDomainResult.h>
+#include <aws/auditmanager/model/ListAssessmentFrameworkShareRequestsPaginationTraits.h>
 #include <aws/auditmanager/model/ListAssessmentFrameworkShareRequestsRequest.h>
 #include <aws/auditmanager/model/ListAssessmentFrameworkShareRequestsResult.h>
+#include <aws/auditmanager/model/ListAssessmentFrameworksPaginationTraits.h>
 #include <aws/auditmanager/model/ListAssessmentFrameworksRequest.h>
 #include <aws/auditmanager/model/ListAssessmentFrameworksResult.h>
+#include <aws/auditmanager/model/ListAssessmentReportsPaginationTraits.h>
 #include <aws/auditmanager/model/ListAssessmentReportsRequest.h>
 #include <aws/auditmanager/model/ListAssessmentReportsResult.h>
+#include <aws/auditmanager/model/ListAssessmentsPaginationTraits.h>
 #include <aws/auditmanager/model/ListAssessmentsRequest.h>
 #include <aws/auditmanager/model/ListAssessmentsResult.h>
+#include <aws/auditmanager/model/ListControlDomainInsightsByAssessmentPaginationTraits.h>
 #include <aws/auditmanager/model/ListControlDomainInsightsByAssessmentRequest.h>
 #include <aws/auditmanager/model/ListControlDomainInsightsByAssessmentResult.h>
+#include <aws/auditmanager/model/ListControlDomainInsightsPaginationTraits.h>
 #include <aws/auditmanager/model/ListControlDomainInsightsRequest.h>
 #include <aws/auditmanager/model/ListControlDomainInsightsResult.h>
+#include <aws/auditmanager/model/ListControlInsightsByControlDomainPaginationTraits.h>
 #include <aws/auditmanager/model/ListControlInsightsByControlDomainRequest.h>
 #include <aws/auditmanager/model/ListControlInsightsByControlDomainResult.h>
+#include <aws/auditmanager/model/ListControlsPaginationTraits.h>
 #include <aws/auditmanager/model/ListControlsRequest.h>
 #include <aws/auditmanager/model/ListControlsResult.h>
+#include <aws/auditmanager/model/ListKeywordsForDataSourcePaginationTraits.h>
 #include <aws/auditmanager/model/ListKeywordsForDataSourceRequest.h>
 #include <aws/auditmanager/model/ListKeywordsForDataSourceResult.h>
+#include <aws/auditmanager/model/ListNotificationsPaginationTraits.h>
 #include <aws/auditmanager/model/ListNotificationsRequest.h>
 #include <aws/auditmanager/model/ListNotificationsResult.h>
 #include <aws/auditmanager/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/autoscaling-gen-tests/AutoScalingIncludeTests.cpp b/generated/tests/autoscaling-gen-tests/AutoScalingIncludeTests.cpp
index 0b9e4ad08d93..1e020f1d8b19 100644
--- a/generated/tests/autoscaling-gen-tests/AutoScalingIncludeTests.cpp
+++ b/generated/tests/autoscaling-gen-tests/AutoScalingIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/autoscaling/AutoScalingClient.h>
+#include <aws/autoscaling/AutoScalingClientPagination.h>
 #include <aws/autoscaling/AutoScalingEndpointProvider.h>
 #include <aws/autoscaling/AutoScalingErrorMarshaller.h>
 #include <aws/autoscaling/AutoScalingErrors.h>
+#include <aws/autoscaling/AutoScalingPaginationBase.h>
 #include <aws/autoscaling/AutoScalingRequest.h>
 #include <aws/autoscaling/AutoScalingServiceClientModel.h>
+#include <aws/autoscaling/AutoScalingWaiter.h>
 #include <aws/autoscaling/AutoScaling_EXPORTS.h>
+#include <aws/autoscaling/internal/AutoScalingEndpointRules.h>
 #include <aws/autoscaling/model/AcceleratorCountRequest.h>
 #include <aws/autoscaling/model/AcceleratorManufacturer.h>
 #include <aws/autoscaling/model/AcceleratorName.h>
@@ -72,42 +76,55 @@
 #include <aws/autoscaling/model/DescribeAccountLimitsResult.h>
 #include <aws/autoscaling/model/DescribeAdjustmentTypesRequest.h>
 #include <aws/autoscaling/model/DescribeAdjustmentTypesResult.h>
+#include <aws/autoscaling/model/DescribeAutoScalingGroupsPaginationTraits.h>
 #include <aws/autoscaling/model/DescribeAutoScalingGroupsRequest.h>
 #include <aws/autoscaling/model/DescribeAutoScalingGroupsResult.h>
+#include <aws/autoscaling/model/DescribeAutoScalingInstancesPaginationTraits.h>
 #include <aws/autoscaling/model/DescribeAutoScalingInstancesRequest.h>
 #include <aws/autoscaling/model/DescribeAutoScalingInstancesResult.h>
 #include <aws/autoscaling/model/DescribeAutoScalingNotificationTypesRequest.h>
 #include <aws/autoscaling/model/DescribeAutoScalingNotificationTypesResult.h>
+#include <aws/autoscaling/model/DescribeInstanceRefreshesPaginationTraits.h>
 #include <aws/autoscaling/model/DescribeInstanceRefreshesRequest.h>
 #include <aws/autoscaling/model/DescribeInstanceRefreshesResult.h>
+#include <aws/autoscaling/model/DescribeLaunchConfigurationsPaginationTraits.h>
 #include <aws/autoscaling/model/DescribeLaunchConfigurationsRequest.h>
 #include <aws/autoscaling/model/DescribeLaunchConfigurationsResult.h>
 #include <aws/autoscaling/model/DescribeLifecycleHookTypesRequest.h>
 #include <aws/autoscaling/model/DescribeLifecycleHookTypesResult.h>
 #include <aws/autoscaling/model/DescribeLifecycleHooksRequest.h>
 #include <aws/autoscaling/model/DescribeLifecycleHooksResult.h>
+#include <aws/autoscaling/model/DescribeLoadBalancerTargetGroupsPaginationTraits.h>
 #include <aws/autoscaling/model/DescribeLoadBalancerTargetGroupsRequest.h>
 #include <aws/autoscaling/model/DescribeLoadBalancerTargetGroupsResult.h>
+#include <aws/autoscaling/model/DescribeLoadBalancersPaginationTraits.h>
 #include <aws/autoscaling/model/DescribeLoadBalancersRequest.h>
 #include <aws/autoscaling/model/DescribeLoadBalancersResult.h>
 #include <aws/autoscaling/model/DescribeMetricCollectionTypesRequest.h>
 #include <aws/autoscaling/model/DescribeMetricCollectionTypesResult.h>
+#include <aws/autoscaling/model/DescribeNotificationConfigurationsPaginationTraits.h>
 #include <aws/autoscaling/model/DescribeNotificationConfigurationsRequest.h>
 #include <aws/autoscaling/model/DescribeNotificationConfigurationsResult.h>
+#include <aws/autoscaling/model/DescribePoliciesPaginationTraits.h>
 #include <aws/autoscaling/model/DescribePoliciesRequest.h>
 #include <aws/autoscaling/model/DescribePoliciesResult.h>
+#include <aws/autoscaling/model/DescribeScalingActivitiesPaginationTraits.h>
 #include <aws/autoscaling/model/DescribeScalingActivitiesRequest.h>
 #include <aws/autoscaling/model/DescribeScalingActivitiesResult.h>
 #include <aws/autoscaling/model/DescribeScalingProcessTypesRequest.h>
 #include <aws/autoscaling/model/DescribeScalingProcessTypesResult.h>
+#include <aws/autoscaling/model/DescribeScheduledActionsPaginationTraits.h>
 #include <aws/autoscaling/model/DescribeScheduledActionsRequest.h>
 #include <aws/autoscaling/model/DescribeScheduledActionsResult.h>
+#include <aws/autoscaling/model/DescribeTagsPaginationTraits.h>
 #include <aws/autoscaling/model/DescribeTagsRequest.h>
 #include <aws/autoscaling/model/DescribeTagsResult.h>
 #include <aws/autoscaling/model/DescribeTerminationPolicyTypesRequest.h>
 #include <aws/autoscaling/model/DescribeTerminationPolicyTypesResult.h>
+#include <aws/autoscaling/model/DescribeTrafficSourcesPaginationTraits.h>
 #include <aws/autoscaling/model/DescribeTrafficSourcesRequest.h>
 #include <aws/autoscaling/model/DescribeTrafficSourcesResult.h>
+#include <aws/autoscaling/model/DescribeWarmPoolPaginationTraits.h>
 #include <aws/autoscaling/model/DescribeWarmPoolRequest.h>
 #include <aws/autoscaling/model/DescribeWarmPoolResult.h>
 #include <aws/autoscaling/model/DesiredConfiguration.h>
diff --git a/generated/tests/autoscaling-plans-gen-tests/AutoScalingPlansIncludeTests.cpp b/generated/tests/autoscaling-plans-gen-tests/AutoScalingPlansIncludeTests.cpp
index 40c499954890..7bb4ff6d3f1f 100644
--- a/generated/tests/autoscaling-plans-gen-tests/AutoScalingPlansIncludeTests.cpp
+++ b/generated/tests/autoscaling-plans-gen-tests/AutoScalingPlansIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/autoscaling-plans/AutoScalingPlansEndpointProvider.h>
 #include <aws/autoscaling-plans/AutoScalingPlansErrorMarshaller.h>
 #include <aws/autoscaling-plans/AutoScalingPlansErrors.h>
+#include <aws/autoscaling-plans/AutoScalingPlansPaginationBase.h>
 #include <aws/autoscaling-plans/AutoScalingPlansRequest.h>
 #include <aws/autoscaling-plans/AutoScalingPlansServiceClientModel.h>
+#include <aws/autoscaling-plans/AutoScalingPlansWaiter.h>
 #include <aws/autoscaling-plans/AutoScalingPlans_EXPORTS.h>
+#include <aws/autoscaling-plans/internal/AutoScalingPlansEndpointRules.h>
 #include <aws/autoscaling-plans/model/ApplicationSource.h>
 #include <aws/autoscaling-plans/model/CreateScalingPlanRequest.h>
 #include <aws/autoscaling-plans/model/CreateScalingPlanResult.h>
diff --git a/generated/tests/awstransfer-gen-tests/TransferIncludeTests.cpp b/generated/tests/awstransfer-gen-tests/TransferIncludeTests.cpp
index c19fc10fc36a..64608a2be4be 100644
--- a/generated/tests/awstransfer-gen-tests/TransferIncludeTests.cpp
+++ b/generated/tests/awstransfer-gen-tests/TransferIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/awstransfer/TransferClient.h>
+#include <aws/awstransfer/TransferClientPagination.h>
 #include <aws/awstransfer/TransferEndpointProvider.h>
 #include <aws/awstransfer/TransferErrorMarshaller.h>
 #include <aws/awstransfer/TransferErrors.h>
+#include <aws/awstransfer/TransferPaginationBase.h>
 #include <aws/awstransfer/TransferRequest.h>
 #include <aws/awstransfer/TransferServiceClientModel.h>
+#include <aws/awstransfer/TransferWaiter.h>
 #include <aws/awstransfer/Transfer_EXPORTS.h>
+#include <aws/awstransfer/internal/TransferEndpointRules.h>
 #include <aws/awstransfer/model/AgreementStatusType.h>
 #include <aws/awstransfer/model/As2AsyncMdnConnectorConfig.h>
 #include <aws/awstransfer/model/As2ConnectorConfig.h>
@@ -134,32 +138,45 @@
 #include <aws/awstransfer/model/ImportSshPublicKeyResult.h>
 #include <aws/awstransfer/model/InputFileLocation.h>
 #include <aws/awstransfer/model/IpAddressType.h>
+#include <aws/awstransfer/model/ListAccessesPaginationTraits.h>
 #include <aws/awstransfer/model/ListAccessesRequest.h>
 #include <aws/awstransfer/model/ListAccessesResult.h>
+#include <aws/awstransfer/model/ListAgreementsPaginationTraits.h>
 #include <aws/awstransfer/model/ListAgreementsRequest.h>
 #include <aws/awstransfer/model/ListAgreementsResult.h>
+#include <aws/awstransfer/model/ListCertificatesPaginationTraits.h>
 #include <aws/awstransfer/model/ListCertificatesRequest.h>
 #include <aws/awstransfer/model/ListCertificatesResult.h>
+#include <aws/awstransfer/model/ListConnectorsPaginationTraits.h>
 #include <aws/awstransfer/model/ListConnectorsRequest.h>
 #include <aws/awstransfer/model/ListConnectorsResult.h>
+#include <aws/awstransfer/model/ListExecutionsPaginationTraits.h>
 #include <aws/awstransfer/model/ListExecutionsRequest.h>
 #include <aws/awstransfer/model/ListExecutionsResult.h>
+#include <aws/awstransfer/model/ListFileTransferResultsPaginationTraits.h>
 #include <aws/awstransfer/model/ListFileTransferResultsRequest.h>
 #include <aws/awstransfer/model/ListFileTransferResultsResult.h>
 #include <aws/awstransfer/model/ListHostKeysRequest.h>
 #include <aws/awstransfer/model/ListHostKeysResult.h>
+#include <aws/awstransfer/model/ListProfilesPaginationTraits.h>
 #include <aws/awstransfer/model/ListProfilesRequest.h>
 #include <aws/awstransfer/model/ListProfilesResult.h>
+#include <aws/awstransfer/model/ListSecurityPoliciesPaginationTraits.h>
 #include <aws/awstransfer/model/ListSecurityPoliciesRequest.h>
 #include <aws/awstransfer/model/ListSecurityPoliciesResult.h>
+#include <aws/awstransfer/model/ListServersPaginationTraits.h>
 #include <aws/awstransfer/model/ListServersRequest.h>
 #include <aws/awstransfer/model/ListServersResult.h>
+#include <aws/awstransfer/model/ListTagsForResourcePaginationTraits.h>
 #include <aws/awstransfer/model/ListTagsForResourceRequest.h>
 #include <aws/awstransfer/model/ListTagsForResourceResult.h>
+#include <aws/awstransfer/model/ListUsersPaginationTraits.h>
 #include <aws/awstransfer/model/ListUsersRequest.h>
 #include <aws/awstransfer/model/ListUsersResult.h>
+#include <aws/awstransfer/model/ListWebAppsPaginationTraits.h>
 #include <aws/awstransfer/model/ListWebAppsRequest.h>
 #include <aws/awstransfer/model/ListWebAppsResult.h>
+#include <aws/awstransfer/model/ListWorkflowsPaginationTraits.h>
 #include <aws/awstransfer/model/ListWorkflowsRequest.h>
 #include <aws/awstransfer/model/ListWorkflowsResult.h>
 #include <aws/awstransfer/model/ListedAccess.h>
diff --git a/generated/tests/b2bi-gen-tests/B2BIIncludeTests.cpp b/generated/tests/b2bi-gen-tests/B2BIIncludeTests.cpp
index 10794bcdd29d..7a411c9d531c 100644
--- a/generated/tests/b2bi-gen-tests/B2BIIncludeTests.cpp
+++ b/generated/tests/b2bi-gen-tests/B2BIIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/b2bi/B2BIClient.h>
+#include <aws/b2bi/B2BIClientPagination.h>
 #include <aws/b2bi/B2BIEndpointProvider.h>
 #include <aws/b2bi/B2BIErrorMarshaller.h>
 #include <aws/b2bi/B2BIErrors.h>
+#include <aws/b2bi/B2BIPaginationBase.h>
 #include <aws/b2bi/B2BIRequest.h>
 #include <aws/b2bi/B2BIServiceClientModel.h>
+#include <aws/b2bi/B2BIWaiter.h>
 #include <aws/b2bi/B2BI_EXPORTS.h>
+#include <aws/b2bi/internal/B2BIEndpointRules.h>
 #include <aws/b2bi/model/AdvancedOptions.h>
 #include <aws/b2bi/model/CapabilityConfiguration.h>
 #include <aws/b2bi/model/CapabilityDirection.h>
@@ -61,14 +65,18 @@
 #include <aws/b2bi/model/InputFileSource.h>
 #include <aws/b2bi/model/InternalServerException.h>
 #include <aws/b2bi/model/LineTerminator.h>
+#include <aws/b2bi/model/ListCapabilitiesPaginationTraits.h>
 #include <aws/b2bi/model/ListCapabilitiesRequest.h>
 #include <aws/b2bi/model/ListCapabilitiesResult.h>
+#include <aws/b2bi/model/ListPartnershipsPaginationTraits.h>
 #include <aws/b2bi/model/ListPartnershipsRequest.h>
 #include <aws/b2bi/model/ListPartnershipsResult.h>
+#include <aws/b2bi/model/ListProfilesPaginationTraits.h>
 #include <aws/b2bi/model/ListProfilesRequest.h>
 #include <aws/b2bi/model/ListProfilesResult.h>
 #include <aws/b2bi/model/ListTagsForResourceRequest.h>
 #include <aws/b2bi/model/ListTagsForResourceResult.h>
+#include <aws/b2bi/model/ListTransformersPaginationTraits.h>
 #include <aws/b2bi/model/ListTransformersRequest.h>
 #include <aws/b2bi/model/ListTransformersResult.h>
 #include <aws/b2bi/model/Logging.h>
diff --git a/generated/tests/backup-gateway-gen-tests/BackupGatewayIncludeTests.cpp b/generated/tests/backup-gateway-gen-tests/BackupGatewayIncludeTests.cpp
index 8834b264f589..80e01a1bfa70 100644
--- a/generated/tests/backup-gateway-gen-tests/BackupGatewayIncludeTests.cpp
+++ b/generated/tests/backup-gateway-gen-tests/BackupGatewayIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/backup-gateway/BackupGatewayClient.h>
+#include <aws/backup-gateway/BackupGatewayClientPagination.h>
 #include <aws/backup-gateway/BackupGatewayEndpointProvider.h>
 #include <aws/backup-gateway/BackupGatewayErrorMarshaller.h>
 #include <aws/backup-gateway/BackupGatewayErrors.h>
+#include <aws/backup-gateway/BackupGatewayPaginationBase.h>
 #include <aws/backup-gateway/BackupGatewayRequest.h>
 #include <aws/backup-gateway/BackupGatewayServiceClientModel.h>
+#include <aws/backup-gateway/BackupGatewayWaiter.h>
 #include <aws/backup-gateway/BackupGateway_EXPORTS.h>
+#include <aws/backup-gateway/internal/BackupGatewayEndpointRules.h>
 #include <aws/backup-gateway/model/AccessDeniedException.h>
 #include <aws/backup-gateway/model/AssociateGatewayToServerRequest.h>
 #include <aws/backup-gateway/model/AssociateGatewayToServerResult.h>
@@ -45,12 +49,15 @@
 #include <aws/backup-gateway/model/ImportHypervisorConfigurationRequest.h>
 #include <aws/backup-gateway/model/ImportHypervisorConfigurationResult.h>
 #include <aws/backup-gateway/model/InternalServerException.h>
+#include <aws/backup-gateway/model/ListGatewaysPaginationTraits.h>
 #include <aws/backup-gateway/model/ListGatewaysRequest.h>
 #include <aws/backup-gateway/model/ListGatewaysResult.h>
+#include <aws/backup-gateway/model/ListHypervisorsPaginationTraits.h>
 #include <aws/backup-gateway/model/ListHypervisorsRequest.h>
 #include <aws/backup-gateway/model/ListHypervisorsResult.h>
 #include <aws/backup-gateway/model/ListTagsForResourceRequest.h>
 #include <aws/backup-gateway/model/ListTagsForResourceResult.h>
+#include <aws/backup-gateway/model/ListVirtualMachinesPaginationTraits.h>
 #include <aws/backup-gateway/model/ListVirtualMachinesRequest.h>
 #include <aws/backup-gateway/model/ListVirtualMachinesResult.h>
 #include <aws/backup-gateway/model/MaintenanceStartTime.h>
diff --git a/generated/tests/backup-gen-tests/BackupIncludeTests.cpp b/generated/tests/backup-gen-tests/BackupIncludeTests.cpp
index b29dbc8b4c68..f02493d9736b 100644
--- a/generated/tests/backup-gen-tests/BackupIncludeTests.cpp
+++ b/generated/tests/backup-gen-tests/BackupIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/backup/BackupClient.h>
+#include <aws/backup/BackupClientPagination.h>
 #include <aws/backup/BackupEndpointProvider.h>
 #include <aws/backup/BackupErrorMarshaller.h>
 #include <aws/backup/BackupErrors.h>
+#include <aws/backup/BackupPaginationBase.h>
 #include <aws/backup/BackupRequest.h>
 #include <aws/backup/BackupServiceClientModel.h>
+#include <aws/backup/BackupWaiter.h>
 #include <aws/backup/Backup_EXPORTS.h>
+#include <aws/backup/internal/BackupEndpointRules.h>
 #include <aws/backup/model/AccessPointStatus.h>
 #include <aws/backup/model/AdvancedBackupSetting.h>
 #include <aws/backup/model/AggregatedScanResult.h>
@@ -171,68 +175,100 @@
 #include <aws/backup/model/LifecycleDeleteAfterEvent.h>
 #include <aws/backup/model/LimitExceededException.h>
 #include <aws/backup/model/ListAccessPointsMember.h>
+#include <aws/backup/model/ListBackupAccessPointsByRecoveryPointPaginationTraits.h>
 #include <aws/backup/model/ListBackupAccessPointsByRecoveryPointRequest.h>
 #include <aws/backup/model/ListBackupAccessPointsByRecoveryPointResult.h>
+#include <aws/backup/model/ListBackupAccessPointsByResourcePaginationTraits.h>
 #include <aws/backup/model/ListBackupAccessPointsByResourceRequest.h>
 #include <aws/backup/model/ListBackupAccessPointsByResourceResult.h>
+#include <aws/backup/model/ListBackupAccessPointsPaginationTraits.h>
 #include <aws/backup/model/ListBackupAccessPointsRequest.h>
 #include <aws/backup/model/ListBackupAccessPointsResult.h>
+#include <aws/backup/model/ListBackupJobSummariesPaginationTraits.h>
 #include <aws/backup/model/ListBackupJobSummariesRequest.h>
 #include <aws/backup/model/ListBackupJobSummariesResult.h>
+#include <aws/backup/model/ListBackupJobsPaginationTraits.h>
 #include <aws/backup/model/ListBackupJobsRequest.h>
 #include <aws/backup/model/ListBackupJobsResult.h>
+#include <aws/backup/model/ListBackupPlanTemplatesPaginationTraits.h>
 #include <aws/backup/model/ListBackupPlanTemplatesRequest.h>
 #include <aws/backup/model/ListBackupPlanTemplatesResult.h>
+#include <aws/backup/model/ListBackupPlanVersionsPaginationTraits.h>
 #include <aws/backup/model/ListBackupPlanVersionsRequest.h>
 #include <aws/backup/model/ListBackupPlanVersionsResult.h>
+#include <aws/backup/model/ListBackupPlansPaginationTraits.h>
 #include <aws/backup/model/ListBackupPlansRequest.h>
 #include <aws/backup/model/ListBackupPlansResult.h>
+#include <aws/backup/model/ListBackupSelectionsPaginationTraits.h>
 #include <aws/backup/model/ListBackupSelectionsRequest.h>
 #include <aws/backup/model/ListBackupSelectionsResult.h>
+#include <aws/backup/model/ListBackupVaultsPaginationTraits.h>
 #include <aws/backup/model/ListBackupVaultsRequest.h>
 #include <aws/backup/model/ListBackupVaultsResult.h>
+#include <aws/backup/model/ListCopyJobSummariesPaginationTraits.h>
 #include <aws/backup/model/ListCopyJobSummariesRequest.h>
 #include <aws/backup/model/ListCopyJobSummariesResult.h>
+#include <aws/backup/model/ListCopyJobsPaginationTraits.h>
 #include <aws/backup/model/ListCopyJobsRequest.h>
 #include <aws/backup/model/ListCopyJobsResult.h>
+#include <aws/backup/model/ListFrameworksPaginationTraits.h>
 #include <aws/backup/model/ListFrameworksRequest.h>
 #include <aws/backup/model/ListFrameworksResult.h>
+#include <aws/backup/model/ListIndexedRecoveryPointsPaginationTraits.h>
 #include <aws/backup/model/ListIndexedRecoveryPointsRequest.h>
 #include <aws/backup/model/ListIndexedRecoveryPointsResult.h>
+#include <aws/backup/model/ListLegalHoldsPaginationTraits.h>
 #include <aws/backup/model/ListLegalHoldsRequest.h>
 #include <aws/backup/model/ListLegalHoldsResult.h>
+#include <aws/backup/model/ListProtectedResourcesByBackupVaultPaginationTraits.h>
 #include <aws/backup/model/ListProtectedResourcesByBackupVaultRequest.h>
 #include <aws/backup/model/ListProtectedResourcesByBackupVaultResult.h>
+#include <aws/backup/model/ListProtectedResourcesPaginationTraits.h>
 #include <aws/backup/model/ListProtectedResourcesRequest.h>
 #include <aws/backup/model/ListProtectedResourcesResult.h>
+#include <aws/backup/model/ListRecoveryPointsByBackupVaultPaginationTraits.h>
 #include <aws/backup/model/ListRecoveryPointsByBackupVaultRequest.h>
 #include <aws/backup/model/ListRecoveryPointsByBackupVaultResult.h>
+#include <aws/backup/model/ListRecoveryPointsByLegalHoldPaginationTraits.h>
 #include <aws/backup/model/ListRecoveryPointsByLegalHoldRequest.h>
 #include <aws/backup/model/ListRecoveryPointsByLegalHoldResult.h>
+#include <aws/backup/model/ListRecoveryPointsByResourcePaginationTraits.h>
 #include <aws/backup/model/ListRecoveryPointsByResourceRequest.h>
 #include <aws/backup/model/ListRecoveryPointsByResourceResult.h>
+#include <aws/backup/model/ListReportJobsPaginationTraits.h>
 #include <aws/backup/model/ListReportJobsRequest.h>
 #include <aws/backup/model/ListReportJobsResult.h>
+#include <aws/backup/model/ListReportPlansPaginationTraits.h>
 #include <aws/backup/model/ListReportPlansRequest.h>
 #include <aws/backup/model/ListReportPlansResult.h>
+#include <aws/backup/model/ListRestoreAccessBackupVaultsPaginationTraits.h>
 #include <aws/backup/model/ListRestoreAccessBackupVaultsRequest.h>
 #include <aws/backup/model/ListRestoreAccessBackupVaultsResult.h>
+#include <aws/backup/model/ListRestoreJobSummariesPaginationTraits.h>
 #include <aws/backup/model/ListRestoreJobSummariesRequest.h>
 #include <aws/backup/model/ListRestoreJobSummariesResult.h>
+#include <aws/backup/model/ListRestoreJobsByProtectedResourcePaginationTraits.h>
 #include <aws/backup/model/ListRestoreJobsByProtectedResourceRequest.h>
 #include <aws/backup/model/ListRestoreJobsByProtectedResourceResult.h>
+#include <aws/backup/model/ListRestoreJobsPaginationTraits.h>
 #include <aws/backup/model/ListRestoreJobsRequest.h>
 #include <aws/backup/model/ListRestoreJobsResult.h>
+#include <aws/backup/model/ListRestoreTestingPlansPaginationTraits.h>
 #include <aws/backup/model/ListRestoreTestingPlansRequest.h>
 #include <aws/backup/model/ListRestoreTestingPlansResult.h>
+#include <aws/backup/model/ListRestoreTestingSelectionsPaginationTraits.h>
 #include <aws/backup/model/ListRestoreTestingSelectionsRequest.h>
 #include <aws/backup/model/ListRestoreTestingSelectionsResult.h>
+#include <aws/backup/model/ListScanJobSummariesPaginationTraits.h>
 #include <aws/backup/model/ListScanJobSummariesRequest.h>
 #include <aws/backup/model/ListScanJobSummariesResult.h>
+#include <aws/backup/model/ListScanJobsPaginationTraits.h>
 #include <aws/backup/model/ListScanJobsRequest.h>
 #include <aws/backup/model/ListScanJobsResult.h>
+#include <aws/backup/model/ListTagsPaginationTraits.h>
 #include <aws/backup/model/ListTagsRequest.h>
 #include <aws/backup/model/ListTagsResult.h>
+#include <aws/backup/model/ListTieringConfigurationsPaginationTraits.h>
 #include <aws/backup/model/ListTieringConfigurationsRequest.h>
 #include <aws/backup/model/ListTieringConfigurationsResult.h>
 #include <aws/backup/model/MalwareScanner.h>
diff --git a/generated/tests/backupsearch-gen-tests/BackupSearchIncludeTests.cpp b/generated/tests/backupsearch-gen-tests/BackupSearchIncludeTests.cpp
index c45129251612..63a68a851852 100644
--- a/generated/tests/backupsearch-gen-tests/BackupSearchIncludeTests.cpp
+++ b/generated/tests/backupsearch-gen-tests/BackupSearchIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/backupsearch/BackupSearchClient.h>
+#include <aws/backupsearch/BackupSearchClientPagination.h>
 #include <aws/backupsearch/BackupSearchEndpointProvider.h>
 #include <aws/backupsearch/BackupSearchErrorMarshaller.h>
 #include <aws/backupsearch/BackupSearchErrors.h>
+#include <aws/backupsearch/BackupSearchPaginationBase.h>
 #include <aws/backupsearch/BackupSearchRequest.h>
 #include <aws/backupsearch/BackupSearchServiceClientModel.h>
+#include <aws/backupsearch/BackupSearchWaiter.h>
 #include <aws/backupsearch/BackupSearch_EXPORTS.h>
+#include <aws/backupsearch/internal/BackupSearchEndpointRules.h>
 #include <aws/backupsearch/model/BackupCreationTimeFilter.h>
 #include <aws/backupsearch/model/ConflictException.h>
 #include <aws/backupsearch/model/CurrentSearchProgress.h>
@@ -27,12 +31,16 @@
 #include <aws/backupsearch/model/GetSearchResultExportJobResult.h>
 #include <aws/backupsearch/model/InternalServerException.h>
 #include <aws/backupsearch/model/ItemFilters.h>
+#include <aws/backupsearch/model/ListSearchJobBackupsPaginationTraits.h>
 #include <aws/backupsearch/model/ListSearchJobBackupsRequest.h>
 #include <aws/backupsearch/model/ListSearchJobBackupsResult.h>
+#include <aws/backupsearch/model/ListSearchJobResultsPaginationTraits.h>
 #include <aws/backupsearch/model/ListSearchJobResultsRequest.h>
 #include <aws/backupsearch/model/ListSearchJobResultsResult.h>
+#include <aws/backupsearch/model/ListSearchJobsPaginationTraits.h>
 #include <aws/backupsearch/model/ListSearchJobsRequest.h>
 #include <aws/backupsearch/model/ListSearchJobsResult.h>
+#include <aws/backupsearch/model/ListSearchResultExportJobsPaginationTraits.h>
 #include <aws/backupsearch/model/ListSearchResultExportJobsRequest.h>
 #include <aws/backupsearch/model/ListSearchResultExportJobsResult.h>
 #include <aws/backupsearch/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/batch-gen-tests/BatchIncludeTests.cpp b/generated/tests/batch-gen-tests/BatchIncludeTests.cpp
index 52d7c2f4d0c1..fea72c4be862 100644
--- a/generated/tests/batch-gen-tests/BatchIncludeTests.cpp
+++ b/generated/tests/batch-gen-tests/BatchIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/batch/BatchClient.h>
+#include <aws/batch/BatchClientPagination.h>
 #include <aws/batch/BatchEndpointProvider.h>
 #include <aws/batch/BatchErrorMarshaller.h>
 #include <aws/batch/BatchErrors.h>
+#include <aws/batch/BatchPaginationBase.h>
 #include <aws/batch/BatchRequest.h>
 #include <aws/batch/BatchServiceClientModel.h>
+#include <aws/batch/BatchWaiter.h>
 #include <aws/batch/Batch_EXPORTS.h>
+#include <aws/batch/internal/BatchEndpointRules.h>
 #include <aws/batch/model/ArrayJobDependency.h>
 #include <aws/batch/model/ArrayProperties.h>
 #include <aws/batch/model/ArrayPropertiesDetail.h>
@@ -69,12 +73,15 @@
 #include <aws/batch/model/DeleteServiceEnvironmentResult.h>
 #include <aws/batch/model/DeregisterJobDefinitionRequest.h>
 #include <aws/batch/model/DeregisterJobDefinitionResult.h>
+#include <aws/batch/model/DescribeComputeEnvironmentsPaginationTraits.h>
 #include <aws/batch/model/DescribeComputeEnvironmentsRequest.h>
 #include <aws/batch/model/DescribeComputeEnvironmentsResult.h>
 #include <aws/batch/model/DescribeConsumableResourceRequest.h>
 #include <aws/batch/model/DescribeConsumableResourceResult.h>
+#include <aws/batch/model/DescribeJobDefinitionsPaginationTraits.h>
 #include <aws/batch/model/DescribeJobDefinitionsRequest.h>
 #include <aws/batch/model/DescribeJobDefinitionsResult.h>
+#include <aws/batch/model/DescribeJobQueuesPaginationTraits.h>
 #include <aws/batch/model/DescribeJobQueuesRequest.h>
 #include <aws/batch/model/DescribeJobQueuesResult.h>
 #include <aws/batch/model/DescribeJobsRequest.h>
@@ -83,6 +90,7 @@
 #include <aws/batch/model/DescribeQuotaShareResult.h>
 #include <aws/batch/model/DescribeSchedulingPoliciesRequest.h>
 #include <aws/batch/model/DescribeSchedulingPoliciesResult.h>
+#include <aws/batch/model/DescribeServiceEnvironmentsPaginationTraits.h>
 #include <aws/batch/model/DescribeServiceEnvironmentsRequest.h>
 #include <aws/batch/model/DescribeServiceEnvironmentsResult.h>
 #include <aws/batch/model/DescribeServiceJobRequest.h>
@@ -159,17 +167,23 @@
 #include <aws/batch/model/LaunchTemplateSpecification.h>
 #include <aws/batch/model/LaunchTemplateSpecificationOverride.h>
 #include <aws/batch/model/LinuxParameters.h>
+#include <aws/batch/model/ListConsumableResourcesPaginationTraits.h>
 #include <aws/batch/model/ListConsumableResourcesRequest.h>
 #include <aws/batch/model/ListConsumableResourcesResult.h>
+#include <aws/batch/model/ListJobsByConsumableResourcePaginationTraits.h>
 #include <aws/batch/model/ListJobsByConsumableResourceRequest.h>
 #include <aws/batch/model/ListJobsByConsumableResourceResult.h>
 #include <aws/batch/model/ListJobsByConsumableResourceSummary.h>
+#include <aws/batch/model/ListJobsPaginationTraits.h>
 #include <aws/batch/model/ListJobsRequest.h>
 #include <aws/batch/model/ListJobsResult.h>
+#include <aws/batch/model/ListQuotaSharesPaginationTraits.h>
 #include <aws/batch/model/ListQuotaSharesRequest.h>
 #include <aws/batch/model/ListQuotaSharesResult.h>
+#include <aws/batch/model/ListSchedulingPoliciesPaginationTraits.h>
 #include <aws/batch/model/ListSchedulingPoliciesRequest.h>
 #include <aws/batch/model/ListSchedulingPoliciesResult.h>
+#include <aws/batch/model/ListServiceJobsPaginationTraits.h>
 #include <aws/batch/model/ListServiceJobsRequest.h>
 #include <aws/batch/model/ListServiceJobsResult.h>
 #include <aws/batch/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/bcm-dashboards-gen-tests/BCMDashboardsIncludeTests.cpp b/generated/tests/bcm-dashboards-gen-tests/BCMDashboardsIncludeTests.cpp
index 48270787d386..302f5e6428a7 100644
--- a/generated/tests/bcm-dashboards-gen-tests/BCMDashboardsIncludeTests.cpp
+++ b/generated/tests/bcm-dashboards-gen-tests/BCMDashboardsIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/bcm-dashboards/BCMDashboardsClient.h>
+#include <aws/bcm-dashboards/BCMDashboardsClientPagination.h>
 #include <aws/bcm-dashboards/BCMDashboardsEndpointProvider.h>
 #include <aws/bcm-dashboards/BCMDashboardsErrorMarshaller.h>
 #include <aws/bcm-dashboards/BCMDashboardsErrors.h>
+#include <aws/bcm-dashboards/BCMDashboardsPaginationBase.h>
 #include <aws/bcm-dashboards/BCMDashboardsRequest.h>
 #include <aws/bcm-dashboards/BCMDashboardsServiceClientModel.h>
+#include <aws/bcm-dashboards/BCMDashboardsWaiter.h>
 #include <aws/bcm-dashboards/BCMDashboards_EXPORTS.h>
+#include <aws/bcm-dashboards/internal/BCMDashboardsEndpointRules.h>
 #include <aws/bcm-dashboards/model/CostAndUsageQuery.h>
 #include <aws/bcm-dashboards/model/CostCategoryValues.h>
 #include <aws/bcm-dashboards/model/CreateDashboardRequest.h>
@@ -46,8 +50,10 @@
 #include <aws/bcm-dashboards/model/GroupDefinitionType.h>
 #include <aws/bcm-dashboards/model/HealthStatus.h>
 #include <aws/bcm-dashboards/model/HealthStatusCode.h>
+#include <aws/bcm-dashboards/model/ListDashboardsPaginationTraits.h>
 #include <aws/bcm-dashboards/model/ListDashboardsRequest.h>
 #include <aws/bcm-dashboards/model/ListDashboardsResult.h>
+#include <aws/bcm-dashboards/model/ListScheduledReportsPaginationTraits.h>
 #include <aws/bcm-dashboards/model/ListScheduledReportsRequest.h>
 #include <aws/bcm-dashboards/model/ListScheduledReportsResult.h>
 #include <aws/bcm-dashboards/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/bcm-data-exports-gen-tests/BCMDataExportsIncludeTests.cpp b/generated/tests/bcm-data-exports-gen-tests/BCMDataExportsIncludeTests.cpp
index 7cad20a56047..8e8e40c6cf4d 100644
--- a/generated/tests/bcm-data-exports-gen-tests/BCMDataExportsIncludeTests.cpp
+++ b/generated/tests/bcm-data-exports-gen-tests/BCMDataExportsIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/bcm-data-exports/BCMDataExportsClient.h>
+#include <aws/bcm-data-exports/BCMDataExportsClientPagination.h>
 #include <aws/bcm-data-exports/BCMDataExportsEndpointProvider.h>
 #include <aws/bcm-data-exports/BCMDataExportsErrorMarshaller.h>
 #include <aws/bcm-data-exports/BCMDataExportsErrors.h>
+#include <aws/bcm-data-exports/BCMDataExportsPaginationBase.h>
 #include <aws/bcm-data-exports/BCMDataExportsRequest.h>
 #include <aws/bcm-data-exports/BCMDataExportsServiceClientModel.h>
+#include <aws/bcm-data-exports/BCMDataExportsWaiter.h>
 #include <aws/bcm-data-exports/BCMDataExports_EXPORTS.h>
+#include <aws/bcm-data-exports/internal/BCMDataExportsEndpointRules.h>
 #include <aws/bcm-data-exports/model/Column.h>
 #include <aws/bcm-data-exports/model/CompressionOption.h>
 #include <aws/bcm-data-exports/model/CreateExportRequest.h>
@@ -37,10 +41,13 @@
 #include <aws/bcm-data-exports/model/GetExportResult.h>
 #include <aws/bcm-data-exports/model/GetTableRequest.h>
 #include <aws/bcm-data-exports/model/GetTableResult.h>
+#include <aws/bcm-data-exports/model/ListExecutionsPaginationTraits.h>
 #include <aws/bcm-data-exports/model/ListExecutionsRequest.h>
 #include <aws/bcm-data-exports/model/ListExecutionsResult.h>
+#include <aws/bcm-data-exports/model/ListExportsPaginationTraits.h>
 #include <aws/bcm-data-exports/model/ListExportsRequest.h>
 #include <aws/bcm-data-exports/model/ListExportsResult.h>
+#include <aws/bcm-data-exports/model/ListTablesPaginationTraits.h>
 #include <aws/bcm-data-exports/model/ListTablesRequest.h>
 #include <aws/bcm-data-exports/model/ListTablesResult.h>
 #include <aws/bcm-data-exports/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/bcm-pricing-calculator-gen-tests/BCMPricingCalculatorIncludeTests.cpp b/generated/tests/bcm-pricing-calculator-gen-tests/BCMPricingCalculatorIncludeTests.cpp
index 3fb040786ca3..33ca43184e9b 100644
--- a/generated/tests/bcm-pricing-calculator-gen-tests/BCMPricingCalculatorIncludeTests.cpp
+++ b/generated/tests/bcm-pricing-calculator-gen-tests/BCMPricingCalculatorIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/bcm-pricing-calculator/BCMPricingCalculatorClient.h>
+#include <aws/bcm-pricing-calculator/BCMPricingCalculatorClientPagination.h>
 #include <aws/bcm-pricing-calculator/BCMPricingCalculatorEndpointProvider.h>
 #include <aws/bcm-pricing-calculator/BCMPricingCalculatorErrorMarshaller.h>
 #include <aws/bcm-pricing-calculator/BCMPricingCalculatorErrors.h>
+#include <aws/bcm-pricing-calculator/BCMPricingCalculatorPaginationBase.h>
 #include <aws/bcm-pricing-calculator/BCMPricingCalculatorRequest.h>
 #include <aws/bcm-pricing-calculator/BCMPricingCalculatorServiceClientModel.h>
+#include <aws/bcm-pricing-calculator/BCMPricingCalculatorWaiter.h>
 #include <aws/bcm-pricing-calculator/BCMPricingCalculator_EXPORTS.h>
+#include <aws/bcm-pricing-calculator/internal/BCMPricingCalculatorEndpointRules.h>
 #include <aws/bcm-pricing-calculator/model/AddReservedInstanceAction.h>
 #include <aws/bcm-pricing-calculator/model/AddSavingsPlanAction.h>
 #include <aws/bcm-pricing-calculator/model/BatchCreateBillScenarioCommitmentModificationEntry.h>
@@ -101,36 +105,46 @@
 #include <aws/bcm-pricing-calculator/model/GroupSharingPreferenceEnum.h>
 #include <aws/bcm-pricing-calculator/model/HistoricalUsageEntity.h>
 #include <aws/bcm-pricing-calculator/model/InternalServerException.h>
+#include <aws/bcm-pricing-calculator/model/ListBillEstimateCommitmentsPaginationTraits.h>
 #include <aws/bcm-pricing-calculator/model/ListBillEstimateCommitmentsRequest.h>
 #include <aws/bcm-pricing-calculator/model/ListBillEstimateCommitmentsResult.h>
+#include <aws/bcm-pricing-calculator/model/ListBillEstimateInputCommitmentModificationsPaginationTraits.h>
 #include <aws/bcm-pricing-calculator/model/ListBillEstimateInputCommitmentModificationsRequest.h>
 #include <aws/bcm-pricing-calculator/model/ListBillEstimateInputCommitmentModificationsResult.h>
+#include <aws/bcm-pricing-calculator/model/ListBillEstimateInputUsageModificationsPaginationTraits.h>
 #include <aws/bcm-pricing-calculator/model/ListBillEstimateInputUsageModificationsRequest.h>
 #include <aws/bcm-pricing-calculator/model/ListBillEstimateInputUsageModificationsResult.h>
 #include <aws/bcm-pricing-calculator/model/ListBillEstimateLineItemsFilter.h>
 #include <aws/bcm-pricing-calculator/model/ListBillEstimateLineItemsFilterName.h>
+#include <aws/bcm-pricing-calculator/model/ListBillEstimateLineItemsPaginationTraits.h>
 #include <aws/bcm-pricing-calculator/model/ListBillEstimateLineItemsRequest.h>
 #include <aws/bcm-pricing-calculator/model/ListBillEstimateLineItemsResult.h>
 #include <aws/bcm-pricing-calculator/model/ListBillEstimatesFilter.h>
 #include <aws/bcm-pricing-calculator/model/ListBillEstimatesFilterName.h>
+#include <aws/bcm-pricing-calculator/model/ListBillEstimatesPaginationTraits.h>
 #include <aws/bcm-pricing-calculator/model/ListBillEstimatesRequest.h>
 #include <aws/bcm-pricing-calculator/model/ListBillEstimatesResult.h>
+#include <aws/bcm-pricing-calculator/model/ListBillScenarioCommitmentModificationsPaginationTraits.h>
 #include <aws/bcm-pricing-calculator/model/ListBillScenarioCommitmentModificationsRequest.h>
 #include <aws/bcm-pricing-calculator/model/ListBillScenarioCommitmentModificationsResult.h>
+#include <aws/bcm-pricing-calculator/model/ListBillScenarioUsageModificationsPaginationTraits.h>
 #include <aws/bcm-pricing-calculator/model/ListBillScenarioUsageModificationsRequest.h>
 #include <aws/bcm-pricing-calculator/model/ListBillScenarioUsageModificationsResult.h>
 #include <aws/bcm-pricing-calculator/model/ListBillScenariosFilter.h>
 #include <aws/bcm-pricing-calculator/model/ListBillScenariosFilterName.h>
+#include <aws/bcm-pricing-calculator/model/ListBillScenariosPaginationTraits.h>
 #include <aws/bcm-pricing-calculator/model/ListBillScenariosRequest.h>
 #include <aws/bcm-pricing-calculator/model/ListBillScenariosResult.h>
 #include <aws/bcm-pricing-calculator/model/ListTagsForResourceRequest.h>
 #include <aws/bcm-pricing-calculator/model/ListTagsForResourceResult.h>
 #include <aws/bcm-pricing-calculator/model/ListUsageFilter.h>
 #include <aws/bcm-pricing-calculator/model/ListUsageFilterName.h>
+#include <aws/bcm-pricing-calculator/model/ListWorkloadEstimateUsagePaginationTraits.h>
 #include <aws/bcm-pricing-calculator/model/ListWorkloadEstimateUsageRequest.h>
 #include <aws/bcm-pricing-calculator/model/ListWorkloadEstimateUsageResult.h>
 #include <aws/bcm-pricing-calculator/model/ListWorkloadEstimatesFilter.h>
 #include <aws/bcm-pricing-calculator/model/ListWorkloadEstimatesFilterName.h>
+#include <aws/bcm-pricing-calculator/model/ListWorkloadEstimatesPaginationTraits.h>
 #include <aws/bcm-pricing-calculator/model/ListWorkloadEstimatesRequest.h>
 #include <aws/bcm-pricing-calculator/model/ListWorkloadEstimatesResult.h>
 #include <aws/bcm-pricing-calculator/model/MatchOption.h>
diff --git a/generated/tests/bcm-recommended-actions-gen-tests/BCMRecommendedActionsIncludeTests.cpp b/generated/tests/bcm-recommended-actions-gen-tests/BCMRecommendedActionsIncludeTests.cpp
index e9d38e6b4aa3..4471260528f9 100644
--- a/generated/tests/bcm-recommended-actions-gen-tests/BCMRecommendedActionsIncludeTests.cpp
+++ b/generated/tests/bcm-recommended-actions-gen-tests/BCMRecommendedActionsIncludeTests.cpp
@@ -7,16 +7,21 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/bcm-recommended-actions/BCMRecommendedActionsClient.h>
+#include <aws/bcm-recommended-actions/BCMRecommendedActionsClientPagination.h>
 #include <aws/bcm-recommended-actions/BCMRecommendedActionsEndpointProvider.h>
 #include <aws/bcm-recommended-actions/BCMRecommendedActionsErrorMarshaller.h>
 #include <aws/bcm-recommended-actions/BCMRecommendedActionsErrors.h>
+#include <aws/bcm-recommended-actions/BCMRecommendedActionsPaginationBase.h>
 #include <aws/bcm-recommended-actions/BCMRecommendedActionsRequest.h>
 #include <aws/bcm-recommended-actions/BCMRecommendedActionsServiceClientModel.h>
+#include <aws/bcm-recommended-actions/BCMRecommendedActionsWaiter.h>
 #include <aws/bcm-recommended-actions/BCMRecommendedActions_EXPORTS.h>
+#include <aws/bcm-recommended-actions/internal/BCMRecommendedActionsEndpointRules.h>
 #include <aws/bcm-recommended-actions/model/ActionFilter.h>
 #include <aws/bcm-recommended-actions/model/ActionType.h>
 #include <aws/bcm-recommended-actions/model/Feature.h>
 #include <aws/bcm-recommended-actions/model/FilterName.h>
+#include <aws/bcm-recommended-actions/model/ListRecommendedActionsPaginationTraits.h>
 #include <aws/bcm-recommended-actions/model/ListRecommendedActionsRequest.h>
 #include <aws/bcm-recommended-actions/model/ListRecommendedActionsResult.h>
 #include <aws/bcm-recommended-actions/model/MatchOption.h>
diff --git a/generated/tests/bedrock-agent-gen-tests/BedrockAgentIncludeTests.cpp b/generated/tests/bedrock-agent-gen-tests/BedrockAgentIncludeTests.cpp
index edf5efcb31a4..de98d9603b91 100644
--- a/generated/tests/bedrock-agent-gen-tests/BedrockAgentIncludeTests.cpp
+++ b/generated/tests/bedrock-agent-gen-tests/BedrockAgentIncludeTests.cpp
@@ -9,12 +9,16 @@
 #include <aws/bedrock-agent/BedrockAgentAwsBearerTokenIdentityResolver.h>
 #include <aws/bedrock-agent/BedrockAgentClient.h>
 #include <aws/bedrock-agent/BedrockAgentClientConfiguration.h>
+#include <aws/bedrock-agent/BedrockAgentClientPagination.h>
 #include <aws/bedrock-agent/BedrockAgentEndpointProvider.h>
 #include <aws/bedrock-agent/BedrockAgentErrorMarshaller.h>
 #include <aws/bedrock-agent/BedrockAgentErrors.h>
+#include <aws/bedrock-agent/BedrockAgentPaginationBase.h>
 #include <aws/bedrock-agent/BedrockAgentRequest.h>
 #include <aws/bedrock-agent/BedrockAgentServiceClientModel.h>
+#include <aws/bedrock-agent/BedrockAgentWaiter.h>
 #include <aws/bedrock-agent/BedrockAgent_EXPORTS.h>
+#include <aws/bedrock-agent/internal/BedrockAgentEndpointRules.h>
 #include <aws/bedrock-agent/model/APISchema.h>
 #include <aws/bedrock-agent/model/AccessControlAccess.h>
 #include <aws/bedrock-agent/model/AccessControlPrincipalType.h>
@@ -253,32 +257,46 @@
 #include <aws/bedrock-agent/model/KnowledgeBaseType.h>
 #include <aws/bedrock-agent/model/LambdaFunctionFlowNodeConfiguration.h>
 #include <aws/bedrock-agent/model/LexFlowNodeConfiguration.h>
+#include <aws/bedrock-agent/model/ListAgentActionGroupsPaginationTraits.h>
 #include <aws/bedrock-agent/model/ListAgentActionGroupsRequest.h>
 #include <aws/bedrock-agent/model/ListAgentActionGroupsResult.h>
+#include <aws/bedrock-agent/model/ListAgentAliasesPaginationTraits.h>
 #include <aws/bedrock-agent/model/ListAgentAliasesRequest.h>
 #include <aws/bedrock-agent/model/ListAgentAliasesResult.h>
+#include <aws/bedrock-agent/model/ListAgentCollaboratorsPaginationTraits.h>
 #include <aws/bedrock-agent/model/ListAgentCollaboratorsRequest.h>
 #include <aws/bedrock-agent/model/ListAgentCollaboratorsResult.h>
+#include <aws/bedrock-agent/model/ListAgentKnowledgeBasesPaginationTraits.h>
 #include <aws/bedrock-agent/model/ListAgentKnowledgeBasesRequest.h>
 #include <aws/bedrock-agent/model/ListAgentKnowledgeBasesResult.h>
+#include <aws/bedrock-agent/model/ListAgentVersionsPaginationTraits.h>
 #include <aws/bedrock-agent/model/ListAgentVersionsRequest.h>
 #include <aws/bedrock-agent/model/ListAgentVersionsResult.h>
+#include <aws/bedrock-agent/model/ListAgentsPaginationTraits.h>
 #include <aws/bedrock-agent/model/ListAgentsRequest.h>
 #include <aws/bedrock-agent/model/ListAgentsResult.h>
+#include <aws/bedrock-agent/model/ListDataSourcesPaginationTraits.h>
 #include <aws/bedrock-agent/model/ListDataSourcesRequest.h>
 #include <aws/bedrock-agent/model/ListDataSourcesResult.h>
+#include <aws/bedrock-agent/model/ListFlowAliasesPaginationTraits.h>
 #include <aws/bedrock-agent/model/ListFlowAliasesRequest.h>
 #include <aws/bedrock-agent/model/ListFlowAliasesResult.h>
+#include <aws/bedrock-agent/model/ListFlowVersionsPaginationTraits.h>
 #include <aws/bedrock-agent/model/ListFlowVersionsRequest.h>
 #include <aws/bedrock-agent/model/ListFlowVersionsResult.h>
+#include <aws/bedrock-agent/model/ListFlowsPaginationTraits.h>
 #include <aws/bedrock-agent/model/ListFlowsRequest.h>
 #include <aws/bedrock-agent/model/ListFlowsResult.h>
+#include <aws/bedrock-agent/model/ListIngestionJobsPaginationTraits.h>
 #include <aws/bedrock-agent/model/ListIngestionJobsRequest.h>
 #include <aws/bedrock-agent/model/ListIngestionJobsResult.h>
+#include <aws/bedrock-agent/model/ListKnowledgeBaseDocumentsPaginationTraits.h>
 #include <aws/bedrock-agent/model/ListKnowledgeBaseDocumentsRequest.h>
 #include <aws/bedrock-agent/model/ListKnowledgeBaseDocumentsResult.h>
+#include <aws/bedrock-agent/model/ListKnowledgeBasesPaginationTraits.h>
 #include <aws/bedrock-agent/model/ListKnowledgeBasesRequest.h>
 #include <aws/bedrock-agent/model/ListKnowledgeBasesResult.h>
+#include <aws/bedrock-agent/model/ListPromptsPaginationTraits.h>
 #include <aws/bedrock-agent/model/ListPromptsRequest.h>
 #include <aws/bedrock-agent/model/ListPromptsResult.h>
 #include <aws/bedrock-agent/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/bedrock-agent-runtime-gen-tests/BedrockAgentRuntimeIncludeTests.cpp b/generated/tests/bedrock-agent-runtime-gen-tests/BedrockAgentRuntimeIncludeTests.cpp
index 12a6642a1ba5..867666c86eea 100644
--- a/generated/tests/bedrock-agent-runtime-gen-tests/BedrockAgentRuntimeIncludeTests.cpp
+++ b/generated/tests/bedrock-agent-runtime-gen-tests/BedrockAgentRuntimeIncludeTests.cpp
@@ -9,12 +9,16 @@
 #include <aws/bedrock-agent-runtime/BedrockAgentRuntimeAwsBearerTokenIdentityResolver.h>
 #include <aws/bedrock-agent-runtime/BedrockAgentRuntimeClient.h>
 #include <aws/bedrock-agent-runtime/BedrockAgentRuntimeClientConfiguration.h>
+#include <aws/bedrock-agent-runtime/BedrockAgentRuntimeClientPagination.h>
 #include <aws/bedrock-agent-runtime/BedrockAgentRuntimeEndpointProvider.h>
 #include <aws/bedrock-agent-runtime/BedrockAgentRuntimeErrorMarshaller.h>
 #include <aws/bedrock-agent-runtime/BedrockAgentRuntimeErrors.h>
+#include <aws/bedrock-agent-runtime/BedrockAgentRuntimePaginationBase.h>
 #include <aws/bedrock-agent-runtime/BedrockAgentRuntimeRequest.h>
 #include <aws/bedrock-agent-runtime/BedrockAgentRuntimeServiceClientModel.h>
+#include <aws/bedrock-agent-runtime/BedrockAgentRuntimeWaiter.h>
 #include <aws/bedrock-agent-runtime/BedrockAgentRuntime_EXPORTS.h>
+#include <aws/bedrock-agent-runtime/internal/BedrockAgentRuntimeEndpointRules.h>
 #include <aws/bedrock-agent-runtime/model/APISchema.h>
 #include <aws/bedrock-agent-runtime/model/ActionGroupExecutor.h>
 #include <aws/bedrock-agent-runtime/model/ActionGroupInvocationInput.h>
@@ -177,6 +181,7 @@
 #include <aws/bedrock-agent-runtime/model/GeneratedQueryType.h>
 #include <aws/bedrock-agent-runtime/model/GeneratedResponsePart.h>
 #include <aws/bedrock-agent-runtime/model/GenerationConfiguration.h>
+#include <aws/bedrock-agent-runtime/model/GetAgentMemoryPaginationTraits.h>
 #include <aws/bedrock-agent-runtime/model/GetAgentMemoryRequest.h>
 #include <aws/bedrock-agent-runtime/model/GetAgentMemoryResult.h>
 #include <aws/bedrock-agent-runtime/model/GetDocumentContentRequest.h>
@@ -265,14 +270,19 @@
 #include <aws/bedrock-agent-runtime/model/KnowledgeBaseRetrieveAndGenerateConfiguration.h>
 #include <aws/bedrock-agent-runtime/model/KnowledgeBaseRetrieverConfiguration.h>
 #include <aws/bedrock-agent-runtime/model/KnowledgeBaseVectorSearchConfiguration.h>
+#include <aws/bedrock-agent-runtime/model/ListFlowExecutionEventsPaginationTraits.h>
 #include <aws/bedrock-agent-runtime/model/ListFlowExecutionEventsRequest.h>
 #include <aws/bedrock-agent-runtime/model/ListFlowExecutionEventsResult.h>
+#include <aws/bedrock-agent-runtime/model/ListFlowExecutionsPaginationTraits.h>
 #include <aws/bedrock-agent-runtime/model/ListFlowExecutionsRequest.h>
 #include <aws/bedrock-agent-runtime/model/ListFlowExecutionsResult.h>
+#include <aws/bedrock-agent-runtime/model/ListInvocationStepsPaginationTraits.h>
 #include <aws/bedrock-agent-runtime/model/ListInvocationStepsRequest.h>
 #include <aws/bedrock-agent-runtime/model/ListInvocationStepsResult.h>
+#include <aws/bedrock-agent-runtime/model/ListInvocationsPaginationTraits.h>
 #include <aws/bedrock-agent-runtime/model/ListInvocationsRequest.h>
 #include <aws/bedrock-agent-runtime/model/ListInvocationsResult.h>
+#include <aws/bedrock-agent-runtime/model/ListSessionsPaginationTraits.h>
 #include <aws/bedrock-agent-runtime/model/ListSessionsRequest.h>
 #include <aws/bedrock-agent-runtime/model/ListSessionsResult.h>
 #include <aws/bedrock-agent-runtime/model/ListTagsForResourceRequest.h>
@@ -354,6 +364,7 @@
 #include <aws/bedrock-agent-runtime/model/RequireConfirmation.h>
 #include <aws/bedrock-agent-runtime/model/RerankDocument.h>
 #include <aws/bedrock-agent-runtime/model/RerankDocumentType.h>
+#include <aws/bedrock-agent-runtime/model/RerankPaginationTraits.h>
 #include <aws/bedrock-agent-runtime/model/RerankQuery.h>
 #include <aws/bedrock-agent-runtime/model/RerankQueryContentType.h>
 #include <aws/bedrock-agent-runtime/model/RerankRequest.h>
@@ -400,6 +411,7 @@
 #include <aws/bedrock-agent-runtime/model/RetrieveAndGenerateStreamRequest.h>
 #include <aws/bedrock-agent-runtime/model/RetrieveAndGenerateStreamResponseOutput.h>
 #include <aws/bedrock-agent-runtime/model/RetrieveAndGenerateType.h>
+#include <aws/bedrock-agent-runtime/model/RetrievePaginationTraits.h>
 #include <aws/bedrock-agent-runtime/model/RetrieveRequest.h>
 #include <aws/bedrock-agent-runtime/model/RetrieveResult.h>
 #include <aws/bedrock-agent-runtime/model/RetrievedReference.h>
diff --git a/generated/tests/bedrock-agentcore-control-gen-tests/BedrockAgentCoreControlIncludeTests.cpp b/generated/tests/bedrock-agentcore-control-gen-tests/BedrockAgentCoreControlIncludeTests.cpp
index 3d6aff9e4342..47b43d59b613 100644
--- a/generated/tests/bedrock-agentcore-control-gen-tests/BedrockAgentCoreControlIncludeTests.cpp
+++ b/generated/tests/bedrock-agentcore-control-gen-tests/BedrockAgentCoreControlIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/bedrock-agentcore-control/BedrockAgentCoreControlClient.h>
+#include <aws/bedrock-agentcore-control/BedrockAgentCoreControlClientPagination.h>
 #include <aws/bedrock-agentcore-control/BedrockAgentCoreControlEndpointProvider.h>
 #include <aws/bedrock-agentcore-control/BedrockAgentCoreControlErrorMarshaller.h>
 #include <aws/bedrock-agentcore-control/BedrockAgentCoreControlErrors.h>
+#include <aws/bedrock-agentcore-control/BedrockAgentCoreControlPaginationBase.h>
 #include <aws/bedrock-agentcore-control/BedrockAgentCoreControlRequest.h>
 #include <aws/bedrock-agentcore-control/BedrockAgentCoreControlServiceClientModel.h>
+#include <aws/bedrock-agentcore-control/BedrockAgentCoreControlWaiter.h>
 #include <aws/bedrock-agentcore-control/BedrockAgentCoreControl_EXPORTS.h>
+#include <aws/bedrock-agentcore-control/internal/BedrockAgentCoreControlEndpointRules.h>
 #include <aws/bedrock-agentcore-control/model/A2aDescriptor.h>
 #include <aws/bedrock-agentcore-control/model/Action.h>
 #include <aws/bedrock-agentcore-control/model/ActorTokenContentType.h>
@@ -455,82 +459,120 @@
 #include <aws/bedrock-agentcore-control/model/LimitEntry.h>
 #include <aws/bedrock-agentcore-control/model/LinkedinOauth2ProviderConfigInput.h>
 #include <aws/bedrock-agentcore-control/model/LinkedinOauth2ProviderConfigOutput.h>
+#include <aws/bedrock-agentcore-control/model/ListAgentRuntimeEndpointsPaginationTraits.h>
 #include <aws/bedrock-agentcore-control/model/ListAgentRuntimeEndpointsRequest.h>
 #include <aws/bedrock-agentcore-control/model/ListAgentRuntimeEndpointsResult.h>
+#include <aws/bedrock-agentcore-control/model/ListAgentRuntimeVersionsByCapacityProviderPaginationTraits.h>
 #include <aws/bedrock-agentcore-control/model/ListAgentRuntimeVersionsByCapacityProviderRequest.h>
 #include <aws/bedrock-agentcore-control/model/ListAgentRuntimeVersionsByCapacityProviderResult.h>
+#include <aws/bedrock-agentcore-control/model/ListAgentRuntimeVersionsPaginationTraits.h>
 #include <aws/bedrock-agentcore-control/model/ListAgentRuntimeVersionsRequest.h>
 #include <aws/bedrock-agentcore-control/model/ListAgentRuntimeVersionsResult.h>
+#include <aws/bedrock-agentcore-control/model/ListAgentRuntimesPaginationTraits.h>
 #include <aws/bedrock-agentcore-control/model/ListAgentRuntimesRequest.h>
 #include <aws/bedrock-agentcore-control/model/ListAgentRuntimesResult.h>
+#include <aws/bedrock-agentcore-control/model/ListApiKeyCredentialProvidersPaginationTraits.h>
 #include <aws/bedrock-agentcore-control/model/ListApiKeyCredentialProvidersRequest.h>
 #include <aws/bedrock-agentcore-control/model/ListApiKeyCredentialProvidersResult.h>
+#include <aws/bedrock-agentcore-control/model/ListBrowserProfilesPaginationTraits.h>
 #include <aws/bedrock-agentcore-control/model/ListBrowserProfilesRequest.h>
 #include <aws/bedrock-agentcore-control/model/ListBrowserProfilesResult.h>
+#include <aws/bedrock-agentcore-control/model/ListBrowsersPaginationTraits.h>
 #include <aws/bedrock-agentcore-control/model/ListBrowsersRequest.h>
 #include <aws/bedrock-agentcore-control/model/ListBrowsersResult.h>
+#include <aws/bedrock-agentcore-control/model/ListCapacityProvidersPaginationTraits.h>
 #include <aws/bedrock-agentcore-control/model/ListCapacityProvidersRequest.h>
 #include <aws/bedrock-agentcore-control/model/ListCapacityProvidersResult.h>
+#include <aws/bedrock-agentcore-control/model/ListCodeInterpretersPaginationTraits.h>
 #include <aws/bedrock-agentcore-control/model/ListCodeInterpretersRequest.h>
 #include <aws/bedrock-agentcore-control/model/ListCodeInterpretersResult.h>
+#include <aws/bedrock-agentcore-control/model/ListConfigurationBundleVersionsPaginationTraits.h>
 #include <aws/bedrock-agentcore-control/model/ListConfigurationBundleVersionsRequest.h>
 #include <aws/bedrock-agentcore-control/model/ListConfigurationBundleVersionsResult.h>
+#include <aws/bedrock-agentcore-control/model/ListConfigurationBundlesPaginationTraits.h>
 #include <aws/bedrock-agentcore-control/model/ListConfigurationBundlesRequest.h>
 #include <aws/bedrock-agentcore-control/model/ListConfigurationBundlesResult.h>
+#include <aws/bedrock-agentcore-control/model/ListDatasetExamplesPaginationTraits.h>
 #include <aws/bedrock-agentcore-control/model/ListDatasetExamplesRequest.h>
 #include <aws/bedrock-agentcore-control/model/ListDatasetExamplesResult.h>
+#include <aws/bedrock-agentcore-control/model/ListDatasetVersionsPaginationTraits.h>
 #include <aws/bedrock-agentcore-control/model/ListDatasetVersionsRequest.h>
 #include <aws/bedrock-agentcore-control/model/ListDatasetVersionsResult.h>
+#include <aws/bedrock-agentcore-control/model/ListDatasetsPaginationTraits.h>
 #include <aws/bedrock-agentcore-control/model/ListDatasetsRequest.h>
 #include <aws/bedrock-agentcore-control/model/ListDatasetsResult.h>
+#include <aws/bedrock-agentcore-control/model/ListEvaluatorsPaginationTraits.h>
 #include <aws/bedrock-agentcore-control/model/ListEvaluatorsRequest.h>
 #include <aws/bedrock-agentcore-control/model/ListEvaluatorsResult.h>
+#include <aws/bedrock-agentcore-control/model/ListGatewayRateLimitsPaginationTraits.h>
 #include <aws/bedrock-agentcore-control/model/ListGatewayRateLimitsRequest.h>
 #include <aws/bedrock-agentcore-control/model/ListGatewayRateLimitsResult.h>
+#include <aws/bedrock-agentcore-control/model/ListGatewayRulesPaginationTraits.h>
 #include <aws/bedrock-agentcore-control/model/ListGatewayRulesRequest.h>
 #include <aws/bedrock-agentcore-control/model/ListGatewayRulesResult.h>
+#include <aws/bedrock-agentcore-control/model/ListGatewayTargetsPaginationTraits.h>
 #include <aws/bedrock-agentcore-control/model/ListGatewayTargetsRequest.h>
 #include <aws/bedrock-agentcore-control/model/ListGatewayTargetsResult.h>
+#include <aws/bedrock-agentcore-control/model/ListGatewaysPaginationTraits.h>
 #include <aws/bedrock-agentcore-control/model/ListGatewaysRequest.h>
 #include <aws/bedrock-agentcore-control/model/ListGatewaysResult.h>
+#include <aws/bedrock-agentcore-control/model/ListHarnessEndpointsPaginationTraits.h>
 #include <aws/bedrock-agentcore-control/model/ListHarnessEndpointsRequest.h>
 #include <aws/bedrock-agentcore-control/model/ListHarnessEndpointsResult.h>
+#include <aws/bedrock-agentcore-control/model/ListHarnessVersionsPaginationTraits.h>
 #include <aws/bedrock-agentcore-control/model/ListHarnessVersionsRequest.h>
 #include <aws/bedrock-agentcore-control/model/ListHarnessVersionsResult.h>
+#include <aws/bedrock-agentcore-control/model/ListHarnessesPaginationTraits.h>
 #include <aws/bedrock-agentcore-control/model/ListHarnessesRequest.h>
 #include <aws/bedrock-agentcore-control/model/ListHarnessesResult.h>
+#include <aws/bedrock-agentcore-control/model/ListMemoriesPaginationTraits.h>
 #include <aws/bedrock-agentcore-control/model/ListMemoriesRequest.h>
 #include <aws/bedrock-agentcore-control/model/ListMemoriesResult.h>
+#include <aws/bedrock-agentcore-control/model/ListOauth2CredentialProvidersPaginationTraits.h>
 #include <aws/bedrock-agentcore-control/model/ListOauth2CredentialProvidersRequest.h>
 #include <aws/bedrock-agentcore-control/model/ListOauth2CredentialProvidersResult.h>
+#include <aws/bedrock-agentcore-control/model/ListOnlineEvaluationConfigsPaginationTraits.h>
 #include <aws/bedrock-agentcore-control/model/ListOnlineEvaluationConfigsRequest.h>
 #include <aws/bedrock-agentcore-control/model/ListOnlineEvaluationConfigsResult.h>
+#include <aws/bedrock-agentcore-control/model/ListPaymentConnectorsPaginationTraits.h>
 #include <aws/bedrock-agentcore-control/model/ListPaymentConnectorsRequest.h>
 #include <aws/bedrock-agentcore-control/model/ListPaymentConnectorsResult.h>
+#include <aws/bedrock-agentcore-control/model/ListPaymentCredentialProvidersPaginationTraits.h>
 #include <aws/bedrock-agentcore-control/model/ListPaymentCredentialProvidersRequest.h>
 #include <aws/bedrock-agentcore-control/model/ListPaymentCredentialProvidersResult.h>
+#include <aws/bedrock-agentcore-control/model/ListPaymentManagersPaginationTraits.h>
 #include <aws/bedrock-agentcore-control/model/ListPaymentManagersRequest.h>
 #include <aws/bedrock-agentcore-control/model/ListPaymentManagersResult.h>
+#include <aws/bedrock-agentcore-control/model/ListPoliciesPaginationTraits.h>
 #include <aws/bedrock-agentcore-control/model/ListPoliciesRequest.h>
 #include <aws/bedrock-agentcore-control/model/ListPoliciesResult.h>
+#include <aws/bedrock-agentcore-control/model/ListPolicyEngineSummariesPaginationTraits.h>
 #include <aws/bedrock-agentcore-control/model/ListPolicyEngineSummariesRequest.h>
 #include <aws/bedrock-agentcore-control/model/ListPolicyEngineSummariesResult.h>
+#include <aws/bedrock-agentcore-control/model/ListPolicyEnginesPaginationTraits.h>
 #include <aws/bedrock-agentcore-control/model/ListPolicyEnginesRequest.h>
 #include <aws/bedrock-agentcore-control/model/ListPolicyEnginesResult.h>
+#include <aws/bedrock-agentcore-control/model/ListPolicyGenerationAssetsPaginationTraits.h>
 #include <aws/bedrock-agentcore-control/model/ListPolicyGenerationAssetsRequest.h>
 #include <aws/bedrock-agentcore-control/model/ListPolicyGenerationAssetsResult.h>
+#include <aws/bedrock-agentcore-control/model/ListPolicyGenerationSummariesPaginationTraits.h>
 #include <aws/bedrock-agentcore-control/model/ListPolicyGenerationSummariesRequest.h>
 #include <aws/bedrock-agentcore-control/model/ListPolicyGenerationSummariesResult.h>
+#include <aws/bedrock-agentcore-control/model/ListPolicyGenerationsPaginationTraits.h>
 #include <aws/bedrock-agentcore-control/model/ListPolicyGenerationsRequest.h>
 #include <aws/bedrock-agentcore-control/model/ListPolicyGenerationsResult.h>
+#include <aws/bedrock-agentcore-control/model/ListPolicySummariesPaginationTraits.h>
 #include <aws/bedrock-agentcore-control/model/ListPolicySummariesRequest.h>
 #include <aws/bedrock-agentcore-control/model/ListPolicySummariesResult.h>
+#include <aws/bedrock-agentcore-control/model/ListRegistriesPaginationTraits.h>
 #include <aws/bedrock-agentcore-control/model/ListRegistriesRequest.h>
 #include <aws/bedrock-agentcore-control/model/ListRegistriesResult.h>
+#include <aws/bedrock-agentcore-control/model/ListRegistryRecordsPaginationTraits.h>
 #include <aws/bedrock-agentcore-control/model/ListRegistryRecordsRequest.h>
 #include <aws/bedrock-agentcore-control/model/ListRegistryRecordsResult.h>
 #include <aws/bedrock-agentcore-control/model/ListTagsForResourceRequest.h>
 #include <aws/bedrock-agentcore-control/model/ListTagsForResourceResult.h>
+#include <aws/bedrock-agentcore-control/model/ListWorkloadIdentitiesPaginationTraits.h>
 #include <aws/bedrock-agentcore-control/model/ListWorkloadIdentitiesRequest.h>
 #include <aws/bedrock-agentcore-control/model/ListWorkloadIdentitiesResult.h>
 #include <aws/bedrock-agentcore-control/model/ListingMode.h>
diff --git a/generated/tests/bedrock-agentcore-gen-tests/BedrockAgentCoreIncludeTests.cpp b/generated/tests/bedrock-agentcore-gen-tests/BedrockAgentCoreIncludeTests.cpp
index baaa22dcf17c..7e971be09781 100644
--- a/generated/tests/bedrock-agentcore-gen-tests/BedrockAgentCoreIncludeTests.cpp
+++ b/generated/tests/bedrock-agentcore-gen-tests/BedrockAgentCoreIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/bedrock-agentcore/BedrockAgentCoreClient.h>
+#include <aws/bedrock-agentcore/BedrockAgentCoreClientPagination.h>
 #include <aws/bedrock-agentcore/BedrockAgentCoreEndpointProvider.h>
 #include <aws/bedrock-agentcore/BedrockAgentCoreErrorMarshaller.h>
 #include <aws/bedrock-agentcore/BedrockAgentCoreErrors.h>
+#include <aws/bedrock-agentcore/BedrockAgentCorePaginationBase.h>
 #include <aws/bedrock-agentcore/BedrockAgentCoreRequest.h>
 #include <aws/bedrock-agentcore/BedrockAgentCoreServiceClientModel.h>
+#include <aws/bedrock-agentcore/BedrockAgentCoreWaiter.h>
 #include <aws/bedrock-agentcore/BedrockAgentCore_EXPORTS.h>
+#include <aws/bedrock-agentcore/internal/BedrockAgentCoreEndpointRules.h>
 #include <aws/bedrock-agentcore/model/A2aDescriptor.h>
 #include <aws/bedrock-agentcore/model/ABTestEvaluationConfig.h>
 #include <aws/bedrock-agentcore/model/ABTestExecutionStatus.h>
@@ -272,28 +276,38 @@
 #include <aws/bedrock-agentcore/model/LinkedAccountEmail.h>
 #include <aws/bedrock-agentcore/model/LinkedAccountOAuth2.h>
 #include <aws/bedrock-agentcore/model/LinkedAccountSms.h>
+#include <aws/bedrock-agentcore/model/ListABTestsPaginationTraits.h>
 #include <aws/bedrock-agentcore/model/ListABTestsRequest.h>
 #include <aws/bedrock-agentcore/model/ListABTestsResult.h>
+#include <aws/bedrock-agentcore/model/ListActorsPaginationTraits.h>
 #include <aws/bedrock-agentcore/model/ListActorsRequest.h>
 #include <aws/bedrock-agentcore/model/ListActorsResult.h>
+#include <aws/bedrock-agentcore/model/ListBatchEvaluationsPaginationTraits.h>
 #include <aws/bedrock-agentcore/model/ListBatchEvaluationsRequest.h>
 #include <aws/bedrock-agentcore/model/ListBatchEvaluationsResult.h>
 #include <aws/bedrock-agentcore/model/ListBrowserSessionsRequest.h>
 #include <aws/bedrock-agentcore/model/ListBrowserSessionsResult.h>
 #include <aws/bedrock-agentcore/model/ListCodeInterpreterSessionsRequest.h>
 #include <aws/bedrock-agentcore/model/ListCodeInterpreterSessionsResult.h>
+#include <aws/bedrock-agentcore/model/ListEventsPaginationTraits.h>
 #include <aws/bedrock-agentcore/model/ListEventsRequest.h>
 #include <aws/bedrock-agentcore/model/ListEventsResult.h>
+#include <aws/bedrock-agentcore/model/ListMemoryExtractionJobsPaginationTraits.h>
 #include <aws/bedrock-agentcore/model/ListMemoryExtractionJobsRequest.h>
 #include <aws/bedrock-agentcore/model/ListMemoryExtractionJobsResult.h>
+#include <aws/bedrock-agentcore/model/ListMemoryRecordsPaginationTraits.h>
 #include <aws/bedrock-agentcore/model/ListMemoryRecordsRequest.h>
 #include <aws/bedrock-agentcore/model/ListMemoryRecordsResult.h>
+#include <aws/bedrock-agentcore/model/ListPaymentInstrumentsPaginationTraits.h>
 #include <aws/bedrock-agentcore/model/ListPaymentInstrumentsRequest.h>
 #include <aws/bedrock-agentcore/model/ListPaymentInstrumentsResult.h>
+#include <aws/bedrock-agentcore/model/ListPaymentSessionsPaginationTraits.h>
 #include <aws/bedrock-agentcore/model/ListPaymentSessionsRequest.h>
 #include <aws/bedrock-agentcore/model/ListPaymentSessionsResult.h>
+#include <aws/bedrock-agentcore/model/ListRecommendationsPaginationTraits.h>
 #include <aws/bedrock-agentcore/model/ListRecommendationsRequest.h>
 #include <aws/bedrock-agentcore/model/ListRecommendationsResult.h>
+#include <aws/bedrock-agentcore/model/ListSessionsPaginationTraits.h>
 #include <aws/bedrock-agentcore/model/ListSessionsRequest.h>
 #include <aws/bedrock-agentcore/model/ListSessionsResult.h>
 #include <aws/bedrock-agentcore/model/LiveViewStream.h>
@@ -368,6 +382,7 @@
 #include <aws/bedrock-agentcore/model/ResourceContentType.h>
 #include <aws/bedrock-agentcore/model/ResourceLocation.h>
 #include <aws/bedrock-agentcore/model/ResponseChunk.h>
+#include <aws/bedrock-agentcore/model/RetrieveMemoryRecordsPaginationTraits.h>
 #include <aws/bedrock-agentcore/model/RetrieveMemoryRecordsRequest.h>
 #include <aws/bedrock-agentcore/model/RetrieveMemoryRecordsResult.h>
 #include <aws/bedrock-agentcore/model/RightExpression.h>
diff --git a/generated/tests/bedrock-data-automation-gen-tests/BedrockDataAutomationIncludeTests.cpp b/generated/tests/bedrock-data-automation-gen-tests/BedrockDataAutomationIncludeTests.cpp
index 650c49f7f0c1..3bef2e2c477a 100644
--- a/generated/tests/bedrock-data-automation-gen-tests/BedrockDataAutomationIncludeTests.cpp
+++ b/generated/tests/bedrock-data-automation-gen-tests/BedrockDataAutomationIncludeTests.cpp
@@ -9,12 +9,16 @@
 #include <aws/bedrock-data-automation/BedrockDataAutomationAwsBearerTokenIdentityResolver.h>
 #include <aws/bedrock-data-automation/BedrockDataAutomationClient.h>
 #include <aws/bedrock-data-automation/BedrockDataAutomationClientConfiguration.h>
+#include <aws/bedrock-data-automation/BedrockDataAutomationClientPagination.h>
 #include <aws/bedrock-data-automation/BedrockDataAutomationEndpointProvider.h>
 #include <aws/bedrock-data-automation/BedrockDataAutomationErrorMarshaller.h>
 #include <aws/bedrock-data-automation/BedrockDataAutomationErrors.h>
+#include <aws/bedrock-data-automation/BedrockDataAutomationPaginationBase.h>
 #include <aws/bedrock-data-automation/BedrockDataAutomationRequest.h>
 #include <aws/bedrock-data-automation/BedrockDataAutomationServiceClientModel.h>
+#include <aws/bedrock-data-automation/BedrockDataAutomationWaiter.h>
 #include <aws/bedrock-data-automation/BedrockDataAutomation_EXPORTS.h>
+#include <aws/bedrock-data-automation/internal/BedrockDataAutomationEndpointRules.h>
 #include <aws/bedrock-data-automation/model/AudioExtractionCategory.h>
 #include <aws/bedrock-data-automation/model/AudioExtractionCategoryType.h>
 #include <aws/bedrock-data-automation/model/AudioExtractionCategoryTypeConfiguration.h>
@@ -117,14 +121,19 @@
 #include <aws/bedrock-data-automation/model/Language.h>
 #include <aws/bedrock-data-automation/model/LibraryIngestionJobOperationType.h>
 #include <aws/bedrock-data-automation/model/LibraryIngestionJobStatus.h>
+#include <aws/bedrock-data-automation/model/ListBlueprintsPaginationTraits.h>
 #include <aws/bedrock-data-automation/model/ListBlueprintsRequest.h>
 #include <aws/bedrock-data-automation/model/ListBlueprintsResult.h>
+#include <aws/bedrock-data-automation/model/ListDataAutomationLibrariesPaginationTraits.h>
 #include <aws/bedrock-data-automation/model/ListDataAutomationLibrariesRequest.h>
 #include <aws/bedrock-data-automation/model/ListDataAutomationLibrariesResult.h>
+#include <aws/bedrock-data-automation/model/ListDataAutomationLibraryEntitiesPaginationTraits.h>
 #include <aws/bedrock-data-automation/model/ListDataAutomationLibraryEntitiesRequest.h>
 #include <aws/bedrock-data-automation/model/ListDataAutomationLibraryEntitiesResult.h>
+#include <aws/bedrock-data-automation/model/ListDataAutomationLibraryIngestionJobsPaginationTraits.h>
 #include <aws/bedrock-data-automation/model/ListDataAutomationLibraryIngestionJobsRequest.h>
 #include <aws/bedrock-data-automation/model/ListDataAutomationLibraryIngestionJobsResult.h>
+#include <aws/bedrock-data-automation/model/ListDataAutomationProjectsPaginationTraits.h>
 #include <aws/bedrock-data-automation/model/ListDataAutomationProjectsRequest.h>
 #include <aws/bedrock-data-automation/model/ListDataAutomationProjectsResult.h>
 #include <aws/bedrock-data-automation/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/bedrock-data-automation-runtime-gen-tests/BedrockDataAutomationRuntimeIncludeTests.cpp b/generated/tests/bedrock-data-automation-runtime-gen-tests/BedrockDataAutomationRuntimeIncludeTests.cpp
index 567e13d14ea9..b665b1281497 100644
--- a/generated/tests/bedrock-data-automation-runtime-gen-tests/BedrockDataAutomationRuntimeIncludeTests.cpp
+++ b/generated/tests/bedrock-data-automation-runtime-gen-tests/BedrockDataAutomationRuntimeIncludeTests.cpp
@@ -12,9 +12,12 @@
 #include <aws/bedrock-data-automation-runtime/BedrockDataAutomationRuntimeEndpointProvider.h>
 #include <aws/bedrock-data-automation-runtime/BedrockDataAutomationRuntimeErrorMarshaller.h>
 #include <aws/bedrock-data-automation-runtime/BedrockDataAutomationRuntimeErrors.h>
+#include <aws/bedrock-data-automation-runtime/BedrockDataAutomationRuntimePaginationBase.h>
 #include <aws/bedrock-data-automation-runtime/BedrockDataAutomationRuntimeRequest.h>
 #include <aws/bedrock-data-automation-runtime/BedrockDataAutomationRuntimeServiceClientModel.h>
+#include <aws/bedrock-data-automation-runtime/BedrockDataAutomationRuntimeWaiter.h>
 #include <aws/bedrock-data-automation-runtime/BedrockDataAutomationRuntime_EXPORTS.h>
+#include <aws/bedrock-data-automation-runtime/internal/BedrockDataAutomationRuntimeEndpointRules.h>
 #include <aws/bedrock-data-automation-runtime/model/AssetProcessingConfiguration.h>
 #include <aws/bedrock-data-automation-runtime/model/AutomationJobStatus.h>
 #include <aws/bedrock-data-automation-runtime/model/Blueprint.h>
diff --git a/generated/tests/bedrock-gen-tests/BedrockIncludeTests.cpp b/generated/tests/bedrock-gen-tests/BedrockIncludeTests.cpp
index 16321940701e..636114e10003 100644
--- a/generated/tests/bedrock-gen-tests/BedrockIncludeTests.cpp
+++ b/generated/tests/bedrock-gen-tests/BedrockIncludeTests.cpp
@@ -9,12 +9,16 @@
 #include <aws/bedrock/BedrockAwsBearerTokenIdentityResolver.h>
 #include <aws/bedrock/BedrockClient.h>
 #include <aws/bedrock/BedrockClientConfiguration.h>
+#include <aws/bedrock/BedrockClientPagination.h>
 #include <aws/bedrock/BedrockEndpointProvider.h>
 #include <aws/bedrock/BedrockErrorMarshaller.h>
 #include <aws/bedrock/BedrockErrors.h>
+#include <aws/bedrock/BedrockPaginationBase.h>
 #include <aws/bedrock/BedrockRequest.h>
 #include <aws/bedrock/BedrockServiceClientModel.h>
+#include <aws/bedrock/BedrockWaiter.h>
 #include <aws/bedrock/Bedrock_EXPORTS.h>
+#include <aws/bedrock/internal/BedrockEndpointRules.h>
 #include <aws/bedrock/model/AccountEnforcedGuardrailInferenceInputConfiguration.h>
 #include <aws/bedrock/model/AccountEnforcedGuardrailOutputConfiguration.h>
 #include <aws/bedrock/model/AdvancedPromptOptimizationInputConfig.h>
@@ -386,46 +390,65 @@
 #include <aws/bedrock/model/KnowledgeBaseVectorSearchConfiguration.h>
 #include <aws/bedrock/model/LambdaGraderConfig.h>
 #include <aws/bedrock/model/LegalTerm.h>
+#include <aws/bedrock/model/ListAdvancedPromptOptimizationJobsPaginationTraits.h>
 #include <aws/bedrock/model/ListAdvancedPromptOptimizationJobsRequest.h>
 #include <aws/bedrock/model/ListAdvancedPromptOptimizationJobsResult.h>
+#include <aws/bedrock/model/ListAutomatedReasoningPoliciesPaginationTraits.h>
 #include <aws/bedrock/model/ListAutomatedReasoningPoliciesRequest.h>
 #include <aws/bedrock/model/ListAutomatedReasoningPoliciesResult.h>
+#include <aws/bedrock/model/ListAutomatedReasoningPolicyBuildWorkflowsPaginationTraits.h>
 #include <aws/bedrock/model/ListAutomatedReasoningPolicyBuildWorkflowsRequest.h>
 #include <aws/bedrock/model/ListAutomatedReasoningPolicyBuildWorkflowsResult.h>
+#include <aws/bedrock/model/ListAutomatedReasoningPolicyTestCasesPaginationTraits.h>
 #include <aws/bedrock/model/ListAutomatedReasoningPolicyTestCasesRequest.h>
 #include <aws/bedrock/model/ListAutomatedReasoningPolicyTestCasesResult.h>
+#include <aws/bedrock/model/ListAutomatedReasoningPolicyTestResultsPaginationTraits.h>
 #include <aws/bedrock/model/ListAutomatedReasoningPolicyTestResultsRequest.h>
 #include <aws/bedrock/model/ListAutomatedReasoningPolicyTestResultsResult.h>
+#include <aws/bedrock/model/ListCustomModelDeploymentsPaginationTraits.h>
 #include <aws/bedrock/model/ListCustomModelDeploymentsRequest.h>
 #include <aws/bedrock/model/ListCustomModelDeploymentsResult.h>
+#include <aws/bedrock/model/ListCustomModelsPaginationTraits.h>
 #include <aws/bedrock/model/ListCustomModelsRequest.h>
 #include <aws/bedrock/model/ListCustomModelsResult.h>
+#include <aws/bedrock/model/ListEnforcedGuardrailsConfigurationPaginationTraits.h>
 #include <aws/bedrock/model/ListEnforcedGuardrailsConfigurationRequest.h>
 #include <aws/bedrock/model/ListEnforcedGuardrailsConfigurationResult.h>
+#include <aws/bedrock/model/ListEvaluationJobsPaginationTraits.h>
 #include <aws/bedrock/model/ListEvaluationJobsRequest.h>
 #include <aws/bedrock/model/ListEvaluationJobsResult.h>
 #include <aws/bedrock/model/ListFoundationModelAgreementOffersRequest.h>
 #include <aws/bedrock/model/ListFoundationModelAgreementOffersResult.h>
 #include <aws/bedrock/model/ListFoundationModelsRequest.h>
 #include <aws/bedrock/model/ListFoundationModelsResult.h>
+#include <aws/bedrock/model/ListGuardrailsPaginationTraits.h>
 #include <aws/bedrock/model/ListGuardrailsRequest.h>
 #include <aws/bedrock/model/ListGuardrailsResult.h>
+#include <aws/bedrock/model/ListImportedModelsPaginationTraits.h>
 #include <aws/bedrock/model/ListImportedModelsRequest.h>
 #include <aws/bedrock/model/ListImportedModelsResult.h>
+#include <aws/bedrock/model/ListInferenceProfilesPaginationTraits.h>
 #include <aws/bedrock/model/ListInferenceProfilesRequest.h>
 #include <aws/bedrock/model/ListInferenceProfilesResult.h>
+#include <aws/bedrock/model/ListMarketplaceModelEndpointsPaginationTraits.h>
 #include <aws/bedrock/model/ListMarketplaceModelEndpointsRequest.h>
 #include <aws/bedrock/model/ListMarketplaceModelEndpointsResult.h>
+#include <aws/bedrock/model/ListModelCopyJobsPaginationTraits.h>
 #include <aws/bedrock/model/ListModelCopyJobsRequest.h>
 #include <aws/bedrock/model/ListModelCopyJobsResult.h>
+#include <aws/bedrock/model/ListModelCustomizationJobsPaginationTraits.h>
 #include <aws/bedrock/model/ListModelCustomizationJobsRequest.h>
 #include <aws/bedrock/model/ListModelCustomizationJobsResult.h>
+#include <aws/bedrock/model/ListModelImportJobsPaginationTraits.h>
 #include <aws/bedrock/model/ListModelImportJobsRequest.h>
 #include <aws/bedrock/model/ListModelImportJobsResult.h>
+#include <aws/bedrock/model/ListModelInvocationJobsPaginationTraits.h>
 #include <aws/bedrock/model/ListModelInvocationJobsRequest.h>
 #include <aws/bedrock/model/ListModelInvocationJobsResult.h>
+#include <aws/bedrock/model/ListPromptRoutersPaginationTraits.h>
 #include <aws/bedrock/model/ListPromptRoutersRequest.h>
 #include <aws/bedrock/model/ListPromptRoutersResult.h>
+#include <aws/bedrock/model/ListProvisionedModelThroughputsPaginationTraits.h>
 #include <aws/bedrock/model/ListProvisionedModelThroughputsRequest.h>
 #include <aws/bedrock/model/ListProvisionedModelThroughputsResult.h>
 #include <aws/bedrock/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/bedrock-runtime-gen-tests/BedrockRuntimeIncludeTests.cpp b/generated/tests/bedrock-runtime-gen-tests/BedrockRuntimeIncludeTests.cpp
index 7ee834e47ab1..395b2103660d 100644
--- a/generated/tests/bedrock-runtime-gen-tests/BedrockRuntimeIncludeTests.cpp
+++ b/generated/tests/bedrock-runtime-gen-tests/BedrockRuntimeIncludeTests.cpp
@@ -9,12 +9,16 @@
 #include <aws/bedrock-runtime/BedrockRuntimeAwsBearerTokenIdentityResolver.h>
 #include <aws/bedrock-runtime/BedrockRuntimeClient.h>
 #include <aws/bedrock-runtime/BedrockRuntimeClientConfiguration.h>
+#include <aws/bedrock-runtime/BedrockRuntimeClientPagination.h>
 #include <aws/bedrock-runtime/BedrockRuntimeEndpointProvider.h>
 #include <aws/bedrock-runtime/BedrockRuntimeErrorMarshaller.h>
 #include <aws/bedrock-runtime/BedrockRuntimeErrors.h>
+#include <aws/bedrock-runtime/BedrockRuntimePaginationBase.h>
 #include <aws/bedrock-runtime/BedrockRuntimeRequest.h>
 #include <aws/bedrock-runtime/BedrockRuntimeServiceClientModel.h>
+#include <aws/bedrock-runtime/BedrockRuntimeWaiter.h>
 #include <aws/bedrock-runtime/BedrockRuntime_EXPORTS.h>
+#include <aws/bedrock-runtime/internal/BedrockRuntimeEndpointRules.h>
 #include <aws/bedrock-runtime/model/AnyToolChoice.h>
 #include <aws/bedrock-runtime/model/AppliedGuardrailDetails.h>
 #include <aws/bedrock-runtime/model/ApplyGuardrailRequest.h>
@@ -188,6 +192,7 @@
 #include <aws/bedrock-runtime/model/InvokeModelWithResponseStreamInitialResponse.h>
 #include <aws/bedrock-runtime/model/InvokeModelWithResponseStreamRequest.h>
 #include <aws/bedrock-runtime/model/JsonSchemaDefinition.h>
+#include <aws/bedrock-runtime/model/ListAsyncInvokesPaginationTraits.h>
 #include <aws/bedrock-runtime/model/ListAsyncInvokesRequest.h>
 #include <aws/bedrock-runtime/model/ListAsyncInvokesResult.h>
 #include <aws/bedrock-runtime/model/Message.h>
diff --git a/generated/tests/billing-gen-tests/BillingIncludeTests.cpp b/generated/tests/billing-gen-tests/BillingIncludeTests.cpp
index ba3c49946054..5f4ea9c3dc58 100644
--- a/generated/tests/billing-gen-tests/BillingIncludeTests.cpp
+++ b/generated/tests/billing-gen-tests/BillingIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/billing/BillingClient.h>
+#include <aws/billing/BillingClientPagination.h>
 #include <aws/billing/BillingEndpointProvider.h>
 #include <aws/billing/BillingErrorMarshaller.h>
 #include <aws/billing/BillingErrors.h>
+#include <aws/billing/BillingPaginationBase.h>
 #include <aws/billing/BillingRequest.h>
 #include <aws/billing/BillingServiceClientModel.h>
+#include <aws/billing/BillingWaiter.h>
 #include <aws/billing/Billing_EXPORTS.h>
+#include <aws/billing/internal/BillingEndpointRules.h>
 #include <aws/billing/model/ActiveTimeRange.h>
 #include <aws/billing/model/AdditionalCharge.h>
 #include <aws/billing/model/Amount.h>
@@ -53,6 +57,7 @@
 #include <aws/billing/model/GetBillingPreferencesResult.h>
 #include <aws/billing/model/GetBillingViewRequest.h>
 #include <aws/billing/model/GetBillingViewResult.h>
+#include <aws/billing/model/GetCreditAllocationHistoryPaginationTraits.h>
 #include <aws/billing/model/GetCreditAllocationHistoryRequest.h>
 #include <aws/billing/model/GetCreditAllocationHistoryResult.h>
 #include <aws/billing/model/GetCreditsRequest.h>
@@ -64,10 +69,13 @@
 #include <aws/billing/model/GetResourcePolicyRequest.h>
 #include <aws/billing/model/GetResourcePolicyResult.h>
 #include <aws/billing/model/LinkedAccountCharge.h>
+#include <aws/billing/model/ListBillingViewsPaginationTraits.h>
 #include <aws/billing/model/ListBillingViewsRequest.h>
 #include <aws/billing/model/ListBillingViewsResult.h>
+#include <aws/billing/model/ListEnterpriseSupportLinkedAccountChargesPaginationTraits.h>
 #include <aws/billing/model/ListEnterpriseSupportLinkedAccountChargesRequest.h>
 #include <aws/billing/model/ListEnterpriseSupportLinkedAccountChargesResult.h>
+#include <aws/billing/model/ListSourceViewsForBillingViewPaginationTraits.h>
 #include <aws/billing/model/ListSourceViewsForBillingViewRequest.h>
 #include <aws/billing/model/ListSourceViewsForBillingViewResult.h>
 #include <aws/billing/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/billingconductor-gen-tests/BillingConductorIncludeTests.cpp b/generated/tests/billingconductor-gen-tests/BillingConductorIncludeTests.cpp
index e3fc8993d056..9b3064250ca9 100644
--- a/generated/tests/billingconductor-gen-tests/BillingConductorIncludeTests.cpp
+++ b/generated/tests/billingconductor-gen-tests/BillingConductorIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/billingconductor/BillingConductorClient.h>
+#include <aws/billingconductor/BillingConductorClientPagination.h>
 #include <aws/billingconductor/BillingConductorEndpointProvider.h>
 #include <aws/billingconductor/BillingConductorErrorMarshaller.h>
 #include <aws/billingconductor/BillingConductorErrors.h>
+#include <aws/billingconductor/BillingConductorPaginationBase.h>
 #include <aws/billingconductor/BillingConductorRequest.h>
 #include <aws/billingconductor/BillingConductorServiceClientModel.h>
+#include <aws/billingconductor/BillingConductorWaiter.h>
 #include <aws/billingconductor/BillingConductor_EXPORTS.h>
+#include <aws/billingconductor/internal/BillingConductorEndpointRules.h>
 #include <aws/billingconductor/model/AccountAssociationsListElement.h>
 #include <aws/billingconductor/model/AccountGrouping.h>
 #include <aws/billingconductor/model/AssociateAccountsRequest.h>
@@ -70,6 +74,7 @@
 #include <aws/billingconductor/model/DisassociatePricingRulesResult.h>
 #include <aws/billingconductor/model/DisassociateResourceResponseElement.h>
 #include <aws/billingconductor/model/FreeTierConfig.h>
+#include <aws/billingconductor/model/GetBillingGroupCostReportPaginationTraits.h>
 #include <aws/billingconductor/model/GetBillingGroupCostReportRequest.h>
 #include <aws/billingconductor/model/GetBillingGroupCostReportResult.h>
 #include <aws/billingconductor/model/GroupByAttributeName.h>
@@ -78,13 +83,16 @@
 #include <aws/billingconductor/model/LineItemFilterAttributeName.h>
 #include <aws/billingconductor/model/LineItemFilterValue.h>
 #include <aws/billingconductor/model/ListAccountAssociationsFilter.h>
+#include <aws/billingconductor/model/ListAccountAssociationsPaginationTraits.h>
 #include <aws/billingconductor/model/ListAccountAssociationsRequest.h>
 #include <aws/billingconductor/model/ListAccountAssociationsResult.h>
 #include <aws/billingconductor/model/ListBillingGroupAccountGrouping.h>
 #include <aws/billingconductor/model/ListBillingGroupCostReportsFilter.h>
+#include <aws/billingconductor/model/ListBillingGroupCostReportsPaginationTraits.h>
 #include <aws/billingconductor/model/ListBillingGroupCostReportsRequest.h>
 #include <aws/billingconductor/model/ListBillingGroupCostReportsResult.h>
 #include <aws/billingconductor/model/ListBillingGroupsFilter.h>
+#include <aws/billingconductor/model/ListBillingGroupsPaginationTraits.h>
 #include <aws/billingconductor/model/ListBillingGroupsRequest.h>
 #include <aws/billingconductor/model/ListBillingGroupsResult.h>
 #include <aws/billingconductor/model/ListCustomLineItemChargeDetails.h>
@@ -92,22 +100,29 @@
 #include <aws/billingconductor/model/ListCustomLineItemPercentageChargeDetails.h>
 #include <aws/billingconductor/model/ListCustomLineItemVersionsBillingPeriodRangeFilter.h>
 #include <aws/billingconductor/model/ListCustomLineItemVersionsFilter.h>
+#include <aws/billingconductor/model/ListCustomLineItemVersionsPaginationTraits.h>
 #include <aws/billingconductor/model/ListCustomLineItemVersionsRequest.h>
 #include <aws/billingconductor/model/ListCustomLineItemVersionsResult.h>
 #include <aws/billingconductor/model/ListCustomLineItemsFilter.h>
+#include <aws/billingconductor/model/ListCustomLineItemsPaginationTraits.h>
 #include <aws/billingconductor/model/ListCustomLineItemsRequest.h>
 #include <aws/billingconductor/model/ListCustomLineItemsResult.h>
+#include <aws/billingconductor/model/ListPricingPlansAssociatedWithPricingRulePaginationTraits.h>
 #include <aws/billingconductor/model/ListPricingPlansAssociatedWithPricingRuleRequest.h>
 #include <aws/billingconductor/model/ListPricingPlansAssociatedWithPricingRuleResult.h>
 #include <aws/billingconductor/model/ListPricingPlansFilter.h>
+#include <aws/billingconductor/model/ListPricingPlansPaginationTraits.h>
 #include <aws/billingconductor/model/ListPricingPlansRequest.h>
 #include <aws/billingconductor/model/ListPricingPlansResult.h>
+#include <aws/billingconductor/model/ListPricingRulesAssociatedToPricingPlanPaginationTraits.h>
 #include <aws/billingconductor/model/ListPricingRulesAssociatedToPricingPlanRequest.h>
 #include <aws/billingconductor/model/ListPricingRulesAssociatedToPricingPlanResult.h>
 #include <aws/billingconductor/model/ListPricingRulesFilter.h>
+#include <aws/billingconductor/model/ListPricingRulesPaginationTraits.h>
 #include <aws/billingconductor/model/ListPricingRulesRequest.h>
 #include <aws/billingconductor/model/ListPricingRulesResult.h>
 #include <aws/billingconductor/model/ListResourcesAssociatedToCustomLineItemFilter.h>
+#include <aws/billingconductor/model/ListResourcesAssociatedToCustomLineItemPaginationTraits.h>
 #include <aws/billingconductor/model/ListResourcesAssociatedToCustomLineItemRequest.h>
 #include <aws/billingconductor/model/ListResourcesAssociatedToCustomLineItemResponseElement.h>
 #include <aws/billingconductor/model/ListResourcesAssociatedToCustomLineItemResult.h>
diff --git a/generated/tests/braket-gen-tests/BraketIncludeTests.cpp b/generated/tests/braket-gen-tests/BraketIncludeTests.cpp
index b15061096da3..d25f1e5fb665 100644
--- a/generated/tests/braket-gen-tests/BraketIncludeTests.cpp
+++ b/generated/tests/braket-gen-tests/BraketIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/braket/BraketClient.h>
+#include <aws/braket/BraketClientPagination.h>
 #include <aws/braket/BraketEndpointProvider.h>
 #include <aws/braket/BraketErrorMarshaller.h>
 #include <aws/braket/BraketErrors.h>
+#include <aws/braket/BraketPaginationBase.h>
 #include <aws/braket/BraketRequest.h>
 #include <aws/braket/BraketServiceClientModel.h>
+#include <aws/braket/BraketWaiter.h>
 #include <aws/braket/Braket_EXPORTS.h>
+#include <aws/braket/internal/BraketEndpointRules.h>
 #include <aws/braket/model/ActionMetadata.h>
 #include <aws/braket/model/AlgorithmSpecification.h>
 #include <aws/braket/model/Association.h>
@@ -70,18 +74,22 @@
 #include <aws/braket/model/S3DataSource.h>
 #include <aws/braket/model/ScriptModeConfig.h>
 #include <aws/braket/model/SearchDevicesFilter.h>
+#include <aws/braket/model/SearchDevicesPaginationTraits.h>
 #include <aws/braket/model/SearchDevicesRequest.h>
 #include <aws/braket/model/SearchDevicesResult.h>
 #include <aws/braket/model/SearchJobsFilter.h>
 #include <aws/braket/model/SearchJobsFilterOperator.h>
+#include <aws/braket/model/SearchJobsPaginationTraits.h>
 #include <aws/braket/model/SearchJobsRequest.h>
 #include <aws/braket/model/SearchJobsResult.h>
 #include <aws/braket/model/SearchQuantumTasksFilter.h>
 #include <aws/braket/model/SearchQuantumTasksFilterOperator.h>
+#include <aws/braket/model/SearchQuantumTasksPaginationTraits.h>
 #include <aws/braket/model/SearchQuantumTasksRequest.h>
 #include <aws/braket/model/SearchQuantumTasksResult.h>
 #include <aws/braket/model/SearchSpendingLimitsFilter.h>
 #include <aws/braket/model/SearchSpendingLimitsFilterOperator.h>
+#include <aws/braket/model/SearchSpendingLimitsPaginationTraits.h>
 #include <aws/braket/model/SearchSpendingLimitsRequest.h>
 #include <aws/braket/model/SearchSpendingLimitsResult.h>
 #include <aws/braket/model/SpendingLimitSummary.h>
diff --git a/generated/tests/budgets-gen-tests/BudgetsIncludeTests.cpp b/generated/tests/budgets-gen-tests/BudgetsIncludeTests.cpp
index 0c6eb6d8e6e9..217387558d07 100644
--- a/generated/tests/budgets-gen-tests/BudgetsIncludeTests.cpp
+++ b/generated/tests/budgets-gen-tests/BudgetsIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/budgets/BudgetsClient.h>
+#include <aws/budgets/BudgetsClientPagination.h>
 #include <aws/budgets/BudgetsEndpointProvider.h>
 #include <aws/budgets/BudgetsErrorMarshaller.h>
 #include <aws/budgets/BudgetsErrors.h>
+#include <aws/budgets/BudgetsPaginationBase.h>
 #include <aws/budgets/BudgetsRequest.h>
 #include <aws/budgets/BudgetsServiceClientModel.h>
+#include <aws/budgets/BudgetsWaiter.h>
 #include <aws/budgets/Budgets_EXPORTS.h>
+#include <aws/budgets/internal/BudgetsEndpointRules.h>
 #include <aws/budgets/model/Action.h>
 #include <aws/budgets/model/ActionHistory.h>
 #include <aws/budgets/model/ActionHistoryDetails.h>
@@ -49,24 +53,32 @@
 #include <aws/budgets/model/DeleteNotificationResult.h>
 #include <aws/budgets/model/DeleteSubscriberRequest.h>
 #include <aws/budgets/model/DeleteSubscriberResult.h>
+#include <aws/budgets/model/DescribeBudgetActionHistoriesPaginationTraits.h>
 #include <aws/budgets/model/DescribeBudgetActionHistoriesRequest.h>
 #include <aws/budgets/model/DescribeBudgetActionHistoriesResult.h>
 #include <aws/budgets/model/DescribeBudgetActionRequest.h>
 #include <aws/budgets/model/DescribeBudgetActionResult.h>
+#include <aws/budgets/model/DescribeBudgetActionsForAccountPaginationTraits.h>
 #include <aws/budgets/model/DescribeBudgetActionsForAccountRequest.h>
 #include <aws/budgets/model/DescribeBudgetActionsForAccountResult.h>
+#include <aws/budgets/model/DescribeBudgetActionsForBudgetPaginationTraits.h>
 #include <aws/budgets/model/DescribeBudgetActionsForBudgetRequest.h>
 #include <aws/budgets/model/DescribeBudgetActionsForBudgetResult.h>
+#include <aws/budgets/model/DescribeBudgetNotificationsForAccountPaginationTraits.h>
 #include <aws/budgets/model/DescribeBudgetNotificationsForAccountRequest.h>
 #include <aws/budgets/model/DescribeBudgetNotificationsForAccountResult.h>
+#include <aws/budgets/model/DescribeBudgetPerformanceHistoryPaginationTraits.h>
 #include <aws/budgets/model/DescribeBudgetPerformanceHistoryRequest.h>
 #include <aws/budgets/model/DescribeBudgetPerformanceHistoryResult.h>
 #include <aws/budgets/model/DescribeBudgetRequest.h>
 #include <aws/budgets/model/DescribeBudgetResult.h>
+#include <aws/budgets/model/DescribeBudgetsPaginationTraits.h>
 #include <aws/budgets/model/DescribeBudgetsRequest.h>
 #include <aws/budgets/model/DescribeBudgetsResult.h>
+#include <aws/budgets/model/DescribeNotificationsForBudgetPaginationTraits.h>
 #include <aws/budgets/model/DescribeNotificationsForBudgetRequest.h>
 #include <aws/budgets/model/DescribeNotificationsForBudgetResult.h>
+#include <aws/budgets/model/DescribeSubscribersForNotificationPaginationTraits.h>
 #include <aws/budgets/model/DescribeSubscribersForNotificationRequest.h>
 #include <aws/budgets/model/DescribeSubscribersForNotificationResult.h>
 #include <aws/budgets/model/Dimension.h>
diff --git a/generated/tests/ce-gen-tests/CostExplorerIncludeTests.cpp b/generated/tests/ce-gen-tests/CostExplorerIncludeTests.cpp
index 9279bce6ac18..3fa8895fe43b 100644
--- a/generated/tests/ce-gen-tests/CostExplorerIncludeTests.cpp
+++ b/generated/tests/ce-gen-tests/CostExplorerIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/ce/CostExplorerClient.h>
+#include <aws/ce/CostExplorerClientPagination.h>
 #include <aws/ce/CostExplorerEndpointProvider.h>
 #include <aws/ce/CostExplorerErrorMarshaller.h>
 #include <aws/ce/CostExplorerErrors.h>
+#include <aws/ce/CostExplorerPaginationBase.h>
 #include <aws/ce/CostExplorerRequest.h>
 #include <aws/ce/CostExplorerServiceClientModel.h>
+#include <aws/ce/CostExplorerWaiter.h>
 #include <aws/ce/CostExplorer_EXPORTS.h>
+#include <aws/ce/internal/CostExplorerEndpointRules.h>
 #include <aws/ce/model/AccountScope.h>
 #include <aws/ce/model/AnalysisDetails.h>
 #include <aws/ce/model/AnalysisStatus.h>
@@ -93,16 +97,20 @@
 #include <aws/ce/model/ForecastResult.h>
 #include <aws/ce/model/GenerationStatus.h>
 #include <aws/ce/model/GenerationSummary.h>
+#include <aws/ce/model/GetAnomaliesPaginationTraits.h>
 #include <aws/ce/model/GetAnomaliesRequest.h>
 #include <aws/ce/model/GetAnomaliesResult.h>
+#include <aws/ce/model/GetAnomalyMonitorsPaginationTraits.h>
 #include <aws/ce/model/GetAnomalyMonitorsRequest.h>
 #include <aws/ce/model/GetAnomalyMonitorsResult.h>
+#include <aws/ce/model/GetAnomalySubscriptionsPaginationTraits.h>
 #include <aws/ce/model/GetAnomalySubscriptionsRequest.h>
 #include <aws/ce/model/GetAnomalySubscriptionsResult.h>
 #include <aws/ce/model/GetApproximateUsageRecordsRequest.h>
 #include <aws/ce/model/GetApproximateUsageRecordsResult.h>
 #include <aws/ce/model/GetCommitmentPurchaseAnalysisRequest.h>
 #include <aws/ce/model/GetCommitmentPurchaseAnalysisResult.h>
+#include <aws/ce/model/GetCostAndUsageComparisonsPaginationTraits.h>
 #include <aws/ce/model/GetCostAndUsageComparisonsRequest.h>
 #include <aws/ce/model/GetCostAndUsageComparisonsResult.h>
 #include <aws/ce/model/GetCostAndUsageRequest.h>
@@ -111,6 +119,7 @@
 #include <aws/ce/model/GetCostAndUsageWithResourcesResult.h>
 #include <aws/ce/model/GetCostCategoriesRequest.h>
 #include <aws/ce/model/GetCostCategoriesResult.h>
+#include <aws/ce/model/GetCostComparisonDriversPaginationTraits.h>
 #include <aws/ce/model/GetCostComparisonDriversRequest.h>
 #include <aws/ce/model/GetCostComparisonDriversResult.h>
 #include <aws/ce/model/GetCostForecastRequest.h>
@@ -119,18 +128,22 @@
 #include <aws/ce/model/GetDimensionValuesResult.h>
 #include <aws/ce/model/GetReservationCoverageRequest.h>
 #include <aws/ce/model/GetReservationCoverageResult.h>
+#include <aws/ce/model/GetReservationPurchaseRecommendationPaginationTraits.h>
 #include <aws/ce/model/GetReservationPurchaseRecommendationRequest.h>
 #include <aws/ce/model/GetReservationPurchaseRecommendationResult.h>
 #include <aws/ce/model/GetReservationUtilizationRequest.h>
 #include <aws/ce/model/GetReservationUtilizationResult.h>
+#include <aws/ce/model/GetRightsizingRecommendationPaginationTraits.h>
 #include <aws/ce/model/GetRightsizingRecommendationRequest.h>
 #include <aws/ce/model/GetRightsizingRecommendationResult.h>
 #include <aws/ce/model/GetSavingsPlanPurchaseRecommendationDetailsRequest.h>
 #include <aws/ce/model/GetSavingsPlanPurchaseRecommendationDetailsResult.h>
+#include <aws/ce/model/GetSavingsPlansCoveragePaginationTraits.h>
 #include <aws/ce/model/GetSavingsPlansCoverageRequest.h>
 #include <aws/ce/model/GetSavingsPlansCoverageResult.h>
 #include <aws/ce/model/GetSavingsPlansPurchaseRecommendationRequest.h>
 #include <aws/ce/model/GetSavingsPlansPurchaseRecommendationResult.h>
+#include <aws/ce/model/GetSavingsPlansUtilizationDetailsPaginationTraits.h>
 #include <aws/ce/model/GetSavingsPlansUtilizationDetailsRequest.h>
 #include <aws/ce/model/GetSavingsPlansUtilizationDetailsResult.h>
 #include <aws/ce/model/GetSavingsPlansUtilizationRequest.h>
@@ -145,16 +158,22 @@
 #include <aws/ce/model/GroupDefinitionType.h>
 #include <aws/ce/model/Impact.h>
 #include <aws/ce/model/InstanceDetails.h>
+#include <aws/ce/model/ListCommitmentPurchaseAnalysesPaginationTraits.h>
 #include <aws/ce/model/ListCommitmentPurchaseAnalysesRequest.h>
 #include <aws/ce/model/ListCommitmentPurchaseAnalysesResult.h>
+#include <aws/ce/model/ListCostAllocationTagBackfillHistoryPaginationTraits.h>
 #include <aws/ce/model/ListCostAllocationTagBackfillHistoryRequest.h>
 #include <aws/ce/model/ListCostAllocationTagBackfillHistoryResult.h>
+#include <aws/ce/model/ListCostAllocationTagsPaginationTraits.h>
 #include <aws/ce/model/ListCostAllocationTagsRequest.h>
 #include <aws/ce/model/ListCostAllocationTagsResult.h>
+#include <aws/ce/model/ListCostCategoryDefinitionsPaginationTraits.h>
 #include <aws/ce/model/ListCostCategoryDefinitionsRequest.h>
 #include <aws/ce/model/ListCostCategoryDefinitionsResult.h>
+#include <aws/ce/model/ListCostCategoryResourceAssociationsPaginationTraits.h>
 #include <aws/ce/model/ListCostCategoryResourceAssociationsRequest.h>
 #include <aws/ce/model/ListCostCategoryResourceAssociationsResult.h>
+#include <aws/ce/model/ListSavingsPlansPurchaseRecommendationGenerationPaginationTraits.h>
 #include <aws/ce/model/ListSavingsPlansPurchaseRecommendationGenerationRequest.h>
 #include <aws/ce/model/ListSavingsPlansPurchaseRecommendationGenerationResult.h>
 #include <aws/ce/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/chatbot-gen-tests/ChatbotIncludeTests.cpp b/generated/tests/chatbot-gen-tests/ChatbotIncludeTests.cpp
index 2140b8884c7b..a881483bded0 100644
--- a/generated/tests/chatbot-gen-tests/ChatbotIncludeTests.cpp
+++ b/generated/tests/chatbot-gen-tests/ChatbotIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/chatbot/ChatbotClient.h>
+#include <aws/chatbot/ChatbotClientPagination.h>
 #include <aws/chatbot/ChatbotEndpointProvider.h>
 #include <aws/chatbot/ChatbotErrorMarshaller.h>
 #include <aws/chatbot/ChatbotErrors.h>
+#include <aws/chatbot/ChatbotPaginationBase.h>
 #include <aws/chatbot/ChatbotRequest.h>
 #include <aws/chatbot/ChatbotServiceClientModel.h>
+#include <aws/chatbot/ChatbotWaiter.h>
 #include <aws/chatbot/Chatbot_EXPORTS.h>
+#include <aws/chatbot/internal/ChatbotEndpointRules.h>
 #include <aws/chatbot/model/AccountPreferences.h>
 #include <aws/chatbot/model/AssociateToConfigurationRequest.h>
 #include <aws/chatbot/model/AssociateToConfigurationResult.h>
@@ -48,12 +52,16 @@
 #include <aws/chatbot/model/DeleteSlackUserIdentityResult.h>
 #include <aws/chatbot/model/DeleteSlackWorkspaceAuthorizationRequest.h>
 #include <aws/chatbot/model/DeleteSlackWorkspaceAuthorizationResult.h>
+#include <aws/chatbot/model/DescribeChimeWebhookConfigurationsPaginationTraits.h>
 #include <aws/chatbot/model/DescribeChimeWebhookConfigurationsRequest.h>
 #include <aws/chatbot/model/DescribeChimeWebhookConfigurationsResult.h>
+#include <aws/chatbot/model/DescribeSlackChannelConfigurationsPaginationTraits.h>
 #include <aws/chatbot/model/DescribeSlackChannelConfigurationsRequest.h>
 #include <aws/chatbot/model/DescribeSlackChannelConfigurationsResult.h>
+#include <aws/chatbot/model/DescribeSlackUserIdentitiesPaginationTraits.h>
 #include <aws/chatbot/model/DescribeSlackUserIdentitiesRequest.h>
 #include <aws/chatbot/model/DescribeSlackUserIdentitiesResult.h>
+#include <aws/chatbot/model/DescribeSlackWorkspacesPaginationTraits.h>
 #include <aws/chatbot/model/DescribeSlackWorkspacesRequest.h>
 #include <aws/chatbot/model/DescribeSlackWorkspacesResult.h>
 #include <aws/chatbot/model/DisassociateFromConfigurationRequest.h>
@@ -64,14 +72,19 @@
 #include <aws/chatbot/model/GetCustomActionResult.h>
 #include <aws/chatbot/model/GetMicrosoftTeamsChannelConfigurationRequest.h>
 #include <aws/chatbot/model/GetMicrosoftTeamsChannelConfigurationResult.h>
+#include <aws/chatbot/model/ListAssociationsPaginationTraits.h>
 #include <aws/chatbot/model/ListAssociationsRequest.h>
 #include <aws/chatbot/model/ListAssociationsResult.h>
+#include <aws/chatbot/model/ListCustomActionsPaginationTraits.h>
 #include <aws/chatbot/model/ListCustomActionsRequest.h>
 #include <aws/chatbot/model/ListCustomActionsResult.h>
+#include <aws/chatbot/model/ListMicrosoftTeamsChannelConfigurationsPaginationTraits.h>
 #include <aws/chatbot/model/ListMicrosoftTeamsChannelConfigurationsRequest.h>
 #include <aws/chatbot/model/ListMicrosoftTeamsChannelConfigurationsResult.h>
+#include <aws/chatbot/model/ListMicrosoftTeamsConfiguredTeamsPaginationTraits.h>
 #include <aws/chatbot/model/ListMicrosoftTeamsConfiguredTeamsRequest.h>
 #include <aws/chatbot/model/ListMicrosoftTeamsConfiguredTeamsResult.h>
+#include <aws/chatbot/model/ListMicrosoftTeamsUserIdentitiesPaginationTraits.h>
 #include <aws/chatbot/model/ListMicrosoftTeamsUserIdentitiesRequest.h>
 #include <aws/chatbot/model/ListMicrosoftTeamsUserIdentitiesResult.h>
 #include <aws/chatbot/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/chime-gen-tests/ChimeIncludeTests.cpp b/generated/tests/chime-gen-tests/ChimeIncludeTests.cpp
index 6f9941af885c..ed36a1e50562 100644
--- a/generated/tests/chime-gen-tests/ChimeIncludeTests.cpp
+++ b/generated/tests/chime-gen-tests/ChimeIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/chime/ChimeClient.h>
+#include <aws/chime/ChimeClientPagination.h>
 #include <aws/chime/ChimeEndpointProvider.h>
 #include <aws/chime/ChimeErrorMarshaller.h>
 #include <aws/chime/ChimeErrors.h>
+#include <aws/chime/ChimePaginationBase.h>
 #include <aws/chime/ChimeRequest.h>
 #include <aws/chime/ChimeServiceClientModel.h>
+#include <aws/chime/ChimeWaiter.h>
 #include <aws/chime/Chime_EXPORTS.h>
+#include <aws/chime/internal/ChimeEndpointRules.h>
 #include <aws/chime/model/AccessDeniedException.h>
 #include <aws/chime/model/Account.h>
 #include <aws/chime/model/AccountSettings.h>
@@ -99,20 +103,27 @@
 #include <aws/chime/model/InviteUsersRequest.h>
 #include <aws/chime/model/InviteUsersResult.h>
 #include <aws/chime/model/License.h>
+#include <aws/chime/model/ListAccountsPaginationTraits.h>
 #include <aws/chime/model/ListAccountsRequest.h>
 #include <aws/chime/model/ListAccountsResult.h>
+#include <aws/chime/model/ListBotsPaginationTraits.h>
 #include <aws/chime/model/ListBotsRequest.h>
 #include <aws/chime/model/ListBotsResult.h>
+#include <aws/chime/model/ListPhoneNumberOrdersPaginationTraits.h>
 #include <aws/chime/model/ListPhoneNumberOrdersRequest.h>
 #include <aws/chime/model/ListPhoneNumberOrdersResult.h>
+#include <aws/chime/model/ListPhoneNumbersPaginationTraits.h>
 #include <aws/chime/model/ListPhoneNumbersRequest.h>
 #include <aws/chime/model/ListPhoneNumbersResult.h>
+#include <aws/chime/model/ListRoomMembershipsPaginationTraits.h>
 #include <aws/chime/model/ListRoomMembershipsRequest.h>
 #include <aws/chime/model/ListRoomMembershipsResult.h>
+#include <aws/chime/model/ListRoomsPaginationTraits.h>
 #include <aws/chime/model/ListRoomsRequest.h>
 #include <aws/chime/model/ListRoomsResult.h>
 #include <aws/chime/model/ListSupportedPhoneNumberCountriesRequest.h>
 #include <aws/chime/model/ListSupportedPhoneNumberCountriesResult.h>
+#include <aws/chime/model/ListUsersPaginationTraits.h>
 #include <aws/chime/model/ListUsersRequest.h>
 #include <aws/chime/model/ListUsersResult.h>
 #include <aws/chime/model/LogoutUserRequest.h>
@@ -156,6 +167,7 @@
 #include <aws/chime/model/RoomMembership.h>
 #include <aws/chime/model/RoomMembershipRole.h>
 #include <aws/chime/model/RoomRetentionSettings.h>
+#include <aws/chime/model/SearchAvailablePhoneNumbersPaginationTraits.h>
 #include <aws/chime/model/SearchAvailablePhoneNumbersRequest.h>
 #include <aws/chime/model/SearchAvailablePhoneNumbersResult.h>
 #include <aws/chime/model/ServiceFailureException.h>
diff --git a/generated/tests/chime-sdk-identity-gen-tests/ChimeSDKIdentityIncludeTests.cpp b/generated/tests/chime-sdk-identity-gen-tests/ChimeSDKIdentityIncludeTests.cpp
index 249c990d748d..e29d2a79b0d2 100644
--- a/generated/tests/chime-sdk-identity-gen-tests/ChimeSDKIdentityIncludeTests.cpp
+++ b/generated/tests/chime-sdk-identity-gen-tests/ChimeSDKIdentityIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/chime-sdk-identity/ChimeSDKIdentityClient.h>
+#include <aws/chime-sdk-identity/ChimeSDKIdentityClientPagination.h>
 #include <aws/chime-sdk-identity/ChimeSDKIdentityEndpointProvider.h>
 #include <aws/chime-sdk-identity/ChimeSDKIdentityErrorMarshaller.h>
 #include <aws/chime-sdk-identity/ChimeSDKIdentityErrors.h>
+#include <aws/chime-sdk-identity/ChimeSDKIdentityPaginationBase.h>
 #include <aws/chime-sdk-identity/ChimeSDKIdentityRequest.h>
 #include <aws/chime-sdk-identity/ChimeSDKIdentityServiceClientModel.h>
+#include <aws/chime-sdk-identity/ChimeSDKIdentityWaiter.h>
 #include <aws/chime-sdk-identity/ChimeSDKIdentity_EXPORTS.h>
+#include <aws/chime-sdk-identity/internal/ChimeSDKIdentityEndpointRules.h>
 #include <aws/chime-sdk-identity/model/AllowMessages.h>
 #include <aws/chime-sdk-identity/model/AppInstance.h>
 #include <aws/chime-sdk-identity/model/AppInstanceAdmin.h>
@@ -66,14 +70,19 @@
 #include <aws/chime-sdk-identity/model/Identity.h>
 #include <aws/chime-sdk-identity/model/InvokedBy.h>
 #include <aws/chime-sdk-identity/model/LexConfiguration.h>
+#include <aws/chime-sdk-identity/model/ListAppInstanceAdminsPaginationTraits.h>
 #include <aws/chime-sdk-identity/model/ListAppInstanceAdminsRequest.h>
 #include <aws/chime-sdk-identity/model/ListAppInstanceAdminsResult.h>
+#include <aws/chime-sdk-identity/model/ListAppInstanceBotsPaginationTraits.h>
 #include <aws/chime-sdk-identity/model/ListAppInstanceBotsRequest.h>
 #include <aws/chime-sdk-identity/model/ListAppInstanceBotsResult.h>
+#include <aws/chime-sdk-identity/model/ListAppInstanceUserEndpointsPaginationTraits.h>
 #include <aws/chime-sdk-identity/model/ListAppInstanceUserEndpointsRequest.h>
 #include <aws/chime-sdk-identity/model/ListAppInstanceUserEndpointsResult.h>
+#include <aws/chime-sdk-identity/model/ListAppInstanceUsersPaginationTraits.h>
 #include <aws/chime-sdk-identity/model/ListAppInstanceUsersRequest.h>
 #include <aws/chime-sdk-identity/model/ListAppInstanceUsersResult.h>
+#include <aws/chime-sdk-identity/model/ListAppInstancesPaginationTraits.h>
 #include <aws/chime-sdk-identity/model/ListAppInstancesRequest.h>
 #include <aws/chime-sdk-identity/model/ListAppInstancesResult.h>
 #include <aws/chime-sdk-identity/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/chime-sdk-media-pipelines-gen-tests/ChimeSDKMediaPipelinesIncludeTests.cpp b/generated/tests/chime-sdk-media-pipelines-gen-tests/ChimeSDKMediaPipelinesIncludeTests.cpp
index 167f63306e21..2f7e83d59bf7 100644
--- a/generated/tests/chime-sdk-media-pipelines-gen-tests/ChimeSDKMediaPipelinesIncludeTests.cpp
+++ b/generated/tests/chime-sdk-media-pipelines-gen-tests/ChimeSDKMediaPipelinesIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/chime-sdk-media-pipelines/ChimeSDKMediaPipelinesClient.h>
+#include <aws/chime-sdk-media-pipelines/ChimeSDKMediaPipelinesClientPagination.h>
 #include <aws/chime-sdk-media-pipelines/ChimeSDKMediaPipelinesEndpointProvider.h>
 #include <aws/chime-sdk-media-pipelines/ChimeSDKMediaPipelinesErrorMarshaller.h>
 #include <aws/chime-sdk-media-pipelines/ChimeSDKMediaPipelinesErrors.h>
+#include <aws/chime-sdk-media-pipelines/ChimeSDKMediaPipelinesPaginationBase.h>
 #include <aws/chime-sdk-media-pipelines/ChimeSDKMediaPipelinesRequest.h>
 #include <aws/chime-sdk-media-pipelines/ChimeSDKMediaPipelinesServiceClientModel.h>
+#include <aws/chime-sdk-media-pipelines/ChimeSDKMediaPipelinesWaiter.h>
 #include <aws/chime-sdk-media-pipelines/ChimeSDKMediaPipelines_EXPORTS.h>
+#include <aws/chime-sdk-media-pipelines/internal/ChimeSDKMediaPipelinesEndpointRules.h>
 #include <aws/chime-sdk-media-pipelines/model/ActiveSpeakerOnlyConfiguration.h>
 #include <aws/chime-sdk-media-pipelines/model/ActiveSpeakerPosition.h>
 #include <aws/chime-sdk-media-pipelines/model/AmazonTranscribeCallAnalyticsProcessorConfiguration.h>
@@ -99,12 +103,16 @@
 #include <aws/chime-sdk-media-pipelines/model/KinesisVideoStreamSourceTaskConfiguration.h>
 #include <aws/chime-sdk-media-pipelines/model/LambdaFunctionSinkConfiguration.h>
 #include <aws/chime-sdk-media-pipelines/model/LayoutOption.h>
+#include <aws/chime-sdk-media-pipelines/model/ListMediaCapturePipelinesPaginationTraits.h>
 #include <aws/chime-sdk-media-pipelines/model/ListMediaCapturePipelinesRequest.h>
 #include <aws/chime-sdk-media-pipelines/model/ListMediaCapturePipelinesResult.h>
+#include <aws/chime-sdk-media-pipelines/model/ListMediaInsightsPipelineConfigurationsPaginationTraits.h>
 #include <aws/chime-sdk-media-pipelines/model/ListMediaInsightsPipelineConfigurationsRequest.h>
 #include <aws/chime-sdk-media-pipelines/model/ListMediaInsightsPipelineConfigurationsResult.h>
+#include <aws/chime-sdk-media-pipelines/model/ListMediaPipelineKinesisVideoStreamPoolsPaginationTraits.h>
 #include <aws/chime-sdk-media-pipelines/model/ListMediaPipelineKinesisVideoStreamPoolsRequest.h>
 #include <aws/chime-sdk-media-pipelines/model/ListMediaPipelineKinesisVideoStreamPoolsResult.h>
+#include <aws/chime-sdk-media-pipelines/model/ListMediaPipelinesPaginationTraits.h>
 #include <aws/chime-sdk-media-pipelines/model/ListMediaPipelinesRequest.h>
 #include <aws/chime-sdk-media-pipelines/model/ListMediaPipelinesResult.h>
 #include <aws/chime-sdk-media-pipelines/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/chime-sdk-meetings-gen-tests/ChimeSDKMeetingsIncludeTests.cpp b/generated/tests/chime-sdk-meetings-gen-tests/ChimeSDKMeetingsIncludeTests.cpp
index 29bc6c417412..3d0cf9db3f64 100644
--- a/generated/tests/chime-sdk-meetings-gen-tests/ChimeSDKMeetingsIncludeTests.cpp
+++ b/generated/tests/chime-sdk-meetings-gen-tests/ChimeSDKMeetingsIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/chime-sdk-meetings/ChimeSDKMeetingsClient.h>
+#include <aws/chime-sdk-meetings/ChimeSDKMeetingsClientPagination.h>
 #include <aws/chime-sdk-meetings/ChimeSDKMeetingsEndpointProvider.h>
 #include <aws/chime-sdk-meetings/ChimeSDKMeetingsErrorMarshaller.h>
 #include <aws/chime-sdk-meetings/ChimeSDKMeetingsErrors.h>
+#include <aws/chime-sdk-meetings/ChimeSDKMeetingsPaginationBase.h>
 #include <aws/chime-sdk-meetings/ChimeSDKMeetingsRequest.h>
 #include <aws/chime-sdk-meetings/ChimeSDKMeetingsServiceClientModel.h>
+#include <aws/chime-sdk-meetings/ChimeSDKMeetingsWaiter.h>
 #include <aws/chime-sdk-meetings/ChimeSDKMeetings_EXPORTS.h>
+#include <aws/chime-sdk-meetings/internal/ChimeSDKMeetingsEndpointRules.h>
 #include <aws/chime-sdk-meetings/model/Attendee.h>
 #include <aws/chime-sdk-meetings/model/AttendeeCapabilities.h>
 #include <aws/chime-sdk-meetings/model/AttendeeFeatures.h>
@@ -43,6 +47,7 @@
 #include <aws/chime-sdk-meetings/model/GetMeetingRequest.h>
 #include <aws/chime-sdk-meetings/model/GetMeetingResult.h>
 #include <aws/chime-sdk-meetings/model/LimitExceededException.h>
+#include <aws/chime-sdk-meetings/model/ListAttendeesPaginationTraits.h>
 #include <aws/chime-sdk-meetings/model/ListAttendeesRequest.h>
 #include <aws/chime-sdk-meetings/model/ListAttendeesResult.h>
 #include <aws/chime-sdk-meetings/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/chime-sdk-messaging-gen-tests/ChimeSDKMessagingIncludeTests.cpp b/generated/tests/chime-sdk-messaging-gen-tests/ChimeSDKMessagingIncludeTests.cpp
index d4c7889c9a34..97d02974cfd5 100644
--- a/generated/tests/chime-sdk-messaging-gen-tests/ChimeSDKMessagingIncludeTests.cpp
+++ b/generated/tests/chime-sdk-messaging-gen-tests/ChimeSDKMessagingIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/chime-sdk-messaging/ChimeSDKMessagingClient.h>
+#include <aws/chime-sdk-messaging/ChimeSDKMessagingClientPagination.h>
 #include <aws/chime-sdk-messaging/ChimeSDKMessagingEndpointProvider.h>
 #include <aws/chime-sdk-messaging/ChimeSDKMessagingErrorMarshaller.h>
 #include <aws/chime-sdk-messaging/ChimeSDKMessagingErrors.h>
+#include <aws/chime-sdk-messaging/ChimeSDKMessagingPaginationBase.h>
 #include <aws/chime-sdk-messaging/ChimeSDKMessagingRequest.h>
 #include <aws/chime-sdk-messaging/ChimeSDKMessagingServiceClientModel.h>
+#include <aws/chime-sdk-messaging/ChimeSDKMessagingWaiter.h>
 #include <aws/chime-sdk-messaging/ChimeSDKMessaging_EXPORTS.h>
+#include <aws/chime-sdk-messaging/internal/ChimeSDKMessagingEndpointRules.h>
 #include <aws/chime-sdk-messaging/model/AllowNotifications.h>
 #include <aws/chime-sdk-messaging/model/AppInstanceUserMembershipSummary.h>
 #include <aws/chime-sdk-messaging/model/AssociateChannelFlowRequest.h>
@@ -99,24 +103,34 @@
 #include <aws/chime-sdk-messaging/model/Identity.h>
 #include <aws/chime-sdk-messaging/model/InvocationType.h>
 #include <aws/chime-sdk-messaging/model/LambdaConfiguration.h>
+#include <aws/chime-sdk-messaging/model/ListChannelBansPaginationTraits.h>
 #include <aws/chime-sdk-messaging/model/ListChannelBansRequest.h>
 #include <aws/chime-sdk-messaging/model/ListChannelBansResult.h>
+#include <aws/chime-sdk-messaging/model/ListChannelFlowsPaginationTraits.h>
 #include <aws/chime-sdk-messaging/model/ListChannelFlowsRequest.h>
 #include <aws/chime-sdk-messaging/model/ListChannelFlowsResult.h>
+#include <aws/chime-sdk-messaging/model/ListChannelMembershipsForAppInstanceUserPaginationTraits.h>
 #include <aws/chime-sdk-messaging/model/ListChannelMembershipsForAppInstanceUserRequest.h>
 #include <aws/chime-sdk-messaging/model/ListChannelMembershipsForAppInstanceUserResult.h>
+#include <aws/chime-sdk-messaging/model/ListChannelMembershipsPaginationTraits.h>
 #include <aws/chime-sdk-messaging/model/ListChannelMembershipsRequest.h>
 #include <aws/chime-sdk-messaging/model/ListChannelMembershipsResult.h>
+#include <aws/chime-sdk-messaging/model/ListChannelMessagesPaginationTraits.h>
 #include <aws/chime-sdk-messaging/model/ListChannelMessagesRequest.h>
 #include <aws/chime-sdk-messaging/model/ListChannelMessagesResult.h>
+#include <aws/chime-sdk-messaging/model/ListChannelModeratorsPaginationTraits.h>
 #include <aws/chime-sdk-messaging/model/ListChannelModeratorsRequest.h>
 #include <aws/chime-sdk-messaging/model/ListChannelModeratorsResult.h>
+#include <aws/chime-sdk-messaging/model/ListChannelsAssociatedWithChannelFlowPaginationTraits.h>
 #include <aws/chime-sdk-messaging/model/ListChannelsAssociatedWithChannelFlowRequest.h>
 #include <aws/chime-sdk-messaging/model/ListChannelsAssociatedWithChannelFlowResult.h>
+#include <aws/chime-sdk-messaging/model/ListChannelsModeratedByAppInstanceUserPaginationTraits.h>
 #include <aws/chime-sdk-messaging/model/ListChannelsModeratedByAppInstanceUserRequest.h>
 #include <aws/chime-sdk-messaging/model/ListChannelsModeratedByAppInstanceUserResult.h>
+#include <aws/chime-sdk-messaging/model/ListChannelsPaginationTraits.h>
 #include <aws/chime-sdk-messaging/model/ListChannelsRequest.h>
 #include <aws/chime-sdk-messaging/model/ListChannelsResult.h>
+#include <aws/chime-sdk-messaging/model/ListSubChannelsPaginationTraits.h>
 #include <aws/chime-sdk-messaging/model/ListSubChannelsRequest.h>
 #include <aws/chime-sdk-messaging/model/ListSubChannelsResult.h>
 #include <aws/chime-sdk-messaging/model/ListTagsForResourceRequest.h>
@@ -140,6 +154,7 @@
 #include <aws/chime-sdk-messaging/model/RedactChannelMessageRequest.h>
 #include <aws/chime-sdk-messaging/model/RedactChannelMessageResult.h>
 #include <aws/chime-sdk-messaging/model/ResourceLimitExceededException.h>
+#include <aws/chime-sdk-messaging/model/SearchChannelsPaginationTraits.h>
 #include <aws/chime-sdk-messaging/model/SearchChannelsRequest.h>
 #include <aws/chime-sdk-messaging/model/SearchChannelsResult.h>
 #include <aws/chime-sdk-messaging/model/SearchField.h>
diff --git a/generated/tests/chime-sdk-voice-gen-tests/ChimeSDKVoiceIncludeTests.cpp b/generated/tests/chime-sdk-voice-gen-tests/ChimeSDKVoiceIncludeTests.cpp
index ea43b7fb0763..f09ad50c9fe8 100644
--- a/generated/tests/chime-sdk-voice-gen-tests/ChimeSDKVoiceIncludeTests.cpp
+++ b/generated/tests/chime-sdk-voice-gen-tests/ChimeSDKVoiceIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/chime-sdk-voice/ChimeSDKVoiceClient.h>
+#include <aws/chime-sdk-voice/ChimeSDKVoiceClientPagination.h>
 #include <aws/chime-sdk-voice/ChimeSDKVoiceEndpointProvider.h>
 #include <aws/chime-sdk-voice/ChimeSDKVoiceErrorMarshaller.h>
 #include <aws/chime-sdk-voice/ChimeSDKVoiceErrors.h>
+#include <aws/chime-sdk-voice/ChimeSDKVoicePaginationBase.h>
 #include <aws/chime-sdk-voice/ChimeSDKVoiceRequest.h>
 #include <aws/chime-sdk-voice/ChimeSDKVoiceServiceClientModel.h>
+#include <aws/chime-sdk-voice/ChimeSDKVoiceWaiter.h>
 #include <aws/chime-sdk-voice/ChimeSDKVoice_EXPORTS.h>
+#include <aws/chime-sdk-voice/internal/ChimeSDKVoiceEndpointRules.h>
 #include <aws/chime-sdk-voice/model/Address.h>
 #include <aws/chime-sdk-voice/model/AlexaSkillStatus.h>
 #include <aws/chime-sdk-voice/model/AssociatePhoneNumbersWithVoiceConnectorGroupRequest.h>
@@ -113,26 +117,34 @@
 #include <aws/chime-sdk-voice/model/LanguageCode.h>
 #include <aws/chime-sdk-voice/model/ListAvailableVoiceConnectorRegionsRequest.h>
 #include <aws/chime-sdk-voice/model/ListAvailableVoiceConnectorRegionsResult.h>
+#include <aws/chime-sdk-voice/model/ListPhoneNumberOrdersPaginationTraits.h>
 #include <aws/chime-sdk-voice/model/ListPhoneNumberOrdersRequest.h>
 #include <aws/chime-sdk-voice/model/ListPhoneNumberOrdersResult.h>
+#include <aws/chime-sdk-voice/model/ListPhoneNumbersPaginationTraits.h>
 #include <aws/chime-sdk-voice/model/ListPhoneNumbersRequest.h>
 #include <aws/chime-sdk-voice/model/ListPhoneNumbersResult.h>
+#include <aws/chime-sdk-voice/model/ListSipMediaApplicationsPaginationTraits.h>
 #include <aws/chime-sdk-voice/model/ListSipMediaApplicationsRequest.h>
 #include <aws/chime-sdk-voice/model/ListSipMediaApplicationsResult.h>
+#include <aws/chime-sdk-voice/model/ListSipRulesPaginationTraits.h>
 #include <aws/chime-sdk-voice/model/ListSipRulesRequest.h>
 #include <aws/chime-sdk-voice/model/ListSipRulesResult.h>
 #include <aws/chime-sdk-voice/model/ListSupportedPhoneNumberCountriesRequest.h>
 #include <aws/chime-sdk-voice/model/ListSupportedPhoneNumberCountriesResult.h>
 #include <aws/chime-sdk-voice/model/ListTagsForResourceRequest.h>
 #include <aws/chime-sdk-voice/model/ListTagsForResourceResult.h>
+#include <aws/chime-sdk-voice/model/ListVoiceConnectorGroupsPaginationTraits.h>
 #include <aws/chime-sdk-voice/model/ListVoiceConnectorGroupsRequest.h>
 #include <aws/chime-sdk-voice/model/ListVoiceConnectorGroupsResult.h>
 #include <aws/chime-sdk-voice/model/ListVoiceConnectorTerminationCredentialsRequest.h>
 #include <aws/chime-sdk-voice/model/ListVoiceConnectorTerminationCredentialsResult.h>
+#include <aws/chime-sdk-voice/model/ListVoiceConnectorsPaginationTraits.h>
 #include <aws/chime-sdk-voice/model/ListVoiceConnectorsRequest.h>
 #include <aws/chime-sdk-voice/model/ListVoiceConnectorsResult.h>
+#include <aws/chime-sdk-voice/model/ListVoiceProfileDomainsPaginationTraits.h>
 #include <aws/chime-sdk-voice/model/ListVoiceProfileDomainsRequest.h>
 #include <aws/chime-sdk-voice/model/ListVoiceProfileDomainsResult.h>
+#include <aws/chime-sdk-voice/model/ListVoiceProfilesPaginationTraits.h>
 #include <aws/chime-sdk-voice/model/ListVoiceProfilesRequest.h>
 #include <aws/chime-sdk-voice/model/ListVoiceProfilesResult.h>
 #include <aws/chime-sdk-voice/model/LoggingConfiguration.h>
@@ -178,6 +190,7 @@
 #include <aws/chime-sdk-voice/model/PutVoiceConnectorTerminationResult.h>
 #include <aws/chime-sdk-voice/model/RestorePhoneNumberRequest.h>
 #include <aws/chime-sdk-voice/model/RestorePhoneNumberResult.h>
+#include <aws/chime-sdk-voice/model/SearchAvailablePhoneNumbersPaginationTraits.h>
 #include <aws/chime-sdk-voice/model/SearchAvailablePhoneNumbersRequest.h>
 #include <aws/chime-sdk-voice/model/SearchAvailablePhoneNumbersResult.h>
 #include <aws/chime-sdk-voice/model/ServerSideEncryptionConfiguration.h>
diff --git a/generated/tests/cleanrooms-gen-tests/CleanRoomsIncludeTests.cpp b/generated/tests/cleanrooms-gen-tests/CleanRoomsIncludeTests.cpp
index ca76bbd4636c..d868fccc4c92 100644
--- a/generated/tests/cleanrooms-gen-tests/CleanRoomsIncludeTests.cpp
+++ b/generated/tests/cleanrooms-gen-tests/CleanRoomsIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/cleanrooms/CleanRoomsClient.h>
+#include <aws/cleanrooms/CleanRoomsClientPagination.h>
 #include <aws/cleanrooms/CleanRoomsEndpointProvider.h>
 #include <aws/cleanrooms/CleanRoomsErrorMarshaller.h>
 #include <aws/cleanrooms/CleanRoomsErrors.h>
+#include <aws/cleanrooms/CleanRoomsPaginationBase.h>
 #include <aws/cleanrooms/CleanRoomsRequest.h>
 #include <aws/cleanrooms/CleanRoomsServiceClientModel.h>
+#include <aws/cleanrooms/CleanRoomsWaiter.h>
 #include <aws/cleanrooms/CleanRooms_EXPORTS.h>
+#include <aws/cleanrooms/internal/CleanRoomsEndpointRules.h>
 #include <aws/cleanrooms/model/AccessBudget.h>
 #include <aws/cleanrooms/model/AccessBudgetDetails.h>
 #include <aws/cleanrooms/model/AccessBudgetType.h>
@@ -304,50 +308,73 @@
 #include <aws/cleanrooms/model/JobType.h>
 #include <aws/cleanrooms/model/JoinOperator.h>
 #include <aws/cleanrooms/model/JoinRequiredOption.h>
+#include <aws/cleanrooms/model/ListAnalysisLogExportsPaginationTraits.h>
 #include <aws/cleanrooms/model/ListAnalysisLogExportsRequest.h>
 #include <aws/cleanrooms/model/ListAnalysisLogExportsResult.h>
+#include <aws/cleanrooms/model/ListAnalysisTemplatesPaginationTraits.h>
 #include <aws/cleanrooms/model/ListAnalysisTemplatesRequest.h>
 #include <aws/cleanrooms/model/ListAnalysisTemplatesResult.h>
+#include <aws/cleanrooms/model/ListCollaborationAnalysisTemplatesPaginationTraits.h>
 #include <aws/cleanrooms/model/ListCollaborationAnalysisTemplatesRequest.h>
 #include <aws/cleanrooms/model/ListCollaborationAnalysisTemplatesResult.h>
+#include <aws/cleanrooms/model/ListCollaborationChangeRequestsPaginationTraits.h>
 #include <aws/cleanrooms/model/ListCollaborationChangeRequestsRequest.h>
 #include <aws/cleanrooms/model/ListCollaborationChangeRequestsResult.h>
+#include <aws/cleanrooms/model/ListCollaborationConfiguredAudienceModelAssociationsPaginationTraits.h>
 #include <aws/cleanrooms/model/ListCollaborationConfiguredAudienceModelAssociationsRequest.h>
 #include <aws/cleanrooms/model/ListCollaborationConfiguredAudienceModelAssociationsResult.h>
+#include <aws/cleanrooms/model/ListCollaborationIdNamespaceAssociationsPaginationTraits.h>
 #include <aws/cleanrooms/model/ListCollaborationIdNamespaceAssociationsRequest.h>
 #include <aws/cleanrooms/model/ListCollaborationIdNamespaceAssociationsResult.h>
+#include <aws/cleanrooms/model/ListCollaborationPrivacyBudgetTemplatesPaginationTraits.h>
 #include <aws/cleanrooms/model/ListCollaborationPrivacyBudgetTemplatesRequest.h>
 #include <aws/cleanrooms/model/ListCollaborationPrivacyBudgetTemplatesResult.h>
+#include <aws/cleanrooms/model/ListCollaborationPrivacyBudgetsPaginationTraits.h>
 #include <aws/cleanrooms/model/ListCollaborationPrivacyBudgetsRequest.h>
 #include <aws/cleanrooms/model/ListCollaborationPrivacyBudgetsResult.h>
+#include <aws/cleanrooms/model/ListCollaborationsPaginationTraits.h>
 #include <aws/cleanrooms/model/ListCollaborationsRequest.h>
 #include <aws/cleanrooms/model/ListCollaborationsResult.h>
+#include <aws/cleanrooms/model/ListConfiguredAudienceModelAssociationsPaginationTraits.h>
 #include <aws/cleanrooms/model/ListConfiguredAudienceModelAssociationsRequest.h>
 #include <aws/cleanrooms/model/ListConfiguredAudienceModelAssociationsResult.h>
+#include <aws/cleanrooms/model/ListConfiguredTableAssociationsPaginationTraits.h>
 #include <aws/cleanrooms/model/ListConfiguredTableAssociationsRequest.h>
 #include <aws/cleanrooms/model/ListConfiguredTableAssociationsResult.h>
+#include <aws/cleanrooms/model/ListConfiguredTablesPaginationTraits.h>
 #include <aws/cleanrooms/model/ListConfiguredTablesRequest.h>
 #include <aws/cleanrooms/model/ListConfiguredTablesResult.h>
+#include <aws/cleanrooms/model/ListIdMappingTablesPaginationTraits.h>
 #include <aws/cleanrooms/model/ListIdMappingTablesRequest.h>
 #include <aws/cleanrooms/model/ListIdMappingTablesResult.h>
+#include <aws/cleanrooms/model/ListIdNamespaceAssociationsPaginationTraits.h>
 #include <aws/cleanrooms/model/ListIdNamespaceAssociationsRequest.h>
 #include <aws/cleanrooms/model/ListIdNamespaceAssociationsResult.h>
+#include <aws/cleanrooms/model/ListIntermediateTableVersionsPaginationTraits.h>
 #include <aws/cleanrooms/model/ListIntermediateTableVersionsRequest.h>
 #include <aws/cleanrooms/model/ListIntermediateTableVersionsResult.h>
+#include <aws/cleanrooms/model/ListIntermediateTablesPaginationTraits.h>
 #include <aws/cleanrooms/model/ListIntermediateTablesRequest.h>
 #include <aws/cleanrooms/model/ListIntermediateTablesResult.h>
+#include <aws/cleanrooms/model/ListMembersPaginationTraits.h>
 #include <aws/cleanrooms/model/ListMembersRequest.h>
 #include <aws/cleanrooms/model/ListMembersResult.h>
+#include <aws/cleanrooms/model/ListMembershipsPaginationTraits.h>
 #include <aws/cleanrooms/model/ListMembershipsRequest.h>
 #include <aws/cleanrooms/model/ListMembershipsResult.h>
+#include <aws/cleanrooms/model/ListPrivacyBudgetTemplatesPaginationTraits.h>
 #include <aws/cleanrooms/model/ListPrivacyBudgetTemplatesRequest.h>
 #include <aws/cleanrooms/model/ListPrivacyBudgetTemplatesResult.h>
+#include <aws/cleanrooms/model/ListPrivacyBudgetsPaginationTraits.h>
 #include <aws/cleanrooms/model/ListPrivacyBudgetsRequest.h>
 #include <aws/cleanrooms/model/ListPrivacyBudgetsResult.h>
+#include <aws/cleanrooms/model/ListProtectedJobsPaginationTraits.h>
 #include <aws/cleanrooms/model/ListProtectedJobsRequest.h>
 #include <aws/cleanrooms/model/ListProtectedJobsResult.h>
+#include <aws/cleanrooms/model/ListProtectedQueriesPaginationTraits.h>
 #include <aws/cleanrooms/model/ListProtectedQueriesRequest.h>
 #include <aws/cleanrooms/model/ListProtectedQueriesResult.h>
+#include <aws/cleanrooms/model/ListSchemasPaginationTraits.h>
 #include <aws/cleanrooms/model/ListSchemasRequest.h>
 #include <aws/cleanrooms/model/ListSchemasResult.h>
 #include <aws/cleanrooms/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/cleanroomsml-gen-tests/CleanRoomsMLIncludeTests.cpp b/generated/tests/cleanroomsml-gen-tests/CleanRoomsMLIncludeTests.cpp
index 1310706ff2b2..854a1af40cfe 100644
--- a/generated/tests/cleanroomsml-gen-tests/CleanRoomsMLIncludeTests.cpp
+++ b/generated/tests/cleanroomsml-gen-tests/CleanRoomsMLIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/cleanroomsml/CleanRoomsMLClient.h>
+#include <aws/cleanroomsml/CleanRoomsMLClientPagination.h>
 #include <aws/cleanroomsml/CleanRoomsMLEndpointProvider.h>
 #include <aws/cleanroomsml/CleanRoomsMLErrorMarshaller.h>
 #include <aws/cleanroomsml/CleanRoomsMLErrors.h>
+#include <aws/cleanroomsml/CleanRoomsMLPaginationBase.h>
 #include <aws/cleanroomsml/CleanRoomsMLRequest.h>
 #include <aws/cleanroomsml/CleanRoomsMLServiceClientModel.h>
+#include <aws/cleanroomsml/CleanRoomsMLWaiter.h>
 #include <aws/cleanroomsml/CleanRoomsML_EXPORTS.h>
+#include <aws/cleanroomsml/internal/CleanRoomsMLEndpointRules.h>
 #include <aws/cleanroomsml/model/AccessBudget.h>
 #include <aws/cleanroomsml/model/AccessBudgetDetails.h>
 #include <aws/cleanroomsml/model/AccessBudgetType.h>
@@ -118,38 +122,54 @@
 #include <aws/cleanroomsml/model/InputChannel.h>
 #include <aws/cleanroomsml/model/InputChannelDataSource.h>
 #include <aws/cleanroomsml/model/InstanceType.h>
+#include <aws/cleanroomsml/model/ListAudienceExportJobsPaginationTraits.h>
 #include <aws/cleanroomsml/model/ListAudienceExportJobsRequest.h>
 #include <aws/cleanroomsml/model/ListAudienceExportJobsResult.h>
+#include <aws/cleanroomsml/model/ListAudienceGenerationJobsPaginationTraits.h>
 #include <aws/cleanroomsml/model/ListAudienceGenerationJobsRequest.h>
 #include <aws/cleanroomsml/model/ListAudienceGenerationJobsResult.h>
+#include <aws/cleanroomsml/model/ListAudienceModelsPaginationTraits.h>
 #include <aws/cleanroomsml/model/ListAudienceModelsRequest.h>
 #include <aws/cleanroomsml/model/ListAudienceModelsResult.h>
+#include <aws/cleanroomsml/model/ListCollaborationConfiguredModelAlgorithmAssociationsPaginationTraits.h>
 #include <aws/cleanroomsml/model/ListCollaborationConfiguredModelAlgorithmAssociationsRequest.h>
 #include <aws/cleanroomsml/model/ListCollaborationConfiguredModelAlgorithmAssociationsResult.h>
+#include <aws/cleanroomsml/model/ListCollaborationMLInputChannelsPaginationTraits.h>
 #include <aws/cleanroomsml/model/ListCollaborationMLInputChannelsRequest.h>
 #include <aws/cleanroomsml/model/ListCollaborationMLInputChannelsResult.h>
+#include <aws/cleanroomsml/model/ListCollaborationTrainedModelExportJobsPaginationTraits.h>
 #include <aws/cleanroomsml/model/ListCollaborationTrainedModelExportJobsRequest.h>
 #include <aws/cleanroomsml/model/ListCollaborationTrainedModelExportJobsResult.h>
+#include <aws/cleanroomsml/model/ListCollaborationTrainedModelInferenceJobsPaginationTraits.h>
 #include <aws/cleanroomsml/model/ListCollaborationTrainedModelInferenceJobsRequest.h>
 #include <aws/cleanroomsml/model/ListCollaborationTrainedModelInferenceJobsResult.h>
+#include <aws/cleanroomsml/model/ListCollaborationTrainedModelsPaginationTraits.h>
 #include <aws/cleanroomsml/model/ListCollaborationTrainedModelsRequest.h>
 #include <aws/cleanroomsml/model/ListCollaborationTrainedModelsResult.h>
+#include <aws/cleanroomsml/model/ListConfiguredAudienceModelsPaginationTraits.h>
 #include <aws/cleanroomsml/model/ListConfiguredAudienceModelsRequest.h>
 #include <aws/cleanroomsml/model/ListConfiguredAudienceModelsResult.h>
+#include <aws/cleanroomsml/model/ListConfiguredModelAlgorithmAssociationsPaginationTraits.h>
 #include <aws/cleanroomsml/model/ListConfiguredModelAlgorithmAssociationsRequest.h>
 #include <aws/cleanroomsml/model/ListConfiguredModelAlgorithmAssociationsResult.h>
+#include <aws/cleanroomsml/model/ListConfiguredModelAlgorithmsPaginationTraits.h>
 #include <aws/cleanroomsml/model/ListConfiguredModelAlgorithmsRequest.h>
 #include <aws/cleanroomsml/model/ListConfiguredModelAlgorithmsResult.h>
+#include <aws/cleanroomsml/model/ListMLInputChannelsPaginationTraits.h>
 #include <aws/cleanroomsml/model/ListMLInputChannelsRequest.h>
 #include <aws/cleanroomsml/model/ListMLInputChannelsResult.h>
 #include <aws/cleanroomsml/model/ListTagsForResourceRequest.h>
 #include <aws/cleanroomsml/model/ListTagsForResourceResult.h>
+#include <aws/cleanroomsml/model/ListTrainedModelInferenceJobsPaginationTraits.h>
 #include <aws/cleanroomsml/model/ListTrainedModelInferenceJobsRequest.h>
 #include <aws/cleanroomsml/model/ListTrainedModelInferenceJobsResult.h>
+#include <aws/cleanroomsml/model/ListTrainedModelVersionsPaginationTraits.h>
 #include <aws/cleanroomsml/model/ListTrainedModelVersionsRequest.h>
 #include <aws/cleanroomsml/model/ListTrainedModelVersionsResult.h>
+#include <aws/cleanroomsml/model/ListTrainedModelsPaginationTraits.h>
 #include <aws/cleanroomsml/model/ListTrainedModelsRequest.h>
 #include <aws/cleanroomsml/model/ListTrainedModelsResult.h>
+#include <aws/cleanroomsml/model/ListTrainingDatasetsPaginationTraits.h>
 #include <aws/cleanroomsml/model/ListTrainingDatasetsRequest.h>
 #include <aws/cleanroomsml/model/ListTrainingDatasetsResult.h>
 #include <aws/cleanroomsml/model/LogRedactionConfiguration.h>
diff --git a/generated/tests/cloud9-gen-tests/Cloud9IncludeTests.cpp b/generated/tests/cloud9-gen-tests/Cloud9IncludeTests.cpp
index ed87e0e389d6..cdf491bbc579 100644
--- a/generated/tests/cloud9-gen-tests/Cloud9IncludeTests.cpp
+++ b/generated/tests/cloud9-gen-tests/Cloud9IncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/cloud9/Cloud9Client.h>
+#include <aws/cloud9/Cloud9ClientPagination.h>
 #include <aws/cloud9/Cloud9EndpointProvider.h>
 #include <aws/cloud9/Cloud9ErrorMarshaller.h>
 #include <aws/cloud9/Cloud9Errors.h>
+#include <aws/cloud9/Cloud9PaginationBase.h>
 #include <aws/cloud9/Cloud9Request.h>
 #include <aws/cloud9/Cloud9ServiceClientModel.h>
+#include <aws/cloud9/Cloud9Waiter.h>
 #include <aws/cloud9/Cloud9_EXPORTS.h>
+#include <aws/cloud9/internal/Cloud9EndpointRules.h>
 #include <aws/cloud9/model/ConnectionType.h>
 #include <aws/cloud9/model/CreateEnvironmentEC2Request.h>
 #include <aws/cloud9/model/CreateEnvironmentEC2Result.h>
@@ -22,6 +26,7 @@
 #include <aws/cloud9/model/DeleteEnvironmentMembershipResult.h>
 #include <aws/cloud9/model/DeleteEnvironmentRequest.h>
 #include <aws/cloud9/model/DeleteEnvironmentResult.h>
+#include <aws/cloud9/model/DescribeEnvironmentMembershipsPaginationTraits.h>
 #include <aws/cloud9/model/DescribeEnvironmentMembershipsRequest.h>
 #include <aws/cloud9/model/DescribeEnvironmentMembershipsResult.h>
 #include <aws/cloud9/model/DescribeEnvironmentStatusRequest.h>
@@ -34,6 +39,7 @@
 #include <aws/cloud9/model/EnvironmentMember.h>
 #include <aws/cloud9/model/EnvironmentStatus.h>
 #include <aws/cloud9/model/EnvironmentType.h>
+#include <aws/cloud9/model/ListEnvironmentsPaginationTraits.h>
 #include <aws/cloud9/model/ListEnvironmentsRequest.h>
 #include <aws/cloud9/model/ListEnvironmentsResult.h>
 #include <aws/cloud9/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/cloudcontrol-gen-tests/CloudControlApiIncludeTests.cpp b/generated/tests/cloudcontrol-gen-tests/CloudControlApiIncludeTests.cpp
index 7e2158497517..4923a0a9599d 100644
--- a/generated/tests/cloudcontrol-gen-tests/CloudControlApiIncludeTests.cpp
+++ b/generated/tests/cloudcontrol-gen-tests/CloudControlApiIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/cloudcontrol/CloudControlApiClient.h>
+#include <aws/cloudcontrol/CloudControlApiClientPagination.h>
 #include <aws/cloudcontrol/CloudControlApiEndpointProvider.h>
 #include <aws/cloudcontrol/CloudControlApiErrorMarshaller.h>
 #include <aws/cloudcontrol/CloudControlApiErrors.h>
+#include <aws/cloudcontrol/CloudControlApiPaginationBase.h>
 #include <aws/cloudcontrol/CloudControlApiRequest.h>
 #include <aws/cloudcontrol/CloudControlApiServiceClientModel.h>
+#include <aws/cloudcontrol/CloudControlApiWaiter.h>
 #include <aws/cloudcontrol/CloudControlApi_EXPORTS.h>
+#include <aws/cloudcontrol/internal/CloudControlApiEndpointRules.h>
 #include <aws/cloudcontrol/model/CancelResourceRequestRequest.h>
 #include <aws/cloudcontrol/model/CancelResourceRequestResult.h>
 #include <aws/cloudcontrol/model/CreateResourceRequest.h>
@@ -25,8 +29,10 @@
 #include <aws/cloudcontrol/model/GetResourceResult.h>
 #include <aws/cloudcontrol/model/HandlerErrorCode.h>
 #include <aws/cloudcontrol/model/HookProgressEvent.h>
+#include <aws/cloudcontrol/model/ListResourceRequestsPaginationTraits.h>
 #include <aws/cloudcontrol/model/ListResourceRequestsRequest.h>
 #include <aws/cloudcontrol/model/ListResourceRequestsResult.h>
+#include <aws/cloudcontrol/model/ListResourcesPaginationTraits.h>
 #include <aws/cloudcontrol/model/ListResourcesRequest.h>
 #include <aws/cloudcontrol/model/ListResourcesResult.h>
 #include <aws/cloudcontrol/model/Operation.h>
diff --git a/generated/tests/clouddirectory-gen-tests/CloudDirectoryIncludeTests.cpp b/generated/tests/clouddirectory-gen-tests/CloudDirectoryIncludeTests.cpp
index bf99d714f90c..dfadb55ea40c 100644
--- a/generated/tests/clouddirectory-gen-tests/CloudDirectoryIncludeTests.cpp
+++ b/generated/tests/clouddirectory-gen-tests/CloudDirectoryIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/clouddirectory/CloudDirectoryClient.h>
+#include <aws/clouddirectory/CloudDirectoryClientPagination.h>
 #include <aws/clouddirectory/CloudDirectoryEndpointProvider.h>
 #include <aws/clouddirectory/CloudDirectoryErrorMarshaller.h>
 #include <aws/clouddirectory/CloudDirectoryErrors.h>
+#include <aws/clouddirectory/CloudDirectoryPaginationBase.h>
 #include <aws/clouddirectory/CloudDirectoryRequest.h>
 #include <aws/clouddirectory/CloudDirectoryServiceClientModel.h>
+#include <aws/clouddirectory/CloudDirectoryWaiter.h>
 #include <aws/clouddirectory/CloudDirectory_EXPORTS.h>
+#include <aws/clouddirectory/internal/CloudDirectoryEndpointRules.h>
 #include <aws/clouddirectory/model/AddFacetToObjectRequest.h>
 #include <aws/clouddirectory/model/AddFacetToObjectResult.h>
 #include <aws/clouddirectory/model/ApplySchemaRequest.h>
@@ -161,46 +165,65 @@
 #include <aws/clouddirectory/model/IndexAttachment.h>
 #include <aws/clouddirectory/model/LinkAttributeAction.h>
 #include <aws/clouddirectory/model/LinkAttributeUpdate.h>
+#include <aws/clouddirectory/model/ListAppliedSchemaArnsPaginationTraits.h>
 #include <aws/clouddirectory/model/ListAppliedSchemaArnsRequest.h>
 #include <aws/clouddirectory/model/ListAppliedSchemaArnsResult.h>
+#include <aws/clouddirectory/model/ListAttachedIndicesPaginationTraits.h>
 #include <aws/clouddirectory/model/ListAttachedIndicesRequest.h>
 #include <aws/clouddirectory/model/ListAttachedIndicesResult.h>
+#include <aws/clouddirectory/model/ListDevelopmentSchemaArnsPaginationTraits.h>
 #include <aws/clouddirectory/model/ListDevelopmentSchemaArnsRequest.h>
 #include <aws/clouddirectory/model/ListDevelopmentSchemaArnsResult.h>
+#include <aws/clouddirectory/model/ListDirectoriesPaginationTraits.h>
 #include <aws/clouddirectory/model/ListDirectoriesRequest.h>
 #include <aws/clouddirectory/model/ListDirectoriesResult.h>
+#include <aws/clouddirectory/model/ListFacetAttributesPaginationTraits.h>
 #include <aws/clouddirectory/model/ListFacetAttributesRequest.h>
 #include <aws/clouddirectory/model/ListFacetAttributesResult.h>
+#include <aws/clouddirectory/model/ListFacetNamesPaginationTraits.h>
 #include <aws/clouddirectory/model/ListFacetNamesRequest.h>
 #include <aws/clouddirectory/model/ListFacetNamesResult.h>
 #include <aws/clouddirectory/model/ListIncomingTypedLinksRequest.h>
 #include <aws/clouddirectory/model/ListIncomingTypedLinksResult.h>
+#include <aws/clouddirectory/model/ListIndexPaginationTraits.h>
 #include <aws/clouddirectory/model/ListIndexRequest.h>
 #include <aws/clouddirectory/model/ListIndexResult.h>
+#include <aws/clouddirectory/model/ListManagedSchemaArnsPaginationTraits.h>
 #include <aws/clouddirectory/model/ListManagedSchemaArnsRequest.h>
 #include <aws/clouddirectory/model/ListManagedSchemaArnsResult.h>
+#include <aws/clouddirectory/model/ListObjectAttributesPaginationTraits.h>
 #include <aws/clouddirectory/model/ListObjectAttributesRequest.h>
 #include <aws/clouddirectory/model/ListObjectAttributesResult.h>
+#include <aws/clouddirectory/model/ListObjectChildrenPaginationTraits.h>
 #include <aws/clouddirectory/model/ListObjectChildrenRequest.h>
 #include <aws/clouddirectory/model/ListObjectChildrenResult.h>
+#include <aws/clouddirectory/model/ListObjectParentPathsPaginationTraits.h>
 #include <aws/clouddirectory/model/ListObjectParentPathsRequest.h>
 #include <aws/clouddirectory/model/ListObjectParentPathsResult.h>
+#include <aws/clouddirectory/model/ListObjectParentsPaginationTraits.h>
 #include <aws/clouddirectory/model/ListObjectParentsRequest.h>
 #include <aws/clouddirectory/model/ListObjectParentsResult.h>
+#include <aws/clouddirectory/model/ListObjectPoliciesPaginationTraits.h>
 #include <aws/clouddirectory/model/ListObjectPoliciesRequest.h>
 #include <aws/clouddirectory/model/ListObjectPoliciesResult.h>
 #include <aws/clouddirectory/model/ListOutgoingTypedLinksRequest.h>
 #include <aws/clouddirectory/model/ListOutgoingTypedLinksResult.h>
+#include <aws/clouddirectory/model/ListPolicyAttachmentsPaginationTraits.h>
 #include <aws/clouddirectory/model/ListPolicyAttachmentsRequest.h>
 #include <aws/clouddirectory/model/ListPolicyAttachmentsResult.h>
+#include <aws/clouddirectory/model/ListPublishedSchemaArnsPaginationTraits.h>
 #include <aws/clouddirectory/model/ListPublishedSchemaArnsRequest.h>
 #include <aws/clouddirectory/model/ListPublishedSchemaArnsResult.h>
+#include <aws/clouddirectory/model/ListTagsForResourcePaginationTraits.h>
 #include <aws/clouddirectory/model/ListTagsForResourceRequest.h>
 #include <aws/clouddirectory/model/ListTagsForResourceResult.h>
+#include <aws/clouddirectory/model/ListTypedLinkFacetAttributesPaginationTraits.h>
 #include <aws/clouddirectory/model/ListTypedLinkFacetAttributesRequest.h>
 #include <aws/clouddirectory/model/ListTypedLinkFacetAttributesResult.h>
+#include <aws/clouddirectory/model/ListTypedLinkFacetNamesPaginationTraits.h>
 #include <aws/clouddirectory/model/ListTypedLinkFacetNamesRequest.h>
 #include <aws/clouddirectory/model/ListTypedLinkFacetNamesResult.h>
+#include <aws/clouddirectory/model/LookupPolicyPaginationTraits.h>
 #include <aws/clouddirectory/model/LookupPolicyRequest.h>
 #include <aws/clouddirectory/model/LookupPolicyResult.h>
 #include <aws/clouddirectory/model/ObjectAttributeAction.h>
diff --git a/generated/tests/cloudformation-gen-tests/CloudFormationIncludeTests.cpp b/generated/tests/cloudformation-gen-tests/CloudFormationIncludeTests.cpp
index fcfa7e0e009f..6519a6a031c8 100644
--- a/generated/tests/cloudformation-gen-tests/CloudFormationIncludeTests.cpp
+++ b/generated/tests/cloudformation-gen-tests/CloudFormationIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/cloudformation/CloudFormationClient.h>
+#include <aws/cloudformation/CloudFormationClientPagination.h>
 #include <aws/cloudformation/CloudFormationEndpointProvider.h>
 #include <aws/cloudformation/CloudFormationErrorMarshaller.h>
 #include <aws/cloudformation/CloudFormationErrors.h>
+#include <aws/cloudformation/CloudFormationPaginationBase.h>
 #include <aws/cloudformation/CloudFormationRequest.h>
 #include <aws/cloudformation/CloudFormationServiceClientModel.h>
+#include <aws/cloudformation/CloudFormationWaiter.h>
 #include <aws/cloudformation/CloudFormation_EXPORTS.h>
+#include <aws/cloudformation/internal/CloudFormationEndpointRules.h>
 #include <aws/cloudformation/model/AccountFilterType.h>
 #include <aws/cloudformation/model/AccountGateResult.h>
 #include <aws/cloudformation/model/AccountGateStatus.h>
@@ -82,12 +86,15 @@
 #include <aws/cloudformation/model/DeprecatedStatus.h>
 #include <aws/cloudformation/model/DeregisterTypeRequest.h>
 #include <aws/cloudformation/model/DeregisterTypeResult.h>
+#include <aws/cloudformation/model/DescribeAccountLimitsPaginationTraits.h>
 #include <aws/cloudformation/model/DescribeAccountLimitsRequest.h>
 #include <aws/cloudformation/model/DescribeAccountLimitsResult.h>
 #include <aws/cloudformation/model/DescribeChangeSetHooksRequest.h>
 #include <aws/cloudformation/model/DescribeChangeSetHooksResult.h>
+#include <aws/cloudformation/model/DescribeChangeSetPaginationTraits.h>
 #include <aws/cloudformation/model/DescribeChangeSetRequest.h>
 #include <aws/cloudformation/model/DescribeChangeSetResult.h>
+#include <aws/cloudformation/model/DescribeEventsPaginationTraits.h>
 #include <aws/cloudformation/model/DescribeEventsRequest.h>
 #include <aws/cloudformation/model/DescribeEventsResult.h>
 #include <aws/cloudformation/model/DescribeGeneratedTemplateRequest.h>
@@ -100,12 +107,14 @@
 #include <aws/cloudformation/model/DescribeResourceScanResult.h>
 #include <aws/cloudformation/model/DescribeStackDriftDetectionStatusRequest.h>
 #include <aws/cloudformation/model/DescribeStackDriftDetectionStatusResult.h>
+#include <aws/cloudformation/model/DescribeStackEventsPaginationTraits.h>
 #include <aws/cloudformation/model/DescribeStackEventsRequest.h>
 #include <aws/cloudformation/model/DescribeStackEventsResult.h>
 #include <aws/cloudformation/model/DescribeStackInstanceRequest.h>
 #include <aws/cloudformation/model/DescribeStackInstanceResult.h>
 #include <aws/cloudformation/model/DescribeStackRefactorRequest.h>
 #include <aws/cloudformation/model/DescribeStackRefactorResult.h>
+#include <aws/cloudformation/model/DescribeStackResourceDriftsPaginationTraits.h>
 #include <aws/cloudformation/model/DescribeStackResourceDriftsRequest.h>
 #include <aws/cloudformation/model/DescribeStackResourceDriftsResult.h>
 #include <aws/cloudformation/model/DescribeStackResourceRequest.h>
@@ -116,6 +125,7 @@
 #include <aws/cloudformation/model/DescribeStackSetOperationResult.h>
 #include <aws/cloudformation/model/DescribeStackSetRequest.h>
 #include <aws/cloudformation/model/DescribeStackSetResult.h>
+#include <aws/cloudformation/model/DescribeStacksPaginationTraits.h>
 #include <aws/cloudformation/model/DescribeStacksRequest.h>
 #include <aws/cloudformation/model/DescribeStacksResult.h>
 #include <aws/cloudformation/model/DescribeTypeRegistrationRequest.h>
@@ -166,47 +176,65 @@
 #include <aws/cloudformation/model/IdentityProvider.h>
 #include <aws/cloudformation/model/ImportStacksToStackSetRequest.h>
 #include <aws/cloudformation/model/ImportStacksToStackSetResult.h>
+#include <aws/cloudformation/model/ListChangeSetsPaginationTraits.h>
 #include <aws/cloudformation/model/ListChangeSetsRequest.h>
 #include <aws/cloudformation/model/ListChangeSetsResult.h>
+#include <aws/cloudformation/model/ListExportsPaginationTraits.h>
 #include <aws/cloudformation/model/ListExportsRequest.h>
 #include <aws/cloudformation/model/ListExportsResult.h>
+#include <aws/cloudformation/model/ListGeneratedTemplatesPaginationTraits.h>
 #include <aws/cloudformation/model/ListGeneratedTemplatesRequest.h>
 #include <aws/cloudformation/model/ListGeneratedTemplatesResult.h>
 #include <aws/cloudformation/model/ListHookResultsRequest.h>
 #include <aws/cloudformation/model/ListHookResultsResult.h>
 #include <aws/cloudformation/model/ListHookResultsTargetType.h>
+#include <aws/cloudformation/model/ListImportsPaginationTraits.h>
 #include <aws/cloudformation/model/ListImportsRequest.h>
 #include <aws/cloudformation/model/ListImportsResult.h>
+#include <aws/cloudformation/model/ListResourceScanRelatedResourcesPaginationTraits.h>
 #include <aws/cloudformation/model/ListResourceScanRelatedResourcesRequest.h>
 #include <aws/cloudformation/model/ListResourceScanRelatedResourcesResult.h>
+#include <aws/cloudformation/model/ListResourceScanResourcesPaginationTraits.h>
 #include <aws/cloudformation/model/ListResourceScanResourcesRequest.h>
 #include <aws/cloudformation/model/ListResourceScanResourcesResult.h>
+#include <aws/cloudformation/model/ListResourceScansPaginationTraits.h>
 #include <aws/cloudformation/model/ListResourceScansRequest.h>
 #include <aws/cloudformation/model/ListResourceScansResult.h>
 #include <aws/cloudformation/model/ListStackInstanceResourceDriftsRequest.h>
 #include <aws/cloudformation/model/ListStackInstanceResourceDriftsResult.h>
+#include <aws/cloudformation/model/ListStackInstancesPaginationTraits.h>
 #include <aws/cloudformation/model/ListStackInstancesRequest.h>
 #include <aws/cloudformation/model/ListStackInstancesResult.h>
+#include <aws/cloudformation/model/ListStackRefactorActionsPaginationTraits.h>
 #include <aws/cloudformation/model/ListStackRefactorActionsRequest.h>
 #include <aws/cloudformation/model/ListStackRefactorActionsResult.h>
+#include <aws/cloudformation/model/ListStackRefactorsPaginationTraits.h>
 #include <aws/cloudformation/model/ListStackRefactorsRequest.h>
 #include <aws/cloudformation/model/ListStackRefactorsResult.h>
+#include <aws/cloudformation/model/ListStackResourcesPaginationTraits.h>
 #include <aws/cloudformation/model/ListStackResourcesRequest.h>
 #include <aws/cloudformation/model/ListStackResourcesResult.h>
 #include <aws/cloudformation/model/ListStackSetAutoDeploymentTargetsRequest.h>
 #include <aws/cloudformation/model/ListStackSetAutoDeploymentTargetsResult.h>
+#include <aws/cloudformation/model/ListStackSetOperationResultsPaginationTraits.h>
 #include <aws/cloudformation/model/ListStackSetOperationResultsRequest.h>
 #include <aws/cloudformation/model/ListStackSetOperationResultsResult.h>
+#include <aws/cloudformation/model/ListStackSetOperationsPaginationTraits.h>
 #include <aws/cloudformation/model/ListStackSetOperationsRequest.h>
 #include <aws/cloudformation/model/ListStackSetOperationsResult.h>
+#include <aws/cloudformation/model/ListStackSetsPaginationTraits.h>
 #include <aws/cloudformation/model/ListStackSetsRequest.h>
 #include <aws/cloudformation/model/ListStackSetsResult.h>
+#include <aws/cloudformation/model/ListStacksPaginationTraits.h>
 #include <aws/cloudformation/model/ListStacksRequest.h>
 #include <aws/cloudformation/model/ListStacksResult.h>
+#include <aws/cloudformation/model/ListTypeRegistrationsPaginationTraits.h>
 #include <aws/cloudformation/model/ListTypeRegistrationsRequest.h>
 #include <aws/cloudformation/model/ListTypeRegistrationsResult.h>
+#include <aws/cloudformation/model/ListTypeVersionsPaginationTraits.h>
 #include <aws/cloudformation/model/ListTypeVersionsRequest.h>
 #include <aws/cloudformation/model/ListTypeVersionsResult.h>
+#include <aws/cloudformation/model/ListTypesPaginationTraits.h>
 #include <aws/cloudformation/model/ListTypesRequest.h>
 #include <aws/cloudformation/model/ListTypesResult.h>
 #include <aws/cloudformation/model/LiveResourceDrift.h>
diff --git a/generated/tests/cloudfront-gen-tests/CloudFrontIncludeTests.cpp b/generated/tests/cloudfront-gen-tests/CloudFrontIncludeTests.cpp
index 882b715efb6c..3c12bba27580 100644
--- a/generated/tests/cloudfront-gen-tests/CloudFrontIncludeTests.cpp
+++ b/generated/tests/cloudfront-gen-tests/CloudFrontIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/cloudfront/CloudFrontClient.h>
+#include <aws/cloudfront/CloudFrontClientPagination.h>
 #include <aws/cloudfront/CloudFrontEndpointProvider.h>
 #include <aws/cloudfront/CloudFrontErrorMarshaller.h>
 #include <aws/cloudfront/CloudFrontErrors.h>
+#include <aws/cloudfront/CloudFrontPaginationBase.h>
 #include <aws/cloudfront/CloudFrontRequest.h>
 #include <aws/cloudfront/CloudFrontServiceClientModel.h>
+#include <aws/cloudfront/CloudFrontWaiter.h>
 #include <aws/cloudfront/CloudFront_EXPORTS.h>
+#include <aws/cloudfront/internal/CloudFrontEndpointRules.h>
 #include <aws/cloudfront/model/ActiveTrustedKeyGroups.h>
 #include <aws/cloudfront/model/ActiveTrustedSigners.h>
 #include <aws/cloudfront/model/AliasICPRecordal.h>
@@ -323,18 +327,23 @@
 #include <aws/cloudfront/model/ListCachePolicies2020_05_31Result.h>
 #include <aws/cloudfront/model/ListCloudFrontOriginAccessIdentities2020_05_31Request.h>
 #include <aws/cloudfront/model/ListCloudFrontOriginAccessIdentities2020_05_31Result.h>
+#include <aws/cloudfront/model/ListCloudFrontOriginAccessIdentitiesPaginationTraits.h>
 #include <aws/cloudfront/model/ListConflictingAliases2020_05_31Request.h>
 #include <aws/cloudfront/model/ListConflictingAliases2020_05_31Result.h>
 #include <aws/cloudfront/model/ListConnectionFunctions2020_05_31Request.h>
 #include <aws/cloudfront/model/ListConnectionFunctions2020_05_31Result.h>
+#include <aws/cloudfront/model/ListConnectionFunctionsPaginationTraits.h>
 #include <aws/cloudfront/model/ListConnectionGroups2020_05_31Request.h>
 #include <aws/cloudfront/model/ListConnectionGroups2020_05_31Result.h>
+#include <aws/cloudfront/model/ListConnectionGroupsPaginationTraits.h>
 #include <aws/cloudfront/model/ListContinuousDeploymentPolicies2020_05_31Request.h>
 #include <aws/cloudfront/model/ListContinuousDeploymentPolicies2020_05_31Result.h>
 #include <aws/cloudfront/model/ListDistributionTenants2020_05_31Request.h>
 #include <aws/cloudfront/model/ListDistributionTenants2020_05_31Result.h>
 #include <aws/cloudfront/model/ListDistributionTenantsByCustomization2020_05_31Request.h>
 #include <aws/cloudfront/model/ListDistributionTenantsByCustomization2020_05_31Result.h>
+#include <aws/cloudfront/model/ListDistributionTenantsByCustomizationPaginationTraits.h>
+#include <aws/cloudfront/model/ListDistributionTenantsPaginationTraits.h>
 #include <aws/cloudfront/model/ListDistributions2020_05_31Request.h>
 #include <aws/cloudfront/model/ListDistributions2020_05_31Result.h>
 #include <aws/cloudfront/model/ListDistributionsByAnycastIpListId2020_05_31Request.h>
@@ -343,8 +352,10 @@
 #include <aws/cloudfront/model/ListDistributionsByCachePolicyId2020_05_31Result.h>
 #include <aws/cloudfront/model/ListDistributionsByConnectionFunction2020_05_31Request.h>
 #include <aws/cloudfront/model/ListDistributionsByConnectionFunction2020_05_31Result.h>
+#include <aws/cloudfront/model/ListDistributionsByConnectionFunctionPaginationTraits.h>
 #include <aws/cloudfront/model/ListDistributionsByConnectionMode2020_05_31Request.h>
 #include <aws/cloudfront/model/ListDistributionsByConnectionMode2020_05_31Result.h>
+#include <aws/cloudfront/model/ListDistributionsByConnectionModePaginationTraits.h>
 #include <aws/cloudfront/model/ListDistributionsByKeyGroup2020_05_31Request.h>
 #include <aws/cloudfront/model/ListDistributionsByKeyGroup2020_05_31Result.h>
 #include <aws/cloudfront/model/ListDistributionsByOriginRequestPolicyId2020_05_31Request.h>
@@ -357,12 +368,15 @@
 #include <aws/cloudfront/model/ListDistributionsByResponseHeadersPolicyId2020_05_31Result.h>
 #include <aws/cloudfront/model/ListDistributionsByTrustStore2020_05_31Request.h>
 #include <aws/cloudfront/model/ListDistributionsByTrustStore2020_05_31Result.h>
+#include <aws/cloudfront/model/ListDistributionsByTrustStorePaginationTraits.h>
 #include <aws/cloudfront/model/ListDistributionsByVpcOriginId2020_05_31Request.h>
 #include <aws/cloudfront/model/ListDistributionsByVpcOriginId2020_05_31Result.h>
 #include <aws/cloudfront/model/ListDistributionsByWebACLId2020_05_31Request.h>
 #include <aws/cloudfront/model/ListDistributionsByWebACLId2020_05_31Result.h>
+#include <aws/cloudfront/model/ListDistributionsPaginationTraits.h>
 #include <aws/cloudfront/model/ListDomainConflicts2020_05_31Request.h>
 #include <aws/cloudfront/model/ListDomainConflicts2020_05_31Result.h>
+#include <aws/cloudfront/model/ListDomainConflictsPaginationTraits.h>
 #include <aws/cloudfront/model/ListFieldLevelEncryptionConfigs2020_05_31Request.h>
 #include <aws/cloudfront/model/ListFieldLevelEncryptionConfigs2020_05_31Result.h>
 #include <aws/cloudfront/model/ListFieldLevelEncryptionProfiles2020_05_31Request.h>
@@ -373,26 +387,33 @@
 #include <aws/cloudfront/model/ListInvalidations2020_05_31Result.h>
 #include <aws/cloudfront/model/ListInvalidationsForDistributionTenant2020_05_31Request.h>
 #include <aws/cloudfront/model/ListInvalidationsForDistributionTenant2020_05_31Result.h>
+#include <aws/cloudfront/model/ListInvalidationsForDistributionTenantPaginationTraits.h>
+#include <aws/cloudfront/model/ListInvalidationsPaginationTraits.h>
 #include <aws/cloudfront/model/ListKeyGroups2020_05_31Request.h>
 #include <aws/cloudfront/model/ListKeyGroups2020_05_31Result.h>
 #include <aws/cloudfront/model/ListKeyValueStores2020_05_31Request.h>
 #include <aws/cloudfront/model/ListKeyValueStores2020_05_31Result.h>
+#include <aws/cloudfront/model/ListKeyValueStoresPaginationTraits.h>
 #include <aws/cloudfront/model/ListOriginAccessControls2020_05_31Request.h>
 #include <aws/cloudfront/model/ListOriginAccessControls2020_05_31Result.h>
+#include <aws/cloudfront/model/ListOriginAccessControlsPaginationTraits.h>
 #include <aws/cloudfront/model/ListOriginRequestPolicies2020_05_31Request.h>
 #include <aws/cloudfront/model/ListOriginRequestPolicies2020_05_31Result.h>
 #include <aws/cloudfront/model/ListPublicKeys2020_05_31Request.h>
 #include <aws/cloudfront/model/ListPublicKeys2020_05_31Result.h>
+#include <aws/cloudfront/model/ListPublicKeysPaginationTraits.h>
 #include <aws/cloudfront/model/ListRealtimeLogConfigs2020_05_31Request.h>
 #include <aws/cloudfront/model/ListRealtimeLogConfigs2020_05_31Result.h>
 #include <aws/cloudfront/model/ListResponseHeadersPolicies2020_05_31Request.h>
 #include <aws/cloudfront/model/ListResponseHeadersPolicies2020_05_31Result.h>
 #include <aws/cloudfront/model/ListStreamingDistributions2020_05_31Request.h>
 #include <aws/cloudfront/model/ListStreamingDistributions2020_05_31Result.h>
+#include <aws/cloudfront/model/ListStreamingDistributionsPaginationTraits.h>
 #include <aws/cloudfront/model/ListTagsForResource2020_05_31Request.h>
 #include <aws/cloudfront/model/ListTagsForResource2020_05_31Result.h>
 #include <aws/cloudfront/model/ListTrustStores2020_05_31Request.h>
 #include <aws/cloudfront/model/ListTrustStores2020_05_31Result.h>
+#include <aws/cloudfront/model/ListTrustStoresPaginationTraits.h>
 #include <aws/cloudfront/model/ListVpcOrigins2020_05_31Request.h>
 #include <aws/cloudfront/model/ListVpcOrigins2020_05_31Result.h>
 #include <aws/cloudfront/model/LoggingConfig.h>
diff --git a/generated/tests/cloudfront-keyvaluestore-gen-tests/CloudFrontKeyValueStoreIncludeTests.cpp b/generated/tests/cloudfront-keyvaluestore-gen-tests/CloudFrontKeyValueStoreIncludeTests.cpp
index e3a0fe4c9bc0..17c746c62d93 100644
--- a/generated/tests/cloudfront-keyvaluestore-gen-tests/CloudFrontKeyValueStoreIncludeTests.cpp
+++ b/generated/tests/cloudfront-keyvaluestore-gen-tests/CloudFrontKeyValueStoreIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/cloudfront-keyvaluestore/CloudFrontKeyValueStoreClient.h>
+#include <aws/cloudfront-keyvaluestore/CloudFrontKeyValueStoreClientPagination.h>
 #include <aws/cloudfront-keyvaluestore/CloudFrontKeyValueStoreEndpointProvider.h>
 #include <aws/cloudfront-keyvaluestore/CloudFrontKeyValueStoreErrorMarshaller.h>
 #include <aws/cloudfront-keyvaluestore/CloudFrontKeyValueStoreErrors.h>
+#include <aws/cloudfront-keyvaluestore/CloudFrontKeyValueStorePaginationBase.h>
 #include <aws/cloudfront-keyvaluestore/CloudFrontKeyValueStoreRequest.h>
 #include <aws/cloudfront-keyvaluestore/CloudFrontKeyValueStoreServiceClientModel.h>
+#include <aws/cloudfront-keyvaluestore/CloudFrontKeyValueStoreWaiter.h>
 #include <aws/cloudfront-keyvaluestore/CloudFrontKeyValueStore_EXPORTS.h>
+#include <aws/cloudfront-keyvaluestore/internal/CloudFrontKeyValueStoreEndpointRules.h>
 #include <aws/cloudfront-keyvaluestore/model/DeleteKeyRequest.h>
 #include <aws/cloudfront-keyvaluestore/model/DeleteKeyRequestListItem.h>
 #include <aws/cloudfront-keyvaluestore/model/DeleteKeyResult.h>
@@ -20,6 +24,7 @@
 #include <aws/cloudfront-keyvaluestore/model/DescribeKeyValueStoreResult.h>
 #include <aws/cloudfront-keyvaluestore/model/GetKeyRequest.h>
 #include <aws/cloudfront-keyvaluestore/model/GetKeyResult.h>
+#include <aws/cloudfront-keyvaluestore/model/ListKeysPaginationTraits.h>
 #include <aws/cloudfront-keyvaluestore/model/ListKeysRequest.h>
 #include <aws/cloudfront-keyvaluestore/model/ListKeysResponseListItem.h>
 #include <aws/cloudfront-keyvaluestore/model/ListKeysResult.h>
diff --git a/generated/tests/cloudhsm-gen-tests/CloudHSMIncludeTests.cpp b/generated/tests/cloudhsm-gen-tests/CloudHSMIncludeTests.cpp
index a32e01097cbb..17bbb8adb495 100644
--- a/generated/tests/cloudhsm-gen-tests/CloudHSMIncludeTests.cpp
+++ b/generated/tests/cloudhsm-gen-tests/CloudHSMIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/cloudhsm/CloudHSMEndpointProvider.h>
 #include <aws/cloudhsm/CloudHSMErrorMarshaller.h>
 #include <aws/cloudhsm/CloudHSMErrors.h>
+#include <aws/cloudhsm/CloudHSMPaginationBase.h>
 #include <aws/cloudhsm/CloudHSMRequest.h>
 #include <aws/cloudhsm/CloudHSMServiceClientModel.h>
+#include <aws/cloudhsm/CloudHSMWaiter.h>
 #include <aws/cloudhsm/CloudHSM_EXPORTS.h>
+#include <aws/cloudhsm/internal/CloudHSMEndpointRules.h>
 #include <aws/cloudhsm/model/ClientVersion.h>
 #include <aws/cloudhsm/model/CloudHsmObjectState.h>
 #include <aws/cloudhsm/model/HsmStatus.h>
diff --git a/generated/tests/cloudhsmv2-gen-tests/CloudHSMV2IncludeTests.cpp b/generated/tests/cloudhsmv2-gen-tests/CloudHSMV2IncludeTests.cpp
index 896c4636fd6d..afad1270e0a4 100644
--- a/generated/tests/cloudhsmv2-gen-tests/CloudHSMV2IncludeTests.cpp
+++ b/generated/tests/cloudhsmv2-gen-tests/CloudHSMV2IncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/cloudhsmv2/CloudHSMV2Client.h>
+#include <aws/cloudhsmv2/CloudHSMV2ClientPagination.h>
 #include <aws/cloudhsmv2/CloudHSMV2EndpointProvider.h>
 #include <aws/cloudhsmv2/CloudHSMV2ErrorMarshaller.h>
 #include <aws/cloudhsmv2/CloudHSMV2Errors.h>
+#include <aws/cloudhsmv2/CloudHSMV2PaginationBase.h>
 #include <aws/cloudhsmv2/CloudHSMV2Request.h>
 #include <aws/cloudhsmv2/CloudHSMV2ServiceClientModel.h>
+#include <aws/cloudhsmv2/CloudHSMV2Waiter.h>
 #include <aws/cloudhsmv2/CloudHSMV2_EXPORTS.h>
+#include <aws/cloudhsmv2/internal/CloudHSMV2EndpointRules.h>
 #include <aws/cloudhsmv2/model/Backup.h>
 #include <aws/cloudhsmv2/model/BackupPolicy.h>
 #include <aws/cloudhsmv2/model/BackupRetentionPolicy.h>
@@ -36,8 +40,10 @@
 #include <aws/cloudhsmv2/model/DeleteHsmResult.h>
 #include <aws/cloudhsmv2/model/DeleteResourcePolicyRequest.h>
 #include <aws/cloudhsmv2/model/DeleteResourcePolicyResult.h>
+#include <aws/cloudhsmv2/model/DescribeBackupsPaginationTraits.h>
 #include <aws/cloudhsmv2/model/DescribeBackupsRequest.h>
 #include <aws/cloudhsmv2/model/DescribeBackupsResult.h>
+#include <aws/cloudhsmv2/model/DescribeClustersPaginationTraits.h>
 #include <aws/cloudhsmv2/model/DescribeClustersRequest.h>
 #include <aws/cloudhsmv2/model/DescribeClustersResult.h>
 #include <aws/cloudhsmv2/model/DestinationBackup.h>
@@ -47,6 +53,7 @@
 #include <aws/cloudhsmv2/model/HsmState.h>
 #include <aws/cloudhsmv2/model/InitializeClusterRequest.h>
 #include <aws/cloudhsmv2/model/InitializeClusterResult.h>
+#include <aws/cloudhsmv2/model/ListTagsPaginationTraits.h>
 #include <aws/cloudhsmv2/model/ListTagsRequest.h>
 #include <aws/cloudhsmv2/model/ListTagsResult.h>
 #include <aws/cloudhsmv2/model/ModifyBackupAttributesRequest.h>
diff --git a/generated/tests/cloudsearch-gen-tests/CloudSearchIncludeTests.cpp b/generated/tests/cloudsearch-gen-tests/CloudSearchIncludeTests.cpp
index d8e53b464c21..f3322be997cb 100644
--- a/generated/tests/cloudsearch-gen-tests/CloudSearchIncludeTests.cpp
+++ b/generated/tests/cloudsearch-gen-tests/CloudSearchIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/cloudsearch/CloudSearchEndpointProvider.h>
 #include <aws/cloudsearch/CloudSearchErrorMarshaller.h>
 #include <aws/cloudsearch/CloudSearchErrors.h>
+#include <aws/cloudsearch/CloudSearchPaginationBase.h>
 #include <aws/cloudsearch/CloudSearchRequest.h>
 #include <aws/cloudsearch/CloudSearchServiceClientModel.h>
+#include <aws/cloudsearch/CloudSearchWaiter.h>
 #include <aws/cloudsearch/CloudSearch_EXPORTS.h>
+#include <aws/cloudsearch/internal/CloudSearchEndpointRules.h>
 #include <aws/cloudsearch/model/AccessPoliciesStatus.h>
 #include <aws/cloudsearch/model/AlgorithmicStemming.h>
 #include <aws/cloudsearch/model/AnalysisOptions.h>
diff --git a/generated/tests/cloudsearchdomain-gen-tests/CloudSearchDomainIncludeTests.cpp b/generated/tests/cloudsearchdomain-gen-tests/CloudSearchDomainIncludeTests.cpp
index b59ca37a17ef..9fdeafc4578e 100644
--- a/generated/tests/cloudsearchdomain-gen-tests/CloudSearchDomainIncludeTests.cpp
+++ b/generated/tests/cloudsearchdomain-gen-tests/CloudSearchDomainIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/cloudsearchdomain/CloudSearchDomainEndpointProvider.h>
 #include <aws/cloudsearchdomain/CloudSearchDomainErrorMarshaller.h>
 #include <aws/cloudsearchdomain/CloudSearchDomainErrors.h>
+#include <aws/cloudsearchdomain/CloudSearchDomainPaginationBase.h>
 #include <aws/cloudsearchdomain/CloudSearchDomainRequest.h>
 #include <aws/cloudsearchdomain/CloudSearchDomainServiceClientModel.h>
+#include <aws/cloudsearchdomain/CloudSearchDomainWaiter.h>
 #include <aws/cloudsearchdomain/CloudSearchDomain_EXPORTS.h>
+#include <aws/cloudsearchdomain/internal/CloudSearchDomainEndpointRules.h>
 #include <aws/cloudsearchdomain/model/Bucket.h>
 #include <aws/cloudsearchdomain/model/BucketInfo.h>
 #include <aws/cloudsearchdomain/model/ContentType.h>
diff --git a/generated/tests/cloudtrail-data-gen-tests/CloudTrailDataIncludeTests.cpp b/generated/tests/cloudtrail-data-gen-tests/CloudTrailDataIncludeTests.cpp
index 50408af2a810..fb887160cd27 100644
--- a/generated/tests/cloudtrail-data-gen-tests/CloudTrailDataIncludeTests.cpp
+++ b/generated/tests/cloudtrail-data-gen-tests/CloudTrailDataIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/cloudtrail-data/CloudTrailDataEndpointProvider.h>
 #include <aws/cloudtrail-data/CloudTrailDataErrorMarshaller.h>
 #include <aws/cloudtrail-data/CloudTrailDataErrors.h>
+#include <aws/cloudtrail-data/CloudTrailDataPaginationBase.h>
 #include <aws/cloudtrail-data/CloudTrailDataRequest.h>
 #include <aws/cloudtrail-data/CloudTrailDataServiceClientModel.h>
+#include <aws/cloudtrail-data/CloudTrailDataWaiter.h>
 #include <aws/cloudtrail-data/CloudTrailData_EXPORTS.h>
+#include <aws/cloudtrail-data/internal/CloudTrailDataEndpointRules.h>
 #include <aws/cloudtrail-data/model/AuditEvent.h>
 #include <aws/cloudtrail-data/model/AuditEventResultEntry.h>
 #include <aws/cloudtrail-data/model/PutAuditEventsRequest.h>
diff --git a/generated/tests/cloudtrail-gen-tests/CloudTrailIncludeTests.cpp b/generated/tests/cloudtrail-gen-tests/CloudTrailIncludeTests.cpp
index 90a2d3a7d1ab..aefa462426e0 100644
--- a/generated/tests/cloudtrail-gen-tests/CloudTrailIncludeTests.cpp
+++ b/generated/tests/cloudtrail-gen-tests/CloudTrailIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/cloudtrail/CloudTrailClient.h>
+#include <aws/cloudtrail/CloudTrailClientPagination.h>
 #include <aws/cloudtrail/CloudTrailEndpointProvider.h>
 #include <aws/cloudtrail/CloudTrailErrorMarshaller.h>
 #include <aws/cloudtrail/CloudTrailErrors.h>
+#include <aws/cloudtrail/CloudTrailPaginationBase.h>
 #include <aws/cloudtrail/CloudTrailRequest.h>
 #include <aws/cloudtrail/CloudTrailServiceClientModel.h>
+#include <aws/cloudtrail/CloudTrailWaiter.h>
 #include <aws/cloudtrail/CloudTrail_EXPORTS.h>
+#include <aws/cloudtrail/internal/CloudTrailEndpointRules.h>
 #include <aws/cloudtrail/model/AddTagsRequest.h>
 #include <aws/cloudtrail/model/AddTagsResult.h>
 #include <aws/cloudtrail/model/AdvancedEventSelector.h>
@@ -81,6 +85,7 @@
 #include <aws/cloudtrail/model/GetImportResult.h>
 #include <aws/cloudtrail/model/GetInsightSelectorsRequest.h>
 #include <aws/cloudtrail/model/GetInsightSelectorsResult.h>
+#include <aws/cloudtrail/model/GetQueryResultsPaginationTraits.h>
 #include <aws/cloudtrail/model/GetQueryResultsRequest.h>
 #include <aws/cloudtrail/model/GetQueryResultsResult.h>
 #include <aws/cloudtrail/model/GetResourcePolicyRequest.h>
@@ -99,32 +104,43 @@
 #include <aws/cloudtrail/model/InsightSelector.h>
 #include <aws/cloudtrail/model/InsightType.h>
 #include <aws/cloudtrail/model/InsightsMetricDataType.h>
+#include <aws/cloudtrail/model/ListChannelsPaginationTraits.h>
 #include <aws/cloudtrail/model/ListChannelsRequest.h>
 #include <aws/cloudtrail/model/ListChannelsResult.h>
 #include <aws/cloudtrail/model/ListDashboardsRequest.h>
 #include <aws/cloudtrail/model/ListDashboardsResult.h>
+#include <aws/cloudtrail/model/ListEventDataStoresPaginationTraits.h>
 #include <aws/cloudtrail/model/ListEventDataStoresRequest.h>
 #include <aws/cloudtrail/model/ListEventDataStoresResult.h>
+#include <aws/cloudtrail/model/ListImportFailuresPaginationTraits.h>
 #include <aws/cloudtrail/model/ListImportFailuresRequest.h>
 #include <aws/cloudtrail/model/ListImportFailuresResult.h>
+#include <aws/cloudtrail/model/ListImportsPaginationTraits.h>
 #include <aws/cloudtrail/model/ListImportsRequest.h>
 #include <aws/cloudtrail/model/ListImportsResult.h>
 #include <aws/cloudtrail/model/ListInsightsDataDimensionKey.h>
+#include <aws/cloudtrail/model/ListInsightsDataPaginationTraits.h>
 #include <aws/cloudtrail/model/ListInsightsDataRequest.h>
 #include <aws/cloudtrail/model/ListInsightsDataResult.h>
 #include <aws/cloudtrail/model/ListInsightsDataType.h>
+#include <aws/cloudtrail/model/ListInsightsMetricDataPaginationTraits.h>
 #include <aws/cloudtrail/model/ListInsightsMetricDataRequest.h>
 #include <aws/cloudtrail/model/ListInsightsMetricDataResult.h>
+#include <aws/cloudtrail/model/ListPublicKeysPaginationTraits.h>
 #include <aws/cloudtrail/model/ListPublicKeysRequest.h>
 #include <aws/cloudtrail/model/ListPublicKeysResult.h>
+#include <aws/cloudtrail/model/ListQueriesPaginationTraits.h>
 #include <aws/cloudtrail/model/ListQueriesRequest.h>
 #include <aws/cloudtrail/model/ListQueriesResult.h>
+#include <aws/cloudtrail/model/ListTagsPaginationTraits.h>
 #include <aws/cloudtrail/model/ListTagsRequest.h>
 #include <aws/cloudtrail/model/ListTagsResult.h>
+#include <aws/cloudtrail/model/ListTrailsPaginationTraits.h>
 #include <aws/cloudtrail/model/ListTrailsRequest.h>
 #include <aws/cloudtrail/model/ListTrailsResult.h>
 #include <aws/cloudtrail/model/LookupAttribute.h>
 #include <aws/cloudtrail/model/LookupAttributeKey.h>
+#include <aws/cloudtrail/model/LookupEventsPaginationTraits.h>
 #include <aws/cloudtrail/model/LookupEventsRequest.h>
 #include <aws/cloudtrail/model/LookupEventsResult.h>
 #include <aws/cloudtrail/model/MaxEventSize.h>
diff --git a/generated/tests/codeartifact-gen-tests/CodeArtifactIncludeTests.cpp b/generated/tests/codeartifact-gen-tests/CodeArtifactIncludeTests.cpp
index 5693b6798aad..2f50fd4186f5 100644
--- a/generated/tests/codeartifact-gen-tests/CodeArtifactIncludeTests.cpp
+++ b/generated/tests/codeartifact-gen-tests/CodeArtifactIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/codeartifact/CodeArtifactClient.h>
+#include <aws/codeartifact/CodeArtifactClientPagination.h>
 #include <aws/codeartifact/CodeArtifactEndpointProvider.h>
 #include <aws/codeartifact/CodeArtifactErrorMarshaller.h>
 #include <aws/codeartifact/CodeArtifactErrors.h>
+#include <aws/codeartifact/CodeArtifactPaginationBase.h>
 #include <aws/codeartifact/CodeArtifactRequest.h>
 #include <aws/codeartifact/CodeArtifactServiceClientModel.h>
+#include <aws/codeartifact/CodeArtifactWaiter.h>
 #include <aws/codeartifact/CodeArtifact_EXPORTS.h>
+#include <aws/codeartifact/internal/CodeArtifactEndpointRules.h>
 #include <aws/codeartifact/model/AllowPublish.h>
 #include <aws/codeartifact/model/AllowUpstream.h>
 #include <aws/codeartifact/model/AssetSummary.h>
@@ -78,26 +82,36 @@
 #include <aws/codeartifact/model/GetRepositoryPermissionsPolicyResult.h>
 #include <aws/codeartifact/model/HashAlgorithm.h>
 #include <aws/codeartifact/model/LicenseInfo.h>
+#include <aws/codeartifact/model/ListAllowedRepositoriesForGroupPaginationTraits.h>
 #include <aws/codeartifact/model/ListAllowedRepositoriesForGroupRequest.h>
 #include <aws/codeartifact/model/ListAllowedRepositoriesForGroupResult.h>
+#include <aws/codeartifact/model/ListAssociatedPackagesPaginationTraits.h>
 #include <aws/codeartifact/model/ListAssociatedPackagesRequest.h>
 #include <aws/codeartifact/model/ListAssociatedPackagesResult.h>
+#include <aws/codeartifact/model/ListDomainsPaginationTraits.h>
 #include <aws/codeartifact/model/ListDomainsRequest.h>
 #include <aws/codeartifact/model/ListDomainsResult.h>
+#include <aws/codeartifact/model/ListPackageGroupsPaginationTraits.h>
 #include <aws/codeartifact/model/ListPackageGroupsRequest.h>
 #include <aws/codeartifact/model/ListPackageGroupsResult.h>
+#include <aws/codeartifact/model/ListPackageVersionAssetsPaginationTraits.h>
 #include <aws/codeartifact/model/ListPackageVersionAssetsRequest.h>
 #include <aws/codeartifact/model/ListPackageVersionAssetsResult.h>
 #include <aws/codeartifact/model/ListPackageVersionDependenciesRequest.h>
 #include <aws/codeartifact/model/ListPackageVersionDependenciesResult.h>
+#include <aws/codeartifact/model/ListPackageVersionsPaginationTraits.h>
 #include <aws/codeartifact/model/ListPackageVersionsRequest.h>
 #include <aws/codeartifact/model/ListPackageVersionsResult.h>
+#include <aws/codeartifact/model/ListPackagesPaginationTraits.h>
 #include <aws/codeartifact/model/ListPackagesRequest.h>
 #include <aws/codeartifact/model/ListPackagesResult.h>
+#include <aws/codeartifact/model/ListRepositoriesInDomainPaginationTraits.h>
 #include <aws/codeartifact/model/ListRepositoriesInDomainRequest.h>
 #include <aws/codeartifact/model/ListRepositoriesInDomainResult.h>
+#include <aws/codeartifact/model/ListRepositoriesPaginationTraits.h>
 #include <aws/codeartifact/model/ListRepositoriesRequest.h>
 #include <aws/codeartifact/model/ListRepositoriesResult.h>
+#include <aws/codeartifact/model/ListSubPackageGroupsPaginationTraits.h>
 #include <aws/codeartifact/model/ListSubPackageGroupsRequest.h>
 #include <aws/codeartifact/model/ListSubPackageGroupsResult.h>
 #include <aws/codeartifact/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/codebuild-gen-tests/CodeBuildIncludeTests.cpp b/generated/tests/codebuild-gen-tests/CodeBuildIncludeTests.cpp
index 1456883a12a5..4001d7e64a2b 100644
--- a/generated/tests/codebuild-gen-tests/CodeBuildIncludeTests.cpp
+++ b/generated/tests/codebuild-gen-tests/CodeBuildIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/codebuild/CodeBuildClient.h>
+#include <aws/codebuild/CodeBuildClientPagination.h>
 #include <aws/codebuild/CodeBuildEndpointProvider.h>
 #include <aws/codebuild/CodeBuildErrorMarshaller.h>
 #include <aws/codebuild/CodeBuildErrors.h>
+#include <aws/codebuild/CodeBuildPaginationBase.h>
 #include <aws/codebuild/CodeBuildRequest.h>
 #include <aws/codebuild/CodeBuildServiceClientModel.h>
+#include <aws/codebuild/CodeBuildWaiter.h>
 #include <aws/codebuild/CodeBuild_EXPORTS.h>
+#include <aws/codebuild/internal/CodeBuildEndpointRules.h>
 #include <aws/codebuild/model/ArtifactNamespace.h>
 #include <aws/codebuild/model/ArtifactPackaging.h>
 #include <aws/codebuild/model/ArtifactsType.h>
@@ -86,8 +90,10 @@
 #include <aws/codebuild/model/DeleteSourceCredentialsResult.h>
 #include <aws/codebuild/model/DeleteWebhookRequest.h>
 #include <aws/codebuild/model/DeleteWebhookResult.h>
+#include <aws/codebuild/model/DescribeCodeCoveragesPaginationTraits.h>
 #include <aws/codebuild/model/DescribeCodeCoveragesRequest.h>
 #include <aws/codebuild/model/DescribeCodeCoveragesResult.h>
+#include <aws/codebuild/model/DescribeTestCasesPaginationTraits.h>
 #include <aws/codebuild/model/DescribeTestCasesRequest.h>
 #include <aws/codebuild/model/DescribeTestCasesResult.h>
 #include <aws/codebuild/model/DockerServer.h>
@@ -124,34 +130,48 @@
 #include <aws/codebuild/model/InvalidateProjectCacheRequest.h>
 #include <aws/codebuild/model/InvalidateProjectCacheResult.h>
 #include <aws/codebuild/model/LanguageType.h>
+#include <aws/codebuild/model/ListBuildBatchesForProjectPaginationTraits.h>
 #include <aws/codebuild/model/ListBuildBatchesForProjectRequest.h>
 #include <aws/codebuild/model/ListBuildBatchesForProjectResult.h>
+#include <aws/codebuild/model/ListBuildBatchesPaginationTraits.h>
 #include <aws/codebuild/model/ListBuildBatchesRequest.h>
 #include <aws/codebuild/model/ListBuildBatchesResult.h>
+#include <aws/codebuild/model/ListBuildsForProjectPaginationTraits.h>
 #include <aws/codebuild/model/ListBuildsForProjectRequest.h>
 #include <aws/codebuild/model/ListBuildsForProjectResult.h>
+#include <aws/codebuild/model/ListBuildsPaginationTraits.h>
 #include <aws/codebuild/model/ListBuildsRequest.h>
 #include <aws/codebuild/model/ListBuildsResult.h>
+#include <aws/codebuild/model/ListCommandExecutionsForSandboxPaginationTraits.h>
 #include <aws/codebuild/model/ListCommandExecutionsForSandboxRequest.h>
 #include <aws/codebuild/model/ListCommandExecutionsForSandboxResult.h>
 #include <aws/codebuild/model/ListCuratedEnvironmentImagesRequest.h>
 #include <aws/codebuild/model/ListCuratedEnvironmentImagesResult.h>
+#include <aws/codebuild/model/ListFleetsPaginationTraits.h>
 #include <aws/codebuild/model/ListFleetsRequest.h>
 #include <aws/codebuild/model/ListFleetsResult.h>
+#include <aws/codebuild/model/ListProjectsPaginationTraits.h>
 #include <aws/codebuild/model/ListProjectsRequest.h>
 #include <aws/codebuild/model/ListProjectsResult.h>
+#include <aws/codebuild/model/ListReportGroupsPaginationTraits.h>
 #include <aws/codebuild/model/ListReportGroupsRequest.h>
 #include <aws/codebuild/model/ListReportGroupsResult.h>
+#include <aws/codebuild/model/ListReportsForReportGroupPaginationTraits.h>
 #include <aws/codebuild/model/ListReportsForReportGroupRequest.h>
 #include <aws/codebuild/model/ListReportsForReportGroupResult.h>
+#include <aws/codebuild/model/ListReportsPaginationTraits.h>
 #include <aws/codebuild/model/ListReportsRequest.h>
 #include <aws/codebuild/model/ListReportsResult.h>
+#include <aws/codebuild/model/ListSandboxesForProjectPaginationTraits.h>
 #include <aws/codebuild/model/ListSandboxesForProjectRequest.h>
 #include <aws/codebuild/model/ListSandboxesForProjectResult.h>
+#include <aws/codebuild/model/ListSandboxesPaginationTraits.h>
 #include <aws/codebuild/model/ListSandboxesRequest.h>
 #include <aws/codebuild/model/ListSandboxesResult.h>
+#include <aws/codebuild/model/ListSharedProjectsPaginationTraits.h>
 #include <aws/codebuild/model/ListSharedProjectsRequest.h>
 #include <aws/codebuild/model/ListSharedProjectsResult.h>
+#include <aws/codebuild/model/ListSharedReportGroupsPaginationTraits.h>
 #include <aws/codebuild/model/ListSharedReportGroupsRequest.h>
 #include <aws/codebuild/model/ListSharedReportGroupsResult.h>
 #include <aws/codebuild/model/ListSourceCredentialsRequest.h>
diff --git a/generated/tests/codecatalyst-gen-tests/CodeCatalystIncludeTests.cpp b/generated/tests/codecatalyst-gen-tests/CodeCatalystIncludeTests.cpp
index 7dd9ff3224b5..fb0f50aadc9d 100644
--- a/generated/tests/codecatalyst-gen-tests/CodeCatalystIncludeTests.cpp
+++ b/generated/tests/codecatalyst-gen-tests/CodeCatalystIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/codecatalyst/CodeCatalystClient.h>
+#include <aws/codecatalyst/CodeCatalystClientPagination.h>
 #include <aws/codecatalyst/CodeCatalystEndpointProvider.h>
 #include <aws/codecatalyst/CodeCatalystErrorMarshaller.h>
 #include <aws/codecatalyst/CodeCatalystErrors.h>
+#include <aws/codecatalyst/CodeCatalystPaginationBase.h>
 #include <aws/codecatalyst/CodeCatalystRequest.h>
 #include <aws/codecatalyst/CodeCatalystServiceClientModel.h>
+#include <aws/codecatalyst/CodeCatalystWaiter.h>
 #include <aws/codecatalyst/CodeCatalyst_EXPORTS.h>
+#include <aws/codecatalyst/internal/CodeCatalystEndpointRules.h>
 #include <aws/codecatalyst/model/AccessTokenSummary.h>
 #include <aws/codecatalyst/model/ComparisonOperator.h>
 #include <aws/codecatalyst/model/CreateAccessTokenRequest.h>
@@ -69,26 +73,36 @@
 #include <aws/codecatalyst/model/Ide.h>
 #include <aws/codecatalyst/model/IdeConfiguration.h>
 #include <aws/codecatalyst/model/InstanceType.h>
+#include <aws/codecatalyst/model/ListAccessTokensPaginationTraits.h>
 #include <aws/codecatalyst/model/ListAccessTokensRequest.h>
 #include <aws/codecatalyst/model/ListAccessTokensResult.h>
+#include <aws/codecatalyst/model/ListDevEnvironmentSessionsPaginationTraits.h>
 #include <aws/codecatalyst/model/ListDevEnvironmentSessionsRequest.h>
 #include <aws/codecatalyst/model/ListDevEnvironmentSessionsResult.h>
+#include <aws/codecatalyst/model/ListDevEnvironmentsPaginationTraits.h>
 #include <aws/codecatalyst/model/ListDevEnvironmentsRequest.h>
 #include <aws/codecatalyst/model/ListDevEnvironmentsResult.h>
+#include <aws/codecatalyst/model/ListEventLogsPaginationTraits.h>
 #include <aws/codecatalyst/model/ListEventLogsRequest.h>
 #include <aws/codecatalyst/model/ListEventLogsResult.h>
+#include <aws/codecatalyst/model/ListProjectsPaginationTraits.h>
 #include <aws/codecatalyst/model/ListProjectsRequest.h>
 #include <aws/codecatalyst/model/ListProjectsResult.h>
 #include <aws/codecatalyst/model/ListSourceRepositoriesItem.h>
+#include <aws/codecatalyst/model/ListSourceRepositoriesPaginationTraits.h>
 #include <aws/codecatalyst/model/ListSourceRepositoriesRequest.h>
 #include <aws/codecatalyst/model/ListSourceRepositoriesResult.h>
 #include <aws/codecatalyst/model/ListSourceRepositoryBranchesItem.h>
+#include <aws/codecatalyst/model/ListSourceRepositoryBranchesPaginationTraits.h>
 #include <aws/codecatalyst/model/ListSourceRepositoryBranchesRequest.h>
 #include <aws/codecatalyst/model/ListSourceRepositoryBranchesResult.h>
+#include <aws/codecatalyst/model/ListSpacesPaginationTraits.h>
 #include <aws/codecatalyst/model/ListSpacesRequest.h>
 #include <aws/codecatalyst/model/ListSpacesResult.h>
+#include <aws/codecatalyst/model/ListWorkflowRunsPaginationTraits.h>
 #include <aws/codecatalyst/model/ListWorkflowRunsRequest.h>
 #include <aws/codecatalyst/model/ListWorkflowRunsResult.h>
+#include <aws/codecatalyst/model/ListWorkflowsPaginationTraits.h>
 #include <aws/codecatalyst/model/ListWorkflowsRequest.h>
 #include <aws/codecatalyst/model/ListWorkflowsResult.h>
 #include <aws/codecatalyst/model/OperationType.h>
diff --git a/generated/tests/codecommit-gen-tests/CodeCommitIncludeTests.cpp b/generated/tests/codecommit-gen-tests/CodeCommitIncludeTests.cpp
index 83c50f1b4fb9..c67cf3512948 100644
--- a/generated/tests/codecommit-gen-tests/CodeCommitIncludeTests.cpp
+++ b/generated/tests/codecommit-gen-tests/CodeCommitIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/codecommit/CodeCommitClient.h>
+#include <aws/codecommit/CodeCommitClientPagination.h>
 #include <aws/codecommit/CodeCommitEndpointProvider.h>
 #include <aws/codecommit/CodeCommitErrorMarshaller.h>
 #include <aws/codecommit/CodeCommitErrors.h>
+#include <aws/codecommit/CodeCommitPaginationBase.h>
 #include <aws/codecommit/CodeCommitRequest.h>
 #include <aws/codecommit/CodeCommitServiceClientModel.h>
+#include <aws/codecommit/CodeCommitWaiter.h>
 #include <aws/codecommit/CodeCommit_EXPORTS.h>
+#include <aws/codecommit/internal/CodeCommitEndpointRules.h>
 #include <aws/codecommit/model/Approval.h>
 #include <aws/codecommit/model/ApprovalRule.h>
 #include <aws/codecommit/model/ApprovalRuleEventMetadata.h>
@@ -75,8 +79,10 @@
 #include <aws/codecommit/model/DeletePullRequestApprovalRuleResult.h>
 #include <aws/codecommit/model/DeleteRepositoryRequest.h>
 #include <aws/codecommit/model/DeleteRepositoryResult.h>
+#include <aws/codecommit/model/DescribeMergeConflictsPaginationTraits.h>
 #include <aws/codecommit/model/DescribeMergeConflictsRequest.h>
 #include <aws/codecommit/model/DescribeMergeConflictsResult.h>
+#include <aws/codecommit/model/DescribePullRequestEventsPaginationTraits.h>
 #include <aws/codecommit/model/DescribePullRequestEventsRequest.h>
 #include <aws/codecommit/model/DescribePullRequestEventsResult.h>
 #include <aws/codecommit/model/DiffChange.h>
@@ -96,22 +102,27 @@
 #include <aws/codecommit/model/Folder.h>
 #include <aws/codecommit/model/GetApprovalRuleTemplateRequest.h>
 #include <aws/codecommit/model/GetApprovalRuleTemplateResult.h>
+#include <aws/codecommit/model/GetBlobDifferencesPaginationTraits.h>
 #include <aws/codecommit/model/GetBlobDifferencesRequest.h>
 #include <aws/codecommit/model/GetBlobDifferencesResult.h>
 #include <aws/codecommit/model/GetBlobRequest.h>
 #include <aws/codecommit/model/GetBlobResult.h>
 #include <aws/codecommit/model/GetBranchRequest.h>
 #include <aws/codecommit/model/GetBranchResult.h>
+#include <aws/codecommit/model/GetCommentReactionsPaginationTraits.h>
 #include <aws/codecommit/model/GetCommentReactionsRequest.h>
 #include <aws/codecommit/model/GetCommentReactionsResult.h>
 #include <aws/codecommit/model/GetCommentRequest.h>
 #include <aws/codecommit/model/GetCommentResult.h>
+#include <aws/codecommit/model/GetCommentsForComparedCommitPaginationTraits.h>
 #include <aws/codecommit/model/GetCommentsForComparedCommitRequest.h>
 #include <aws/codecommit/model/GetCommentsForComparedCommitResult.h>
+#include <aws/codecommit/model/GetCommentsForPullRequestPaginationTraits.h>
 #include <aws/codecommit/model/GetCommentsForPullRequestRequest.h>
 #include <aws/codecommit/model/GetCommentsForPullRequestResult.h>
 #include <aws/codecommit/model/GetCommitRequest.h>
 #include <aws/codecommit/model/GetCommitResult.h>
+#include <aws/codecommit/model/GetDifferencesPaginationTraits.h>
 #include <aws/codecommit/model/GetDifferencesRequest.h>
 #include <aws/codecommit/model/GetDifferencesResult.h>
 #include <aws/codecommit/model/GetFileRequest.h>
@@ -120,6 +131,7 @@
 #include <aws/codecommit/model/GetFolderResult.h>
 #include <aws/codecommit/model/GetMergeCommitRequest.h>
 #include <aws/codecommit/model/GetMergeCommitResult.h>
+#include <aws/codecommit/model/GetMergeConflictsPaginationTraits.h>
 #include <aws/codecommit/model/GetMergeConflictsRequest.h>
 #include <aws/codecommit/model/GetMergeConflictsResult.h>
 #include <aws/codecommit/model/GetMergeOptionsRequest.h>
@@ -135,18 +147,25 @@
 #include <aws/codecommit/model/GetRepositoryTriggersRequest.h>
 #include <aws/codecommit/model/GetRepositoryTriggersResult.h>
 #include <aws/codecommit/model/IsBinaryFile.h>
+#include <aws/codecommit/model/ListApprovalRuleTemplatesPaginationTraits.h>
 #include <aws/codecommit/model/ListApprovalRuleTemplatesRequest.h>
 #include <aws/codecommit/model/ListApprovalRuleTemplatesResult.h>
+#include <aws/codecommit/model/ListAssociatedApprovalRuleTemplatesForRepositoryPaginationTraits.h>
 #include <aws/codecommit/model/ListAssociatedApprovalRuleTemplatesForRepositoryRequest.h>
 #include <aws/codecommit/model/ListAssociatedApprovalRuleTemplatesForRepositoryResult.h>
+#include <aws/codecommit/model/ListBranchesPaginationTraits.h>
 #include <aws/codecommit/model/ListBranchesRequest.h>
 #include <aws/codecommit/model/ListBranchesResult.h>
+#include <aws/codecommit/model/ListFileCommitHistoryPaginationTraits.h>
 #include <aws/codecommit/model/ListFileCommitHistoryRequest.h>
 #include <aws/codecommit/model/ListFileCommitHistoryResult.h>
+#include <aws/codecommit/model/ListPullRequestsPaginationTraits.h>
 #include <aws/codecommit/model/ListPullRequestsRequest.h>
 #include <aws/codecommit/model/ListPullRequestsResult.h>
+#include <aws/codecommit/model/ListRepositoriesForApprovalRuleTemplatePaginationTraits.h>
 #include <aws/codecommit/model/ListRepositoriesForApprovalRuleTemplateRequest.h>
 #include <aws/codecommit/model/ListRepositoriesForApprovalRuleTemplateResult.h>
+#include <aws/codecommit/model/ListRepositoriesPaginationTraits.h>
 #include <aws/codecommit/model/ListRepositoriesRequest.h>
 #include <aws/codecommit/model/ListRepositoriesResult.h>
 #include <aws/codecommit/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/codeconnections-gen-tests/CodeConnectionsIncludeTests.cpp b/generated/tests/codeconnections-gen-tests/CodeConnectionsIncludeTests.cpp
index ba37a8c4d970..c65e0def9b55 100644
--- a/generated/tests/codeconnections-gen-tests/CodeConnectionsIncludeTests.cpp
+++ b/generated/tests/codeconnections-gen-tests/CodeConnectionsIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/codeconnections/CodeConnectionsClient.h>
+#include <aws/codeconnections/CodeConnectionsClientPagination.h>
 #include <aws/codeconnections/CodeConnectionsEndpointProvider.h>
 #include <aws/codeconnections/CodeConnectionsErrorMarshaller.h>
 #include <aws/codeconnections/CodeConnectionsErrors.h>
+#include <aws/codeconnections/CodeConnectionsPaginationBase.h>
 #include <aws/codeconnections/CodeConnectionsRequest.h>
 #include <aws/codeconnections/CodeConnectionsServiceClientModel.h>
+#include <aws/codeconnections/CodeConnectionsWaiter.h>
 #include <aws/codeconnections/CodeConnections_EXPORTS.h>
+#include <aws/codeconnections/internal/CodeConnectionsEndpointRules.h>
 #include <aws/codeconnections/model/BlockerStatus.h>
 #include <aws/codeconnections/model/BlockerType.h>
 #include <aws/codeconnections/model/Connection.h>
@@ -48,14 +52,18 @@
 #include <aws/codeconnections/model/GetSyncConfigurationRequest.h>
 #include <aws/codeconnections/model/GetSyncConfigurationResult.h>
 #include <aws/codeconnections/model/Host.h>
+#include <aws/codeconnections/model/ListConnectionsPaginationTraits.h>
 #include <aws/codeconnections/model/ListConnectionsRequest.h>
 #include <aws/codeconnections/model/ListConnectionsResult.h>
+#include <aws/codeconnections/model/ListHostsPaginationTraits.h>
 #include <aws/codeconnections/model/ListHostsRequest.h>
 #include <aws/codeconnections/model/ListHostsResult.h>
+#include <aws/codeconnections/model/ListRepositoryLinksPaginationTraits.h>
 #include <aws/codeconnections/model/ListRepositoryLinksRequest.h>
 #include <aws/codeconnections/model/ListRepositoryLinksResult.h>
 #include <aws/codeconnections/model/ListRepositorySyncDefinitionsRequest.h>
 #include <aws/codeconnections/model/ListRepositorySyncDefinitionsResult.h>
+#include <aws/codeconnections/model/ListSyncConfigurationsPaginationTraits.h>
 #include <aws/codeconnections/model/ListSyncConfigurationsRequest.h>
 #include <aws/codeconnections/model/ListSyncConfigurationsResult.h>
 #include <aws/codeconnections/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/codedeploy-gen-tests/CodeDeployIncludeTests.cpp b/generated/tests/codedeploy-gen-tests/CodeDeployIncludeTests.cpp
index 116aefde4a5b..4b83bcfd3a5d 100644
--- a/generated/tests/codedeploy-gen-tests/CodeDeployIncludeTests.cpp
+++ b/generated/tests/codedeploy-gen-tests/CodeDeployIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/codedeploy/CodeDeployClient.h>
+#include <aws/codedeploy/CodeDeployClientPagination.h>
 #include <aws/codedeploy/CodeDeployEndpointProvider.h>
 #include <aws/codedeploy/CodeDeployErrorMarshaller.h>
 #include <aws/codedeploy/CodeDeployErrors.h>
+#include <aws/codedeploy/CodeDeployPaginationBase.h>
 #include <aws/codedeploy/CodeDeployRequest.h>
 #include <aws/codedeploy/CodeDeployServiceClientModel.h>
+#include <aws/codedeploy/CodeDeployWaiter.h>
 #include <aws/codedeploy/CodeDeploy_EXPORTS.h>
+#include <aws/codedeploy/internal/CodeDeployEndpointRules.h>
 #include <aws/codedeploy/model/AddTagsToOnPremisesInstancesRequest.h>
 #include <aws/codedeploy/model/Alarm.h>
 #include <aws/codedeploy/model/AlarmConfiguration.h>
@@ -112,16 +116,21 @@
 #include <aws/codedeploy/model/LifecycleErrorCode.h>
 #include <aws/codedeploy/model/LifecycleEvent.h>
 #include <aws/codedeploy/model/LifecycleEventStatus.h>
+#include <aws/codedeploy/model/ListApplicationRevisionsPaginationTraits.h>
 #include <aws/codedeploy/model/ListApplicationRevisionsRequest.h>
 #include <aws/codedeploy/model/ListApplicationRevisionsResult.h>
+#include <aws/codedeploy/model/ListApplicationsPaginationTraits.h>
 #include <aws/codedeploy/model/ListApplicationsRequest.h>
 #include <aws/codedeploy/model/ListApplicationsResult.h>
+#include <aws/codedeploy/model/ListDeploymentConfigsPaginationTraits.h>
 #include <aws/codedeploy/model/ListDeploymentConfigsRequest.h>
 #include <aws/codedeploy/model/ListDeploymentConfigsResult.h>
+#include <aws/codedeploy/model/ListDeploymentGroupsPaginationTraits.h>
 #include <aws/codedeploy/model/ListDeploymentGroupsRequest.h>
 #include <aws/codedeploy/model/ListDeploymentGroupsResult.h>
 #include <aws/codedeploy/model/ListDeploymentTargetsRequest.h>
 #include <aws/codedeploy/model/ListDeploymentTargetsResult.h>
+#include <aws/codedeploy/model/ListDeploymentsPaginationTraits.h>
 #include <aws/codedeploy/model/ListDeploymentsRequest.h>
 #include <aws/codedeploy/model/ListDeploymentsResult.h>
 #include <aws/codedeploy/model/ListGitHubAccountTokenNamesRequest.h>
diff --git a/generated/tests/codeguru-reviewer-gen-tests/CodeGuruReviewerIncludeTests.cpp b/generated/tests/codeguru-reviewer-gen-tests/CodeGuruReviewerIncludeTests.cpp
index f0a906147f4e..235b34c6b47d 100644
--- a/generated/tests/codeguru-reviewer-gen-tests/CodeGuruReviewerIncludeTests.cpp
+++ b/generated/tests/codeguru-reviewer-gen-tests/CodeGuruReviewerIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/codeguru-reviewer/CodeGuruReviewerClient.h>
+#include <aws/codeguru-reviewer/CodeGuruReviewerClientPagination.h>
 #include <aws/codeguru-reviewer/CodeGuruReviewerEndpointProvider.h>
 #include <aws/codeguru-reviewer/CodeGuruReviewerErrorMarshaller.h>
 #include <aws/codeguru-reviewer/CodeGuruReviewerErrors.h>
+#include <aws/codeguru-reviewer/CodeGuruReviewerPaginationBase.h>
 #include <aws/codeguru-reviewer/CodeGuruReviewerRequest.h>
 #include <aws/codeguru-reviewer/CodeGuruReviewerServiceClientModel.h>
+#include <aws/codeguru-reviewer/CodeGuruReviewerWaiter.h>
 #include <aws/codeguru-reviewer/CodeGuruReviewer_EXPORTS.h>
+#include <aws/codeguru-reviewer/internal/CodeGuruReviewerEndpointRules.h>
 #include <aws/codeguru-reviewer/model/AnalysisType.h>
 #include <aws/codeguru-reviewer/model/AssociateRepositoryRequest.h>
 #include <aws/codeguru-reviewer/model/AssociateRepositoryResult.h>
@@ -38,12 +42,16 @@
 #include <aws/codeguru-reviewer/model/EventInfo.h>
 #include <aws/codeguru-reviewer/model/JobState.h>
 #include <aws/codeguru-reviewer/model/KMSKeyDetails.h>
+#include <aws/codeguru-reviewer/model/ListCodeReviewsPaginationTraits.h>
 #include <aws/codeguru-reviewer/model/ListCodeReviewsRequest.h>
 #include <aws/codeguru-reviewer/model/ListCodeReviewsResult.h>
+#include <aws/codeguru-reviewer/model/ListRecommendationFeedbackPaginationTraits.h>
 #include <aws/codeguru-reviewer/model/ListRecommendationFeedbackRequest.h>
 #include <aws/codeguru-reviewer/model/ListRecommendationFeedbackResult.h>
+#include <aws/codeguru-reviewer/model/ListRecommendationsPaginationTraits.h>
 #include <aws/codeguru-reviewer/model/ListRecommendationsRequest.h>
 #include <aws/codeguru-reviewer/model/ListRecommendationsResult.h>
+#include <aws/codeguru-reviewer/model/ListRepositoryAssociationsPaginationTraits.h>
 #include <aws/codeguru-reviewer/model/ListRepositoryAssociationsRequest.h>
 #include <aws/codeguru-reviewer/model/ListRepositoryAssociationsResult.h>
 #include <aws/codeguru-reviewer/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/codeguru-security-gen-tests/CodeGuruSecurityIncludeTests.cpp b/generated/tests/codeguru-security-gen-tests/CodeGuruSecurityIncludeTests.cpp
index 3e3c25b37c85..c08467199510 100644
--- a/generated/tests/codeguru-security-gen-tests/CodeGuruSecurityIncludeTests.cpp
+++ b/generated/tests/codeguru-security-gen-tests/CodeGuruSecurityIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/codeguru-security/CodeGuruSecurityClient.h>
+#include <aws/codeguru-security/CodeGuruSecurityClientPagination.h>
 #include <aws/codeguru-security/CodeGuruSecurityEndpointProvider.h>
 #include <aws/codeguru-security/CodeGuruSecurityErrorMarshaller.h>
 #include <aws/codeguru-security/CodeGuruSecurityErrors.h>
+#include <aws/codeguru-security/CodeGuruSecurityPaginationBase.h>
 #include <aws/codeguru-security/CodeGuruSecurityRequest.h>
 #include <aws/codeguru-security/CodeGuruSecurityServiceClientModel.h>
+#include <aws/codeguru-security/CodeGuruSecurityWaiter.h>
 #include <aws/codeguru-security/CodeGuruSecurity_EXPORTS.h>
+#include <aws/codeguru-security/internal/CodeGuruSecurityEndpointRules.h>
 #include <aws/codeguru-security/model/AccessDeniedException.h>
 #include <aws/codeguru-security/model/AccountFindingsMetric.h>
 #include <aws/codeguru-security/model/AnalysisType.h>
@@ -34,6 +38,7 @@
 #include <aws/codeguru-security/model/FindingMetricsValuePerSeverity.h>
 #include <aws/codeguru-security/model/GetAccountConfigurationRequest.h>
 #include <aws/codeguru-security/model/GetAccountConfigurationResult.h>
+#include <aws/codeguru-security/model/GetFindingsPaginationTraits.h>
 #include <aws/codeguru-security/model/GetFindingsRequest.h>
 #include <aws/codeguru-security/model/GetFindingsResult.h>
 #include <aws/codeguru-security/model/GetMetricsSummaryRequest.h>
@@ -41,8 +46,10 @@
 #include <aws/codeguru-security/model/GetScanRequest.h>
 #include <aws/codeguru-security/model/GetScanResult.h>
 #include <aws/codeguru-security/model/InternalServerException.h>
+#include <aws/codeguru-security/model/ListFindingsMetricsPaginationTraits.h>
 #include <aws/codeguru-security/model/ListFindingsMetricsRequest.h>
 #include <aws/codeguru-security/model/ListFindingsMetricsResult.h>
+#include <aws/codeguru-security/model/ListScansPaginationTraits.h>
 #include <aws/codeguru-security/model/ListScansRequest.h>
 #include <aws/codeguru-security/model/ListScansResult.h>
 #include <aws/codeguru-security/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/codeguruprofiler-gen-tests/CodeGuruProfilerIncludeTests.cpp b/generated/tests/codeguruprofiler-gen-tests/CodeGuruProfilerIncludeTests.cpp
index ce733ac05895..cc9dc02aaf38 100644
--- a/generated/tests/codeguruprofiler-gen-tests/CodeGuruProfilerIncludeTests.cpp
+++ b/generated/tests/codeguruprofiler-gen-tests/CodeGuruProfilerIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/codeguruprofiler/CodeGuruProfilerClient.h>
+#include <aws/codeguruprofiler/CodeGuruProfilerClientPagination.h>
 #include <aws/codeguruprofiler/CodeGuruProfilerEndpointProvider.h>
 #include <aws/codeguruprofiler/CodeGuruProfilerErrorMarshaller.h>
 #include <aws/codeguruprofiler/CodeGuruProfilerErrors.h>
+#include <aws/codeguruprofiler/CodeGuruProfilerPaginationBase.h>
 #include <aws/codeguruprofiler/CodeGuruProfilerRequest.h>
 #include <aws/codeguruprofiler/CodeGuruProfilerServiceClientModel.h>
+#include <aws/codeguruprofiler/CodeGuruProfilerWaiter.h>
 #include <aws/codeguruprofiler/CodeGuruProfiler_EXPORTS.h>
+#include <aws/codeguruprofiler/internal/CodeGuruProfilerEndpointRules.h>
 #include <aws/codeguruprofiler/model/ActionGroup.h>
 #include <aws/codeguruprofiler/model/AddNotificationChannelsRequest.h>
 #include <aws/codeguruprofiler/model/AddNotificationChannelsResult.h>
@@ -40,6 +44,7 @@
 #include <aws/codeguruprofiler/model/FindingsReportSummary.h>
 #include <aws/codeguruprofiler/model/FrameMetric.h>
 #include <aws/codeguruprofiler/model/FrameMetricDatum.h>
+#include <aws/codeguruprofiler/model/GetFindingsReportAccountSummaryPaginationTraits.h>
 #include <aws/codeguruprofiler/model/GetFindingsReportAccountSummaryRequest.h>
 #include <aws/codeguruprofiler/model/GetFindingsReportAccountSummaryResult.h>
 #include <aws/codeguruprofiler/model/GetNotificationConfigurationRequest.h>
@@ -50,10 +55,13 @@
 #include <aws/codeguruprofiler/model/GetProfileResult.h>
 #include <aws/codeguruprofiler/model/GetRecommendationsRequest.h>
 #include <aws/codeguruprofiler/model/GetRecommendationsResult.h>
+#include <aws/codeguruprofiler/model/ListFindingsReportsPaginationTraits.h>
 #include <aws/codeguruprofiler/model/ListFindingsReportsRequest.h>
 #include <aws/codeguruprofiler/model/ListFindingsReportsResult.h>
+#include <aws/codeguruprofiler/model/ListProfileTimesPaginationTraits.h>
 #include <aws/codeguruprofiler/model/ListProfileTimesRequest.h>
 #include <aws/codeguruprofiler/model/ListProfileTimesResult.h>
+#include <aws/codeguruprofiler/model/ListProfilingGroupsPaginationTraits.h>
 #include <aws/codeguruprofiler/model/ListProfilingGroupsRequest.h>
 #include <aws/codeguruprofiler/model/ListProfilingGroupsResult.h>
 #include <aws/codeguruprofiler/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/codepipeline-gen-tests/CodePipelineIncludeTests.cpp b/generated/tests/codepipeline-gen-tests/CodePipelineIncludeTests.cpp
index 09c7d67bebf0..73330b227988 100644
--- a/generated/tests/codepipeline-gen-tests/CodePipelineIncludeTests.cpp
+++ b/generated/tests/codepipeline-gen-tests/CodePipelineIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/codepipeline/CodePipelineClient.h>
+#include <aws/codepipeline/CodePipelineClientPagination.h>
 #include <aws/codepipeline/CodePipelineEndpointProvider.h>
 #include <aws/codepipeline/CodePipelineErrorMarshaller.h>
 #include <aws/codepipeline/CodePipelineErrors.h>
+#include <aws/codepipeline/CodePipelinePaginationBase.h>
 #include <aws/codepipeline/CodePipelineRequest.h>
 #include <aws/codepipeline/CodePipelineServiceClientModel.h>
+#include <aws/codepipeline/CodePipelineWaiter.h>
 #include <aws/codepipeline/CodePipeline_EXPORTS.h>
+#include <aws/codepipeline/internal/CodePipelineEndpointRules.h>
 #include <aws/codepipeline/model/AWSSessionCredentials.h>
 #include <aws/codepipeline/model/AcknowledgeJobRequest.h>
 #include <aws/codepipeline/model/AcknowledgeJobResult.h>
@@ -119,23 +123,31 @@
 #include <aws/codepipeline/model/JobWorkerExecutorConfiguration.h>
 #include <aws/codepipeline/model/LambdaExecutorConfiguration.h>
 #include <aws/codepipeline/model/LatestInPipelineExecutionFilter.h>
+#include <aws/codepipeline/model/ListActionExecutionsPaginationTraits.h>
 #include <aws/codepipeline/model/ListActionExecutionsRequest.h>
 #include <aws/codepipeline/model/ListActionExecutionsResult.h>
+#include <aws/codepipeline/model/ListActionTypesPaginationTraits.h>
 #include <aws/codepipeline/model/ListActionTypesRequest.h>
 #include <aws/codepipeline/model/ListActionTypesResult.h>
+#include <aws/codepipeline/model/ListDeployActionExecutionTargetsPaginationTraits.h>
 #include <aws/codepipeline/model/ListDeployActionExecutionTargetsRequest.h>
 #include <aws/codepipeline/model/ListDeployActionExecutionTargetsResult.h>
+#include <aws/codepipeline/model/ListPipelineExecutionsPaginationTraits.h>
 #include <aws/codepipeline/model/ListPipelineExecutionsRequest.h>
 #include <aws/codepipeline/model/ListPipelineExecutionsResult.h>
+#include <aws/codepipeline/model/ListPipelinesPaginationTraits.h>
 #include <aws/codepipeline/model/ListPipelinesRequest.h>
 #include <aws/codepipeline/model/ListPipelinesResult.h>
+#include <aws/codepipeline/model/ListRuleExecutionsPaginationTraits.h>
 #include <aws/codepipeline/model/ListRuleExecutionsRequest.h>
 #include <aws/codepipeline/model/ListRuleExecutionsResult.h>
 #include <aws/codepipeline/model/ListRuleTypesRequest.h>
 #include <aws/codepipeline/model/ListRuleTypesResult.h>
+#include <aws/codepipeline/model/ListTagsForResourcePaginationTraits.h>
 #include <aws/codepipeline/model/ListTagsForResourceRequest.h>
 #include <aws/codepipeline/model/ListTagsForResourceResult.h>
 #include <aws/codepipeline/model/ListWebhookItem.h>
+#include <aws/codepipeline/model/ListWebhooksPaginationTraits.h>
 #include <aws/codepipeline/model/ListWebhooksRequest.h>
 #include <aws/codepipeline/model/ListWebhooksResult.h>
 #include <aws/codepipeline/model/OutputArtifact.h>
diff --git a/generated/tests/codestar-connections-gen-tests/CodeStarconnectionsIncludeTests.cpp b/generated/tests/codestar-connections-gen-tests/CodeStarconnectionsIncludeTests.cpp
index 6e894bd8968c..e22ca1233654 100644
--- a/generated/tests/codestar-connections-gen-tests/CodeStarconnectionsIncludeTests.cpp
+++ b/generated/tests/codestar-connections-gen-tests/CodeStarconnectionsIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/codestar-connections/CodeStarconnectionsClient.h>
+#include <aws/codestar-connections/CodeStarconnectionsClientPagination.h>
 #include <aws/codestar-connections/CodeStarconnectionsEndpointProvider.h>
 #include <aws/codestar-connections/CodeStarconnectionsErrorMarshaller.h>
 #include <aws/codestar-connections/CodeStarconnectionsErrors.h>
+#include <aws/codestar-connections/CodeStarconnectionsPaginationBase.h>
 #include <aws/codestar-connections/CodeStarconnectionsRequest.h>
 #include <aws/codestar-connections/CodeStarconnectionsServiceClientModel.h>
+#include <aws/codestar-connections/CodeStarconnectionsWaiter.h>
 #include <aws/codestar-connections/CodeStarconnections_EXPORTS.h>
+#include <aws/codestar-connections/internal/CodeStarconnectionsEndpointRules.h>
 #include <aws/codestar-connections/model/BlockerStatus.h>
 #include <aws/codestar-connections/model/BlockerType.h>
 #include <aws/codestar-connections/model/Connection.h>
@@ -48,14 +52,18 @@
 #include <aws/codestar-connections/model/GetSyncConfigurationRequest.h>
 #include <aws/codestar-connections/model/GetSyncConfigurationResult.h>
 #include <aws/codestar-connections/model/Host.h>
+#include <aws/codestar-connections/model/ListConnectionsPaginationTraits.h>
 #include <aws/codestar-connections/model/ListConnectionsRequest.h>
 #include <aws/codestar-connections/model/ListConnectionsResult.h>
+#include <aws/codestar-connections/model/ListHostsPaginationTraits.h>
 #include <aws/codestar-connections/model/ListHostsRequest.h>
 #include <aws/codestar-connections/model/ListHostsResult.h>
+#include <aws/codestar-connections/model/ListRepositoryLinksPaginationTraits.h>
 #include <aws/codestar-connections/model/ListRepositoryLinksRequest.h>
 #include <aws/codestar-connections/model/ListRepositoryLinksResult.h>
 #include <aws/codestar-connections/model/ListRepositorySyncDefinitionsRequest.h>
 #include <aws/codestar-connections/model/ListRepositorySyncDefinitionsResult.h>
+#include <aws/codestar-connections/model/ListSyncConfigurationsPaginationTraits.h>
 #include <aws/codestar-connections/model/ListSyncConfigurationsRequest.h>
 #include <aws/codestar-connections/model/ListSyncConfigurationsResult.h>
 #include <aws/codestar-connections/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/codestar-notifications-gen-tests/CodeStarNotificationsIncludeTests.cpp b/generated/tests/codestar-notifications-gen-tests/CodeStarNotificationsIncludeTests.cpp
index e899e872c3c2..1c17a6d5de88 100644
--- a/generated/tests/codestar-notifications-gen-tests/CodeStarNotificationsIncludeTests.cpp
+++ b/generated/tests/codestar-notifications-gen-tests/CodeStarNotificationsIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/codestar-notifications/CodeStarNotificationsClient.h>
+#include <aws/codestar-notifications/CodeStarNotificationsClientPagination.h>
 #include <aws/codestar-notifications/CodeStarNotificationsEndpointProvider.h>
 #include <aws/codestar-notifications/CodeStarNotificationsErrorMarshaller.h>
 #include <aws/codestar-notifications/CodeStarNotificationsErrors.h>
+#include <aws/codestar-notifications/CodeStarNotificationsPaginationBase.h>
 #include <aws/codestar-notifications/CodeStarNotificationsRequest.h>
 #include <aws/codestar-notifications/CodeStarNotificationsServiceClientModel.h>
+#include <aws/codestar-notifications/CodeStarNotificationsWaiter.h>
 #include <aws/codestar-notifications/CodeStarNotifications_EXPORTS.h>
+#include <aws/codestar-notifications/internal/CodeStarNotificationsEndpointRules.h>
 #include <aws/codestar-notifications/model/CreateNotificationRuleRequest.h>
 #include <aws/codestar-notifications/model/CreateNotificationRuleResult.h>
 #include <aws/codestar-notifications/model/DeleteNotificationRuleRequest.h>
@@ -25,16 +29,19 @@
 #include <aws/codestar-notifications/model/EventTypeSummary.h>
 #include <aws/codestar-notifications/model/ListEventTypesFilter.h>
 #include <aws/codestar-notifications/model/ListEventTypesFilterName.h>
+#include <aws/codestar-notifications/model/ListEventTypesPaginationTraits.h>
 #include <aws/codestar-notifications/model/ListEventTypesRequest.h>
 #include <aws/codestar-notifications/model/ListEventTypesResult.h>
 #include <aws/codestar-notifications/model/ListNotificationRulesFilter.h>
 #include <aws/codestar-notifications/model/ListNotificationRulesFilterName.h>
+#include <aws/codestar-notifications/model/ListNotificationRulesPaginationTraits.h>
 #include <aws/codestar-notifications/model/ListNotificationRulesRequest.h>
 #include <aws/codestar-notifications/model/ListNotificationRulesResult.h>
 #include <aws/codestar-notifications/model/ListTagsForResourceRequest.h>
 #include <aws/codestar-notifications/model/ListTagsForResourceResult.h>
 #include <aws/codestar-notifications/model/ListTargetsFilter.h>
 #include <aws/codestar-notifications/model/ListTargetsFilterName.h>
+#include <aws/codestar-notifications/model/ListTargetsPaginationTraits.h>
 #include <aws/codestar-notifications/model/ListTargetsRequest.h>
 #include <aws/codestar-notifications/model/ListTargetsResult.h>
 #include <aws/codestar-notifications/model/NotificationRuleStatus.h>
diff --git a/generated/tests/cognito-identity-gen-tests/CognitoIdentityIncludeTests.cpp b/generated/tests/cognito-identity-gen-tests/CognitoIdentityIncludeTests.cpp
index 01a148d190d8..0edd645bf7d9 100644
--- a/generated/tests/cognito-identity-gen-tests/CognitoIdentityIncludeTests.cpp
+++ b/generated/tests/cognito-identity-gen-tests/CognitoIdentityIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/cognito-identity/CognitoIdentityClient.h>
+#include <aws/cognito-identity/CognitoIdentityClientPagination.h>
 #include <aws/cognito-identity/CognitoIdentityEndpointProvider.h>
 #include <aws/cognito-identity/CognitoIdentityErrorMarshaller.h>
 #include <aws/cognito-identity/CognitoIdentityErrors.h>
+#include <aws/cognito-identity/CognitoIdentityPaginationBase.h>
 #include <aws/cognito-identity/CognitoIdentityRequest.h>
 #include <aws/cognito-identity/CognitoIdentityServiceClientModel.h>
+#include <aws/cognito-identity/CognitoIdentityWaiter.h>
 #include <aws/cognito-identity/CognitoIdentity_EXPORTS.h>
+#include <aws/cognito-identity/internal/CognitoIdentityEndpointRules.h>
 #include <aws/cognito-identity/model/AmbiguousRoleResolutionType.h>
 #include <aws/cognito-identity/model/CognitoIdentityProvider.h>
 #include <aws/cognito-identity/model/CreateIdentityPoolRequest.h>
@@ -42,6 +46,7 @@
 #include <aws/cognito-identity/model/IdentityPoolShortDescription.h>
 #include <aws/cognito-identity/model/ListIdentitiesRequest.h>
 #include <aws/cognito-identity/model/ListIdentitiesResult.h>
+#include <aws/cognito-identity/model/ListIdentityPoolsPaginationTraits.h>
 #include <aws/cognito-identity/model/ListIdentityPoolsRequest.h>
 #include <aws/cognito-identity/model/ListIdentityPoolsResult.h>
 #include <aws/cognito-identity/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/cognito-idp-gen-tests/CognitoIdentityProviderIncludeTests.cpp b/generated/tests/cognito-idp-gen-tests/CognitoIdentityProviderIncludeTests.cpp
index c57ef56a4f75..5caeddb7f65f 100644
--- a/generated/tests/cognito-idp-gen-tests/CognitoIdentityProviderIncludeTests.cpp
+++ b/generated/tests/cognito-idp-gen-tests/CognitoIdentityProviderIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/cognito-idp/CognitoIdentityProviderClient.h>
+#include <aws/cognito-idp/CognitoIdentityProviderClientPagination.h>
 #include <aws/cognito-idp/CognitoIdentityProviderEndpointProvider.h>
 #include <aws/cognito-idp/CognitoIdentityProviderErrorMarshaller.h>
 #include <aws/cognito-idp/CognitoIdentityProviderErrors.h>
+#include <aws/cognito-idp/CognitoIdentityProviderPaginationBase.h>
 #include <aws/cognito-idp/CognitoIdentityProviderRequest.h>
 #include <aws/cognito-idp/CognitoIdentityProviderServiceClientModel.h>
+#include <aws/cognito-idp/CognitoIdentityProviderWaiter.h>
 #include <aws/cognito-idp/CognitoIdentityProvider_EXPORTS.h>
+#include <aws/cognito-idp/internal/CognitoIdentityProviderEndpointRules.h>
 #include <aws/cognito-idp/model/AccountRecoverySettingType.h>
 #include <aws/cognito-idp/model/AccountTakeoverActionType.h>
 #include <aws/cognito-idp/model/AccountTakeoverActionsType.h>
@@ -50,8 +54,10 @@
 #include <aws/cognito-idp/model/AdminLinkProviderForUserResult.h>
 #include <aws/cognito-idp/model/AdminListDevicesRequest.h>
 #include <aws/cognito-idp/model/AdminListDevicesResult.h>
+#include <aws/cognito-idp/model/AdminListGroupsForUserPaginationTraits.h>
 #include <aws/cognito-idp/model/AdminListGroupsForUserRequest.h>
 #include <aws/cognito-idp/model/AdminListGroupsForUserResult.h>
+#include <aws/cognito-idp/model/AdminListUserAuthEventsPaginationTraits.h>
 #include <aws/cognito-idp/model/AdminListUserAuthEventsRequest.h>
 #include <aws/cognito-idp/model/AdminListUserAuthEventsResult.h>
 #include <aws/cognito-idp/model/AdminRemoveUserFromGroupRequest.h>
@@ -251,10 +257,13 @@
 #include <aws/cognito-idp/model/LimitType.h>
 #include <aws/cognito-idp/model/ListDevicesRequest.h>
 #include <aws/cognito-idp/model/ListDevicesResult.h>
+#include <aws/cognito-idp/model/ListGroupsPaginationTraits.h>
 #include <aws/cognito-idp/model/ListGroupsRequest.h>
 #include <aws/cognito-idp/model/ListGroupsResult.h>
+#include <aws/cognito-idp/model/ListIdentityProvidersPaginationTraits.h>
 #include <aws/cognito-idp/model/ListIdentityProvidersRequest.h>
 #include <aws/cognito-idp/model/ListIdentityProvidersResult.h>
+#include <aws/cognito-idp/model/ListResourceServersPaginationTraits.h>
 #include <aws/cognito-idp/model/ListResourceServersRequest.h>
 #include <aws/cognito-idp/model/ListResourceServersResult.h>
 #include <aws/cognito-idp/model/ListTagsForResourceRequest.h>
@@ -265,14 +274,18 @@
 #include <aws/cognito-idp/model/ListUserImportJobsResult.h>
 #include <aws/cognito-idp/model/ListUserPoolClientSecretsRequest.h>
 #include <aws/cognito-idp/model/ListUserPoolClientSecretsResult.h>
+#include <aws/cognito-idp/model/ListUserPoolClientsPaginationTraits.h>
 #include <aws/cognito-idp/model/ListUserPoolClientsRequest.h>
 #include <aws/cognito-idp/model/ListUserPoolClientsResult.h>
 #include <aws/cognito-idp/model/ListUserPoolReplicasRequest.h>
 #include <aws/cognito-idp/model/ListUserPoolReplicasResult.h>
+#include <aws/cognito-idp/model/ListUserPoolsPaginationTraits.h>
 #include <aws/cognito-idp/model/ListUserPoolsRequest.h>
 #include <aws/cognito-idp/model/ListUserPoolsResult.h>
+#include <aws/cognito-idp/model/ListUsersInGroupPaginationTraits.h>
 #include <aws/cognito-idp/model/ListUsersInGroupRequest.h>
 #include <aws/cognito-idp/model/ListUsersInGroupResult.h>
+#include <aws/cognito-idp/model/ListUsersPaginationTraits.h>
 #include <aws/cognito-idp/model/ListUsersRequest.h>
 #include <aws/cognito-idp/model/ListUsersResult.h>
 #include <aws/cognito-idp/model/ListWebAuthnCredentialsRequest.h>
diff --git a/generated/tests/cognito-sync-gen-tests/CognitoSyncIncludeTests.cpp b/generated/tests/cognito-sync-gen-tests/CognitoSyncIncludeTests.cpp
index 608fb5021308..f33df32d19ba 100644
--- a/generated/tests/cognito-sync-gen-tests/CognitoSyncIncludeTests.cpp
+++ b/generated/tests/cognito-sync-gen-tests/CognitoSyncIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/cognito-sync/CognitoSyncEndpointProvider.h>
 #include <aws/cognito-sync/CognitoSyncErrorMarshaller.h>
 #include <aws/cognito-sync/CognitoSyncErrors.h>
+#include <aws/cognito-sync/CognitoSyncPaginationBase.h>
 #include <aws/cognito-sync/CognitoSyncRequest.h>
 #include <aws/cognito-sync/CognitoSyncServiceClientModel.h>
+#include <aws/cognito-sync/CognitoSyncWaiter.h>
 #include <aws/cognito-sync/CognitoSync_EXPORTS.h>
+#include <aws/cognito-sync/internal/CognitoSyncEndpointRules.h>
 #include <aws/cognito-sync/model/BulkPublishRequest.h>
 #include <aws/cognito-sync/model/BulkPublishResult.h>
 #include <aws/cognito-sync/model/BulkPublishStatus.h>
diff --git a/generated/tests/comprehend-gen-tests/ComprehendIncludeTests.cpp b/generated/tests/comprehend-gen-tests/ComprehendIncludeTests.cpp
index 97245b8b96ba..3ed11f94fee0 100644
--- a/generated/tests/comprehend-gen-tests/ComprehendIncludeTests.cpp
+++ b/generated/tests/comprehend-gen-tests/ComprehendIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/comprehend/ComprehendClient.h>
+#include <aws/comprehend/ComprehendClientPagination.h>
 #include <aws/comprehend/ComprehendEndpointProvider.h>
 #include <aws/comprehend/ComprehendErrorMarshaller.h>
 #include <aws/comprehend/ComprehendErrors.h>
+#include <aws/comprehend/ComprehendPaginationBase.h>
 #include <aws/comprehend/ComprehendRequest.h>
 #include <aws/comprehend/ComprehendServiceClientModel.h>
+#include <aws/comprehend/ComprehendWaiter.h>
 #include <aws/comprehend/Comprehend_EXPORTS.h>
+#include <aws/comprehend/internal/ComprehendEndpointRules.h>
 #include <aws/comprehend/model/AugmentedManifestsDocumentTypeFormat.h>
 #include <aws/comprehend/model/AugmentedManifestsListItem.h>
 #include <aws/comprehend/model/BatchDetectDominantLanguageItemResult.h>
@@ -199,40 +203,57 @@
 #include <aws/comprehend/model/KeyPhrasesDetectionJobFilter.h>
 #include <aws/comprehend/model/KeyPhrasesDetectionJobProperties.h>
 #include <aws/comprehend/model/LanguageCode.h>
+#include <aws/comprehend/model/ListDatasetsPaginationTraits.h>
 #include <aws/comprehend/model/ListDatasetsRequest.h>
 #include <aws/comprehend/model/ListDatasetsResult.h>
+#include <aws/comprehend/model/ListDocumentClassificationJobsPaginationTraits.h>
 #include <aws/comprehend/model/ListDocumentClassificationJobsRequest.h>
 #include <aws/comprehend/model/ListDocumentClassificationJobsResult.h>
+#include <aws/comprehend/model/ListDocumentClassifierSummariesPaginationTraits.h>
 #include <aws/comprehend/model/ListDocumentClassifierSummariesRequest.h>
 #include <aws/comprehend/model/ListDocumentClassifierSummariesResult.h>
+#include <aws/comprehend/model/ListDocumentClassifiersPaginationTraits.h>
 #include <aws/comprehend/model/ListDocumentClassifiersRequest.h>
 #include <aws/comprehend/model/ListDocumentClassifiersResult.h>
+#include <aws/comprehend/model/ListDominantLanguageDetectionJobsPaginationTraits.h>
 #include <aws/comprehend/model/ListDominantLanguageDetectionJobsRequest.h>
 #include <aws/comprehend/model/ListDominantLanguageDetectionJobsResult.h>
+#include <aws/comprehend/model/ListEndpointsPaginationTraits.h>
 #include <aws/comprehend/model/ListEndpointsRequest.h>
 #include <aws/comprehend/model/ListEndpointsResult.h>
+#include <aws/comprehend/model/ListEntitiesDetectionJobsPaginationTraits.h>
 #include <aws/comprehend/model/ListEntitiesDetectionJobsRequest.h>
 #include <aws/comprehend/model/ListEntitiesDetectionJobsResult.h>
+#include <aws/comprehend/model/ListEntityRecognizerSummariesPaginationTraits.h>
 #include <aws/comprehend/model/ListEntityRecognizerSummariesRequest.h>
 #include <aws/comprehend/model/ListEntityRecognizerSummariesResult.h>
+#include <aws/comprehend/model/ListEntityRecognizersPaginationTraits.h>
 #include <aws/comprehend/model/ListEntityRecognizersRequest.h>
 #include <aws/comprehend/model/ListEntityRecognizersResult.h>
+#include <aws/comprehend/model/ListEventsDetectionJobsPaginationTraits.h>
 #include <aws/comprehend/model/ListEventsDetectionJobsRequest.h>
 #include <aws/comprehend/model/ListEventsDetectionJobsResult.h>
+#include <aws/comprehend/model/ListFlywheelIterationHistoryPaginationTraits.h>
 #include <aws/comprehend/model/ListFlywheelIterationHistoryRequest.h>
 #include <aws/comprehend/model/ListFlywheelIterationHistoryResult.h>
+#include <aws/comprehend/model/ListFlywheelsPaginationTraits.h>
 #include <aws/comprehend/model/ListFlywheelsRequest.h>
 #include <aws/comprehend/model/ListFlywheelsResult.h>
+#include <aws/comprehend/model/ListKeyPhrasesDetectionJobsPaginationTraits.h>
 #include <aws/comprehend/model/ListKeyPhrasesDetectionJobsRequest.h>
 #include <aws/comprehend/model/ListKeyPhrasesDetectionJobsResult.h>
+#include <aws/comprehend/model/ListPiiEntitiesDetectionJobsPaginationTraits.h>
 #include <aws/comprehend/model/ListPiiEntitiesDetectionJobsRequest.h>
 #include <aws/comprehend/model/ListPiiEntitiesDetectionJobsResult.h>
+#include <aws/comprehend/model/ListSentimentDetectionJobsPaginationTraits.h>
 #include <aws/comprehend/model/ListSentimentDetectionJobsRequest.h>
 #include <aws/comprehend/model/ListSentimentDetectionJobsResult.h>
 #include <aws/comprehend/model/ListTagsForResourceRequest.h>
 #include <aws/comprehend/model/ListTagsForResourceResult.h>
+#include <aws/comprehend/model/ListTargetedSentimentDetectionJobsPaginationTraits.h>
 #include <aws/comprehend/model/ListTargetedSentimentDetectionJobsRequest.h>
 #include <aws/comprehend/model/ListTargetedSentimentDetectionJobsResult.h>
+#include <aws/comprehend/model/ListTopicsDetectionJobsPaginationTraits.h>
 #include <aws/comprehend/model/ListTopicsDetectionJobsRequest.h>
 #include <aws/comprehend/model/ListTopicsDetectionJobsResult.h>
 #include <aws/comprehend/model/MentionSentiment.h>
diff --git a/generated/tests/comprehendmedical-gen-tests/ComprehendMedicalIncludeTests.cpp b/generated/tests/comprehendmedical-gen-tests/ComprehendMedicalIncludeTests.cpp
index a1391016822a..77b3dc08a627 100644
--- a/generated/tests/comprehendmedical-gen-tests/ComprehendMedicalIncludeTests.cpp
+++ b/generated/tests/comprehendmedical-gen-tests/ComprehendMedicalIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/comprehendmedical/ComprehendMedicalEndpointProvider.h>
 #include <aws/comprehendmedical/ComprehendMedicalErrorMarshaller.h>
 #include <aws/comprehendmedical/ComprehendMedicalErrors.h>
+#include <aws/comprehendmedical/ComprehendMedicalPaginationBase.h>
 #include <aws/comprehendmedical/ComprehendMedicalRequest.h>
 #include <aws/comprehendmedical/ComprehendMedicalServiceClientModel.h>
+#include <aws/comprehendmedical/ComprehendMedicalWaiter.h>
 #include <aws/comprehendmedical/ComprehendMedical_EXPORTS.h>
+#include <aws/comprehendmedical/internal/ComprehendMedicalEndpointRules.h>
 #include <aws/comprehendmedical/model/Attribute.h>
 #include <aws/comprehendmedical/model/AttributeName.h>
 #include <aws/comprehendmedical/model/Characters.h>
diff --git a/generated/tests/compute-optimizer-automation-gen-tests/ComputeOptimizerAutomationIncludeTests.cpp b/generated/tests/compute-optimizer-automation-gen-tests/ComputeOptimizerAutomationIncludeTests.cpp
index af544ecc3a65..5773df7874e8 100644
--- a/generated/tests/compute-optimizer-automation-gen-tests/ComputeOptimizerAutomationIncludeTests.cpp
+++ b/generated/tests/compute-optimizer-automation-gen-tests/ComputeOptimizerAutomationIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/compute-optimizer-automation/ComputeOptimizerAutomationClient.h>
+#include <aws/compute-optimizer-automation/ComputeOptimizerAutomationClientPagination.h>
 #include <aws/compute-optimizer-automation/ComputeOptimizerAutomationEndpointProvider.h>
 #include <aws/compute-optimizer-automation/ComputeOptimizerAutomationErrorMarshaller.h>
 #include <aws/compute-optimizer-automation/ComputeOptimizerAutomationErrors.h>
+#include <aws/compute-optimizer-automation/ComputeOptimizerAutomationPaginationBase.h>
 #include <aws/compute-optimizer-automation/ComputeOptimizerAutomationRequest.h>
 #include <aws/compute-optimizer-automation/ComputeOptimizerAutomationServiceClientModel.h>
+#include <aws/compute-optimizer-automation/ComputeOptimizerAutomationWaiter.h>
 #include <aws/compute-optimizer-automation/ComputeOptimizerAutomation_EXPORTS.h>
+#include <aws/compute-optimizer-automation/internal/ComputeOptimizerAutomationEndpointRules.h>
 #include <aws/compute-optimizer-automation/model/AccountInfo.h>
 #include <aws/compute-optimizer-automation/model/AssociateAccountsRequest.h>
 #include <aws/compute-optimizer-automation/model/AssociateAccountsResult.h>
@@ -46,22 +50,31 @@
 #include <aws/compute-optimizer-automation/model/GetEnrollmentConfigurationRequest.h>
 #include <aws/compute-optimizer-automation/model/GetEnrollmentConfigurationResult.h>
 #include <aws/compute-optimizer-automation/model/IntegerCriteriaCondition.h>
+#include <aws/compute-optimizer-automation/model/ListAccountsPaginationTraits.h>
 #include <aws/compute-optimizer-automation/model/ListAccountsRequest.h>
 #include <aws/compute-optimizer-automation/model/ListAccountsResult.h>
+#include <aws/compute-optimizer-automation/model/ListAutomationEventStepsPaginationTraits.h>
 #include <aws/compute-optimizer-automation/model/ListAutomationEventStepsRequest.h>
 #include <aws/compute-optimizer-automation/model/ListAutomationEventStepsResult.h>
+#include <aws/compute-optimizer-automation/model/ListAutomationEventSummariesPaginationTraits.h>
 #include <aws/compute-optimizer-automation/model/ListAutomationEventSummariesRequest.h>
 #include <aws/compute-optimizer-automation/model/ListAutomationEventSummariesResult.h>
+#include <aws/compute-optimizer-automation/model/ListAutomationEventsPaginationTraits.h>
 #include <aws/compute-optimizer-automation/model/ListAutomationEventsRequest.h>
 #include <aws/compute-optimizer-automation/model/ListAutomationEventsResult.h>
+#include <aws/compute-optimizer-automation/model/ListAutomationRulePreviewPaginationTraits.h>
 #include <aws/compute-optimizer-automation/model/ListAutomationRulePreviewRequest.h>
 #include <aws/compute-optimizer-automation/model/ListAutomationRulePreviewResult.h>
+#include <aws/compute-optimizer-automation/model/ListAutomationRulePreviewSummariesPaginationTraits.h>
 #include <aws/compute-optimizer-automation/model/ListAutomationRulePreviewSummariesRequest.h>
 #include <aws/compute-optimizer-automation/model/ListAutomationRulePreviewSummariesResult.h>
+#include <aws/compute-optimizer-automation/model/ListAutomationRulesPaginationTraits.h>
 #include <aws/compute-optimizer-automation/model/ListAutomationRulesRequest.h>
 #include <aws/compute-optimizer-automation/model/ListAutomationRulesResult.h>
+#include <aws/compute-optimizer-automation/model/ListRecommendedActionSummariesPaginationTraits.h>
 #include <aws/compute-optimizer-automation/model/ListRecommendedActionSummariesRequest.h>
 #include <aws/compute-optimizer-automation/model/ListRecommendedActionSummariesResult.h>
+#include <aws/compute-optimizer-automation/model/ListRecommendedActionsPaginationTraits.h>
 #include <aws/compute-optimizer-automation/model/ListRecommendedActionsRequest.h>
 #include <aws/compute-optimizer-automation/model/ListRecommendedActionsResult.h>
 #include <aws/compute-optimizer-automation/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/compute-optimizer-gen-tests/ComputeOptimizerIncludeTests.cpp b/generated/tests/compute-optimizer-gen-tests/ComputeOptimizerIncludeTests.cpp
index 6bc1f360b0f9..2aa68c1feb69 100644
--- a/generated/tests/compute-optimizer-gen-tests/ComputeOptimizerIncludeTests.cpp
+++ b/generated/tests/compute-optimizer-gen-tests/ComputeOptimizerIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/compute-optimizer/ComputeOptimizerClient.h>
+#include <aws/compute-optimizer/ComputeOptimizerClientPagination.h>
 #include <aws/compute-optimizer/ComputeOptimizerEndpointProvider.h>
 #include <aws/compute-optimizer/ComputeOptimizerErrorMarshaller.h>
 #include <aws/compute-optimizer/ComputeOptimizerErrors.h>
+#include <aws/compute-optimizer/ComputeOptimizerPaginationBase.h>
 #include <aws/compute-optimizer/ComputeOptimizerRequest.h>
 #include <aws/compute-optimizer/ComputeOptimizerServiceClientModel.h>
+#include <aws/compute-optimizer/ComputeOptimizerWaiter.h>
 #include <aws/compute-optimizer/ComputeOptimizer_EXPORTS.h>
+#include <aws/compute-optimizer/internal/ComputeOptimizerEndpointRules.h>
 #include <aws/compute-optimizer/model/AccountEnrollmentStatus.h>
 #include <aws/compute-optimizer/model/AllocationStrategy.h>
 #include <aws/compute-optimizer/model/AsgType.h>
@@ -35,6 +39,7 @@
 #include <aws/compute-optimizer/model/DBStorageConfiguration.h>
 #include <aws/compute-optimizer/model/DeleteRecommendationPreferencesRequest.h>
 #include <aws/compute-optimizer/model/DeleteRecommendationPreferencesResult.h>
+#include <aws/compute-optimizer/model/DescribeRecommendationExportJobsPaginationTraits.h>
 #include <aws/compute-optimizer/model/DescribeRecommendationExportJobsRequest.h>
 #include <aws/compute-optimizer/model/DescribeRecommendationExportJobsResult.h>
 #include <aws/compute-optimizer/model/Dimension.h>
@@ -122,10 +127,12 @@
 #include <aws/compute-optimizer/model/GetEffectiveRecommendationPreferencesResult.h>
 #include <aws/compute-optimizer/model/GetEnrollmentStatusRequest.h>
 #include <aws/compute-optimizer/model/GetEnrollmentStatusResult.h>
+#include <aws/compute-optimizer/model/GetEnrollmentStatusesForOrganizationPaginationTraits.h>
 #include <aws/compute-optimizer/model/GetEnrollmentStatusesForOrganizationRequest.h>
 #include <aws/compute-optimizer/model/GetEnrollmentStatusesForOrganizationResult.h>
 #include <aws/compute-optimizer/model/GetIdleRecommendationsRequest.h>
 #include <aws/compute-optimizer/model/GetIdleRecommendationsResult.h>
+#include <aws/compute-optimizer/model/GetLambdaFunctionRecommendationsPaginationTraits.h>
 #include <aws/compute-optimizer/model/GetLambdaFunctionRecommendationsRequest.h>
 #include <aws/compute-optimizer/model/GetLambdaFunctionRecommendationsResult.h>
 #include <aws/compute-optimizer/model/GetLicenseRecommendationsRequest.h>
@@ -135,8 +142,10 @@
 #include <aws/compute-optimizer/model/GetRDSDatabaseRecommendationsRequest.h>
 #include <aws/compute-optimizer/model/GetRDSDatabaseRecommendationsResult.h>
 #include <aws/compute-optimizer/model/GetRecommendationError.h>
+#include <aws/compute-optimizer/model/GetRecommendationPreferencesPaginationTraits.h>
 #include <aws/compute-optimizer/model/GetRecommendationPreferencesRequest.h>
 #include <aws/compute-optimizer/model/GetRecommendationPreferencesResult.h>
+#include <aws/compute-optimizer/model/GetRecommendationSummariesPaginationTraits.h>
 #include <aws/compute-optimizer/model/GetRecommendationSummariesRequest.h>
 #include <aws/compute-optimizer/model/GetRecommendationSummariesResult.h>
 #include <aws/compute-optimizer/model/Gpu.h>
diff --git a/generated/tests/config-gen-tests/ConfigServiceIncludeTests.cpp b/generated/tests/config-gen-tests/ConfigServiceIncludeTests.cpp
index 7bf3fcb9659a..ba2ea3c39161 100644
--- a/generated/tests/config-gen-tests/ConfigServiceIncludeTests.cpp
+++ b/generated/tests/config-gen-tests/ConfigServiceIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/config/ConfigServiceClient.h>
+#include <aws/config/ConfigServiceClientPagination.h>
 #include <aws/config/ConfigServiceEndpointProvider.h>
 #include <aws/config/ConfigServiceErrorMarshaller.h>
 #include <aws/config/ConfigServiceErrors.h>
+#include <aws/config/ConfigServicePaginationBase.h>
 #include <aws/config/ConfigServiceRequest.h>
 #include <aws/config/ConfigServiceServiceClientModel.h>
+#include <aws/config/ConfigServiceWaiter.h>
 #include <aws/config/ConfigService_EXPORTS.h>
+#include <aws/config/internal/ConfigServiceEndpointRules.h>
 #include <aws/config/model/AccountAggregationSource.h>
 #include <aws/config/model/AggregateComplianceByConfigRule.h>
 #include <aws/config/model/AggregateComplianceByConformancePack.h>
@@ -111,55 +115,75 @@
 #include <aws/config/model/DeliveryChannel.h>
 #include <aws/config/model/DeliveryChannelStatus.h>
 #include <aws/config/model/DeliveryStatus.h>
+#include <aws/config/model/DescribeAggregateComplianceByConfigRulesPaginationTraits.h>
 #include <aws/config/model/DescribeAggregateComplianceByConfigRulesRequest.h>
 #include <aws/config/model/DescribeAggregateComplianceByConfigRulesResult.h>
+#include <aws/config/model/DescribeAggregateComplianceByConformancePacksPaginationTraits.h>
 #include <aws/config/model/DescribeAggregateComplianceByConformancePacksRequest.h>
 #include <aws/config/model/DescribeAggregateComplianceByConformancePacksResult.h>
+#include <aws/config/model/DescribeAggregationAuthorizationsPaginationTraits.h>
 #include <aws/config/model/DescribeAggregationAuthorizationsRequest.h>
 #include <aws/config/model/DescribeAggregationAuthorizationsResult.h>
+#include <aws/config/model/DescribeComplianceByConfigRulePaginationTraits.h>
 #include <aws/config/model/DescribeComplianceByConfigRuleRequest.h>
 #include <aws/config/model/DescribeComplianceByConfigRuleResult.h>
+#include <aws/config/model/DescribeComplianceByResourcePaginationTraits.h>
 #include <aws/config/model/DescribeComplianceByResourceRequest.h>
 #include <aws/config/model/DescribeComplianceByResourceResult.h>
+#include <aws/config/model/DescribeConfigRuleEvaluationStatusPaginationTraits.h>
 #include <aws/config/model/DescribeConfigRuleEvaluationStatusRequest.h>
 #include <aws/config/model/DescribeConfigRuleEvaluationStatusResult.h>
 #include <aws/config/model/DescribeConfigRulesFilters.h>
+#include <aws/config/model/DescribeConfigRulesPaginationTraits.h>
 #include <aws/config/model/DescribeConfigRulesRequest.h>
 #include <aws/config/model/DescribeConfigRulesResult.h>
+#include <aws/config/model/DescribeConfigurationAggregatorSourcesStatusPaginationTraits.h>
 #include <aws/config/model/DescribeConfigurationAggregatorSourcesStatusRequest.h>
 #include <aws/config/model/DescribeConfigurationAggregatorSourcesStatusResult.h>
+#include <aws/config/model/DescribeConfigurationAggregatorsPaginationTraits.h>
 #include <aws/config/model/DescribeConfigurationAggregatorsRequest.h>
 #include <aws/config/model/DescribeConfigurationAggregatorsResult.h>
 #include <aws/config/model/DescribeConfigurationRecorderStatusRequest.h>
 #include <aws/config/model/DescribeConfigurationRecorderStatusResult.h>
 #include <aws/config/model/DescribeConfigurationRecordersRequest.h>
 #include <aws/config/model/DescribeConfigurationRecordersResult.h>
+#include <aws/config/model/DescribeConformancePackCompliancePaginationTraits.h>
 #include <aws/config/model/DescribeConformancePackComplianceRequest.h>
 #include <aws/config/model/DescribeConformancePackComplianceResult.h>
+#include <aws/config/model/DescribeConformancePackStatusPaginationTraits.h>
 #include <aws/config/model/DescribeConformancePackStatusRequest.h>
 #include <aws/config/model/DescribeConformancePackStatusResult.h>
+#include <aws/config/model/DescribeConformancePacksPaginationTraits.h>
 #include <aws/config/model/DescribeConformancePacksRequest.h>
 #include <aws/config/model/DescribeConformancePacksResult.h>
 #include <aws/config/model/DescribeDeliveryChannelStatusRequest.h>
 #include <aws/config/model/DescribeDeliveryChannelStatusResult.h>
 #include <aws/config/model/DescribeDeliveryChannelsRequest.h>
 #include <aws/config/model/DescribeDeliveryChannelsResult.h>
+#include <aws/config/model/DescribeOrganizationConfigRuleStatusesPaginationTraits.h>
 #include <aws/config/model/DescribeOrganizationConfigRuleStatusesRequest.h>
 #include <aws/config/model/DescribeOrganizationConfigRuleStatusesResult.h>
+#include <aws/config/model/DescribeOrganizationConfigRulesPaginationTraits.h>
 #include <aws/config/model/DescribeOrganizationConfigRulesRequest.h>
 #include <aws/config/model/DescribeOrganizationConfigRulesResult.h>
+#include <aws/config/model/DescribeOrganizationConformancePackStatusesPaginationTraits.h>
 #include <aws/config/model/DescribeOrganizationConformancePackStatusesRequest.h>
 #include <aws/config/model/DescribeOrganizationConformancePackStatusesResult.h>
+#include <aws/config/model/DescribeOrganizationConformancePacksPaginationTraits.h>
 #include <aws/config/model/DescribeOrganizationConformancePacksRequest.h>
 #include <aws/config/model/DescribeOrganizationConformancePacksResult.h>
+#include <aws/config/model/DescribePendingAggregationRequestsPaginationTraits.h>
 #include <aws/config/model/DescribePendingAggregationRequestsRequest.h>
 #include <aws/config/model/DescribePendingAggregationRequestsResult.h>
 #include <aws/config/model/DescribeRemediationConfigurationsRequest.h>
 #include <aws/config/model/DescribeRemediationConfigurationsResult.h>
+#include <aws/config/model/DescribeRemediationExceptionsPaginationTraits.h>
 #include <aws/config/model/DescribeRemediationExceptionsRequest.h>
 #include <aws/config/model/DescribeRemediationExceptionsResult.h>
+#include <aws/config/model/DescribeRemediationExecutionStatusPaginationTraits.h>
 #include <aws/config/model/DescribeRemediationExecutionStatusRequest.h>
 #include <aws/config/model/DescribeRemediationExecutionStatusResult.h>
+#include <aws/config/model/DescribeRetentionConfigurationsPaginationTraits.h>
 #include <aws/config/model/DescribeRetentionConfigurationsRequest.h>
 #include <aws/config/model/DescribeRetentionConfigurationsResult.h>
 #include <aws/config/model/DisassociateResourceTypesRequest.h>
@@ -180,40 +204,52 @@
 #include <aws/config/model/FailedRemediationBatch.h>
 #include <aws/config/model/FailedRemediationExceptionBatch.h>
 #include <aws/config/model/FieldInfo.h>
+#include <aws/config/model/GetAggregateComplianceDetailsByConfigRulePaginationTraits.h>
 #include <aws/config/model/GetAggregateComplianceDetailsByConfigRuleRequest.h>
 #include <aws/config/model/GetAggregateComplianceDetailsByConfigRuleResult.h>
+#include <aws/config/model/GetAggregateConfigRuleComplianceSummaryPaginationTraits.h>
 #include <aws/config/model/GetAggregateConfigRuleComplianceSummaryRequest.h>
 #include <aws/config/model/GetAggregateConfigRuleComplianceSummaryResult.h>
+#include <aws/config/model/GetAggregateConformancePackComplianceSummaryPaginationTraits.h>
 #include <aws/config/model/GetAggregateConformancePackComplianceSummaryRequest.h>
 #include <aws/config/model/GetAggregateConformancePackComplianceSummaryResult.h>
+#include <aws/config/model/GetAggregateDiscoveredResourceCountsPaginationTraits.h>
 #include <aws/config/model/GetAggregateDiscoveredResourceCountsRequest.h>
 #include <aws/config/model/GetAggregateDiscoveredResourceCountsResult.h>
 #include <aws/config/model/GetAggregateResourceConfigRequest.h>
 #include <aws/config/model/GetAggregateResourceConfigResult.h>
+#include <aws/config/model/GetComplianceDetailsByConfigRulePaginationTraits.h>
 #include <aws/config/model/GetComplianceDetailsByConfigRuleRequest.h>
 #include <aws/config/model/GetComplianceDetailsByConfigRuleResult.h>
+#include <aws/config/model/GetComplianceDetailsByResourcePaginationTraits.h>
 #include <aws/config/model/GetComplianceDetailsByResourceRequest.h>
 #include <aws/config/model/GetComplianceDetailsByResourceResult.h>
 #include <aws/config/model/GetComplianceSummaryByConfigRuleRequest.h>
 #include <aws/config/model/GetComplianceSummaryByConfigRuleResult.h>
 #include <aws/config/model/GetComplianceSummaryByResourceTypeRequest.h>
 #include <aws/config/model/GetComplianceSummaryByResourceTypeResult.h>
+#include <aws/config/model/GetConformancePackComplianceDetailsPaginationTraits.h>
 #include <aws/config/model/GetConformancePackComplianceDetailsRequest.h>
 #include <aws/config/model/GetConformancePackComplianceDetailsResult.h>
+#include <aws/config/model/GetConformancePackComplianceSummaryPaginationTraits.h>
 #include <aws/config/model/GetConformancePackComplianceSummaryRequest.h>
 #include <aws/config/model/GetConformancePackComplianceSummaryResult.h>
 #include <aws/config/model/GetConnectorRequest.h>
 #include <aws/config/model/GetConnectorResult.h>
 #include <aws/config/model/GetCustomRulePolicyRequest.h>
 #include <aws/config/model/GetCustomRulePolicyResult.h>
+#include <aws/config/model/GetDiscoveredResourceCountsPaginationTraits.h>
 #include <aws/config/model/GetDiscoveredResourceCountsRequest.h>
 #include <aws/config/model/GetDiscoveredResourceCountsResult.h>
+#include <aws/config/model/GetOrganizationConfigRuleDetailedStatusPaginationTraits.h>
 #include <aws/config/model/GetOrganizationConfigRuleDetailedStatusRequest.h>
 #include <aws/config/model/GetOrganizationConfigRuleDetailedStatusResult.h>
+#include <aws/config/model/GetOrganizationConformancePackDetailedStatusPaginationTraits.h>
 #include <aws/config/model/GetOrganizationConformancePackDetailedStatusRequest.h>
 #include <aws/config/model/GetOrganizationConformancePackDetailedStatusResult.h>
 #include <aws/config/model/GetOrganizationCustomRulePolicyRequest.h>
 #include <aws/config/model/GetOrganizationCustomRulePolicyResult.h>
+#include <aws/config/model/GetResourceConfigHistoryPaginationTraits.h>
 #include <aws/config/model/GetResourceConfigHistoryRequest.h>
 #include <aws/config/model/GetResourceConfigHistoryResult.h>
 #include <aws/config/model/GetResourceEvaluationSummaryRequest.h>
@@ -221,20 +257,28 @@
 #include <aws/config/model/GetStoredQueryRequest.h>
 #include <aws/config/model/GetStoredQueryResult.h>
 #include <aws/config/model/GroupedResourceCount.h>
+#include <aws/config/model/ListAggregateDiscoveredResourcesPaginationTraits.h>
 #include <aws/config/model/ListAggregateDiscoveredResourcesRequest.h>
 #include <aws/config/model/ListAggregateDiscoveredResourcesResult.h>
+#include <aws/config/model/ListConfigurationRecordersPaginationTraits.h>
 #include <aws/config/model/ListConfigurationRecordersRequest.h>
 #include <aws/config/model/ListConfigurationRecordersResult.h>
+#include <aws/config/model/ListConformancePackComplianceScoresPaginationTraits.h>
 #include <aws/config/model/ListConformancePackComplianceScoresRequest.h>
 #include <aws/config/model/ListConformancePackComplianceScoresResult.h>
+#include <aws/config/model/ListConnectorsPaginationTraits.h>
 #include <aws/config/model/ListConnectorsRequest.h>
 #include <aws/config/model/ListConnectorsResult.h>
+#include <aws/config/model/ListDiscoveredResourcesPaginationTraits.h>
 #include <aws/config/model/ListDiscoveredResourcesRequest.h>
 #include <aws/config/model/ListDiscoveredResourcesResult.h>
+#include <aws/config/model/ListResourceEvaluationsPaginationTraits.h>
 #include <aws/config/model/ListResourceEvaluationsRequest.h>
 #include <aws/config/model/ListResourceEvaluationsResult.h>
+#include <aws/config/model/ListStoredQueriesPaginationTraits.h>
 #include <aws/config/model/ListStoredQueriesRequest.h>
 #include <aws/config/model/ListStoredQueriesResult.h>
+#include <aws/config/model/ListTagsForResourcePaginationTraits.h>
 #include <aws/config/model/ListTagsForResourceRequest.h>
 #include <aws/config/model/ListTagsForResourceResult.h>
 #include <aws/config/model/MaximumExecutionFrequency.h>
@@ -329,8 +373,10 @@
 #include <aws/config/model/RuleEvaluationVisibility.h>
 #include <aws/config/model/Scope.h>
 #include <aws/config/model/ScopeConfiguration.h>
+#include <aws/config/model/SelectAggregateResourceConfigPaginationTraits.h>
 #include <aws/config/model/SelectAggregateResourceConfigRequest.h>
 #include <aws/config/model/SelectAggregateResourceConfigResult.h>
+#include <aws/config/model/SelectResourceConfigPaginationTraits.h>
 #include <aws/config/model/SelectResourceConfigRequest.h>
 #include <aws/config/model/SelectResourceConfigResult.h>
 #include <aws/config/model/SortBy.h>
diff --git a/generated/tests/connect-contact-lens-gen-tests/ConnectContactLensIncludeTests.cpp b/generated/tests/connect-contact-lens-gen-tests/ConnectContactLensIncludeTests.cpp
index a7f42c8c9332..b9ed18b34e8b 100644
--- a/generated/tests/connect-contact-lens-gen-tests/ConnectContactLensIncludeTests.cpp
+++ b/generated/tests/connect-contact-lens-gen-tests/ConnectContactLensIncludeTests.cpp
@@ -7,16 +7,21 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/connect-contact-lens/ConnectContactLensClient.h>
+#include <aws/connect-contact-lens/ConnectContactLensClientPagination.h>
 #include <aws/connect-contact-lens/ConnectContactLensEndpointProvider.h>
 #include <aws/connect-contact-lens/ConnectContactLensErrorMarshaller.h>
 #include <aws/connect-contact-lens/ConnectContactLensErrors.h>
+#include <aws/connect-contact-lens/ConnectContactLensPaginationBase.h>
 #include <aws/connect-contact-lens/ConnectContactLensRequest.h>
 #include <aws/connect-contact-lens/ConnectContactLensServiceClientModel.h>
+#include <aws/connect-contact-lens/ConnectContactLensWaiter.h>
 #include <aws/connect-contact-lens/ConnectContactLens_EXPORTS.h>
+#include <aws/connect-contact-lens/internal/ConnectContactLensEndpointRules.h>
 #include <aws/connect-contact-lens/model/Categories.h>
 #include <aws/connect-contact-lens/model/CategoryDetails.h>
 #include <aws/connect-contact-lens/model/CharacterOffsets.h>
 #include <aws/connect-contact-lens/model/IssueDetected.h>
+#include <aws/connect-contact-lens/model/ListRealtimeContactAnalysisSegmentsPaginationTraits.h>
 #include <aws/connect-contact-lens/model/ListRealtimeContactAnalysisSegmentsRequest.h>
 #include <aws/connect-contact-lens/model/ListRealtimeContactAnalysisSegmentsResult.h>
 #include <aws/connect-contact-lens/model/PointOfInterest.h>
diff --git a/generated/tests/connect-gen-tests/ConnectIncludeTests.cpp b/generated/tests/connect-gen-tests/ConnectIncludeTests.cpp
index 691931122c36..fceb49f2f05d 100644
--- a/generated/tests/connect-gen-tests/ConnectIncludeTests.cpp
+++ b/generated/tests/connect-gen-tests/ConnectIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/connect/ConnectClient.h>
+#include <aws/connect/ConnectClientPagination.h>
 #include <aws/connect/ConnectEndpointProvider.h>
 #include <aws/connect/ConnectErrorMarshaller.h>
 #include <aws/connect/ConnectErrors.h>
+#include <aws/connect/ConnectPaginationBase.h>
 #include <aws/connect/ConnectRequest.h>
 #include <aws/connect/ConnectServiceClientModel.h>
+#include <aws/connect/ConnectWaiter.h>
 #include <aws/connect/Connect_EXPORTS.h>
+#include <aws/connect/internal/ConnectEndpointRules.h>
 #include <aws/connect/model/AccessType.h>
 #include <aws/connect/model/ActionSummary.h>
 #include <aws/connect/model/ActionType.h>
@@ -523,6 +527,7 @@
 #include <aws/connect/model/EndpointType.h>
 #include <aws/connect/model/EntityType.h>
 #include <aws/connect/model/ErrorResult.h>
+#include <aws/connect/model/EvaluateDataTableValuesPaginationTraits.h>
 #include <aws/connect/model/EvaluateDataTableValuesRequest.h>
 #include <aws/connect/model/EvaluateDataTableValuesResult.h>
 #include <aws/connect/model/Evaluation.h>
@@ -645,8 +650,10 @@
 #include <aws/connect/model/GetContactAttributesResult.h>
 #include <aws/connect/model/GetContactMetricsRequest.h>
 #include <aws/connect/model/GetContactMetricsResult.h>
+#include <aws/connect/model/GetCurrentMetricDataPaginationTraits.h>
 #include <aws/connect/model/GetCurrentMetricDataRequest.h>
 #include <aws/connect/model/GetCurrentMetricDataResult.h>
+#include <aws/connect/model/GetCurrentUserDataPaginationTraits.h>
 #include <aws/connect/model/GetCurrentUserDataRequest.h>
 #include <aws/connect/model/GetCurrentUserDataResult.h>
 #include <aws/connect/model/GetEffectiveHoursOfOperationsRequest.h>
@@ -657,8 +664,10 @@
 #include <aws/connect/model/GetFederationTokenResult.h>
 #include <aws/connect/model/GetFlowAssociationRequest.h>
 #include <aws/connect/model/GetFlowAssociationResult.h>
+#include <aws/connect/model/GetMetricDataPaginationTraits.h>
 #include <aws/connect/model/GetMetricDataRequest.h>
 #include <aws/connect/model/GetMetricDataResult.h>
+#include <aws/connect/model/GetMetricDataV2PaginationTraits.h>
 #include <aws/connect/model/GetMetricDataV2Request.h>
 #include <aws/connect/model/GetMetricDataV2Result.h>
 #include <aws/connect/model/GetPromptFileRequest.h>
@@ -737,147 +746,207 @@
 #include <aws/connect/model/LexBotConfig.h>
 #include <aws/connect/model/LexV2Bot.h>
 #include <aws/connect/model/LexVersion.h>
+#include <aws/connect/model/ListAgentStatusesPaginationTraits.h>
 #include <aws/connect/model/ListAgentStatusesRequest.h>
 #include <aws/connect/model/ListAgentStatusesResult.h>
 #include <aws/connect/model/ListAnalyticsDataAssociationsRequest.h>
 #include <aws/connect/model/ListAnalyticsDataAssociationsResult.h>
 #include <aws/connect/model/ListAnalyticsDataLakeDataSetsRequest.h>
 #include <aws/connect/model/ListAnalyticsDataLakeDataSetsResult.h>
+#include <aws/connect/model/ListApprovedOriginsPaginationTraits.h>
 #include <aws/connect/model/ListApprovedOriginsRequest.h>
 #include <aws/connect/model/ListApprovedOriginsResult.h>
 #include <aws/connect/model/ListAssociatedContactsRequest.h>
 #include <aws/connect/model/ListAssociatedContactsResult.h>
+#include <aws/connect/model/ListAttachedFilesConfigurationsPaginationTraits.h>
 #include <aws/connect/model/ListAttachedFilesConfigurationsRequest.h>
 #include <aws/connect/model/ListAttachedFilesConfigurationsResult.h>
+#include <aws/connect/model/ListAuthenticationProfilesPaginationTraits.h>
 #include <aws/connect/model/ListAuthenticationProfilesRequest.h>
 #include <aws/connect/model/ListAuthenticationProfilesResult.h>
+#include <aws/connect/model/ListBotsPaginationTraits.h>
 #include <aws/connect/model/ListBotsRequest.h>
 #include <aws/connect/model/ListBotsResult.h>
+#include <aws/connect/model/ListChildHoursOfOperationsPaginationTraits.h>
 #include <aws/connect/model/ListChildHoursOfOperationsRequest.h>
 #include <aws/connect/model/ListChildHoursOfOperationsResult.h>
 #include <aws/connect/model/ListCondition.h>
+#include <aws/connect/model/ListContactEvaluationsPaginationTraits.h>
 #include <aws/connect/model/ListContactEvaluationsRequest.h>
 #include <aws/connect/model/ListContactEvaluationsResult.h>
+#include <aws/connect/model/ListContactFlowModuleAliasesPaginationTraits.h>
 #include <aws/connect/model/ListContactFlowModuleAliasesRequest.h>
 #include <aws/connect/model/ListContactFlowModuleAliasesResult.h>
+#include <aws/connect/model/ListContactFlowModuleVersionsPaginationTraits.h>
 #include <aws/connect/model/ListContactFlowModuleVersionsRequest.h>
 #include <aws/connect/model/ListContactFlowModuleVersionsResult.h>
+#include <aws/connect/model/ListContactFlowModulesPaginationTraits.h>
 #include <aws/connect/model/ListContactFlowModulesRequest.h>
 #include <aws/connect/model/ListContactFlowModulesResult.h>
+#include <aws/connect/model/ListContactFlowVersionsPaginationTraits.h>
 #include <aws/connect/model/ListContactFlowVersionsRequest.h>
 #include <aws/connect/model/ListContactFlowVersionsResult.h>
+#include <aws/connect/model/ListContactFlowsPaginationTraits.h>
 #include <aws/connect/model/ListContactFlowsRequest.h>
 #include <aws/connect/model/ListContactFlowsResult.h>
+#include <aws/connect/model/ListContactReferencesPaginationTraits.h>
 #include <aws/connect/model/ListContactReferencesRequest.h>
 #include <aws/connect/model/ListContactReferencesResult.h>
+#include <aws/connect/model/ListDataTableAttributesPaginationTraits.h>
 #include <aws/connect/model/ListDataTableAttributesRequest.h>
 #include <aws/connect/model/ListDataTableAttributesResult.h>
+#include <aws/connect/model/ListDataTablePrimaryValuesPaginationTraits.h>
 #include <aws/connect/model/ListDataTablePrimaryValuesRequest.h>
 #include <aws/connect/model/ListDataTablePrimaryValuesResult.h>
+#include <aws/connect/model/ListDataTableValuesPaginationTraits.h>
 #include <aws/connect/model/ListDataTableValuesRequest.h>
 #include <aws/connect/model/ListDataTableValuesResult.h>
+#include <aws/connect/model/ListDataTablesPaginationTraits.h>
 #include <aws/connect/model/ListDataTablesRequest.h>
 #include <aws/connect/model/ListDataTablesResult.h>
+#include <aws/connect/model/ListDefaultVocabulariesPaginationTraits.h>
 #include <aws/connect/model/ListDefaultVocabulariesRequest.h>
 #include <aws/connect/model/ListDefaultVocabulariesResult.h>
+#include <aws/connect/model/ListEntitySecurityProfilesPaginationTraits.h>
 #include <aws/connect/model/ListEntitySecurityProfilesRequest.h>
 #include <aws/connect/model/ListEntitySecurityProfilesResult.h>
+#include <aws/connect/model/ListEvaluationFormVersionsPaginationTraits.h>
 #include <aws/connect/model/ListEvaluationFormVersionsRequest.h>
 #include <aws/connect/model/ListEvaluationFormVersionsResult.h>
+#include <aws/connect/model/ListEvaluationFormsPaginationTraits.h>
 #include <aws/connect/model/ListEvaluationFormsRequest.h>
 #include <aws/connect/model/ListEvaluationFormsResult.h>
 #include <aws/connect/model/ListFlowAssociationResourceType.h>
+#include <aws/connect/model/ListFlowAssociationsPaginationTraits.h>
 #include <aws/connect/model/ListFlowAssociationsRequest.h>
 #include <aws/connect/model/ListFlowAssociationsResult.h>
+#include <aws/connect/model/ListHoursOfOperationOverridesPaginationTraits.h>
 #include <aws/connect/model/ListHoursOfOperationOverridesRequest.h>
 #include <aws/connect/model/ListHoursOfOperationOverridesResult.h>
+#include <aws/connect/model/ListHoursOfOperationsPaginationTraits.h>
 #include <aws/connect/model/ListHoursOfOperationsRequest.h>
 #include <aws/connect/model/ListHoursOfOperationsResult.h>
+#include <aws/connect/model/ListInstanceAttributesPaginationTraits.h>
 #include <aws/connect/model/ListInstanceAttributesRequest.h>
 #include <aws/connect/model/ListInstanceAttributesResult.h>
+#include <aws/connect/model/ListInstanceStorageConfigsPaginationTraits.h>
 #include <aws/connect/model/ListInstanceStorageConfigsRequest.h>
 #include <aws/connect/model/ListInstanceStorageConfigsResult.h>
+#include <aws/connect/model/ListInstancesPaginationTraits.h>
 #include <aws/connect/model/ListInstancesRequest.h>
 #include <aws/connect/model/ListInstancesResult.h>
+#include <aws/connect/model/ListIntegrationAssociationsPaginationTraits.h>
 #include <aws/connect/model/ListIntegrationAssociationsRequest.h>
 #include <aws/connect/model/ListIntegrationAssociationsResult.h>
+#include <aws/connect/model/ListLambdaFunctionsPaginationTraits.h>
 #include <aws/connect/model/ListLambdaFunctionsRequest.h>
 #include <aws/connect/model/ListLambdaFunctionsResult.h>
+#include <aws/connect/model/ListLexBotsPaginationTraits.h>
 #include <aws/connect/model/ListLexBotsRequest.h>
 #include <aws/connect/model/ListLexBotsResult.h>
+#include <aws/connect/model/ListMetricsPaginationTraits.h>
 #include <aws/connect/model/ListMetricsRequest.h>
 #include <aws/connect/model/ListMetricsResult.h>
 #include <aws/connect/model/ListNotificationsRequest.h>
 #include <aws/connect/model/ListNotificationsResult.h>
+#include <aws/connect/model/ListPhoneNumbersPaginationTraits.h>
 #include <aws/connect/model/ListPhoneNumbersRequest.h>
 #include <aws/connect/model/ListPhoneNumbersResult.h>
 #include <aws/connect/model/ListPhoneNumbersSummary.h>
+#include <aws/connect/model/ListPhoneNumbersV2PaginationTraits.h>
 #include <aws/connect/model/ListPhoneNumbersV2Request.h>
 #include <aws/connect/model/ListPhoneNumbersV2Result.h>
+#include <aws/connect/model/ListPredefinedAttributesPaginationTraits.h>
 #include <aws/connect/model/ListPredefinedAttributesRequest.h>
 #include <aws/connect/model/ListPredefinedAttributesResult.h>
+#include <aws/connect/model/ListPromptsPaginationTraits.h>
 #include <aws/connect/model/ListPromptsRequest.h>
 #include <aws/connect/model/ListPromptsResult.h>
 #include <aws/connect/model/ListQueueEmailAddressesRequest.h>
 #include <aws/connect/model/ListQueueEmailAddressesResult.h>
+#include <aws/connect/model/ListQueueQuickConnectsPaginationTraits.h>
 #include <aws/connect/model/ListQueueQuickConnectsRequest.h>
 #include <aws/connect/model/ListQueueQuickConnectsResult.h>
+#include <aws/connect/model/ListQueuesPaginationTraits.h>
 #include <aws/connect/model/ListQueuesRequest.h>
 #include <aws/connect/model/ListQueuesResult.h>
+#include <aws/connect/model/ListQuickConnectsPaginationTraits.h>
 #include <aws/connect/model/ListQuickConnectsRequest.h>
 #include <aws/connect/model/ListQuickConnectsResult.h>
+#include <aws/connect/model/ListRealtimeContactAnalysisSegmentsV2PaginationTraits.h>
 #include <aws/connect/model/ListRealtimeContactAnalysisSegmentsV2Request.h>
 #include <aws/connect/model/ListRealtimeContactAnalysisSegmentsV2Result.h>
+#include <aws/connect/model/ListRoutingProfileManualAssignmentQueuesPaginationTraits.h>
 #include <aws/connect/model/ListRoutingProfileManualAssignmentQueuesRequest.h>
 #include <aws/connect/model/ListRoutingProfileManualAssignmentQueuesResult.h>
+#include <aws/connect/model/ListRoutingProfileQueuesPaginationTraits.h>
 #include <aws/connect/model/ListRoutingProfileQueuesRequest.h>
 #include <aws/connect/model/ListRoutingProfileQueuesResult.h>
+#include <aws/connect/model/ListRoutingProfilesPaginationTraits.h>
 #include <aws/connect/model/ListRoutingProfilesRequest.h>
 #include <aws/connect/model/ListRoutingProfilesResult.h>
+#include <aws/connect/model/ListRulesPaginationTraits.h>
 #include <aws/connect/model/ListRulesRequest.h>
 #include <aws/connect/model/ListRulesResult.h>
+#include <aws/connect/model/ListSecurityKeysPaginationTraits.h>
 #include <aws/connect/model/ListSecurityKeysRequest.h>
 #include <aws/connect/model/ListSecurityKeysResult.h>
+#include <aws/connect/model/ListSecurityProfileApplicationsPaginationTraits.h>
 #include <aws/connect/model/ListSecurityProfileApplicationsRequest.h>
 #include <aws/connect/model/ListSecurityProfileApplicationsResult.h>
+#include <aws/connect/model/ListSecurityProfileFlowModulesPaginationTraits.h>
 #include <aws/connect/model/ListSecurityProfileFlowModulesRequest.h>
 #include <aws/connect/model/ListSecurityProfileFlowModulesResult.h>
+#include <aws/connect/model/ListSecurityProfilePermissionsPaginationTraits.h>
 #include <aws/connect/model/ListSecurityProfilePermissionsRequest.h>
 #include <aws/connect/model/ListSecurityProfilePermissionsResult.h>
+#include <aws/connect/model/ListSecurityProfilesPaginationTraits.h>
 #include <aws/connect/model/ListSecurityProfilesRequest.h>
 #include <aws/connect/model/ListSecurityProfilesResult.h>
 #include <aws/connect/model/ListTagsForResourceRequest.h>
 #include <aws/connect/model/ListTagsForResourceResult.h>
+#include <aws/connect/model/ListTaskTemplatesPaginationTraits.h>
 #include <aws/connect/model/ListTaskTemplatesRequest.h>
 #include <aws/connect/model/ListTaskTemplatesResult.h>
 #include <aws/connect/model/ListTestCaseExecutionRecordsRequest.h>
 #include <aws/connect/model/ListTestCaseExecutionRecordsResult.h>
 #include <aws/connect/model/ListTestCaseExecutionsRequest.h>
 #include <aws/connect/model/ListTestCaseExecutionsResult.h>
+#include <aws/connect/model/ListTestCasesPaginationTraits.h>
 #include <aws/connect/model/ListTestCasesRequest.h>
 #include <aws/connect/model/ListTestCasesResult.h>
+#include <aws/connect/model/ListTrafficDistributionGroupUsersPaginationTraits.h>
 #include <aws/connect/model/ListTrafficDistributionGroupUsersRequest.h>
 #include <aws/connect/model/ListTrafficDistributionGroupUsersResult.h>
+#include <aws/connect/model/ListTrafficDistributionGroupsPaginationTraits.h>
 #include <aws/connect/model/ListTrafficDistributionGroupsRequest.h>
 #include <aws/connect/model/ListTrafficDistributionGroupsResult.h>
+#include <aws/connect/model/ListUseCasesPaginationTraits.h>
 #include <aws/connect/model/ListUseCasesRequest.h>
 #include <aws/connect/model/ListUseCasesResult.h>
+#include <aws/connect/model/ListUserHierarchyGroupsPaginationTraits.h>
 #include <aws/connect/model/ListUserHierarchyGroupsRequest.h>
 #include <aws/connect/model/ListUserHierarchyGroupsResult.h>
 #include <aws/connect/model/ListUserNotificationsRequest.h>
 #include <aws/connect/model/ListUserNotificationsResult.h>
+#include <aws/connect/model/ListUserProficienciesPaginationTraits.h>
 #include <aws/connect/model/ListUserProficienciesRequest.h>
 #include <aws/connect/model/ListUserProficienciesResult.h>
+#include <aws/connect/model/ListUsersPaginationTraits.h>
 #include <aws/connect/model/ListUsersRequest.h>
 #include <aws/connect/model/ListUsersResult.h>
+#include <aws/connect/model/ListViewVersionsPaginationTraits.h>
 #include <aws/connect/model/ListViewVersionsRequest.h>
 #include <aws/connect/model/ListViewVersionsResult.h>
+#include <aws/connect/model/ListViewsPaginationTraits.h>
 #include <aws/connect/model/ListViewsRequest.h>
 #include <aws/connect/model/ListViewsResult.h>
 #include <aws/connect/model/ListWorkspaceMediaRequest.h>
 #include <aws/connect/model/ListWorkspaceMediaResult.h>
+#include <aws/connect/model/ListWorkspacePagesPaginationTraits.h>
 #include <aws/connect/model/ListWorkspacePagesRequest.h>
 #include <aws/connect/model/ListWorkspacePagesResult.h>
+#include <aws/connect/model/ListWorkspacesPaginationTraits.h>
 #include <aws/connect/model/ListWorkspacesRequest.h>
 #include <aws/connect/model/ListWorkspacesResult.h>
 #include <aws/connect/model/LocaleCode.h>
@@ -1110,19 +1179,24 @@
 #include <aws/connect/model/RulesSearchFilter.h>
 #include <aws/connect/model/S3Config.h>
 #include <aws/connect/model/ScreenShareCapability.h>
+#include <aws/connect/model/SearchAgentStatusesPaginationTraits.h>
 #include <aws/connect/model/SearchAgentStatusesRequest.h>
 #include <aws/connect/model/SearchAgentStatusesResult.h>
+#include <aws/connect/model/SearchAvailablePhoneNumbersPaginationTraits.h>
 #include <aws/connect/model/SearchAvailablePhoneNumbersRequest.h>
 #include <aws/connect/model/SearchAvailablePhoneNumbersResult.h>
 #include <aws/connect/model/SearchContactEvaluationsRequest.h>
 #include <aws/connect/model/SearchContactEvaluationsResult.h>
+#include <aws/connect/model/SearchContactFlowModulesPaginationTraits.h>
 #include <aws/connect/model/SearchContactFlowModulesRequest.h>
 #include <aws/connect/model/SearchContactFlowModulesResult.h>
+#include <aws/connect/model/SearchContactFlowsPaginationTraits.h>
 #include <aws/connect/model/SearchContactFlowsRequest.h>
 #include <aws/connect/model/SearchContactFlowsResult.h>
 #include <aws/connect/model/SearchContactsAdditionalTimeRange.h>
 #include <aws/connect/model/SearchContactsAdditionalTimeRangeCriteria.h>
 #include <aws/connect/model/SearchContactsMatchType.h>
+#include <aws/connect/model/SearchContactsPaginationTraits.h>
 #include <aws/connect/model/SearchContactsRequest.h>
 #include <aws/connect/model/SearchContactsResult.h>
 #include <aws/connect/model/SearchContactsTimeRange.h>
@@ -1130,48 +1204,67 @@
 #include <aws/connect/model/SearchContactsTimeRangeType.h>
 #include <aws/connect/model/SearchContactsTimestampCondition.h>
 #include <aws/connect/model/SearchCriteria.h>
+#include <aws/connect/model/SearchDataTablesPaginationTraits.h>
 #include <aws/connect/model/SearchDataTablesRequest.h>
 #include <aws/connect/model/SearchDataTablesResult.h>
 #include <aws/connect/model/SearchEmailAddressesRequest.h>
 #include <aws/connect/model/SearchEmailAddressesResult.h>
 #include <aws/connect/model/SearchEvaluationFormsRequest.h>
 #include <aws/connect/model/SearchEvaluationFormsResult.h>
+#include <aws/connect/model/SearchHoursOfOperationOverridesPaginationTraits.h>
 #include <aws/connect/model/SearchHoursOfOperationOverridesRequest.h>
 #include <aws/connect/model/SearchHoursOfOperationOverridesResult.h>
+#include <aws/connect/model/SearchHoursOfOperationsPaginationTraits.h>
 #include <aws/connect/model/SearchHoursOfOperationsRequest.h>
 #include <aws/connect/model/SearchHoursOfOperationsResult.h>
+#include <aws/connect/model/SearchMetricsPaginationTraits.h>
 #include <aws/connect/model/SearchMetricsRequest.h>
 #include <aws/connect/model/SearchMetricsResult.h>
 #include <aws/connect/model/SearchNotificationsRequest.h>
 #include <aws/connect/model/SearchNotificationsResult.h>
+#include <aws/connect/model/SearchPredefinedAttributesPaginationTraits.h>
 #include <aws/connect/model/SearchPredefinedAttributesRequest.h>
 #include <aws/connect/model/SearchPredefinedAttributesResult.h>
+#include <aws/connect/model/SearchPromptsPaginationTraits.h>
 #include <aws/connect/model/SearchPromptsRequest.h>
 #include <aws/connect/model/SearchPromptsResult.h>
+#include <aws/connect/model/SearchQueuesPaginationTraits.h>
 #include <aws/connect/model/SearchQueuesRequest.h>
 #include <aws/connect/model/SearchQueuesResult.h>
+#include <aws/connect/model/SearchQuickConnectsPaginationTraits.h>
 #include <aws/connect/model/SearchQuickConnectsRequest.h>
 #include <aws/connect/model/SearchQuickConnectsResult.h>
+#include <aws/connect/model/SearchResourceTagsPaginationTraits.h>
 #include <aws/connect/model/SearchResourceTagsRequest.h>
 #include <aws/connect/model/SearchResourceTagsResult.h>
+#include <aws/connect/model/SearchRoutingProfilesPaginationTraits.h>
 #include <aws/connect/model/SearchRoutingProfilesRequest.h>
 #include <aws/connect/model/SearchRoutingProfilesResult.h>
+#include <aws/connect/model/SearchRulesPaginationTraits.h>
 #include <aws/connect/model/SearchRulesRequest.h>
 #include <aws/connect/model/SearchRulesResult.h>
+#include <aws/connect/model/SearchSecurityProfilesPaginationTraits.h>
 #include <aws/connect/model/SearchSecurityProfilesRequest.h>
 #include <aws/connect/model/SearchSecurityProfilesResult.h>
+#include <aws/connect/model/SearchTestCasesPaginationTraits.h>
 #include <aws/connect/model/SearchTestCasesRequest.h>
 #include <aws/connect/model/SearchTestCasesResult.h>
+#include <aws/connect/model/SearchUserHierarchyGroupsPaginationTraits.h>
 #include <aws/connect/model/SearchUserHierarchyGroupsRequest.h>
 #include <aws/connect/model/SearchUserHierarchyGroupsResult.h>
+#include <aws/connect/model/SearchUsersPaginationTraits.h>
 #include <aws/connect/model/SearchUsersRequest.h>
 #include <aws/connect/model/SearchUsersResult.h>
+#include <aws/connect/model/SearchViewsPaginationTraits.h>
 #include <aws/connect/model/SearchViewsRequest.h>
 #include <aws/connect/model/SearchViewsResult.h>
+#include <aws/connect/model/SearchVocabulariesPaginationTraits.h>
 #include <aws/connect/model/SearchVocabulariesRequest.h>
 #include <aws/connect/model/SearchVocabulariesResult.h>
+#include <aws/connect/model/SearchWorkspaceAssociationsPaginationTraits.h>
 #include <aws/connect/model/SearchWorkspaceAssociationsRequest.h>
 #include <aws/connect/model/SearchWorkspaceAssociationsResult.h>
+#include <aws/connect/model/SearchWorkspacesPaginationTraits.h>
 #include <aws/connect/model/SearchWorkspacesRequest.h>
 #include <aws/connect/model/SearchWorkspacesResult.h>
 #include <aws/connect/model/SearchableAgentCriteriaStep.h>
diff --git a/generated/tests/connectcampaigns-gen-tests/ConnectCampaignsIncludeTests.cpp b/generated/tests/connectcampaigns-gen-tests/ConnectCampaignsIncludeTests.cpp
index e81d17713bda..6f68feef7582 100644
--- a/generated/tests/connectcampaigns-gen-tests/ConnectCampaignsIncludeTests.cpp
+++ b/generated/tests/connectcampaigns-gen-tests/ConnectCampaignsIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/connectcampaigns/ConnectCampaignsClient.h>
+#include <aws/connectcampaigns/ConnectCampaignsClientPagination.h>
 #include <aws/connectcampaigns/ConnectCampaignsEndpointProvider.h>
 #include <aws/connectcampaigns/ConnectCampaignsErrorMarshaller.h>
 #include <aws/connectcampaigns/ConnectCampaignsErrors.h>
+#include <aws/connectcampaigns/ConnectCampaignsPaginationBase.h>
 #include <aws/connectcampaigns/ConnectCampaignsRequest.h>
 #include <aws/connectcampaigns/ConnectCampaignsServiceClientModel.h>
+#include <aws/connectcampaigns/ConnectCampaignsWaiter.h>
 #include <aws/connectcampaigns/ConnectCampaigns_EXPORTS.h>
+#include <aws/connectcampaigns/internal/ConnectCampaignsEndpointRules.h>
 #include <aws/connectcampaigns/model/AccessDeniedException.h>
 #include <aws/connectcampaigns/model/AgentlessDialerConfig.h>
 #include <aws/connectcampaigns/model/AnswerMachineDetectionConfig.h>
@@ -53,6 +57,7 @@
 #include <aws/connectcampaigns/model/InternalServerException.h>
 #include <aws/connectcampaigns/model/InvalidCampaignStateException.h>
 #include <aws/connectcampaigns/model/InvalidStateException.h>
+#include <aws/connectcampaigns/model/ListCampaignsPaginationTraits.h>
 #include <aws/connectcampaigns/model/ListCampaignsRequest.h>
 #include <aws/connectcampaigns/model/ListCampaignsResult.h>
 #include <aws/connectcampaigns/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/connectcampaignsv2-gen-tests/ConnectCampaignsV2IncludeTests.cpp b/generated/tests/connectcampaignsv2-gen-tests/ConnectCampaignsV2IncludeTests.cpp
index 13d81037d081..2c9640b73349 100644
--- a/generated/tests/connectcampaignsv2-gen-tests/ConnectCampaignsV2IncludeTests.cpp
+++ b/generated/tests/connectcampaignsv2-gen-tests/ConnectCampaignsV2IncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/connectcampaignsv2/ConnectCampaignsV2Client.h>
+#include <aws/connectcampaignsv2/ConnectCampaignsV2ClientPagination.h>
 #include <aws/connectcampaignsv2/ConnectCampaignsV2EndpointProvider.h>
 #include <aws/connectcampaignsv2/ConnectCampaignsV2ErrorMarshaller.h>
 #include <aws/connectcampaignsv2/ConnectCampaignsV2Errors.h>
+#include <aws/connectcampaignsv2/ConnectCampaignsV2PaginationBase.h>
 #include <aws/connectcampaignsv2/ConnectCampaignsV2Request.h>
 #include <aws/connectcampaignsv2/ConnectCampaignsV2ServiceClientModel.h>
+#include <aws/connectcampaignsv2/ConnectCampaignsV2Waiter.h>
 #include <aws/connectcampaignsv2/ConnectCampaignsV2_EXPORTS.h>
+#include <aws/connectcampaignsv2/internal/ConnectCampaignsV2EndpointRules.h>
 #include <aws/connectcampaignsv2/model/AbandonmentRatePacingConfig.h>
 #include <aws/connectcampaignsv2/model/AccessDeniedException.h>
 #include <aws/connectcampaignsv2/model/AgentAction.h>
@@ -95,8 +99,10 @@
 #include <aws/connectcampaignsv2/model/LambdaIntegrationConfig.h>
 #include <aws/connectcampaignsv2/model/LambdaIntegrationIdentifier.h>
 #include <aws/connectcampaignsv2/model/LambdaIntegrationSummary.h>
+#include <aws/connectcampaignsv2/model/ListCampaignsPaginationTraits.h>
 #include <aws/connectcampaignsv2/model/ListCampaignsRequest.h>
 #include <aws/connectcampaignsv2/model/ListCampaignsResult.h>
+#include <aws/connectcampaignsv2/model/ListConnectInstanceIntegrationsPaginationTraits.h>
 #include <aws/connectcampaignsv2/model/ListConnectInstanceIntegrationsRequest.h>
 #include <aws/connectcampaignsv2/model/ListConnectInstanceIntegrationsResult.h>
 #include <aws/connectcampaignsv2/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/connectcases-gen-tests/ConnectCasesIncludeTests.cpp b/generated/tests/connectcases-gen-tests/ConnectCasesIncludeTests.cpp
index ec58f3aa421e..8536e23c18ae 100644
--- a/generated/tests/connectcases-gen-tests/ConnectCasesIncludeTests.cpp
+++ b/generated/tests/connectcases-gen-tests/ConnectCasesIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/connectcases/ConnectCasesClient.h>
+#include <aws/connectcases/ConnectCasesClientPagination.h>
 #include <aws/connectcases/ConnectCasesEndpointProvider.h>
 #include <aws/connectcases/ConnectCasesErrorMarshaller.h>
 #include <aws/connectcases/ConnectCasesErrors.h>
+#include <aws/connectcases/ConnectCasesPaginationBase.h>
 #include <aws/connectcases/ConnectCasesRequest.h>
 #include <aws/connectcases/ConnectCasesServiceClientModel.h>
+#include <aws/connectcases/ConnectCasesWaiter.h>
 #include <aws/connectcases/ConnectCases_EXPORTS.h>
+#include <aws/connectcases/internal/ConnectCasesEndpointRules.h>
 #include <aws/connectcases/model/AuditEvent.h>
 #include <aws/connectcases/model/AuditEventField.h>
 #include <aws/connectcases/model/AuditEventFieldValueUnion.h>
@@ -100,10 +104,12 @@
 #include <aws/connectcases/model/FieldValueUnion.h>
 #include <aws/connectcases/model/FileContent.h>
 #include <aws/connectcases/model/FileFilter.h>
+#include <aws/connectcases/model/GetCaseAuditEventsPaginationTraits.h>
 #include <aws/connectcases/model/GetCaseAuditEventsRequest.h>
 #include <aws/connectcases/model/GetCaseAuditEventsResult.h>
 #include <aws/connectcases/model/GetCaseEventConfigurationRequest.h>
 #include <aws/connectcases/model/GetCaseEventConfigurationResult.h>
+#include <aws/connectcases/model/GetCasePaginationTraits.h>
 #include <aws/connectcases/model/GetCaseRequest.h>
 #include <aws/connectcases/model/GetCaseResult.h>
 #include <aws/connectcases/model/GetCaseRuleResponse.h>
@@ -120,20 +126,27 @@
 #include <aws/connectcases/model/LayoutContent.h>
 #include <aws/connectcases/model/LayoutSections.h>
 #include <aws/connectcases/model/LayoutSummary.h>
+#include <aws/connectcases/model/ListCaseRulesPaginationTraits.h>
 #include <aws/connectcases/model/ListCaseRulesRequest.h>
 #include <aws/connectcases/model/ListCaseRulesResult.h>
+#include <aws/connectcases/model/ListCasesForContactPaginationTraits.h>
 #include <aws/connectcases/model/ListCasesForContactRequest.h>
 #include <aws/connectcases/model/ListCasesForContactResult.h>
+#include <aws/connectcases/model/ListDomainsPaginationTraits.h>
 #include <aws/connectcases/model/ListDomainsRequest.h>
 #include <aws/connectcases/model/ListDomainsResult.h>
+#include <aws/connectcases/model/ListFieldOptionsPaginationTraits.h>
 #include <aws/connectcases/model/ListFieldOptionsRequest.h>
 #include <aws/connectcases/model/ListFieldOptionsResult.h>
+#include <aws/connectcases/model/ListFieldsPaginationTraits.h>
 #include <aws/connectcases/model/ListFieldsRequest.h>
 #include <aws/connectcases/model/ListFieldsResult.h>
+#include <aws/connectcases/model/ListLayoutsPaginationTraits.h>
 #include <aws/connectcases/model/ListLayoutsRequest.h>
 #include <aws/connectcases/model/ListLayoutsResult.h>
 #include <aws/connectcases/model/ListTagsForResourceRequest.h>
 #include <aws/connectcases/model/ListTagsForResourceResult.h>
+#include <aws/connectcases/model/ListTemplatesPaginationTraits.h>
 #include <aws/connectcases/model/ListTemplatesRequest.h>
 #include <aws/connectcases/model/ListTemplatesResult.h>
 #include <aws/connectcases/model/OperandOne.h>
@@ -152,14 +165,17 @@
 #include <aws/connectcases/model/RequiredField.h>
 #include <aws/connectcases/model/ResourceNotFoundException.h>
 #include <aws/connectcases/model/RuleType.h>
+#include <aws/connectcases/model/SearchAllRelatedItemsPaginationTraits.h>
 #include <aws/connectcases/model/SearchAllRelatedItemsRequest.h>
 #include <aws/connectcases/model/SearchAllRelatedItemsResponseItem.h>
 #include <aws/connectcases/model/SearchAllRelatedItemsResult.h>
 #include <aws/connectcases/model/SearchAllRelatedItemsSort.h>
 #include <aws/connectcases/model/SearchAllRelatedItemsSortProperty.h>
+#include <aws/connectcases/model/SearchCasesPaginationTraits.h>
 #include <aws/connectcases/model/SearchCasesRequest.h>
 #include <aws/connectcases/model/SearchCasesResponseItem.h>
 #include <aws/connectcases/model/SearchCasesResult.h>
+#include <aws/connectcases/model/SearchRelatedItemsPaginationTraits.h>
 #include <aws/connectcases/model/SearchRelatedItemsRequest.h>
 #include <aws/connectcases/model/SearchRelatedItemsResponseItem.h>
 #include <aws/connectcases/model/SearchRelatedItemsResult.h>
diff --git a/generated/tests/connecthealth-gen-tests/ConnectHealthIncludeTests.cpp b/generated/tests/connecthealth-gen-tests/ConnectHealthIncludeTests.cpp
index e4abdc0621c3..e10fc52b6773 100644
--- a/generated/tests/connecthealth-gen-tests/ConnectHealthIncludeTests.cpp
+++ b/generated/tests/connecthealth-gen-tests/ConnectHealthIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/connecthealth/ConnectHealthClient.h>
+#include <aws/connecthealth/ConnectHealthClientPagination.h>
 #include <aws/connecthealth/ConnectHealthEndpointProvider.h>
 #include <aws/connecthealth/ConnectHealthErrorMarshaller.h>
 #include <aws/connecthealth/ConnectHealthErrors.h>
+#include <aws/connecthealth/ConnectHealthPaginationBase.h>
 #include <aws/connecthealth/ConnectHealthRequest.h>
 #include <aws/connecthealth/ConnectHealthServiceClientModel.h>
+#include <aws/connecthealth/ConnectHealthWaiter.h>
 #include <aws/connecthealth/ConnectHealth_EXPORTS.h>
+#include <aws/connecthealth/internal/ConnectHealthEndpointRules.h>
 #include <aws/connecthealth/model/ActivateSubscriptionRequest.h>
 #include <aws/connecthealth/model/ActivateSubscriptionResult.h>
 #include <aws/connecthealth/model/ArtifactDetails.h>
@@ -50,8 +54,10 @@
 #include <aws/connecthealth/model/InsightsOutput.h>
 #include <aws/connecthealth/model/InsightsType.h>
 #include <aws/connecthealth/model/JobStatus.h>
+#include <aws/connecthealth/model/ListDomainsPaginationTraits.h>
 #include <aws/connecthealth/model/ListDomainsRequest.h>
 #include <aws/connecthealth/model/ListDomainsResult.h>
+#include <aws/connecthealth/model/ListSubscriptionsPaginationTraits.h>
 #include <aws/connecthealth/model/ListSubscriptionsRequest.h>
 #include <aws/connecthealth/model/ListSubscriptionsResult.h>
 #include <aws/connecthealth/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/connectparticipant-gen-tests/ConnectParticipantIncludeTests.cpp b/generated/tests/connectparticipant-gen-tests/ConnectParticipantIncludeTests.cpp
index d4eff4ec5f05..6f715c495ac6 100644
--- a/generated/tests/connectparticipant-gen-tests/ConnectParticipantIncludeTests.cpp
+++ b/generated/tests/connectparticipant-gen-tests/ConnectParticipantIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/connectparticipant/ConnectParticipantClient.h>
+#include <aws/connectparticipant/ConnectParticipantClientPagination.h>
 #include <aws/connectparticipant/ConnectParticipantEndpointProvider.h>
 #include <aws/connectparticipant/ConnectParticipantErrorMarshaller.h>
 #include <aws/connectparticipant/ConnectParticipantErrors.h>
+#include <aws/connectparticipant/ConnectParticipantPaginationBase.h>
 #include <aws/connectparticipant/ConnectParticipantRequest.h>
 #include <aws/connectparticipant/ConnectParticipantServiceClientModel.h>
+#include <aws/connectparticipant/ConnectParticipantWaiter.h>
 #include <aws/connectparticipant/ConnectParticipant_EXPORTS.h>
+#include <aws/connectparticipant/internal/ConnectParticipantEndpointRules.h>
 #include <aws/connectparticipant/model/ArtifactStatus.h>
 #include <aws/connectparticipant/model/AttachmentItem.h>
 #include <aws/connectparticipant/model/Attendee.h>
@@ -34,6 +38,7 @@
 #include <aws/connectparticipant/model/GetAttachmentResult.h>
 #include <aws/connectparticipant/model/GetAuthenticationUrlRequest.h>
 #include <aws/connectparticipant/model/GetAuthenticationUrlResult.h>
+#include <aws/connectparticipant/model/GetTranscriptPaginationTraits.h>
 #include <aws/connectparticipant/model/GetTranscriptRequest.h>
 #include <aws/connectparticipant/model/GetTranscriptResult.h>
 #include <aws/connectparticipant/model/Item.h>
diff --git a/generated/tests/controlcatalog-gen-tests/ControlCatalogIncludeTests.cpp b/generated/tests/controlcatalog-gen-tests/ControlCatalogIncludeTests.cpp
index 2ac78b46fac4..5dd2a84703f9 100644
--- a/generated/tests/controlcatalog-gen-tests/ControlCatalogIncludeTests.cpp
+++ b/generated/tests/controlcatalog-gen-tests/ControlCatalogIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/controlcatalog/ControlCatalogClient.h>
+#include <aws/controlcatalog/ControlCatalogClientPagination.h>
 #include <aws/controlcatalog/ControlCatalogEndpointProvider.h>
 #include <aws/controlcatalog/ControlCatalogErrorMarshaller.h>
 #include <aws/controlcatalog/ControlCatalogErrors.h>
+#include <aws/controlcatalog/ControlCatalogPaginationBase.h>
 #include <aws/controlcatalog/ControlCatalogRequest.h>
 #include <aws/controlcatalog/ControlCatalogServiceClientModel.h>
+#include <aws/controlcatalog/ControlCatalogWaiter.h>
 #include <aws/controlcatalog/ControlCatalog_EXPORTS.h>
+#include <aws/controlcatalog/internal/ControlCatalogEndpointRules.h>
 #include <aws/controlcatalog/model/AssociatedDomainSummary.h>
 #include <aws/controlcatalog/model/AssociatedObjectiveSummary.h>
 #include <aws/controlcatalog/model/CommonControlFilter.h>
@@ -36,14 +40,19 @@
 #include <aws/controlcatalog/model/ImplementationDetails.h>
 #include <aws/controlcatalog/model/ImplementationFilter.h>
 #include <aws/controlcatalog/model/ImplementationSummary.h>
+#include <aws/controlcatalog/model/ListCommonControlsPaginationTraits.h>
 #include <aws/controlcatalog/model/ListCommonControlsRequest.h>
 #include <aws/controlcatalog/model/ListCommonControlsResult.h>
+#include <aws/controlcatalog/model/ListControlMappingsPaginationTraits.h>
 #include <aws/controlcatalog/model/ListControlMappingsRequest.h>
 #include <aws/controlcatalog/model/ListControlMappingsResult.h>
+#include <aws/controlcatalog/model/ListControlsPaginationTraits.h>
 #include <aws/controlcatalog/model/ListControlsRequest.h>
 #include <aws/controlcatalog/model/ListControlsResult.h>
+#include <aws/controlcatalog/model/ListDomainsPaginationTraits.h>
 #include <aws/controlcatalog/model/ListDomainsRequest.h>
 #include <aws/controlcatalog/model/ListDomainsResult.h>
+#include <aws/controlcatalog/model/ListObjectivesPaginationTraits.h>
 #include <aws/controlcatalog/model/ListObjectivesRequest.h>
 #include <aws/controlcatalog/model/ListObjectivesResult.h>
 #include <aws/controlcatalog/model/Mapping.h>
diff --git a/generated/tests/controltower-gen-tests/ControlTowerIncludeTests.cpp b/generated/tests/controltower-gen-tests/ControlTowerIncludeTests.cpp
index ec36ed434cdf..4728cb493b6c 100644
--- a/generated/tests/controltower-gen-tests/ControlTowerIncludeTests.cpp
+++ b/generated/tests/controltower-gen-tests/ControlTowerIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/controltower/ControlTowerClient.h>
+#include <aws/controltower/ControlTowerClientPagination.h>
 #include <aws/controltower/ControlTowerEndpointProvider.h>
 #include <aws/controltower/ControlTowerErrorMarshaller.h>
 #include <aws/controltower/ControlTowerErrors.h>
+#include <aws/controltower/ControlTowerPaginationBase.h>
 #include <aws/controltower/ControlTowerRequest.h>
 #include <aws/controltower/ControlTowerServiceClientModel.h>
+#include <aws/controltower/ControlTowerWaiter.h>
 #include <aws/controltower/ControlTower_EXPORTS.h>
+#include <aws/controltower/internal/ControlTowerEndpointRules.h>
 #include <aws/controltower/model/BaselineOperation.h>
 #include <aws/controltower/model/BaselineOperationStatus.h>
 #include <aws/controltower/model/BaselineOperationType.h>
@@ -79,16 +83,22 @@
 #include <aws/controltower/model/LandingZoneOperationType.h>
 #include <aws/controltower/model/LandingZoneStatus.h>
 #include <aws/controltower/model/LandingZoneSummary.h>
+#include <aws/controltower/model/ListBaselinesPaginationTraits.h>
 #include <aws/controltower/model/ListBaselinesRequest.h>
 #include <aws/controltower/model/ListBaselinesResult.h>
+#include <aws/controltower/model/ListControlOperationsPaginationTraits.h>
 #include <aws/controltower/model/ListControlOperationsRequest.h>
 #include <aws/controltower/model/ListControlOperationsResult.h>
+#include <aws/controltower/model/ListEnabledBaselinesPaginationTraits.h>
 #include <aws/controltower/model/ListEnabledBaselinesRequest.h>
 #include <aws/controltower/model/ListEnabledBaselinesResult.h>
+#include <aws/controltower/model/ListEnabledControlsPaginationTraits.h>
 #include <aws/controltower/model/ListEnabledControlsRequest.h>
 #include <aws/controltower/model/ListEnabledControlsResult.h>
+#include <aws/controltower/model/ListLandingZoneOperationsPaginationTraits.h>
 #include <aws/controltower/model/ListLandingZoneOperationsRequest.h>
 #include <aws/controltower/model/ListLandingZoneOperationsResult.h>
+#include <aws/controltower/model/ListLandingZonesPaginationTraits.h>
 #include <aws/controltower/model/ListLandingZonesRequest.h>
 #include <aws/controltower/model/ListLandingZonesResult.h>
 #include <aws/controltower/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/cost-optimization-hub-gen-tests/CostOptimizationHubIncludeTests.cpp b/generated/tests/cost-optimization-hub-gen-tests/CostOptimizationHubIncludeTests.cpp
index cffad2255422..cb95cdcea5e1 100644
--- a/generated/tests/cost-optimization-hub-gen-tests/CostOptimizationHubIncludeTests.cpp
+++ b/generated/tests/cost-optimization-hub-gen-tests/CostOptimizationHubIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/cost-optimization-hub/CostOptimizationHubClient.h>
+#include <aws/cost-optimization-hub/CostOptimizationHubClientPagination.h>
 #include <aws/cost-optimization-hub/CostOptimizationHubEndpointProvider.h>
 #include <aws/cost-optimization-hub/CostOptimizationHubErrorMarshaller.h>
 #include <aws/cost-optimization-hub/CostOptimizationHubErrors.h>
+#include <aws/cost-optimization-hub/CostOptimizationHubPaginationBase.h>
 #include <aws/cost-optimization-hub/CostOptimizationHubRequest.h>
 #include <aws/cost-optimization-hub/CostOptimizationHubServiceClientModel.h>
+#include <aws/cost-optimization-hub/CostOptimizationHubWaiter.h>
 #include <aws/cost-optimization-hub/CostOptimizationHub_EXPORTS.h>
+#include <aws/cost-optimization-hub/internal/CostOptimizationHubEndpointRules.h>
 #include <aws/cost-optimization-hub/model/AccountEnrollmentStatus.h>
 #include <aws/cost-optimization-hub/model/ActionType.h>
 #include <aws/cost-optimization-hub/model/AllocationStrategy.h>
@@ -56,12 +60,16 @@
 #include <aws/cost-optimization-hub/model/InstanceConfiguration.h>
 #include <aws/cost-optimization-hub/model/LambdaFunction.h>
 #include <aws/cost-optimization-hub/model/LambdaFunctionConfiguration.h>
+#include <aws/cost-optimization-hub/model/ListEfficiencyMetricsPaginationTraits.h>
 #include <aws/cost-optimization-hub/model/ListEfficiencyMetricsRequest.h>
 #include <aws/cost-optimization-hub/model/ListEfficiencyMetricsResult.h>
+#include <aws/cost-optimization-hub/model/ListEnrollmentStatusesPaginationTraits.h>
 #include <aws/cost-optimization-hub/model/ListEnrollmentStatusesRequest.h>
 #include <aws/cost-optimization-hub/model/ListEnrollmentStatusesResult.h>
+#include <aws/cost-optimization-hub/model/ListRecommendationSummariesPaginationTraits.h>
 #include <aws/cost-optimization-hub/model/ListRecommendationSummariesRequest.h>
 #include <aws/cost-optimization-hub/model/ListRecommendationSummariesResult.h>
+#include <aws/cost-optimization-hub/model/ListRecommendationsPaginationTraits.h>
 #include <aws/cost-optimization-hub/model/ListRecommendationsRequest.h>
 #include <aws/cost-optimization-hub/model/ListRecommendationsResult.h>
 #include <aws/cost-optimization-hub/model/MemberAccountDiscountVisibility.h>
diff --git a/generated/tests/cur-gen-tests/CostandUsageReportServiceIncludeTests.cpp b/generated/tests/cur-gen-tests/CostandUsageReportServiceIncludeTests.cpp
index e87ab41259a9..ca73d46b0308 100644
--- a/generated/tests/cur-gen-tests/CostandUsageReportServiceIncludeTests.cpp
+++ b/generated/tests/cur-gen-tests/CostandUsageReportServiceIncludeTests.cpp
@@ -7,17 +7,22 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/cur/CostandUsageReportServiceClient.h>
+#include <aws/cur/CostandUsageReportServiceClientPagination.h>
 #include <aws/cur/CostandUsageReportServiceEndpointProvider.h>
 #include <aws/cur/CostandUsageReportServiceErrorMarshaller.h>
 #include <aws/cur/CostandUsageReportServiceErrors.h>
+#include <aws/cur/CostandUsageReportServicePaginationBase.h>
 #include <aws/cur/CostandUsageReportServiceRequest.h>
 #include <aws/cur/CostandUsageReportServiceServiceClientModel.h>
+#include <aws/cur/CostandUsageReportServiceWaiter.h>
 #include <aws/cur/CostandUsageReportService_EXPORTS.h>
+#include <aws/cur/internal/CostandUsageReportServiceEndpointRules.h>
 #include <aws/cur/model/AWSRegion.h>
 #include <aws/cur/model/AdditionalArtifact.h>
 #include <aws/cur/model/CompressionFormat.h>
 #include <aws/cur/model/DeleteReportDefinitionRequest.h>
 #include <aws/cur/model/DeleteReportDefinitionResult.h>
+#include <aws/cur/model/DescribeReportDefinitionsPaginationTraits.h>
 #include <aws/cur/model/DescribeReportDefinitionsRequest.h>
 #include <aws/cur/model/DescribeReportDefinitionsResult.h>
 #include <aws/cur/model/LastStatus.h>
diff --git a/generated/tests/customer-profiles-gen-tests/CustomerProfilesIncludeTests.cpp b/generated/tests/customer-profiles-gen-tests/CustomerProfilesIncludeTests.cpp
index 82cd8d90f0aa..d9f8987ad634 100644
--- a/generated/tests/customer-profiles-gen-tests/CustomerProfilesIncludeTests.cpp
+++ b/generated/tests/customer-profiles-gen-tests/CustomerProfilesIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/customer-profiles/CustomerProfilesClient.h>
+#include <aws/customer-profiles/CustomerProfilesClientPagination.h>
 #include <aws/customer-profiles/CustomerProfilesEndpointProvider.h>
 #include <aws/customer-profiles/CustomerProfilesErrorMarshaller.h>
 #include <aws/customer-profiles/CustomerProfilesErrors.h>
+#include <aws/customer-profiles/CustomerProfilesPaginationBase.h>
 #include <aws/customer-profiles/CustomerProfilesRequest.h>
 #include <aws/customer-profiles/CustomerProfilesServiceClientModel.h>
+#include <aws/customer-profiles/CustomerProfilesWaiter.h>
 #include <aws/customer-profiles/CustomerProfiles_EXPORTS.h>
+#include <aws/customer-profiles/internal/CustomerProfilesEndpointRules.h>
 #include <aws/customer-profiles/model/ActionType.h>
 #include <aws/customer-profiles/model/AddProfileKeyRequest.h>
 #include <aws/customer-profiles/model/AddProfileKeyResult.h>
@@ -208,6 +212,7 @@
 #include <aws/customer-profiles/model/GetSegmentMembershipResult.h>
 #include <aws/customer-profiles/model/GetSegmentSnapshotRequest.h>
 #include <aws/customer-profiles/model/GetSegmentSnapshotResult.h>
+#include <aws/customer-profiles/model/GetSimilarProfilesPaginationTraits.h>
 #include <aws/customer-profiles/model/GetSimilarProfilesRequest.h>
 #include <aws/customer-profiles/model/GetSimilarProfilesResult.h>
 #include <aws/customer-profiles/model/GetUploadJobPathRequest.h>
@@ -240,14 +245,18 @@
 #include <aws/customer-profiles/model/ListCalculatedAttributesForProfileRequest.h>
 #include <aws/customer-profiles/model/ListCalculatedAttributesForProfileResult.h>
 #include <aws/customer-profiles/model/ListDomainItem.h>
+#include <aws/customer-profiles/model/ListDomainLayoutsPaginationTraits.h>
 #include <aws/customer-profiles/model/ListDomainLayoutsRequest.h>
 #include <aws/customer-profiles/model/ListDomainLayoutsResult.h>
+#include <aws/customer-profiles/model/ListDomainObjectTypesPaginationTraits.h>
 #include <aws/customer-profiles/model/ListDomainObjectTypesRequest.h>
 #include <aws/customer-profiles/model/ListDomainObjectTypesResult.h>
 #include <aws/customer-profiles/model/ListDomainsRequest.h>
 #include <aws/customer-profiles/model/ListDomainsResult.h>
+#include <aws/customer-profiles/model/ListEventStreamsPaginationTraits.h>
 #include <aws/customer-profiles/model/ListEventStreamsRequest.h>
 #include <aws/customer-profiles/model/ListEventStreamsResult.h>
+#include <aws/customer-profiles/model/ListEventTriggersPaginationTraits.h>
 #include <aws/customer-profiles/model/ListEventTriggersRequest.h>
 #include <aws/customer-profiles/model/ListEventTriggersResult.h>
 #include <aws/customer-profiles/model/ListIdentityResolutionJobsRequest.h>
@@ -259,6 +268,7 @@
 #include <aws/customer-profiles/model/ListObjectTypeAttributeValuesItem.h>
 #include <aws/customer-profiles/model/ListObjectTypeAttributeValuesRequest.h>
 #include <aws/customer-profiles/model/ListObjectTypeAttributeValuesResult.h>
+#include <aws/customer-profiles/model/ListObjectTypeAttributesPaginationTraits.h>
 #include <aws/customer-profiles/model/ListObjectTypeAttributesRequest.h>
 #include <aws/customer-profiles/model/ListObjectTypeAttributesResult.h>
 #include <aws/customer-profiles/model/ListProfileAttributeValuesRequest.h>
@@ -274,20 +284,27 @@
 #include <aws/customer-profiles/model/ListProfileObjectsItem.h>
 #include <aws/customer-profiles/model/ListProfileObjectsRequest.h>
 #include <aws/customer-profiles/model/ListProfileObjectsResult.h>
+#include <aws/customer-profiles/model/ListRecommenderFiltersPaginationTraits.h>
 #include <aws/customer-profiles/model/ListRecommenderFiltersRequest.h>
 #include <aws/customer-profiles/model/ListRecommenderFiltersResult.h>
+#include <aws/customer-profiles/model/ListRecommenderRecipesPaginationTraits.h>
 #include <aws/customer-profiles/model/ListRecommenderRecipesRequest.h>
 #include <aws/customer-profiles/model/ListRecommenderRecipesResult.h>
+#include <aws/customer-profiles/model/ListRecommenderSchemasPaginationTraits.h>
 #include <aws/customer-profiles/model/ListRecommenderSchemasRequest.h>
 #include <aws/customer-profiles/model/ListRecommenderSchemasResult.h>
+#include <aws/customer-profiles/model/ListRecommendersPaginationTraits.h>
 #include <aws/customer-profiles/model/ListRecommendersRequest.h>
 #include <aws/customer-profiles/model/ListRecommendersResult.h>
+#include <aws/customer-profiles/model/ListRuleBasedMatchesPaginationTraits.h>
 #include <aws/customer-profiles/model/ListRuleBasedMatchesRequest.h>
 #include <aws/customer-profiles/model/ListRuleBasedMatchesResult.h>
+#include <aws/customer-profiles/model/ListSegmentDefinitionsPaginationTraits.h>
 #include <aws/customer-profiles/model/ListSegmentDefinitionsRequest.h>
 #include <aws/customer-profiles/model/ListSegmentDefinitionsResult.h>
 #include <aws/customer-profiles/model/ListTagsForResourceRequest.h>
 #include <aws/customer-profiles/model/ListTagsForResourceResult.h>
+#include <aws/customer-profiles/model/ListUploadJobsPaginationTraits.h>
 #include <aws/customer-profiles/model/ListUploadJobsRequest.h>
 #include <aws/customer-profiles/model/ListUploadJobsResult.h>
 #include <aws/customer-profiles/model/ListWorkflowsItem.h>
diff --git a/generated/tests/databrew-gen-tests/GlueDataBrewIncludeTests.cpp b/generated/tests/databrew-gen-tests/GlueDataBrewIncludeTests.cpp
index 0f7ca5f8ed9d..438dd2ff4528 100644
--- a/generated/tests/databrew-gen-tests/GlueDataBrewIncludeTests.cpp
+++ b/generated/tests/databrew-gen-tests/GlueDataBrewIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/databrew/GlueDataBrewClient.h>
+#include <aws/databrew/GlueDataBrewClientPagination.h>
 #include <aws/databrew/GlueDataBrewEndpointProvider.h>
 #include <aws/databrew/GlueDataBrewErrorMarshaller.h>
 #include <aws/databrew/GlueDataBrewErrors.h>
+#include <aws/databrew/GlueDataBrewPaginationBase.h>
 #include <aws/databrew/GlueDataBrewRequest.h>
 #include <aws/databrew/GlueDataBrewServiceClientModel.h>
+#include <aws/databrew/GlueDataBrewWaiter.h>
 #include <aws/databrew/GlueDataBrew_EXPORTS.h>
+#include <aws/databrew/internal/GlueDataBrewEndpointRules.h>
 #include <aws/databrew/model/AllowedStatistics.h>
 #include <aws/databrew/model/AnalyticsMode.h>
 #include <aws/databrew/model/BatchDeleteRecipeVersionRequest.h>
@@ -86,20 +90,28 @@
 #include <aws/databrew/model/JobSample.h>
 #include <aws/databrew/model/JobType.h>
 #include <aws/databrew/model/JsonOptions.h>
+#include <aws/databrew/model/ListDatasetsPaginationTraits.h>
 #include <aws/databrew/model/ListDatasetsRequest.h>
 #include <aws/databrew/model/ListDatasetsResult.h>
+#include <aws/databrew/model/ListJobRunsPaginationTraits.h>
 #include <aws/databrew/model/ListJobRunsRequest.h>
 #include <aws/databrew/model/ListJobRunsResult.h>
+#include <aws/databrew/model/ListJobsPaginationTraits.h>
 #include <aws/databrew/model/ListJobsRequest.h>
 #include <aws/databrew/model/ListJobsResult.h>
+#include <aws/databrew/model/ListProjectsPaginationTraits.h>
 #include <aws/databrew/model/ListProjectsRequest.h>
 #include <aws/databrew/model/ListProjectsResult.h>
+#include <aws/databrew/model/ListRecipeVersionsPaginationTraits.h>
 #include <aws/databrew/model/ListRecipeVersionsRequest.h>
 #include <aws/databrew/model/ListRecipeVersionsResult.h>
+#include <aws/databrew/model/ListRecipesPaginationTraits.h>
 #include <aws/databrew/model/ListRecipesRequest.h>
 #include <aws/databrew/model/ListRecipesResult.h>
+#include <aws/databrew/model/ListRulesetsPaginationTraits.h>
 #include <aws/databrew/model/ListRulesetsRequest.h>
 #include <aws/databrew/model/ListRulesetsResult.h>
+#include <aws/databrew/model/ListSchedulesPaginationTraits.h>
 #include <aws/databrew/model/ListSchedulesRequest.h>
 #include <aws/databrew/model/ListSchedulesResult.h>
 #include <aws/databrew/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/dataexchange-gen-tests/DataExchangeIncludeTests.cpp b/generated/tests/dataexchange-gen-tests/DataExchangeIncludeTests.cpp
index d0020c793257..8feec4c3b492 100644
--- a/generated/tests/dataexchange-gen-tests/DataExchangeIncludeTests.cpp
+++ b/generated/tests/dataexchange-gen-tests/DataExchangeIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/dataexchange/DataExchangeClient.h>
+#include <aws/dataexchange/DataExchangeClientPagination.h>
 #include <aws/dataexchange/DataExchangeEndpointProvider.h>
 #include <aws/dataexchange/DataExchangeErrorMarshaller.h>
 #include <aws/dataexchange/DataExchangeErrors.h>
+#include <aws/dataexchange/DataExchangePaginationBase.h>
 #include <aws/dataexchange/DataExchangeRequest.h>
 #include <aws/dataexchange/DataExchangeServiceClientModel.h>
+#include <aws/dataexchange/DataExchangeWaiter.h>
 #include <aws/dataexchange/DataExchange_EXPORTS.h>
+#include <aws/dataexchange/internal/DataExchangeEndpointRules.h>
 #include <aws/dataexchange/model/AcceptDataGrantRequest.h>
 #include <aws/dataexchange/model/AcceptDataGrantResult.h>
 #include <aws/dataexchange/model/AcceptanceStateFilterValue.h>
@@ -106,18 +110,25 @@
 #include <aws/dataexchange/model/LakeFormationDataPermissionType.h>
 #include <aws/dataexchange/model/LakeFormationTagPolicyDetails.h>
 #include <aws/dataexchange/model/LimitName.h>
+#include <aws/dataexchange/model/ListDataGrantsPaginationTraits.h>
 #include <aws/dataexchange/model/ListDataGrantsRequest.h>
 #include <aws/dataexchange/model/ListDataGrantsResult.h>
+#include <aws/dataexchange/model/ListDataSetRevisionsPaginationTraits.h>
 #include <aws/dataexchange/model/ListDataSetRevisionsRequest.h>
 #include <aws/dataexchange/model/ListDataSetRevisionsResult.h>
+#include <aws/dataexchange/model/ListDataSetsPaginationTraits.h>
 #include <aws/dataexchange/model/ListDataSetsRequest.h>
 #include <aws/dataexchange/model/ListDataSetsResult.h>
+#include <aws/dataexchange/model/ListEventActionsPaginationTraits.h>
 #include <aws/dataexchange/model/ListEventActionsRequest.h>
 #include <aws/dataexchange/model/ListEventActionsResult.h>
+#include <aws/dataexchange/model/ListJobsPaginationTraits.h>
 #include <aws/dataexchange/model/ListJobsRequest.h>
 #include <aws/dataexchange/model/ListJobsResult.h>
+#include <aws/dataexchange/model/ListReceivedDataGrantsPaginationTraits.h>
 #include <aws/dataexchange/model/ListReceivedDataGrantsRequest.h>
 #include <aws/dataexchange/model/ListReceivedDataGrantsResult.h>
+#include <aws/dataexchange/model/ListRevisionAssetsPaginationTraits.h>
 #include <aws/dataexchange/model/ListRevisionAssetsRequest.h>
 #include <aws/dataexchange/model/ListRevisionAssetsResult.h>
 #include <aws/dataexchange/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/datapipeline-gen-tests/DataPipelineIncludeTests.cpp b/generated/tests/datapipeline-gen-tests/DataPipelineIncludeTests.cpp
index 528eeb5ea9b5..e4c37ca13aa8 100644
--- a/generated/tests/datapipeline-gen-tests/DataPipelineIncludeTests.cpp
+++ b/generated/tests/datapipeline-gen-tests/DataPipelineIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/datapipeline/DataPipelineClient.h>
+#include <aws/datapipeline/DataPipelineClientPagination.h>
 #include <aws/datapipeline/DataPipelineEndpointProvider.h>
 #include <aws/datapipeline/DataPipelineErrorMarshaller.h>
 #include <aws/datapipeline/DataPipelineErrors.h>
+#include <aws/datapipeline/DataPipelinePaginationBase.h>
 #include <aws/datapipeline/DataPipelineRequest.h>
 #include <aws/datapipeline/DataPipelineServiceClientModel.h>
+#include <aws/datapipeline/DataPipelineWaiter.h>
 #include <aws/datapipeline/DataPipeline_EXPORTS.h>
+#include <aws/datapipeline/internal/DataPipelineEndpointRules.h>
 #include <aws/datapipeline/model/ActivatePipelineRequest.h>
 #include <aws/datapipeline/model/ActivatePipelineResult.h>
 #include <aws/datapipeline/model/AddTagsRequest.h>
@@ -22,6 +26,7 @@
 #include <aws/datapipeline/model/DeactivatePipelineRequest.h>
 #include <aws/datapipeline/model/DeactivatePipelineResult.h>
 #include <aws/datapipeline/model/DeletePipelineRequest.h>
+#include <aws/datapipeline/model/DescribeObjectsPaginationTraits.h>
 #include <aws/datapipeline/model/DescribeObjectsRequest.h>
 #include <aws/datapipeline/model/DescribeObjectsResult.h>
 #include <aws/datapipeline/model/DescribePipelinesRequest.h>
@@ -32,6 +37,7 @@
 #include <aws/datapipeline/model/GetPipelineDefinitionRequest.h>
 #include <aws/datapipeline/model/GetPipelineDefinitionResult.h>
 #include <aws/datapipeline/model/InstanceIdentity.h>
+#include <aws/datapipeline/model/ListPipelinesPaginationTraits.h>
 #include <aws/datapipeline/model/ListPipelinesRequest.h>
 #include <aws/datapipeline/model/ListPipelinesResult.h>
 #include <aws/datapipeline/model/Operator.h>
@@ -47,6 +53,7 @@
 #include <aws/datapipeline/model/PutPipelineDefinitionRequest.h>
 #include <aws/datapipeline/model/PutPipelineDefinitionResult.h>
 #include <aws/datapipeline/model/Query.h>
+#include <aws/datapipeline/model/QueryObjectsPaginationTraits.h>
 #include <aws/datapipeline/model/QueryObjectsRequest.h>
 #include <aws/datapipeline/model/QueryObjectsResult.h>
 #include <aws/datapipeline/model/RemoveTagsRequest.h>
diff --git a/generated/tests/datasync-gen-tests/DataSyncIncludeTests.cpp b/generated/tests/datasync-gen-tests/DataSyncIncludeTests.cpp
index 57808b1516d8..6fceb48bb9b8 100644
--- a/generated/tests/datasync-gen-tests/DataSyncIncludeTests.cpp
+++ b/generated/tests/datasync-gen-tests/DataSyncIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/datasync/DataSyncClient.h>
+#include <aws/datasync/DataSyncClientPagination.h>
 #include <aws/datasync/DataSyncEndpointProvider.h>
 #include <aws/datasync/DataSyncErrorMarshaller.h>
 #include <aws/datasync/DataSyncErrors.h>
+#include <aws/datasync/DataSyncPaginationBase.h>
 #include <aws/datasync/DataSyncRequest.h>
 #include <aws/datasync/DataSyncServiceClientModel.h>
+#include <aws/datasync/DataSyncWaiter.h>
 #include <aws/datasync/DataSync_EXPORTS.h>
+#include <aws/datasync/internal/DataSyncEndpointRules.h>
 #include <aws/datasync/model/AgentListEntry.h>
 #include <aws/datasync/model/AgentStatus.h>
 #include <aws/datasync/model/Atime.h>
@@ -101,14 +105,19 @@
 #include <aws/datasync/model/HdfsRpcProtection.h>
 #include <aws/datasync/model/InternalException.h>
 #include <aws/datasync/model/InvalidRequestException.h>
+#include <aws/datasync/model/ListAgentsPaginationTraits.h>
 #include <aws/datasync/model/ListAgentsRequest.h>
 #include <aws/datasync/model/ListAgentsResult.h>
+#include <aws/datasync/model/ListLocationsPaginationTraits.h>
 #include <aws/datasync/model/ListLocationsRequest.h>
 #include <aws/datasync/model/ListLocationsResult.h>
+#include <aws/datasync/model/ListTagsForResourcePaginationTraits.h>
 #include <aws/datasync/model/ListTagsForResourceRequest.h>
 #include <aws/datasync/model/ListTagsForResourceResult.h>
+#include <aws/datasync/model/ListTaskExecutionsPaginationTraits.h>
 #include <aws/datasync/model/ListTaskExecutionsRequest.h>
 #include <aws/datasync/model/ListTaskExecutionsResult.h>
+#include <aws/datasync/model/ListTasksPaginationTraits.h>
 #include <aws/datasync/model/ListTasksRequest.h>
 #include <aws/datasync/model/ListTasksResult.h>
 #include <aws/datasync/model/LocationFilter.h>
diff --git a/generated/tests/datazone-gen-tests/DataZoneIncludeTests.cpp b/generated/tests/datazone-gen-tests/DataZoneIncludeTests.cpp
index b394de3b7e8b..dae03a1ffcfd 100644
--- a/generated/tests/datazone-gen-tests/DataZoneIncludeTests.cpp
+++ b/generated/tests/datazone-gen-tests/DataZoneIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/datazone/DataZoneClient.h>
+#include <aws/datazone/DataZoneClientPagination.h>
 #include <aws/datazone/DataZoneEndpointProvider.h>
 #include <aws/datazone/DataZoneErrorMarshaller.h>
 #include <aws/datazone/DataZoneErrors.h>
+#include <aws/datazone/DataZonePaginationBase.h>
 #include <aws/datazone/DataZoneRequest.h>
 #include <aws/datazone/DataZoneServiceClientModel.h>
+#include <aws/datazone/DataZoneWaiter.h>
 #include <aws/datazone/DataZone_EXPORTS.h>
+#include <aws/datazone/internal/DataZoneEndpointRules.h>
 #include <aws/datazone/model/AcceptChoice.h>
 #include <aws/datazone/model/AcceptPredictionsRequest.h>
 #include <aws/datazone/model/AcceptPredictionsResult.h>
@@ -456,74 +460,108 @@
 #include <aws/datazone/model/LineageSyncInput.h>
 #include <aws/datazone/model/LineageSyncOutput.h>
 #include <aws/datazone/model/LineageSyncSchedule.h>
+#include <aws/datazone/model/ListAccountPoolsPaginationTraits.h>
 #include <aws/datazone/model/ListAccountPoolsRequest.h>
 #include <aws/datazone/model/ListAccountPoolsResult.h>
+#include <aws/datazone/model/ListAccountsInAccountPoolPaginationTraits.h>
 #include <aws/datazone/model/ListAccountsInAccountPoolRequest.h>
 #include <aws/datazone/model/ListAccountsInAccountPoolResult.h>
+#include <aws/datazone/model/ListAssetFiltersPaginationTraits.h>
 #include <aws/datazone/model/ListAssetFiltersRequest.h>
 #include <aws/datazone/model/ListAssetFiltersResult.h>
+#include <aws/datazone/model/ListAssetRevisionsPaginationTraits.h>
 #include <aws/datazone/model/ListAssetRevisionsRequest.h>
 #include <aws/datazone/model/ListAssetRevisionsResult.h>
+#include <aws/datazone/model/ListConnectionsPaginationTraits.h>
 #include <aws/datazone/model/ListConnectionsRequest.h>
 #include <aws/datazone/model/ListConnectionsResult.h>
+#include <aws/datazone/model/ListDataProductRevisionsPaginationTraits.h>
 #include <aws/datazone/model/ListDataProductRevisionsRequest.h>
 #include <aws/datazone/model/ListDataProductRevisionsResult.h>
+#include <aws/datazone/model/ListDataSourceRunActivitiesPaginationTraits.h>
 #include <aws/datazone/model/ListDataSourceRunActivitiesRequest.h>
 #include <aws/datazone/model/ListDataSourceRunActivitiesResult.h>
+#include <aws/datazone/model/ListDataSourceRunsPaginationTraits.h>
 #include <aws/datazone/model/ListDataSourceRunsRequest.h>
 #include <aws/datazone/model/ListDataSourceRunsResult.h>
+#include <aws/datazone/model/ListDataSourcesPaginationTraits.h>
 #include <aws/datazone/model/ListDataSourcesRequest.h>
 #include <aws/datazone/model/ListDataSourcesResult.h>
+#include <aws/datazone/model/ListDomainUnitsForParentPaginationTraits.h>
 #include <aws/datazone/model/ListDomainUnitsForParentRequest.h>
 #include <aws/datazone/model/ListDomainUnitsForParentResult.h>
+#include <aws/datazone/model/ListDomainsPaginationTraits.h>
 #include <aws/datazone/model/ListDomainsRequest.h>
 #include <aws/datazone/model/ListDomainsResult.h>
+#include <aws/datazone/model/ListEntityOwnersPaginationTraits.h>
 #include <aws/datazone/model/ListEntityOwnersRequest.h>
 #include <aws/datazone/model/ListEntityOwnersResult.h>
+#include <aws/datazone/model/ListEnvironmentActionsPaginationTraits.h>
 #include <aws/datazone/model/ListEnvironmentActionsRequest.h>
 #include <aws/datazone/model/ListEnvironmentActionsResult.h>
+#include <aws/datazone/model/ListEnvironmentBlueprintConfigurationsPaginationTraits.h>
 #include <aws/datazone/model/ListEnvironmentBlueprintConfigurationsRequest.h>
 #include <aws/datazone/model/ListEnvironmentBlueprintConfigurationsResult.h>
+#include <aws/datazone/model/ListEnvironmentBlueprintsPaginationTraits.h>
 #include <aws/datazone/model/ListEnvironmentBlueprintsRequest.h>
 #include <aws/datazone/model/ListEnvironmentBlueprintsResult.h>
+#include <aws/datazone/model/ListEnvironmentProfilesPaginationTraits.h>
 #include <aws/datazone/model/ListEnvironmentProfilesRequest.h>
 #include <aws/datazone/model/ListEnvironmentProfilesResult.h>
+#include <aws/datazone/model/ListEnvironmentsPaginationTraits.h>
 #include <aws/datazone/model/ListEnvironmentsRequest.h>
 #include <aws/datazone/model/ListEnvironmentsResult.h>
+#include <aws/datazone/model/ListJobRunsPaginationTraits.h>
 #include <aws/datazone/model/ListJobRunsRequest.h>
 #include <aws/datazone/model/ListJobRunsResult.h>
+#include <aws/datazone/model/ListLineageEventsPaginationTraits.h>
 #include <aws/datazone/model/ListLineageEventsRequest.h>
 #include <aws/datazone/model/ListLineageEventsResult.h>
+#include <aws/datazone/model/ListLineageNodeHistoryPaginationTraits.h>
 #include <aws/datazone/model/ListLineageNodeHistoryRequest.h>
 #include <aws/datazone/model/ListLineageNodeHistoryResult.h>
+#include <aws/datazone/model/ListMetadataGenerationRunsPaginationTraits.h>
 #include <aws/datazone/model/ListMetadataGenerationRunsRequest.h>
 #include <aws/datazone/model/ListMetadataGenerationRunsResult.h>
+#include <aws/datazone/model/ListNotebookRunsPaginationTraits.h>
 #include <aws/datazone/model/ListNotebookRunsRequest.h>
 #include <aws/datazone/model/ListNotebookRunsResult.h>
+#include <aws/datazone/model/ListNotebooksPaginationTraits.h>
 #include <aws/datazone/model/ListNotebooksRequest.h>
 #include <aws/datazone/model/ListNotebooksResult.h>
+#include <aws/datazone/model/ListNotificationsPaginationTraits.h>
 #include <aws/datazone/model/ListNotificationsRequest.h>
 #include <aws/datazone/model/ListNotificationsResult.h>
+#include <aws/datazone/model/ListPolicyGrantsPaginationTraits.h>
 #include <aws/datazone/model/ListPolicyGrantsRequest.h>
 #include <aws/datazone/model/ListPolicyGrantsResult.h>
+#include <aws/datazone/model/ListProjectMembershipsPaginationTraits.h>
 #include <aws/datazone/model/ListProjectMembershipsRequest.h>
 #include <aws/datazone/model/ListProjectMembershipsResult.h>
+#include <aws/datazone/model/ListProjectProfilesPaginationTraits.h>
 #include <aws/datazone/model/ListProjectProfilesRequest.h>
 #include <aws/datazone/model/ListProjectProfilesResult.h>
+#include <aws/datazone/model/ListProjectsPaginationTraits.h>
 #include <aws/datazone/model/ListProjectsRequest.h>
 #include <aws/datazone/model/ListProjectsResult.h>
+#include <aws/datazone/model/ListRulesPaginationTraits.h>
 #include <aws/datazone/model/ListRulesRequest.h>
 #include <aws/datazone/model/ListRulesResult.h>
+#include <aws/datazone/model/ListSubscriptionGrantsPaginationTraits.h>
 #include <aws/datazone/model/ListSubscriptionGrantsRequest.h>
 #include <aws/datazone/model/ListSubscriptionGrantsResult.h>
+#include <aws/datazone/model/ListSubscriptionRequestsPaginationTraits.h>
 #include <aws/datazone/model/ListSubscriptionRequestsRequest.h>
 #include <aws/datazone/model/ListSubscriptionRequestsResult.h>
+#include <aws/datazone/model/ListSubscriptionTargetsPaginationTraits.h>
 #include <aws/datazone/model/ListSubscriptionTargetsRequest.h>
 #include <aws/datazone/model/ListSubscriptionTargetsResult.h>
+#include <aws/datazone/model/ListSubscriptionsPaginationTraits.h>
 #include <aws/datazone/model/ListSubscriptionsRequest.h>
 #include <aws/datazone/model/ListSubscriptionsResult.h>
 #include <aws/datazone/model/ListTagsForResourceRequest.h>
 #include <aws/datazone/model/ListTagsForResourceResult.h>
+#include <aws/datazone/model/ListTimeSeriesDataPointsPaginationTraits.h>
 #include <aws/datazone/model/ListTimeSeriesDataPointsRequest.h>
 #include <aws/datazone/model/ListTimeSeriesDataPointsResult.h>
 #include <aws/datazone/model/ListingItem.h>
@@ -617,6 +655,7 @@
 #include <aws/datazone/model/PutEnvironmentBlueprintConfigurationRequest.h>
 #include <aws/datazone/model/PutEnvironmentBlueprintConfigurationResult.h>
 #include <aws/datazone/model/PutResourceConfiguration.h>
+#include <aws/datazone/model/QueryGraphPaginationTraits.h>
 #include <aws/datazone/model/QueryGraphRequest.h>
 #include <aws/datazone/model/QueryGraphResult.h>
 #include <aws/datazone/model/RecommendationConfiguration.h>
@@ -679,20 +718,25 @@
 #include <aws/datazone/model/SageMakerRunConfigurationInput.h>
 #include <aws/datazone/model/SageMakerRunConfigurationOutput.h>
 #include <aws/datazone/model/ScheduleConfiguration.h>
+#include <aws/datazone/model/SearchGroupProfilesPaginationTraits.h>
 #include <aws/datazone/model/SearchGroupProfilesRequest.h>
 #include <aws/datazone/model/SearchGroupProfilesResult.h>
 #include <aws/datazone/model/SearchInItem.h>
 #include <aws/datazone/model/SearchInventoryResultItem.h>
+#include <aws/datazone/model/SearchListingsPaginationTraits.h>
 #include <aws/datazone/model/SearchListingsRequest.h>
 #include <aws/datazone/model/SearchListingsResult.h>
 #include <aws/datazone/model/SearchOutputAdditionalAttribute.h>
+#include <aws/datazone/model/SearchPaginationTraits.h>
 #include <aws/datazone/model/SearchRequest.h>
 #include <aws/datazone/model/SearchResult.h>
 #include <aws/datazone/model/SearchResultItem.h>
 #include <aws/datazone/model/SearchSort.h>
+#include <aws/datazone/model/SearchTypesPaginationTraits.h>
 #include <aws/datazone/model/SearchTypesRequest.h>
 #include <aws/datazone/model/SearchTypesResult.h>
 #include <aws/datazone/model/SearchTypesResultItem.h>
+#include <aws/datazone/model/SearchUserProfilesPaginationTraits.h>
 #include <aws/datazone/model/SearchUserProfilesRequest.h>
 #include <aws/datazone/model/SearchUserProfilesResult.h>
 #include <aws/datazone/model/SelfGrantStatus.h>
diff --git a/generated/tests/dax-gen-tests/DAXIncludeTests.cpp b/generated/tests/dax-gen-tests/DAXIncludeTests.cpp
index 0df402c1d308..9549e115babc 100644
--- a/generated/tests/dax-gen-tests/DAXIncludeTests.cpp
+++ b/generated/tests/dax-gen-tests/DAXIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/dax/DAXEndpointProvider.h>
 #include <aws/dax/DAXErrorMarshaller.h>
 #include <aws/dax/DAXErrors.h>
+#include <aws/dax/DAXPaginationBase.h>
 #include <aws/dax/DAXRequest.h>
 #include <aws/dax/DAXServiceClientModel.h>
+#include <aws/dax/DAXWaiter.h>
 #include <aws/dax/DAX_EXPORTS.h>
+#include <aws/dax/internal/DAXEndpointRules.h>
 #include <aws/dax/model/ChangeType.h>
 #include <aws/dax/model/Cluster.h>
 #include <aws/dax/model/ClusterEndpointEncryptionType.h>
diff --git a/generated/tests/deadline-gen-tests/DeadlineIncludeTests.cpp b/generated/tests/deadline-gen-tests/DeadlineIncludeTests.cpp
index f59ee04323ec..9279bf99b61c 100644
--- a/generated/tests/deadline-gen-tests/DeadlineIncludeTests.cpp
+++ b/generated/tests/deadline-gen-tests/DeadlineIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/deadline/DeadlineClient.h>
+#include <aws/deadline/DeadlineClientPagination.h>
 #include <aws/deadline/DeadlineEndpointProvider.h>
 #include <aws/deadline/DeadlineErrorMarshaller.h>
 #include <aws/deadline/DeadlineErrors.h>
+#include <aws/deadline/DeadlinePaginationBase.h>
 #include <aws/deadline/DeadlineRequest.h>
 #include <aws/deadline/DeadlineServiceClientModel.h>
+#include <aws/deadline/DeadlineWaiter.h>
 #include <aws/deadline/Deadline_EXPORTS.h>
+#include <aws/deadline/internal/DeadlineEndpointRules.h>
 #include <aws/deadline/model/AcceleratorCapabilities.h>
 #include <aws/deadline/model/AcceleratorCountRange.h>
 #include <aws/deadline/model/AcceleratorName.h>
@@ -237,6 +241,7 @@
 #include <aws/deadline/model/GetSessionActionResult.h>
 #include <aws/deadline/model/GetSessionRequest.h>
 #include <aws/deadline/model/GetSessionResult.h>
+#include <aws/deadline/model/GetSessionsStatisticsAggregationPaginationTraits.h>
 #include <aws/deadline/model/GetSessionsStatisticsAggregationRequest.h>
 #include <aws/deadline/model/GetSessionsStatisticsAggregationResult.h>
 #include <aws/deadline/model/GetStepRequest.h>
@@ -279,64 +284,93 @@
 #include <aws/deadline/model/LicenseEndpointStatus.h>
 #include <aws/deadline/model/LicenseEndpointSummary.h>
 #include <aws/deadline/model/LimitSummary.h>
+#include <aws/deadline/model/ListAvailableMeteredProductsPaginationTraits.h>
 #include <aws/deadline/model/ListAvailableMeteredProductsRequest.h>
 #include <aws/deadline/model/ListAvailableMeteredProductsResult.h>
+#include <aws/deadline/model/ListBudgetsPaginationTraits.h>
 #include <aws/deadline/model/ListBudgetsRequest.h>
 #include <aws/deadline/model/ListBudgetsResult.h>
+#include <aws/deadline/model/ListFarmMembersPaginationTraits.h>
 #include <aws/deadline/model/ListFarmMembersRequest.h>
 #include <aws/deadline/model/ListFarmMembersResult.h>
+#include <aws/deadline/model/ListFarmsPaginationTraits.h>
 #include <aws/deadline/model/ListFarmsRequest.h>
 #include <aws/deadline/model/ListFarmsResult.h>
+#include <aws/deadline/model/ListFleetMembersPaginationTraits.h>
 #include <aws/deadline/model/ListFleetMembersRequest.h>
 #include <aws/deadline/model/ListFleetMembersResult.h>
+#include <aws/deadline/model/ListFleetsPaginationTraits.h>
 #include <aws/deadline/model/ListFleetsRequest.h>
 #include <aws/deadline/model/ListFleetsResult.h>
+#include <aws/deadline/model/ListJobMembersPaginationTraits.h>
 #include <aws/deadline/model/ListJobMembersRequest.h>
 #include <aws/deadline/model/ListJobMembersResult.h>
+#include <aws/deadline/model/ListJobParameterDefinitionsPaginationTraits.h>
 #include <aws/deadline/model/ListJobParameterDefinitionsRequest.h>
 #include <aws/deadline/model/ListJobParameterDefinitionsResult.h>
+#include <aws/deadline/model/ListJobsPaginationTraits.h>
 #include <aws/deadline/model/ListJobsRequest.h>
 #include <aws/deadline/model/ListJobsResult.h>
+#include <aws/deadline/model/ListLicenseEndpointsPaginationTraits.h>
 #include <aws/deadline/model/ListLicenseEndpointsRequest.h>
 #include <aws/deadline/model/ListLicenseEndpointsResult.h>
+#include <aws/deadline/model/ListLimitsPaginationTraits.h>
 #include <aws/deadline/model/ListLimitsRequest.h>
 #include <aws/deadline/model/ListLimitsResult.h>
+#include <aws/deadline/model/ListMeteredProductsPaginationTraits.h>
 #include <aws/deadline/model/ListMeteredProductsRequest.h>
 #include <aws/deadline/model/ListMeteredProductsResult.h>
+#include <aws/deadline/model/ListMonitorsPaginationTraits.h>
 #include <aws/deadline/model/ListMonitorsRequest.h>
 #include <aws/deadline/model/ListMonitorsResult.h>
+#include <aws/deadline/model/ListQueueEnvironmentsPaginationTraits.h>
 #include <aws/deadline/model/ListQueueEnvironmentsRequest.h>
 #include <aws/deadline/model/ListQueueEnvironmentsResult.h>
+#include <aws/deadline/model/ListQueueFleetAssociationsPaginationTraits.h>
 #include <aws/deadline/model/ListQueueFleetAssociationsRequest.h>
 #include <aws/deadline/model/ListQueueFleetAssociationsResult.h>
+#include <aws/deadline/model/ListQueueLimitAssociationsPaginationTraits.h>
 #include <aws/deadline/model/ListQueueLimitAssociationsRequest.h>
 #include <aws/deadline/model/ListQueueLimitAssociationsResult.h>
+#include <aws/deadline/model/ListQueueMembersPaginationTraits.h>
 #include <aws/deadline/model/ListQueueMembersRequest.h>
 #include <aws/deadline/model/ListQueueMembersResult.h>
+#include <aws/deadline/model/ListQueuesPaginationTraits.h>
 #include <aws/deadline/model/ListQueuesRequest.h>
 #include <aws/deadline/model/ListQueuesResult.h>
+#include <aws/deadline/model/ListSessionActionsPaginationTraits.h>
 #include <aws/deadline/model/ListSessionActionsRequest.h>
 #include <aws/deadline/model/ListSessionActionsResult.h>
+#include <aws/deadline/model/ListSessionsForWorkerPaginationTraits.h>
 #include <aws/deadline/model/ListSessionsForWorkerRequest.h>
 #include <aws/deadline/model/ListSessionsForWorkerResult.h>
+#include <aws/deadline/model/ListSessionsPaginationTraits.h>
 #include <aws/deadline/model/ListSessionsRequest.h>
 #include <aws/deadline/model/ListSessionsResult.h>
+#include <aws/deadline/model/ListStepConsumersPaginationTraits.h>
 #include <aws/deadline/model/ListStepConsumersRequest.h>
 #include <aws/deadline/model/ListStepConsumersResult.h>
+#include <aws/deadline/model/ListStepDependenciesPaginationTraits.h>
 #include <aws/deadline/model/ListStepDependenciesRequest.h>
 #include <aws/deadline/model/ListStepDependenciesResult.h>
+#include <aws/deadline/model/ListStepsPaginationTraits.h>
 #include <aws/deadline/model/ListStepsRequest.h>
 #include <aws/deadline/model/ListStepsResult.h>
+#include <aws/deadline/model/ListStorageProfilesForQueuePaginationTraits.h>
 #include <aws/deadline/model/ListStorageProfilesForQueueRequest.h>
 #include <aws/deadline/model/ListStorageProfilesForQueueResult.h>
+#include <aws/deadline/model/ListStorageProfilesPaginationTraits.h>
 #include <aws/deadline/model/ListStorageProfilesRequest.h>
 #include <aws/deadline/model/ListStorageProfilesResult.h>
 #include <aws/deadline/model/ListTagsForResourceRequest.h>
 #include <aws/deadline/model/ListTagsForResourceResult.h>
+#include <aws/deadline/model/ListTasksPaginationTraits.h>
 #include <aws/deadline/model/ListTasksRequest.h>
 #include <aws/deadline/model/ListTasksResult.h>
+#include <aws/deadline/model/ListVolumesPaginationTraits.h>
 #include <aws/deadline/model/ListVolumesRequest.h>
 #include <aws/deadline/model/ListVolumesResult.h>
+#include <aws/deadline/model/ListWorkersPaginationTraits.h>
 #include <aws/deadline/model/ListWorkersRequest.h>
 #include <aws/deadline/model/ListWorkersResult.h>
 #include <aws/deadline/model/LogConfiguration.h>
diff --git a/generated/tests/detective-gen-tests/DetectiveIncludeTests.cpp b/generated/tests/detective-gen-tests/DetectiveIncludeTests.cpp
index 60dc4fa2d356..74ed596d728e 100644
--- a/generated/tests/detective-gen-tests/DetectiveIncludeTests.cpp
+++ b/generated/tests/detective-gen-tests/DetectiveIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/detective/DetectiveClient.h>
+#include <aws/detective/DetectiveClientPagination.h>
 #include <aws/detective/DetectiveEndpointProvider.h>
 #include <aws/detective/DetectiveErrorMarshaller.h>
 #include <aws/detective/DetectiveErrors.h>
+#include <aws/detective/DetectivePaginationBase.h>
 #include <aws/detective/DetectiveRequest.h>
 #include <aws/detective/DetectiveServiceClientModel.h>
+#include <aws/detective/DetectiveWaiter.h>
 #include <aws/detective/Detective_EXPORTS.h>
+#include <aws/detective/internal/DetectiveEndpointRules.h>
 #include <aws/detective/model/AcceptInvitationRequest.h>
 #include <aws/detective/model/AccessDeniedException.h>
 #include <aws/detective/model/Account.h>
@@ -54,18 +58,23 @@
 #include <aws/detective/model/IndicatorType.h>
 #include <aws/detective/model/InvestigationDetail.h>
 #include <aws/detective/model/InvitationType.h>
+#include <aws/detective/model/ListDatasourcePackagesPaginationTraits.h>
 #include <aws/detective/model/ListDatasourcePackagesRequest.h>
 #include <aws/detective/model/ListDatasourcePackagesResult.h>
+#include <aws/detective/model/ListGraphsPaginationTraits.h>
 #include <aws/detective/model/ListGraphsRequest.h>
 #include <aws/detective/model/ListGraphsResult.h>
 #include <aws/detective/model/ListIndicatorsRequest.h>
 #include <aws/detective/model/ListIndicatorsResult.h>
 #include <aws/detective/model/ListInvestigationsRequest.h>
 #include <aws/detective/model/ListInvestigationsResult.h>
+#include <aws/detective/model/ListInvitationsPaginationTraits.h>
 #include <aws/detective/model/ListInvitationsRequest.h>
 #include <aws/detective/model/ListInvitationsResult.h>
+#include <aws/detective/model/ListMembersPaginationTraits.h>
 #include <aws/detective/model/ListMembersRequest.h>
 #include <aws/detective/model/ListMembersResult.h>
+#include <aws/detective/model/ListOrganizationAdminAccountsPaginationTraits.h>
 #include <aws/detective/model/ListOrganizationAdminAccountsRequest.h>
 #include <aws/detective/model/ListOrganizationAdminAccountsResult.h>
 #include <aws/detective/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/devicefarm-gen-tests/DeviceFarmIncludeTests.cpp b/generated/tests/devicefarm-gen-tests/DeviceFarmIncludeTests.cpp
index f8a64c33bad9..1860db24ab28 100644
--- a/generated/tests/devicefarm-gen-tests/DeviceFarmIncludeTests.cpp
+++ b/generated/tests/devicefarm-gen-tests/DeviceFarmIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/devicefarm/DeviceFarmClient.h>
+#include <aws/devicefarm/DeviceFarmClientPagination.h>
 #include <aws/devicefarm/DeviceFarmEndpointProvider.h>
 #include <aws/devicefarm/DeviceFarmErrorMarshaller.h>
 #include <aws/devicefarm/DeviceFarmErrors.h>
+#include <aws/devicefarm/DeviceFarmPaginationBase.h>
 #include <aws/devicefarm/DeviceFarmRequest.h>
 #include <aws/devicefarm/DeviceFarmServiceClientModel.h>
+#include <aws/devicefarm/DeviceFarmWaiter.h>
 #include <aws/devicefarm/DeviceFarm_EXPORTS.h>
+#include <aws/devicefarm/internal/DeviceFarmEndpointRules.h>
 #include <aws/devicefarm/model/AccountSettings.h>
 #include <aws/devicefarm/model/Artifact.h>
 #include <aws/devicefarm/model/ArtifactCategory.h>
@@ -95,6 +99,7 @@
 #include <aws/devicefarm/model/GetJobResult.h>
 #include <aws/devicefarm/model/GetNetworkProfileRequest.h>
 #include <aws/devicefarm/model/GetNetworkProfileResult.h>
+#include <aws/devicefarm/model/GetOfferingStatusPaginationTraits.h>
 #include <aws/devicefarm/model/GetOfferingStatusRequest.h>
 #include <aws/devicefarm/model/GetOfferingStatusResult.h>
 #include <aws/devicefarm/model/GetProjectRequest.h>
@@ -125,50 +130,67 @@
 #include <aws/devicefarm/model/JobInsights.h>
 #include <aws/devicefarm/model/JobReport.h>
 #include <aws/devicefarm/model/JobReportMetrics.h>
+#include <aws/devicefarm/model/ListArtifactsPaginationTraits.h>
 #include <aws/devicefarm/model/ListArtifactsRequest.h>
 #include <aws/devicefarm/model/ListArtifactsResult.h>
 #include <aws/devicefarm/model/ListDeviceInstancesRequest.h>
 #include <aws/devicefarm/model/ListDeviceInstancesResult.h>
+#include <aws/devicefarm/model/ListDevicePoolsPaginationTraits.h>
 #include <aws/devicefarm/model/ListDevicePoolsRequest.h>
 #include <aws/devicefarm/model/ListDevicePoolsResult.h>
+#include <aws/devicefarm/model/ListDevicesPaginationTraits.h>
 #include <aws/devicefarm/model/ListDevicesRequest.h>
 #include <aws/devicefarm/model/ListDevicesResult.h>
 #include <aws/devicefarm/model/ListInstanceProfilesRequest.h>
 #include <aws/devicefarm/model/ListInstanceProfilesResult.h>
+#include <aws/devicefarm/model/ListJobsPaginationTraits.h>
 #include <aws/devicefarm/model/ListJobsRequest.h>
 #include <aws/devicefarm/model/ListJobsResult.h>
 #include <aws/devicefarm/model/ListNetworkProfilesRequest.h>
 #include <aws/devicefarm/model/ListNetworkProfilesResult.h>
 #include <aws/devicefarm/model/ListOfferingPromotionsRequest.h>
 #include <aws/devicefarm/model/ListOfferingPromotionsResult.h>
+#include <aws/devicefarm/model/ListOfferingTransactionsPaginationTraits.h>
 #include <aws/devicefarm/model/ListOfferingTransactionsRequest.h>
 #include <aws/devicefarm/model/ListOfferingTransactionsResult.h>
+#include <aws/devicefarm/model/ListOfferingsPaginationTraits.h>
 #include <aws/devicefarm/model/ListOfferingsRequest.h>
 #include <aws/devicefarm/model/ListOfferingsResult.h>
+#include <aws/devicefarm/model/ListProjectsPaginationTraits.h>
 #include <aws/devicefarm/model/ListProjectsRequest.h>
 #include <aws/devicefarm/model/ListProjectsResult.h>
 #include <aws/devicefarm/model/ListRemoteAccessSessionsRequest.h>
 #include <aws/devicefarm/model/ListRemoteAccessSessionsResult.h>
+#include <aws/devicefarm/model/ListRunsPaginationTraits.h>
 #include <aws/devicefarm/model/ListRunsRequest.h>
 #include <aws/devicefarm/model/ListRunsResult.h>
+#include <aws/devicefarm/model/ListSamplesPaginationTraits.h>
 #include <aws/devicefarm/model/ListSamplesRequest.h>
 #include <aws/devicefarm/model/ListSamplesResult.h>
+#include <aws/devicefarm/model/ListSuitesPaginationTraits.h>
 #include <aws/devicefarm/model/ListSuitesRequest.h>
 #include <aws/devicefarm/model/ListSuitesResult.h>
 #include <aws/devicefarm/model/ListTagsForResourceRequest.h>
 #include <aws/devicefarm/model/ListTagsForResourceResult.h>
+#include <aws/devicefarm/model/ListTestGridProjectsPaginationTraits.h>
 #include <aws/devicefarm/model/ListTestGridProjectsRequest.h>
 #include <aws/devicefarm/model/ListTestGridProjectsResult.h>
+#include <aws/devicefarm/model/ListTestGridSessionActionsPaginationTraits.h>
 #include <aws/devicefarm/model/ListTestGridSessionActionsRequest.h>
 #include <aws/devicefarm/model/ListTestGridSessionActionsResult.h>
+#include <aws/devicefarm/model/ListTestGridSessionArtifactsPaginationTraits.h>
 #include <aws/devicefarm/model/ListTestGridSessionArtifactsRequest.h>
 #include <aws/devicefarm/model/ListTestGridSessionArtifactsResult.h>
+#include <aws/devicefarm/model/ListTestGridSessionsPaginationTraits.h>
 #include <aws/devicefarm/model/ListTestGridSessionsRequest.h>
 #include <aws/devicefarm/model/ListTestGridSessionsResult.h>
+#include <aws/devicefarm/model/ListTestsPaginationTraits.h>
 #include <aws/devicefarm/model/ListTestsRequest.h>
 #include <aws/devicefarm/model/ListTestsResult.h>
+#include <aws/devicefarm/model/ListUniqueProblemsPaginationTraits.h>
 #include <aws/devicefarm/model/ListUniqueProblemsRequest.h>
 #include <aws/devicefarm/model/ListUniqueProblemsResult.h>
+#include <aws/devicefarm/model/ListUploadsPaginationTraits.h>
 #include <aws/devicefarm/model/ListUploadsRequest.h>
 #include <aws/devicefarm/model/ListUploadsResult.h>
 #include <aws/devicefarm/model/ListVPCEConfigurationsRequest.h>
diff --git a/generated/tests/devops-agent-gen-tests/DevOpsAgentIncludeTests.cpp b/generated/tests/devops-agent-gen-tests/DevOpsAgentIncludeTests.cpp
index 7c124f9c6020..83767ac8cf66 100644
--- a/generated/tests/devops-agent-gen-tests/DevOpsAgentIncludeTests.cpp
+++ b/generated/tests/devops-agent-gen-tests/DevOpsAgentIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/devops-agent/DevOpsAgentClient.h>
+#include <aws/devops-agent/DevOpsAgentClientPagination.h>
 #include <aws/devops-agent/DevOpsAgentEndpointProvider.h>
 #include <aws/devops-agent/DevOpsAgentErrorMarshaller.h>
 #include <aws/devops-agent/DevOpsAgentErrors.h>
+#include <aws/devops-agent/DevOpsAgentPaginationBase.h>
 #include <aws/devops-agent/DevOpsAgentRequest.h>
 #include <aws/devops-agent/DevOpsAgentServiceClientModel.h>
+#include <aws/devops-agent/DevOpsAgentWaiter.h>
 #include <aws/devops-agent/DevOpsAgent_EXPORTS.h>
+#include <aws/devops-agent/internal/DevOpsAgentEndpointRules.h>
 #include <aws/devops-agent/model/AWSConfiguration.h>
 #include <aws/devops-agent/model/AdditionalServiceDetails.h>
 #include <aws/devops-agent/model/AdditionalServiceRegistrationStep.h>
@@ -122,26 +126,36 @@
 #include <aws/devops-agent/model/IdpAuthConfiguration.h>
 #include <aws/devops-agent/model/IpAddressType.h>
 #include <aws/devops-agent/model/JournalRecord.h>
+#include <aws/devops-agent/model/ListAgentSpacesPaginationTraits.h>
 #include <aws/devops-agent/model/ListAgentSpacesRequest.h>
 #include <aws/devops-agent/model/ListAgentSpacesResult.h>
+#include <aws/devops-agent/model/ListAssetFilesPaginationTraits.h>
 #include <aws/devops-agent/model/ListAssetFilesRequest.h>
 #include <aws/devops-agent/model/ListAssetFilesResult.h>
+#include <aws/devops-agent/model/ListAssetTypesPaginationTraits.h>
 #include <aws/devops-agent/model/ListAssetTypesRequest.h>
 #include <aws/devops-agent/model/ListAssetTypesResult.h>
+#include <aws/devops-agent/model/ListAssetVersionsPaginationTraits.h>
 #include <aws/devops-agent/model/ListAssetVersionsRequest.h>
 #include <aws/devops-agent/model/ListAssetVersionsResult.h>
+#include <aws/devops-agent/model/ListAssetsPaginationTraits.h>
 #include <aws/devops-agent/model/ListAssetsRequest.h>
 #include <aws/devops-agent/model/ListAssetsResult.h>
+#include <aws/devops-agent/model/ListAssociationsPaginationTraits.h>
 #include <aws/devops-agent/model/ListAssociationsRequest.h>
 #include <aws/devops-agent/model/ListAssociationsResult.h>
+#include <aws/devops-agent/model/ListBacklogTasksPaginationTraits.h>
 #include <aws/devops-agent/model/ListBacklogTasksRequest.h>
 #include <aws/devops-agent/model/ListBacklogTasksResult.h>
 #include <aws/devops-agent/model/ListChatsRequest.h>
 #include <aws/devops-agent/model/ListChatsResult.h>
+#include <aws/devops-agent/model/ListExecutionsPaginationTraits.h>
 #include <aws/devops-agent/model/ListExecutionsRequest.h>
 #include <aws/devops-agent/model/ListExecutionsResult.h>
+#include <aws/devops-agent/model/ListGoalsPaginationTraits.h>
 #include <aws/devops-agent/model/ListGoalsRequest.h>
 #include <aws/devops-agent/model/ListGoalsResult.h>
+#include <aws/devops-agent/model/ListJournalRecordsPaginationTraits.h>
 #include <aws/devops-agent/model/ListJournalRecordsRequest.h>
 #include <aws/devops-agent/model/ListJournalRecordsResult.h>
 #include <aws/devops-agent/model/ListPendingMessagesRequest.h>
@@ -150,10 +164,12 @@
 #include <aws/devops-agent/model/ListPrivateConnectionsResult.h>
 #include <aws/devops-agent/model/ListRecommendationsRequest.h>
 #include <aws/devops-agent/model/ListRecommendationsResult.h>
+#include <aws/devops-agent/model/ListServicesPaginationTraits.h>
 #include <aws/devops-agent/model/ListServicesRequest.h>
 #include <aws/devops-agent/model/ListServicesResult.h>
 #include <aws/devops-agent/model/ListTagsForResourceRequest.h>
 #include <aws/devops-agent/model/ListTagsForResourceResult.h>
+#include <aws/devops-agent/model/ListTriggersPaginationTraits.h>
 #include <aws/devops-agent/model/ListTriggersRequest.h>
 #include <aws/devops-agent/model/ListTriggersResult.h>
 #include <aws/devops-agent/model/ListWebhooksRequest.h>
diff --git a/generated/tests/devops-guru-gen-tests/DevOpsGuruIncludeTests.cpp b/generated/tests/devops-guru-gen-tests/DevOpsGuruIncludeTests.cpp
index 46c57882410b..3d3f37da3bf6 100644
--- a/generated/tests/devops-guru-gen-tests/DevOpsGuruIncludeTests.cpp
+++ b/generated/tests/devops-guru-gen-tests/DevOpsGuruIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/devops-guru/DevOpsGuruClient.h>
+#include <aws/devops-guru/DevOpsGuruClientPagination.h>
 #include <aws/devops-guru/DevOpsGuruEndpointProvider.h>
 #include <aws/devops-guru/DevOpsGuruErrorMarshaller.h>
 #include <aws/devops-guru/DevOpsGuruErrors.h>
+#include <aws/devops-guru/DevOpsGuruPaginationBase.h>
 #include <aws/devops-guru/DevOpsGuruRequest.h>
 #include <aws/devops-guru/DevOpsGuruServiceClientModel.h>
+#include <aws/devops-guru/DevOpsGuruWaiter.h>
 #include <aws/devops-guru/DevOpsGuru_EXPORTS.h>
+#include <aws/devops-guru/internal/DevOpsGuruEndpointRules.h>
 #include <aws/devops-guru/model/AccountHealth.h>
 #include <aws/devops-guru/model/AccountInsightHealth.h>
 #include <aws/devops-guru/model/AddNotificationChannelRequest.h>
@@ -59,8 +63,10 @@
 #include <aws/devops-guru/model/DescribeOrganizationHealthResult.h>
 #include <aws/devops-guru/model/DescribeOrganizationOverviewRequest.h>
 #include <aws/devops-guru/model/DescribeOrganizationOverviewResult.h>
+#include <aws/devops-guru/model/DescribeOrganizationResourceCollectionHealthPaginationTraits.h>
 #include <aws/devops-guru/model/DescribeOrganizationResourceCollectionHealthRequest.h>
 #include <aws/devops-guru/model/DescribeOrganizationResourceCollectionHealthResult.h>
+#include <aws/devops-guru/model/DescribeResourceCollectionHealthPaginationTraits.h>
 #include <aws/devops-guru/model/DescribeResourceCollectionHealthRequest.h>
 #include <aws/devops-guru/model/DescribeResourceCollectionHealthResult.h>
 #include <aws/devops-guru/model/DescribeServiceIntegrationRequest.h>
@@ -73,8 +79,10 @@
 #include <aws/devops-guru/model/EventSourceOptInStatus.h>
 #include <aws/devops-guru/model/EventSourcesConfig.h>
 #include <aws/devops-guru/model/EventTimeRange.h>
+#include <aws/devops-guru/model/GetCostEstimationPaginationTraits.h>
 #include <aws/devops-guru/model/GetCostEstimationRequest.h>
 #include <aws/devops-guru/model/GetCostEstimationResult.h>
+#include <aws/devops-guru/model/GetResourceCollectionPaginationTraits.h>
 #include <aws/devops-guru/model/GetResourceCollectionRequest.h>
 #include <aws/devops-guru/model/GetResourceCollectionResult.h>
 #include <aws/devops-guru/model/InsightFeedback.h>
@@ -88,26 +96,34 @@
 #include <aws/devops-guru/model/KMSServerSideEncryptionIntegration.h>
 #include <aws/devops-guru/model/KMSServerSideEncryptionIntegrationConfig.h>
 #include <aws/devops-guru/model/ListAnomaliesForInsightFilters.h>
+#include <aws/devops-guru/model/ListAnomaliesForInsightPaginationTraits.h>
 #include <aws/devops-guru/model/ListAnomaliesForInsightRequest.h>
 #include <aws/devops-guru/model/ListAnomaliesForInsightResult.h>
+#include <aws/devops-guru/model/ListAnomalousLogGroupsPaginationTraits.h>
 #include <aws/devops-guru/model/ListAnomalousLogGroupsRequest.h>
 #include <aws/devops-guru/model/ListAnomalousLogGroupsResult.h>
 #include <aws/devops-guru/model/ListEventsFilters.h>
+#include <aws/devops-guru/model/ListEventsPaginationTraits.h>
 #include <aws/devops-guru/model/ListEventsRequest.h>
 #include <aws/devops-guru/model/ListEventsResult.h>
 #include <aws/devops-guru/model/ListInsightsAnyStatusFilter.h>
 #include <aws/devops-guru/model/ListInsightsClosedStatusFilter.h>
 #include <aws/devops-guru/model/ListInsightsOngoingStatusFilter.h>
+#include <aws/devops-guru/model/ListInsightsPaginationTraits.h>
 #include <aws/devops-guru/model/ListInsightsRequest.h>
 #include <aws/devops-guru/model/ListInsightsResult.h>
 #include <aws/devops-guru/model/ListInsightsStatusFilter.h>
 #include <aws/devops-guru/model/ListMonitoredResourcesFilters.h>
+#include <aws/devops-guru/model/ListMonitoredResourcesPaginationTraits.h>
 #include <aws/devops-guru/model/ListMonitoredResourcesRequest.h>
 #include <aws/devops-guru/model/ListMonitoredResourcesResult.h>
+#include <aws/devops-guru/model/ListNotificationChannelsPaginationTraits.h>
 #include <aws/devops-guru/model/ListNotificationChannelsRequest.h>
 #include <aws/devops-guru/model/ListNotificationChannelsResult.h>
+#include <aws/devops-guru/model/ListOrganizationInsightsPaginationTraits.h>
 #include <aws/devops-guru/model/ListOrganizationInsightsRequest.h>
 #include <aws/devops-guru/model/ListOrganizationInsightsResult.h>
+#include <aws/devops-guru/model/ListRecommendationsPaginationTraits.h>
 #include <aws/devops-guru/model/ListRecommendationsRequest.h>
 #include <aws/devops-guru/model/ListRecommendationsResult.h>
 #include <aws/devops-guru/model/Locale.h>
@@ -162,9 +178,11 @@
 #include <aws/devops-guru/model/ResourcePermission.h>
 #include <aws/devops-guru/model/ResourceTypeFilter.h>
 #include <aws/devops-guru/model/SearchInsightsFilters.h>
+#include <aws/devops-guru/model/SearchInsightsPaginationTraits.h>
 #include <aws/devops-guru/model/SearchInsightsRequest.h>
 #include <aws/devops-guru/model/SearchInsightsResult.h>
 #include <aws/devops-guru/model/SearchOrganizationInsightsFilters.h>
+#include <aws/devops-guru/model/SearchOrganizationInsightsPaginationTraits.h>
 #include <aws/devops-guru/model/SearchOrganizationInsightsRequest.h>
 #include <aws/devops-guru/model/SearchOrganizationInsightsResult.h>
 #include <aws/devops-guru/model/ServerSideEncryptionType.h>
diff --git a/generated/tests/directconnect-gen-tests/DirectConnectIncludeTests.cpp b/generated/tests/directconnect-gen-tests/DirectConnectIncludeTests.cpp
index 00a7d65c7d42..1cc6d1c254cc 100644
--- a/generated/tests/directconnect-gen-tests/DirectConnectIncludeTests.cpp
+++ b/generated/tests/directconnect-gen-tests/DirectConnectIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/directconnect/DirectConnectEndpointProvider.h>
 #include <aws/directconnect/DirectConnectErrorMarshaller.h>
 #include <aws/directconnect/DirectConnectErrors.h>
+#include <aws/directconnect/DirectConnectPaginationBase.h>
 #include <aws/directconnect/DirectConnectRequest.h>
 #include <aws/directconnect/DirectConnectServiceClientModel.h>
+#include <aws/directconnect/DirectConnectWaiter.h>
 #include <aws/directconnect/DirectConnect_EXPORTS.h>
+#include <aws/directconnect/internal/DirectConnectEndpointRules.h>
 #include <aws/directconnect/model/AcceptDirectConnectGatewayAssociationProposalRequest.h>
 #include <aws/directconnect/model/AcceptDirectConnectGatewayAssociationProposalResult.h>
 #include <aws/directconnect/model/AddressFamily.h>
diff --git a/generated/tests/directory-service-data-gen-tests/DirectoryServiceDataIncludeTests.cpp b/generated/tests/directory-service-data-gen-tests/DirectoryServiceDataIncludeTests.cpp
index 5d56f3134ecc..85831b92614b 100644
--- a/generated/tests/directory-service-data-gen-tests/DirectoryServiceDataIncludeTests.cpp
+++ b/generated/tests/directory-service-data-gen-tests/DirectoryServiceDataIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/directory-service-data/DirectoryServiceDataClient.h>
+#include <aws/directory-service-data/DirectoryServiceDataClientPagination.h>
 #include <aws/directory-service-data/DirectoryServiceDataEndpointProvider.h>
 #include <aws/directory-service-data/DirectoryServiceDataErrorMarshaller.h>
 #include <aws/directory-service-data/DirectoryServiceDataErrors.h>
+#include <aws/directory-service-data/DirectoryServiceDataPaginationBase.h>
 #include <aws/directory-service-data/DirectoryServiceDataRequest.h>
 #include <aws/directory-service-data/DirectoryServiceDataServiceClientModel.h>
+#include <aws/directory-service-data/DirectoryServiceDataWaiter.h>
 #include <aws/directory-service-data/DirectoryServiceData_EXPORTS.h>
+#include <aws/directory-service-data/internal/DirectoryServiceDataEndpointRules.h>
 #include <aws/directory-service-data/model/AccessDeniedException.h>
 #include <aws/directory-service-data/model/AccessDeniedReason.h>
 #include <aws/directory-service-data/model/AddGroupMemberRequest.h>
@@ -38,20 +42,26 @@
 #include <aws/directory-service-data/model/GroupScope.h>
 #include <aws/directory-service-data/model/GroupSummary.h>
 #include <aws/directory-service-data/model/GroupType.h>
+#include <aws/directory-service-data/model/ListGroupMembersPaginationTraits.h>
 #include <aws/directory-service-data/model/ListGroupMembersRequest.h>
 #include <aws/directory-service-data/model/ListGroupMembersResult.h>
+#include <aws/directory-service-data/model/ListGroupsForMemberPaginationTraits.h>
 #include <aws/directory-service-data/model/ListGroupsForMemberRequest.h>
 #include <aws/directory-service-data/model/ListGroupsForMemberResult.h>
+#include <aws/directory-service-data/model/ListGroupsPaginationTraits.h>
 #include <aws/directory-service-data/model/ListGroupsRequest.h>
 #include <aws/directory-service-data/model/ListGroupsResult.h>
+#include <aws/directory-service-data/model/ListUsersPaginationTraits.h>
 #include <aws/directory-service-data/model/ListUsersRequest.h>
 #include <aws/directory-service-data/model/ListUsersResult.h>
 #include <aws/directory-service-data/model/Member.h>
 #include <aws/directory-service-data/model/MemberType.h>
 #include <aws/directory-service-data/model/RemoveGroupMemberRequest.h>
 #include <aws/directory-service-data/model/RemoveGroupMemberResult.h>
+#include <aws/directory-service-data/model/SearchGroupsPaginationTraits.h>
 #include <aws/directory-service-data/model/SearchGroupsRequest.h>
 #include <aws/directory-service-data/model/SearchGroupsResult.h>
+#include <aws/directory-service-data/model/SearchUsersPaginationTraits.h>
 #include <aws/directory-service-data/model/SearchUsersRequest.h>
 #include <aws/directory-service-data/model/SearchUsersResult.h>
 #include <aws/directory-service-data/model/ThrottlingException.h>
diff --git a/generated/tests/discovery-gen-tests/ApplicationDiscoveryServiceIncludeTests.cpp b/generated/tests/discovery-gen-tests/ApplicationDiscoveryServiceIncludeTests.cpp
index 139e5fb65e10..82649ebea55c 100644
--- a/generated/tests/discovery-gen-tests/ApplicationDiscoveryServiceIncludeTests.cpp
+++ b/generated/tests/discovery-gen-tests/ApplicationDiscoveryServiceIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/discovery/ApplicationDiscoveryServiceClient.h>
+#include <aws/discovery/ApplicationDiscoveryServiceClientPagination.h>
 #include <aws/discovery/ApplicationDiscoveryServiceEndpointProvider.h>
 #include <aws/discovery/ApplicationDiscoveryServiceErrorMarshaller.h>
 #include <aws/discovery/ApplicationDiscoveryServiceErrors.h>
+#include <aws/discovery/ApplicationDiscoveryServicePaginationBase.h>
 #include <aws/discovery/ApplicationDiscoveryServiceRequest.h>
 #include <aws/discovery/ApplicationDiscoveryServiceServiceClientModel.h>
+#include <aws/discovery/ApplicationDiscoveryServiceWaiter.h>
 #include <aws/discovery/ApplicationDiscoveryService_EXPORTS.h>
+#include <aws/discovery/internal/ApplicationDiscoveryServiceEndpointRules.h>
 #include <aws/discovery/model/AgentConfigurationStatus.h>
 #include <aws/discovery/model/AgentInfo.h>
 #include <aws/discovery/model/AgentNetworkInfo.h>
@@ -49,18 +53,23 @@
 #include <aws/discovery/model/DeleteTagsResult.h>
 #include <aws/discovery/model/DeletionConfigurationItemType.h>
 #include <aws/discovery/model/DeletionWarning.h>
+#include <aws/discovery/model/DescribeAgentsPaginationTraits.h>
 #include <aws/discovery/model/DescribeAgentsRequest.h>
 #include <aws/discovery/model/DescribeAgentsResult.h>
 #include <aws/discovery/model/DescribeBatchDeleteConfigurationTaskRequest.h>
 #include <aws/discovery/model/DescribeBatchDeleteConfigurationTaskResult.h>
 #include <aws/discovery/model/DescribeConfigurationsRequest.h>
 #include <aws/discovery/model/DescribeConfigurationsResult.h>
+#include <aws/discovery/model/DescribeContinuousExportsPaginationTraits.h>
 #include <aws/discovery/model/DescribeContinuousExportsRequest.h>
 #include <aws/discovery/model/DescribeContinuousExportsResult.h>
+#include <aws/discovery/model/DescribeExportTasksPaginationTraits.h>
 #include <aws/discovery/model/DescribeExportTasksRequest.h>
 #include <aws/discovery/model/DescribeExportTasksResult.h>
+#include <aws/discovery/model/DescribeImportTasksPaginationTraits.h>
 #include <aws/discovery/model/DescribeImportTasksRequest.h>
 #include <aws/discovery/model/DescribeImportTasksResult.h>
+#include <aws/discovery/model/DescribeTagsPaginationTraits.h>
 #include <aws/discovery/model/DescribeTagsRequest.h>
 #include <aws/discovery/model/DescribeTagsResult.h>
 #include <aws/discovery/model/DisassociateConfigurationItemsFromApplicationRequest.h>
@@ -80,6 +89,7 @@
 #include <aws/discovery/model/ImportTask.h>
 #include <aws/discovery/model/ImportTaskFilter.h>
 #include <aws/discovery/model/ImportTaskFilterName.h>
+#include <aws/discovery/model/ListConfigurationsPaginationTraits.h>
 #include <aws/discovery/model/ListConfigurationsRequest.h>
 #include <aws/discovery/model/ListConfigurationsResult.h>
 #include <aws/discovery/model/ListServerNeighborsRequest.h>
diff --git a/generated/tests/dlm-gen-tests/DLMIncludeTests.cpp b/generated/tests/dlm-gen-tests/DLMIncludeTests.cpp
index db5634649e7e..93ac230f4f05 100644
--- a/generated/tests/dlm-gen-tests/DLMIncludeTests.cpp
+++ b/generated/tests/dlm-gen-tests/DLMIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/dlm/DLMEndpointProvider.h>
 #include <aws/dlm/DLMErrorMarshaller.h>
 #include <aws/dlm/DLMErrors.h>
+#include <aws/dlm/DLMPaginationBase.h>
 #include <aws/dlm/DLMRequest.h>
 #include <aws/dlm/DLMServiceClientModel.h>
+#include <aws/dlm/DLMWaiter.h>
 #include <aws/dlm/DLM_EXPORTS.h>
+#include <aws/dlm/internal/DLMEndpointRules.h>
 #include <aws/dlm/model/Action.h>
 #include <aws/dlm/model/ArchiveRetainRule.h>
 #include <aws/dlm/model/ArchiveRule.h>
diff --git a/generated/tests/dms-gen-tests/DatabaseMigrationServiceIncludeTests.cpp b/generated/tests/dms-gen-tests/DatabaseMigrationServiceIncludeTests.cpp
index 7330a0129edf..169d33846949 100644
--- a/generated/tests/dms-gen-tests/DatabaseMigrationServiceIncludeTests.cpp
+++ b/generated/tests/dms-gen-tests/DatabaseMigrationServiceIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/dms/DatabaseMigrationServiceClient.h>
+#include <aws/dms/DatabaseMigrationServiceClientPagination.h>
 #include <aws/dms/DatabaseMigrationServiceEndpointProvider.h>
 #include <aws/dms/DatabaseMigrationServiceErrorMarshaller.h>
 #include <aws/dms/DatabaseMigrationServiceErrors.h>
+#include <aws/dms/DatabaseMigrationServicePaginationBase.h>
 #include <aws/dms/DatabaseMigrationServiceRequest.h>
 #include <aws/dms/DatabaseMigrationServiceServiceClientModel.h>
+#include <aws/dms/DatabaseMigrationServiceWaiter.h>
 #include <aws/dms/DatabaseMigrationService_EXPORTS.h>
+#include <aws/dms/internal/DatabaseMigrationServiceEndpointRules.h>
 #include <aws/dms/model/AccountQuota.h>
 #include <aws/dms/model/AddTagsToResourceRequest.h>
 #include <aws/dms/model/AddTagsToResourceResult.h>
@@ -109,96 +113,138 @@
 #include <aws/dms/model/DeleteReplicationTaskResult.h>
 #include <aws/dms/model/DescribeAccountAttributesRequest.h>
 #include <aws/dms/model/DescribeAccountAttributesResult.h>
+#include <aws/dms/model/DescribeApplicableIndividualAssessmentsPaginationTraits.h>
 #include <aws/dms/model/DescribeApplicableIndividualAssessmentsRequest.h>
 #include <aws/dms/model/DescribeApplicableIndividualAssessmentsResult.h>
+#include <aws/dms/model/DescribeCertificatesPaginationTraits.h>
 #include <aws/dms/model/DescribeCertificatesRequest.h>
 #include <aws/dms/model/DescribeCertificatesResult.h>
+#include <aws/dms/model/DescribeConnectionsPaginationTraits.h>
 #include <aws/dms/model/DescribeConnectionsRequest.h>
 #include <aws/dms/model/DescribeConnectionsResult.h>
 #include <aws/dms/model/DescribeConversionConfigurationRequest.h>
 #include <aws/dms/model/DescribeConversionConfigurationResult.h>
+#include <aws/dms/model/DescribeDataMigrationsPaginationTraits.h>
 #include <aws/dms/model/DescribeDataMigrationsRequest.h>
 #include <aws/dms/model/DescribeDataMigrationsResult.h>
+#include <aws/dms/model/DescribeDataProvidersPaginationTraits.h>
 #include <aws/dms/model/DescribeDataProvidersRequest.h>
 #include <aws/dms/model/DescribeDataProvidersResult.h>
+#include <aws/dms/model/DescribeEndpointSettingsPaginationTraits.h>
 #include <aws/dms/model/DescribeEndpointSettingsRequest.h>
 #include <aws/dms/model/DescribeEndpointSettingsResult.h>
+#include <aws/dms/model/DescribeEndpointTypesPaginationTraits.h>
 #include <aws/dms/model/DescribeEndpointTypesRequest.h>
 #include <aws/dms/model/DescribeEndpointTypesResult.h>
+#include <aws/dms/model/DescribeEndpointsPaginationTraits.h>
 #include <aws/dms/model/DescribeEndpointsRequest.h>
 #include <aws/dms/model/DescribeEndpointsResult.h>
+#include <aws/dms/model/DescribeEngineVersionsPaginationTraits.h>
 #include <aws/dms/model/DescribeEngineVersionsRequest.h>
 #include <aws/dms/model/DescribeEngineVersionsResult.h>
 #include <aws/dms/model/DescribeEventCategoriesRequest.h>
 #include <aws/dms/model/DescribeEventCategoriesResult.h>
+#include <aws/dms/model/DescribeEventSubscriptionsPaginationTraits.h>
 #include <aws/dms/model/DescribeEventSubscriptionsRequest.h>
 #include <aws/dms/model/DescribeEventSubscriptionsResult.h>
+#include <aws/dms/model/DescribeEventsPaginationTraits.h>
 #include <aws/dms/model/DescribeEventsRequest.h>
 #include <aws/dms/model/DescribeEventsResult.h>
+#include <aws/dms/model/DescribeExtensionPackAssociationsPaginationTraits.h>
 #include <aws/dms/model/DescribeExtensionPackAssociationsRequest.h>
 #include <aws/dms/model/DescribeExtensionPackAssociationsResult.h>
+#include <aws/dms/model/DescribeFleetAdvisorCollectorsPaginationTraits.h>
 #include <aws/dms/model/DescribeFleetAdvisorCollectorsRequest.h>
 #include <aws/dms/model/DescribeFleetAdvisorCollectorsResult.h>
+#include <aws/dms/model/DescribeFleetAdvisorDatabasesPaginationTraits.h>
 #include <aws/dms/model/DescribeFleetAdvisorDatabasesRequest.h>
 #include <aws/dms/model/DescribeFleetAdvisorDatabasesResult.h>
+#include <aws/dms/model/DescribeFleetAdvisorLsaAnalysisPaginationTraits.h>
 #include <aws/dms/model/DescribeFleetAdvisorLsaAnalysisRequest.h>
 #include <aws/dms/model/DescribeFleetAdvisorLsaAnalysisResult.h>
+#include <aws/dms/model/DescribeFleetAdvisorSchemaObjectSummaryPaginationTraits.h>
 #include <aws/dms/model/DescribeFleetAdvisorSchemaObjectSummaryRequest.h>
 #include <aws/dms/model/DescribeFleetAdvisorSchemaObjectSummaryResult.h>
+#include <aws/dms/model/DescribeFleetAdvisorSchemasPaginationTraits.h>
 #include <aws/dms/model/DescribeFleetAdvisorSchemasRequest.h>
 #include <aws/dms/model/DescribeFleetAdvisorSchemasResult.h>
+#include <aws/dms/model/DescribeInstanceProfilesPaginationTraits.h>
 #include <aws/dms/model/DescribeInstanceProfilesRequest.h>
 #include <aws/dms/model/DescribeInstanceProfilesResult.h>
+#include <aws/dms/model/DescribeMetadataModelAssessmentsPaginationTraits.h>
 #include <aws/dms/model/DescribeMetadataModelAssessmentsRequest.h>
 #include <aws/dms/model/DescribeMetadataModelAssessmentsResult.h>
+#include <aws/dms/model/DescribeMetadataModelChildrenPaginationTraits.h>
 #include <aws/dms/model/DescribeMetadataModelChildrenRequest.h>
 #include <aws/dms/model/DescribeMetadataModelChildrenResult.h>
+#include <aws/dms/model/DescribeMetadataModelConversionsPaginationTraits.h>
 #include <aws/dms/model/DescribeMetadataModelConversionsRequest.h>
 #include <aws/dms/model/DescribeMetadataModelConversionsResult.h>
+#include <aws/dms/model/DescribeMetadataModelCreationsPaginationTraits.h>
 #include <aws/dms/model/DescribeMetadataModelCreationsRequest.h>
 #include <aws/dms/model/DescribeMetadataModelCreationsResult.h>
+#include <aws/dms/model/DescribeMetadataModelExportsAsScriptPaginationTraits.h>
 #include <aws/dms/model/DescribeMetadataModelExportsAsScriptRequest.h>
 #include <aws/dms/model/DescribeMetadataModelExportsAsScriptResult.h>
+#include <aws/dms/model/DescribeMetadataModelExportsToTargetPaginationTraits.h>
 #include <aws/dms/model/DescribeMetadataModelExportsToTargetRequest.h>
 #include <aws/dms/model/DescribeMetadataModelExportsToTargetResult.h>
+#include <aws/dms/model/DescribeMetadataModelImportsPaginationTraits.h>
 #include <aws/dms/model/DescribeMetadataModelImportsRequest.h>
 #include <aws/dms/model/DescribeMetadataModelImportsResult.h>
 #include <aws/dms/model/DescribeMetadataModelRequest.h>
 #include <aws/dms/model/DescribeMetadataModelResult.h>
+#include <aws/dms/model/DescribeMigrationProjectsPaginationTraits.h>
 #include <aws/dms/model/DescribeMigrationProjectsRequest.h>
 #include <aws/dms/model/DescribeMigrationProjectsResult.h>
+#include <aws/dms/model/DescribeOrderableReplicationInstancesPaginationTraits.h>
 #include <aws/dms/model/DescribeOrderableReplicationInstancesRequest.h>
 #include <aws/dms/model/DescribeOrderableReplicationInstancesResult.h>
+#include <aws/dms/model/DescribePendingMaintenanceActionsPaginationTraits.h>
 #include <aws/dms/model/DescribePendingMaintenanceActionsRequest.h>
 #include <aws/dms/model/DescribePendingMaintenanceActionsResult.h>
+#include <aws/dms/model/DescribeRecommendationLimitationsPaginationTraits.h>
 #include <aws/dms/model/DescribeRecommendationLimitationsRequest.h>
 #include <aws/dms/model/DescribeRecommendationLimitationsResult.h>
+#include <aws/dms/model/DescribeRecommendationsPaginationTraits.h>
 #include <aws/dms/model/DescribeRecommendationsRequest.h>
 #include <aws/dms/model/DescribeRecommendationsResult.h>
 #include <aws/dms/model/DescribeRefreshSchemasStatusRequest.h>
 #include <aws/dms/model/DescribeRefreshSchemasStatusResult.h>
+#include <aws/dms/model/DescribeReplicationConfigsPaginationTraits.h>
 #include <aws/dms/model/DescribeReplicationConfigsRequest.h>
 #include <aws/dms/model/DescribeReplicationConfigsResult.h>
+#include <aws/dms/model/DescribeReplicationInstanceTaskLogsPaginationTraits.h>
 #include <aws/dms/model/DescribeReplicationInstanceTaskLogsRequest.h>
 #include <aws/dms/model/DescribeReplicationInstanceTaskLogsResult.h>
+#include <aws/dms/model/DescribeReplicationInstancesPaginationTraits.h>
 #include <aws/dms/model/DescribeReplicationInstancesRequest.h>
 #include <aws/dms/model/DescribeReplicationInstancesResult.h>
+#include <aws/dms/model/DescribeReplicationSubnetGroupsPaginationTraits.h>
 #include <aws/dms/model/DescribeReplicationSubnetGroupsRequest.h>
 #include <aws/dms/model/DescribeReplicationSubnetGroupsResult.h>
+#include <aws/dms/model/DescribeReplicationTableStatisticsPaginationTraits.h>
 #include <aws/dms/model/DescribeReplicationTableStatisticsRequest.h>
 #include <aws/dms/model/DescribeReplicationTableStatisticsResult.h>
+#include <aws/dms/model/DescribeReplicationTaskAssessmentResultsPaginationTraits.h>
 #include <aws/dms/model/DescribeReplicationTaskAssessmentResultsRequest.h>
 #include <aws/dms/model/DescribeReplicationTaskAssessmentResultsResult.h>
+#include <aws/dms/model/DescribeReplicationTaskAssessmentRunsPaginationTraits.h>
 #include <aws/dms/model/DescribeReplicationTaskAssessmentRunsRequest.h>
 #include <aws/dms/model/DescribeReplicationTaskAssessmentRunsResult.h>
+#include <aws/dms/model/DescribeReplicationTaskIndividualAssessmentsPaginationTraits.h>
 #include <aws/dms/model/DescribeReplicationTaskIndividualAssessmentsRequest.h>
 #include <aws/dms/model/DescribeReplicationTaskIndividualAssessmentsResult.h>
+#include <aws/dms/model/DescribeReplicationTasksPaginationTraits.h>
 #include <aws/dms/model/DescribeReplicationTasksRequest.h>
 #include <aws/dms/model/DescribeReplicationTasksResult.h>
+#include <aws/dms/model/DescribeReplicationsPaginationTraits.h>
 #include <aws/dms/model/DescribeReplicationsRequest.h>
 #include <aws/dms/model/DescribeReplicationsResult.h>
+#include <aws/dms/model/DescribeSchemasPaginationTraits.h>
 #include <aws/dms/model/DescribeSchemasRequest.h>
 #include <aws/dms/model/DescribeSchemasResult.h>
+#include <aws/dms/model/DescribeTableStatisticsPaginationTraits.h>
 #include <aws/dms/model/DescribeTableStatisticsRequest.h>
 #include <aws/dms/model/DescribeTableStatisticsResult.h>
 #include <aws/dms/model/DmsSslModeValue.h>
diff --git a/generated/tests/docdb-elastic-gen-tests/DocDBElasticIncludeTests.cpp b/generated/tests/docdb-elastic-gen-tests/DocDBElasticIncludeTests.cpp
index 85b7265c25f6..f19abd56d740 100644
--- a/generated/tests/docdb-elastic-gen-tests/DocDBElasticIncludeTests.cpp
+++ b/generated/tests/docdb-elastic-gen-tests/DocDBElasticIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/docdb-elastic/DocDBElasticClient.h>
+#include <aws/docdb-elastic/DocDBElasticClientPagination.h>
 #include <aws/docdb-elastic/DocDBElasticEndpointProvider.h>
 #include <aws/docdb-elastic/DocDBElasticErrorMarshaller.h>
 #include <aws/docdb-elastic/DocDBElasticErrors.h>
+#include <aws/docdb-elastic/DocDBElasticPaginationBase.h>
 #include <aws/docdb-elastic/DocDBElasticRequest.h>
 #include <aws/docdb-elastic/DocDBElasticServiceClientModel.h>
+#include <aws/docdb-elastic/DocDBElasticWaiter.h>
 #include <aws/docdb-elastic/DocDBElastic_EXPORTS.h>
+#include <aws/docdb-elastic/internal/DocDBElasticEndpointRules.h>
 #include <aws/docdb-elastic/model/ApplyPendingMaintenanceActionRequest.h>
 #include <aws/docdb-elastic/model/ApplyPendingMaintenanceActionResult.h>
 #include <aws/docdb-elastic/model/Auth.h>
@@ -37,10 +41,13 @@
 #include <aws/docdb-elastic/model/GetClusterSnapshotResult.h>
 #include <aws/docdb-elastic/model/GetPendingMaintenanceActionRequest.h>
 #include <aws/docdb-elastic/model/GetPendingMaintenanceActionResult.h>
+#include <aws/docdb-elastic/model/ListClusterSnapshotsPaginationTraits.h>
 #include <aws/docdb-elastic/model/ListClusterSnapshotsRequest.h>
 #include <aws/docdb-elastic/model/ListClusterSnapshotsResult.h>
+#include <aws/docdb-elastic/model/ListClustersPaginationTraits.h>
 #include <aws/docdb-elastic/model/ListClustersRequest.h>
 #include <aws/docdb-elastic/model/ListClustersResult.h>
+#include <aws/docdb-elastic/model/ListPendingMaintenanceActionsPaginationTraits.h>
 #include <aws/docdb-elastic/model/ListPendingMaintenanceActionsRequest.h>
 #include <aws/docdb-elastic/model/ListPendingMaintenanceActionsResult.h>
 #include <aws/docdb-elastic/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/docdb-gen-tests/DocDBIncludeTests.cpp b/generated/tests/docdb-gen-tests/DocDBIncludeTests.cpp
index 433b5d99edff..2a5fd7f342e6 100644
--- a/generated/tests/docdb-gen-tests/DocDBIncludeTests.cpp
+++ b/generated/tests/docdb-gen-tests/DocDBIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/docdb/DocDBClient.h>
+#include <aws/docdb/DocDBClientPagination.h>
 #include <aws/docdb/DocDBEndpointProvider.h>
 #include <aws/docdb/DocDBErrorMarshaller.h>
 #include <aws/docdb/DocDBErrors.h>
+#include <aws/docdb/DocDBPaginationBase.h>
 #include <aws/docdb/DocDBRequest.h>
 #include <aws/docdb/DocDBServiceClientModel.h>
+#include <aws/docdb/DocDBWaiter.h>
 #include <aws/docdb/DocDB_EXPORTS.h>
+#include <aws/docdb/internal/DocDBEndpointRules.h>
 #include <aws/docdb/model/AddSourceIdentifierToSubscriptionRequest.h>
 #include <aws/docdb/model/AddSourceIdentifierToSubscriptionResult.h>
 #include <aws/docdb/model/AddTagsToResourceRequest.h>
@@ -65,36 +69,49 @@
 #include <aws/docdb/model/DeleteEventSubscriptionResult.h>
 #include <aws/docdb/model/DeleteGlobalClusterRequest.h>
 #include <aws/docdb/model/DeleteGlobalClusterResult.h>
+#include <aws/docdb/model/DescribeCertificatesPaginationTraits.h>
 #include <aws/docdb/model/DescribeCertificatesRequest.h>
 #include <aws/docdb/model/DescribeCertificatesResult.h>
+#include <aws/docdb/model/DescribeDBClusterParameterGroupsPaginationTraits.h>
 #include <aws/docdb/model/DescribeDBClusterParameterGroupsRequest.h>
 #include <aws/docdb/model/DescribeDBClusterParameterGroupsResult.h>
+#include <aws/docdb/model/DescribeDBClusterParametersPaginationTraits.h>
 #include <aws/docdb/model/DescribeDBClusterParametersRequest.h>
 #include <aws/docdb/model/DescribeDBClusterParametersResult.h>
 #include <aws/docdb/model/DescribeDBClusterSnapshotAttributesRequest.h>
 #include <aws/docdb/model/DescribeDBClusterSnapshotAttributesResult.h>
+#include <aws/docdb/model/DescribeDBClusterSnapshotsPaginationTraits.h>
 #include <aws/docdb/model/DescribeDBClusterSnapshotsRequest.h>
 #include <aws/docdb/model/DescribeDBClusterSnapshotsResult.h>
+#include <aws/docdb/model/DescribeDBClustersPaginationTraits.h>
 #include <aws/docdb/model/DescribeDBClustersRequest.h>
 #include <aws/docdb/model/DescribeDBClustersResult.h>
+#include <aws/docdb/model/DescribeDBEngineVersionsPaginationTraits.h>
 #include <aws/docdb/model/DescribeDBEngineVersionsRequest.h>
 #include <aws/docdb/model/DescribeDBEngineVersionsResult.h>
+#include <aws/docdb/model/DescribeDBInstancesPaginationTraits.h>
 #include <aws/docdb/model/DescribeDBInstancesRequest.h>
 #include <aws/docdb/model/DescribeDBInstancesResult.h>
+#include <aws/docdb/model/DescribeDBSubnetGroupsPaginationTraits.h>
 #include <aws/docdb/model/DescribeDBSubnetGroupsRequest.h>
 #include <aws/docdb/model/DescribeDBSubnetGroupsResult.h>
 #include <aws/docdb/model/DescribeEngineDefaultClusterParametersRequest.h>
 #include <aws/docdb/model/DescribeEngineDefaultClusterParametersResult.h>
 #include <aws/docdb/model/DescribeEventCategoriesRequest.h>
 #include <aws/docdb/model/DescribeEventCategoriesResult.h>
+#include <aws/docdb/model/DescribeEventSubscriptionsPaginationTraits.h>
 #include <aws/docdb/model/DescribeEventSubscriptionsRequest.h>
 #include <aws/docdb/model/DescribeEventSubscriptionsResult.h>
+#include <aws/docdb/model/DescribeEventsPaginationTraits.h>
 #include <aws/docdb/model/DescribeEventsRequest.h>
 #include <aws/docdb/model/DescribeEventsResult.h>
+#include <aws/docdb/model/DescribeGlobalClustersPaginationTraits.h>
 #include <aws/docdb/model/DescribeGlobalClustersRequest.h>
 #include <aws/docdb/model/DescribeGlobalClustersResult.h>
+#include <aws/docdb/model/DescribeOrderableDBInstanceOptionsPaginationTraits.h>
 #include <aws/docdb/model/DescribeOrderableDBInstanceOptionsRequest.h>
 #include <aws/docdb/model/DescribeOrderableDBInstanceOptionsResult.h>
+#include <aws/docdb/model/DescribePendingMaintenanceActionsPaginationTraits.h>
 #include <aws/docdb/model/DescribePendingMaintenanceActionsRequest.h>
 #include <aws/docdb/model/DescribePendingMaintenanceActionsResult.h>
 #include <aws/docdb/model/Endpoint.h>
diff --git a/generated/tests/drs-gen-tests/DrsIncludeTests.cpp b/generated/tests/drs-gen-tests/DrsIncludeTests.cpp
index 1831fa971968..912b6916692d 100644
--- a/generated/tests/drs-gen-tests/DrsIncludeTests.cpp
+++ b/generated/tests/drs-gen-tests/DrsIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/drs/DrsClient.h>
+#include <aws/drs/DrsClientPagination.h>
 #include <aws/drs/DrsEndpointProvider.h>
 #include <aws/drs/DrsErrorMarshaller.h>
 #include <aws/drs/DrsErrors.h>
+#include <aws/drs/DrsPaginationBase.h>
 #include <aws/drs/DrsRequest.h>
 #include <aws/drs/DrsServiceClientModel.h>
+#include <aws/drs/DrsWaiter.h>
 #include <aws/drs/Drs_EXPORTS.h>
+#include <aws/drs/internal/DrsEndpointRules.h>
 #include <aws/drs/model/AccessDeniedException.h>
 #include <aws/drs/model/Account.h>
 #include <aws/drs/model/AssociateSourceNetworkStackRequest.h>
@@ -50,24 +54,32 @@
 #include <aws/drs/model/DeleteSourceNetworkResult.h>
 #include <aws/drs/model/DeleteSourceServerRequest.h>
 #include <aws/drs/model/DeleteSourceServerResult.h>
+#include <aws/drs/model/DescribeJobLogItemsPaginationTraits.h>
 #include <aws/drs/model/DescribeJobLogItemsRequest.h>
 #include <aws/drs/model/DescribeJobLogItemsResult.h>
+#include <aws/drs/model/DescribeJobsPaginationTraits.h>
 #include <aws/drs/model/DescribeJobsRequest.h>
 #include <aws/drs/model/DescribeJobsRequestFilters.h>
 #include <aws/drs/model/DescribeJobsResult.h>
+#include <aws/drs/model/DescribeLaunchConfigurationTemplatesPaginationTraits.h>
 #include <aws/drs/model/DescribeLaunchConfigurationTemplatesRequest.h>
 #include <aws/drs/model/DescribeLaunchConfigurationTemplatesResult.h>
+#include <aws/drs/model/DescribeRecoveryInstancesPaginationTraits.h>
 #include <aws/drs/model/DescribeRecoveryInstancesRequest.h>
 #include <aws/drs/model/DescribeRecoveryInstancesRequestFilters.h>
 #include <aws/drs/model/DescribeRecoveryInstancesResult.h>
+#include <aws/drs/model/DescribeRecoverySnapshotsPaginationTraits.h>
 #include <aws/drs/model/DescribeRecoverySnapshotsRequest.h>
 #include <aws/drs/model/DescribeRecoverySnapshotsRequestFilters.h>
 #include <aws/drs/model/DescribeRecoverySnapshotsResult.h>
+#include <aws/drs/model/DescribeReplicationConfigurationTemplatesPaginationTraits.h>
 #include <aws/drs/model/DescribeReplicationConfigurationTemplatesRequest.h>
 #include <aws/drs/model/DescribeReplicationConfigurationTemplatesResult.h>
+#include <aws/drs/model/DescribeSourceNetworksPaginationTraits.h>
 #include <aws/drs/model/DescribeSourceNetworksRequest.h>
 #include <aws/drs/model/DescribeSourceNetworksRequestFilters.h>
 #include <aws/drs/model/DescribeSourceNetworksResult.h>
+#include <aws/drs/model/DescribeSourceServersPaginationTraits.h>
 #include <aws/drs/model/DescribeSourceServersRequest.h>
 #include <aws/drs/model/DescribeSourceServersRequestFilters.h>
 #include <aws/drs/model/DescribeSourceServersResult.h>
@@ -120,10 +132,13 @@
 #include <aws/drs/model/LifeCycle.h>
 #include <aws/drs/model/LifeCycleLastLaunch.h>
 #include <aws/drs/model/LifeCycleLastLaunchInitiated.h>
+#include <aws/drs/model/ListExtensibleSourceServersPaginationTraits.h>
 #include <aws/drs/model/ListExtensibleSourceServersRequest.h>
 #include <aws/drs/model/ListExtensibleSourceServersResult.h>
+#include <aws/drs/model/ListLaunchActionsPaginationTraits.h>
 #include <aws/drs/model/ListLaunchActionsRequest.h>
 #include <aws/drs/model/ListLaunchActionsResult.h>
+#include <aws/drs/model/ListStagingAccountsPaginationTraits.h>
 #include <aws/drs/model/ListStagingAccountsRequest.h>
 #include <aws/drs/model/ListStagingAccountsResult.h>
 #include <aws/drs/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/ds-gen-tests/DirectoryServiceIncludeTests.cpp b/generated/tests/ds-gen-tests/DirectoryServiceIncludeTests.cpp
index 4823e235a0ec..082e0a6a0626 100644
--- a/generated/tests/ds-gen-tests/DirectoryServiceIncludeTests.cpp
+++ b/generated/tests/ds-gen-tests/DirectoryServiceIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/ds/DirectoryServiceClient.h>
+#include <aws/ds/DirectoryServiceClientPagination.h>
 #include <aws/ds/DirectoryServiceEndpointProvider.h>
 #include <aws/ds/DirectoryServiceErrorMarshaller.h>
 #include <aws/ds/DirectoryServiceErrors.h>
+#include <aws/ds/DirectoryServicePaginationBase.h>
 #include <aws/ds/DirectoryServiceRequest.h>
 #include <aws/ds/DirectoryServiceServiceClientModel.h>
+#include <aws/ds/DirectoryServiceWaiter.h>
 #include <aws/ds/DirectoryService_EXPORTS.h>
+#include <aws/ds/internal/DirectoryServiceEndpointRules.h>
 #include <aws/ds/model/ADAssessmentLimitExceededException.h>
 #include <aws/ds/model/AcceptSharedDirectoryRequest.h>
 #include <aws/ds/model/AcceptSharedDirectoryResult.h>
@@ -91,32 +95,41 @@
 #include <aws/ds/model/DescribeCAEnrollmentPolicyResult.h>
 #include <aws/ds/model/DescribeCertificateRequest.h>
 #include <aws/ds/model/DescribeCertificateResult.h>
+#include <aws/ds/model/DescribeClientAuthenticationSettingsPaginationTraits.h>
 #include <aws/ds/model/DescribeClientAuthenticationSettingsRequest.h>
 #include <aws/ds/model/DescribeClientAuthenticationSettingsResult.h>
 #include <aws/ds/model/DescribeConditionalForwardersRequest.h>
 #include <aws/ds/model/DescribeConditionalForwardersResult.h>
+#include <aws/ds/model/DescribeDirectoriesPaginationTraits.h>
 #include <aws/ds/model/DescribeDirectoriesRequest.h>
 #include <aws/ds/model/DescribeDirectoriesResult.h>
 #include <aws/ds/model/DescribeDirectoryDataAccessRequest.h>
 #include <aws/ds/model/DescribeDirectoryDataAccessResult.h>
+#include <aws/ds/model/DescribeDomainControllersPaginationTraits.h>
 #include <aws/ds/model/DescribeDomainControllersRequest.h>
 #include <aws/ds/model/DescribeDomainControllersResult.h>
 #include <aws/ds/model/DescribeEventTopicsRequest.h>
 #include <aws/ds/model/DescribeEventTopicsResult.h>
 #include <aws/ds/model/DescribeHybridADUpdateRequest.h>
 #include <aws/ds/model/DescribeHybridADUpdateResult.h>
+#include <aws/ds/model/DescribeLDAPSSettingsPaginationTraits.h>
 #include <aws/ds/model/DescribeLDAPSSettingsRequest.h>
 #include <aws/ds/model/DescribeLDAPSSettingsResult.h>
+#include <aws/ds/model/DescribeRegionsPaginationTraits.h>
 #include <aws/ds/model/DescribeRegionsRequest.h>
 #include <aws/ds/model/DescribeRegionsResult.h>
 #include <aws/ds/model/DescribeSettingsRequest.h>
 #include <aws/ds/model/DescribeSettingsResult.h>
+#include <aws/ds/model/DescribeSharedDirectoriesPaginationTraits.h>
 #include <aws/ds/model/DescribeSharedDirectoriesRequest.h>
 #include <aws/ds/model/DescribeSharedDirectoriesResult.h>
+#include <aws/ds/model/DescribeSnapshotsPaginationTraits.h>
 #include <aws/ds/model/DescribeSnapshotsRequest.h>
 #include <aws/ds/model/DescribeSnapshotsResult.h>
+#include <aws/ds/model/DescribeTrustsPaginationTraits.h>
 #include <aws/ds/model/DescribeTrustsRequest.h>
 #include <aws/ds/model/DescribeTrustsResult.h>
+#include <aws/ds/model/DescribeUpdateDirectoryPaginationTraits.h>
 #include <aws/ds/model/DescribeUpdateDirectoryRequest.h>
 #include <aws/ds/model/DescribeUpdateDirectoryResult.h>
 #include <aws/ds/model/DirectoryAlreadyInRegionException.h>
@@ -197,16 +210,22 @@
 #include <aws/ds/model/LDAPSSettingInfo.h>
 #include <aws/ds/model/LDAPSStatus.h>
 #include <aws/ds/model/LDAPSType.h>
+#include <aws/ds/model/ListADAssessmentsPaginationTraits.h>
 #include <aws/ds/model/ListADAssessmentsRequest.h>
 #include <aws/ds/model/ListADAssessmentsResult.h>
+#include <aws/ds/model/ListCertificatesPaginationTraits.h>
 #include <aws/ds/model/ListCertificatesRequest.h>
 #include <aws/ds/model/ListCertificatesResult.h>
+#include <aws/ds/model/ListIpRoutesPaginationTraits.h>
 #include <aws/ds/model/ListIpRoutesRequest.h>
 #include <aws/ds/model/ListIpRoutesResult.h>
+#include <aws/ds/model/ListLogSubscriptionsPaginationTraits.h>
 #include <aws/ds/model/ListLogSubscriptionsRequest.h>
 #include <aws/ds/model/ListLogSubscriptionsResult.h>
+#include <aws/ds/model/ListSchemaExtensionsPaginationTraits.h>
 #include <aws/ds/model/ListSchemaExtensionsRequest.h>
 #include <aws/ds/model/ListSchemaExtensionsResult.h>
+#include <aws/ds/model/ListTagsForResourcePaginationTraits.h>
 #include <aws/ds/model/ListTagsForResourceRequest.h>
 #include <aws/ds/model/ListTagsForResourceResult.h>
 #include <aws/ds/model/LogSubscription.h>
diff --git a/generated/tests/dsql-gen-tests/DSQLIncludeTests.cpp b/generated/tests/dsql-gen-tests/DSQLIncludeTests.cpp
index c64bc83aebc6..26a05b51f908 100644
--- a/generated/tests/dsql-gen-tests/DSQLIncludeTests.cpp
+++ b/generated/tests/dsql-gen-tests/DSQLIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/dsql/DSQLClient.h>
+#include <aws/dsql/DSQLClientPagination.h>
 #include <aws/dsql/DSQLEndpointProvider.h>
 #include <aws/dsql/DSQLErrorMarshaller.h>
 #include <aws/dsql/DSQLErrors.h>
+#include <aws/dsql/DSQLPaginationBase.h>
 #include <aws/dsql/DSQLRequest.h>
 #include <aws/dsql/DSQLServiceClientModel.h>
+#include <aws/dsql/DSQLWaiter.h>
 #include <aws/dsql/DSQL_EXPORTS.h>
+#include <aws/dsql/internal/DSQLEndpointRules.h>
 #include <aws/dsql/model/ClusterStatus.h>
 #include <aws/dsql/model/ClusterSummary.h>
 #include <aws/dsql/model/ConflictException.h>
@@ -39,8 +43,10 @@
 #include <aws/dsql/model/GetVpcEndpointServiceNameResult.h>
 #include <aws/dsql/model/InternalServerException.h>
 #include <aws/dsql/model/KinesisTargetDefinition.h>
+#include <aws/dsql/model/ListClustersPaginationTraits.h>
 #include <aws/dsql/model/ListClustersRequest.h>
 #include <aws/dsql/model/ListClustersResult.h>
+#include <aws/dsql/model/ListStreamsPaginationTraits.h>
 #include <aws/dsql/model/ListStreamsRequest.h>
 #include <aws/dsql/model/ListStreamsResult.h>
 #include <aws/dsql/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/dynamodb-gen-tests/DynamoDBIncludeTests.cpp b/generated/tests/dynamodb-gen-tests/DynamoDBIncludeTests.cpp
index d787fb7f1619..62c494bc7353 100644
--- a/generated/tests/dynamodb-gen-tests/DynamoDBIncludeTests.cpp
+++ b/generated/tests/dynamodb-gen-tests/DynamoDBIncludeTests.cpp
@@ -8,12 +8,16 @@
 
 #include <aws/dynamodb/DynamoDBClient.h>
 #include <aws/dynamodb/DynamoDBClientConfiguration.h>
+#include <aws/dynamodb/DynamoDBClientPagination.h>
 #include <aws/dynamodb/DynamoDBEndpointProvider.h>
 #include <aws/dynamodb/DynamoDBErrorMarshaller.h>
 #include <aws/dynamodb/DynamoDBErrors.h>
+#include <aws/dynamodb/DynamoDBPaginationBase.h>
 #include <aws/dynamodb/DynamoDBRequest.h>
 #include <aws/dynamodb/DynamoDBServiceClientModel.h>
+#include <aws/dynamodb/DynamoDBWaiter.h>
 #include <aws/dynamodb/DynamoDB_EXPORTS.h>
+#include <aws/dynamodb/internal/DynamoDBEndpointRules.h>
 #include <aws/dynamodb/model/ApproximateCreationDateTimePrecision.h>
 #include <aws/dynamodb/model/ArchivalSummary.h>
 #include <aws/dynamodb/model/AttributeAction.h>
@@ -169,14 +173,18 @@
 #include <aws/dynamodb/model/KinesisDataStreamDestination.h>
 #include <aws/dynamodb/model/ListBackupsRequest.h>
 #include <aws/dynamodb/model/ListBackupsResult.h>
+#include <aws/dynamodb/model/ListContributorInsightsPaginationTraits.h>
 #include <aws/dynamodb/model/ListContributorInsightsRequest.h>
 #include <aws/dynamodb/model/ListContributorInsightsResult.h>
+#include <aws/dynamodb/model/ListExportsPaginationTraits.h>
 #include <aws/dynamodb/model/ListExportsRequest.h>
 #include <aws/dynamodb/model/ListExportsResult.h>
 #include <aws/dynamodb/model/ListGlobalTablesRequest.h>
 #include <aws/dynamodb/model/ListGlobalTablesResult.h>
+#include <aws/dynamodb/model/ListImportsPaginationTraits.h>
 #include <aws/dynamodb/model/ListImportsRequest.h>
 #include <aws/dynamodb/model/ListImportsResult.h>
+#include <aws/dynamodb/model/ListTablesPaginationTraits.h>
 #include <aws/dynamodb/model/ListTablesRequest.h>
 #include <aws/dynamodb/model/ListTablesResult.h>
 #include <aws/dynamodb/model/ListTagsOfResourceRequest.h>
@@ -203,6 +211,7 @@
 #include <aws/dynamodb/model/PutRequest.h>
 #include <aws/dynamodb/model/PutResourcePolicyRequest.h>
 #include <aws/dynamodb/model/PutResourcePolicyResult.h>
+#include <aws/dynamodb/model/QueryPaginationTraits.h>
 #include <aws/dynamodb/model/QueryRequest.h>
 #include <aws/dynamodb/model/QueryResult.h>
 #include <aws/dynamodb/model/Replica.h>
@@ -237,6 +246,7 @@
 #include <aws/dynamodb/model/SSEStatus.h>
 #include <aws/dynamodb/model/SSEType.h>
 #include <aws/dynamodb/model/ScalarAttributeType.h>
+#include <aws/dynamodb/model/ScanPaginationTraits.h>
 #include <aws/dynamodb/model/ScanRequest.h>
 #include <aws/dynamodb/model/ScanResult.h>
 #include <aws/dynamodb/model/SearchResultItem.h>
diff --git a/generated/tests/dynamodbstreams-gen-tests/DynamoDBStreamsIncludeTests.cpp b/generated/tests/dynamodbstreams-gen-tests/DynamoDBStreamsIncludeTests.cpp
index 1051de90567b..caa655d73fdd 100644
--- a/generated/tests/dynamodbstreams-gen-tests/DynamoDBStreamsIncludeTests.cpp
+++ b/generated/tests/dynamodbstreams-gen-tests/DynamoDBStreamsIncludeTests.cpp
@@ -11,9 +11,12 @@
 #include <aws/dynamodbstreams/DynamoDBStreamsEndpointProvider.h>
 #include <aws/dynamodbstreams/DynamoDBStreamsErrorMarshaller.h>
 #include <aws/dynamodbstreams/DynamoDBStreamsErrors.h>
+#include <aws/dynamodbstreams/DynamoDBStreamsPaginationBase.h>
 #include <aws/dynamodbstreams/DynamoDBStreamsRequest.h>
 #include <aws/dynamodbstreams/DynamoDBStreamsServiceClientModel.h>
+#include <aws/dynamodbstreams/DynamoDBStreamsWaiter.h>
 #include <aws/dynamodbstreams/DynamoDBStreams_EXPORTS.h>
+#include <aws/dynamodbstreams/internal/DynamoDBStreamsEndpointRules.h>
 #include <aws/dynamodbstreams/model/AttributeValue.h>
 #include <aws/dynamodbstreams/model/DescribeStreamRequest.h>
 #include <aws/dynamodbstreams/model/DescribeStreamResult.h>
diff --git a/generated/tests/ebs-gen-tests/EBSIncludeTests.cpp b/generated/tests/ebs-gen-tests/EBSIncludeTests.cpp
index db2bc2db1a25..7b149c734c31 100644
--- a/generated/tests/ebs-gen-tests/EBSIncludeTests.cpp
+++ b/generated/tests/ebs-gen-tests/EBSIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/ebs/EBSClient.h>
+#include <aws/ebs/EBSClientPagination.h>
 #include <aws/ebs/EBSEndpointProvider.h>
 #include <aws/ebs/EBSErrorMarshaller.h>
 #include <aws/ebs/EBSErrors.h>
+#include <aws/ebs/EBSPaginationBase.h>
 #include <aws/ebs/EBSRequest.h>
 #include <aws/ebs/EBSServiceClientModel.h>
+#include <aws/ebs/EBSWaiter.h>
 #include <aws/ebs/EBS_EXPORTS.h>
+#include <aws/ebs/internal/EBSEndpointRules.h>
 #include <aws/ebs/model/AccessDeniedException.h>
 #include <aws/ebs/model/AccessDeniedExceptionReason.h>
 #include <aws/ebs/model/Block.h>
@@ -23,8 +27,10 @@
 #include <aws/ebs/model/CompleteSnapshotResult.h>
 #include <aws/ebs/model/GetSnapshotBlockRequest.h>
 #include <aws/ebs/model/GetSnapshotBlockResult.h>
+#include <aws/ebs/model/ListChangedBlocksPaginationTraits.h>
 #include <aws/ebs/model/ListChangedBlocksRequest.h>
 #include <aws/ebs/model/ListChangedBlocksResult.h>
+#include <aws/ebs/model/ListSnapshotBlocksPaginationTraits.h>
 #include <aws/ebs/model/ListSnapshotBlocksRequest.h>
 #include <aws/ebs/model/ListSnapshotBlocksResult.h>
 #include <aws/ebs/model/PutSnapshotBlockRequest.h>
diff --git a/generated/tests/ec2-gen-tests/EC2IncludeTests.cpp b/generated/tests/ec2-gen-tests/EC2IncludeTests.cpp
index 875770ae0e87..27ee22de928a 100644
--- a/generated/tests/ec2-gen-tests/EC2IncludeTests.cpp
+++ b/generated/tests/ec2-gen-tests/EC2IncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/ec2/EC2Client.h>
+#include <aws/ec2/EC2ClientPagination.h>
 #include <aws/ec2/EC2EndpointProvider.h>
 #include <aws/ec2/EC2ErrorMarshaller.h>
 #include <aws/ec2/EC2Errors.h>
+#include <aws/ec2/EC2PaginationBase.h>
 #include <aws/ec2/EC2Request.h>
 #include <aws/ec2/EC2ServiceClientModel.h>
+#include <aws/ec2/EC2Waiter.h>
 #include <aws/ec2/EC2_EXPORTS.h>
+#include <aws/ec2/internal/EC2EndpointRules.h>
 #include <aws/ec2/model/AcceleratorCount.h>
 #include <aws/ec2/model/AcceleratorCountRequest.h>
 #include <aws/ec2/model/AcceleratorManufacturer.h>
@@ -831,8 +835,10 @@
 #include <aws/ec2/model/DescribeAccountAttributesResponse.h>
 #include <aws/ec2/model/DescribeAccountVpcEncryptionControlRequest.h>
 #include <aws/ec2/model/DescribeAccountVpcEncryptionControlResponse.h>
+#include <aws/ec2/model/DescribeAddressTransfersPaginationTraits.h>
 #include <aws/ec2/model/DescribeAddressTransfersRequest.h>
 #include <aws/ec2/model/DescribeAddressTransfersResponse.h>
+#include <aws/ec2/model/DescribeAddressesAttributePaginationTraits.h>
 #include <aws/ec2/model/DescribeAddressesAttributeRequest.h>
 #include <aws/ec2/model/DescribeAddressesAttributeResponse.h>
 #include <aws/ec2/model/DescribeAddressesRequest.h>
@@ -847,48 +853,67 @@
 #include <aws/ec2/model/DescribeApplicationStatusResponse.h>
 #include <aws/ec2/model/DescribeAvailabilityZonesRequest.h>
 #include <aws/ec2/model/DescribeAvailabilityZonesResponse.h>
+#include <aws/ec2/model/DescribeAwsNetworkPerformanceMetricSubscriptionsPaginationTraits.h>
 #include <aws/ec2/model/DescribeAwsNetworkPerformanceMetricSubscriptionsRequest.h>
 #include <aws/ec2/model/DescribeAwsNetworkPerformanceMetricSubscriptionsResponse.h>
 #include <aws/ec2/model/DescribeBundleTasksRequest.h>
 #include <aws/ec2/model/DescribeBundleTasksResponse.h>
+#include <aws/ec2/model/DescribeByoipCidrsPaginationTraits.h>
 #include <aws/ec2/model/DescribeByoipCidrsRequest.h>
 #include <aws/ec2/model/DescribeByoipCidrsResponse.h>
+#include <aws/ec2/model/DescribeCapacityBlockExtensionHistoryPaginationTraits.h>
 #include <aws/ec2/model/DescribeCapacityBlockExtensionHistoryRequest.h>
 #include <aws/ec2/model/DescribeCapacityBlockExtensionHistoryResponse.h>
+#include <aws/ec2/model/DescribeCapacityBlockExtensionOfferingsPaginationTraits.h>
 #include <aws/ec2/model/DescribeCapacityBlockExtensionOfferingsRequest.h>
 #include <aws/ec2/model/DescribeCapacityBlockExtensionOfferingsResponse.h>
+#include <aws/ec2/model/DescribeCapacityBlockOfferingsPaginationTraits.h>
 #include <aws/ec2/model/DescribeCapacityBlockOfferingsRequest.h>
 #include <aws/ec2/model/DescribeCapacityBlockOfferingsResponse.h>
+#include <aws/ec2/model/DescribeCapacityBlockStatusPaginationTraits.h>
 #include <aws/ec2/model/DescribeCapacityBlockStatusRequest.h>
 #include <aws/ec2/model/DescribeCapacityBlockStatusResponse.h>
+#include <aws/ec2/model/DescribeCapacityBlocksPaginationTraits.h>
 #include <aws/ec2/model/DescribeCapacityBlocksRequest.h>
 #include <aws/ec2/model/DescribeCapacityBlocksResponse.h>
+#include <aws/ec2/model/DescribeCapacityManagerDataExportsPaginationTraits.h>
 #include <aws/ec2/model/DescribeCapacityManagerDataExportsRequest.h>
 #include <aws/ec2/model/DescribeCapacityManagerDataExportsResponse.h>
+#include <aws/ec2/model/DescribeCapacityReservationBillingRequestsPaginationTraits.h>
 #include <aws/ec2/model/DescribeCapacityReservationBillingRequestsRequest.h>
 #include <aws/ec2/model/DescribeCapacityReservationBillingRequestsResponse.h>
 #include <aws/ec2/model/DescribeCapacityReservationCancellationQuotesRequest.h>
 #include <aws/ec2/model/DescribeCapacityReservationCancellationQuotesResponse.h>
+#include <aws/ec2/model/DescribeCapacityReservationFleetsPaginationTraits.h>
 #include <aws/ec2/model/DescribeCapacityReservationFleetsRequest.h>
 #include <aws/ec2/model/DescribeCapacityReservationFleetsResponse.h>
 #include <aws/ec2/model/DescribeCapacityReservationTopologyRequest.h>
 #include <aws/ec2/model/DescribeCapacityReservationTopologyResponse.h>
+#include <aws/ec2/model/DescribeCapacityReservationsPaginationTraits.h>
 #include <aws/ec2/model/DescribeCapacityReservationsRequest.h>
 #include <aws/ec2/model/DescribeCapacityReservationsResponse.h>
+#include <aws/ec2/model/DescribeCarrierGatewaysPaginationTraits.h>
 #include <aws/ec2/model/DescribeCarrierGatewaysRequest.h>
 #include <aws/ec2/model/DescribeCarrierGatewaysResponse.h>
+#include <aws/ec2/model/DescribeClassicLinkInstancesPaginationTraits.h>
 #include <aws/ec2/model/DescribeClassicLinkInstancesRequest.h>
 #include <aws/ec2/model/DescribeClassicLinkInstancesResponse.h>
+#include <aws/ec2/model/DescribeClientVpnAuthorizationRulesPaginationTraits.h>
 #include <aws/ec2/model/DescribeClientVpnAuthorizationRulesRequest.h>
 #include <aws/ec2/model/DescribeClientVpnAuthorizationRulesResponse.h>
+#include <aws/ec2/model/DescribeClientVpnConnectionsPaginationTraits.h>
 #include <aws/ec2/model/DescribeClientVpnConnectionsRequest.h>
 #include <aws/ec2/model/DescribeClientVpnConnectionsResponse.h>
+#include <aws/ec2/model/DescribeClientVpnEndpointsPaginationTraits.h>
 #include <aws/ec2/model/DescribeClientVpnEndpointsRequest.h>
 #include <aws/ec2/model/DescribeClientVpnEndpointsResponse.h>
+#include <aws/ec2/model/DescribeClientVpnRoutesPaginationTraits.h>
 #include <aws/ec2/model/DescribeClientVpnRoutesRequest.h>
 #include <aws/ec2/model/DescribeClientVpnRoutesResponse.h>
+#include <aws/ec2/model/DescribeClientVpnTargetNetworksPaginationTraits.h>
 #include <aws/ec2/model/DescribeClientVpnTargetNetworksRequest.h>
 #include <aws/ec2/model/DescribeClientVpnTargetNetworksResponse.h>
+#include <aws/ec2/model/DescribeCoipPoolsPaginationTraits.h>
 #include <aws/ec2/model/DescribeCoipPoolsRequest.h>
 #include <aws/ec2/model/DescribeCoipPoolsResponse.h>
 #include <aws/ec2/model/DescribeConversionTasksRequest.h>
@@ -897,20 +922,25 @@
 #include <aws/ec2/model/DescribeCustomerGatewaysResponse.h>
 #include <aws/ec2/model/DescribeDeclarativePoliciesReportsRequest.h>
 #include <aws/ec2/model/DescribeDeclarativePoliciesReportsResponse.h>
+#include <aws/ec2/model/DescribeDhcpOptionsPaginationTraits.h>
 #include <aws/ec2/model/DescribeDhcpOptionsRequest.h>
 #include <aws/ec2/model/DescribeDhcpOptionsResponse.h>
+#include <aws/ec2/model/DescribeEgressOnlyInternetGatewaysPaginationTraits.h>
 #include <aws/ec2/model/DescribeEgressOnlyInternetGatewaysRequest.h>
 #include <aws/ec2/model/DescribeEgressOnlyInternetGatewaysResponse.h>
 #include <aws/ec2/model/DescribeElasticGpusRequest.h>
 #include <aws/ec2/model/DescribeElasticGpusResponse.h>
+#include <aws/ec2/model/DescribeExportImageTasksPaginationTraits.h>
 #include <aws/ec2/model/DescribeExportImageTasksRequest.h>
 #include <aws/ec2/model/DescribeExportImageTasksResponse.h>
 #include <aws/ec2/model/DescribeExportTasksRequest.h>
 #include <aws/ec2/model/DescribeExportTasksResponse.h>
+#include <aws/ec2/model/DescribeFastLaunchImagesPaginationTraits.h>
 #include <aws/ec2/model/DescribeFastLaunchImagesRequest.h>
 #include <aws/ec2/model/DescribeFastLaunchImagesResponse.h>
 #include <aws/ec2/model/DescribeFastLaunchImagesSuccessItem.h>
 #include <aws/ec2/model/DescribeFastSnapshotRestoreSuccessItem.h>
+#include <aws/ec2/model/DescribeFastSnapshotRestoresPaginationTraits.h>
 #include <aws/ec2/model/DescribeFastSnapshotRestoresRequest.h>
 #include <aws/ec2/model/DescribeFastSnapshotRestoresResponse.h>
 #include <aws/ec2/model/DescribeFleetError.h>
@@ -919,20 +949,27 @@
 #include <aws/ec2/model/DescribeFleetInstancesRequest.h>
 #include <aws/ec2/model/DescribeFleetInstancesResponse.h>
 #include <aws/ec2/model/DescribeFleetsInstances.h>
+#include <aws/ec2/model/DescribeFleetsPaginationTraits.h>
 #include <aws/ec2/model/DescribeFleetsRequest.h>
 #include <aws/ec2/model/DescribeFleetsResponse.h>
+#include <aws/ec2/model/DescribeFlowLogsPaginationTraits.h>
 #include <aws/ec2/model/DescribeFlowLogsRequest.h>
 #include <aws/ec2/model/DescribeFlowLogsResponse.h>
 #include <aws/ec2/model/DescribeFpgaImageAttributeRequest.h>
 #include <aws/ec2/model/DescribeFpgaImageAttributeResponse.h>
+#include <aws/ec2/model/DescribeFpgaImagesPaginationTraits.h>
 #include <aws/ec2/model/DescribeFpgaImagesRequest.h>
 #include <aws/ec2/model/DescribeFpgaImagesResponse.h>
+#include <aws/ec2/model/DescribeHostReservationOfferingsPaginationTraits.h>
 #include <aws/ec2/model/DescribeHostReservationOfferingsRequest.h>
 #include <aws/ec2/model/DescribeHostReservationOfferingsResponse.h>
+#include <aws/ec2/model/DescribeHostReservationsPaginationTraits.h>
 #include <aws/ec2/model/DescribeHostReservationsRequest.h>
 #include <aws/ec2/model/DescribeHostReservationsResponse.h>
+#include <aws/ec2/model/DescribeHostsPaginationTraits.h>
 #include <aws/ec2/model/DescribeHostsRequest.h>
 #include <aws/ec2/model/DescribeHostsResponse.h>
+#include <aws/ec2/model/DescribeIamInstanceProfileAssociationsPaginationTraits.h>
 #include <aws/ec2/model/DescribeIamInstanceProfileAssociationsRequest.h>
 #include <aws/ec2/model/DescribeIamInstanceProfileAssociationsResponse.h>
 #include <aws/ec2/model/DescribeIdFormatRequest.h>
@@ -941,44 +978,60 @@
 #include <aws/ec2/model/DescribeIdentityIdFormatResponse.h>
 #include <aws/ec2/model/DescribeImageAttributeRequest.h>
 #include <aws/ec2/model/DescribeImageAttributeResponse.h>
+#include <aws/ec2/model/DescribeImageReferencesPaginationTraits.h>
 #include <aws/ec2/model/DescribeImageReferencesRequest.h>
 #include <aws/ec2/model/DescribeImageReferencesResponse.h>
+#include <aws/ec2/model/DescribeImageUsageReportEntriesPaginationTraits.h>
 #include <aws/ec2/model/DescribeImageUsageReportEntriesRequest.h>
 #include <aws/ec2/model/DescribeImageUsageReportEntriesResponse.h>
+#include <aws/ec2/model/DescribeImageUsageReportsPaginationTraits.h>
 #include <aws/ec2/model/DescribeImageUsageReportsRequest.h>
 #include <aws/ec2/model/DescribeImageUsageReportsResponse.h>
+#include <aws/ec2/model/DescribeImagesPaginationTraits.h>
 #include <aws/ec2/model/DescribeImagesRequest.h>
 #include <aws/ec2/model/DescribeImagesResponse.h>
+#include <aws/ec2/model/DescribeImportImageTasksPaginationTraits.h>
 #include <aws/ec2/model/DescribeImportImageTasksRequest.h>
 #include <aws/ec2/model/DescribeImportImageTasksResponse.h>
+#include <aws/ec2/model/DescribeImportSnapshotTasksPaginationTraits.h>
 #include <aws/ec2/model/DescribeImportSnapshotTasksRequest.h>
 #include <aws/ec2/model/DescribeImportSnapshotTasksResponse.h>
 #include <aws/ec2/model/DescribeInstanceAttributeRequest.h>
 #include <aws/ec2/model/DescribeInstanceAttributeResponse.h>
+#include <aws/ec2/model/DescribeInstanceConnectEndpointsPaginationTraits.h>
 #include <aws/ec2/model/DescribeInstanceConnectEndpointsRequest.h>
 #include <aws/ec2/model/DescribeInstanceConnectEndpointsResponse.h>
+#include <aws/ec2/model/DescribeInstanceCreditSpecificationsPaginationTraits.h>
 #include <aws/ec2/model/DescribeInstanceCreditSpecificationsRequest.h>
 #include <aws/ec2/model/DescribeInstanceCreditSpecificationsResponse.h>
 #include <aws/ec2/model/DescribeInstanceEventNotificationAttributesRequest.h>
 #include <aws/ec2/model/DescribeInstanceEventNotificationAttributesResponse.h>
+#include <aws/ec2/model/DescribeInstanceEventWindowsPaginationTraits.h>
 #include <aws/ec2/model/DescribeInstanceEventWindowsRequest.h>
 #include <aws/ec2/model/DescribeInstanceEventWindowsResponse.h>
+#include <aws/ec2/model/DescribeInstanceImageMetadataPaginationTraits.h>
 #include <aws/ec2/model/DescribeInstanceImageMetadataRequest.h>
 #include <aws/ec2/model/DescribeInstanceImageMetadataResponse.h>
 #include <aws/ec2/model/DescribeInstanceSqlHaHistoryStatesRequest.h>
 #include <aws/ec2/model/DescribeInstanceSqlHaHistoryStatesResponse.h>
 #include <aws/ec2/model/DescribeInstanceSqlHaStatesRequest.h>
 #include <aws/ec2/model/DescribeInstanceSqlHaStatesResponse.h>
+#include <aws/ec2/model/DescribeInstanceStatusPaginationTraits.h>
 #include <aws/ec2/model/DescribeInstanceStatusRequest.h>
 #include <aws/ec2/model/DescribeInstanceStatusResponse.h>
+#include <aws/ec2/model/DescribeInstanceTopologyPaginationTraits.h>
 #include <aws/ec2/model/DescribeInstanceTopologyRequest.h>
 #include <aws/ec2/model/DescribeInstanceTopologyResponse.h>
+#include <aws/ec2/model/DescribeInstanceTypeOfferingsPaginationTraits.h>
 #include <aws/ec2/model/DescribeInstanceTypeOfferingsRequest.h>
 #include <aws/ec2/model/DescribeInstanceTypeOfferingsResponse.h>
+#include <aws/ec2/model/DescribeInstanceTypesPaginationTraits.h>
 #include <aws/ec2/model/DescribeInstanceTypesRequest.h>
 #include <aws/ec2/model/DescribeInstanceTypesResponse.h>
+#include <aws/ec2/model/DescribeInstancesPaginationTraits.h>
 #include <aws/ec2/model/DescribeInstancesRequest.h>
 #include <aws/ec2/model/DescribeInstancesResponse.h>
+#include <aws/ec2/model/DescribeInternetGatewaysPaginationTraits.h>
 #include <aws/ec2/model/DescribeInternetGatewaysRequest.h>
 #include <aws/ec2/model/DescribeInternetGatewaysResponse.h>
 #include <aws/ec2/model/DescribeIpamByoasnRequest.h>
@@ -989,124 +1042,173 @@
 #include <aws/ec2/model/DescribeIpamInternetRegistryAssociationsResponse.h>
 #include <aws/ec2/model/DescribeIpamPoliciesRequest.h>
 #include <aws/ec2/model/DescribeIpamPoliciesResponse.h>
+#include <aws/ec2/model/DescribeIpamPoolAllocationsPaginationTraits.h>
 #include <aws/ec2/model/DescribeIpamPoolAllocationsRequest.h>
 #include <aws/ec2/model/DescribeIpamPoolAllocationsResponse.h>
+#include <aws/ec2/model/DescribeIpamPoolsPaginationTraits.h>
 #include <aws/ec2/model/DescribeIpamPoolsRequest.h>
 #include <aws/ec2/model/DescribeIpamPoolsResponse.h>
+#include <aws/ec2/model/DescribeIpamPrefixListResolverTargetsPaginationTraits.h>
 #include <aws/ec2/model/DescribeIpamPrefixListResolverTargetsRequest.h>
 #include <aws/ec2/model/DescribeIpamPrefixListResolverTargetsResponse.h>
+#include <aws/ec2/model/DescribeIpamPrefixListResolversPaginationTraits.h>
 #include <aws/ec2/model/DescribeIpamPrefixListResolversRequest.h>
 #include <aws/ec2/model/DescribeIpamPrefixListResolversResponse.h>
+#include <aws/ec2/model/DescribeIpamResourceDiscoveriesPaginationTraits.h>
 #include <aws/ec2/model/DescribeIpamResourceDiscoveriesRequest.h>
 #include <aws/ec2/model/DescribeIpamResourceDiscoveriesResponse.h>
+#include <aws/ec2/model/DescribeIpamResourceDiscoveryAssociationsPaginationTraits.h>
 #include <aws/ec2/model/DescribeIpamResourceDiscoveryAssociationsRequest.h>
 #include <aws/ec2/model/DescribeIpamResourceDiscoveryAssociationsResponse.h>
+#include <aws/ec2/model/DescribeIpamScopesPaginationTraits.h>
 #include <aws/ec2/model/DescribeIpamScopesRequest.h>
 #include <aws/ec2/model/DescribeIpamScopesResponse.h>
+#include <aws/ec2/model/DescribeIpamsPaginationTraits.h>
 #include <aws/ec2/model/DescribeIpamsRequest.h>
 #include <aws/ec2/model/DescribeIpamsResponse.h>
+#include <aws/ec2/model/DescribeIpv6PoolsPaginationTraits.h>
 #include <aws/ec2/model/DescribeIpv6PoolsRequest.h>
 #include <aws/ec2/model/DescribeIpv6PoolsResponse.h>
 #include <aws/ec2/model/DescribeKeyPairsRequest.h>
 #include <aws/ec2/model/DescribeKeyPairsResponse.h>
+#include <aws/ec2/model/DescribeLaunchTemplateVersionsPaginationTraits.h>
 #include <aws/ec2/model/DescribeLaunchTemplateVersionsRequest.h>
 #include <aws/ec2/model/DescribeLaunchTemplateVersionsResponse.h>
+#include <aws/ec2/model/DescribeLaunchTemplatesPaginationTraits.h>
 #include <aws/ec2/model/DescribeLaunchTemplatesRequest.h>
 #include <aws/ec2/model/DescribeLaunchTemplatesResponse.h>
+#include <aws/ec2/model/DescribeLocalGatewayRouteTableVirtualInterfaceGroupAssociationsPaginationTraits.h>
 #include <aws/ec2/model/DescribeLocalGatewayRouteTableVirtualInterfaceGroupAssociationsRequest.h>
 #include <aws/ec2/model/DescribeLocalGatewayRouteTableVirtualInterfaceGroupAssociationsResponse.h>
+#include <aws/ec2/model/DescribeLocalGatewayRouteTableVpcAssociationsPaginationTraits.h>
 #include <aws/ec2/model/DescribeLocalGatewayRouteTableVpcAssociationsRequest.h>
 #include <aws/ec2/model/DescribeLocalGatewayRouteTableVpcAssociationsResponse.h>
+#include <aws/ec2/model/DescribeLocalGatewayRouteTablesPaginationTraits.h>
 #include <aws/ec2/model/DescribeLocalGatewayRouteTablesRequest.h>
 #include <aws/ec2/model/DescribeLocalGatewayRouteTablesResponse.h>
+#include <aws/ec2/model/DescribeLocalGatewayVirtualInterfaceGroupsPaginationTraits.h>
 #include <aws/ec2/model/DescribeLocalGatewayVirtualInterfaceGroupsRequest.h>
 #include <aws/ec2/model/DescribeLocalGatewayVirtualInterfaceGroupsResponse.h>
+#include <aws/ec2/model/DescribeLocalGatewayVirtualInterfacesPaginationTraits.h>
 #include <aws/ec2/model/DescribeLocalGatewayVirtualInterfacesRequest.h>
 #include <aws/ec2/model/DescribeLocalGatewayVirtualInterfacesResponse.h>
+#include <aws/ec2/model/DescribeLocalGatewaysPaginationTraits.h>
 #include <aws/ec2/model/DescribeLocalGatewaysRequest.h>
 #include <aws/ec2/model/DescribeLocalGatewaysResponse.h>
 #include <aws/ec2/model/DescribeLockedSnapshotsRequest.h>
 #include <aws/ec2/model/DescribeLockedSnapshotsResponse.h>
+#include <aws/ec2/model/DescribeMacHostsPaginationTraits.h>
 #include <aws/ec2/model/DescribeMacHostsRequest.h>
 #include <aws/ec2/model/DescribeMacHostsResponse.h>
+#include <aws/ec2/model/DescribeMacModificationTasksPaginationTraits.h>
 #include <aws/ec2/model/DescribeMacModificationTasksRequest.h>
 #include <aws/ec2/model/DescribeMacModificationTasksResponse.h>
+#include <aws/ec2/model/DescribeManagedPrefixListsPaginationTraits.h>
 #include <aws/ec2/model/DescribeManagedPrefixListsRequest.h>
 #include <aws/ec2/model/DescribeManagedPrefixListsResponse.h>
+#include <aws/ec2/model/DescribeMovingAddressesPaginationTraits.h>
 #include <aws/ec2/model/DescribeMovingAddressesRequest.h>
 #include <aws/ec2/model/DescribeMovingAddressesResponse.h>
+#include <aws/ec2/model/DescribeNatGatewaysPaginationTraits.h>
 #include <aws/ec2/model/DescribeNatGatewaysRequest.h>
 #include <aws/ec2/model/DescribeNatGatewaysResponse.h>
+#include <aws/ec2/model/DescribeNetworkAclsPaginationTraits.h>
 #include <aws/ec2/model/DescribeNetworkAclsRequest.h>
 #include <aws/ec2/model/DescribeNetworkAclsResponse.h>
+#include <aws/ec2/model/DescribeNetworkInsightsAccessScopeAnalysesPaginationTraits.h>
 #include <aws/ec2/model/DescribeNetworkInsightsAccessScopeAnalysesRequest.h>
 #include <aws/ec2/model/DescribeNetworkInsightsAccessScopeAnalysesResponse.h>
+#include <aws/ec2/model/DescribeNetworkInsightsAccessScopesPaginationTraits.h>
 #include <aws/ec2/model/DescribeNetworkInsightsAccessScopesRequest.h>
 #include <aws/ec2/model/DescribeNetworkInsightsAccessScopesResponse.h>
+#include <aws/ec2/model/DescribeNetworkInsightsAnalysesPaginationTraits.h>
 #include <aws/ec2/model/DescribeNetworkInsightsAnalysesRequest.h>
 #include <aws/ec2/model/DescribeNetworkInsightsAnalysesResponse.h>
+#include <aws/ec2/model/DescribeNetworkInsightsPathsPaginationTraits.h>
 #include <aws/ec2/model/DescribeNetworkInsightsPathsRequest.h>
 #include <aws/ec2/model/DescribeNetworkInsightsPathsResponse.h>
 #include <aws/ec2/model/DescribeNetworkInterfaceAttributeRequest.h>
 #include <aws/ec2/model/DescribeNetworkInterfaceAttributeResponse.h>
+#include <aws/ec2/model/DescribeNetworkInterfacePermissionsPaginationTraits.h>
 #include <aws/ec2/model/DescribeNetworkInterfacePermissionsRequest.h>
 #include <aws/ec2/model/DescribeNetworkInterfacePermissionsResponse.h>
+#include <aws/ec2/model/DescribeNetworkInterfacesPaginationTraits.h>
 #include <aws/ec2/model/DescribeNetworkInterfacesRequest.h>
 #include <aws/ec2/model/DescribeNetworkInterfacesResponse.h>
 #include <aws/ec2/model/DescribeOutpostLagsRequest.h>
 #include <aws/ec2/model/DescribeOutpostLagsResponse.h>
 #include <aws/ec2/model/DescribePlacementGroupsRequest.h>
 #include <aws/ec2/model/DescribePlacementGroupsResponse.h>
+#include <aws/ec2/model/DescribePrefixListsPaginationTraits.h>
 #include <aws/ec2/model/DescribePrefixListsRequest.h>
 #include <aws/ec2/model/DescribePrefixListsResponse.h>
+#include <aws/ec2/model/DescribePrincipalIdFormatPaginationTraits.h>
 #include <aws/ec2/model/DescribePrincipalIdFormatRequest.h>
 #include <aws/ec2/model/DescribePrincipalIdFormatResponse.h>
+#include <aws/ec2/model/DescribePublicIpv4PoolsPaginationTraits.h>
 #include <aws/ec2/model/DescribePublicIpv4PoolsRequest.h>
 #include <aws/ec2/model/DescribePublicIpv4PoolsResponse.h>
 #include <aws/ec2/model/DescribeRegionsRequest.h>
 #include <aws/ec2/model/DescribeRegionsResponse.h>
+#include <aws/ec2/model/DescribeReplaceRootVolumeTasksPaginationTraits.h>
 #include <aws/ec2/model/DescribeReplaceRootVolumeTasksRequest.h>
 #include <aws/ec2/model/DescribeReplaceRootVolumeTasksResponse.h>
 #include <aws/ec2/model/DescribeReservedInstancesListingsRequest.h>
 #include <aws/ec2/model/DescribeReservedInstancesListingsResponse.h>
+#include <aws/ec2/model/DescribeReservedInstancesModificationsPaginationTraits.h>
 #include <aws/ec2/model/DescribeReservedInstancesModificationsRequest.h>
 #include <aws/ec2/model/DescribeReservedInstancesModificationsResponse.h>
+#include <aws/ec2/model/DescribeReservedInstancesOfferingsPaginationTraits.h>
 #include <aws/ec2/model/DescribeReservedInstancesOfferingsRequest.h>
 #include <aws/ec2/model/DescribeReservedInstancesOfferingsResponse.h>
 #include <aws/ec2/model/DescribeReservedInstancesRequest.h>
 #include <aws/ec2/model/DescribeReservedInstancesResponse.h>
+#include <aws/ec2/model/DescribeRouteServerEndpointsPaginationTraits.h>
 #include <aws/ec2/model/DescribeRouteServerEndpointsRequest.h>
 #include <aws/ec2/model/DescribeRouteServerEndpointsResponse.h>
+#include <aws/ec2/model/DescribeRouteServerPeersPaginationTraits.h>
 #include <aws/ec2/model/DescribeRouteServerPeersRequest.h>
 #include <aws/ec2/model/DescribeRouteServerPeersResponse.h>
+#include <aws/ec2/model/DescribeRouteServersPaginationTraits.h>
 #include <aws/ec2/model/DescribeRouteServersRequest.h>
 #include <aws/ec2/model/DescribeRouteServersResponse.h>
+#include <aws/ec2/model/DescribeRouteTablesPaginationTraits.h>
 #include <aws/ec2/model/DescribeRouteTablesRequest.h>
 #include <aws/ec2/model/DescribeRouteTablesResponse.h>
+#include <aws/ec2/model/DescribeScheduledInstanceAvailabilityPaginationTraits.h>
 #include <aws/ec2/model/DescribeScheduledInstanceAvailabilityRequest.h>
 #include <aws/ec2/model/DescribeScheduledInstanceAvailabilityResponse.h>
+#include <aws/ec2/model/DescribeScheduledInstancesPaginationTraits.h>
 #include <aws/ec2/model/DescribeScheduledInstancesRequest.h>
 #include <aws/ec2/model/DescribeScheduledInstancesResponse.h>
+#include <aws/ec2/model/DescribeSecondaryInterfacesPaginationTraits.h>
 #include <aws/ec2/model/DescribeSecondaryInterfacesRequest.h>
 #include <aws/ec2/model/DescribeSecondaryInterfacesResponse.h>
+#include <aws/ec2/model/DescribeSecondaryNetworksPaginationTraits.h>
 #include <aws/ec2/model/DescribeSecondaryNetworksRequest.h>
 #include <aws/ec2/model/DescribeSecondaryNetworksResponse.h>
+#include <aws/ec2/model/DescribeSecondarySubnetsPaginationTraits.h>
 #include <aws/ec2/model/DescribeSecondarySubnetsRequest.h>
 #include <aws/ec2/model/DescribeSecondarySubnetsResponse.h>
 #include <aws/ec2/model/DescribeSecurityGroupReferencesRequest.h>
 #include <aws/ec2/model/DescribeSecurityGroupReferencesResponse.h>
+#include <aws/ec2/model/DescribeSecurityGroupRulesPaginationTraits.h>
 #include <aws/ec2/model/DescribeSecurityGroupRulesRequest.h>
 #include <aws/ec2/model/DescribeSecurityGroupRulesResponse.h>
+#include <aws/ec2/model/DescribeSecurityGroupVpcAssociationsPaginationTraits.h>
 #include <aws/ec2/model/DescribeSecurityGroupVpcAssociationsRequest.h>
 #include <aws/ec2/model/DescribeSecurityGroupVpcAssociationsResponse.h>
+#include <aws/ec2/model/DescribeSecurityGroupsPaginationTraits.h>
 #include <aws/ec2/model/DescribeSecurityGroupsRequest.h>
 #include <aws/ec2/model/DescribeSecurityGroupsResponse.h>
 #include <aws/ec2/model/DescribeServiceLinkVirtualInterfacesRequest.h>
 #include <aws/ec2/model/DescribeServiceLinkVirtualInterfacesResponse.h>
 #include <aws/ec2/model/DescribeSnapshotAttributeRequest.h>
 #include <aws/ec2/model/DescribeSnapshotAttributeResponse.h>
+#include <aws/ec2/model/DescribeSnapshotTierStatusPaginationTraits.h>
 #include <aws/ec2/model/DescribeSnapshotTierStatusRequest.h>
 #include <aws/ec2/model/DescribeSnapshotTierStatusResponse.h>
+#include <aws/ec2/model/DescribeSnapshotsPaginationTraits.h>
 #include <aws/ec2/model/DescribeSnapshotsRequest.h>
 #include <aws/ec2/model/DescribeSnapshotsResponse.h>
 #include <aws/ec2/model/DescribeSpotDatafeedSubscriptionRequest.h>
@@ -1115,68 +1217,97 @@
 #include <aws/ec2/model/DescribeSpotFleetInstancesResponse.h>
 #include <aws/ec2/model/DescribeSpotFleetRequestHistoryRequest.h>
 #include <aws/ec2/model/DescribeSpotFleetRequestHistoryResponse.h>
+#include <aws/ec2/model/DescribeSpotFleetRequestsPaginationTraits.h>
 #include <aws/ec2/model/DescribeSpotFleetRequestsRequest.h>
 #include <aws/ec2/model/DescribeSpotFleetRequestsResponse.h>
+#include <aws/ec2/model/DescribeSpotInstanceRequestsPaginationTraits.h>
 #include <aws/ec2/model/DescribeSpotInstanceRequestsRequest.h>
 #include <aws/ec2/model/DescribeSpotInstanceRequestsResponse.h>
+#include <aws/ec2/model/DescribeSpotPriceHistoryPaginationTraits.h>
 #include <aws/ec2/model/DescribeSpotPriceHistoryRequest.h>
 #include <aws/ec2/model/DescribeSpotPriceHistoryResponse.h>
+#include <aws/ec2/model/DescribeStaleSecurityGroupsPaginationTraits.h>
 #include <aws/ec2/model/DescribeStaleSecurityGroupsRequest.h>
 #include <aws/ec2/model/DescribeStaleSecurityGroupsResponse.h>
+#include <aws/ec2/model/DescribeStoreImageTasksPaginationTraits.h>
 #include <aws/ec2/model/DescribeStoreImageTasksRequest.h>
 #include <aws/ec2/model/DescribeStoreImageTasksResponse.h>
+#include <aws/ec2/model/DescribeSubnetsPaginationTraits.h>
 #include <aws/ec2/model/DescribeSubnetsRequest.h>
 #include <aws/ec2/model/DescribeSubnetsResponse.h>
+#include <aws/ec2/model/DescribeTagsPaginationTraits.h>
 #include <aws/ec2/model/DescribeTagsRequest.h>
 #include <aws/ec2/model/DescribeTagsResponse.h>
 #include <aws/ec2/model/DescribeTrafficMirrorFilterRulesRequest.h>
 #include <aws/ec2/model/DescribeTrafficMirrorFilterRulesResponse.h>
+#include <aws/ec2/model/DescribeTrafficMirrorFiltersPaginationTraits.h>
 #include <aws/ec2/model/DescribeTrafficMirrorFiltersRequest.h>
 #include <aws/ec2/model/DescribeTrafficMirrorFiltersResponse.h>
+#include <aws/ec2/model/DescribeTrafficMirrorSessionsPaginationTraits.h>
 #include <aws/ec2/model/DescribeTrafficMirrorSessionsRequest.h>
 #include <aws/ec2/model/DescribeTrafficMirrorSessionsResponse.h>
+#include <aws/ec2/model/DescribeTrafficMirrorTargetsPaginationTraits.h>
 #include <aws/ec2/model/DescribeTrafficMirrorTargetsRequest.h>
 #include <aws/ec2/model/DescribeTrafficMirrorTargetsResponse.h>
+#include <aws/ec2/model/DescribeTransitGatewayAttachmentsPaginationTraits.h>
 #include <aws/ec2/model/DescribeTransitGatewayAttachmentsRequest.h>
 #include <aws/ec2/model/DescribeTransitGatewayAttachmentsResponse.h>
+#include <aws/ec2/model/DescribeTransitGatewayConnectPeersPaginationTraits.h>
 #include <aws/ec2/model/DescribeTransitGatewayConnectPeersRequest.h>
 #include <aws/ec2/model/DescribeTransitGatewayConnectPeersResponse.h>
+#include <aws/ec2/model/DescribeTransitGatewayConnectsPaginationTraits.h>
 #include <aws/ec2/model/DescribeTransitGatewayConnectsRequest.h>
 #include <aws/ec2/model/DescribeTransitGatewayConnectsResponse.h>
 #include <aws/ec2/model/DescribeTransitGatewayMeteringPoliciesRequest.h>
 #include <aws/ec2/model/DescribeTransitGatewayMeteringPoliciesResponse.h>
+#include <aws/ec2/model/DescribeTransitGatewayMulticastDomainsPaginationTraits.h>
 #include <aws/ec2/model/DescribeTransitGatewayMulticastDomainsRequest.h>
 #include <aws/ec2/model/DescribeTransitGatewayMulticastDomainsResponse.h>
+#include <aws/ec2/model/DescribeTransitGatewayPeeringAttachmentsPaginationTraits.h>
 #include <aws/ec2/model/DescribeTransitGatewayPeeringAttachmentsRequest.h>
 #include <aws/ec2/model/DescribeTransitGatewayPeeringAttachmentsResponse.h>
+#include <aws/ec2/model/DescribeTransitGatewayPolicyTablesPaginationTraits.h>
 #include <aws/ec2/model/DescribeTransitGatewayPolicyTablesRequest.h>
 #include <aws/ec2/model/DescribeTransitGatewayPolicyTablesResponse.h>
+#include <aws/ec2/model/DescribeTransitGatewayRouteTableAnnouncementsPaginationTraits.h>
 #include <aws/ec2/model/DescribeTransitGatewayRouteTableAnnouncementsRequest.h>
 #include <aws/ec2/model/DescribeTransitGatewayRouteTableAnnouncementsResponse.h>
+#include <aws/ec2/model/DescribeTransitGatewayRouteTablesPaginationTraits.h>
 #include <aws/ec2/model/DescribeTransitGatewayRouteTablesRequest.h>
 #include <aws/ec2/model/DescribeTransitGatewayRouteTablesResponse.h>
+#include <aws/ec2/model/DescribeTransitGatewayVpcAttachmentsPaginationTraits.h>
 #include <aws/ec2/model/DescribeTransitGatewayVpcAttachmentsRequest.h>
 #include <aws/ec2/model/DescribeTransitGatewayVpcAttachmentsResponse.h>
+#include <aws/ec2/model/DescribeTransitGatewaysPaginationTraits.h>
 #include <aws/ec2/model/DescribeTransitGatewaysRequest.h>
 #include <aws/ec2/model/DescribeTransitGatewaysResponse.h>
+#include <aws/ec2/model/DescribeTrunkInterfaceAssociationsPaginationTraits.h>
 #include <aws/ec2/model/DescribeTrunkInterfaceAssociationsRequest.h>
 #include <aws/ec2/model/DescribeTrunkInterfaceAssociationsResponse.h>
+#include <aws/ec2/model/DescribeVerifiedAccessEndpointsPaginationTraits.h>
 #include <aws/ec2/model/DescribeVerifiedAccessEndpointsRequest.h>
 #include <aws/ec2/model/DescribeVerifiedAccessEndpointsResponse.h>
+#include <aws/ec2/model/DescribeVerifiedAccessGroupsPaginationTraits.h>
 #include <aws/ec2/model/DescribeVerifiedAccessGroupsRequest.h>
 #include <aws/ec2/model/DescribeVerifiedAccessGroupsResponse.h>
+#include <aws/ec2/model/DescribeVerifiedAccessInstanceLoggingConfigurationsPaginationTraits.h>
 #include <aws/ec2/model/DescribeVerifiedAccessInstanceLoggingConfigurationsRequest.h>
 #include <aws/ec2/model/DescribeVerifiedAccessInstanceLoggingConfigurationsResponse.h>
+#include <aws/ec2/model/DescribeVerifiedAccessInstancesPaginationTraits.h>
 #include <aws/ec2/model/DescribeVerifiedAccessInstancesRequest.h>
 #include <aws/ec2/model/DescribeVerifiedAccessInstancesResponse.h>
+#include <aws/ec2/model/DescribeVerifiedAccessTrustProvidersPaginationTraits.h>
 #include <aws/ec2/model/DescribeVerifiedAccessTrustProvidersRequest.h>
 #include <aws/ec2/model/DescribeVerifiedAccessTrustProvidersResponse.h>
 #include <aws/ec2/model/DescribeVolumeAttributeRequest.h>
 #include <aws/ec2/model/DescribeVolumeAttributeResponse.h>
+#include <aws/ec2/model/DescribeVolumeStatusPaginationTraits.h>
 #include <aws/ec2/model/DescribeVolumeStatusRequest.h>
 #include <aws/ec2/model/DescribeVolumeStatusResponse.h>
+#include <aws/ec2/model/DescribeVolumesModificationsPaginationTraits.h>
 #include <aws/ec2/model/DescribeVolumesModificationsRequest.h>
 #include <aws/ec2/model/DescribeVolumesModificationsResponse.h>
+#include <aws/ec2/model/DescribeVolumesPaginationTraits.h>
 #include <aws/ec2/model/DescribeVolumesRequest.h>
 #include <aws/ec2/model/DescribeVolumesResponse.h>
 #include <aws/ec2/model/DescribeVpcAttributeRequest.h>
@@ -1185,6 +1316,7 @@
 #include <aws/ec2/model/DescribeVpcBlockPublicAccessExclusionsResponse.h>
 #include <aws/ec2/model/DescribeVpcBlockPublicAccessOptionsRequest.h>
 #include <aws/ec2/model/DescribeVpcBlockPublicAccessOptionsResponse.h>
+#include <aws/ec2/model/DescribeVpcClassicLinkDnsSupportPaginationTraits.h>
 #include <aws/ec2/model/DescribeVpcClassicLinkDnsSupportRequest.h>
 #include <aws/ec2/model/DescribeVpcClassicLinkDnsSupportResponse.h>
 #include <aws/ec2/model/DescribeVpcClassicLinkRequest.h>
@@ -1193,22 +1325,30 @@
 #include <aws/ec2/model/DescribeVpcEncryptionControlsResponse.h>
 #include <aws/ec2/model/DescribeVpcEndpointAssociationsRequest.h>
 #include <aws/ec2/model/DescribeVpcEndpointAssociationsResponse.h>
+#include <aws/ec2/model/DescribeVpcEndpointConnectionNotificationsPaginationTraits.h>
 #include <aws/ec2/model/DescribeVpcEndpointConnectionNotificationsRequest.h>
 #include <aws/ec2/model/DescribeVpcEndpointConnectionNotificationsResponse.h>
+#include <aws/ec2/model/DescribeVpcEndpointConnectionsPaginationTraits.h>
 #include <aws/ec2/model/DescribeVpcEndpointConnectionsRequest.h>
 #include <aws/ec2/model/DescribeVpcEndpointConnectionsResponse.h>
+#include <aws/ec2/model/DescribeVpcEndpointServiceConfigurationsPaginationTraits.h>
 #include <aws/ec2/model/DescribeVpcEndpointServiceConfigurationsRequest.h>
 #include <aws/ec2/model/DescribeVpcEndpointServiceConfigurationsResponse.h>
+#include <aws/ec2/model/DescribeVpcEndpointServicePermissionsPaginationTraits.h>
 #include <aws/ec2/model/DescribeVpcEndpointServicePermissionsRequest.h>
 #include <aws/ec2/model/DescribeVpcEndpointServicePermissionsResponse.h>
 #include <aws/ec2/model/DescribeVpcEndpointServicesRequest.h>
 #include <aws/ec2/model/DescribeVpcEndpointServicesResponse.h>
+#include <aws/ec2/model/DescribeVpcEndpointsPaginationTraits.h>
 #include <aws/ec2/model/DescribeVpcEndpointsRequest.h>
 #include <aws/ec2/model/DescribeVpcEndpointsResponse.h>
+#include <aws/ec2/model/DescribeVpcPeeringConnectionsPaginationTraits.h>
 #include <aws/ec2/model/DescribeVpcPeeringConnectionsRequest.h>
 #include <aws/ec2/model/DescribeVpcPeeringConnectionsResponse.h>
+#include <aws/ec2/model/DescribeVpcsPaginationTraits.h>
 #include <aws/ec2/model/DescribeVpcsRequest.h>
 #include <aws/ec2/model/DescribeVpcsResponse.h>
+#include <aws/ec2/model/DescribeVpnConcentratorsPaginationTraits.h>
 #include <aws/ec2/model/DescribeVpnConcentratorsRequest.h>
 #include <aws/ec2/model/DescribeVpnConcentratorsResponse.h>
 #include <aws/ec2/model/DescribeVpnConnectionsRequest.h>
@@ -1517,16 +1657,21 @@
 #include <aws/ec2/model/GetAllowedImagesSettingsResponse.h>
 #include <aws/ec2/model/GetAssociatedEnclaveCertificateIamRolesRequest.h>
 #include <aws/ec2/model/GetAssociatedEnclaveCertificateIamRolesResponse.h>
+#include <aws/ec2/model/GetAssociatedIpv6PoolCidrsPaginationTraits.h>
 #include <aws/ec2/model/GetAssociatedIpv6PoolCidrsRequest.h>
 #include <aws/ec2/model/GetAssociatedIpv6PoolCidrsResponse.h>
+#include <aws/ec2/model/GetAwsNetworkPerformanceDataPaginationTraits.h>
 #include <aws/ec2/model/GetAwsNetworkPerformanceDataRequest.h>
 #include <aws/ec2/model/GetAwsNetworkPerformanceDataResponse.h>
 #include <aws/ec2/model/GetCapacityManagerAttributesRequest.h>
 #include <aws/ec2/model/GetCapacityManagerAttributesResponse.h>
+#include <aws/ec2/model/GetCapacityManagerMetricDataPaginationTraits.h>
 #include <aws/ec2/model/GetCapacityManagerMetricDataRequest.h>
 #include <aws/ec2/model/GetCapacityManagerMetricDataResponse.h>
+#include <aws/ec2/model/GetCapacityManagerMetricDimensionsPaginationTraits.h>
 #include <aws/ec2/model/GetCapacityManagerMetricDimensionsRequest.h>
 #include <aws/ec2/model/GetCapacityManagerMetricDimensionsResponse.h>
+#include <aws/ec2/model/GetCapacityManagerMonitoredTagKeysPaginationTraits.h>
 #include <aws/ec2/model/GetCapacityManagerMonitoredTagKeysRequest.h>
 #include <aws/ec2/model/GetCapacityManagerMonitoredTagKeysResponse.h>
 #include <aws/ec2/model/GetCapacityReservationUsageRequest.h>
@@ -1549,6 +1694,7 @@
 #include <aws/ec2/model/GetEnabledIpamPolicyResponse.h>
 #include <aws/ec2/model/GetFlowLogsIntegrationTemplateRequest.h>
 #include <aws/ec2/model/GetFlowLogsIntegrationTemplateResponse.h>
+#include <aws/ec2/model/GetGroupsForCapacityReservationPaginationTraits.h>
 #include <aws/ec2/model/GetGroupsForCapacityReservationRequest.h>
 #include <aws/ec2/model/GetGroupsForCapacityReservationResponse.h>
 #include <aws/ec2/model/GetHostReservationPurchasePreviewRequest.h>
@@ -1561,16 +1707,20 @@
 #include <aws/ec2/model/GetInstanceMetadataDefaultsResponse.h>
 #include <aws/ec2/model/GetInstanceTpmEkPubRequest.h>
 #include <aws/ec2/model/GetInstanceTpmEkPubResponse.h>
+#include <aws/ec2/model/GetInstanceTypesFromInstanceRequirementsPaginationTraits.h>
 #include <aws/ec2/model/GetInstanceTypesFromInstanceRequirementsRequest.h>
 #include <aws/ec2/model/GetInstanceTypesFromInstanceRequirementsResponse.h>
 #include <aws/ec2/model/GetInstanceUefiDataRequest.h>
 #include <aws/ec2/model/GetInstanceUefiDataResponse.h>
+#include <aws/ec2/model/GetIpamAddressHistoryPaginationTraits.h>
 #include <aws/ec2/model/GetIpamAddressHistoryRequest.h>
 #include <aws/ec2/model/GetIpamAddressHistoryResponse.h>
+#include <aws/ec2/model/GetIpamDiscoveredAccountsPaginationTraits.h>
 #include <aws/ec2/model/GetIpamDiscoveredAccountsRequest.h>
 #include <aws/ec2/model/GetIpamDiscoveredAccountsResponse.h>
 #include <aws/ec2/model/GetIpamDiscoveredPublicAddressesRequest.h>
 #include <aws/ec2/model/GetIpamDiscoveredPublicAddressesResponse.h>
+#include <aws/ec2/model/GetIpamDiscoveredResourceCidrsPaginationTraits.h>
 #include <aws/ec2/model/GetIpamDiscoveredResourceCidrsRequest.h>
 #include <aws/ec2/model/GetIpamDiscoveredResourceCidrsResponse.h>
 #include <aws/ec2/model/GetIpamDiscoveredRoutesRequest.h>
@@ -1583,16 +1733,22 @@
 #include <aws/ec2/model/GetIpamPolicyAllocationRulesResponse.h>
 #include <aws/ec2/model/GetIpamPolicyOrganizationTargetsRequest.h>
 #include <aws/ec2/model/GetIpamPolicyOrganizationTargetsResponse.h>
+#include <aws/ec2/model/GetIpamPoolAllocationsPaginationTraits.h>
 #include <aws/ec2/model/GetIpamPoolAllocationsRequest.h>
 #include <aws/ec2/model/GetIpamPoolAllocationsResponse.h>
+#include <aws/ec2/model/GetIpamPoolCidrsPaginationTraits.h>
 #include <aws/ec2/model/GetIpamPoolCidrsRequest.h>
 #include <aws/ec2/model/GetIpamPoolCidrsResponse.h>
+#include <aws/ec2/model/GetIpamPrefixListResolverRulesPaginationTraits.h>
 #include <aws/ec2/model/GetIpamPrefixListResolverRulesRequest.h>
 #include <aws/ec2/model/GetIpamPrefixListResolverRulesResponse.h>
+#include <aws/ec2/model/GetIpamPrefixListResolverVersionEntriesPaginationTraits.h>
 #include <aws/ec2/model/GetIpamPrefixListResolverVersionEntriesRequest.h>
 #include <aws/ec2/model/GetIpamPrefixListResolverVersionEntriesResponse.h>
+#include <aws/ec2/model/GetIpamPrefixListResolverVersionsPaginationTraits.h>
 #include <aws/ec2/model/GetIpamPrefixListResolverVersionsRequest.h>
 #include <aws/ec2/model/GetIpamPrefixListResolverVersionsResponse.h>
+#include <aws/ec2/model/GetIpamResourceCidrsPaginationTraits.h>
 #include <aws/ec2/model/GetIpamResourceCidrsRequest.h>
 #include <aws/ec2/model/GetIpamResourceCidrsResponse.h>
 #include <aws/ec2/model/GetIpamRouteOriginAuthorizationsRequest.h>
@@ -1605,12 +1761,15 @@
 #include <aws/ec2/model/GetIpamRoutingPolicyRegistrationsResponse.h>
 #include <aws/ec2/model/GetLaunchTemplateDataRequest.h>
 #include <aws/ec2/model/GetLaunchTemplateDataResponse.h>
+#include <aws/ec2/model/GetManagedPrefixListAssociationsPaginationTraits.h>
 #include <aws/ec2/model/GetManagedPrefixListAssociationsRequest.h>
 #include <aws/ec2/model/GetManagedPrefixListAssociationsResponse.h>
+#include <aws/ec2/model/GetManagedPrefixListEntriesPaginationTraits.h>
 #include <aws/ec2/model/GetManagedPrefixListEntriesRequest.h>
 #include <aws/ec2/model/GetManagedPrefixListEntriesResponse.h>
 #include <aws/ec2/model/GetManagedResourceVisibilityRequest.h>
 #include <aws/ec2/model/GetManagedResourceVisibilityResponse.h>
+#include <aws/ec2/model/GetNetworkInsightsAccessScopeAnalysisFindingsPaginationTraits.h>
 #include <aws/ec2/model/GetNetworkInsightsAccessScopeAnalysisFindingsRequest.h>
 #include <aws/ec2/model/GetNetworkInsightsAccessScopeAnalysisFindingsResponse.h>
 #include <aws/ec2/model/GetNetworkInsightsAccessScopeContentRequest.h>
@@ -1625,30 +1784,39 @@
 #include <aws/ec2/model/GetRouteServerPropagationsResponse.h>
 #include <aws/ec2/model/GetRouteServerRoutingDatabaseRequest.h>
 #include <aws/ec2/model/GetRouteServerRoutingDatabaseResponse.h>
+#include <aws/ec2/model/GetSecurityGroupsForVpcPaginationTraits.h>
 #include <aws/ec2/model/GetSecurityGroupsForVpcRequest.h>
 #include <aws/ec2/model/GetSecurityGroupsForVpcResponse.h>
 #include <aws/ec2/model/GetSerialConsoleAccessStatusRequest.h>
 #include <aws/ec2/model/GetSerialConsoleAccessStatusResponse.h>
 #include <aws/ec2/model/GetSnapshotBlockPublicAccessStateRequest.h>
 #include <aws/ec2/model/GetSnapshotBlockPublicAccessStateResponse.h>
+#include <aws/ec2/model/GetSpotPlacementScoresPaginationTraits.h>
 #include <aws/ec2/model/GetSpotPlacementScoresRequest.h>
 #include <aws/ec2/model/GetSpotPlacementScoresResponse.h>
 #include <aws/ec2/model/GetSubnetCidrReservationsRequest.h>
 #include <aws/ec2/model/GetSubnetCidrReservationsResponse.h>
+#include <aws/ec2/model/GetTransitGatewayAttachmentPropagationsPaginationTraits.h>
 #include <aws/ec2/model/GetTransitGatewayAttachmentPropagationsRequest.h>
 #include <aws/ec2/model/GetTransitGatewayAttachmentPropagationsResponse.h>
 #include <aws/ec2/model/GetTransitGatewayMeteringPolicyEntriesRequest.h>
 #include <aws/ec2/model/GetTransitGatewayMeteringPolicyEntriesResponse.h>
+#include <aws/ec2/model/GetTransitGatewayMulticastDomainAssociationsPaginationTraits.h>
 #include <aws/ec2/model/GetTransitGatewayMulticastDomainAssociationsRequest.h>
 #include <aws/ec2/model/GetTransitGatewayMulticastDomainAssociationsResponse.h>
+#include <aws/ec2/model/GetTransitGatewayPolicyTableAssociationsPaginationTraits.h>
 #include <aws/ec2/model/GetTransitGatewayPolicyTableAssociationsRequest.h>
 #include <aws/ec2/model/GetTransitGatewayPolicyTableAssociationsResponse.h>
+#include <aws/ec2/model/GetTransitGatewayPolicyTableEntriesPaginationTraits.h>
 #include <aws/ec2/model/GetTransitGatewayPolicyTableEntriesRequest.h>
 #include <aws/ec2/model/GetTransitGatewayPolicyTableEntriesResponse.h>
+#include <aws/ec2/model/GetTransitGatewayPrefixListReferencesPaginationTraits.h>
 #include <aws/ec2/model/GetTransitGatewayPrefixListReferencesRequest.h>
 #include <aws/ec2/model/GetTransitGatewayPrefixListReferencesResponse.h>
+#include <aws/ec2/model/GetTransitGatewayRouteTableAssociationsPaginationTraits.h>
 #include <aws/ec2/model/GetTransitGatewayRouteTableAssociationsRequest.h>
 #include <aws/ec2/model/GetTransitGatewayRouteTableAssociationsResponse.h>
+#include <aws/ec2/model/GetTransitGatewayRouteTablePropagationsPaginationTraits.h>
 #include <aws/ec2/model/GetTransitGatewayRouteTablePropagationsRequest.h>
 #include <aws/ec2/model/GetTransitGatewayRouteTablePropagationsResponse.h>
 #include <aws/ec2/model/GetVerifiedAccessEndpointPolicyRequest.h>
@@ -1661,6 +1829,7 @@
 #include <aws/ec2/model/GetVpcResourcesBlockingEncryptionEnforcementResponse.h>
 #include <aws/ec2/model/GetVpnConnectionDeviceSampleConfigurationRequest.h>
 #include <aws/ec2/model/GetVpnConnectionDeviceSampleConfigurationResponse.h>
+#include <aws/ec2/model/GetVpnConnectionDeviceTypesPaginationTraits.h>
 #include <aws/ec2/model/GetVpnConnectionDeviceTypesRequest.h>
 #include <aws/ec2/model/GetVpnConnectionDeviceTypesResponse.h>
 #include <aws/ec2/model/GetVpnTunnelReplacementStatusRequest.h>
@@ -2021,8 +2190,10 @@
 #include <aws/ec2/model/LaunchTemplatesMonitoringRequest.h>
 #include <aws/ec2/model/LicenseConfiguration.h>
 #include <aws/ec2/model/LicenseConfigurationRequest.h>
+#include <aws/ec2/model/ListImagesInRecycleBinPaginationTraits.h>
 #include <aws/ec2/model/ListImagesInRecycleBinRequest.h>
 #include <aws/ec2/model/ListImagesInRecycleBinResponse.h>
+#include <aws/ec2/model/ListSnapshotsInRecycleBinPaginationTraits.h>
 #include <aws/ec2/model/ListSnapshotsInRecycleBinRequest.h>
 #include <aws/ec2/model/ListSnapshotsInRecycleBinResponse.h>
 #include <aws/ec2/model/ListVolumesInRecycleBinRequest.h>
@@ -2602,10 +2773,13 @@
 #include <aws/ec2/model/ScheduledInstancesPlacement.h>
 #include <aws/ec2/model/ScheduledInstancesPrivateIpAddressConfig.h>
 #include <aws/ec2/model/Scope.h>
+#include <aws/ec2/model/SearchLocalGatewayRoutesPaginationTraits.h>
 #include <aws/ec2/model/SearchLocalGatewayRoutesRequest.h>
 #include <aws/ec2/model/SearchLocalGatewayRoutesResponse.h>
+#include <aws/ec2/model/SearchTransitGatewayMulticastGroupsPaginationTraits.h>
 #include <aws/ec2/model/SearchTransitGatewayMulticastGroupsRequest.h>
 #include <aws/ec2/model/SearchTransitGatewayMulticastGroupsResponse.h>
+#include <aws/ec2/model/SearchTransitGatewayRoutesPaginationTraits.h>
 #include <aws/ec2/model/SearchTransitGatewayRoutesRequest.h>
 #include <aws/ec2/model/SearchTransitGatewayRoutesResponse.h>
 #include <aws/ec2/model/SecondaryInterface.h>
diff --git a/generated/tests/ec2-instance-connect-gen-tests/EC2InstanceConnectIncludeTests.cpp b/generated/tests/ec2-instance-connect-gen-tests/EC2InstanceConnectIncludeTests.cpp
index 4fa487a1effe..133b2cfa3476 100644
--- a/generated/tests/ec2-instance-connect-gen-tests/EC2InstanceConnectIncludeTests.cpp
+++ b/generated/tests/ec2-instance-connect-gen-tests/EC2InstanceConnectIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/ec2-instance-connect/EC2InstanceConnectEndpointProvider.h>
 #include <aws/ec2-instance-connect/EC2InstanceConnectErrorMarshaller.h>
 #include <aws/ec2-instance-connect/EC2InstanceConnectErrors.h>
+#include <aws/ec2-instance-connect/EC2InstanceConnectPaginationBase.h>
 #include <aws/ec2-instance-connect/EC2InstanceConnectRequest.h>
 #include <aws/ec2-instance-connect/EC2InstanceConnectServiceClientModel.h>
+#include <aws/ec2-instance-connect/EC2InstanceConnectWaiter.h>
 #include <aws/ec2-instance-connect/EC2InstanceConnect_EXPORTS.h>
+#include <aws/ec2-instance-connect/internal/EC2InstanceConnectEndpointRules.h>
 #include <aws/ec2-instance-connect/model/SendSSHPublicKeyRequest.h>
 #include <aws/ec2-instance-connect/model/SendSSHPublicKeyResult.h>
 #include <aws/ec2-instance-connect/model/SendSerialConsoleSSHPublicKeyRequest.h>
diff --git a/generated/tests/ecr-gen-tests/ECRIncludeTests.cpp b/generated/tests/ecr-gen-tests/ECRIncludeTests.cpp
index b5fa5bd1ded1..f772ea7a3d99 100644
--- a/generated/tests/ecr-gen-tests/ECRIncludeTests.cpp
+++ b/generated/tests/ecr-gen-tests/ECRIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/ecr/ECRClient.h>
+#include <aws/ecr/ECRClientPagination.h>
 #include <aws/ecr/ECREndpointProvider.h>
 #include <aws/ecr/ECRErrorMarshaller.h>
 #include <aws/ecr/ECRErrors.h>
+#include <aws/ecr/ECRPaginationBase.h>
 #include <aws/ecr/ECRRequest.h>
 #include <aws/ecr/ECRServiceClientModel.h>
+#include <aws/ecr/ECRWaiter.h>
 #include <aws/ecr/ECR_EXPORTS.h>
+#include <aws/ecr/internal/ECREndpointRules.h>
 #include <aws/ecr/model/ArtifactStatus.h>
 #include <aws/ecr/model/ArtifactStatusFilter.h>
 #include <aws/ecr/model/Attribute.h>
@@ -55,19 +59,24 @@
 #include <aws/ecr/model/DeregisterPullTimeUpdateExclusionResult.h>
 #include <aws/ecr/model/DescribeImageReplicationStatusRequest.h>
 #include <aws/ecr/model/DescribeImageReplicationStatusResult.h>
+#include <aws/ecr/model/DescribeImageScanFindingsPaginationTraits.h>
 #include <aws/ecr/model/DescribeImageScanFindingsRequest.h>
 #include <aws/ecr/model/DescribeImageScanFindingsResult.h>
 #include <aws/ecr/model/DescribeImageSigningStatusRequest.h>
 #include <aws/ecr/model/DescribeImageSigningStatusResult.h>
 #include <aws/ecr/model/DescribeImagesFilter.h>
+#include <aws/ecr/model/DescribeImagesPaginationTraits.h>
 #include <aws/ecr/model/DescribeImagesRequest.h>
 #include <aws/ecr/model/DescribeImagesResult.h>
+#include <aws/ecr/model/DescribePullThroughCacheRulesPaginationTraits.h>
 #include <aws/ecr/model/DescribePullThroughCacheRulesRequest.h>
 #include <aws/ecr/model/DescribePullThroughCacheRulesResult.h>
 #include <aws/ecr/model/DescribeRegistryRequest.h>
 #include <aws/ecr/model/DescribeRegistryResult.h>
+#include <aws/ecr/model/DescribeRepositoriesPaginationTraits.h>
 #include <aws/ecr/model/DescribeRepositoriesRequest.h>
 #include <aws/ecr/model/DescribeRepositoriesResult.h>
+#include <aws/ecr/model/DescribeRepositoryCreationTemplatesPaginationTraits.h>
 #include <aws/ecr/model/DescribeRepositoryCreationTemplatesRequest.h>
 #include <aws/ecr/model/DescribeRepositoryCreationTemplatesResult.h>
 #include <aws/ecr/model/EncryptionConfiguration.h>
@@ -81,6 +90,7 @@
 #include <aws/ecr/model/GetAuthorizationTokenResult.h>
 #include <aws/ecr/model/GetDownloadUrlForLayerRequest.h>
 #include <aws/ecr/model/GetDownloadUrlForLayerResult.h>
+#include <aws/ecr/model/GetLifecyclePolicyPreviewPaginationTraits.h>
 #include <aws/ecr/model/GetLifecyclePolicyPreviewRequest.h>
 #include <aws/ecr/model/GetLifecyclePolicyPreviewResult.h>
 #include <aws/ecr/model/GetLifecyclePolicyRequest.h>
@@ -131,6 +141,7 @@
 #include <aws/ecr/model/ListImageReferrersRequest.h>
 #include <aws/ecr/model/ListImageReferrersResult.h>
 #include <aws/ecr/model/ListImagesFilter.h>
+#include <aws/ecr/model/ListImagesPaginationTraits.h>
 #include <aws/ecr/model/ListImagesRequest.h>
 #include <aws/ecr/model/ListImagesResult.h>
 #include <aws/ecr/model/ListPullTimeUpdateExclusionsRequest.h>
diff --git a/generated/tests/ecr-public-gen-tests/ECRPublicIncludeTests.cpp b/generated/tests/ecr-public-gen-tests/ECRPublicIncludeTests.cpp
index 207b55dc8861..991e13b560fc 100644
--- a/generated/tests/ecr-public-gen-tests/ECRPublicIncludeTests.cpp
+++ b/generated/tests/ecr-public-gen-tests/ECRPublicIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/ecr-public/ECRPublicClient.h>
+#include <aws/ecr-public/ECRPublicClientPagination.h>
 #include <aws/ecr-public/ECRPublicEndpointProvider.h>
 #include <aws/ecr-public/ECRPublicErrorMarshaller.h>
 #include <aws/ecr-public/ECRPublicErrors.h>
+#include <aws/ecr-public/ECRPublicPaginationBase.h>
 #include <aws/ecr-public/ECRPublicRequest.h>
 #include <aws/ecr-public/ECRPublicServiceClientModel.h>
+#include <aws/ecr-public/ECRPublicWaiter.h>
 #include <aws/ecr-public/ECRPublic_EXPORTS.h>
+#include <aws/ecr-public/internal/ECRPublicEndpointRules.h>
 #include <aws/ecr-public/model/AuthorizationData.h>
 #include <aws/ecr-public/model/BatchCheckLayerAvailabilityRequest.h>
 #include <aws/ecr-public/model/BatchCheckLayerAvailabilityResult.h>
@@ -26,12 +30,16 @@
 #include <aws/ecr-public/model/DeleteRepositoryPolicyResult.h>
 #include <aws/ecr-public/model/DeleteRepositoryRequest.h>
 #include <aws/ecr-public/model/DeleteRepositoryResult.h>
+#include <aws/ecr-public/model/DescribeImageTagsPaginationTraits.h>
 #include <aws/ecr-public/model/DescribeImageTagsRequest.h>
 #include <aws/ecr-public/model/DescribeImageTagsResult.h>
+#include <aws/ecr-public/model/DescribeImagesPaginationTraits.h>
 #include <aws/ecr-public/model/DescribeImagesRequest.h>
 #include <aws/ecr-public/model/DescribeImagesResult.h>
+#include <aws/ecr-public/model/DescribeRegistriesPaginationTraits.h>
 #include <aws/ecr-public/model/DescribeRegistriesRequest.h>
 #include <aws/ecr-public/model/DescribeRegistriesResult.h>
+#include <aws/ecr-public/model/DescribeRepositoriesPaginationTraits.h>
 #include <aws/ecr-public/model/DescribeRepositoriesRequest.h>
 #include <aws/ecr-public/model/DescribeRepositoriesResult.h>
 #include <aws/ecr-public/model/GetAuthorizationTokenRequest.h>
diff --git a/generated/tests/ecs-gen-tests/ECSIncludeTests.cpp b/generated/tests/ecs-gen-tests/ECSIncludeTests.cpp
index 2054a4370f5c..53670be9047f 100644
--- a/generated/tests/ecs-gen-tests/ECSIncludeTests.cpp
+++ b/generated/tests/ecs-gen-tests/ECSIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/ecs/ECSClient.h>
+#include <aws/ecs/ECSClientPagination.h>
 #include <aws/ecs/ECSEndpointProvider.h>
 #include <aws/ecs/ECSErrorMarshaller.h>
 #include <aws/ecs/ECSErrors.h>
+#include <aws/ecs/ECSPaginationBase.h>
 #include <aws/ecs/ECSRequest.h>
 #include <aws/ecs/ECSServiceClientModel.h>
+#include <aws/ecs/ECSWaiter.h>
 #include <aws/ecs/ECS_EXPORTS.h>
+#include <aws/ecs/internal/ECSEndpointRules.h>
 #include <aws/ecs/model/AcceleratorCountRequest.h>
 #include <aws/ecs/model/AcceleratorManufacturer.h>
 #include <aws/ecs/model/AcceleratorName.h>
@@ -242,12 +246,16 @@
 #include <aws/ecs/model/LaunchType.h>
 #include <aws/ecs/model/LinearConfiguration.h>
 #include <aws/ecs/model/LinuxParameters.h>
+#include <aws/ecs/model/ListAccountSettingsPaginationTraits.h>
 #include <aws/ecs/model/ListAccountSettingsRequest.h>
 #include <aws/ecs/model/ListAccountSettingsResult.h>
+#include <aws/ecs/model/ListAttributesPaginationTraits.h>
 #include <aws/ecs/model/ListAttributesRequest.h>
 #include <aws/ecs/model/ListAttributesResult.h>
+#include <aws/ecs/model/ListClustersPaginationTraits.h>
 #include <aws/ecs/model/ListClustersRequest.h>
 #include <aws/ecs/model/ListClustersResult.h>
+#include <aws/ecs/model/ListContainerInstancesPaginationTraits.h>
 #include <aws/ecs/model/ListContainerInstancesRequest.h>
 #include <aws/ecs/model/ListContainerInstancesResult.h>
 #include <aws/ecs/model/ListDaemonDeploymentsRequest.h>
@@ -258,16 +266,21 @@
 #include <aws/ecs/model/ListDaemonsResult.h>
 #include <aws/ecs/model/ListServiceDeploymentsRequest.h>
 #include <aws/ecs/model/ListServiceDeploymentsResult.h>
+#include <aws/ecs/model/ListServicesByNamespacePaginationTraits.h>
 #include <aws/ecs/model/ListServicesByNamespaceRequest.h>
 #include <aws/ecs/model/ListServicesByNamespaceResult.h>
+#include <aws/ecs/model/ListServicesPaginationTraits.h>
 #include <aws/ecs/model/ListServicesRequest.h>
 #include <aws/ecs/model/ListServicesResult.h>
 #include <aws/ecs/model/ListTagsForResourceRequest.h>
 #include <aws/ecs/model/ListTagsForResourceResult.h>
+#include <aws/ecs/model/ListTaskDefinitionFamiliesPaginationTraits.h>
 #include <aws/ecs/model/ListTaskDefinitionFamiliesRequest.h>
 #include <aws/ecs/model/ListTaskDefinitionFamiliesResult.h>
+#include <aws/ecs/model/ListTaskDefinitionsPaginationTraits.h>
 #include <aws/ecs/model/ListTaskDefinitionsRequest.h>
 #include <aws/ecs/model/ListTaskDefinitionsResult.h>
+#include <aws/ecs/model/ListTasksPaginationTraits.h>
 #include <aws/ecs/model/ListTasksRequest.h>
 #include <aws/ecs/model/ListTasksResult.h>
 #include <aws/ecs/model/LoadBalancer.h>
diff --git a/generated/tests/eks-auth-gen-tests/EKSAuthIncludeTests.cpp b/generated/tests/eks-auth-gen-tests/EKSAuthIncludeTests.cpp
index e8a1b5c45519..ca172b39928f 100644
--- a/generated/tests/eks-auth-gen-tests/EKSAuthIncludeTests.cpp
+++ b/generated/tests/eks-auth-gen-tests/EKSAuthIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/eks-auth/EKSAuthEndpointProvider.h>
 #include <aws/eks-auth/EKSAuthErrorMarshaller.h>
 #include <aws/eks-auth/EKSAuthErrors.h>
+#include <aws/eks-auth/EKSAuthPaginationBase.h>
 #include <aws/eks-auth/EKSAuthRequest.h>
 #include <aws/eks-auth/EKSAuthServiceClientModel.h>
+#include <aws/eks-auth/EKSAuthWaiter.h>
 #include <aws/eks-auth/EKSAuth_EXPORTS.h>
+#include <aws/eks-auth/internal/EKSAuthEndpointRules.h>
 #include <aws/eks-auth/model/AssumeRoleForPodIdentityRequest.h>
 #include <aws/eks-auth/model/AssumeRoleForPodIdentityResult.h>
 #include <aws/eks-auth/model/AssumedRoleUser.h>
diff --git a/generated/tests/eks-gen-tests/EKSIncludeTests.cpp b/generated/tests/eks-gen-tests/EKSIncludeTests.cpp
index e69d5696ef24..b400702a3345 100644
--- a/generated/tests/eks-gen-tests/EKSIncludeTests.cpp
+++ b/generated/tests/eks-gen-tests/EKSIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/eks/EKSClient.h>
+#include <aws/eks/EKSClientPagination.h>
 #include <aws/eks/EKSEndpointProvider.h>
 #include <aws/eks/EKSErrorMarshaller.h>
 #include <aws/eks/EKSErrors.h>
+#include <aws/eks/EKSPaginationBase.h>
 #include <aws/eks/EKSRequest.h>
 #include <aws/eks/EKSServiceClientModel.h>
+#include <aws/eks/EKSWaiter.h>
 #include <aws/eks/EKS_EXPORTS.h>
+#include <aws/eks/internal/EKSEndpointRules.h>
 #include <aws/eks/model/AMITypes.h>
 #include <aws/eks/model/AccessConfigResponse.h>
 #include <aws/eks/model/AccessEntry.h>
@@ -131,12 +135,14 @@
 #include <aws/eks/model/DescribeAddonConfigurationResult.h>
 #include <aws/eks/model/DescribeAddonRequest.h>
 #include <aws/eks/model/DescribeAddonResult.h>
+#include <aws/eks/model/DescribeAddonVersionsPaginationTraits.h>
 #include <aws/eks/model/DescribeAddonVersionsRequest.h>
 #include <aws/eks/model/DescribeAddonVersionsResult.h>
 #include <aws/eks/model/DescribeCapabilityRequest.h>
 #include <aws/eks/model/DescribeCapabilityResult.h>
 #include <aws/eks/model/DescribeClusterRequest.h>
 #include <aws/eks/model/DescribeClusterResult.h>
+#include <aws/eks/model/DescribeClusterVersionsPaginationTraits.h>
 #include <aws/eks/model/DescribeClusterVersionsRequest.h>
 #include <aws/eks/model/DescribeClusterVersionsResult.h>
 #include <aws/eks/model/DescribeEksAnywhereSubscriptionRequest.h>
@@ -211,32 +217,45 @@
 #include <aws/eks/model/KubernetesNetworkConfigResponse.h>
 #include <aws/eks/model/LaunchTemplateSpecification.h>
 #include <aws/eks/model/License.h>
+#include <aws/eks/model/ListAccessEntriesPaginationTraits.h>
 #include <aws/eks/model/ListAccessEntriesRequest.h>
 #include <aws/eks/model/ListAccessEntriesResult.h>
+#include <aws/eks/model/ListAccessPoliciesPaginationTraits.h>
 #include <aws/eks/model/ListAccessPoliciesRequest.h>
 #include <aws/eks/model/ListAccessPoliciesResult.h>
+#include <aws/eks/model/ListAddonsPaginationTraits.h>
 #include <aws/eks/model/ListAddonsRequest.h>
 #include <aws/eks/model/ListAddonsResult.h>
+#include <aws/eks/model/ListAssociatedAccessPoliciesPaginationTraits.h>
 #include <aws/eks/model/ListAssociatedAccessPoliciesRequest.h>
 #include <aws/eks/model/ListAssociatedAccessPoliciesResult.h>
+#include <aws/eks/model/ListCapabilitiesPaginationTraits.h>
 #include <aws/eks/model/ListCapabilitiesRequest.h>
 #include <aws/eks/model/ListCapabilitiesResult.h>
+#include <aws/eks/model/ListClustersPaginationTraits.h>
 #include <aws/eks/model/ListClustersRequest.h>
 #include <aws/eks/model/ListClustersResult.h>
+#include <aws/eks/model/ListEksAnywhereSubscriptionsPaginationTraits.h>
 #include <aws/eks/model/ListEksAnywhereSubscriptionsRequest.h>
 #include <aws/eks/model/ListEksAnywhereSubscriptionsResult.h>
+#include <aws/eks/model/ListFargateProfilesPaginationTraits.h>
 #include <aws/eks/model/ListFargateProfilesRequest.h>
 #include <aws/eks/model/ListFargateProfilesResult.h>
+#include <aws/eks/model/ListIdentityProviderConfigsPaginationTraits.h>
 #include <aws/eks/model/ListIdentityProviderConfigsRequest.h>
 #include <aws/eks/model/ListIdentityProviderConfigsResult.h>
+#include <aws/eks/model/ListInsightsPaginationTraits.h>
 #include <aws/eks/model/ListInsightsRequest.h>
 #include <aws/eks/model/ListInsightsResult.h>
+#include <aws/eks/model/ListNodegroupsPaginationTraits.h>
 #include <aws/eks/model/ListNodegroupsRequest.h>
 #include <aws/eks/model/ListNodegroupsResult.h>
+#include <aws/eks/model/ListPodIdentityAssociationsPaginationTraits.h>
 #include <aws/eks/model/ListPodIdentityAssociationsRequest.h>
 #include <aws/eks/model/ListPodIdentityAssociationsResult.h>
 #include <aws/eks/model/ListTagsForResourceRequest.h>
 #include <aws/eks/model/ListTagsForResourceResult.h>
+#include <aws/eks/model/ListUpdatesPaginationTraits.h>
 #include <aws/eks/model/ListUpdatesRequest.h>
 #include <aws/eks/model/ListUpdatesResult.h>
 #include <aws/eks/model/LogSetup.h>
diff --git a/generated/tests/elasticache-gen-tests/ElastiCacheIncludeTests.cpp b/generated/tests/elasticache-gen-tests/ElastiCacheIncludeTests.cpp
index 0642bd0d5a1c..29ac92182e22 100644
--- a/generated/tests/elasticache-gen-tests/ElastiCacheIncludeTests.cpp
+++ b/generated/tests/elasticache-gen-tests/ElastiCacheIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/elasticache/ElastiCacheClient.h>
+#include <aws/elasticache/ElastiCacheClientPagination.h>
 #include <aws/elasticache/ElastiCacheEndpointProvider.h>
 #include <aws/elasticache/ElastiCacheErrorMarshaller.h>
 #include <aws/elasticache/ElastiCacheErrors.h>
+#include <aws/elasticache/ElastiCachePaginationBase.h>
 #include <aws/elasticache/ElastiCacheRequest.h>
 #include <aws/elasticache/ElastiCacheServiceClientModel.h>
+#include <aws/elasticache/ElastiCacheWaiter.h>
 #include <aws/elasticache/ElastiCache_EXPORTS.h>
+#include <aws/elasticache/internal/ElastiCacheEndpointRules.h>
 #include <aws/elasticache/model/AZMode.h>
 #include <aws/elasticache/model/AddTagsToResourceRequest.h>
 #include <aws/elasticache/model/AddTagsToResourceResult.h>
@@ -100,42 +104,61 @@
 #include <aws/elasticache/model/DeleteUserGroupResult.h>
 #include <aws/elasticache/model/DeleteUserRequest.h>
 #include <aws/elasticache/model/DeleteUserResult.h>
+#include <aws/elasticache/model/DescribeCacheClustersPaginationTraits.h>
 #include <aws/elasticache/model/DescribeCacheClustersRequest.h>
 #include <aws/elasticache/model/DescribeCacheClustersResult.h>
+#include <aws/elasticache/model/DescribeCacheEngineVersionsPaginationTraits.h>
 #include <aws/elasticache/model/DescribeCacheEngineVersionsRequest.h>
 #include <aws/elasticache/model/DescribeCacheEngineVersionsResult.h>
+#include <aws/elasticache/model/DescribeCacheParameterGroupsPaginationTraits.h>
 #include <aws/elasticache/model/DescribeCacheParameterGroupsRequest.h>
 #include <aws/elasticache/model/DescribeCacheParameterGroupsResult.h>
+#include <aws/elasticache/model/DescribeCacheParametersPaginationTraits.h>
 #include <aws/elasticache/model/DescribeCacheParametersRequest.h>
 #include <aws/elasticache/model/DescribeCacheParametersResult.h>
+#include <aws/elasticache/model/DescribeCacheSecurityGroupsPaginationTraits.h>
 #include <aws/elasticache/model/DescribeCacheSecurityGroupsRequest.h>
 #include <aws/elasticache/model/DescribeCacheSecurityGroupsResult.h>
+#include <aws/elasticache/model/DescribeCacheSubnetGroupsPaginationTraits.h>
 #include <aws/elasticache/model/DescribeCacheSubnetGroupsRequest.h>
 #include <aws/elasticache/model/DescribeCacheSubnetGroupsResult.h>
+#include <aws/elasticache/model/DescribeEngineDefaultParametersPaginationTraits.h>
 #include <aws/elasticache/model/DescribeEngineDefaultParametersRequest.h>
 #include <aws/elasticache/model/DescribeEngineDefaultParametersResult.h>
+#include <aws/elasticache/model/DescribeEventsPaginationTraits.h>
 #include <aws/elasticache/model/DescribeEventsRequest.h>
 #include <aws/elasticache/model/DescribeEventsResult.h>
+#include <aws/elasticache/model/DescribeGlobalReplicationGroupsPaginationTraits.h>
 #include <aws/elasticache/model/DescribeGlobalReplicationGroupsRequest.h>
 #include <aws/elasticache/model/DescribeGlobalReplicationGroupsResult.h>
+#include <aws/elasticache/model/DescribeReplicationGroupsPaginationTraits.h>
 #include <aws/elasticache/model/DescribeReplicationGroupsRequest.h>
 #include <aws/elasticache/model/DescribeReplicationGroupsResult.h>
+#include <aws/elasticache/model/DescribeReservedCacheNodesOfferingsPaginationTraits.h>
 #include <aws/elasticache/model/DescribeReservedCacheNodesOfferingsRequest.h>
 #include <aws/elasticache/model/DescribeReservedCacheNodesOfferingsResult.h>
+#include <aws/elasticache/model/DescribeReservedCacheNodesPaginationTraits.h>
 #include <aws/elasticache/model/DescribeReservedCacheNodesRequest.h>
 #include <aws/elasticache/model/DescribeReservedCacheNodesResult.h>
+#include <aws/elasticache/model/DescribeServerlessCacheSnapshotsPaginationTraits.h>
 #include <aws/elasticache/model/DescribeServerlessCacheSnapshotsRequest.h>
 #include <aws/elasticache/model/DescribeServerlessCacheSnapshotsResult.h>
+#include <aws/elasticache/model/DescribeServerlessCachesPaginationTraits.h>
 #include <aws/elasticache/model/DescribeServerlessCachesRequest.h>
 #include <aws/elasticache/model/DescribeServerlessCachesResult.h>
+#include <aws/elasticache/model/DescribeServiceUpdatesPaginationTraits.h>
 #include <aws/elasticache/model/DescribeServiceUpdatesRequest.h>
 #include <aws/elasticache/model/DescribeServiceUpdatesResult.h>
+#include <aws/elasticache/model/DescribeSnapshotsPaginationTraits.h>
 #include <aws/elasticache/model/DescribeSnapshotsRequest.h>
 #include <aws/elasticache/model/DescribeSnapshotsResult.h>
+#include <aws/elasticache/model/DescribeUpdateActionsPaginationTraits.h>
 #include <aws/elasticache/model/DescribeUpdateActionsRequest.h>
 #include <aws/elasticache/model/DescribeUpdateActionsResult.h>
+#include <aws/elasticache/model/DescribeUserGroupsPaginationTraits.h>
 #include <aws/elasticache/model/DescribeUserGroupsRequest.h>
 #include <aws/elasticache/model/DescribeUserGroupsResult.h>
+#include <aws/elasticache/model/DescribeUsersPaginationTraits.h>
 #include <aws/elasticache/model/DescribeUsersRequest.h>
 #include <aws/elasticache/model/DescribeUsersResult.h>
 #include <aws/elasticache/model/DestinationDetails.h>
diff --git a/generated/tests/elasticbeanstalk-gen-tests/ElasticBeanstalkIncludeTests.cpp b/generated/tests/elasticbeanstalk-gen-tests/ElasticBeanstalkIncludeTests.cpp
index 1ffe46eb9616..d29112c6ea51 100644
--- a/generated/tests/elasticbeanstalk-gen-tests/ElasticBeanstalkIncludeTests.cpp
+++ b/generated/tests/elasticbeanstalk-gen-tests/ElasticBeanstalkIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/elasticbeanstalk/ElasticBeanstalkClient.h>
+#include <aws/elasticbeanstalk/ElasticBeanstalkClientPagination.h>
 #include <aws/elasticbeanstalk/ElasticBeanstalkEndpointProvider.h>
 #include <aws/elasticbeanstalk/ElasticBeanstalkErrorMarshaller.h>
 #include <aws/elasticbeanstalk/ElasticBeanstalkErrors.h>
+#include <aws/elasticbeanstalk/ElasticBeanstalkPaginationBase.h>
 #include <aws/elasticbeanstalk/ElasticBeanstalkRequest.h>
 #include <aws/elasticbeanstalk/ElasticBeanstalkServiceClientModel.h>
+#include <aws/elasticbeanstalk/ElasticBeanstalkWaiter.h>
 #include <aws/elasticbeanstalk/ElasticBeanstalk_EXPORTS.h>
+#include <aws/elasticbeanstalk/internal/ElasticBeanstalkEndpointRules.h>
 #include <aws/elasticbeanstalk/model/AbortEnvironmentUpdateRequest.h>
 #include <aws/elasticbeanstalk/model/ActionHistoryStatus.h>
 #include <aws/elasticbeanstalk/model/ActionStatus.h>
@@ -72,6 +76,7 @@
 #include <aws/elasticbeanstalk/model/DescribeConfigurationSettingsResult.h>
 #include <aws/elasticbeanstalk/model/DescribeEnvironmentHealthRequest.h>
 #include <aws/elasticbeanstalk/model/DescribeEnvironmentHealthResult.h>
+#include <aws/elasticbeanstalk/model/DescribeEnvironmentManagedActionHistoryPaginationTraits.h>
 #include <aws/elasticbeanstalk/model/DescribeEnvironmentManagedActionHistoryRequest.h>
 #include <aws/elasticbeanstalk/model/DescribeEnvironmentManagedActionHistoryResult.h>
 #include <aws/elasticbeanstalk/model/DescribeEnvironmentManagedActionsRequest.h>
@@ -80,6 +85,7 @@
 #include <aws/elasticbeanstalk/model/DescribeEnvironmentResourcesResult.h>
 #include <aws/elasticbeanstalk/model/DescribeEnvironmentsRequest.h>
 #include <aws/elasticbeanstalk/model/DescribeEnvironmentsResult.h>
+#include <aws/elasticbeanstalk/model/DescribeEventsPaginationTraits.h>
 #include <aws/elasticbeanstalk/model/DescribeEventsRequest.h>
 #include <aws/elasticbeanstalk/model/DescribeEventsResult.h>
 #include <aws/elasticbeanstalk/model/DescribeInstancesHealthRequest.h>
@@ -109,8 +115,10 @@
 #include <aws/elasticbeanstalk/model/LaunchTemplate.h>
 #include <aws/elasticbeanstalk/model/ListAvailableSolutionStacksRequest.h>
 #include <aws/elasticbeanstalk/model/ListAvailableSolutionStacksResult.h>
+#include <aws/elasticbeanstalk/model/ListPlatformBranchesPaginationTraits.h>
 #include <aws/elasticbeanstalk/model/ListPlatformBranchesRequest.h>
 #include <aws/elasticbeanstalk/model/ListPlatformBranchesResult.h>
+#include <aws/elasticbeanstalk/model/ListPlatformVersionsPaginationTraits.h>
 #include <aws/elasticbeanstalk/model/ListPlatformVersionsRequest.h>
 #include <aws/elasticbeanstalk/model/ListPlatformVersionsResult.h>
 #include <aws/elasticbeanstalk/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/elasticfilesystem-gen-tests/EFSIncludeTests.cpp b/generated/tests/elasticfilesystem-gen-tests/EFSIncludeTests.cpp
index 7aa80ee915a1..e037ae0569ed 100644
--- a/generated/tests/elasticfilesystem-gen-tests/EFSIncludeTests.cpp
+++ b/generated/tests/elasticfilesystem-gen-tests/EFSIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/elasticfilesystem/EFSClient.h>
+#include <aws/elasticfilesystem/EFSClientPagination.h>
 #include <aws/elasticfilesystem/EFSEndpointProvider.h>
 #include <aws/elasticfilesystem/EFSErrorMarshaller.h>
 #include <aws/elasticfilesystem/EFSErrors.h>
+#include <aws/elasticfilesystem/EFSPaginationBase.h>
 #include <aws/elasticfilesystem/EFSRequest.h>
 #include <aws/elasticfilesystem/EFSServiceClientModel.h>
+#include <aws/elasticfilesystem/EFSWaiter.h>
 #include <aws/elasticfilesystem/EFS_EXPORTS.h>
+#include <aws/elasticfilesystem/internal/EFSEndpointRules.h>
 #include <aws/elasticfilesystem/model/AccessPointAlreadyExists.h>
 #include <aws/elasticfilesystem/model/AccessPointDescription.h>
 #include <aws/elasticfilesystem/model/AccessPointLimitExceeded.h>
@@ -37,6 +41,7 @@
 #include <aws/elasticfilesystem/model/DeleteReplicationConfigurationRequest.h>
 #include <aws/elasticfilesystem/model/DeletionMode.h>
 #include <aws/elasticfilesystem/model/DependencyTimeout.h>
+#include <aws/elasticfilesystem/model/DescribeAccessPointsPaginationTraits.h>
 #include <aws/elasticfilesystem/model/DescribeAccessPointsRequest.h>
 #include <aws/elasticfilesystem/model/DescribeAccessPointsResult.h>
 #include <aws/elasticfilesystem/model/DescribeAccountPreferencesRequest.h>
@@ -45,14 +50,17 @@
 #include <aws/elasticfilesystem/model/DescribeBackupPolicyResult.h>
 #include <aws/elasticfilesystem/model/DescribeFileSystemPolicyRequest.h>
 #include <aws/elasticfilesystem/model/DescribeFileSystemPolicyResult.h>
+#include <aws/elasticfilesystem/model/DescribeFileSystemsPaginationTraits.h>
 #include <aws/elasticfilesystem/model/DescribeFileSystemsRequest.h>
 #include <aws/elasticfilesystem/model/DescribeFileSystemsResult.h>
 #include <aws/elasticfilesystem/model/DescribeLifecycleConfigurationRequest.h>
 #include <aws/elasticfilesystem/model/DescribeLifecycleConfigurationResult.h>
 #include <aws/elasticfilesystem/model/DescribeMountTargetSecurityGroupsRequest.h>
 #include <aws/elasticfilesystem/model/DescribeMountTargetSecurityGroupsResult.h>
+#include <aws/elasticfilesystem/model/DescribeMountTargetsPaginationTraits.h>
 #include <aws/elasticfilesystem/model/DescribeMountTargetsRequest.h>
 #include <aws/elasticfilesystem/model/DescribeMountTargetsResult.h>
+#include <aws/elasticfilesystem/model/DescribeReplicationConfigurationsPaginationTraits.h>
 #include <aws/elasticfilesystem/model/DescribeReplicationConfigurationsRequest.h>
 #include <aws/elasticfilesystem/model/DescribeReplicationConfigurationsResult.h>
 #include <aws/elasticfilesystem/model/Destination.h>
@@ -73,6 +81,7 @@
 #include <aws/elasticfilesystem/model/IpAddressType.h>
 #include <aws/elasticfilesystem/model/LifeCycleState.h>
 #include <aws/elasticfilesystem/model/LifecyclePolicy.h>
+#include <aws/elasticfilesystem/model/ListTagsForResourcePaginationTraits.h>
 #include <aws/elasticfilesystem/model/ListTagsForResourceRequest.h>
 #include <aws/elasticfilesystem/model/ListTagsForResourceResult.h>
 #include <aws/elasticfilesystem/model/ModifyMountTargetSecurityGroupsRequest.h>
diff --git a/generated/tests/elasticloadbalancing-gen-tests/ElasticLoadBalancingIncludeTests.cpp b/generated/tests/elasticloadbalancing-gen-tests/ElasticLoadBalancingIncludeTests.cpp
index 4847e623987a..715e481d7b0b 100644
--- a/generated/tests/elasticloadbalancing-gen-tests/ElasticLoadBalancingIncludeTests.cpp
+++ b/generated/tests/elasticloadbalancing-gen-tests/ElasticLoadBalancingIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/elasticloadbalancing/ElasticLoadBalancingClient.h>
+#include <aws/elasticloadbalancing/ElasticLoadBalancingClientPagination.h>
 #include <aws/elasticloadbalancing/ElasticLoadBalancingEndpointProvider.h>
 #include <aws/elasticloadbalancing/ElasticLoadBalancingErrorMarshaller.h>
 #include <aws/elasticloadbalancing/ElasticLoadBalancingErrors.h>
+#include <aws/elasticloadbalancing/ElasticLoadBalancingPaginationBase.h>
 #include <aws/elasticloadbalancing/ElasticLoadBalancingRequest.h>
 #include <aws/elasticloadbalancing/ElasticLoadBalancingServiceClientModel.h>
+#include <aws/elasticloadbalancing/ElasticLoadBalancingWaiter.h>
 #include <aws/elasticloadbalancing/ElasticLoadBalancing_EXPORTS.h>
+#include <aws/elasticloadbalancing/internal/ElasticLoadBalancingEndpointRules.h>
 #include <aws/elasticloadbalancing/model/AccessLog.h>
 #include <aws/elasticloadbalancing/model/AddTagsRequest.h>
 #include <aws/elasticloadbalancing/model/AddTagsResult.h>
@@ -56,6 +60,7 @@
 #include <aws/elasticloadbalancing/model/DescribeLoadBalancerPoliciesResult.h>
 #include <aws/elasticloadbalancing/model/DescribeLoadBalancerPolicyTypesRequest.h>
 #include <aws/elasticloadbalancing/model/DescribeLoadBalancerPolicyTypesResult.h>
+#include <aws/elasticloadbalancing/model/DescribeLoadBalancersPaginationTraits.h>
 #include <aws/elasticloadbalancing/model/DescribeLoadBalancersRequest.h>
 #include <aws/elasticloadbalancing/model/DescribeLoadBalancersResult.h>
 #include <aws/elasticloadbalancing/model/DescribeTagsRequest.h>
diff --git a/generated/tests/elasticloadbalancingv2-gen-tests/ElasticLoadBalancingv2IncludeTests.cpp b/generated/tests/elasticloadbalancingv2-gen-tests/ElasticLoadBalancingv2IncludeTests.cpp
index 68aa3e3c67e1..d838602093cb 100644
--- a/generated/tests/elasticloadbalancingv2-gen-tests/ElasticLoadBalancingv2IncludeTests.cpp
+++ b/generated/tests/elasticloadbalancingv2-gen-tests/ElasticLoadBalancingv2IncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/elasticloadbalancingv2/ElasticLoadBalancingv2Client.h>
+#include <aws/elasticloadbalancingv2/ElasticLoadBalancingv2ClientPagination.h>
 #include <aws/elasticloadbalancingv2/ElasticLoadBalancingv2EndpointProvider.h>
 #include <aws/elasticloadbalancingv2/ElasticLoadBalancingv2ErrorMarshaller.h>
 #include <aws/elasticloadbalancingv2/ElasticLoadBalancingv2Errors.h>
+#include <aws/elasticloadbalancingv2/ElasticLoadBalancingv2PaginationBase.h>
 #include <aws/elasticloadbalancingv2/ElasticLoadBalancingv2Request.h>
 #include <aws/elasticloadbalancingv2/ElasticLoadBalancingv2ServiceClientModel.h>
+#include <aws/elasticloadbalancingv2/ElasticLoadBalancingv2Waiter.h>
 #include <aws/elasticloadbalancingv2/ElasticLoadBalancingv2_EXPORTS.h>
+#include <aws/elasticloadbalancingv2/internal/ElasticLoadBalancingv2EndpointRules.h>
 #include <aws/elasticloadbalancingv2/model/Action.h>
 #include <aws/elasticloadbalancingv2/model/ActionTypeEnum.h>
 #include <aws/elasticloadbalancingv2/model/AddListenerCertificatesRequest.h>
@@ -58,20 +62,25 @@
 #include <aws/elasticloadbalancingv2/model/DeleteTrustStoreResult.h>
 #include <aws/elasticloadbalancingv2/model/DeregisterTargetsRequest.h>
 #include <aws/elasticloadbalancingv2/model/DeregisterTargetsResult.h>
+#include <aws/elasticloadbalancingv2/model/DescribeAccountLimitsPaginationTraits.h>
 #include <aws/elasticloadbalancingv2/model/DescribeAccountLimitsRequest.h>
 #include <aws/elasticloadbalancingv2/model/DescribeAccountLimitsResult.h>
 #include <aws/elasticloadbalancingv2/model/DescribeCapacityReservationRequest.h>
 #include <aws/elasticloadbalancingv2/model/DescribeCapacityReservationResult.h>
 #include <aws/elasticloadbalancingv2/model/DescribeListenerAttributesRequest.h>
 #include <aws/elasticloadbalancingv2/model/DescribeListenerAttributesResult.h>
+#include <aws/elasticloadbalancingv2/model/DescribeListenerCertificatesPaginationTraits.h>
 #include <aws/elasticloadbalancingv2/model/DescribeListenerCertificatesRequest.h>
 #include <aws/elasticloadbalancingv2/model/DescribeListenerCertificatesResult.h>
+#include <aws/elasticloadbalancingv2/model/DescribeListenersPaginationTraits.h>
 #include <aws/elasticloadbalancingv2/model/DescribeListenersRequest.h>
 #include <aws/elasticloadbalancingv2/model/DescribeListenersResult.h>
 #include <aws/elasticloadbalancingv2/model/DescribeLoadBalancerAttributesRequest.h>
 #include <aws/elasticloadbalancingv2/model/DescribeLoadBalancerAttributesResult.h>
+#include <aws/elasticloadbalancingv2/model/DescribeLoadBalancersPaginationTraits.h>
 #include <aws/elasticloadbalancingv2/model/DescribeLoadBalancersRequest.h>
 #include <aws/elasticloadbalancingv2/model/DescribeLoadBalancersResult.h>
+#include <aws/elasticloadbalancingv2/model/DescribeRulesPaginationTraits.h>
 #include <aws/elasticloadbalancingv2/model/DescribeRulesRequest.h>
 #include <aws/elasticloadbalancingv2/model/DescribeRulesResult.h>
 #include <aws/elasticloadbalancingv2/model/DescribeSSLPoliciesRequest.h>
@@ -80,16 +89,20 @@
 #include <aws/elasticloadbalancingv2/model/DescribeTagsResult.h>
 #include <aws/elasticloadbalancingv2/model/DescribeTargetGroupAttributesRequest.h>
 #include <aws/elasticloadbalancingv2/model/DescribeTargetGroupAttributesResult.h>
+#include <aws/elasticloadbalancingv2/model/DescribeTargetGroupsPaginationTraits.h>
 #include <aws/elasticloadbalancingv2/model/DescribeTargetGroupsRequest.h>
 #include <aws/elasticloadbalancingv2/model/DescribeTargetGroupsResult.h>
 #include <aws/elasticloadbalancingv2/model/DescribeTargetHealthInputIncludeEnum.h>
 #include <aws/elasticloadbalancingv2/model/DescribeTargetHealthRequest.h>
 #include <aws/elasticloadbalancingv2/model/DescribeTargetHealthResult.h>
+#include <aws/elasticloadbalancingv2/model/DescribeTrustStoreAssociationsPaginationTraits.h>
 #include <aws/elasticloadbalancingv2/model/DescribeTrustStoreAssociationsRequest.h>
 #include <aws/elasticloadbalancingv2/model/DescribeTrustStoreAssociationsResult.h>
 #include <aws/elasticloadbalancingv2/model/DescribeTrustStoreRevocation.h>
+#include <aws/elasticloadbalancingv2/model/DescribeTrustStoreRevocationsPaginationTraits.h>
 #include <aws/elasticloadbalancingv2/model/DescribeTrustStoreRevocationsRequest.h>
 #include <aws/elasticloadbalancingv2/model/DescribeTrustStoreRevocationsResult.h>
+#include <aws/elasticloadbalancingv2/model/DescribeTrustStoresPaginationTraits.h>
 #include <aws/elasticloadbalancingv2/model/DescribeTrustStoresRequest.h>
 #include <aws/elasticloadbalancingv2/model/DescribeTrustStoresResult.h>
 #include <aws/elasticloadbalancingv2/model/EnablePrefixForIpv6SourceNatEnum.h>
diff --git a/generated/tests/elasticmapreduce-gen-tests/EMRIncludeTests.cpp b/generated/tests/elasticmapreduce-gen-tests/EMRIncludeTests.cpp
index d2fe7a3006fb..73e4cc0cedcd 100644
--- a/generated/tests/elasticmapreduce-gen-tests/EMRIncludeTests.cpp
+++ b/generated/tests/elasticmapreduce-gen-tests/EMRIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/elasticmapreduce/EMRClient.h>
+#include <aws/elasticmapreduce/EMRClientPagination.h>
 #include <aws/elasticmapreduce/EMREndpointProvider.h>
 #include <aws/elasticmapreduce/EMRErrorMarshaller.h>
 #include <aws/elasticmapreduce/EMRErrors.h>
+#include <aws/elasticmapreduce/EMRPaginationBase.h>
 #include <aws/elasticmapreduce/EMRRequest.h>
 #include <aws/elasticmapreduce/EMRServiceClientModel.h>
+#include <aws/elasticmapreduce/EMRWaiter.h>
 #include <aws/elasticmapreduce/EMR_EXPORTS.h>
+#include <aws/elasticmapreduce/internal/EMREndpointRules.h>
 #include <aws/elasticmapreduce/model/ActionOnFailure.h>
 #include <aws/elasticmapreduce/model/AddInstanceFleetRequest.h>
 #include <aws/elasticmapreduce/model/AddInstanceFleetResult.h>
@@ -152,30 +156,43 @@
 #include <aws/elasticmapreduce/model/JobFlowInstancesDetail.h>
 #include <aws/elasticmapreduce/model/KerberosAttributes.h>
 #include <aws/elasticmapreduce/model/KeyValue.h>
+#include <aws/elasticmapreduce/model/ListBootstrapActionsPaginationTraits.h>
 #include <aws/elasticmapreduce/model/ListBootstrapActionsRequest.h>
 #include <aws/elasticmapreduce/model/ListBootstrapActionsResult.h>
+#include <aws/elasticmapreduce/model/ListClustersPaginationTraits.h>
 #include <aws/elasticmapreduce/model/ListClustersRequest.h>
 #include <aws/elasticmapreduce/model/ListClustersResult.h>
+#include <aws/elasticmapreduce/model/ListInstanceFleetsPaginationTraits.h>
 #include <aws/elasticmapreduce/model/ListInstanceFleetsRequest.h>
 #include <aws/elasticmapreduce/model/ListInstanceFleetsResult.h>
+#include <aws/elasticmapreduce/model/ListInstanceGroupsPaginationTraits.h>
 #include <aws/elasticmapreduce/model/ListInstanceGroupsRequest.h>
 #include <aws/elasticmapreduce/model/ListInstanceGroupsResult.h>
+#include <aws/elasticmapreduce/model/ListInstancesPaginationTraits.h>
 #include <aws/elasticmapreduce/model/ListInstancesRequest.h>
 #include <aws/elasticmapreduce/model/ListInstancesResult.h>
+#include <aws/elasticmapreduce/model/ListNotebookExecutionsPaginationTraits.h>
 #include <aws/elasticmapreduce/model/ListNotebookExecutionsRequest.h>
 #include <aws/elasticmapreduce/model/ListNotebookExecutionsResult.h>
+#include <aws/elasticmapreduce/model/ListReleaseLabelsPaginationTraits.h>
 #include <aws/elasticmapreduce/model/ListReleaseLabelsRequest.h>
 #include <aws/elasticmapreduce/model/ListReleaseLabelsResult.h>
+#include <aws/elasticmapreduce/model/ListSecurityConfigurationsPaginationTraits.h>
 #include <aws/elasticmapreduce/model/ListSecurityConfigurationsRequest.h>
 #include <aws/elasticmapreduce/model/ListSecurityConfigurationsResult.h>
+#include <aws/elasticmapreduce/model/ListSessionsPaginationTraits.h>
 #include <aws/elasticmapreduce/model/ListSessionsRequest.h>
 #include <aws/elasticmapreduce/model/ListSessionsResult.h>
+#include <aws/elasticmapreduce/model/ListStepsPaginationTraits.h>
 #include <aws/elasticmapreduce/model/ListStepsRequest.h>
 #include <aws/elasticmapreduce/model/ListStepsResult.h>
+#include <aws/elasticmapreduce/model/ListStudioSessionMappingsPaginationTraits.h>
 #include <aws/elasticmapreduce/model/ListStudioSessionMappingsRequest.h>
 #include <aws/elasticmapreduce/model/ListStudioSessionMappingsResult.h>
+#include <aws/elasticmapreduce/model/ListStudiosPaginationTraits.h>
 #include <aws/elasticmapreduce/model/ListStudiosRequest.h>
 #include <aws/elasticmapreduce/model/ListStudiosResult.h>
+#include <aws/elasticmapreduce/model/ListSupportedInstanceTypesPaginationTraits.h>
 #include <aws/elasticmapreduce/model/ListSupportedInstanceTypesRequest.h>
 #include <aws/elasticmapreduce/model/ListSupportedInstanceTypesResult.h>
 #include <aws/elasticmapreduce/model/LogType.h>
diff --git a/generated/tests/elementalinference-gen-tests/ElementalInferenceIncludeTests.cpp b/generated/tests/elementalinference-gen-tests/ElementalInferenceIncludeTests.cpp
index df49f6554c83..4dc213e0d744 100644
--- a/generated/tests/elementalinference-gen-tests/ElementalInferenceIncludeTests.cpp
+++ b/generated/tests/elementalinference-gen-tests/ElementalInferenceIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/elementalinference/ElementalInferenceClient.h>
+#include <aws/elementalinference/ElementalInferenceClientPagination.h>
 #include <aws/elementalinference/ElementalInferenceEndpointProvider.h>
 #include <aws/elementalinference/ElementalInferenceErrorMarshaller.h>
 #include <aws/elementalinference/ElementalInferenceErrors.h>
+#include <aws/elementalinference/ElementalInferencePaginationBase.h>
 #include <aws/elementalinference/ElementalInferenceRequest.h>
 #include <aws/elementalinference/ElementalInferenceServiceClientModel.h>
+#include <aws/elementalinference/ElementalInferenceWaiter.h>
 #include <aws/elementalinference/ElementalInference_EXPORTS.h>
+#include <aws/elementalinference/internal/ElementalInferenceEndpointRules.h>
 #include <aws/elementalinference/model/AspectRatio.h>
 #include <aws/elementalinference/model/AssociateFeedRequest.h>
 #include <aws/elementalinference/model/AssociateFeedResult.h>
@@ -47,8 +51,10 @@
 #include <aws/elementalinference/model/GetFeedRequest.h>
 #include <aws/elementalinference/model/GetFeedResult.h>
 #include <aws/elementalinference/model/GetOutput.h>
+#include <aws/elementalinference/model/ListDictionariesPaginationTraits.h>
 #include <aws/elementalinference/model/ListDictionariesRequest.h>
 #include <aws/elementalinference/model/ListDictionariesResult.h>
+#include <aws/elementalinference/model/ListFeedsPaginationTraits.h>
 #include <aws/elementalinference/model/ListFeedsRequest.h>
 #include <aws/elementalinference/model/ListFeedsResult.h>
 #include <aws/elementalinference/model/ListTagsForResourceRequest.h>
@@ -57,6 +63,7 @@
 #include <aws/elementalinference/model/OutputStatus.h>
 #include <aws/elementalinference/model/ProfanityFilterMode.h>
 #include <aws/elementalinference/model/SearchFilter.h>
+#include <aws/elementalinference/model/SearchFixturesPaginationTraits.h>
 #include <aws/elementalinference/model/SearchFixturesRequest.h>
 #include <aws/elementalinference/model/SearchFixturesResult.h>
 #include <aws/elementalinference/model/SubtitlingConfig.h>
diff --git a/generated/tests/email-gen-tests/SESIncludeTests.cpp b/generated/tests/email-gen-tests/SESIncludeTests.cpp
index 40da2400a92c..43a3ce8305c9 100644
--- a/generated/tests/email-gen-tests/SESIncludeTests.cpp
+++ b/generated/tests/email-gen-tests/SESIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/email/SESClient.h>
+#include <aws/email/SESClientPagination.h>
 #include <aws/email/SESEndpointProvider.h>
 #include <aws/email/SESErrorMarshaller.h>
 #include <aws/email/SESErrors.h>
+#include <aws/email/SESPaginationBase.h>
 #include <aws/email/SESRequest.h>
 #include <aws/email/SESServiceClientModel.h>
+#include <aws/email/SESWaiter.h>
 #include <aws/email/SES_EXPORTS.h>
+#include <aws/email/internal/SESEndpointRules.h>
 #include <aws/email/model/AddHeaderAction.h>
 #include <aws/email/model/AlreadyExistsException.h>
 #include <aws/email/model/BehaviorOnMXFailure.h>
@@ -130,8 +134,10 @@
 #include <aws/email/model/LambdaAction.h>
 #include <aws/email/model/ListConfigurationSetsRequest.h>
 #include <aws/email/model/ListConfigurationSetsResult.h>
+#include <aws/email/model/ListCustomVerificationEmailTemplatesPaginationTraits.h>
 #include <aws/email/model/ListCustomVerificationEmailTemplatesRequest.h>
 #include <aws/email/model/ListCustomVerificationEmailTemplatesResult.h>
+#include <aws/email/model/ListIdentitiesPaginationTraits.h>
 #include <aws/email/model/ListIdentitiesRequest.h>
 #include <aws/email/model/ListIdentitiesResult.h>
 #include <aws/email/model/ListIdentityPoliciesRequest.h>
diff --git a/generated/tests/emr-containers-gen-tests/EMRContainersIncludeTests.cpp b/generated/tests/emr-containers-gen-tests/EMRContainersIncludeTests.cpp
index 1d1a71c1cd70..4057a3312b7f 100644
--- a/generated/tests/emr-containers-gen-tests/EMRContainersIncludeTests.cpp
+++ b/generated/tests/emr-containers-gen-tests/EMRContainersIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/emr-containers/EMRContainersClient.h>
+#include <aws/emr-containers/EMRContainersClientPagination.h>
 #include <aws/emr-containers/EMRContainersEndpointProvider.h>
 #include <aws/emr-containers/EMRContainersErrorMarshaller.h>
 #include <aws/emr-containers/EMRContainersErrors.h>
+#include <aws/emr-containers/EMRContainersPaginationBase.h>
 #include <aws/emr-containers/EMRContainersRequest.h>
 #include <aws/emr-containers/EMRContainersServiceClientModel.h>
+#include <aws/emr-containers/EMRContainersWaiter.h>
 #include <aws/emr-containers/EMRContainers_EXPORTS.h>
+#include <aws/emr-containers/internal/EMRContainersEndpointRules.h>
 #include <aws/emr-containers/model/AllowAWSToRetainLogs.h>
 #include <aws/emr-containers/model/AuthenticationConfiguration.h>
 #include <aws/emr-containers/model/AuthorizationConfiguration.h>
@@ -70,16 +74,21 @@
 #include <aws/emr-containers/model/JobTemplate.h>
 #include <aws/emr-containers/model/JobTemplateData.h>
 #include <aws/emr-containers/model/LakeFormationConfiguration.h>
+#include <aws/emr-containers/model/ListJobRunsPaginationTraits.h>
 #include <aws/emr-containers/model/ListJobRunsRequest.h>
 #include <aws/emr-containers/model/ListJobRunsResult.h>
+#include <aws/emr-containers/model/ListJobTemplatesPaginationTraits.h>
 #include <aws/emr-containers/model/ListJobTemplatesRequest.h>
 #include <aws/emr-containers/model/ListJobTemplatesResult.h>
+#include <aws/emr-containers/model/ListManagedEndpointsPaginationTraits.h>
 #include <aws/emr-containers/model/ListManagedEndpointsRequest.h>
 #include <aws/emr-containers/model/ListManagedEndpointsResult.h>
+#include <aws/emr-containers/model/ListSecurityConfigurationsPaginationTraits.h>
 #include <aws/emr-containers/model/ListSecurityConfigurationsRequest.h>
 #include <aws/emr-containers/model/ListSecurityConfigurationsResult.h>
 #include <aws/emr-containers/model/ListTagsForResourceRequest.h>
 #include <aws/emr-containers/model/ListTagsForResourceResult.h>
+#include <aws/emr-containers/model/ListVirtualClustersPaginationTraits.h>
 #include <aws/emr-containers/model/ListVirtualClustersRequest.h>
 #include <aws/emr-containers/model/ListVirtualClustersResult.h>
 #include <aws/emr-containers/model/ManagedLogs.h>
diff --git a/generated/tests/emr-serverless-gen-tests/EMRServerlessIncludeTests.cpp b/generated/tests/emr-serverless-gen-tests/EMRServerlessIncludeTests.cpp
index 5513659f98b1..e72f54ff20bf 100644
--- a/generated/tests/emr-serverless-gen-tests/EMRServerlessIncludeTests.cpp
+++ b/generated/tests/emr-serverless-gen-tests/EMRServerlessIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/emr-serverless/EMRServerlessClient.h>
+#include <aws/emr-serverless/EMRServerlessClientPagination.h>
 #include <aws/emr-serverless/EMRServerlessEndpointProvider.h>
 #include <aws/emr-serverless/EMRServerlessErrorMarshaller.h>
 #include <aws/emr-serverless/EMRServerlessErrors.h>
+#include <aws/emr-serverless/EMRServerlessPaginationBase.h>
 #include <aws/emr-serverless/EMRServerlessRequest.h>
 #include <aws/emr-serverless/EMRServerlessServiceClientModel.h>
+#include <aws/emr-serverless/EMRServerlessWaiter.h>
 #include <aws/emr-serverless/EMRServerless_EXPORTS.h>
+#include <aws/emr-serverless/internal/EMRServerlessEndpointRules.h>
 #include <aws/emr-serverless/model/Application.h>
 #include <aws/emr-serverless/model/ApplicationState.h>
 #include <aws/emr-serverless/model/ApplicationSummary.h>
@@ -56,12 +60,16 @@
 #include <aws/emr-serverless/model/JobRunMode.h>
 #include <aws/emr-serverless/model/JobRunState.h>
 #include <aws/emr-serverless/model/JobRunSummary.h>
+#include <aws/emr-serverless/model/ListApplicationsPaginationTraits.h>
 #include <aws/emr-serverless/model/ListApplicationsRequest.h>
 #include <aws/emr-serverless/model/ListApplicationsResult.h>
+#include <aws/emr-serverless/model/ListJobRunAttemptsPaginationTraits.h>
 #include <aws/emr-serverless/model/ListJobRunAttemptsRequest.h>
 #include <aws/emr-serverless/model/ListJobRunAttemptsResult.h>
+#include <aws/emr-serverless/model/ListJobRunsPaginationTraits.h>
 #include <aws/emr-serverless/model/ListJobRunsRequest.h>
 #include <aws/emr-serverless/model/ListJobRunsResult.h>
+#include <aws/emr-serverless/model/ListSessionsPaginationTraits.h>
 #include <aws/emr-serverless/model/ListSessionsRequest.h>
 #include <aws/emr-serverless/model/ListSessionsResult.h>
 #include <aws/emr-serverless/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/entityresolution-gen-tests/EntityResolutionIncludeTests.cpp b/generated/tests/entityresolution-gen-tests/EntityResolutionIncludeTests.cpp
index 2a13064ca9a4..495ff66d4a16 100644
--- a/generated/tests/entityresolution-gen-tests/EntityResolutionIncludeTests.cpp
+++ b/generated/tests/entityresolution-gen-tests/EntityResolutionIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/entityresolution/EntityResolutionClient.h>
+#include <aws/entityresolution/EntityResolutionClientPagination.h>
 #include <aws/entityresolution/EntityResolutionEndpointProvider.h>
 #include <aws/entityresolution/EntityResolutionErrorMarshaller.h>
 #include <aws/entityresolution/EntityResolutionErrors.h>
+#include <aws/entityresolution/EntityResolutionPaginationBase.h>
 #include <aws/entityresolution/EntityResolutionRequest.h>
 #include <aws/entityresolution/EntityResolutionServiceClientModel.h>
+#include <aws/entityresolution/EntityResolutionWaiter.h>
 #include <aws/entityresolution/EntityResolution_EXPORTS.h>
+#include <aws/entityresolution/internal/EntityResolutionEndpointRules.h>
 #include <aws/entityresolution/model/AddPolicyStatementRequest.h>
 #include <aws/entityresolution/model/AddPolicyStatementResult.h>
 #include <aws/entityresolution/model/AttributeMatchingModel.h>
@@ -89,18 +93,25 @@
 #include <aws/entityresolution/model/JobStatus.h>
 #include <aws/entityresolution/model/JobSummary.h>
 #include <aws/entityresolution/model/JobType.h>
+#include <aws/entityresolution/model/ListIdMappingJobsPaginationTraits.h>
 #include <aws/entityresolution/model/ListIdMappingJobsRequest.h>
 #include <aws/entityresolution/model/ListIdMappingJobsResult.h>
+#include <aws/entityresolution/model/ListIdMappingWorkflowsPaginationTraits.h>
 #include <aws/entityresolution/model/ListIdMappingWorkflowsRequest.h>
 #include <aws/entityresolution/model/ListIdMappingWorkflowsResult.h>
+#include <aws/entityresolution/model/ListIdNamespacesPaginationTraits.h>
 #include <aws/entityresolution/model/ListIdNamespacesRequest.h>
 #include <aws/entityresolution/model/ListIdNamespacesResult.h>
+#include <aws/entityresolution/model/ListMatchingJobsPaginationTraits.h>
 #include <aws/entityresolution/model/ListMatchingJobsRequest.h>
 #include <aws/entityresolution/model/ListMatchingJobsResult.h>
+#include <aws/entityresolution/model/ListMatchingWorkflowsPaginationTraits.h>
 #include <aws/entityresolution/model/ListMatchingWorkflowsRequest.h>
 #include <aws/entityresolution/model/ListMatchingWorkflowsResult.h>
+#include <aws/entityresolution/model/ListProviderServicesPaginationTraits.h>
 #include <aws/entityresolution/model/ListProviderServicesRequest.h>
 #include <aws/entityresolution/model/ListProviderServicesResult.h>
+#include <aws/entityresolution/model/ListSchemaMappingsPaginationTraits.h>
 #include <aws/entityresolution/model/ListSchemaMappingsRequest.h>
 #include <aws/entityresolution/model/ListSchemaMappingsResult.h>
 #include <aws/entityresolution/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/es-gen-tests/ElasticsearchServiceIncludeTests.cpp b/generated/tests/es-gen-tests/ElasticsearchServiceIncludeTests.cpp
index 16487f0a9023..33914f63fb90 100644
--- a/generated/tests/es-gen-tests/ElasticsearchServiceIncludeTests.cpp
+++ b/generated/tests/es-gen-tests/ElasticsearchServiceIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/es/ElasticsearchServiceClient.h>
+#include <aws/es/ElasticsearchServiceClientPagination.h>
 #include <aws/es/ElasticsearchServiceEndpointProvider.h>
 #include <aws/es/ElasticsearchServiceErrorMarshaller.h>
 #include <aws/es/ElasticsearchServiceErrors.h>
+#include <aws/es/ElasticsearchServicePaginationBase.h>
 #include <aws/es/ElasticsearchServiceRequest.h>
 #include <aws/es/ElasticsearchServiceServiceClientModel.h>
+#include <aws/es/ElasticsearchServiceWaiter.h>
 #include <aws/es/ElasticsearchService_EXPORTS.h>
+#include <aws/es/internal/ElasticsearchServiceEndpointRules.h>
 #include <aws/es/model/AcceptInboundCrossClusterSearchConnectionRequest.h>
 #include <aws/es/model/AcceptInboundCrossClusterSearchConnectionResult.h>
 #include <aws/es/model/AccessPoliciesStatus.h>
@@ -77,6 +81,7 @@
 #include <aws/es/model/DeploymentStrategy.h>
 #include <aws/es/model/DeploymentStrategyOptions.h>
 #include <aws/es/model/DeploymentStrategyOptionsStatus.h>
+#include <aws/es/model/DescribeDomainAutoTunesPaginationTraits.h>
 #include <aws/es/model/DescribeDomainAutoTunesRequest.h>
 #include <aws/es/model/DescribeDomainAutoTunesResult.h>
 #include <aws/es/model/DescribeDomainChangeProgressRequest.h>
@@ -89,16 +94,21 @@
 #include <aws/es/model/DescribeElasticsearchDomainsResult.h>
 #include <aws/es/model/DescribeElasticsearchInstanceTypeLimitsRequest.h>
 #include <aws/es/model/DescribeElasticsearchInstanceTypeLimitsResult.h>
+#include <aws/es/model/DescribeInboundCrossClusterSearchConnectionsPaginationTraits.h>
 #include <aws/es/model/DescribeInboundCrossClusterSearchConnectionsRequest.h>
 #include <aws/es/model/DescribeInboundCrossClusterSearchConnectionsResult.h>
+#include <aws/es/model/DescribeOutboundCrossClusterSearchConnectionsPaginationTraits.h>
 #include <aws/es/model/DescribeOutboundCrossClusterSearchConnectionsRequest.h>
 #include <aws/es/model/DescribeOutboundCrossClusterSearchConnectionsResult.h>
 #include <aws/es/model/DescribePackagesFilter.h>
 #include <aws/es/model/DescribePackagesFilterName.h>
+#include <aws/es/model/DescribePackagesPaginationTraits.h>
 #include <aws/es/model/DescribePackagesRequest.h>
 #include <aws/es/model/DescribePackagesResult.h>
+#include <aws/es/model/DescribeReservedElasticsearchInstanceOfferingsPaginationTraits.h>
 #include <aws/es/model/DescribeReservedElasticsearchInstanceOfferingsRequest.h>
 #include <aws/es/model/DescribeReservedElasticsearchInstanceOfferingsResult.h>
+#include <aws/es/model/DescribeReservedElasticsearchInstancesPaginationTraits.h>
 #include <aws/es/model/DescribeReservedElasticsearchInstancesRequest.h>
 #include <aws/es/model/DescribeReservedElasticsearchInstancesResult.h>
 #include <aws/es/model/DescribeVpcEndpointsRequest.h>
@@ -133,8 +143,10 @@
 #include <aws/es/model/Filter.h>
 #include <aws/es/model/GetCompatibleElasticsearchVersionsRequest.h>
 #include <aws/es/model/GetCompatibleElasticsearchVersionsResult.h>
+#include <aws/es/model/GetPackageVersionHistoryPaginationTraits.h>
 #include <aws/es/model/GetPackageVersionHistoryRequest.h>
 #include <aws/es/model/GetPackageVersionHistoryResult.h>
+#include <aws/es/model/GetUpgradeHistoryPaginationTraits.h>
 #include <aws/es/model/GetUpgradeHistoryRequest.h>
 #include <aws/es/model/GetUpgradeHistoryResult.h>
 #include <aws/es/model/GetUpgradeStatusRequest.h>
@@ -148,12 +160,16 @@
 #include <aws/es/model/Limits.h>
 #include <aws/es/model/ListDomainNamesRequest.h>
 #include <aws/es/model/ListDomainNamesResult.h>
+#include <aws/es/model/ListDomainsForPackagePaginationTraits.h>
 #include <aws/es/model/ListDomainsForPackageRequest.h>
 #include <aws/es/model/ListDomainsForPackageResult.h>
+#include <aws/es/model/ListElasticsearchInstanceTypesPaginationTraits.h>
 #include <aws/es/model/ListElasticsearchInstanceTypesRequest.h>
 #include <aws/es/model/ListElasticsearchInstanceTypesResult.h>
+#include <aws/es/model/ListElasticsearchVersionsPaginationTraits.h>
 #include <aws/es/model/ListElasticsearchVersionsRequest.h>
 #include <aws/es/model/ListElasticsearchVersionsResult.h>
+#include <aws/es/model/ListPackagesForDomainPaginationTraits.h>
 #include <aws/es/model/ListPackagesForDomainRequest.h>
 #include <aws/es/model/ListPackagesForDomainResult.h>
 #include <aws/es/model/ListTagsRequest.h>
diff --git a/generated/tests/eventbridge-gen-tests/EventBridgeIncludeTests.cpp b/generated/tests/eventbridge-gen-tests/EventBridgeIncludeTests.cpp
index f5f99ffecf0e..9f015cce94a2 100644
--- a/generated/tests/eventbridge-gen-tests/EventBridgeIncludeTests.cpp
+++ b/generated/tests/eventbridge-gen-tests/EventBridgeIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/eventbridge/EventBridgeEndpointProvider.h>
 #include <aws/eventbridge/EventBridgeErrorMarshaller.h>
 #include <aws/eventbridge/EventBridgeErrors.h>
+#include <aws/eventbridge/EventBridgePaginationBase.h>
 #include <aws/eventbridge/EventBridgeRequest.h>
 #include <aws/eventbridge/EventBridgeServiceClientModel.h>
+#include <aws/eventbridge/EventBridgeWaiter.h>
 #include <aws/eventbridge/EventBridge_EXPORTS.h>
+#include <aws/eventbridge/internal/EventBridgeEndpointRules.h>
 #include <aws/eventbridge/model/ActivateEventSourceRequest.h>
 #include <aws/eventbridge/model/ApiDestination.h>
 #include <aws/eventbridge/model/ApiDestinationHttpMethod.h>
diff --git a/generated/tests/events-gen-tests/CloudWatchEventsIncludeTests.cpp b/generated/tests/events-gen-tests/CloudWatchEventsIncludeTests.cpp
index 599be83c420f..5505d4635acc 100644
--- a/generated/tests/events-gen-tests/CloudWatchEventsIncludeTests.cpp
+++ b/generated/tests/events-gen-tests/CloudWatchEventsIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/events/CloudWatchEventsEndpointProvider.h>
 #include <aws/events/CloudWatchEventsErrorMarshaller.h>
 #include <aws/events/CloudWatchEventsErrors.h>
+#include <aws/events/CloudWatchEventsPaginationBase.h>
 #include <aws/events/CloudWatchEventsRequest.h>
 #include <aws/events/CloudWatchEventsServiceClientModel.h>
+#include <aws/events/CloudWatchEventsWaiter.h>
 #include <aws/events/CloudWatchEvents_EXPORTS.h>
+#include <aws/events/internal/CloudWatchEventsEndpointRules.h>
 #include <aws/events/model/ActivateEventSourceRequest.h>
 #include <aws/events/model/ApiDestination.h>
 #include <aws/events/model/ApiDestinationHttpMethod.h>
diff --git a/generated/tests/evs-gen-tests/EVSIncludeTests.cpp b/generated/tests/evs-gen-tests/EVSIncludeTests.cpp
index 3beb5cee02cd..82ff68873155 100644
--- a/generated/tests/evs-gen-tests/EVSIncludeTests.cpp
+++ b/generated/tests/evs-gen-tests/EVSIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/evs/EVSClient.h>
+#include <aws/evs/EVSClientPagination.h>
 #include <aws/evs/EVSEndpointProvider.h>
 #include <aws/evs/EVSErrorMarshaller.h>
 #include <aws/evs/EVSErrors.h>
+#include <aws/evs/EVSPaginationBase.h>
 #include <aws/evs/EVSRequest.h>
 #include <aws/evs/EVSServiceClientModel.h>
+#include <aws/evs/EVSWaiter.h>
 #include <aws/evs/EVS_EXPORTS.h>
+#include <aws/evs/internal/EVSEndpointRules.h>
 #include <aws/evs/model/AssociateEipToVlanRequest.h>
 #include <aws/evs/model/AssociateEipToVlanResult.h>
 #include <aws/evs/model/Check.h>
@@ -62,16 +66,21 @@
 #include <aws/evs/model/InstanceType.h>
 #include <aws/evs/model/InstanceTypeEsxVersionsInfo.h>
 #include <aws/evs/model/LicenseInfo.h>
+#include <aws/evs/model/ListEnvironmentConnectorsPaginationTraits.h>
 #include <aws/evs/model/ListEnvironmentConnectorsRequest.h>
 #include <aws/evs/model/ListEnvironmentConnectorsResult.h>
+#include <aws/evs/model/ListEnvironmentHostsPaginationTraits.h>
 #include <aws/evs/model/ListEnvironmentHostsRequest.h>
 #include <aws/evs/model/ListEnvironmentHostsResult.h>
+#include <aws/evs/model/ListEnvironmentVlansPaginationTraits.h>
 #include <aws/evs/model/ListEnvironmentVlansRequest.h>
 #include <aws/evs/model/ListEnvironmentVlansResult.h>
+#include <aws/evs/model/ListEnvironmentsPaginationTraits.h>
 #include <aws/evs/model/ListEnvironmentsRequest.h>
 #include <aws/evs/model/ListEnvironmentsResult.h>
 #include <aws/evs/model/ListTagsForResourceRequest.h>
 #include <aws/evs/model/ListTagsForResourceResult.h>
+#include <aws/evs/model/ListVmEntitlementsPaginationTraits.h>
 #include <aws/evs/model/ListVmEntitlementsRequest.h>
 #include <aws/evs/model/ListVmEntitlementsResult.h>
 #include <aws/evs/model/NetworkInterface.h>
diff --git a/generated/tests/finspace-data-gen-tests/FinSpaceDataIncludeTests.cpp b/generated/tests/finspace-data-gen-tests/FinSpaceDataIncludeTests.cpp
index d6dc185946d9..ae9dae892625 100644
--- a/generated/tests/finspace-data-gen-tests/FinSpaceDataIncludeTests.cpp
+++ b/generated/tests/finspace-data-gen-tests/FinSpaceDataIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/finspace-data/FinSpaceDataEndpointProvider.h>
 #include <aws/finspace-data/FinSpaceDataErrorMarshaller.h>
 #include <aws/finspace-data/FinSpaceDataErrors.h>
+#include <aws/finspace-data/FinSpaceDataPaginationBase.h>
 #include <aws/finspace-data/FinSpaceDataRequest.h>
 #include <aws/finspace-data/FinSpaceDataServiceClientModel.h>
+#include <aws/finspace-data/FinSpaceDataWaiter.h>
 #include <aws/finspace-data/FinSpaceData_EXPORTS.h>
+#include <aws/finspace-data/internal/FinSpaceDataEndpointRules.h>
 #include <aws/finspace-data/model/ApiAccess.h>
 #include <aws/finspace-data/model/ApplicationPermission.h>
 #include <aws/finspace-data/model/AwsCredentials.h>
diff --git a/generated/tests/finspace-gen-tests/FinspaceIncludeTests.cpp b/generated/tests/finspace-gen-tests/FinspaceIncludeTests.cpp
index e9252f2b0941..820e6da9b92b 100644
--- a/generated/tests/finspace-gen-tests/FinspaceIncludeTests.cpp
+++ b/generated/tests/finspace-gen-tests/FinspaceIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/finspace/FinspaceClient.h>
+#include <aws/finspace/FinspaceClientPagination.h>
 #include <aws/finspace/FinspaceEndpointProvider.h>
 #include <aws/finspace/FinspaceErrorMarshaller.h>
 #include <aws/finspace/FinspaceErrors.h>
+#include <aws/finspace/FinspacePaginationBase.h>
 #include <aws/finspace/FinspaceRequest.h>
 #include <aws/finspace/FinspaceServiceClientModel.h>
+#include <aws/finspace/FinspaceWaiter.h>
 #include <aws/finspace/Finspace_EXPORTS.h>
+#include <aws/finspace/internal/FinspaceEndpointRules.h>
 #include <aws/finspace/model/AutoScalingConfiguration.h>
 #include <aws/finspace/model/AutoScalingMetric.h>
 #include <aws/finspace/model/CapacityConfiguration.h>
@@ -115,18 +119,24 @@
 #include <aws/finspace/model/KxVolume.h>
 #include <aws/finspace/model/KxVolumeStatus.h>
 #include <aws/finspace/model/KxVolumeType.h>
+#include <aws/finspace/model/ListKxChangesetsPaginationTraits.h>
 #include <aws/finspace/model/ListKxChangesetsRequest.h>
 #include <aws/finspace/model/ListKxChangesetsResult.h>
+#include <aws/finspace/model/ListKxClusterNodesPaginationTraits.h>
 #include <aws/finspace/model/ListKxClusterNodesRequest.h>
 #include <aws/finspace/model/ListKxClusterNodesResult.h>
 #include <aws/finspace/model/ListKxClustersRequest.h>
 #include <aws/finspace/model/ListKxClustersResult.h>
+#include <aws/finspace/model/ListKxDatabasesPaginationTraits.h>
 #include <aws/finspace/model/ListKxDatabasesRequest.h>
 #include <aws/finspace/model/ListKxDatabasesResult.h>
+#include <aws/finspace/model/ListKxDataviewsPaginationTraits.h>
 #include <aws/finspace/model/ListKxDataviewsRequest.h>
 #include <aws/finspace/model/ListKxDataviewsResult.h>
+#include <aws/finspace/model/ListKxEnvironmentsPaginationTraits.h>
 #include <aws/finspace/model/ListKxEnvironmentsRequest.h>
 #include <aws/finspace/model/ListKxEnvironmentsResult.h>
+#include <aws/finspace/model/ListKxScalingGroupsPaginationTraits.h>
 #include <aws/finspace/model/ListKxScalingGroupsRequest.h>
 #include <aws/finspace/model/ListKxScalingGroupsResult.h>
 #include <aws/finspace/model/ListKxUsersRequest.h>
diff --git a/generated/tests/firehose-gen-tests/FirehoseIncludeTests.cpp b/generated/tests/firehose-gen-tests/FirehoseIncludeTests.cpp
index d202da14450f..9b11383ace93 100644
--- a/generated/tests/firehose-gen-tests/FirehoseIncludeTests.cpp
+++ b/generated/tests/firehose-gen-tests/FirehoseIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/firehose/FirehoseEndpointProvider.h>
 #include <aws/firehose/FirehoseErrorMarshaller.h>
 #include <aws/firehose/FirehoseErrors.h>
+#include <aws/firehose/FirehosePaginationBase.h>
 #include <aws/firehose/FirehoseRequest.h>
 #include <aws/firehose/FirehoseServiceClientModel.h>
+#include <aws/firehose/FirehoseWaiter.h>
 #include <aws/firehose/Firehose_EXPORTS.h>
+#include <aws/firehose/internal/FirehoseEndpointRules.h>
 #include <aws/firehose/model/AmazonOpenSearchServerlessBufferingHints.h>
 #include <aws/firehose/model/AmazonOpenSearchServerlessDestinationConfiguration.h>
 #include <aws/firehose/model/AmazonOpenSearchServerlessDestinationDescription.h>
diff --git a/generated/tests/fis-gen-tests/FISIncludeTests.cpp b/generated/tests/fis-gen-tests/FISIncludeTests.cpp
index 93006218f7e4..17be9b97ec99 100644
--- a/generated/tests/fis-gen-tests/FISIncludeTests.cpp
+++ b/generated/tests/fis-gen-tests/FISIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/fis/FISClient.h>
+#include <aws/fis/FISClientPagination.h>
 #include <aws/fis/FISEndpointProvider.h>
 #include <aws/fis/FISErrorMarshaller.h>
 #include <aws/fis/FISErrors.h>
+#include <aws/fis/FISPaginationBase.h>
 #include <aws/fis/FISRequest.h>
 #include <aws/fis/FISServiceClientModel.h>
+#include <aws/fis/FISWaiter.h>
 #include <aws/fis/FIS_EXPORTS.h>
+#include <aws/fis/internal/FISEndpointRules.h>
 #include <aws/fis/model/AccountTargeting.h>
 #include <aws/fis/model/Action.h>
 #include <aws/fis/model/ActionParameter.h>
@@ -94,20 +98,26 @@
 #include <aws/fis/model/GetTargetAccountConfigurationResult.h>
 #include <aws/fis/model/GetTargetResourceTypeRequest.h>
 #include <aws/fis/model/GetTargetResourceTypeResult.h>
+#include <aws/fis/model/ListActionsPaginationTraits.h>
 #include <aws/fis/model/ListActionsRequest.h>
 #include <aws/fis/model/ListActionsResult.h>
+#include <aws/fis/model/ListExperimentResolvedTargetsPaginationTraits.h>
 #include <aws/fis/model/ListExperimentResolvedTargetsRequest.h>
 #include <aws/fis/model/ListExperimentResolvedTargetsResult.h>
 #include <aws/fis/model/ListExperimentTargetAccountConfigurationsRequest.h>
 #include <aws/fis/model/ListExperimentTargetAccountConfigurationsResult.h>
+#include <aws/fis/model/ListExperimentTemplatesPaginationTraits.h>
 #include <aws/fis/model/ListExperimentTemplatesRequest.h>
 #include <aws/fis/model/ListExperimentTemplatesResult.h>
+#include <aws/fis/model/ListExperimentsPaginationTraits.h>
 #include <aws/fis/model/ListExperimentsRequest.h>
 #include <aws/fis/model/ListExperimentsResult.h>
 #include <aws/fis/model/ListTagsForResourceRequest.h>
 #include <aws/fis/model/ListTagsForResourceResult.h>
+#include <aws/fis/model/ListTargetAccountConfigurationsPaginationTraits.h>
 #include <aws/fis/model/ListTargetAccountConfigurationsRequest.h>
 #include <aws/fis/model/ListTargetAccountConfigurationsResult.h>
+#include <aws/fis/model/ListTargetResourceTypesPaginationTraits.h>
 #include <aws/fis/model/ListTargetResourceTypesRequest.h>
 #include <aws/fis/model/ListTargetResourceTypesResult.h>
 #include <aws/fis/model/ReportConfigurationCloudWatchDashboardInput.h>
diff --git a/generated/tests/fms-gen-tests/FMSIncludeTests.cpp b/generated/tests/fms-gen-tests/FMSIncludeTests.cpp
index 40bf34387094..a064e17b6556 100644
--- a/generated/tests/fms-gen-tests/FMSIncludeTests.cpp
+++ b/generated/tests/fms-gen-tests/FMSIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/fms/FMSClient.h>
+#include <aws/fms/FMSClientPagination.h>
 #include <aws/fms/FMSEndpointProvider.h>
 #include <aws/fms/FMSErrorMarshaller.h>
 #include <aws/fms/FMSErrors.h>
+#include <aws/fms/FMSPaginationBase.h>
 #include <aws/fms/FMSRequest.h>
 #include <aws/fms/FMSServiceClientModel.h>
+#include <aws/fms/FMSWaiter.h>
 #include <aws/fms/FMS_EXPORTS.h>
+#include <aws/fms/internal/FMSEndpointRules.h>
 #include <aws/fms/model/AccountRoleStatus.h>
 #include <aws/fms/model/AccountScope.h>
 #include <aws/fms/model/ActionTarget.h>
@@ -93,20 +97,27 @@
 #include <aws/fms/model/GetViolationDetailsRequest.h>
 #include <aws/fms/model/GetViolationDetailsResult.h>
 #include <aws/fms/model/InvalidNetworkAclEntriesViolation.h>
+#include <aws/fms/model/ListAdminAccountsForOrganizationPaginationTraits.h>
 #include <aws/fms/model/ListAdminAccountsForOrganizationRequest.h>
 #include <aws/fms/model/ListAdminAccountsForOrganizationResult.h>
+#include <aws/fms/model/ListAdminsManagingAccountPaginationTraits.h>
 #include <aws/fms/model/ListAdminsManagingAccountRequest.h>
 #include <aws/fms/model/ListAdminsManagingAccountResult.h>
+#include <aws/fms/model/ListAppsListsPaginationTraits.h>
 #include <aws/fms/model/ListAppsListsRequest.h>
 #include <aws/fms/model/ListAppsListsResult.h>
+#include <aws/fms/model/ListComplianceStatusPaginationTraits.h>
 #include <aws/fms/model/ListComplianceStatusRequest.h>
 #include <aws/fms/model/ListComplianceStatusResult.h>
 #include <aws/fms/model/ListDiscoveredResourcesRequest.h>
 #include <aws/fms/model/ListDiscoveredResourcesResult.h>
+#include <aws/fms/model/ListMemberAccountsPaginationTraits.h>
 #include <aws/fms/model/ListMemberAccountsRequest.h>
 #include <aws/fms/model/ListMemberAccountsResult.h>
+#include <aws/fms/model/ListPoliciesPaginationTraits.h>
 #include <aws/fms/model/ListPoliciesRequest.h>
 #include <aws/fms/model/ListPoliciesResult.h>
+#include <aws/fms/model/ListProtocolsListsPaginationTraits.h>
 #include <aws/fms/model/ListProtocolsListsRequest.h>
 #include <aws/fms/model/ListProtocolsListsResult.h>
 #include <aws/fms/model/ListResourceSetResourcesRequest.h>
@@ -115,6 +126,7 @@
 #include <aws/fms/model/ListResourceSetsResult.h>
 #include <aws/fms/model/ListTagsForResourceRequest.h>
 #include <aws/fms/model/ListTagsForResourceResult.h>
+#include <aws/fms/model/ListThirdPartyFirewallFirewallPoliciesPaginationTraits.h>
 #include <aws/fms/model/ListThirdPartyFirewallFirewallPoliciesRequest.h>
 #include <aws/fms/model/ListThirdPartyFirewallFirewallPoliciesResult.h>
 #include <aws/fms/model/MarketplaceSubscriptionOnboardingStatus.h>
diff --git a/generated/tests/forecast-gen-tests/ForecastServiceIncludeTests.cpp b/generated/tests/forecast-gen-tests/ForecastServiceIncludeTests.cpp
index b8860e6b6fd9..1fa6adc941a6 100644
--- a/generated/tests/forecast-gen-tests/ForecastServiceIncludeTests.cpp
+++ b/generated/tests/forecast-gen-tests/ForecastServiceIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/forecast/ForecastServiceClient.h>
+#include <aws/forecast/ForecastServiceClientPagination.h>
 #include <aws/forecast/ForecastServiceEndpointProvider.h>
 #include <aws/forecast/ForecastServiceErrorMarshaller.h>
 #include <aws/forecast/ForecastServiceErrors.h>
+#include <aws/forecast/ForecastServicePaginationBase.h>
 #include <aws/forecast/ForecastServiceRequest.h>
 #include <aws/forecast/ForecastServiceServiceClientModel.h>
+#include <aws/forecast/ForecastServiceWaiter.h>
 #include <aws/forecast/ForecastService_EXPORTS.h>
+#include <aws/forecast/internal/ForecastServiceEndpointRules.h>
 #include <aws/forecast/model/Action.h>
 #include <aws/forecast/model/AdditionalDataset.h>
 #include <aws/forecast/model/AttributeConfig.h>
@@ -125,34 +129,48 @@
 #include <aws/forecast/model/ImportMode.h>
 #include <aws/forecast/model/InputDataConfig.h>
 #include <aws/forecast/model/IntegerParameterRange.h>
+#include <aws/forecast/model/ListDatasetGroupsPaginationTraits.h>
 #include <aws/forecast/model/ListDatasetGroupsRequest.h>
 #include <aws/forecast/model/ListDatasetGroupsResult.h>
+#include <aws/forecast/model/ListDatasetImportJobsPaginationTraits.h>
 #include <aws/forecast/model/ListDatasetImportJobsRequest.h>
 #include <aws/forecast/model/ListDatasetImportJobsResult.h>
+#include <aws/forecast/model/ListDatasetsPaginationTraits.h>
 #include <aws/forecast/model/ListDatasetsRequest.h>
 #include <aws/forecast/model/ListDatasetsResult.h>
+#include <aws/forecast/model/ListExplainabilitiesPaginationTraits.h>
 #include <aws/forecast/model/ListExplainabilitiesRequest.h>
 #include <aws/forecast/model/ListExplainabilitiesResult.h>
+#include <aws/forecast/model/ListExplainabilityExportsPaginationTraits.h>
 #include <aws/forecast/model/ListExplainabilityExportsRequest.h>
 #include <aws/forecast/model/ListExplainabilityExportsResult.h>
+#include <aws/forecast/model/ListForecastExportJobsPaginationTraits.h>
 #include <aws/forecast/model/ListForecastExportJobsRequest.h>
 #include <aws/forecast/model/ListForecastExportJobsResult.h>
+#include <aws/forecast/model/ListForecastsPaginationTraits.h>
 #include <aws/forecast/model/ListForecastsRequest.h>
 #include <aws/forecast/model/ListForecastsResult.h>
+#include <aws/forecast/model/ListMonitorEvaluationsPaginationTraits.h>
 #include <aws/forecast/model/ListMonitorEvaluationsRequest.h>
 #include <aws/forecast/model/ListMonitorEvaluationsResult.h>
+#include <aws/forecast/model/ListMonitorsPaginationTraits.h>
 #include <aws/forecast/model/ListMonitorsRequest.h>
 #include <aws/forecast/model/ListMonitorsResult.h>
+#include <aws/forecast/model/ListPredictorBacktestExportJobsPaginationTraits.h>
 #include <aws/forecast/model/ListPredictorBacktestExportJobsRequest.h>
 #include <aws/forecast/model/ListPredictorBacktestExportJobsResult.h>
+#include <aws/forecast/model/ListPredictorsPaginationTraits.h>
 #include <aws/forecast/model/ListPredictorsRequest.h>
 #include <aws/forecast/model/ListPredictorsResult.h>
 #include <aws/forecast/model/ListTagsForResourceRequest.h>
 #include <aws/forecast/model/ListTagsForResourceResult.h>
+#include <aws/forecast/model/ListWhatIfAnalysesPaginationTraits.h>
 #include <aws/forecast/model/ListWhatIfAnalysesRequest.h>
 #include <aws/forecast/model/ListWhatIfAnalysesResult.h>
+#include <aws/forecast/model/ListWhatIfForecastExportsPaginationTraits.h>
 #include <aws/forecast/model/ListWhatIfForecastExportsRequest.h>
 #include <aws/forecast/model/ListWhatIfForecastExportsResult.h>
+#include <aws/forecast/model/ListWhatIfForecastsPaginationTraits.h>
 #include <aws/forecast/model/ListWhatIfForecastsRequest.h>
 #include <aws/forecast/model/ListWhatIfForecastsResult.h>
 #include <aws/forecast/model/MetricResult.h>
diff --git a/generated/tests/forecastquery-gen-tests/ForecastQueryServiceIncludeTests.cpp b/generated/tests/forecastquery-gen-tests/ForecastQueryServiceIncludeTests.cpp
index ccd9d5fff00e..3d6586847b91 100644
--- a/generated/tests/forecastquery-gen-tests/ForecastQueryServiceIncludeTests.cpp
+++ b/generated/tests/forecastquery-gen-tests/ForecastQueryServiceIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/forecastquery/ForecastQueryServiceEndpointProvider.h>
 #include <aws/forecastquery/ForecastQueryServiceErrorMarshaller.h>
 #include <aws/forecastquery/ForecastQueryServiceErrors.h>
+#include <aws/forecastquery/ForecastQueryServicePaginationBase.h>
 #include <aws/forecastquery/ForecastQueryServiceRequest.h>
 #include <aws/forecastquery/ForecastQueryServiceServiceClientModel.h>
+#include <aws/forecastquery/ForecastQueryServiceWaiter.h>
 #include <aws/forecastquery/ForecastQueryService_EXPORTS.h>
+#include <aws/forecastquery/internal/ForecastQueryServiceEndpointRules.h>
 #include <aws/forecastquery/model/DataPoint.h>
 #include <aws/forecastquery/model/Forecast.h>
 #include <aws/forecastquery/model/QueryForecastRequest.h>
diff --git a/generated/tests/frauddetector-gen-tests/FraudDetectorIncludeTests.cpp b/generated/tests/frauddetector-gen-tests/FraudDetectorIncludeTests.cpp
index befdbc8e2fec..51ab41c1a4c3 100644
--- a/generated/tests/frauddetector-gen-tests/FraudDetectorIncludeTests.cpp
+++ b/generated/tests/frauddetector-gen-tests/FraudDetectorIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/frauddetector/FraudDetectorClient.h>
+#include <aws/frauddetector/FraudDetectorClientPagination.h>
 #include <aws/frauddetector/FraudDetectorEndpointProvider.h>
 #include <aws/frauddetector/FraudDetectorErrorMarshaller.h>
 #include <aws/frauddetector/FraudDetectorErrors.h>
+#include <aws/frauddetector/FraudDetectorPaginationBase.h>
 #include <aws/frauddetector/FraudDetectorRequest.h>
 #include <aws/frauddetector/FraudDetectorServiceClientModel.h>
+#include <aws/frauddetector/FraudDetectorWaiter.h>
 #include <aws/frauddetector/FraudDetector_EXPORTS.h>
+#include <aws/frauddetector/internal/FraudDetectorEndpointRules.h>
 #include <aws/frauddetector/model/ATIMetricDataPoint.h>
 #include <aws/frauddetector/model/ATIModelPerformance.h>
 #include <aws/frauddetector/model/ATITrainingMetricsValue.h>
@@ -86,6 +90,7 @@
 #include <aws/frauddetector/model/DeleteVariableResult.h>
 #include <aws/frauddetector/model/DescribeDetectorRequest.h>
 #include <aws/frauddetector/model/DescribeDetectorResult.h>
+#include <aws/frauddetector/model/DescribeModelVersionsPaginationTraits.h>
 #include <aws/frauddetector/model/DescribeModelVersionsRequest.h>
 #include <aws/frauddetector/model/DescribeModelVersionsResult.h>
 #include <aws/frauddetector/model/Detector.h>
@@ -109,16 +114,20 @@
 #include <aws/frauddetector/model/FieldValidationMessage.h>
 #include <aws/frauddetector/model/FileValidationMessage.h>
 #include <aws/frauddetector/model/FilterCondition.h>
+#include <aws/frauddetector/model/GetBatchImportJobsPaginationTraits.h>
 #include <aws/frauddetector/model/GetBatchImportJobsRequest.h>
 #include <aws/frauddetector/model/GetBatchImportJobsResult.h>
+#include <aws/frauddetector/model/GetBatchPredictionJobsPaginationTraits.h>
 #include <aws/frauddetector/model/GetBatchPredictionJobsRequest.h>
 #include <aws/frauddetector/model/GetBatchPredictionJobsResult.h>
 #include <aws/frauddetector/model/GetDeleteEventsByEventTypeStatusRequest.h>
 #include <aws/frauddetector/model/GetDeleteEventsByEventTypeStatusResult.h>
 #include <aws/frauddetector/model/GetDetectorVersionRequest.h>
 #include <aws/frauddetector/model/GetDetectorVersionResult.h>
+#include <aws/frauddetector/model/GetDetectorsPaginationTraits.h>
 #include <aws/frauddetector/model/GetDetectorsRequest.h>
 #include <aws/frauddetector/model/GetDetectorsResult.h>
+#include <aws/frauddetector/model/GetEntityTypesPaginationTraits.h>
 #include <aws/frauddetector/model/GetEntityTypesRequest.h>
 #include <aws/frauddetector/model/GetEntityTypesResult.h>
 #include <aws/frauddetector/model/GetEventPredictionMetadataRequest.h>
@@ -127,26 +136,35 @@
 #include <aws/frauddetector/model/GetEventPredictionResult.h>
 #include <aws/frauddetector/model/GetEventRequest.h>
 #include <aws/frauddetector/model/GetEventResult.h>
+#include <aws/frauddetector/model/GetEventTypesPaginationTraits.h>
 #include <aws/frauddetector/model/GetEventTypesRequest.h>
 #include <aws/frauddetector/model/GetEventTypesResult.h>
+#include <aws/frauddetector/model/GetExternalModelsPaginationTraits.h>
 #include <aws/frauddetector/model/GetExternalModelsRequest.h>
 #include <aws/frauddetector/model/GetExternalModelsResult.h>
 #include <aws/frauddetector/model/GetKMSEncryptionKeyRequest.h>
 #include <aws/frauddetector/model/GetKMSEncryptionKeyResult.h>
+#include <aws/frauddetector/model/GetLabelsPaginationTraits.h>
 #include <aws/frauddetector/model/GetLabelsRequest.h>
 #include <aws/frauddetector/model/GetLabelsResult.h>
+#include <aws/frauddetector/model/GetListElementsPaginationTraits.h>
 #include <aws/frauddetector/model/GetListElementsRequest.h>
 #include <aws/frauddetector/model/GetListElementsResult.h>
+#include <aws/frauddetector/model/GetListsMetadataPaginationTraits.h>
 #include <aws/frauddetector/model/GetListsMetadataRequest.h>
 #include <aws/frauddetector/model/GetListsMetadataResult.h>
 #include <aws/frauddetector/model/GetModelVersionRequest.h>
 #include <aws/frauddetector/model/GetModelVersionResult.h>
+#include <aws/frauddetector/model/GetModelsPaginationTraits.h>
 #include <aws/frauddetector/model/GetModelsRequest.h>
 #include <aws/frauddetector/model/GetModelsResult.h>
+#include <aws/frauddetector/model/GetOutcomesPaginationTraits.h>
 #include <aws/frauddetector/model/GetOutcomesRequest.h>
 #include <aws/frauddetector/model/GetOutcomesResult.h>
+#include <aws/frauddetector/model/GetRulesPaginationTraits.h>
 #include <aws/frauddetector/model/GetRulesRequest.h>
 #include <aws/frauddetector/model/GetRulesResult.h>
+#include <aws/frauddetector/model/GetVariablesPaginationTraits.h>
 #include <aws/frauddetector/model/GetVariablesRequest.h>
 #include <aws/frauddetector/model/GetVariablesResult.h>
 #include <aws/frauddetector/model/IngestedEventStatistics.h>
@@ -156,8 +174,10 @@
 #include <aws/frauddetector/model/Label.h>
 #include <aws/frauddetector/model/LabelSchema.h>
 #include <aws/frauddetector/model/Language.h>
+#include <aws/frauddetector/model/ListEventPredictionsPaginationTraits.h>
 #include <aws/frauddetector/model/ListEventPredictionsRequest.h>
 #include <aws/frauddetector/model/ListEventPredictionsResult.h>
+#include <aws/frauddetector/model/ListTagsForResourcePaginationTraits.h>
 #include <aws/frauddetector/model/ListTagsForResourceRequest.h>
 #include <aws/frauddetector/model/ListTagsForResourceResult.h>
 #include <aws/frauddetector/model/ListUpdateMode.h>
diff --git a/generated/tests/freetier-gen-tests/FreeTierIncludeTests.cpp b/generated/tests/freetier-gen-tests/FreeTierIncludeTests.cpp
index 402f9d7b9451..830153d1d4f9 100644
--- a/generated/tests/freetier-gen-tests/FreeTierIncludeTests.cpp
+++ b/generated/tests/freetier-gen-tests/FreeTierIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/freetier/FreeTierClient.h>
+#include <aws/freetier/FreeTierClientPagination.h>
 #include <aws/freetier/FreeTierEndpointProvider.h>
 #include <aws/freetier/FreeTierErrorMarshaller.h>
 #include <aws/freetier/FreeTierErrors.h>
+#include <aws/freetier/FreeTierPaginationBase.h>
 #include <aws/freetier/FreeTierRequest.h>
 #include <aws/freetier/FreeTierServiceClientModel.h>
+#include <aws/freetier/FreeTierWaiter.h>
 #include <aws/freetier/FreeTier_EXPORTS.h>
+#include <aws/freetier/internal/FreeTierEndpointRules.h>
 #include <aws/freetier/model/AccountPlanStatus.h>
 #include <aws/freetier/model/AccountPlanType.h>
 #include <aws/freetier/model/ActivityReward.h>
@@ -27,9 +31,11 @@
 #include <aws/freetier/model/GetAccountActivityResult.h>
 #include <aws/freetier/model/GetAccountPlanStateRequest.h>
 #include <aws/freetier/model/GetAccountPlanStateResult.h>
+#include <aws/freetier/model/GetFreeTierUsagePaginationTraits.h>
 #include <aws/freetier/model/GetFreeTierUsageRequest.h>
 #include <aws/freetier/model/GetFreeTierUsageResult.h>
 #include <aws/freetier/model/LanguageCode.h>
+#include <aws/freetier/model/ListAccountActivitiesPaginationTraits.h>
 #include <aws/freetier/model/ListAccountActivitiesRequest.h>
 #include <aws/freetier/model/ListAccountActivitiesResult.h>
 #include <aws/freetier/model/MatchOption.h>
diff --git a/generated/tests/fsx-gen-tests/FSxIncludeTests.cpp b/generated/tests/fsx-gen-tests/FSxIncludeTests.cpp
index bc65a18e648f..6bc060964463 100644
--- a/generated/tests/fsx-gen-tests/FSxIncludeTests.cpp
+++ b/generated/tests/fsx-gen-tests/FSxIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/fsx/FSxClient.h>
+#include <aws/fsx/FSxClientPagination.h>
 #include <aws/fsx/FSxEndpointProvider.h>
 #include <aws/fsx/FSxErrorMarshaller.h>
 #include <aws/fsx/FSxErrors.h>
+#include <aws/fsx/FSxPaginationBase.h>
 #include <aws/fsx/FSxRequest.h>
 #include <aws/fsx/FSxServiceClientModel.h>
+#include <aws/fsx/FSxWaiter.h>
 #include <aws/fsx/FSx_EXPORTS.h>
+#include <aws/fsx/internal/FSxEndpointRules.h>
 #include <aws/fsx/model/AccessPointAlreadyOwnedByYou.h>
 #include <aws/fsx/model/ActiveDirectoryBackupAttributes.h>
 #include <aws/fsx/model/ActiveDirectoryError.h>
@@ -117,26 +121,36 @@
 #include <aws/fsx/model/DeleteVolumeOpenZFSConfiguration.h>
 #include <aws/fsx/model/DeleteVolumeRequest.h>
 #include <aws/fsx/model/DeleteVolumeResult.h>
+#include <aws/fsx/model/DescribeBackupsPaginationTraits.h>
 #include <aws/fsx/model/DescribeBackupsRequest.h>
 #include <aws/fsx/model/DescribeBackupsResult.h>
+#include <aws/fsx/model/DescribeDataRepositoryAssociationsPaginationTraits.h>
 #include <aws/fsx/model/DescribeDataRepositoryAssociationsRequest.h>
 #include <aws/fsx/model/DescribeDataRepositoryAssociationsResult.h>
+#include <aws/fsx/model/DescribeDataRepositoryTasksPaginationTraits.h>
 #include <aws/fsx/model/DescribeDataRepositoryTasksRequest.h>
 #include <aws/fsx/model/DescribeDataRepositoryTasksResult.h>
+#include <aws/fsx/model/DescribeFileCachesPaginationTraits.h>
 #include <aws/fsx/model/DescribeFileCachesRequest.h>
 #include <aws/fsx/model/DescribeFileCachesResult.h>
+#include <aws/fsx/model/DescribeFileSystemAliasesPaginationTraits.h>
 #include <aws/fsx/model/DescribeFileSystemAliasesRequest.h>
 #include <aws/fsx/model/DescribeFileSystemAliasesResult.h>
+#include <aws/fsx/model/DescribeFileSystemsPaginationTraits.h>
 #include <aws/fsx/model/DescribeFileSystemsRequest.h>
 #include <aws/fsx/model/DescribeFileSystemsResult.h>
+#include <aws/fsx/model/DescribeS3AccessPointAttachmentsPaginationTraits.h>
 #include <aws/fsx/model/DescribeS3AccessPointAttachmentsRequest.h>
 #include <aws/fsx/model/DescribeS3AccessPointAttachmentsResult.h>
 #include <aws/fsx/model/DescribeSharedVpcConfigurationRequest.h>
 #include <aws/fsx/model/DescribeSharedVpcConfigurationResult.h>
+#include <aws/fsx/model/DescribeSnapshotsPaginationTraits.h>
 #include <aws/fsx/model/DescribeSnapshotsRequest.h>
 #include <aws/fsx/model/DescribeSnapshotsResult.h>
+#include <aws/fsx/model/DescribeStorageVirtualMachinesPaginationTraits.h>
 #include <aws/fsx/model/DescribeStorageVirtualMachinesRequest.h>
 #include <aws/fsx/model/DescribeStorageVirtualMachinesResult.h>
+#include <aws/fsx/model/DescribeVolumesPaginationTraits.h>
 #include <aws/fsx/model/DescribeVolumesRequest.h>
 #include <aws/fsx/model/DescribeVolumesResult.h>
 #include <aws/fsx/model/DetachAndDeleteS3AccessPointRequest.h>
@@ -175,6 +189,7 @@
 #include <aws/fsx/model/InvalidNetworkSettings.h>
 #include <aws/fsx/model/InvalidRequest.h>
 #include <aws/fsx/model/LifecycleTransitionReason.h>
+#include <aws/fsx/model/ListTagsForResourcePaginationTraits.h>
 #include <aws/fsx/model/ListTagsForResourceRequest.h>
 #include <aws/fsx/model/ListTagsForResourceResult.h>
 #include <aws/fsx/model/LustreAccessAuditLogLevel.h>
diff --git a/generated/tests/gamelift-gen-tests/GameLiftIncludeTests.cpp b/generated/tests/gamelift-gen-tests/GameLiftIncludeTests.cpp
index 3088bc6116f5..550b7a46e203 100644
--- a/generated/tests/gamelift-gen-tests/GameLiftIncludeTests.cpp
+++ b/generated/tests/gamelift-gen-tests/GameLiftIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/gamelift/GameLiftClient.h>
+#include <aws/gamelift/GameLiftClientPagination.h>
 #include <aws/gamelift/GameLiftEndpointProvider.h>
 #include <aws/gamelift/GameLiftErrorMarshaller.h>
 #include <aws/gamelift/GameLiftErrors.h>
+#include <aws/gamelift/GameLiftPaginationBase.h>
 #include <aws/gamelift/GameLiftRequest.h>
 #include <aws/gamelift/GameLiftServiceClientModel.h>
+#include <aws/gamelift/GameLiftWaiter.h>
 #include <aws/gamelift/GameLift_EXPORTS.h>
+#include <aws/gamelift/internal/GameLiftEndpointRules.h>
 #include <aws/gamelift/model/AcceptMatchRequest.h>
 #include <aws/gamelift/model/AcceptMatchResult.h>
 #include <aws/gamelift/model/AcceptanceType.h>
@@ -137,14 +141,18 @@
 #include <aws/gamelift/model/DescribeContainerGroupPortMappingsResult.h>
 #include <aws/gamelift/model/DescribeEC2InstanceLimitsRequest.h>
 #include <aws/gamelift/model/DescribeEC2InstanceLimitsResult.h>
+#include <aws/gamelift/model/DescribeFleetAttributesPaginationTraits.h>
 #include <aws/gamelift/model/DescribeFleetAttributesRequest.h>
 #include <aws/gamelift/model/DescribeFleetAttributesResult.h>
+#include <aws/gamelift/model/DescribeFleetCapacityPaginationTraits.h>
 #include <aws/gamelift/model/DescribeFleetCapacityRequest.h>
 #include <aws/gamelift/model/DescribeFleetCapacityResult.h>
 #include <aws/gamelift/model/DescribeFleetDeploymentRequest.h>
 #include <aws/gamelift/model/DescribeFleetDeploymentResult.h>
+#include <aws/gamelift/model/DescribeFleetEventsPaginationTraits.h>
 #include <aws/gamelift/model/DescribeFleetEventsRequest.h>
 #include <aws/gamelift/model/DescribeFleetEventsResult.h>
+#include <aws/gamelift/model/DescribeFleetLocationAttributesPaginationTraits.h>
 #include <aws/gamelift/model/DescribeFleetLocationAttributesRequest.h>
 #include <aws/gamelift/model/DescribeFleetLocationAttributesResult.h>
 #include <aws/gamelift/model/DescribeFleetLocationCapacityRequest.h>
@@ -153,34 +161,44 @@
 #include <aws/gamelift/model/DescribeFleetLocationUtilizationResult.h>
 #include <aws/gamelift/model/DescribeFleetPortSettingsRequest.h>
 #include <aws/gamelift/model/DescribeFleetPortSettingsResult.h>
+#include <aws/gamelift/model/DescribeFleetUtilizationPaginationTraits.h>
 #include <aws/gamelift/model/DescribeFleetUtilizationRequest.h>
 #include <aws/gamelift/model/DescribeFleetUtilizationResult.h>
 #include <aws/gamelift/model/DescribeGameServerGroupRequest.h>
 #include <aws/gamelift/model/DescribeGameServerGroupResult.h>
+#include <aws/gamelift/model/DescribeGameServerInstancesPaginationTraits.h>
 #include <aws/gamelift/model/DescribeGameServerInstancesRequest.h>
 #include <aws/gamelift/model/DescribeGameServerInstancesResult.h>
 #include <aws/gamelift/model/DescribeGameServerRequest.h>
 #include <aws/gamelift/model/DescribeGameServerResult.h>
+#include <aws/gamelift/model/DescribeGameSessionDetailsPaginationTraits.h>
 #include <aws/gamelift/model/DescribeGameSessionDetailsRequest.h>
 #include <aws/gamelift/model/DescribeGameSessionDetailsResult.h>
 #include <aws/gamelift/model/DescribeGameSessionPlacementRequest.h>
 #include <aws/gamelift/model/DescribeGameSessionPlacementResult.h>
+#include <aws/gamelift/model/DescribeGameSessionQueuesPaginationTraits.h>
 #include <aws/gamelift/model/DescribeGameSessionQueuesRequest.h>
 #include <aws/gamelift/model/DescribeGameSessionQueuesResult.h>
+#include <aws/gamelift/model/DescribeGameSessionsPaginationTraits.h>
 #include <aws/gamelift/model/DescribeGameSessionsRequest.h>
 #include <aws/gamelift/model/DescribeGameSessionsResult.h>
+#include <aws/gamelift/model/DescribeInstancesPaginationTraits.h>
 #include <aws/gamelift/model/DescribeInstancesRequest.h>
 #include <aws/gamelift/model/DescribeInstancesResult.h>
+#include <aws/gamelift/model/DescribeMatchmakingConfigurationsPaginationTraits.h>
 #include <aws/gamelift/model/DescribeMatchmakingConfigurationsRequest.h>
 #include <aws/gamelift/model/DescribeMatchmakingConfigurationsResult.h>
 #include <aws/gamelift/model/DescribeMatchmakingRequest.h>
 #include <aws/gamelift/model/DescribeMatchmakingResult.h>
+#include <aws/gamelift/model/DescribeMatchmakingRuleSetsPaginationTraits.h>
 #include <aws/gamelift/model/DescribeMatchmakingRuleSetsRequest.h>
 #include <aws/gamelift/model/DescribeMatchmakingRuleSetsResult.h>
+#include <aws/gamelift/model/DescribePlayerSessionsPaginationTraits.h>
 #include <aws/gamelift/model/DescribePlayerSessionsRequest.h>
 #include <aws/gamelift/model/DescribePlayerSessionsResult.h>
 #include <aws/gamelift/model/DescribeRuntimeConfigurationRequest.h>
 #include <aws/gamelift/model/DescribeRuntimeConfigurationResult.h>
+#include <aws/gamelift/model/DescribeScalingPoliciesPaginationTraits.h>
 #include <aws/gamelift/model/DescribeScalingPoliciesRequest.h>
 #include <aws/gamelift/model/DescribeScalingPoliciesResult.h>
 #include <aws/gamelift/model/DescribeScriptRequest.h>
@@ -254,29 +272,41 @@
 #include <aws/gamelift/model/LaunchTemplateSpecification.h>
 #include <aws/gamelift/model/LinuxCapabilities.h>
 #include <aws/gamelift/model/LinuxCapability.h>
+#include <aws/gamelift/model/ListAliasesPaginationTraits.h>
 #include <aws/gamelift/model/ListAliasesRequest.h>
 #include <aws/gamelift/model/ListAliasesResult.h>
+#include <aws/gamelift/model/ListBuildsPaginationTraits.h>
 #include <aws/gamelift/model/ListBuildsRequest.h>
 #include <aws/gamelift/model/ListBuildsResult.h>
 #include <aws/gamelift/model/ListComputeInputStatus.h>
+#include <aws/gamelift/model/ListComputePaginationTraits.h>
 #include <aws/gamelift/model/ListComputeRequest.h>
 #include <aws/gamelift/model/ListComputeResult.h>
+#include <aws/gamelift/model/ListContainerFleetsPaginationTraits.h>
 #include <aws/gamelift/model/ListContainerFleetsRequest.h>
 #include <aws/gamelift/model/ListContainerFleetsResult.h>
+#include <aws/gamelift/model/ListContainerGroupDefinitionVersionsPaginationTraits.h>
 #include <aws/gamelift/model/ListContainerGroupDefinitionVersionsRequest.h>
 #include <aws/gamelift/model/ListContainerGroupDefinitionVersionsResult.h>
+#include <aws/gamelift/model/ListContainerGroupDefinitionsPaginationTraits.h>
 #include <aws/gamelift/model/ListContainerGroupDefinitionsRequest.h>
 #include <aws/gamelift/model/ListContainerGroupDefinitionsResult.h>
+#include <aws/gamelift/model/ListFleetDeploymentsPaginationTraits.h>
 #include <aws/gamelift/model/ListFleetDeploymentsRequest.h>
 #include <aws/gamelift/model/ListFleetDeploymentsResult.h>
+#include <aws/gamelift/model/ListFleetsPaginationTraits.h>
 #include <aws/gamelift/model/ListFleetsRequest.h>
 #include <aws/gamelift/model/ListFleetsResult.h>
+#include <aws/gamelift/model/ListGameServerGroupsPaginationTraits.h>
 #include <aws/gamelift/model/ListGameServerGroupsRequest.h>
 #include <aws/gamelift/model/ListGameServerGroupsResult.h>
+#include <aws/gamelift/model/ListGameServersPaginationTraits.h>
 #include <aws/gamelift/model/ListGameServersRequest.h>
 #include <aws/gamelift/model/ListGameServersResult.h>
+#include <aws/gamelift/model/ListLocationsPaginationTraits.h>
 #include <aws/gamelift/model/ListLocationsRequest.h>
 #include <aws/gamelift/model/ListLocationsResult.h>
+#include <aws/gamelift/model/ListScriptsPaginationTraits.h>
 #include <aws/gamelift/model/ListScriptsRequest.h>
 #include <aws/gamelift/model/ListScriptsResult.h>
 #include <aws/gamelift/model/ListTagsForResourceRequest.h>
@@ -338,6 +368,7 @@
 #include <aws/gamelift/model/ScalingPolicy.h>
 #include <aws/gamelift/model/ScalingStatusType.h>
 #include <aws/gamelift/model/Script.h>
+#include <aws/gamelift/model/SearchGameSessionsPaginationTraits.h>
 #include <aws/gamelift/model/SearchGameSessionsRequest.h>
 #include <aws/gamelift/model/SearchGameSessionsResult.h>
 #include <aws/gamelift/model/ServerProcess.h>
diff --git a/generated/tests/gameliftstreams-gen-tests/GameLiftStreamsIncludeTests.cpp b/generated/tests/gameliftstreams-gen-tests/GameLiftStreamsIncludeTests.cpp
index ef9ba7c16e11..3616eb1ce09b 100644
--- a/generated/tests/gameliftstreams-gen-tests/GameLiftStreamsIncludeTests.cpp
+++ b/generated/tests/gameliftstreams-gen-tests/GameLiftStreamsIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/gameliftstreams/GameLiftStreamsClient.h>
+#include <aws/gameliftstreams/GameLiftStreamsClientPagination.h>
 #include <aws/gameliftstreams/GameLiftStreamsEndpointProvider.h>
 #include <aws/gameliftstreams/GameLiftStreamsErrorMarshaller.h>
 #include <aws/gameliftstreams/GameLiftStreamsErrors.h>
+#include <aws/gameliftstreams/GameLiftStreamsPaginationBase.h>
 #include <aws/gameliftstreams/GameLiftStreamsRequest.h>
 #include <aws/gameliftstreams/GameLiftStreamsServiceClientModel.h>
+#include <aws/gameliftstreams/GameLiftStreamsWaiter.h>
 #include <aws/gameliftstreams/GameLiftStreams_EXPORTS.h>
+#include <aws/gameliftstreams/internal/GameLiftStreamsEndpointRules.h>
 #include <aws/gameliftstreams/model/AddStreamGroupLocationsRequest.h>
 #include <aws/gameliftstreams/model/AddStreamGroupLocationsResult.h>
 #include <aws/gameliftstreams/model/ApplicationStatus.h>
@@ -50,14 +54,19 @@
 #include <aws/gameliftstreams/model/GetStreamUrlResult.h>
 #include <aws/gameliftstreams/model/ListApplicationShaderCachesRequest.h>
 #include <aws/gameliftstreams/model/ListApplicationShaderCachesResult.h>
+#include <aws/gameliftstreams/model/ListApplicationsPaginationTraits.h>
 #include <aws/gameliftstreams/model/ListApplicationsRequest.h>
 #include <aws/gameliftstreams/model/ListApplicationsResult.h>
+#include <aws/gameliftstreams/model/ListStreamGroupsPaginationTraits.h>
 #include <aws/gameliftstreams/model/ListStreamGroupsRequest.h>
 #include <aws/gameliftstreams/model/ListStreamGroupsResult.h>
+#include <aws/gameliftstreams/model/ListStreamSessionsByAccountPaginationTraits.h>
 #include <aws/gameliftstreams/model/ListStreamSessionsByAccountRequest.h>
 #include <aws/gameliftstreams/model/ListStreamSessionsByAccountResult.h>
+#include <aws/gameliftstreams/model/ListStreamSessionsPaginationTraits.h>
 #include <aws/gameliftstreams/model/ListStreamSessionsRequest.h>
 #include <aws/gameliftstreams/model/ListStreamSessionsResult.h>
+#include <aws/gameliftstreams/model/ListStreamUrlsPaginationTraits.h>
 #include <aws/gameliftstreams/model/ListStreamUrlsRequest.h>
 #include <aws/gameliftstreams/model/ListStreamUrlsResult.h>
 #include <aws/gameliftstreams/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/geo-maps-gen-tests/GeoMapsIncludeTests.cpp b/generated/tests/geo-maps-gen-tests/GeoMapsIncludeTests.cpp
index a6ede6cb2ea8..b90dcd4449da 100644
--- a/generated/tests/geo-maps-gen-tests/GeoMapsIncludeTests.cpp
+++ b/generated/tests/geo-maps-gen-tests/GeoMapsIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/geo-maps/GeoMapsEndpointProvider.h>
 #include <aws/geo-maps/GeoMapsErrorMarshaller.h>
 #include <aws/geo-maps/GeoMapsErrors.h>
+#include <aws/geo-maps/GeoMapsPaginationBase.h>
 #include <aws/geo-maps/GeoMapsRequest.h>
 #include <aws/geo-maps/GeoMapsServiceClientModel.h>
+#include <aws/geo-maps/GeoMapsWaiter.h>
 #include <aws/geo-maps/GeoMaps_EXPORTS.h>
+#include <aws/geo-maps/internal/GeoMapsEndpointRules.h>
 #include <aws/geo-maps/model/Buildings.h>
 #include <aws/geo-maps/model/ColorScheme.h>
 #include <aws/geo-maps/model/ContourDensity.h>
diff --git a/generated/tests/geo-places-gen-tests/GeoPlacesIncludeTests.cpp b/generated/tests/geo-places-gen-tests/GeoPlacesIncludeTests.cpp
index 4b7fcd4df89a..97876a4027b9 100644
--- a/generated/tests/geo-places-gen-tests/GeoPlacesIncludeTests.cpp
+++ b/generated/tests/geo-places-gen-tests/GeoPlacesIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/geo-places/GeoPlacesEndpointProvider.h>
 #include <aws/geo-places/GeoPlacesErrorMarshaller.h>
 #include <aws/geo-places/GeoPlacesErrors.h>
+#include <aws/geo-places/GeoPlacesPaginationBase.h>
 #include <aws/geo-places/GeoPlacesRequest.h>
 #include <aws/geo-places/GeoPlacesServiceClientModel.h>
+#include <aws/geo-places/GeoPlacesWaiter.h>
 #include <aws/geo-places/GeoPlaces_EXPORTS.h>
+#include <aws/geo-places/internal/GeoPlacesEndpointRules.h>
 #include <aws/geo-places/model/AccessPoint.h>
 #include <aws/geo-places/model/AccessPointType.h>
 #include <aws/geo-places/model/AccessRestriction.h>
diff --git a/generated/tests/geo-routes-gen-tests/GeoRoutesIncludeTests.cpp b/generated/tests/geo-routes-gen-tests/GeoRoutesIncludeTests.cpp
index 940aa3b993b4..0efb95f31c52 100644
--- a/generated/tests/geo-routes-gen-tests/GeoRoutesIncludeTests.cpp
+++ b/generated/tests/geo-routes-gen-tests/GeoRoutesIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/geo-routes/GeoRoutesEndpointProvider.h>
 #include <aws/geo-routes/GeoRoutesErrorMarshaller.h>
 #include <aws/geo-routes/GeoRoutesErrors.h>
+#include <aws/geo-routes/GeoRoutesPaginationBase.h>
 #include <aws/geo-routes/GeoRoutesRequest.h>
 #include <aws/geo-routes/GeoRoutesServiceClientModel.h>
+#include <aws/geo-routes/GeoRoutesWaiter.h>
 #include <aws/geo-routes/GeoRoutes_EXPORTS.h>
+#include <aws/geo-routes/internal/GeoRoutesEndpointRules.h>
 #include <aws/geo-routes/model/CalculateIsolinesRequest.h>
 #include <aws/geo-routes/model/CalculateIsolinesResult.h>
 #include <aws/geo-routes/model/CalculateRouteMatrixRequest.h>
diff --git a/generated/tests/glacier-gen-tests/GlacierIncludeTests.cpp b/generated/tests/glacier-gen-tests/GlacierIncludeTests.cpp
index fe7d047cc164..d57f36532450 100644
--- a/generated/tests/glacier-gen-tests/GlacierIncludeTests.cpp
+++ b/generated/tests/glacier-gen-tests/GlacierIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/glacier/GlacierClient.h>
+#include <aws/glacier/GlacierClientPagination.h>
 #include <aws/glacier/GlacierEndpointProvider.h>
 #include <aws/glacier/GlacierErrorMarshaller.h>
 #include <aws/glacier/GlacierErrors.h>
+#include <aws/glacier/GlacierPaginationBase.h>
 #include <aws/glacier/GlacierRequest.h>
 #include <aws/glacier/GlacierServiceClientModel.h>
+#include <aws/glacier/GlacierWaiter.h>
 #include <aws/glacier/Glacier_EXPORTS.h>
+#include <aws/glacier/internal/GlacierEndpointRules.h>
 #include <aws/glacier/model/AbortMultipartUploadRequest.h>
 #include <aws/glacier/model/AbortVaultLockRequest.h>
 #include <aws/glacier/model/ActionCode.h>
@@ -66,16 +70,20 @@
 #include <aws/glacier/model/InventoryRetrievalJobInput.h>
 #include <aws/glacier/model/JobParameters.h>
 #include <aws/glacier/model/LimitExceededException.h>
+#include <aws/glacier/model/ListJobsPaginationTraits.h>
 #include <aws/glacier/model/ListJobsRequest.h>
 #include <aws/glacier/model/ListJobsResult.h>
+#include <aws/glacier/model/ListMultipartUploadsPaginationTraits.h>
 #include <aws/glacier/model/ListMultipartUploadsRequest.h>
 #include <aws/glacier/model/ListMultipartUploadsResult.h>
+#include <aws/glacier/model/ListPartsPaginationTraits.h>
 #include <aws/glacier/model/ListPartsRequest.h>
 #include <aws/glacier/model/ListPartsResult.h>
 #include <aws/glacier/model/ListProvisionedCapacityRequest.h>
 #include <aws/glacier/model/ListProvisionedCapacityResult.h>
 #include <aws/glacier/model/ListTagsForVaultRequest.h>
 #include <aws/glacier/model/ListTagsForVaultResult.h>
+#include <aws/glacier/model/ListVaultsPaginationTraits.h>
 #include <aws/glacier/model/ListVaultsRequest.h>
 #include <aws/glacier/model/ListVaultsResult.h>
 #include <aws/glacier/model/MissingParameterValueException.h>
diff --git a/generated/tests/globalaccelerator-gen-tests/GlobalAcceleratorIncludeTests.cpp b/generated/tests/globalaccelerator-gen-tests/GlobalAcceleratorIncludeTests.cpp
index 9dcc2b775e7d..fbae0d0471a3 100644
--- a/generated/tests/globalaccelerator-gen-tests/GlobalAcceleratorIncludeTests.cpp
+++ b/generated/tests/globalaccelerator-gen-tests/GlobalAcceleratorIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/globalaccelerator/GlobalAcceleratorClient.h>
+#include <aws/globalaccelerator/GlobalAcceleratorClientPagination.h>
 #include <aws/globalaccelerator/GlobalAcceleratorEndpointProvider.h>
 #include <aws/globalaccelerator/GlobalAcceleratorErrorMarshaller.h>
 #include <aws/globalaccelerator/GlobalAcceleratorErrors.h>
+#include <aws/globalaccelerator/GlobalAcceleratorPaginationBase.h>
 #include <aws/globalaccelerator/GlobalAcceleratorRequest.h>
 #include <aws/globalaccelerator/GlobalAcceleratorServiceClientModel.h>
+#include <aws/globalaccelerator/GlobalAcceleratorWaiter.h>
 #include <aws/globalaccelerator/GlobalAccelerator_EXPORTS.h>
+#include <aws/globalaccelerator/internal/GlobalAcceleratorEndpointRules.h>
 #include <aws/globalaccelerator/model/Accelerator.h>
 #include <aws/globalaccelerator/model/AcceleratorAttributes.h>
 #include <aws/globalaccelerator/model/AcceleratorEvent.h>
@@ -94,28 +98,39 @@
 #include <aws/globalaccelerator/model/IpAddressFamily.h>
 #include <aws/globalaccelerator/model/IpAddressType.h>
 #include <aws/globalaccelerator/model/IpSet.h>
+#include <aws/globalaccelerator/model/ListAcceleratorsPaginationTraits.h>
 #include <aws/globalaccelerator/model/ListAcceleratorsRequest.h>
 #include <aws/globalaccelerator/model/ListAcceleratorsResult.h>
+#include <aws/globalaccelerator/model/ListByoipCidrsPaginationTraits.h>
 #include <aws/globalaccelerator/model/ListByoipCidrsRequest.h>
 #include <aws/globalaccelerator/model/ListByoipCidrsResult.h>
+#include <aws/globalaccelerator/model/ListCrossAccountAttachmentsPaginationTraits.h>
 #include <aws/globalaccelerator/model/ListCrossAccountAttachmentsRequest.h>
 #include <aws/globalaccelerator/model/ListCrossAccountAttachmentsResult.h>
 #include <aws/globalaccelerator/model/ListCrossAccountResourceAccountsRequest.h>
 #include <aws/globalaccelerator/model/ListCrossAccountResourceAccountsResult.h>
+#include <aws/globalaccelerator/model/ListCrossAccountResourcesPaginationTraits.h>
 #include <aws/globalaccelerator/model/ListCrossAccountResourcesRequest.h>
 #include <aws/globalaccelerator/model/ListCrossAccountResourcesResult.h>
+#include <aws/globalaccelerator/model/ListCustomRoutingAcceleratorsPaginationTraits.h>
 #include <aws/globalaccelerator/model/ListCustomRoutingAcceleratorsRequest.h>
 #include <aws/globalaccelerator/model/ListCustomRoutingAcceleratorsResult.h>
+#include <aws/globalaccelerator/model/ListCustomRoutingEndpointGroupsPaginationTraits.h>
 #include <aws/globalaccelerator/model/ListCustomRoutingEndpointGroupsRequest.h>
 #include <aws/globalaccelerator/model/ListCustomRoutingEndpointGroupsResult.h>
+#include <aws/globalaccelerator/model/ListCustomRoutingListenersPaginationTraits.h>
 #include <aws/globalaccelerator/model/ListCustomRoutingListenersRequest.h>
 #include <aws/globalaccelerator/model/ListCustomRoutingListenersResult.h>
+#include <aws/globalaccelerator/model/ListCustomRoutingPortMappingsByDestinationPaginationTraits.h>
 #include <aws/globalaccelerator/model/ListCustomRoutingPortMappingsByDestinationRequest.h>
 #include <aws/globalaccelerator/model/ListCustomRoutingPortMappingsByDestinationResult.h>
+#include <aws/globalaccelerator/model/ListCustomRoutingPortMappingsPaginationTraits.h>
 #include <aws/globalaccelerator/model/ListCustomRoutingPortMappingsRequest.h>
 #include <aws/globalaccelerator/model/ListCustomRoutingPortMappingsResult.h>
+#include <aws/globalaccelerator/model/ListEndpointGroupsPaginationTraits.h>
 #include <aws/globalaccelerator/model/ListEndpointGroupsRequest.h>
 #include <aws/globalaccelerator/model/ListEndpointGroupsResult.h>
+#include <aws/globalaccelerator/model/ListListenersPaginationTraits.h>
 #include <aws/globalaccelerator/model/ListListenersRequest.h>
 #include <aws/globalaccelerator/model/ListListenersResult.h>
 #include <aws/globalaccelerator/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/glue-gen-tests/GlueIncludeTests.cpp b/generated/tests/glue-gen-tests/GlueIncludeTests.cpp
index ddab605fde25..d17bd6b1abc2 100644
--- a/generated/tests/glue-gen-tests/GlueIncludeTests.cpp
+++ b/generated/tests/glue-gen-tests/GlueIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/glue/GlueClient.h>
+#include <aws/glue/GlueClientPagination.h>
 #include <aws/glue/GlueEndpointProvider.h>
 #include <aws/glue/GlueErrorMarshaller.h>
 #include <aws/glue/GlueErrors.h>
+#include <aws/glue/GluePaginationBase.h>
 #include <aws/glue/GlueRequest.h>
 #include <aws/glue/GlueServiceClientModel.h>
+#include <aws/glue/GlueWaiter.h>
 #include <aws/glue/Glue_EXPORTS.h>
+#include <aws/glue/internal/GlueEndpointRules.h>
 #include <aws/glue/model/Action.h>
 #include <aws/glue/model/AdditionalOptionKeys.h>
 #include <aws/glue/model/AggFunction.h>
@@ -395,6 +399,7 @@
 #include <aws/glue/model/DeltaTargetCompressionType.h>
 #include <aws/glue/model/DescribeConnectionTypeRequest.h>
 #include <aws/glue/model/DescribeConnectionTypeResult.h>
+#include <aws/glue/model/DescribeEntityPaginationTraits.h>
 #include <aws/glue/model/DescribeEntityRequest.h>
 #include <aws/glue/model/DescribeEntityResult.h>
 #include <aws/glue/model/DescribeInboundIntegrationsRequest.h>
@@ -478,6 +483,7 @@
 #include <aws/glue/model/GetBlueprintResult.h>
 #include <aws/glue/model/GetBlueprintRunRequest.h>
 #include <aws/glue/model/GetBlueprintRunResult.h>
+#include <aws/glue/model/GetBlueprintRunsPaginationTraits.h>
 #include <aws/glue/model/GetBlueprintRunsRequest.h>
 #include <aws/glue/model/GetBlueprintRunsResult.h>
 #include <aws/glue/model/GetCatalogImportStatusRequest.h>
@@ -488,6 +494,7 @@
 #include <aws/glue/model/GetCatalogsResult.h>
 #include <aws/glue/model/GetClassifierRequest.h>
 #include <aws/glue/model/GetClassifierResult.h>
+#include <aws/glue/model/GetClassifiersPaginationTraits.h>
 #include <aws/glue/model/GetClassifiersRequest.h>
 #include <aws/glue/model/GetClassifiersResult.h>
 #include <aws/glue/model/GetColumnStatisticsForPartitionRequest.h>
@@ -496,6 +503,7 @@
 #include <aws/glue/model/GetColumnStatisticsForTableResult.h>
 #include <aws/glue/model/GetColumnStatisticsTaskRunRequest.h>
 #include <aws/glue/model/GetColumnStatisticsTaskRunResult.h>
+#include <aws/glue/model/GetColumnStatisticsTaskRunsPaginationTraits.h>
 #include <aws/glue/model/GetColumnStatisticsTaskRunsRequest.h>
 #include <aws/glue/model/GetColumnStatisticsTaskRunsResult.h>
 #include <aws/glue/model/GetColumnStatisticsTaskSettingsRequest.h>
@@ -503,12 +511,15 @@
 #include <aws/glue/model/GetConnectionRequest.h>
 #include <aws/glue/model/GetConnectionResult.h>
 #include <aws/glue/model/GetConnectionsFilter.h>
+#include <aws/glue/model/GetConnectionsPaginationTraits.h>
 #include <aws/glue/model/GetConnectionsRequest.h>
 #include <aws/glue/model/GetConnectionsResult.h>
+#include <aws/glue/model/GetCrawlerMetricsPaginationTraits.h>
 #include <aws/glue/model/GetCrawlerMetricsRequest.h>
 #include <aws/glue/model/GetCrawlerMetricsResult.h>
 #include <aws/glue/model/GetCrawlerRequest.h>
 #include <aws/glue/model/GetCrawlerResult.h>
+#include <aws/glue/model/GetCrawlersPaginationTraits.h>
 #include <aws/glue/model/GetCrawlersRequest.h>
 #include <aws/glue/model/GetCrawlersResult.h>
 #include <aws/glue/model/GetCustomEntityTypeRequest.h>
@@ -533,12 +544,14 @@
 #include <aws/glue/model/GetDataQualityRulesetResult.h>
 #include <aws/glue/model/GetDatabaseRequest.h>
 #include <aws/glue/model/GetDatabaseResult.h>
+#include <aws/glue/model/GetDatabasesPaginationTraits.h>
 #include <aws/glue/model/GetDatabasesRequest.h>
 #include <aws/glue/model/GetDatabasesResult.h>
 #include <aws/glue/model/GetDataflowGraphRequest.h>
 #include <aws/glue/model/GetDataflowGraphResult.h>
 #include <aws/glue/model/GetDevEndpointRequest.h>
 #include <aws/glue/model/GetDevEndpointResult.h>
+#include <aws/glue/model/GetDevEndpointsPaginationTraits.h>
 #include <aws/glue/model/GetDevEndpointsRequest.h>
 #include <aws/glue/model/GetDevEndpointsResult.h>
 #include <aws/glue/model/GetEntityRecordsRequest.h>
@@ -561,32 +574,39 @@
 #include <aws/glue/model/GetJobResult.h>
 #include <aws/glue/model/GetJobRunRequest.h>
 #include <aws/glue/model/GetJobRunResult.h>
+#include <aws/glue/model/GetJobRunsPaginationTraits.h>
 #include <aws/glue/model/GetJobRunsRequest.h>
 #include <aws/glue/model/GetJobRunsResult.h>
+#include <aws/glue/model/GetJobsPaginationTraits.h>
 #include <aws/glue/model/GetJobsRequest.h>
 #include <aws/glue/model/GetJobsResult.h>
 #include <aws/glue/model/GetMLTaskRunRequest.h>
 #include <aws/glue/model/GetMLTaskRunResult.h>
+#include <aws/glue/model/GetMLTaskRunsPaginationTraits.h>
 #include <aws/glue/model/GetMLTaskRunsRequest.h>
 #include <aws/glue/model/GetMLTaskRunsResult.h>
 #include <aws/glue/model/GetMLTransformRequest.h>
 #include <aws/glue/model/GetMLTransformResult.h>
+#include <aws/glue/model/GetMLTransformsPaginationTraits.h>
 #include <aws/glue/model/GetMLTransformsRequest.h>
 #include <aws/glue/model/GetMLTransformsResult.h>
 #include <aws/glue/model/GetMappingRequest.h>
 #include <aws/glue/model/GetMappingResult.h>
 #include <aws/glue/model/GetMaterializedViewRefreshTaskRunRequest.h>
 #include <aws/glue/model/GetMaterializedViewRefreshTaskRunResult.h>
+#include <aws/glue/model/GetPartitionIndexesPaginationTraits.h>
 #include <aws/glue/model/GetPartitionIndexesRequest.h>
 #include <aws/glue/model/GetPartitionIndexesResult.h>
 #include <aws/glue/model/GetPartitionRequest.h>
 #include <aws/glue/model/GetPartitionResult.h>
+#include <aws/glue/model/GetPartitionsPaginationTraits.h>
 #include <aws/glue/model/GetPartitionsRequest.h>
 #include <aws/glue/model/GetPartitionsResult.h>
 #include <aws/glue/model/GetPlanRequest.h>
 #include <aws/glue/model/GetPlanResult.h>
 #include <aws/glue/model/GetRegistryRequest.h>
 #include <aws/glue/model/GetRegistryResult.h>
+#include <aws/glue/model/GetResourcePoliciesPaginationTraits.h>
 #include <aws/glue/model/GetResourcePoliciesRequest.h>
 #include <aws/glue/model/GetResourcePoliciesResult.h>
 #include <aws/glue/model/GetResourcePolicyRequest.h>
@@ -601,6 +621,7 @@
 #include <aws/glue/model/GetSchemaVersionsDiffResult.h>
 #include <aws/glue/model/GetSecurityConfigurationRequest.h>
 #include <aws/glue/model/GetSecurityConfigurationResult.h>
+#include <aws/glue/model/GetSecurityConfigurationsPaginationTraits.h>
 #include <aws/glue/model/GetSecurityConfigurationsRequest.h>
 #include <aws/glue/model/GetSecurityConfigurationsResult.h>
 #include <aws/glue/model/GetSessionEndpointRequest.h>
@@ -615,18 +636,22 @@
 #include <aws/glue/model/GetTableResult.h>
 #include <aws/glue/model/GetTableVersionRequest.h>
 #include <aws/glue/model/GetTableVersionResult.h>
+#include <aws/glue/model/GetTableVersionsPaginationTraits.h>
 #include <aws/glue/model/GetTableVersionsRequest.h>
 #include <aws/glue/model/GetTableVersionsResult.h>
+#include <aws/glue/model/GetTablesPaginationTraits.h>
 #include <aws/glue/model/GetTablesRequest.h>
 #include <aws/glue/model/GetTablesResult.h>
 #include <aws/glue/model/GetTagsRequest.h>
 #include <aws/glue/model/GetTagsResult.h>
 #include <aws/glue/model/GetTriggerRequest.h>
 #include <aws/glue/model/GetTriggerResult.h>
+#include <aws/glue/model/GetTriggersPaginationTraits.h>
 #include <aws/glue/model/GetTriggersRequest.h>
 #include <aws/glue/model/GetTriggersResult.h>
 #include <aws/glue/model/GetUnfilteredPartitionMetadataRequest.h>
 #include <aws/glue/model/GetUnfilteredPartitionMetadataResult.h>
+#include <aws/glue/model/GetUnfilteredPartitionsMetadataPaginationTraits.h>
 #include <aws/glue/model/GetUnfilteredPartitionsMetadataRequest.h>
 #include <aws/glue/model/GetUnfilteredPartitionsMetadataResult.h>
 #include <aws/glue/model/GetUnfilteredTableMetadataRequest.h>
@@ -635,6 +660,7 @@
 #include <aws/glue/model/GetUsageProfileResult.h>
 #include <aws/glue/model/GetUserDefinedFunctionRequest.h>
 #include <aws/glue/model/GetUserDefinedFunctionResult.h>
+#include <aws/glue/model/GetUserDefinedFunctionsPaginationTraits.h>
 #include <aws/glue/model/GetUserDefinedFunctionsRequest.h>
 #include <aws/glue/model/GetUserDefinedFunctionsResult.h>
 #include <aws/glue/model/GetWorkflowRequest.h>
@@ -643,6 +669,7 @@
 #include <aws/glue/model/GetWorkflowRunPropertiesResult.h>
 #include <aws/glue/model/GetWorkflowRunRequest.h>
 #include <aws/glue/model/GetWorkflowRunResult.h>
+#include <aws/glue/model/GetWorkflowRunsPaginationTraits.h>
 #include <aws/glue/model/GetWorkflowRunsRequest.h>
 #include <aws/glue/model/GetWorkflowRunsResult.h>
 #include <aws/glue/model/GlossaryItem.h>
@@ -737,68 +764,95 @@
 #include <aws/glue/model/LastCrawlStatus.h>
 #include <aws/glue/model/LastRefreshType.h>
 #include <aws/glue/model/LineageConfiguration.h>
+#include <aws/glue/model/ListAssetTypesPaginationTraits.h>
 #include <aws/glue/model/ListAssetTypesRequest.h>
 #include <aws/glue/model/ListAssetTypesResult.h>
+#include <aws/glue/model/ListBlueprintsPaginationTraits.h>
 #include <aws/glue/model/ListBlueprintsRequest.h>
 #include <aws/glue/model/ListBlueprintsResult.h>
+#include <aws/glue/model/ListColumnStatisticsTaskRunsPaginationTraits.h>
 #include <aws/glue/model/ListColumnStatisticsTaskRunsRequest.h>
 #include <aws/glue/model/ListColumnStatisticsTaskRunsResult.h>
+#include <aws/glue/model/ListConnectionTypesPaginationTraits.h>
 #include <aws/glue/model/ListConnectionTypesRequest.h>
 #include <aws/glue/model/ListConnectionTypesResult.h>
+#include <aws/glue/model/ListCrawlersPaginationTraits.h>
 #include <aws/glue/model/ListCrawlersRequest.h>
 #include <aws/glue/model/ListCrawlersResult.h>
 #include <aws/glue/model/ListCrawlsRequest.h>
 #include <aws/glue/model/ListCrawlsResult.h>
+#include <aws/glue/model/ListCustomEntityTypesPaginationTraits.h>
 #include <aws/glue/model/ListCustomEntityTypesRequest.h>
 #include <aws/glue/model/ListCustomEntityTypesResult.h>
+#include <aws/glue/model/ListDataQualityResultsPaginationTraits.h>
 #include <aws/glue/model/ListDataQualityResultsRequest.h>
 #include <aws/glue/model/ListDataQualityResultsResult.h>
+#include <aws/glue/model/ListDataQualityRuleRecommendationRunsPaginationTraits.h>
 #include <aws/glue/model/ListDataQualityRuleRecommendationRunsRequest.h>
 #include <aws/glue/model/ListDataQualityRuleRecommendationRunsResult.h>
+#include <aws/glue/model/ListDataQualityRulesetEvaluationRunsPaginationTraits.h>
 #include <aws/glue/model/ListDataQualityRulesetEvaluationRunsRequest.h>
 #include <aws/glue/model/ListDataQualityRulesetEvaluationRunsResult.h>
+#include <aws/glue/model/ListDataQualityRulesetsPaginationTraits.h>
 #include <aws/glue/model/ListDataQualityRulesetsRequest.h>
 #include <aws/glue/model/ListDataQualityRulesetsResult.h>
 #include <aws/glue/model/ListDataQualityStatisticAnnotationsRequest.h>
 #include <aws/glue/model/ListDataQualityStatisticAnnotationsResult.h>
 #include <aws/glue/model/ListDataQualityStatisticsRequest.h>
 #include <aws/glue/model/ListDataQualityStatisticsResult.h>
+#include <aws/glue/model/ListDevEndpointsPaginationTraits.h>
 #include <aws/glue/model/ListDevEndpointsRequest.h>
 #include <aws/glue/model/ListDevEndpointsResult.h>
+#include <aws/glue/model/ListEntitiesPaginationTraits.h>
 #include <aws/glue/model/ListEntitiesRequest.h>
 #include <aws/glue/model/ListEntitiesResult.h>
+#include <aws/glue/model/ListFormTypesPaginationTraits.h>
 #include <aws/glue/model/ListFormTypesRequest.h>
 #include <aws/glue/model/ListFormTypesResult.h>
+#include <aws/glue/model/ListGlossariesPaginationTraits.h>
 #include <aws/glue/model/ListGlossariesRequest.h>
 #include <aws/glue/model/ListGlossariesResult.h>
+#include <aws/glue/model/ListGlossaryTermsPaginationTraits.h>
 #include <aws/glue/model/ListGlossaryTermsRequest.h>
 #include <aws/glue/model/ListGlossaryTermsResult.h>
 #include <aws/glue/model/ListIntegrationResourcePropertiesRequest.h>
 #include <aws/glue/model/ListIntegrationResourcePropertiesResult.h>
+#include <aws/glue/model/ListIterableFormsPaginationTraits.h>
 #include <aws/glue/model/ListIterableFormsRequest.h>
 #include <aws/glue/model/ListIterableFormsResult.h>
+#include <aws/glue/model/ListJobsPaginationTraits.h>
 #include <aws/glue/model/ListJobsRequest.h>
 #include <aws/glue/model/ListJobsResult.h>
+#include <aws/glue/model/ListMLTransformsPaginationTraits.h>
 #include <aws/glue/model/ListMLTransformsRequest.h>
 #include <aws/glue/model/ListMLTransformsResult.h>
+#include <aws/glue/model/ListMaterializedViewRefreshTaskRunsPaginationTraits.h>
 #include <aws/glue/model/ListMaterializedViewRefreshTaskRunsRequest.h>
 #include <aws/glue/model/ListMaterializedViewRefreshTaskRunsResult.h>
+#include <aws/glue/model/ListRegistriesPaginationTraits.h>
 #include <aws/glue/model/ListRegistriesRequest.h>
 #include <aws/glue/model/ListRegistriesResult.h>
+#include <aws/glue/model/ListSchemaVersionsPaginationTraits.h>
 #include <aws/glue/model/ListSchemaVersionsRequest.h>
 #include <aws/glue/model/ListSchemaVersionsResult.h>
+#include <aws/glue/model/ListSchemasPaginationTraits.h>
 #include <aws/glue/model/ListSchemasRequest.h>
 #include <aws/glue/model/ListSchemasResult.h>
+#include <aws/glue/model/ListSessionsPaginationTraits.h>
 #include <aws/glue/model/ListSessionsRequest.h>
 #include <aws/glue/model/ListSessionsResult.h>
 #include <aws/glue/model/ListStatementsRequest.h>
 #include <aws/glue/model/ListStatementsResult.h>
+#include <aws/glue/model/ListTableOptimizerRunsPaginationTraits.h>
 #include <aws/glue/model/ListTableOptimizerRunsRequest.h>
 #include <aws/glue/model/ListTableOptimizerRunsResult.h>
+#include <aws/glue/model/ListTriggersPaginationTraits.h>
 #include <aws/glue/model/ListTriggersRequest.h>
 #include <aws/glue/model/ListTriggersResult.h>
+#include <aws/glue/model/ListUsageProfilesPaginationTraits.h>
 #include <aws/glue/model/ListUsageProfilesRequest.h>
 #include <aws/glue/model/ListUsageProfilesResult.h>
+#include <aws/glue/model/ListWorkflowsPaginationTraits.h>
 #include <aws/glue/model/ListWorkflowsRequest.h>
 #include <aws/glue/model/ListWorkflowsResult.h>
 #include <aws/glue/model/Location.h>
@@ -977,6 +1031,7 @@
 #include <aws/glue/model/SchemaVersionListItem.h>
 #include <aws/glue/model/SchemaVersionNumber.h>
 #include <aws/glue/model/SchemaVersionStatus.h>
+#include <aws/glue/model/SearchAssetsPaginationTraits.h>
 #include <aws/glue/model/SearchAssetsRequest.h>
 #include <aws/glue/model/SearchAssetsResult.h>
 #include <aws/glue/model/SearchAttributeFilter.h>
@@ -988,6 +1043,7 @@
 #include <aws/glue/model/SearchResultItem.h>
 #include <aws/glue/model/SearchSort.h>
 #include <aws/glue/model/SearchSortOrder.h>
+#include <aws/glue/model/SearchTablesPaginationTraits.h>
 #include <aws/glue/model/SearchTablesRequest.h>
 #include <aws/glue/model/SearchTablesResult.h>
 #include <aws/glue/model/SecurityConfiguration.h>
diff --git a/generated/tests/grafana-gen-tests/ManagedGrafanaIncludeTests.cpp b/generated/tests/grafana-gen-tests/ManagedGrafanaIncludeTests.cpp
index 0078755fd64b..7978c2f0eec5 100644
--- a/generated/tests/grafana-gen-tests/ManagedGrafanaIncludeTests.cpp
+++ b/generated/tests/grafana-gen-tests/ManagedGrafanaIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/grafana/ManagedGrafanaClient.h>
+#include <aws/grafana/ManagedGrafanaClientPagination.h>
 #include <aws/grafana/ManagedGrafanaEndpointProvider.h>
 #include <aws/grafana/ManagedGrafanaErrorMarshaller.h>
 #include <aws/grafana/ManagedGrafanaErrors.h>
+#include <aws/grafana/ManagedGrafanaPaginationBase.h>
 #include <aws/grafana/ManagedGrafanaRequest.h>
 #include <aws/grafana/ManagedGrafanaServiceClientModel.h>
+#include <aws/grafana/ManagedGrafanaWaiter.h>
 #include <aws/grafana/ManagedGrafana_EXPORTS.h>
+#include <aws/grafana/internal/ManagedGrafanaEndpointRules.h>
 #include <aws/grafana/model/AccountAccessType.h>
 #include <aws/grafana/model/AssertionAttributes.h>
 #include <aws/grafana/model/AssociateLicenseRequest.h>
@@ -51,16 +55,21 @@
 #include <aws/grafana/model/IdpMetadata.h>
 #include <aws/grafana/model/InternalServerException.h>
 #include <aws/grafana/model/LicenseType.h>
+#include <aws/grafana/model/ListPermissionsPaginationTraits.h>
 #include <aws/grafana/model/ListPermissionsRequest.h>
 #include <aws/grafana/model/ListPermissionsResult.h>
 #include <aws/grafana/model/ListTagsForResourceRequest.h>
 #include <aws/grafana/model/ListTagsForResourceResult.h>
+#include <aws/grafana/model/ListVersionsPaginationTraits.h>
 #include <aws/grafana/model/ListVersionsRequest.h>
 #include <aws/grafana/model/ListVersionsResult.h>
+#include <aws/grafana/model/ListWorkspaceServiceAccountTokensPaginationTraits.h>
 #include <aws/grafana/model/ListWorkspaceServiceAccountTokensRequest.h>
 #include <aws/grafana/model/ListWorkspaceServiceAccountTokensResult.h>
+#include <aws/grafana/model/ListWorkspaceServiceAccountsPaginationTraits.h>
 #include <aws/grafana/model/ListWorkspaceServiceAccountsRequest.h>
 #include <aws/grafana/model/ListWorkspaceServiceAccountsResult.h>
+#include <aws/grafana/model/ListWorkspacesPaginationTraits.h>
 #include <aws/grafana/model/ListWorkspacesRequest.h>
 #include <aws/grafana/model/ListWorkspacesResult.h>
 #include <aws/grafana/model/NetworkAccessConfiguration.h>
diff --git a/generated/tests/greengrass-gen-tests/GreengrassIncludeTests.cpp b/generated/tests/greengrass-gen-tests/GreengrassIncludeTests.cpp
index b10c440d3193..ed3156b627cb 100644
--- a/generated/tests/greengrass-gen-tests/GreengrassIncludeTests.cpp
+++ b/generated/tests/greengrass-gen-tests/GreengrassIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/greengrass/GreengrassEndpointProvider.h>
 #include <aws/greengrass/GreengrassErrorMarshaller.h>
 #include <aws/greengrass/GreengrassErrors.h>
+#include <aws/greengrass/GreengrassPaginationBase.h>
 #include <aws/greengrass/GreengrassRequest.h>
 #include <aws/greengrass/GreengrassServiceClientModel.h>
+#include <aws/greengrass/GreengrassWaiter.h>
 #include <aws/greengrass/Greengrass_EXPORTS.h>
+#include <aws/greengrass/internal/GreengrassEndpointRules.h>
 #include <aws/greengrass/model/AssociateRoleToGroupRequest.h>
 #include <aws/greengrass/model/AssociateRoleToGroupResult.h>
 #include <aws/greengrass/model/AssociateServiceRoleToAccountRequest.h>
diff --git a/generated/tests/greengrassv2-gen-tests/GreengrassV2IncludeTests.cpp b/generated/tests/greengrassv2-gen-tests/GreengrassV2IncludeTests.cpp
index 1fd4a368e6dc..0081e7318da3 100644
--- a/generated/tests/greengrassv2-gen-tests/GreengrassV2IncludeTests.cpp
+++ b/generated/tests/greengrassv2-gen-tests/GreengrassV2IncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/greengrassv2/GreengrassV2Client.h>
+#include <aws/greengrassv2/GreengrassV2ClientPagination.h>
 #include <aws/greengrassv2/GreengrassV2EndpointProvider.h>
 #include <aws/greengrassv2/GreengrassV2ErrorMarshaller.h>
 #include <aws/greengrassv2/GreengrassV2Errors.h>
+#include <aws/greengrassv2/GreengrassV2PaginationBase.h>
 #include <aws/greengrassv2/GreengrassV2Request.h>
 #include <aws/greengrassv2/GreengrassV2ServiceClientModel.h>
+#include <aws/greengrassv2/GreengrassV2Waiter.h>
 #include <aws/greengrassv2/GreengrassV2_EXPORTS.h>
+#include <aws/greengrassv2/internal/GreengrassV2EndpointRules.h>
 #include <aws/greengrassv2/model/AssociateClientDeviceWithCoreDeviceEntry.h>
 #include <aws/greengrassv2/model/AssociateClientDeviceWithCoreDeviceErrorEntry.h>
 #include <aws/greengrassv2/model/AssociateServiceRoleToAccountRequest.h>
@@ -102,18 +106,25 @@
 #include <aws/greengrassv2/model/LambdaIsolationMode.h>
 #include <aws/greengrassv2/model/LambdaLinuxProcessParams.h>
 #include <aws/greengrassv2/model/LambdaVolumeMount.h>
+#include <aws/greengrassv2/model/ListClientDevicesAssociatedWithCoreDevicePaginationTraits.h>
 #include <aws/greengrassv2/model/ListClientDevicesAssociatedWithCoreDeviceRequest.h>
 #include <aws/greengrassv2/model/ListClientDevicesAssociatedWithCoreDeviceResult.h>
+#include <aws/greengrassv2/model/ListComponentVersionsPaginationTraits.h>
 #include <aws/greengrassv2/model/ListComponentVersionsRequest.h>
 #include <aws/greengrassv2/model/ListComponentVersionsResult.h>
+#include <aws/greengrassv2/model/ListComponentsPaginationTraits.h>
 #include <aws/greengrassv2/model/ListComponentsRequest.h>
 #include <aws/greengrassv2/model/ListComponentsResult.h>
+#include <aws/greengrassv2/model/ListCoreDevicesPaginationTraits.h>
 #include <aws/greengrassv2/model/ListCoreDevicesRequest.h>
 #include <aws/greengrassv2/model/ListCoreDevicesResult.h>
+#include <aws/greengrassv2/model/ListDeploymentsPaginationTraits.h>
 #include <aws/greengrassv2/model/ListDeploymentsRequest.h>
 #include <aws/greengrassv2/model/ListDeploymentsResult.h>
+#include <aws/greengrassv2/model/ListEffectiveDeploymentsPaginationTraits.h>
 #include <aws/greengrassv2/model/ListEffectiveDeploymentsRequest.h>
 #include <aws/greengrassv2/model/ListEffectiveDeploymentsResult.h>
+#include <aws/greengrassv2/model/ListInstalledComponentsPaginationTraits.h>
 #include <aws/greengrassv2/model/ListInstalledComponentsRequest.h>
 #include <aws/greengrassv2/model/ListInstalledComponentsResult.h>
 #include <aws/greengrassv2/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/groundstation-gen-tests/GroundStationIncludeTests.cpp b/generated/tests/groundstation-gen-tests/GroundStationIncludeTests.cpp
index ccd60743ccf2..cc7cd7939087 100644
--- a/generated/tests/groundstation-gen-tests/GroundStationIncludeTests.cpp
+++ b/generated/tests/groundstation-gen-tests/GroundStationIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/groundstation/GroundStationClient.h>
+#include <aws/groundstation/GroundStationClientPagination.h>
 #include <aws/groundstation/GroundStationEndpointProvider.h>
 #include <aws/groundstation/GroundStationErrorMarshaller.h>
 #include <aws/groundstation/GroundStationErrors.h>
+#include <aws/groundstation/GroundStationPaginationBase.h>
 #include <aws/groundstation/GroundStationRequest.h>
 #include <aws/groundstation/GroundStationServiceClientModel.h>
+#include <aws/groundstation/GroundStationWaiter.h>
 #include <aws/groundstation/GroundStation_EXPORTS.h>
+#include <aws/groundstation/internal/GroundStationEndpointRules.h>
 #include <aws/groundstation/model/AgentDetails.h>
 #include <aws/groundstation/model/AgentStatus.h>
 #include <aws/groundstation/model/AggregateStatus.h>
@@ -127,24 +131,34 @@
 #include <aws/groundstation/model/InvalidParameterException.h>
 #include <aws/groundstation/model/KinesisDataStreamData.h>
 #include <aws/groundstation/model/KmsKey.h>
+#include <aws/groundstation/model/ListAntennasPaginationTraits.h>
 #include <aws/groundstation/model/ListAntennasRequest.h>
 #include <aws/groundstation/model/ListAntennasResult.h>
+#include <aws/groundstation/model/ListConfigsPaginationTraits.h>
 #include <aws/groundstation/model/ListConfigsRequest.h>
 #include <aws/groundstation/model/ListConfigsResult.h>
+#include <aws/groundstation/model/ListContactVersionsPaginationTraits.h>
 #include <aws/groundstation/model/ListContactVersionsRequest.h>
 #include <aws/groundstation/model/ListContactVersionsResult.h>
+#include <aws/groundstation/model/ListContactsPaginationTraits.h>
 #include <aws/groundstation/model/ListContactsRequest.h>
 #include <aws/groundstation/model/ListContactsResult.h>
+#include <aws/groundstation/model/ListDataflowEndpointGroupsPaginationTraits.h>
 #include <aws/groundstation/model/ListDataflowEndpointGroupsRequest.h>
 #include <aws/groundstation/model/ListDataflowEndpointGroupsResult.h>
+#include <aws/groundstation/model/ListEphemeridesPaginationTraits.h>
 #include <aws/groundstation/model/ListEphemeridesRequest.h>
 #include <aws/groundstation/model/ListEphemeridesResult.h>
+#include <aws/groundstation/model/ListGroundStationReservationsPaginationTraits.h>
 #include <aws/groundstation/model/ListGroundStationReservationsRequest.h>
 #include <aws/groundstation/model/ListGroundStationReservationsResult.h>
+#include <aws/groundstation/model/ListGroundStationsPaginationTraits.h>
 #include <aws/groundstation/model/ListGroundStationsRequest.h>
 #include <aws/groundstation/model/ListGroundStationsResult.h>
+#include <aws/groundstation/model/ListMissionProfilesPaginationTraits.h>
 #include <aws/groundstation/model/ListMissionProfilesRequest.h>
 #include <aws/groundstation/model/ListMissionProfilesResult.h>
+#include <aws/groundstation/model/ListSatellitesPaginationTraits.h>
 #include <aws/groundstation/model/ListSatellitesRequest.h>
 #include <aws/groundstation/model/ListSatellitesResult.h>
 #include <aws/groundstation/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/guardduty-gen-tests/GuardDutyIncludeTests.cpp b/generated/tests/guardduty-gen-tests/GuardDutyIncludeTests.cpp
index 7ea300a01d5b..14be5371d5ed 100644
--- a/generated/tests/guardduty-gen-tests/GuardDutyIncludeTests.cpp
+++ b/generated/tests/guardduty-gen-tests/GuardDutyIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/guardduty/GuardDutyClient.h>
+#include <aws/guardduty/GuardDutyClientPagination.h>
 #include <aws/guardduty/GuardDutyEndpointProvider.h>
 #include <aws/guardduty/GuardDutyErrorMarshaller.h>
 #include <aws/guardduty/GuardDutyErrors.h>
+#include <aws/guardduty/GuardDutyPaginationBase.h>
 #include <aws/guardduty/GuardDutyRequest.h>
 #include <aws/guardduty/GuardDutyServiceClientModel.h>
+#include <aws/guardduty/GuardDutyWaiter.h>
 #include <aws/guardduty/GuardDuty_EXPORTS.h>
+#include <aws/guardduty/internal/GuardDutyEndpointRules.h>
 #include <aws/guardduty/model/AcceptAdministratorInvitationRequest.h>
 #include <aws/guardduty/model/AcceptAdministratorInvitationResult.h>
 #include <aws/guardduty/model/AccessControlList.h>
@@ -132,8 +136,10 @@
 #include <aws/guardduty/model/DeleteThreatIntelSetResult.h>
 #include <aws/guardduty/model/DeleteTrustedEntitySetRequest.h>
 #include <aws/guardduty/model/DeleteTrustedEntitySetResult.h>
+#include <aws/guardduty/model/DescribeMalwareScansPaginationTraits.h>
 #include <aws/guardduty/model/DescribeMalwareScansRequest.h>
 #include <aws/guardduty/model/DescribeMalwareScansResult.h>
+#include <aws/guardduty/model/DescribeOrganizationConfigurationPaginationTraits.h>
 #include <aws/guardduty/model/DescribeOrganizationConfigurationRequest.h>
 #include <aws/guardduty/model/DescribeOrganizationConfigurationResult.h>
 #include <aws/guardduty/model/DescribePublishingDestinationRequest.h>
@@ -239,6 +245,7 @@
 #include <aws/guardduty/model/GetThreatIntelSetResult.h>
 #include <aws/guardduty/model/GetTrustedEntitySetRequest.h>
 #include <aws/guardduty/model/GetTrustedEntitySetResult.h>
+#include <aws/guardduty/model/GetUsageStatisticsPaginationTraits.h>
 #include <aws/guardduty/model/GetUsageStatisticsRequest.h>
 #include <aws/guardduty/model/GetUsageStatisticsResult.h>
 #include <aws/guardduty/model/GroupByType.h>
@@ -283,18 +290,25 @@
 #include <aws/guardduty/model/KubernetesWorkloadDetails.h>
 #include <aws/guardduty/model/LambdaDetails.h>
 #include <aws/guardduty/model/LineageObject.h>
+#include <aws/guardduty/model/ListCoveragePaginationTraits.h>
 #include <aws/guardduty/model/ListCoverageRequest.h>
 #include <aws/guardduty/model/ListCoverageResult.h>
+#include <aws/guardduty/model/ListDetectorsPaginationTraits.h>
 #include <aws/guardduty/model/ListDetectorsRequest.h>
 #include <aws/guardduty/model/ListDetectorsResult.h>
+#include <aws/guardduty/model/ListFiltersPaginationTraits.h>
 #include <aws/guardduty/model/ListFiltersRequest.h>
 #include <aws/guardduty/model/ListFiltersResult.h>
+#include <aws/guardduty/model/ListFindingsPaginationTraits.h>
 #include <aws/guardduty/model/ListFindingsRequest.h>
 #include <aws/guardduty/model/ListFindingsResult.h>
+#include <aws/guardduty/model/ListIPSetsPaginationTraits.h>
 #include <aws/guardduty/model/ListIPSetsRequest.h>
 #include <aws/guardduty/model/ListIPSetsResult.h>
+#include <aws/guardduty/model/ListInvestigationsPaginationTraits.h>
 #include <aws/guardduty/model/ListInvestigationsRequest.h>
 #include <aws/guardduty/model/ListInvestigationsResult.h>
+#include <aws/guardduty/model/ListInvitationsPaginationTraits.h>
 #include <aws/guardduty/model/ListInvitationsRequest.h>
 #include <aws/guardduty/model/ListInvitationsResult.h>
 #include <aws/guardduty/model/ListMalwareProtectionPlansRequest.h>
@@ -302,20 +316,27 @@
 #include <aws/guardduty/model/ListMalwareScansCriterionKey.h>
 #include <aws/guardduty/model/ListMalwareScansFilterCriteria.h>
 #include <aws/guardduty/model/ListMalwareScansFilterCriterion.h>
+#include <aws/guardduty/model/ListMalwareScansPaginationTraits.h>
 #include <aws/guardduty/model/ListMalwareScansRequest.h>
 #include <aws/guardduty/model/ListMalwareScansResult.h>
+#include <aws/guardduty/model/ListMembersPaginationTraits.h>
 #include <aws/guardduty/model/ListMembersRequest.h>
 #include <aws/guardduty/model/ListMembersResult.h>
+#include <aws/guardduty/model/ListOrganizationAdminAccountsPaginationTraits.h>
 #include <aws/guardduty/model/ListOrganizationAdminAccountsRequest.h>
 #include <aws/guardduty/model/ListOrganizationAdminAccountsResult.h>
+#include <aws/guardduty/model/ListPublishingDestinationsPaginationTraits.h>
 #include <aws/guardduty/model/ListPublishingDestinationsRequest.h>
 #include <aws/guardduty/model/ListPublishingDestinationsResult.h>
 #include <aws/guardduty/model/ListTagsForResourceRequest.h>
 #include <aws/guardduty/model/ListTagsForResourceResult.h>
+#include <aws/guardduty/model/ListThreatEntitySetsPaginationTraits.h>
 #include <aws/guardduty/model/ListThreatEntitySetsRequest.h>
 #include <aws/guardduty/model/ListThreatEntitySetsResult.h>
+#include <aws/guardduty/model/ListThreatIntelSetsPaginationTraits.h>
 #include <aws/guardduty/model/ListThreatIntelSetsRequest.h>
 #include <aws/guardduty/model/ListThreatIntelSetsResult.h>
+#include <aws/guardduty/model/ListTrustedEntitySetsPaginationTraits.h>
 #include <aws/guardduty/model/ListTrustedEntitySetsRequest.h>
 #include <aws/guardduty/model/ListTrustedEntitySetsResult.h>
 #include <aws/guardduty/model/LocalIpDetails.h>
diff --git a/generated/tests/health-gen-tests/HealthIncludeTests.cpp b/generated/tests/health-gen-tests/HealthIncludeTests.cpp
index 382aaf7d0b2c..65f95dd2403e 100644
--- a/generated/tests/health-gen-tests/HealthIncludeTests.cpp
+++ b/generated/tests/health-gen-tests/HealthIncludeTests.cpp
@@ -7,35 +7,46 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/health/HealthClient.h>
+#include <aws/health/HealthClientPagination.h>
 #include <aws/health/HealthEndpointProvider.h>
 #include <aws/health/HealthErrorMarshaller.h>
 #include <aws/health/HealthErrors.h>
+#include <aws/health/HealthPaginationBase.h>
 #include <aws/health/HealthRequest.h>
 #include <aws/health/HealthServiceClientModel.h>
+#include <aws/health/HealthWaiter.h>
 #include <aws/health/Health_EXPORTS.h>
+#include <aws/health/internal/HealthEndpointRules.h>
 #include <aws/health/model/AccountEntityAggregate.h>
 #include <aws/health/model/AffectedEntity.h>
 #include <aws/health/model/DateTimeRange.h>
+#include <aws/health/model/DescribeAffectedAccountsForOrganizationPaginationTraits.h>
 #include <aws/health/model/DescribeAffectedAccountsForOrganizationRequest.h>
 #include <aws/health/model/DescribeAffectedAccountsForOrganizationResult.h>
+#include <aws/health/model/DescribeAffectedEntitiesForOrganizationPaginationTraits.h>
 #include <aws/health/model/DescribeAffectedEntitiesForOrganizationRequest.h>
 #include <aws/health/model/DescribeAffectedEntitiesForOrganizationResult.h>
+#include <aws/health/model/DescribeAffectedEntitiesPaginationTraits.h>
 #include <aws/health/model/DescribeAffectedEntitiesRequest.h>
 #include <aws/health/model/DescribeAffectedEntitiesResult.h>
 #include <aws/health/model/DescribeEntityAggregatesForOrganizationRequest.h>
 #include <aws/health/model/DescribeEntityAggregatesForOrganizationResult.h>
 #include <aws/health/model/DescribeEntityAggregatesRequest.h>
 #include <aws/health/model/DescribeEntityAggregatesResult.h>
+#include <aws/health/model/DescribeEventAggregatesPaginationTraits.h>
 #include <aws/health/model/DescribeEventAggregatesRequest.h>
 #include <aws/health/model/DescribeEventAggregatesResult.h>
 #include <aws/health/model/DescribeEventDetailsForOrganizationRequest.h>
 #include <aws/health/model/DescribeEventDetailsForOrganizationResult.h>
 #include <aws/health/model/DescribeEventDetailsRequest.h>
 #include <aws/health/model/DescribeEventDetailsResult.h>
+#include <aws/health/model/DescribeEventTypesPaginationTraits.h>
 #include <aws/health/model/DescribeEventTypesRequest.h>
 #include <aws/health/model/DescribeEventTypesResult.h>
+#include <aws/health/model/DescribeEventsForOrganizationPaginationTraits.h>
 #include <aws/health/model/DescribeEventsForOrganizationRequest.h>
 #include <aws/health/model/DescribeEventsForOrganizationResult.h>
+#include <aws/health/model/DescribeEventsPaginationTraits.h>
 #include <aws/health/model/DescribeEventsRequest.h>
 #include <aws/health/model/DescribeEventsResult.h>
 #include <aws/health/model/DescribeHealthServiceStatusForOrganizationRequest.h>
diff --git a/generated/tests/healthlake-gen-tests/HealthLakeIncludeTests.cpp b/generated/tests/healthlake-gen-tests/HealthLakeIncludeTests.cpp
index f5674c399c76..5ad02ae16214 100644
--- a/generated/tests/healthlake-gen-tests/HealthLakeIncludeTests.cpp
+++ b/generated/tests/healthlake-gen-tests/HealthLakeIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/healthlake/HealthLakeClient.h>
+#include <aws/healthlake/HealthLakeClientPagination.h>
 #include <aws/healthlake/HealthLakeEndpointProvider.h>
 #include <aws/healthlake/HealthLakeErrorMarshaller.h>
 #include <aws/healthlake/HealthLakeErrors.h>
+#include <aws/healthlake/HealthLakePaginationBase.h>
 #include <aws/healthlake/HealthLakeRequest.h>
 #include <aws/healthlake/HealthLakeServiceClientModel.h>
+#include <aws/healthlake/HealthLakeWaiter.h>
 #include <aws/healthlake/HealthLake_EXPORTS.h>
+#include <aws/healthlake/internal/HealthLakeEndpointRules.h>
 #include <aws/healthlake/model/AgentInputMessage.h>
 #include <aws/healthlake/model/AgentInputMessageType.h>
 #include <aws/healthlake/model/AgentOutputMessage.h>
@@ -57,16 +61,22 @@
 #include <aws/healthlake/model/JobProgressReport.h>
 #include <aws/healthlake/model/JobStatus.h>
 #include <aws/healthlake/model/KmsEncryptionConfig.h>
+#include <aws/healthlake/model/ListDataTransformationJobsPaginationTraits.h>
 #include <aws/healthlake/model/ListDataTransformationJobsRequest.h>
 #include <aws/healthlake/model/ListDataTransformationJobsResult.h>
+#include <aws/healthlake/model/ListDataTransformationProfileVersionsPaginationTraits.h>
 #include <aws/healthlake/model/ListDataTransformationProfileVersionsRequest.h>
 #include <aws/healthlake/model/ListDataTransformationProfileVersionsResult.h>
+#include <aws/healthlake/model/ListDataTransformationProfilesPaginationTraits.h>
 #include <aws/healthlake/model/ListDataTransformationProfilesRequest.h>
 #include <aws/healthlake/model/ListDataTransformationProfilesResult.h>
+#include <aws/healthlake/model/ListFHIRDatastoresPaginationTraits.h>
 #include <aws/healthlake/model/ListFHIRDatastoresRequest.h>
 #include <aws/healthlake/model/ListFHIRDatastoresResult.h>
+#include <aws/healthlake/model/ListFHIRExportJobsPaginationTraits.h>
 #include <aws/healthlake/model/ListFHIRExportJobsRequest.h>
 #include <aws/healthlake/model/ListFHIRExportJobsResult.h>
+#include <aws/healthlake/model/ListFHIRImportJobsPaginationTraits.h>
 #include <aws/healthlake/model/ListFHIRImportJobsRequest.h>
 #include <aws/healthlake/model/ListFHIRImportJobsResult.h>
 #include <aws/healthlake/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/iam-gen-tests/IAMIncludeTests.cpp b/generated/tests/iam-gen-tests/IAMIncludeTests.cpp
index 39af713bf81a..1e19180cd3c3 100644
--- a/generated/tests/iam-gen-tests/IAMIncludeTests.cpp
+++ b/generated/tests/iam-gen-tests/IAMIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/iam/IAMClient.h>
+#include <aws/iam/IAMClientPagination.h>
 #include <aws/iam/IAMEndpointProvider.h>
 #include <aws/iam/IAMErrorMarshaller.h>
 #include <aws/iam/IAMErrors.h>
+#include <aws/iam/IAMPaginationBase.h>
 #include <aws/iam/IAMRequest.h>
 #include <aws/iam/IAMServiceClientModel.h>
+#include <aws/iam/IAMWaiter.h>
 #include <aws/iam/IAM_EXPORTS.h>
+#include <aws/iam/internal/IAMEndpointRules.h>
 #include <aws/iam/model/AcceptDelegationRequestRequest.h>
 #include <aws/iam/model/AccessAdvisorUsageGranularityType.h>
 #include <aws/iam/model/AccessDetail.h>
@@ -124,6 +128,7 @@
 #include <aws/iam/model/GenerateServiceLastAccessedDetailsResult.h>
 #include <aws/iam/model/GetAccessKeyLastUsedRequest.h>
 #include <aws/iam/model/GetAccessKeyLastUsedResult.h>
+#include <aws/iam/model/GetAccountAuthorizationDetailsPaginationTraits.h>
 #include <aws/iam/model/GetAccountAuthorizationDetailsRequest.h>
 #include <aws/iam/model/GetAccountAuthorizationDetailsResult.h>
 #include <aws/iam/model/GetAccountPasswordPolicyRequest.h>
@@ -140,6 +145,7 @@
 #include <aws/iam/model/GetCredentialReportResult.h>
 #include <aws/iam/model/GetDelegationRequestRequest.h>
 #include <aws/iam/model/GetDelegationRequestResult.h>
+#include <aws/iam/model/GetGroupPaginationTraits.h>
 #include <aws/iam/model/GetGroupPolicyRequest.h>
 #include <aws/iam/model/GetGroupPolicyResult.h>
 #include <aws/iam/model/GetGroupRequest.h>
@@ -191,36 +197,51 @@
 #include <aws/iam/model/InlinePolicyIdentifierType.h>
 #include <aws/iam/model/InstanceProfile.h>
 #include <aws/iam/model/JobStatusType.h>
+#include <aws/iam/model/ListAccessKeysPaginationTraits.h>
 #include <aws/iam/model/ListAccessKeysRequest.h>
 #include <aws/iam/model/ListAccessKeysResult.h>
+#include <aws/iam/model/ListAccountAliasesPaginationTraits.h>
 #include <aws/iam/model/ListAccountAliasesRequest.h>
 #include <aws/iam/model/ListAccountAliasesResult.h>
+#include <aws/iam/model/ListAttachedGroupPoliciesPaginationTraits.h>
 #include <aws/iam/model/ListAttachedGroupPoliciesRequest.h>
 #include <aws/iam/model/ListAttachedGroupPoliciesResult.h>
+#include <aws/iam/model/ListAttachedRolePoliciesPaginationTraits.h>
 #include <aws/iam/model/ListAttachedRolePoliciesRequest.h>
 #include <aws/iam/model/ListAttachedRolePoliciesResult.h>
+#include <aws/iam/model/ListAttachedUserPoliciesPaginationTraits.h>
 #include <aws/iam/model/ListAttachedUserPoliciesRequest.h>
 #include <aws/iam/model/ListAttachedUserPoliciesResult.h>
 #include <aws/iam/model/ListDelegationRequestsRequest.h>
 #include <aws/iam/model/ListDelegationRequestsResult.h>
+#include <aws/iam/model/ListEntitiesForPolicyPaginationTraits.h>
 #include <aws/iam/model/ListEntitiesForPolicyRequest.h>
 #include <aws/iam/model/ListEntitiesForPolicyResult.h>
+#include <aws/iam/model/ListGroupPoliciesPaginationTraits.h>
 #include <aws/iam/model/ListGroupPoliciesRequest.h>
 #include <aws/iam/model/ListGroupPoliciesResult.h>
+#include <aws/iam/model/ListGroupsForUserPaginationTraits.h>
 #include <aws/iam/model/ListGroupsForUserRequest.h>
 #include <aws/iam/model/ListGroupsForUserResult.h>
+#include <aws/iam/model/ListGroupsPaginationTraits.h>
 #include <aws/iam/model/ListGroupsRequest.h>
 #include <aws/iam/model/ListGroupsResult.h>
+#include <aws/iam/model/ListInstanceProfileTagsPaginationTraits.h>
 #include <aws/iam/model/ListInstanceProfileTagsRequest.h>
 #include <aws/iam/model/ListInstanceProfileTagsResult.h>
+#include <aws/iam/model/ListInstanceProfilesForRolePaginationTraits.h>
 #include <aws/iam/model/ListInstanceProfilesForRoleRequest.h>
 #include <aws/iam/model/ListInstanceProfilesForRoleResult.h>
+#include <aws/iam/model/ListInstanceProfilesPaginationTraits.h>
 #include <aws/iam/model/ListInstanceProfilesRequest.h>
 #include <aws/iam/model/ListInstanceProfilesResult.h>
+#include <aws/iam/model/ListMFADeviceTagsPaginationTraits.h>
 #include <aws/iam/model/ListMFADeviceTagsRequest.h>
 #include <aws/iam/model/ListMFADeviceTagsResult.h>
+#include <aws/iam/model/ListMFADevicesPaginationTraits.h>
 #include <aws/iam/model/ListMFADevicesRequest.h>
 #include <aws/iam/model/ListMFADevicesResult.h>
+#include <aws/iam/model/ListOpenIDConnectProviderTagsPaginationTraits.h>
 #include <aws/iam/model/ListOpenIDConnectProviderTagsRequest.h>
 #include <aws/iam/model/ListOpenIDConnectProviderTagsResult.h>
 #include <aws/iam/model/ListOpenIDConnectProvidersRequest.h>
@@ -230,38 +251,53 @@
 #include <aws/iam/model/ListPoliciesGrantingServiceAccessEntry.h>
 #include <aws/iam/model/ListPoliciesGrantingServiceAccessRequest.h>
 #include <aws/iam/model/ListPoliciesGrantingServiceAccessResult.h>
+#include <aws/iam/model/ListPoliciesPaginationTraits.h>
 #include <aws/iam/model/ListPoliciesRequest.h>
 #include <aws/iam/model/ListPoliciesResult.h>
+#include <aws/iam/model/ListPolicyTagsPaginationTraits.h>
 #include <aws/iam/model/ListPolicyTagsRequest.h>
 #include <aws/iam/model/ListPolicyTagsResult.h>
+#include <aws/iam/model/ListPolicyVersionsPaginationTraits.h>
 #include <aws/iam/model/ListPolicyVersionsRequest.h>
 #include <aws/iam/model/ListPolicyVersionsResult.h>
+#include <aws/iam/model/ListRolePoliciesPaginationTraits.h>
 #include <aws/iam/model/ListRolePoliciesRequest.h>
 #include <aws/iam/model/ListRolePoliciesResult.h>
+#include <aws/iam/model/ListRoleTagsPaginationTraits.h>
 #include <aws/iam/model/ListRoleTagsRequest.h>
 #include <aws/iam/model/ListRoleTagsResult.h>
+#include <aws/iam/model/ListRolesPaginationTraits.h>
 #include <aws/iam/model/ListRolesRequest.h>
 #include <aws/iam/model/ListRolesResult.h>
+#include <aws/iam/model/ListSAMLProviderTagsPaginationTraits.h>
 #include <aws/iam/model/ListSAMLProviderTagsRequest.h>
 #include <aws/iam/model/ListSAMLProviderTagsResult.h>
 #include <aws/iam/model/ListSAMLProvidersRequest.h>
 #include <aws/iam/model/ListSAMLProvidersResult.h>
+#include <aws/iam/model/ListSSHPublicKeysPaginationTraits.h>
 #include <aws/iam/model/ListSSHPublicKeysRequest.h>
 #include <aws/iam/model/ListSSHPublicKeysResult.h>
+#include <aws/iam/model/ListServerCertificateTagsPaginationTraits.h>
 #include <aws/iam/model/ListServerCertificateTagsRequest.h>
 #include <aws/iam/model/ListServerCertificateTagsResult.h>
+#include <aws/iam/model/ListServerCertificatesPaginationTraits.h>
 #include <aws/iam/model/ListServerCertificatesRequest.h>
 #include <aws/iam/model/ListServerCertificatesResult.h>
 #include <aws/iam/model/ListServiceSpecificCredentialsRequest.h>
 #include <aws/iam/model/ListServiceSpecificCredentialsResult.h>
+#include <aws/iam/model/ListSigningCertificatesPaginationTraits.h>
 #include <aws/iam/model/ListSigningCertificatesRequest.h>
 #include <aws/iam/model/ListSigningCertificatesResult.h>
+#include <aws/iam/model/ListUserPoliciesPaginationTraits.h>
 #include <aws/iam/model/ListUserPoliciesRequest.h>
 #include <aws/iam/model/ListUserPoliciesResult.h>
+#include <aws/iam/model/ListUserTagsPaginationTraits.h>
 #include <aws/iam/model/ListUserTagsRequest.h>
 #include <aws/iam/model/ListUserTagsResult.h>
+#include <aws/iam/model/ListUsersPaginationTraits.h>
 #include <aws/iam/model/ListUsersRequest.h>
 #include <aws/iam/model/ListUsersResult.h>
+#include <aws/iam/model/ListVirtualMFADevicesPaginationTraits.h>
 #include <aws/iam/model/ListVirtualMFADevicesRequest.h>
 #include <aws/iam/model/ListVirtualMFADevicesResult.h>
 #include <aws/iam/model/LoginProfile.h>
@@ -333,8 +369,10 @@
 #include <aws/iam/model/SetDefaultPolicyVersionRequest.h>
 #include <aws/iam/model/SetSecurityTokenServicePreferencesRequest.h>
 #include <aws/iam/model/SigningCertificate.h>
+#include <aws/iam/model/SimulateCustomPolicyPaginationTraits.h>
 #include <aws/iam/model/SimulateCustomPolicyRequest.h>
 #include <aws/iam/model/SimulateCustomPolicyResult.h>
+#include <aws/iam/model/SimulatePrincipalPolicyPaginationTraits.h>
 #include <aws/iam/model/SimulatePrincipalPolicyRequest.h>
 #include <aws/iam/model/SimulatePrincipalPolicyResult.h>
 #include <aws/iam/model/SortKeyType.h>
diff --git a/generated/tests/identitystore-gen-tests/IdentityStoreIncludeTests.cpp b/generated/tests/identitystore-gen-tests/IdentityStoreIncludeTests.cpp
index 5d9863a6c540..3abe4db3f5cf 100644
--- a/generated/tests/identitystore-gen-tests/IdentityStoreIncludeTests.cpp
+++ b/generated/tests/identitystore-gen-tests/IdentityStoreIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/identitystore/IdentityStoreClient.h>
+#include <aws/identitystore/IdentityStoreClientPagination.h>
 #include <aws/identitystore/IdentityStoreEndpointProvider.h>
 #include <aws/identitystore/IdentityStoreErrorMarshaller.h>
 #include <aws/identitystore/IdentityStoreErrors.h>
+#include <aws/identitystore/IdentityStorePaginationBase.h>
 #include <aws/identitystore/IdentityStoreRequest.h>
 #include <aws/identitystore/IdentityStoreServiceClientModel.h>
+#include <aws/identitystore/IdentityStoreWaiter.h>
 #include <aws/identitystore/IdentityStore_EXPORTS.h>
+#include <aws/identitystore/internal/IdentityStoreEndpointRules.h>
 #include <aws/identitystore/model/AccessDeniedException.h>
 #include <aws/identitystore/model/AccessDeniedExceptionReason.h>
 #include <aws/identitystore/model/Address.h>
@@ -53,12 +57,16 @@
 #include <aws/identitystore/model/InternalServerException.h>
 #include <aws/identitystore/model/IsMemberInGroupsRequest.h>
 #include <aws/identitystore/model/IsMemberInGroupsResult.h>
+#include <aws/identitystore/model/ListGroupMembershipsForMemberPaginationTraits.h>
 #include <aws/identitystore/model/ListGroupMembershipsForMemberRequest.h>
 #include <aws/identitystore/model/ListGroupMembershipsForMemberResult.h>
+#include <aws/identitystore/model/ListGroupMembershipsPaginationTraits.h>
 #include <aws/identitystore/model/ListGroupMembershipsRequest.h>
 #include <aws/identitystore/model/ListGroupMembershipsResult.h>
+#include <aws/identitystore/model/ListGroupsPaginationTraits.h>
 #include <aws/identitystore/model/ListGroupsRequest.h>
 #include <aws/identitystore/model/ListGroupsResult.h>
+#include <aws/identitystore/model/ListUsersPaginationTraits.h>
 #include <aws/identitystore/model/ListUsersRequest.h>
 #include <aws/identitystore/model/ListUsersResult.h>
 #include <aws/identitystore/model/MemberId.h>
diff --git a/generated/tests/imagebuilder-gen-tests/ImagebuilderIncludeTests.cpp b/generated/tests/imagebuilder-gen-tests/ImagebuilderIncludeTests.cpp
index bd3352f5dc34..ea825b1d7b1d 100644
--- a/generated/tests/imagebuilder-gen-tests/ImagebuilderIncludeTests.cpp
+++ b/generated/tests/imagebuilder-gen-tests/ImagebuilderIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/imagebuilder/ImagebuilderClient.h>
+#include <aws/imagebuilder/ImagebuilderClientPagination.h>
 #include <aws/imagebuilder/ImagebuilderEndpointProvider.h>
 #include <aws/imagebuilder/ImagebuilderErrorMarshaller.h>
 #include <aws/imagebuilder/ImagebuilderErrors.h>
+#include <aws/imagebuilder/ImagebuilderPaginationBase.h>
 #include <aws/imagebuilder/ImagebuilderRequest.h>
 #include <aws/imagebuilder/ImagebuilderServiceClientModel.h>
+#include <aws/imagebuilder/ImagebuilderWaiter.h>
 #include <aws/imagebuilder/Imagebuilder_EXPORTS.h>
+#include <aws/imagebuilder/internal/ImagebuilderEndpointRules.h>
 #include <aws/imagebuilder/model/AccountAggregation.h>
 #include <aws/imagebuilder/model/AdditionalInstanceConfiguration.h>
 #include <aws/imagebuilder/model/Ami.h>
@@ -187,48 +191,69 @@
 #include <aws/imagebuilder/model/LifecyclePolicyStatus.h>
 #include <aws/imagebuilder/model/LifecyclePolicySummary.h>
 #include <aws/imagebuilder/model/LifecyclePolicyTimeUnit.h>
+#include <aws/imagebuilder/model/ListComponentBuildVersionsPaginationTraits.h>
 #include <aws/imagebuilder/model/ListComponentBuildVersionsRequest.h>
 #include <aws/imagebuilder/model/ListComponentBuildVersionsResult.h>
+#include <aws/imagebuilder/model/ListComponentsPaginationTraits.h>
 #include <aws/imagebuilder/model/ListComponentsRequest.h>
 #include <aws/imagebuilder/model/ListComponentsResult.h>
+#include <aws/imagebuilder/model/ListContainerRecipesPaginationTraits.h>
 #include <aws/imagebuilder/model/ListContainerRecipesRequest.h>
 #include <aws/imagebuilder/model/ListContainerRecipesResult.h>
+#include <aws/imagebuilder/model/ListDistributionConfigurationsPaginationTraits.h>
 #include <aws/imagebuilder/model/ListDistributionConfigurationsRequest.h>
 #include <aws/imagebuilder/model/ListDistributionConfigurationsResult.h>
+#include <aws/imagebuilder/model/ListImageBuildVersionsPaginationTraits.h>
 #include <aws/imagebuilder/model/ListImageBuildVersionsRequest.h>
 #include <aws/imagebuilder/model/ListImageBuildVersionsResult.h>
+#include <aws/imagebuilder/model/ListImagePackagesPaginationTraits.h>
 #include <aws/imagebuilder/model/ListImagePackagesRequest.h>
 #include <aws/imagebuilder/model/ListImagePackagesResult.h>
+#include <aws/imagebuilder/model/ListImagePipelineImagesPaginationTraits.h>
 #include <aws/imagebuilder/model/ListImagePipelineImagesRequest.h>
 #include <aws/imagebuilder/model/ListImagePipelineImagesResult.h>
+#include <aws/imagebuilder/model/ListImagePipelinesPaginationTraits.h>
 #include <aws/imagebuilder/model/ListImagePipelinesRequest.h>
 #include <aws/imagebuilder/model/ListImagePipelinesResult.h>
+#include <aws/imagebuilder/model/ListImageRecipesPaginationTraits.h>
 #include <aws/imagebuilder/model/ListImageRecipesRequest.h>
 #include <aws/imagebuilder/model/ListImageRecipesResult.h>
+#include <aws/imagebuilder/model/ListImageScanFindingAggregationsPaginationTraits.h>
 #include <aws/imagebuilder/model/ListImageScanFindingAggregationsRequest.h>
 #include <aws/imagebuilder/model/ListImageScanFindingAggregationsResult.h>
+#include <aws/imagebuilder/model/ListImageScanFindingsPaginationTraits.h>
 #include <aws/imagebuilder/model/ListImageScanFindingsRequest.h>
 #include <aws/imagebuilder/model/ListImageScanFindingsResult.h>
+#include <aws/imagebuilder/model/ListImagesPaginationTraits.h>
 #include <aws/imagebuilder/model/ListImagesRequest.h>
 #include <aws/imagebuilder/model/ListImagesResult.h>
+#include <aws/imagebuilder/model/ListInfrastructureConfigurationsPaginationTraits.h>
 #include <aws/imagebuilder/model/ListInfrastructureConfigurationsRequest.h>
 #include <aws/imagebuilder/model/ListInfrastructureConfigurationsResult.h>
+#include <aws/imagebuilder/model/ListLifecycleExecutionResourcesPaginationTraits.h>
 #include <aws/imagebuilder/model/ListLifecycleExecutionResourcesRequest.h>
 #include <aws/imagebuilder/model/ListLifecycleExecutionResourcesResult.h>
+#include <aws/imagebuilder/model/ListLifecycleExecutionsPaginationTraits.h>
 #include <aws/imagebuilder/model/ListLifecycleExecutionsRequest.h>
 #include <aws/imagebuilder/model/ListLifecycleExecutionsResult.h>
+#include <aws/imagebuilder/model/ListLifecyclePoliciesPaginationTraits.h>
 #include <aws/imagebuilder/model/ListLifecyclePoliciesRequest.h>
 #include <aws/imagebuilder/model/ListLifecyclePoliciesResult.h>
 #include <aws/imagebuilder/model/ListTagsForResourceRequest.h>
 #include <aws/imagebuilder/model/ListTagsForResourceResult.h>
+#include <aws/imagebuilder/model/ListWaitingWorkflowStepsPaginationTraits.h>
 #include <aws/imagebuilder/model/ListWaitingWorkflowStepsRequest.h>
 #include <aws/imagebuilder/model/ListWaitingWorkflowStepsResult.h>
+#include <aws/imagebuilder/model/ListWorkflowBuildVersionsPaginationTraits.h>
 #include <aws/imagebuilder/model/ListWorkflowBuildVersionsRequest.h>
 #include <aws/imagebuilder/model/ListWorkflowBuildVersionsResult.h>
+#include <aws/imagebuilder/model/ListWorkflowExecutionsPaginationTraits.h>
 #include <aws/imagebuilder/model/ListWorkflowExecutionsRequest.h>
 #include <aws/imagebuilder/model/ListWorkflowExecutionsResult.h>
+#include <aws/imagebuilder/model/ListWorkflowStepExecutionsPaginationTraits.h>
 #include <aws/imagebuilder/model/ListWorkflowStepExecutionsRequest.h>
 #include <aws/imagebuilder/model/ListWorkflowStepExecutionsResult.h>
+#include <aws/imagebuilder/model/ListWorkflowsPaginationTraits.h>
 #include <aws/imagebuilder/model/ListWorkflowsRequest.h>
 #include <aws/imagebuilder/model/ListWorkflowsResult.h>
 #include <aws/imagebuilder/model/Logging.h>
diff --git a/generated/tests/importexport-gen-tests/ImportExportIncludeTests.cpp b/generated/tests/importexport-gen-tests/ImportExportIncludeTests.cpp
index eec8e2e5c086..081cd31a0802 100644
--- a/generated/tests/importexport-gen-tests/ImportExportIncludeTests.cpp
+++ b/generated/tests/importexport-gen-tests/ImportExportIncludeTests.cpp
@@ -10,8 +10,10 @@
 #include <aws/importexport/ImportExportEndpointProvider.h>
 #include <aws/importexport/ImportExportErrorMarshaller.h>
 #include <aws/importexport/ImportExportErrors.h>
+#include <aws/importexport/ImportExportPaginationBase.h>
 #include <aws/importexport/ImportExportRequest.h>
 #include <aws/importexport/ImportExportServiceClientModel.h>
+#include <aws/importexport/ImportExportWaiter.h>
 #include <aws/importexport/ImportExport_EXPORTS.h>
 #include <aws/importexport/internal/ImportExportEndpointRules.h>
 #include <aws/importexport/model/Artifact.h>
diff --git a/generated/tests/inspector-gen-tests/InspectorIncludeTests.cpp b/generated/tests/inspector-gen-tests/InspectorIncludeTests.cpp
index 2bb49bd87aef..6ec0fada2f5f 100644
--- a/generated/tests/inspector-gen-tests/InspectorIncludeTests.cpp
+++ b/generated/tests/inspector-gen-tests/InspectorIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/inspector/InspectorClient.h>
+#include <aws/inspector/InspectorClientPagination.h>
 #include <aws/inspector/InspectorEndpointProvider.h>
 #include <aws/inspector/InspectorErrorMarshaller.h>
 #include <aws/inspector/InspectorErrors.h>
+#include <aws/inspector/InspectorPaginationBase.h>
 #include <aws/inspector/InspectorRequest.h>
 #include <aws/inspector/InspectorServiceClientModel.h>
+#include <aws/inspector/InspectorWaiter.h>
 #include <aws/inspector/Inspector_EXPORTS.h>
+#include <aws/inspector/internal/InspectorEndpointRules.h>
 #include <aws/inspector/model/AccessDeniedErrorCode.h>
 #include <aws/inspector/model/AccessDeniedException.h>
 #include <aws/inspector/model/AddAttributesToFindingsRequest.h>
@@ -75,6 +79,7 @@
 #include <aws/inspector/model/FindingFilter.h>
 #include <aws/inspector/model/GetAssessmentReportRequest.h>
 #include <aws/inspector/model/GetAssessmentReportResult.h>
+#include <aws/inspector/model/GetExclusionsPreviewPaginationTraits.h>
 #include <aws/inspector/model/GetExclusionsPreviewRequest.h>
 #include <aws/inspector/model/GetExclusionsPreviewResult.h>
 #include <aws/inspector/model/GetTelemetryMetadataRequest.h>
@@ -88,20 +93,28 @@
 #include <aws/inspector/model/InvalidInputException.h>
 #include <aws/inspector/model/LimitExceededErrorCode.h>
 #include <aws/inspector/model/LimitExceededException.h>
+#include <aws/inspector/model/ListAssessmentRunAgentsPaginationTraits.h>
 #include <aws/inspector/model/ListAssessmentRunAgentsRequest.h>
 #include <aws/inspector/model/ListAssessmentRunAgentsResult.h>
+#include <aws/inspector/model/ListAssessmentRunsPaginationTraits.h>
 #include <aws/inspector/model/ListAssessmentRunsRequest.h>
 #include <aws/inspector/model/ListAssessmentRunsResult.h>
+#include <aws/inspector/model/ListAssessmentTargetsPaginationTraits.h>
 #include <aws/inspector/model/ListAssessmentTargetsRequest.h>
 #include <aws/inspector/model/ListAssessmentTargetsResult.h>
+#include <aws/inspector/model/ListAssessmentTemplatesPaginationTraits.h>
 #include <aws/inspector/model/ListAssessmentTemplatesRequest.h>
 #include <aws/inspector/model/ListAssessmentTemplatesResult.h>
+#include <aws/inspector/model/ListEventSubscriptionsPaginationTraits.h>
 #include <aws/inspector/model/ListEventSubscriptionsRequest.h>
 #include <aws/inspector/model/ListEventSubscriptionsResult.h>
+#include <aws/inspector/model/ListExclusionsPaginationTraits.h>
 #include <aws/inspector/model/ListExclusionsRequest.h>
 #include <aws/inspector/model/ListExclusionsResult.h>
+#include <aws/inspector/model/ListFindingsPaginationTraits.h>
 #include <aws/inspector/model/ListFindingsRequest.h>
 #include <aws/inspector/model/ListFindingsResult.h>
+#include <aws/inspector/model/ListRulesPackagesPaginationTraits.h>
 #include <aws/inspector/model/ListRulesPackagesRequest.h>
 #include <aws/inspector/model/ListRulesPackagesResult.h>
 #include <aws/inspector/model/ListTagsForResourceRequest.h>
@@ -110,6 +123,7 @@
 #include <aws/inspector/model/NetworkInterface.h>
 #include <aws/inspector/model/NoSuchEntityErrorCode.h>
 #include <aws/inspector/model/NoSuchEntityException.h>
+#include <aws/inspector/model/PreviewAgentsPaginationTraits.h>
 #include <aws/inspector/model/PreviewAgentsRequest.h>
 #include <aws/inspector/model/PreviewAgentsResult.h>
 #include <aws/inspector/model/PreviewStatus.h>
diff --git a/generated/tests/inspector-scan-gen-tests/InspectorscanIncludeTests.cpp b/generated/tests/inspector-scan-gen-tests/InspectorscanIncludeTests.cpp
index 019575136d62..b9d2a4a8a0e3 100644
--- a/generated/tests/inspector-scan-gen-tests/InspectorscanIncludeTests.cpp
+++ b/generated/tests/inspector-scan-gen-tests/InspectorscanIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/inspector-scan/InspectorscanEndpointProvider.h>
 #include <aws/inspector-scan/InspectorscanErrorMarshaller.h>
 #include <aws/inspector-scan/InspectorscanErrors.h>
+#include <aws/inspector-scan/InspectorscanPaginationBase.h>
 #include <aws/inspector-scan/InspectorscanRequest.h>
 #include <aws/inspector-scan/InspectorscanServiceClientModel.h>
+#include <aws/inspector-scan/InspectorscanWaiter.h>
 #include <aws/inspector-scan/Inspectorscan_EXPORTS.h>
+#include <aws/inspector-scan/internal/InspectorscanEndpointRules.h>
 #include <aws/inspector-scan/model/InternalServerException.h>
 #include <aws/inspector-scan/model/InternalServerExceptionReason.h>
 #include <aws/inspector-scan/model/OutputFormat.h>
diff --git a/generated/tests/inspector2-gen-tests/Inspector2IncludeTests.cpp b/generated/tests/inspector2-gen-tests/Inspector2IncludeTests.cpp
index a7cc5122a93d..5d8e6fdc6523 100644
--- a/generated/tests/inspector2-gen-tests/Inspector2IncludeTests.cpp
+++ b/generated/tests/inspector2-gen-tests/Inspector2IncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/inspector2/Inspector2Client.h>
+#include <aws/inspector2/Inspector2ClientPagination.h>
 #include <aws/inspector2/Inspector2EndpointProvider.h>
 #include <aws/inspector2/Inspector2ErrorMarshaller.h>
 #include <aws/inspector2/Inspector2Errors.h>
+#include <aws/inspector2/Inspector2PaginationBase.h>
 #include <aws/inspector2/Inspector2Request.h>
 #include <aws/inspector2/Inspector2ServiceClientModel.h>
+#include <aws/inspector2/Inspector2Waiter.h>
 #include <aws/inspector2/Inspector2_EXPORTS.h>
+#include <aws/inspector2/internal/Inspector2EndpointRules.h>
 #include <aws/inspector2/model/Account.h>
 #include <aws/inspector2/model/AccountAggregation.h>
 #include <aws/inspector2/model/AccountAggregationResponse.h>
@@ -276,8 +280,10 @@
 #include <aws/inspector2/model/FreeTrialType.h>
 #include <aws/inspector2/model/GetCisScanReportRequest.h>
 #include <aws/inspector2/model/GetCisScanReportResult.h>
+#include <aws/inspector2/model/GetCisScanResultDetailsPaginationTraits.h>
 #include <aws/inspector2/model/GetCisScanResultDetailsRequest.h>
 #include <aws/inspector2/model/GetCisScanResultDetailsResult.h>
+#include <aws/inspector2/model/GetClustersForImagePaginationTraits.h>
 #include <aws/inspector2/model/GetClustersForImageRequest.h>
 #include <aws/inspector2/model/GetClustersForImageResult.h>
 #include <aws/inspector2/model/GetCodeSecurityIntegrationRequest.h>
@@ -318,17 +324,22 @@
 #include <aws/inspector2/model/LambdaLayerAggregationResponse.h>
 #include <aws/inspector2/model/LambdaLayerSortBy.h>
 #include <aws/inspector2/model/LambdaVpcConfig.h>
+#include <aws/inspector2/model/ListAccountPermissionsPaginationTraits.h>
 #include <aws/inspector2/model/ListAccountPermissionsRequest.h>
 #include <aws/inspector2/model/ListAccountPermissionsResult.h>
 #include <aws/inspector2/model/ListCisScanConfigurationsFilterCriteria.h>
+#include <aws/inspector2/model/ListCisScanConfigurationsPaginationTraits.h>
 #include <aws/inspector2/model/ListCisScanConfigurationsRequest.h>
 #include <aws/inspector2/model/ListCisScanConfigurationsResult.h>
+#include <aws/inspector2/model/ListCisScanResultsAggregatedByChecksPaginationTraits.h>
 #include <aws/inspector2/model/ListCisScanResultsAggregatedByChecksRequest.h>
 #include <aws/inspector2/model/ListCisScanResultsAggregatedByChecksResult.h>
+#include <aws/inspector2/model/ListCisScanResultsAggregatedByTargetResourcePaginationTraits.h>
 #include <aws/inspector2/model/ListCisScanResultsAggregatedByTargetResourceRequest.h>
 #include <aws/inspector2/model/ListCisScanResultsAggregatedByTargetResourceResult.h>
 #include <aws/inspector2/model/ListCisScansDetailLevel.h>
 #include <aws/inspector2/model/ListCisScansFilterCriteria.h>
+#include <aws/inspector2/model/ListCisScansPaginationTraits.h>
 #include <aws/inspector2/model/ListCisScansRequest.h>
 #include <aws/inspector2/model/ListCisScansResult.h>
 #include <aws/inspector2/model/ListCisScansSortBy.h>
@@ -338,26 +349,36 @@
 #include <aws/inspector2/model/ListCodeSecurityScanConfigurationAssociationsResult.h>
 #include <aws/inspector2/model/ListCodeSecurityScanConfigurationsRequest.h>
 #include <aws/inspector2/model/ListCodeSecurityScanConfigurationsResult.h>
+#include <aws/inspector2/model/ListConnectorScanConfigurationsPaginationTraits.h>
 #include <aws/inspector2/model/ListConnectorScanConfigurationsRequest.h>
 #include <aws/inspector2/model/ListConnectorScanConfigurationsResult.h>
+#include <aws/inspector2/model/ListConnectorsPaginationTraits.h>
 #include <aws/inspector2/model/ListConnectorsRequest.h>
 #include <aws/inspector2/model/ListConnectorsResult.h>
+#include <aws/inspector2/model/ListCoveragePaginationTraits.h>
 #include <aws/inspector2/model/ListCoverageRequest.h>
 #include <aws/inspector2/model/ListCoverageResult.h>
+#include <aws/inspector2/model/ListCoverageStatisticsPaginationTraits.h>
 #include <aws/inspector2/model/ListCoverageStatisticsRequest.h>
 #include <aws/inspector2/model/ListCoverageStatisticsResult.h>
+#include <aws/inspector2/model/ListDelegatedAdminAccountsPaginationTraits.h>
 #include <aws/inspector2/model/ListDelegatedAdminAccountsRequest.h>
 #include <aws/inspector2/model/ListDelegatedAdminAccountsResult.h>
+#include <aws/inspector2/model/ListFiltersPaginationTraits.h>
 #include <aws/inspector2/model/ListFiltersRequest.h>
 #include <aws/inspector2/model/ListFiltersResult.h>
+#include <aws/inspector2/model/ListFindingAggregationsPaginationTraits.h>
 #include <aws/inspector2/model/ListFindingAggregationsRequest.h>
 #include <aws/inspector2/model/ListFindingAggregationsResult.h>
+#include <aws/inspector2/model/ListFindingsPaginationTraits.h>
 #include <aws/inspector2/model/ListFindingsRequest.h>
 #include <aws/inspector2/model/ListFindingsResult.h>
+#include <aws/inspector2/model/ListMembersPaginationTraits.h>
 #include <aws/inspector2/model/ListMembersRequest.h>
 #include <aws/inspector2/model/ListMembersResult.h>
 #include <aws/inspector2/model/ListTagsForResourceRequest.h>
 #include <aws/inspector2/model/ListTagsForResourceResult.h>
+#include <aws/inspector2/model/ListUsageTotalsPaginationTraits.h>
 #include <aws/inspector2/model/ListUsageTotalsRequest.h>
 #include <aws/inspector2/model/ListUsageTotalsResult.h>
 #include <aws/inspector2/model/MapComparison.h>
@@ -430,6 +451,7 @@
 #include <aws/inspector2/model/ScopeState.h>
 #include <aws/inspector2/model/ScopeType.h>
 #include <aws/inspector2/model/SearchVulnerabilitiesFilterCriteria.h>
+#include <aws/inspector2/model/SearchVulnerabilitiesPaginationTraits.h>
 #include <aws/inspector2/model/SearchVulnerabilitiesRequest.h>
 #include <aws/inspector2/model/SearchVulnerabilitiesResult.h>
 #include <aws/inspector2/model/SendCisSessionHealthRequest.h>
diff --git a/generated/tests/interconnect-gen-tests/InterconnectIncludeTests.cpp b/generated/tests/interconnect-gen-tests/InterconnectIncludeTests.cpp
index 7a9033332c07..38d8294dde00 100644
--- a/generated/tests/interconnect-gen-tests/InterconnectIncludeTests.cpp
+++ b/generated/tests/interconnect-gen-tests/InterconnectIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/interconnect/InterconnectClient.h>
+#include <aws/interconnect/InterconnectClientPagination.h>
 #include <aws/interconnect/InterconnectEndpointProvider.h>
 #include <aws/interconnect/InterconnectErrorMarshaller.h>
 #include <aws/interconnect/InterconnectErrors.h>
+#include <aws/interconnect/InterconnectPaginationBase.h>
 #include <aws/interconnect/InterconnectRequest.h>
 #include <aws/interconnect/InterconnectServiceClientModel.h>
+#include <aws/interconnect/InterconnectWaiter.h>
 #include <aws/interconnect/Interconnect_EXPORTS.h>
+#include <aws/interconnect/internal/InterconnectEndpointRules.h>
 #include <aws/interconnect/model/AcceptConnectionProposalRequest.h>
 #include <aws/interconnect/model/AcceptConnectionProposalResult.h>
 #include <aws/interconnect/model/AttachPoint.h>
@@ -34,10 +38,13 @@
 #include <aws/interconnect/model/GetConnectionResult.h>
 #include <aws/interconnect/model/GetEnvironmentRequest.h>
 #include <aws/interconnect/model/GetEnvironmentResult.h>
+#include <aws/interconnect/model/ListAttachPointsPaginationTraits.h>
 #include <aws/interconnect/model/ListAttachPointsRequest.h>
 #include <aws/interconnect/model/ListAttachPointsResult.h>
+#include <aws/interconnect/model/ListConnectionsPaginationTraits.h>
 #include <aws/interconnect/model/ListConnectionsRequest.h>
 #include <aws/interconnect/model/ListConnectionsResult.h>
+#include <aws/interconnect/model/ListEnvironmentsPaginationTraits.h>
 #include <aws/interconnect/model/ListEnvironmentsRequest.h>
 #include <aws/interconnect/model/ListEnvironmentsResult.h>
 #include <aws/interconnect/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/internetmonitor-gen-tests/InternetMonitorIncludeTests.cpp b/generated/tests/internetmonitor-gen-tests/InternetMonitorIncludeTests.cpp
index 5bf128b857a5..8b607c4d4975 100644
--- a/generated/tests/internetmonitor-gen-tests/InternetMonitorIncludeTests.cpp
+++ b/generated/tests/internetmonitor-gen-tests/InternetMonitorIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/internetmonitor/InternetMonitorClient.h>
+#include <aws/internetmonitor/InternetMonitorClientPagination.h>
 #include <aws/internetmonitor/InternetMonitorEndpointProvider.h>
 #include <aws/internetmonitor/InternetMonitorErrorMarshaller.h>
 #include <aws/internetmonitor/InternetMonitorErrors.h>
+#include <aws/internetmonitor/InternetMonitorPaginationBase.h>
 #include <aws/internetmonitor/InternetMonitorRequest.h>
 #include <aws/internetmonitor/InternetMonitorServiceClientModel.h>
+#include <aws/internetmonitor/InternetMonitorWaiter.h>
 #include <aws/internetmonitor/InternetMonitor_EXPORTS.h>
+#include <aws/internetmonitor/internal/InternetMonitorEndpointRules.h>
 #include <aws/internetmonitor/model/AvailabilityMeasurement.h>
 #include <aws/internetmonitor/model/ClientLocation.h>
 #include <aws/internetmonitor/model/CreateMonitorRequest.h>
@@ -26,6 +30,7 @@
 #include <aws/internetmonitor/model/GetInternetEventResult.h>
 #include <aws/internetmonitor/model/GetMonitorRequest.h>
 #include <aws/internetmonitor/model/GetMonitorResult.h>
+#include <aws/internetmonitor/model/GetQueryResultsPaginationTraits.h>
 #include <aws/internetmonitor/model/GetQueryResultsRequest.h>
 #include <aws/internetmonitor/model/GetQueryResultsResult.h>
 #include <aws/internetmonitor/model/GetQueryStatusRequest.h>
@@ -40,10 +45,13 @@
 #include <aws/internetmonitor/model/InternetEventType.h>
 #include <aws/internetmonitor/model/InternetHealth.h>
 #include <aws/internetmonitor/model/InternetMeasurementsLogDelivery.h>
+#include <aws/internetmonitor/model/ListHealthEventsPaginationTraits.h>
 #include <aws/internetmonitor/model/ListHealthEventsRequest.h>
 #include <aws/internetmonitor/model/ListHealthEventsResult.h>
+#include <aws/internetmonitor/model/ListInternetEventsPaginationTraits.h>
 #include <aws/internetmonitor/model/ListInternetEventsRequest.h>
 #include <aws/internetmonitor/model/ListInternetEventsResult.h>
+#include <aws/internetmonitor/model/ListMonitorsPaginationTraits.h>
 #include <aws/internetmonitor/model/ListMonitorsRequest.h>
 #include <aws/internetmonitor/model/ListMonitorsResult.h>
 #include <aws/internetmonitor/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/invoicing-gen-tests/InvoicingIncludeTests.cpp b/generated/tests/invoicing-gen-tests/InvoicingIncludeTests.cpp
index 2eca3b71a831..a044b9c86b9d 100644
--- a/generated/tests/invoicing-gen-tests/InvoicingIncludeTests.cpp
+++ b/generated/tests/invoicing-gen-tests/InvoicingIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/invoicing/InvoicingClient.h>
+#include <aws/invoicing/InvoicingClientPagination.h>
 #include <aws/invoicing/InvoicingEndpointProvider.h>
 #include <aws/invoicing/InvoicingErrorMarshaller.h>
 #include <aws/invoicing/InvoicingErrors.h>
+#include <aws/invoicing/InvoicingPaginationBase.h>
 #include <aws/invoicing/InvoicingRequest.h>
 #include <aws/invoicing/InvoicingServiceClientModel.h>
+#include <aws/invoicing/InvoicingWaiter.h>
 #include <aws/invoicing/Invoicing_EXPORTS.h>
+#include <aws/invoicing/internal/InvoicingEndpointRules.h>
 #include <aws/invoicing/model/AccessDeniedException.h>
 #include <aws/invoicing/model/AmountBreakdown.h>
 #include <aws/invoicing/model/BatchGetInvoiceProfileRequest.h>
@@ -61,11 +65,14 @@
 #include <aws/invoicing/model/InvoiceType.h>
 #include <aws/invoicing/model/InvoiceUnit.h>
 #include <aws/invoicing/model/InvoiceUnitRule.h>
+#include <aws/invoicing/model/ListInvoiceSummariesPaginationTraits.h>
 #include <aws/invoicing/model/ListInvoiceSummariesRequest.h>
 #include <aws/invoicing/model/ListInvoiceSummariesResourceType.h>
 #include <aws/invoicing/model/ListInvoiceSummariesResult.h>
+#include <aws/invoicing/model/ListInvoiceUnitsPaginationTraits.h>
 #include <aws/invoicing/model/ListInvoiceUnitsRequest.h>
 #include <aws/invoicing/model/ListInvoiceUnitsResult.h>
+#include <aws/invoicing/model/ListProcurementPortalPreferencesPaginationTraits.h>
 #include <aws/invoicing/model/ListProcurementPortalPreferencesRequest.h>
 #include <aws/invoicing/model/ListProcurementPortalPreferencesResult.h>
 #include <aws/invoicing/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/iot-data-gen-tests/IoTDataPlaneIncludeTests.cpp b/generated/tests/iot-data-gen-tests/IoTDataPlaneIncludeTests.cpp
index 2fb8bfed8e99..cbcbef41518d 100644
--- a/generated/tests/iot-data-gen-tests/IoTDataPlaneIncludeTests.cpp
+++ b/generated/tests/iot-data-gen-tests/IoTDataPlaneIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/iot-data/IoTDataPlaneClient.h>
+#include <aws/iot-data/IoTDataPlaneClientPagination.h>
 #include <aws/iot-data/IoTDataPlaneEndpointProvider.h>
 #include <aws/iot-data/IoTDataPlaneErrorMarshaller.h>
 #include <aws/iot-data/IoTDataPlaneErrors.h>
+#include <aws/iot-data/IoTDataPlanePaginationBase.h>
 #include <aws/iot-data/IoTDataPlaneRequest.h>
 #include <aws/iot-data/IoTDataPlaneServiceClientModel.h>
+#include <aws/iot-data/IoTDataPlaneWaiter.h>
 #include <aws/iot-data/IoTDataPlane_EXPORTS.h>
+#include <aws/iot-data/internal/IoTDataPlaneEndpointRules.h>
 #include <aws/iot-data/model/DeleteConnectionRequest.h>
 #include <aws/iot-data/model/DeleteThingShadowRequest.h>
 #include <aws/iot-data/model/DeleteThingShadowResult.h>
@@ -24,8 +28,10 @@
 #include <aws/iot-data/model/GetThingShadowResult.h>
 #include <aws/iot-data/model/ListNamedShadowsForThingRequest.h>
 #include <aws/iot-data/model/ListNamedShadowsForThingResult.h>
+#include <aws/iot-data/model/ListRetainedMessagesPaginationTraits.h>
 #include <aws/iot-data/model/ListRetainedMessagesRequest.h>
 #include <aws/iot-data/model/ListRetainedMessagesResult.h>
+#include <aws/iot-data/model/ListSubscriptionsPaginationTraits.h>
 #include <aws/iot-data/model/ListSubscriptionsRequest.h>
 #include <aws/iot-data/model/ListSubscriptionsResult.h>
 #include <aws/iot-data/model/PayloadFormatIndicator.h>
diff --git a/generated/tests/iot-gen-tests/IoTIncludeTests.cpp b/generated/tests/iot-gen-tests/IoTIncludeTests.cpp
index b1fd19a882a0..2e8847674bb9 100644
--- a/generated/tests/iot-gen-tests/IoTIncludeTests.cpp
+++ b/generated/tests/iot-gen-tests/IoTIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/iot/IoTClient.h>
+#include <aws/iot/IoTClientPagination.h>
 #include <aws/iot/IoTEndpointProvider.h>
 #include <aws/iot/IoTErrorMarshaller.h>
 #include <aws/iot/IoTErrors.h>
+#include <aws/iot/IoTPaginationBase.h>
 #include <aws/iot/IoTRequest.h>
 #include <aws/iot/IoTServiceClientModel.h>
+#include <aws/iot/IoTWaiter.h>
 #include <aws/iot/IoT_EXPORTS.h>
+#include <aws/iot/internal/IoTEndpointRules.h>
 #include <aws/iot/model/AbortAction.h>
 #include <aws/iot/model/AbortConfig.h>
 #include <aws/iot/model/AbortCriteria.h>
@@ -391,6 +395,7 @@
 #include <aws/iot/model/FleetMetricNameAndArn.h>
 #include <aws/iot/model/FleetMetricUnit.h>
 #include <aws/iot/model/GeoLocationTarget.h>
+#include <aws/iot/model/GetBehaviorModelTrainingSummariesPaginationTraits.h>
 #include <aws/iot/model/GetBehaviorModelTrainingSummariesRequest.h>
 #include <aws/iot/model/GetBehaviorModelTrainingSummariesResult.h>
 #include <aws/iot/model/GetBucketsAggregationRequest.h>
@@ -470,130 +475,191 @@
 #include <aws/iot/model/KeyPair.h>
 #include <aws/iot/model/KinesisAction.h>
 #include <aws/iot/model/LambdaAction.h>
+#include <aws/iot/model/ListActiveViolationsPaginationTraits.h>
 #include <aws/iot/model/ListActiveViolationsRequest.h>
 #include <aws/iot/model/ListActiveViolationsResult.h>
+#include <aws/iot/model/ListAttachedPoliciesPaginationTraits.h>
 #include <aws/iot/model/ListAttachedPoliciesRequest.h>
 #include <aws/iot/model/ListAttachedPoliciesResult.h>
+#include <aws/iot/model/ListAuditFindingsPaginationTraits.h>
 #include <aws/iot/model/ListAuditFindingsRequest.h>
 #include <aws/iot/model/ListAuditFindingsResult.h>
+#include <aws/iot/model/ListAuditMitigationActionsExecutionsPaginationTraits.h>
 #include <aws/iot/model/ListAuditMitigationActionsExecutionsRequest.h>
 #include <aws/iot/model/ListAuditMitigationActionsExecutionsResult.h>
+#include <aws/iot/model/ListAuditMitigationActionsTasksPaginationTraits.h>
 #include <aws/iot/model/ListAuditMitigationActionsTasksRequest.h>
 #include <aws/iot/model/ListAuditMitigationActionsTasksResult.h>
+#include <aws/iot/model/ListAuditSuppressionsPaginationTraits.h>
 #include <aws/iot/model/ListAuditSuppressionsRequest.h>
 #include <aws/iot/model/ListAuditSuppressionsResult.h>
+#include <aws/iot/model/ListAuditTasksPaginationTraits.h>
 #include <aws/iot/model/ListAuditTasksRequest.h>
 #include <aws/iot/model/ListAuditTasksResult.h>
+#include <aws/iot/model/ListAuthorizersPaginationTraits.h>
 #include <aws/iot/model/ListAuthorizersRequest.h>
 #include <aws/iot/model/ListAuthorizersResult.h>
+#include <aws/iot/model/ListBillingGroupsPaginationTraits.h>
 #include <aws/iot/model/ListBillingGroupsRequest.h>
 #include <aws/iot/model/ListBillingGroupsResult.h>
+#include <aws/iot/model/ListCACertificatesPaginationTraits.h>
 #include <aws/iot/model/ListCACertificatesRequest.h>
 #include <aws/iot/model/ListCACertificatesResult.h>
 #include <aws/iot/model/ListCertificateProvidersRequest.h>
 #include <aws/iot/model/ListCertificateProvidersResult.h>
+#include <aws/iot/model/ListCertificatesByCAPaginationTraits.h>
 #include <aws/iot/model/ListCertificatesByCARequest.h>
 #include <aws/iot/model/ListCertificatesByCAResult.h>
+#include <aws/iot/model/ListCertificatesPaginationTraits.h>
 #include <aws/iot/model/ListCertificatesRequest.h>
 #include <aws/iot/model/ListCertificatesResult.h>
+#include <aws/iot/model/ListCommandExecutionsPaginationTraits.h>
 #include <aws/iot/model/ListCommandExecutionsRequest.h>
 #include <aws/iot/model/ListCommandExecutionsResult.h>
+#include <aws/iot/model/ListCommandsPaginationTraits.h>
 #include <aws/iot/model/ListCommandsRequest.h>
 #include <aws/iot/model/ListCommandsResult.h>
+#include <aws/iot/model/ListCustomMetricsPaginationTraits.h>
 #include <aws/iot/model/ListCustomMetricsRequest.h>
 #include <aws/iot/model/ListCustomMetricsResult.h>
+#include <aws/iot/model/ListDetectMitigationActionsExecutionsPaginationTraits.h>
 #include <aws/iot/model/ListDetectMitigationActionsExecutionsRequest.h>
 #include <aws/iot/model/ListDetectMitigationActionsExecutionsResult.h>
+#include <aws/iot/model/ListDetectMitigationActionsTasksPaginationTraits.h>
 #include <aws/iot/model/ListDetectMitigationActionsTasksRequest.h>
 #include <aws/iot/model/ListDetectMitigationActionsTasksResult.h>
+#include <aws/iot/model/ListDimensionsPaginationTraits.h>
 #include <aws/iot/model/ListDimensionsRequest.h>
 #include <aws/iot/model/ListDimensionsResult.h>
+#include <aws/iot/model/ListDomainConfigurationsPaginationTraits.h>
 #include <aws/iot/model/ListDomainConfigurationsRequest.h>
 #include <aws/iot/model/ListDomainConfigurationsResult.h>
+#include <aws/iot/model/ListFleetMetricsPaginationTraits.h>
 #include <aws/iot/model/ListFleetMetricsRequest.h>
 #include <aws/iot/model/ListFleetMetricsResult.h>
+#include <aws/iot/model/ListIndicesPaginationTraits.h>
 #include <aws/iot/model/ListIndicesRequest.h>
 #include <aws/iot/model/ListIndicesResult.h>
+#include <aws/iot/model/ListJobExecutionsForJobPaginationTraits.h>
 #include <aws/iot/model/ListJobExecutionsForJobRequest.h>
 #include <aws/iot/model/ListJobExecutionsForJobResult.h>
+#include <aws/iot/model/ListJobExecutionsForThingPaginationTraits.h>
 #include <aws/iot/model/ListJobExecutionsForThingRequest.h>
 #include <aws/iot/model/ListJobExecutionsForThingResult.h>
+#include <aws/iot/model/ListJobTemplatesPaginationTraits.h>
 #include <aws/iot/model/ListJobTemplatesRequest.h>
 #include <aws/iot/model/ListJobTemplatesResult.h>
+#include <aws/iot/model/ListJobsPaginationTraits.h>
 #include <aws/iot/model/ListJobsRequest.h>
 #include <aws/iot/model/ListJobsResult.h>
+#include <aws/iot/model/ListManagedJobTemplatesPaginationTraits.h>
 #include <aws/iot/model/ListManagedJobTemplatesRequest.h>
 #include <aws/iot/model/ListManagedJobTemplatesResult.h>
+#include <aws/iot/model/ListMetricValuesPaginationTraits.h>
 #include <aws/iot/model/ListMetricValuesRequest.h>
 #include <aws/iot/model/ListMetricValuesResult.h>
+#include <aws/iot/model/ListMitigationActionsPaginationTraits.h>
 #include <aws/iot/model/ListMitigationActionsRequest.h>
 #include <aws/iot/model/ListMitigationActionsResult.h>
+#include <aws/iot/model/ListOTAUpdatesPaginationTraits.h>
 #include <aws/iot/model/ListOTAUpdatesRequest.h>
 #include <aws/iot/model/ListOTAUpdatesResult.h>
+#include <aws/iot/model/ListOutgoingCertificatesPaginationTraits.h>
 #include <aws/iot/model/ListOutgoingCertificatesRequest.h>
 #include <aws/iot/model/ListOutgoingCertificatesResult.h>
+#include <aws/iot/model/ListPackageVersionsPaginationTraits.h>
 #include <aws/iot/model/ListPackageVersionsRequest.h>
 #include <aws/iot/model/ListPackageVersionsResult.h>
+#include <aws/iot/model/ListPackagesPaginationTraits.h>
 #include <aws/iot/model/ListPackagesRequest.h>
 #include <aws/iot/model/ListPackagesResult.h>
+#include <aws/iot/model/ListPoliciesPaginationTraits.h>
 #include <aws/iot/model/ListPoliciesRequest.h>
 #include <aws/iot/model/ListPoliciesResult.h>
 #include <aws/iot/model/ListPolicyVersionsRequest.h>
 #include <aws/iot/model/ListPolicyVersionsResult.h>
+#include <aws/iot/model/ListPrincipalThingsPaginationTraits.h>
 #include <aws/iot/model/ListPrincipalThingsRequest.h>
 #include <aws/iot/model/ListPrincipalThingsResult.h>
+#include <aws/iot/model/ListPrincipalThingsV2PaginationTraits.h>
 #include <aws/iot/model/ListPrincipalThingsV2Request.h>
 #include <aws/iot/model/ListPrincipalThingsV2Result.h>
+#include <aws/iot/model/ListProvisioningTemplateVersionsPaginationTraits.h>
 #include <aws/iot/model/ListProvisioningTemplateVersionsRequest.h>
 #include <aws/iot/model/ListProvisioningTemplateVersionsResult.h>
+#include <aws/iot/model/ListProvisioningTemplatesPaginationTraits.h>
 #include <aws/iot/model/ListProvisioningTemplatesRequest.h>
 #include <aws/iot/model/ListProvisioningTemplatesResult.h>
+#include <aws/iot/model/ListRelatedResourcesForAuditFindingPaginationTraits.h>
 #include <aws/iot/model/ListRelatedResourcesForAuditFindingRequest.h>
 #include <aws/iot/model/ListRelatedResourcesForAuditFindingResult.h>
+#include <aws/iot/model/ListRoleAliasesPaginationTraits.h>
 #include <aws/iot/model/ListRoleAliasesRequest.h>
 #include <aws/iot/model/ListRoleAliasesResult.h>
+#include <aws/iot/model/ListSbomValidationResultsPaginationTraits.h>
 #include <aws/iot/model/ListSbomValidationResultsRequest.h>
 #include <aws/iot/model/ListSbomValidationResultsResult.h>
+#include <aws/iot/model/ListScheduledAuditsPaginationTraits.h>
 #include <aws/iot/model/ListScheduledAuditsRequest.h>
 #include <aws/iot/model/ListScheduledAuditsResult.h>
+#include <aws/iot/model/ListSecurityProfilesForTargetPaginationTraits.h>
 #include <aws/iot/model/ListSecurityProfilesForTargetRequest.h>
 #include <aws/iot/model/ListSecurityProfilesForTargetResult.h>
+#include <aws/iot/model/ListSecurityProfilesPaginationTraits.h>
 #include <aws/iot/model/ListSecurityProfilesRequest.h>
 #include <aws/iot/model/ListSecurityProfilesResult.h>
+#include <aws/iot/model/ListStreamsPaginationTraits.h>
 #include <aws/iot/model/ListStreamsRequest.h>
 #include <aws/iot/model/ListStreamsResult.h>
+#include <aws/iot/model/ListTagsForResourcePaginationTraits.h>
 #include <aws/iot/model/ListTagsForResourceRequest.h>
 #include <aws/iot/model/ListTagsForResourceResult.h>
+#include <aws/iot/model/ListTargetsForPolicyPaginationTraits.h>
 #include <aws/iot/model/ListTargetsForPolicyRequest.h>
 #include <aws/iot/model/ListTargetsForPolicyResult.h>
+#include <aws/iot/model/ListTargetsForSecurityProfilePaginationTraits.h>
 #include <aws/iot/model/ListTargetsForSecurityProfileRequest.h>
 #include <aws/iot/model/ListTargetsForSecurityProfileResult.h>
+#include <aws/iot/model/ListThingGroupsForThingPaginationTraits.h>
 #include <aws/iot/model/ListThingGroupsForThingRequest.h>
 #include <aws/iot/model/ListThingGroupsForThingResult.h>
+#include <aws/iot/model/ListThingGroupsPaginationTraits.h>
 #include <aws/iot/model/ListThingGroupsRequest.h>
 #include <aws/iot/model/ListThingGroupsResult.h>
+#include <aws/iot/model/ListThingPrincipalsPaginationTraits.h>
 #include <aws/iot/model/ListThingPrincipalsRequest.h>
 #include <aws/iot/model/ListThingPrincipalsResult.h>
+#include <aws/iot/model/ListThingPrincipalsV2PaginationTraits.h>
 #include <aws/iot/model/ListThingPrincipalsV2Request.h>
 #include <aws/iot/model/ListThingPrincipalsV2Result.h>
+#include <aws/iot/model/ListThingRegistrationTaskReportsPaginationTraits.h>
 #include <aws/iot/model/ListThingRegistrationTaskReportsRequest.h>
 #include <aws/iot/model/ListThingRegistrationTaskReportsResult.h>
+#include <aws/iot/model/ListThingRegistrationTasksPaginationTraits.h>
 #include <aws/iot/model/ListThingRegistrationTasksRequest.h>
 #include <aws/iot/model/ListThingRegistrationTasksResult.h>
+#include <aws/iot/model/ListThingTypesPaginationTraits.h>
 #include <aws/iot/model/ListThingTypesRequest.h>
 #include <aws/iot/model/ListThingTypesResult.h>
+#include <aws/iot/model/ListThingsInBillingGroupPaginationTraits.h>
 #include <aws/iot/model/ListThingsInBillingGroupRequest.h>
 #include <aws/iot/model/ListThingsInBillingGroupResult.h>
+#include <aws/iot/model/ListThingsInThingGroupPaginationTraits.h>
 #include <aws/iot/model/ListThingsInThingGroupRequest.h>
 #include <aws/iot/model/ListThingsInThingGroupResult.h>
+#include <aws/iot/model/ListThingsPaginationTraits.h>
 #include <aws/iot/model/ListThingsRequest.h>
 #include <aws/iot/model/ListThingsResult.h>
+#include <aws/iot/model/ListTopicRuleDestinationsPaginationTraits.h>
 #include <aws/iot/model/ListTopicRuleDestinationsRequest.h>
 #include <aws/iot/model/ListTopicRuleDestinationsResult.h>
+#include <aws/iot/model/ListTopicRulesPaginationTraits.h>
 #include <aws/iot/model/ListTopicRulesRequest.h>
 #include <aws/iot/model/ListTopicRulesResult.h>
+#include <aws/iot/model/ListV2LoggingLevelsPaginationTraits.h>
 #include <aws/iot/model/ListV2LoggingLevelsRequest.h>
 #include <aws/iot/model/ListV2LoggingLevelsResult.h>
+#include <aws/iot/model/ListViolationEventsPaginationTraits.h>
 #include <aws/iot/model/ListViolationEventsRequest.h>
 #include <aws/iot/model/ListViolationEventsResult.h>
 #include <aws/iot/model/LocationAction.h>
diff --git a/generated/tests/iot-jobs-data-gen-tests/IoTJobsDataPlaneIncludeTests.cpp b/generated/tests/iot-jobs-data-gen-tests/IoTJobsDataPlaneIncludeTests.cpp
index 06aad2e4e13e..7166755e4402 100644
--- a/generated/tests/iot-jobs-data-gen-tests/IoTJobsDataPlaneIncludeTests.cpp
+++ b/generated/tests/iot-jobs-data-gen-tests/IoTJobsDataPlaneIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/iot-jobs-data/IoTJobsDataPlaneEndpointProvider.h>
 #include <aws/iot-jobs-data/IoTJobsDataPlaneErrorMarshaller.h>
 #include <aws/iot-jobs-data/IoTJobsDataPlaneErrors.h>
+#include <aws/iot-jobs-data/IoTJobsDataPlanePaginationBase.h>
 #include <aws/iot-jobs-data/IoTJobsDataPlaneRequest.h>
 #include <aws/iot-jobs-data/IoTJobsDataPlaneServiceClientModel.h>
+#include <aws/iot-jobs-data/IoTJobsDataPlaneWaiter.h>
 #include <aws/iot-jobs-data/IoTJobsDataPlane_EXPORTS.h>
+#include <aws/iot-jobs-data/internal/IoTJobsDataPlaneEndpointRules.h>
 #include <aws/iot-jobs-data/model/CommandParameterValue.h>
 #include <aws/iot-jobs-data/model/ConflictException.h>
 #include <aws/iot-jobs-data/model/DescribeJobExecutionRequest.h>
diff --git a/generated/tests/iot-managed-integrations-gen-tests/IoTManagedIntegrationsIncludeTests.cpp b/generated/tests/iot-managed-integrations-gen-tests/IoTManagedIntegrationsIncludeTests.cpp
index 3fdb2acdd7e9..89e952fb1f36 100644
--- a/generated/tests/iot-managed-integrations-gen-tests/IoTManagedIntegrationsIncludeTests.cpp
+++ b/generated/tests/iot-managed-integrations-gen-tests/IoTManagedIntegrationsIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/iot-managed-integrations/IoTManagedIntegrationsClient.h>
+#include <aws/iot-managed-integrations/IoTManagedIntegrationsClientPagination.h>
 #include <aws/iot-managed-integrations/IoTManagedIntegrationsEndpointProvider.h>
 #include <aws/iot-managed-integrations/IoTManagedIntegrationsErrorMarshaller.h>
 #include <aws/iot-managed-integrations/IoTManagedIntegrationsErrors.h>
+#include <aws/iot-managed-integrations/IoTManagedIntegrationsPaginationBase.h>
 #include <aws/iot-managed-integrations/IoTManagedIntegrationsRequest.h>
 #include <aws/iot-managed-integrations/IoTManagedIntegrationsServiceClientModel.h>
+#include <aws/iot-managed-integrations/IoTManagedIntegrationsWaiter.h>
 #include <aws/iot-managed-integrations/IoTManagedIntegrations_EXPORTS.h>
+#include <aws/iot-managed-integrations/internal/IoTManagedIntegrationsEndpointRules.h>
 #include <aws/iot-managed-integrations/model/AbortConfigCriteria.h>
 #include <aws/iot-managed-integrations/model/AbortCriteriaAction.h>
 #include <aws/iot-managed-integrations/model/AbortCriteriaFailureType.h>
@@ -136,38 +140,55 @@
 #include <aws/iot-managed-integrations/model/GetSchemaVersionResult.h>
 #include <aws/iot-managed-integrations/model/HubNetworkMode.h>
 #include <aws/iot-managed-integrations/model/LambdaConfig.h>
+#include <aws/iot-managed-integrations/model/ListAccountAssociationsPaginationTraits.h>
 #include <aws/iot-managed-integrations/model/ListAccountAssociationsRequest.h>
 #include <aws/iot-managed-integrations/model/ListAccountAssociationsResult.h>
+#include <aws/iot-managed-integrations/model/ListCloudConnectorsPaginationTraits.h>
 #include <aws/iot-managed-integrations/model/ListCloudConnectorsRequest.h>
 #include <aws/iot-managed-integrations/model/ListCloudConnectorsResult.h>
+#include <aws/iot-managed-integrations/model/ListConnectorDestinationsPaginationTraits.h>
 #include <aws/iot-managed-integrations/model/ListConnectorDestinationsRequest.h>
 #include <aws/iot-managed-integrations/model/ListConnectorDestinationsResult.h>
+#include <aws/iot-managed-integrations/model/ListCredentialLockersPaginationTraits.h>
 #include <aws/iot-managed-integrations/model/ListCredentialLockersRequest.h>
 #include <aws/iot-managed-integrations/model/ListCredentialLockersResult.h>
+#include <aws/iot-managed-integrations/model/ListDestinationsPaginationTraits.h>
 #include <aws/iot-managed-integrations/model/ListDestinationsRequest.h>
 #include <aws/iot-managed-integrations/model/ListDestinationsResult.h>
+#include <aws/iot-managed-integrations/model/ListDeviceDiscoveriesPaginationTraits.h>
 #include <aws/iot-managed-integrations/model/ListDeviceDiscoveriesRequest.h>
 #include <aws/iot-managed-integrations/model/ListDeviceDiscoveriesResult.h>
+#include <aws/iot-managed-integrations/model/ListDiscoveredDevicesPaginationTraits.h>
 #include <aws/iot-managed-integrations/model/ListDiscoveredDevicesRequest.h>
 #include <aws/iot-managed-integrations/model/ListDiscoveredDevicesResult.h>
+#include <aws/iot-managed-integrations/model/ListEventLogConfigurationsPaginationTraits.h>
 #include <aws/iot-managed-integrations/model/ListEventLogConfigurationsRequest.h>
 #include <aws/iot-managed-integrations/model/ListEventLogConfigurationsResult.h>
+#include <aws/iot-managed-integrations/model/ListManagedThingAccountAssociationsPaginationTraits.h>
 #include <aws/iot-managed-integrations/model/ListManagedThingAccountAssociationsRequest.h>
 #include <aws/iot-managed-integrations/model/ListManagedThingAccountAssociationsResult.h>
+#include <aws/iot-managed-integrations/model/ListManagedThingSchemasPaginationTraits.h>
 #include <aws/iot-managed-integrations/model/ListManagedThingSchemasRequest.h>
 #include <aws/iot-managed-integrations/model/ListManagedThingSchemasResult.h>
+#include <aws/iot-managed-integrations/model/ListManagedThingsPaginationTraits.h>
 #include <aws/iot-managed-integrations/model/ListManagedThingsRequest.h>
 #include <aws/iot-managed-integrations/model/ListManagedThingsResult.h>
+#include <aws/iot-managed-integrations/model/ListNotificationConfigurationsPaginationTraits.h>
 #include <aws/iot-managed-integrations/model/ListNotificationConfigurationsRequest.h>
 #include <aws/iot-managed-integrations/model/ListNotificationConfigurationsResult.h>
+#include <aws/iot-managed-integrations/model/ListOtaTaskConfigurationsPaginationTraits.h>
 #include <aws/iot-managed-integrations/model/ListOtaTaskConfigurationsRequest.h>
 #include <aws/iot-managed-integrations/model/ListOtaTaskConfigurationsResult.h>
+#include <aws/iot-managed-integrations/model/ListOtaTaskExecutionsPaginationTraits.h>
 #include <aws/iot-managed-integrations/model/ListOtaTaskExecutionsRequest.h>
 #include <aws/iot-managed-integrations/model/ListOtaTaskExecutionsResult.h>
+#include <aws/iot-managed-integrations/model/ListOtaTasksPaginationTraits.h>
 #include <aws/iot-managed-integrations/model/ListOtaTasksRequest.h>
 #include <aws/iot-managed-integrations/model/ListOtaTasksResult.h>
+#include <aws/iot-managed-integrations/model/ListProvisioningProfilesPaginationTraits.h>
 #include <aws/iot-managed-integrations/model/ListProvisioningProfilesRequest.h>
 #include <aws/iot-managed-integrations/model/ListProvisioningProfilesResult.h>
+#include <aws/iot-managed-integrations/model/ListSchemaVersionsPaginationTraits.h>
 #include <aws/iot-managed-integrations/model/ListSchemaVersionsRequest.h>
 #include <aws/iot-managed-integrations/model/ListSchemaVersionsResult.h>
 #include <aws/iot-managed-integrations/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/iotdeviceadvisor-gen-tests/IoTDeviceAdvisorIncludeTests.cpp b/generated/tests/iotdeviceadvisor-gen-tests/IoTDeviceAdvisorIncludeTests.cpp
index 58b40c22da39..cf25d8c4c7a4 100644
--- a/generated/tests/iotdeviceadvisor-gen-tests/IoTDeviceAdvisorIncludeTests.cpp
+++ b/generated/tests/iotdeviceadvisor-gen-tests/IoTDeviceAdvisorIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/iotdeviceadvisor/IoTDeviceAdvisorClient.h>
+#include <aws/iotdeviceadvisor/IoTDeviceAdvisorClientPagination.h>
 #include <aws/iotdeviceadvisor/IoTDeviceAdvisorEndpointProvider.h>
 #include <aws/iotdeviceadvisor/IoTDeviceAdvisorErrorMarshaller.h>
 #include <aws/iotdeviceadvisor/IoTDeviceAdvisorErrors.h>
+#include <aws/iotdeviceadvisor/IoTDeviceAdvisorPaginationBase.h>
 #include <aws/iotdeviceadvisor/IoTDeviceAdvisorRequest.h>
 #include <aws/iotdeviceadvisor/IoTDeviceAdvisorServiceClientModel.h>
+#include <aws/iotdeviceadvisor/IoTDeviceAdvisorWaiter.h>
 #include <aws/iotdeviceadvisor/IoTDeviceAdvisor_EXPORTS.h>
+#include <aws/iotdeviceadvisor/internal/IoTDeviceAdvisorEndpointRules.h>
 #include <aws/iotdeviceadvisor/model/AuthenticationMethod.h>
 #include <aws/iotdeviceadvisor/model/CreateSuiteDefinitionRequest.h>
 #include <aws/iotdeviceadvisor/model/CreateSuiteDefinitionResult.h>
@@ -28,8 +32,10 @@
 #include <aws/iotdeviceadvisor/model/GetSuiteRunRequest.h>
 #include <aws/iotdeviceadvisor/model/GetSuiteRunResult.h>
 #include <aws/iotdeviceadvisor/model/GroupResult.h>
+#include <aws/iotdeviceadvisor/model/ListSuiteDefinitionsPaginationTraits.h>
 #include <aws/iotdeviceadvisor/model/ListSuiteDefinitionsRequest.h>
 #include <aws/iotdeviceadvisor/model/ListSuiteDefinitionsResult.h>
+#include <aws/iotdeviceadvisor/model/ListSuiteRunsPaginationTraits.h>
 #include <aws/iotdeviceadvisor/model/ListSuiteRunsRequest.h>
 #include <aws/iotdeviceadvisor/model/ListSuiteRunsResult.h>
 #include <aws/iotdeviceadvisor/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/iotfleetwise-gen-tests/IoTFleetWiseIncludeTests.cpp b/generated/tests/iotfleetwise-gen-tests/IoTFleetWiseIncludeTests.cpp
index 6e102a29c9ff..1faad3b58465 100644
--- a/generated/tests/iotfleetwise-gen-tests/IoTFleetWiseIncludeTests.cpp
+++ b/generated/tests/iotfleetwise-gen-tests/IoTFleetWiseIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/iotfleetwise/IoTFleetWiseClient.h>
+#include <aws/iotfleetwise/IoTFleetWiseClientPagination.h>
 #include <aws/iotfleetwise/IoTFleetWiseEndpointProvider.h>
 #include <aws/iotfleetwise/IoTFleetWiseErrorMarshaller.h>
 #include <aws/iotfleetwise/IoTFleetWiseErrors.h>
+#include <aws/iotfleetwise/IoTFleetWisePaginationBase.h>
 #include <aws/iotfleetwise/IoTFleetWiseRequest.h>
 #include <aws/iotfleetwise/IoTFleetWiseServiceClientModel.h>
+#include <aws/iotfleetwise/IoTFleetWiseWaiter.h>
 #include <aws/iotfleetwise/IoTFleetWise_EXPORTS.h>
+#include <aws/iotfleetwise/internal/IoTFleetWiseEndpointRules.h>
 #include <aws/iotfleetwise/model/Actuator.h>
 #include <aws/iotfleetwise/model/AssociateVehicleFleetRequest.h>
 #include <aws/iotfleetwise/model/AssociateVehicleFleetResult.h>
@@ -103,6 +107,7 @@
 #include <aws/iotfleetwise/model/GetStateTemplateResult.h>
 #include <aws/iotfleetwise/model/GetVehicleRequest.h>
 #include <aws/iotfleetwise/model/GetVehicleResult.h>
+#include <aws/iotfleetwise/model/GetVehicleStatusPaginationTraits.h>
 #include <aws/iotfleetwise/model/GetVehicleStatusRequest.h>
 #include <aws/iotfleetwise/model/GetVehicleStatusResult.h>
 #include <aws/iotfleetwise/model/IamRegistrationResponse.h>
@@ -118,33 +123,46 @@
 #include <aws/iotfleetwise/model/InvalidSignalDecoder.h>
 #include <aws/iotfleetwise/model/InvalidSignalsException.h>
 #include <aws/iotfleetwise/model/LimitExceededException.h>
+#include <aws/iotfleetwise/model/ListCampaignsPaginationTraits.h>
 #include <aws/iotfleetwise/model/ListCampaignsRequest.h>
 #include <aws/iotfleetwise/model/ListCampaignsResult.h>
+#include <aws/iotfleetwise/model/ListDecoderManifestNetworkInterfacesPaginationTraits.h>
 #include <aws/iotfleetwise/model/ListDecoderManifestNetworkInterfacesRequest.h>
 #include <aws/iotfleetwise/model/ListDecoderManifestNetworkInterfacesResult.h>
+#include <aws/iotfleetwise/model/ListDecoderManifestSignalsPaginationTraits.h>
 #include <aws/iotfleetwise/model/ListDecoderManifestSignalsRequest.h>
 #include <aws/iotfleetwise/model/ListDecoderManifestSignalsResult.h>
+#include <aws/iotfleetwise/model/ListDecoderManifestsPaginationTraits.h>
 #include <aws/iotfleetwise/model/ListDecoderManifestsRequest.h>
 #include <aws/iotfleetwise/model/ListDecoderManifestsResult.h>
+#include <aws/iotfleetwise/model/ListFleetsForVehiclePaginationTraits.h>
 #include <aws/iotfleetwise/model/ListFleetsForVehicleRequest.h>
 #include <aws/iotfleetwise/model/ListFleetsForVehicleResult.h>
+#include <aws/iotfleetwise/model/ListFleetsPaginationTraits.h>
 #include <aws/iotfleetwise/model/ListFleetsRequest.h>
 #include <aws/iotfleetwise/model/ListFleetsResult.h>
+#include <aws/iotfleetwise/model/ListModelManifestNodesPaginationTraits.h>
 #include <aws/iotfleetwise/model/ListModelManifestNodesRequest.h>
 #include <aws/iotfleetwise/model/ListModelManifestNodesResult.h>
+#include <aws/iotfleetwise/model/ListModelManifestsPaginationTraits.h>
 #include <aws/iotfleetwise/model/ListModelManifestsRequest.h>
 #include <aws/iotfleetwise/model/ListModelManifestsResult.h>
 #include <aws/iotfleetwise/model/ListResponseScope.h>
+#include <aws/iotfleetwise/model/ListSignalCatalogNodesPaginationTraits.h>
 #include <aws/iotfleetwise/model/ListSignalCatalogNodesRequest.h>
 #include <aws/iotfleetwise/model/ListSignalCatalogNodesResult.h>
+#include <aws/iotfleetwise/model/ListSignalCatalogsPaginationTraits.h>
 #include <aws/iotfleetwise/model/ListSignalCatalogsRequest.h>
 #include <aws/iotfleetwise/model/ListSignalCatalogsResult.h>
+#include <aws/iotfleetwise/model/ListStateTemplatesPaginationTraits.h>
 #include <aws/iotfleetwise/model/ListStateTemplatesRequest.h>
 #include <aws/iotfleetwise/model/ListStateTemplatesResult.h>
 #include <aws/iotfleetwise/model/ListTagsForResourceRequest.h>
 #include <aws/iotfleetwise/model/ListTagsForResourceResult.h>
+#include <aws/iotfleetwise/model/ListVehiclesInFleetPaginationTraits.h>
 #include <aws/iotfleetwise/model/ListVehiclesInFleetRequest.h>
 #include <aws/iotfleetwise/model/ListVehiclesInFleetResult.h>
+#include <aws/iotfleetwise/model/ListVehiclesPaginationTraits.h>
 #include <aws/iotfleetwise/model/ListVehiclesRequest.h>
 #include <aws/iotfleetwise/model/ListVehiclesResult.h>
 #include <aws/iotfleetwise/model/LogType.h>
diff --git a/generated/tests/iotsecuretunneling-gen-tests/IoTSecureTunnelingIncludeTests.cpp b/generated/tests/iotsecuretunneling-gen-tests/IoTSecureTunnelingIncludeTests.cpp
index 3fbb00e633fa..c7e739e66b11 100644
--- a/generated/tests/iotsecuretunneling-gen-tests/IoTSecureTunnelingIncludeTests.cpp
+++ b/generated/tests/iotsecuretunneling-gen-tests/IoTSecureTunnelingIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/iotsecuretunneling/IoTSecureTunnelingClient.h>
+#include <aws/iotsecuretunneling/IoTSecureTunnelingClientPagination.h>
 #include <aws/iotsecuretunneling/IoTSecureTunnelingEndpointProvider.h>
 #include <aws/iotsecuretunneling/IoTSecureTunnelingErrorMarshaller.h>
 #include <aws/iotsecuretunneling/IoTSecureTunnelingErrors.h>
+#include <aws/iotsecuretunneling/IoTSecureTunnelingPaginationBase.h>
 #include <aws/iotsecuretunneling/IoTSecureTunnelingRequest.h>
 #include <aws/iotsecuretunneling/IoTSecureTunnelingServiceClientModel.h>
+#include <aws/iotsecuretunneling/IoTSecureTunnelingWaiter.h>
 #include <aws/iotsecuretunneling/IoTSecureTunneling_EXPORTS.h>
+#include <aws/iotsecuretunneling/internal/IoTSecureTunnelingEndpointRules.h>
 #include <aws/iotsecuretunneling/model/ClientMode.h>
 #include <aws/iotsecuretunneling/model/CloseTunnelRequest.h>
 #include <aws/iotsecuretunneling/model/CloseTunnelResult.h>
@@ -23,6 +27,7 @@
 #include <aws/iotsecuretunneling/model/DestinationConfig.h>
 #include <aws/iotsecuretunneling/model/ListTagsForResourceRequest.h>
 #include <aws/iotsecuretunneling/model/ListTagsForResourceResult.h>
+#include <aws/iotsecuretunneling/model/ListTunnelsPaginationTraits.h>
 #include <aws/iotsecuretunneling/model/ListTunnelsRequest.h>
 #include <aws/iotsecuretunneling/model/ListTunnelsResult.h>
 #include <aws/iotsecuretunneling/model/OpenTunnelRequest.h>
diff --git a/generated/tests/iotsitewise-gen-tests/IoTSiteWiseIncludeTests.cpp b/generated/tests/iotsitewise-gen-tests/IoTSiteWiseIncludeTests.cpp
index 4e241e629ce5..5a5fc09202d1 100644
--- a/generated/tests/iotsitewise-gen-tests/IoTSiteWiseIncludeTests.cpp
+++ b/generated/tests/iotsitewise-gen-tests/IoTSiteWiseIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/iotsitewise/IoTSiteWiseClient.h>
+#include <aws/iotsitewise/IoTSiteWiseClientPagination.h>
 #include <aws/iotsitewise/IoTSiteWiseEndpointProvider.h>
 #include <aws/iotsitewise/IoTSiteWiseErrorMarshaller.h>
 #include <aws/iotsitewise/IoTSiteWiseErrors.h>
+#include <aws/iotsitewise/IoTSiteWisePaginationBase.h>
 #include <aws/iotsitewise/IoTSiteWiseRequest.h>
 #include <aws/iotsitewise/IoTSiteWiseServiceClientModel.h>
+#include <aws/iotsitewise/IoTSiteWiseWaiter.h>
 #include <aws/iotsitewise/IoTSiteWise_EXPORTS.h>
+#include <aws/iotsitewise/internal/IoTSiteWiseEndpointRules.h>
 #include <aws/iotsitewise/model/AccessPolicySummary.h>
 #include <aws/iotsitewise/model/ActionDefinition.h>
 #include <aws/iotsitewise/model/ActionPayload.h>
@@ -82,6 +86,7 @@
 #include <aws/iotsitewise/model/BatchGetAssetPropertyAggregatesErrorCode.h>
 #include <aws/iotsitewise/model/BatchGetAssetPropertyAggregatesErrorEntry.h>
 #include <aws/iotsitewise/model/BatchGetAssetPropertyAggregatesErrorInfo.h>
+#include <aws/iotsitewise/model/BatchGetAssetPropertyAggregatesPaginationTraits.h>
 #include <aws/iotsitewise/model/BatchGetAssetPropertyAggregatesRequest.h>
 #include <aws/iotsitewise/model/BatchGetAssetPropertyAggregatesResult.h>
 #include <aws/iotsitewise/model/BatchGetAssetPropertyAggregatesSkippedEntry.h>
@@ -94,10 +99,12 @@
 #include <aws/iotsitewise/model/BatchGetAssetPropertyValueHistoryErrorCode.h>
 #include <aws/iotsitewise/model/BatchGetAssetPropertyValueHistoryErrorEntry.h>
 #include <aws/iotsitewise/model/BatchGetAssetPropertyValueHistoryErrorInfo.h>
+#include <aws/iotsitewise/model/BatchGetAssetPropertyValueHistoryPaginationTraits.h>
 #include <aws/iotsitewise/model/BatchGetAssetPropertyValueHistoryRequest.h>
 #include <aws/iotsitewise/model/BatchGetAssetPropertyValueHistoryResult.h>
 #include <aws/iotsitewise/model/BatchGetAssetPropertyValueHistorySkippedEntry.h>
 #include <aws/iotsitewise/model/BatchGetAssetPropertyValueHistorySuccessEntry.h>
+#include <aws/iotsitewise/model/BatchGetAssetPropertyValuePaginationTraits.h>
 #include <aws/iotsitewise/model/BatchGetAssetPropertyValueRequest.h>
 #include <aws/iotsitewise/model/BatchGetAssetPropertyValueResult.h>
 #include <aws/iotsitewise/model/BatchGetAssetPropertyValueSkippedEntry.h>
@@ -278,6 +285,7 @@
 #include <aws/iotsitewise/model/DescribeGatewayResult.h>
 #include <aws/iotsitewise/model/DescribeLoggingOptionsRequest.h>
 #include <aws/iotsitewise/model/DescribeLoggingOptionsResult.h>
+#include <aws/iotsitewise/model/DescribePipelineExecutionPaginationTraits.h>
 #include <aws/iotsitewise/model/DescribePipelineExecutionRequest.h>
 #include <aws/iotsitewise/model/DescribePipelineExecutionResult.h>
 #include <aws/iotsitewise/model/DescribePipelineRequest.h>
@@ -318,6 +326,7 @@
 #include <aws/iotsitewise/model/EventDetection.h>
 #include <aws/iotsitewise/model/ExecuteActionRequest.h>
 #include <aws/iotsitewise/model/ExecuteActionResult.h>
+#include <aws/iotsitewise/model/ExecuteQueryPaginationTraits.h>
 #include <aws/iotsitewise/model/ExecuteQueryRequest.h>
 #include <aws/iotsitewise/model/ExecuteQueryResult.h>
 #include <aws/iotsitewise/model/ExecutionEnvironmentVariables.h>
@@ -339,18 +348,23 @@
 #include <aws/iotsitewise/model/GatewayCapabilitySummary.h>
 #include <aws/iotsitewise/model/GatewayPlatform.h>
 #include <aws/iotsitewise/model/GatewaySummary.h>
+#include <aws/iotsitewise/model/GetAssetPropertyAggregatesPaginationTraits.h>
 #include <aws/iotsitewise/model/GetAssetPropertyAggregatesRequest.h>
 #include <aws/iotsitewise/model/GetAssetPropertyAggregatesResult.h>
+#include <aws/iotsitewise/model/GetAssetPropertyValueHistoryPaginationTraits.h>
 #include <aws/iotsitewise/model/GetAssetPropertyValueHistoryRequest.h>
 #include <aws/iotsitewise/model/GetAssetPropertyValueHistoryResult.h>
 #include <aws/iotsitewise/model/GetAssetPropertyValueRequest.h>
 #include <aws/iotsitewise/model/GetAssetPropertyValueResult.h>
 #include <aws/iotsitewise/model/GetCaptureDataRequest.h>
 #include <aws/iotsitewise/model/GetCaptureDataResult.h>
+#include <aws/iotsitewise/model/GetInterpolatedAssetPropertyValuesPaginationTraits.h>
 #include <aws/iotsitewise/model/GetInterpolatedAssetPropertyValuesRequest.h>
 #include <aws/iotsitewise/model/GetInterpolatedAssetPropertyValuesResult.h>
+#include <aws/iotsitewise/model/GetQueryResultsPaginationTraits.h>
 #include <aws/iotsitewise/model/GetQueryResultsRequest.h>
 #include <aws/iotsitewise/model/GetQueryResultsResult.h>
+#include <aws/iotsitewise/model/GetSearchResultsPaginationTraits.h>
 #include <aws/iotsitewise/model/GetSearchResultsRequest.h>
 #include <aws/iotsitewise/model/GetSearchResultsResult.h>
 #include <aws/iotsitewise/model/Greengrass.h>
@@ -378,80 +392,114 @@
 #include <aws/iotsitewise/model/JobSummary.h>
 #include <aws/iotsitewise/model/JobType.h>
 #include <aws/iotsitewise/model/KendraSourceDetail.h>
+#include <aws/iotsitewise/model/ListAccessPoliciesPaginationTraits.h>
 #include <aws/iotsitewise/model/ListAccessPoliciesRequest.h>
 #include <aws/iotsitewise/model/ListAccessPoliciesResult.h>
+#include <aws/iotsitewise/model/ListActionsPaginationTraits.h>
 #include <aws/iotsitewise/model/ListActionsRequest.h>
 #include <aws/iotsitewise/model/ListActionsResult.h>
+#include <aws/iotsitewise/model/ListApplicationsPaginationTraits.h>
 #include <aws/iotsitewise/model/ListApplicationsRequest.h>
 #include <aws/iotsitewise/model/ListApplicationsResult.h>
+#include <aws/iotsitewise/model/ListAssetModelCompositeModelsPaginationTraits.h>
 #include <aws/iotsitewise/model/ListAssetModelCompositeModelsRequest.h>
 #include <aws/iotsitewise/model/ListAssetModelCompositeModelsResult.h>
 #include <aws/iotsitewise/model/ListAssetModelPropertiesFilter.h>
+#include <aws/iotsitewise/model/ListAssetModelPropertiesPaginationTraits.h>
 #include <aws/iotsitewise/model/ListAssetModelPropertiesRequest.h>
 #include <aws/iotsitewise/model/ListAssetModelPropertiesResult.h>
+#include <aws/iotsitewise/model/ListAssetModelsPaginationTraits.h>
 #include <aws/iotsitewise/model/ListAssetModelsRequest.h>
 #include <aws/iotsitewise/model/ListAssetModelsResult.h>
 #include <aws/iotsitewise/model/ListAssetPropertiesFilter.h>
+#include <aws/iotsitewise/model/ListAssetPropertiesPaginationTraits.h>
 #include <aws/iotsitewise/model/ListAssetPropertiesRequest.h>
 #include <aws/iotsitewise/model/ListAssetPropertiesResult.h>
+#include <aws/iotsitewise/model/ListAssetRelationshipsPaginationTraits.h>
 #include <aws/iotsitewise/model/ListAssetRelationshipsRequest.h>
 #include <aws/iotsitewise/model/ListAssetRelationshipsResult.h>
 #include <aws/iotsitewise/model/ListAssetsFilter.h>
+#include <aws/iotsitewise/model/ListAssetsPaginationTraits.h>
 #include <aws/iotsitewise/model/ListAssetsRequest.h>
 #include <aws/iotsitewise/model/ListAssetsResult.h>
+#include <aws/iotsitewise/model/ListAssociatedAssetsPaginationTraits.h>
 #include <aws/iotsitewise/model/ListAssociatedAssetsRequest.h>
 #include <aws/iotsitewise/model/ListAssociatedAssetsResult.h>
 #include <aws/iotsitewise/model/ListBulkImportJobsFilter.h>
+#include <aws/iotsitewise/model/ListBulkImportJobsPaginationTraits.h>
 #include <aws/iotsitewise/model/ListBulkImportJobsRequest.h>
 #include <aws/iotsitewise/model/ListBulkImportJobsResult.h>
+#include <aws/iotsitewise/model/ListCompositionRelationshipsPaginationTraits.h>
 #include <aws/iotsitewise/model/ListCompositionRelationshipsRequest.h>
 #include <aws/iotsitewise/model/ListCompositionRelationshipsResult.h>
+#include <aws/iotsitewise/model/ListComputationModelDataBindingUsagesPaginationTraits.h>
 #include <aws/iotsitewise/model/ListComputationModelDataBindingUsagesRequest.h>
 #include <aws/iotsitewise/model/ListComputationModelDataBindingUsagesResult.h>
+#include <aws/iotsitewise/model/ListComputationModelResolveToResourcesPaginationTraits.h>
 #include <aws/iotsitewise/model/ListComputationModelResolveToResourcesRequest.h>
 #include <aws/iotsitewise/model/ListComputationModelResolveToResourcesResult.h>
+#include <aws/iotsitewise/model/ListComputationModelsPaginationTraits.h>
 #include <aws/iotsitewise/model/ListComputationModelsRequest.h>
 #include <aws/iotsitewise/model/ListComputationModelsResult.h>
+#include <aws/iotsitewise/model/ListDashboardsPaginationTraits.h>
 #include <aws/iotsitewise/model/ListDashboardsRequest.h>
 #include <aws/iotsitewise/model/ListDashboardsResult.h>
+#include <aws/iotsitewise/model/ListDatasetDataSegmentRelationshipsPaginationTraits.h>
 #include <aws/iotsitewise/model/ListDatasetDataSegmentRelationshipsRequest.h>
 #include <aws/iotsitewise/model/ListDatasetDataSegmentRelationshipsResult.h>
+#include <aws/iotsitewise/model/ListDatasetDataSegmentsPaginationTraits.h>
 #include <aws/iotsitewise/model/ListDatasetDataSegmentsRequest.h>
 #include <aws/iotsitewise/model/ListDatasetDataSegmentsResult.h>
+#include <aws/iotsitewise/model/ListDatasetExportJobsPaginationTraits.h>
 #include <aws/iotsitewise/model/ListDatasetExportJobsRequest.h>
 #include <aws/iotsitewise/model/ListDatasetExportJobsResult.h>
+#include <aws/iotsitewise/model/ListDatasetsPaginationTraits.h>
 #include <aws/iotsitewise/model/ListDatasetsRequest.h>
 #include <aws/iotsitewise/model/ListDatasetsResult.h>
+#include <aws/iotsitewise/model/ListEnrichmentJobsPaginationTraits.h>
 #include <aws/iotsitewise/model/ListEnrichmentJobsRequest.h>
 #include <aws/iotsitewise/model/ListEnrichmentJobsResult.h>
+#include <aws/iotsitewise/model/ListExecutionsPaginationTraits.h>
 #include <aws/iotsitewise/model/ListExecutionsRequest.h>
 #include <aws/iotsitewise/model/ListExecutionsResult.h>
+#include <aws/iotsitewise/model/ListGatewaysPaginationTraits.h>
 #include <aws/iotsitewise/model/ListGatewaysRequest.h>
 #include <aws/iotsitewise/model/ListGatewaysResult.h>
+#include <aws/iotsitewise/model/ListInterfaceRelationshipsPaginationTraits.h>
 #include <aws/iotsitewise/model/ListInterfaceRelationshipsRequest.h>
 #include <aws/iotsitewise/model/ListInterfaceRelationshipsResult.h>
+#include <aws/iotsitewise/model/ListPipelineExecutionsPaginationTraits.h>
 #include <aws/iotsitewise/model/ListPipelineExecutionsRequest.h>
 #include <aws/iotsitewise/model/ListPipelineExecutionsResult.h>
+#include <aws/iotsitewise/model/ListPipelinesPaginationTraits.h>
 #include <aws/iotsitewise/model/ListPipelinesRequest.h>
 #include <aws/iotsitewise/model/ListPipelinesResult.h>
+#include <aws/iotsitewise/model/ListPortalsPaginationTraits.h>
 #include <aws/iotsitewise/model/ListPortalsRequest.h>
 #include <aws/iotsitewise/model/ListPortalsResult.h>
+#include <aws/iotsitewise/model/ListProjectAssetsPaginationTraits.h>
 #include <aws/iotsitewise/model/ListProjectAssetsRequest.h>
 #include <aws/iotsitewise/model/ListProjectAssetsResult.h>
+#include <aws/iotsitewise/model/ListProjectsPaginationTraits.h>
 #include <aws/iotsitewise/model/ListProjectsRequest.h>
 #include <aws/iotsitewise/model/ListProjectsResult.h>
+#include <aws/iotsitewise/model/ListQueriesPaginationTraits.h>
 #include <aws/iotsitewise/model/ListQueriesRequest.h>
 #include <aws/iotsitewise/model/ListQueriesResult.h>
 #include <aws/iotsitewise/model/ListSearchesFilters.h>
+#include <aws/iotsitewise/model/ListSearchesPaginationTraits.h>
 #include <aws/iotsitewise/model/ListSearchesRequest.h>
 #include <aws/iotsitewise/model/ListSearchesResult.h>
 #include <aws/iotsitewise/model/ListTagsForResourceRequest.h>
 #include <aws/iotsitewise/model/ListTagsForResourceResult.h>
+#include <aws/iotsitewise/model/ListTasksPaginationTraits.h>
 #include <aws/iotsitewise/model/ListTasksRequest.h>
 #include <aws/iotsitewise/model/ListTasksResult.h>
+#include <aws/iotsitewise/model/ListTimeSeriesPaginationTraits.h>
 #include <aws/iotsitewise/model/ListTimeSeriesRequest.h>
 #include <aws/iotsitewise/model/ListTimeSeriesResult.h>
 #include <aws/iotsitewise/model/ListTimeSeriesType.h>
+#include <aws/iotsitewise/model/ListWorkspacesPaginationTraits.h>
 #include <aws/iotsitewise/model/ListWorkspacesRequest.h>
 #include <aws/iotsitewise/model/ListWorkspacesResult.h>
 #include <aws/iotsitewise/model/Location.h>
diff --git a/generated/tests/iotthingsgraph-gen-tests/IoTThingsGraphIncludeTests.cpp b/generated/tests/iotthingsgraph-gen-tests/IoTThingsGraphIncludeTests.cpp
index 32a13d6353e9..6b435359096f 100644
--- a/generated/tests/iotthingsgraph-gen-tests/IoTThingsGraphIncludeTests.cpp
+++ b/generated/tests/iotthingsgraph-gen-tests/IoTThingsGraphIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/iotthingsgraph/IoTThingsGraphEndpointProvider.h>
 #include <aws/iotthingsgraph/IoTThingsGraphErrorMarshaller.h>
 #include <aws/iotthingsgraph/IoTThingsGraphErrors.h>
+#include <aws/iotthingsgraph/IoTThingsGraphPaginationBase.h>
 #include <aws/iotthingsgraph/IoTThingsGraphRequest.h>
 #include <aws/iotthingsgraph/IoTThingsGraphServiceClientModel.h>
+#include <aws/iotthingsgraph/IoTThingsGraphWaiter.h>
 #include <aws/iotthingsgraph/IoTThingsGraph_EXPORTS.h>
+#include <aws/iotthingsgraph/internal/IoTThingsGraphEndpointRules.h>
 #include <aws/iotthingsgraph/model/DefinitionDocument.h>
 #include <aws/iotthingsgraph/model/DefinitionLanguage.h>
 #include <aws/iotthingsgraph/model/DependencyRevision.h>
diff --git a/generated/tests/iottwinmaker-gen-tests/IoTTwinMakerIncludeTests.cpp b/generated/tests/iottwinmaker-gen-tests/IoTTwinMakerIncludeTests.cpp
index 11b1d4baec3a..428263e81a73 100644
--- a/generated/tests/iottwinmaker-gen-tests/IoTTwinMakerIncludeTests.cpp
+++ b/generated/tests/iottwinmaker-gen-tests/IoTTwinMakerIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/iottwinmaker/IoTTwinMakerClient.h>
+#include <aws/iottwinmaker/IoTTwinMakerClientPagination.h>
 #include <aws/iottwinmaker/IoTTwinMakerEndpointProvider.h>
 #include <aws/iottwinmaker/IoTTwinMakerErrorMarshaller.h>
 #include <aws/iottwinmaker/IoTTwinMakerErrors.h>
+#include <aws/iottwinmaker/IoTTwinMakerPaginationBase.h>
 #include <aws/iottwinmaker/IoTTwinMakerRequest.h>
 #include <aws/iottwinmaker/IoTTwinMakerServiceClientModel.h>
+#include <aws/iottwinmaker/IoTTwinMakerWaiter.h>
 #include <aws/iottwinmaker/IoTTwinMaker_EXPORTS.h>
+#include <aws/iottwinmaker/internal/IoTTwinMakerEndpointRules.h>
 #include <aws/iottwinmaker/model/BatchPutPropertyError.h>
 #include <aws/iottwinmaker/model/BatchPutPropertyErrorEntry.h>
 #include <aws/iottwinmaker/model/BatchPutPropertyValuesRequest.h>
@@ -65,6 +69,7 @@
 #include <aws/iottwinmaker/model/EntitySummary.h>
 #include <aws/iottwinmaker/model/ErrorCode.h>
 #include <aws/iottwinmaker/model/ErrorDetails.h>
+#include <aws/iottwinmaker/model/ExecuteQueryPaginationTraits.h>
 #include <aws/iottwinmaker/model/ExecuteQueryRequest.h>
 #include <aws/iottwinmaker/model/ExecuteQueryResult.h>
 #include <aws/iottwinmaker/model/FilterByAsset.h>
@@ -81,8 +86,10 @@
 #include <aws/iottwinmaker/model/GetMetadataTransferJobResult.h>
 #include <aws/iottwinmaker/model/GetPricingPlanRequest.h>
 #include <aws/iottwinmaker/model/GetPricingPlanResult.h>
+#include <aws/iottwinmaker/model/GetPropertyValueHistoryPaginationTraits.h>
 #include <aws/iottwinmaker/model/GetPropertyValueHistoryRequest.h>
 #include <aws/iottwinmaker/model/GetPropertyValueHistoryResult.h>
+#include <aws/iottwinmaker/model/GetPropertyValuePaginationTraits.h>
 #include <aws/iottwinmaker/model/GetPropertyValueRequest.h>
 #include <aws/iottwinmaker/model/GetPropertyValueResult.h>
 #include <aws/iottwinmaker/model/GetSceneRequest.h>
@@ -101,26 +108,35 @@
 #include <aws/iottwinmaker/model/IotTwinMakerSourceConfigurationFilter.h>
 #include <aws/iottwinmaker/model/LambdaFunction.h>
 #include <aws/iottwinmaker/model/ListComponentTypesFilter.h>
+#include <aws/iottwinmaker/model/ListComponentTypesPaginationTraits.h>
 #include <aws/iottwinmaker/model/ListComponentTypesRequest.h>
 #include <aws/iottwinmaker/model/ListComponentTypesResult.h>
+#include <aws/iottwinmaker/model/ListComponentsPaginationTraits.h>
 #include <aws/iottwinmaker/model/ListComponentsRequest.h>
 #include <aws/iottwinmaker/model/ListComponentsResult.h>
 #include <aws/iottwinmaker/model/ListEntitiesFilter.h>
+#include <aws/iottwinmaker/model/ListEntitiesPaginationTraits.h>
 #include <aws/iottwinmaker/model/ListEntitiesRequest.h>
 #include <aws/iottwinmaker/model/ListEntitiesResult.h>
 #include <aws/iottwinmaker/model/ListMetadataTransferJobsFilter.h>
+#include <aws/iottwinmaker/model/ListMetadataTransferJobsPaginationTraits.h>
 #include <aws/iottwinmaker/model/ListMetadataTransferJobsRequest.h>
 #include <aws/iottwinmaker/model/ListMetadataTransferJobsResult.h>
+#include <aws/iottwinmaker/model/ListPropertiesPaginationTraits.h>
 #include <aws/iottwinmaker/model/ListPropertiesRequest.h>
 #include <aws/iottwinmaker/model/ListPropertiesResult.h>
+#include <aws/iottwinmaker/model/ListScenesPaginationTraits.h>
 #include <aws/iottwinmaker/model/ListScenesRequest.h>
 #include <aws/iottwinmaker/model/ListScenesResult.h>
+#include <aws/iottwinmaker/model/ListSyncJobsPaginationTraits.h>
 #include <aws/iottwinmaker/model/ListSyncJobsRequest.h>
 #include <aws/iottwinmaker/model/ListSyncJobsResult.h>
+#include <aws/iottwinmaker/model/ListSyncResourcesPaginationTraits.h>
 #include <aws/iottwinmaker/model/ListSyncResourcesRequest.h>
 #include <aws/iottwinmaker/model/ListSyncResourcesResult.h>
 #include <aws/iottwinmaker/model/ListTagsForResourceRequest.h>
 #include <aws/iottwinmaker/model/ListTagsForResourceResult.h>
+#include <aws/iottwinmaker/model/ListWorkspacesPaginationTraits.h>
 #include <aws/iottwinmaker/model/ListWorkspacesRequest.h>
 #include <aws/iottwinmaker/model/ListWorkspacesResult.h>
 #include <aws/iottwinmaker/model/MetadataTransferJobProgress.h>
diff --git a/generated/tests/iotwireless-gen-tests/IoTWirelessIncludeTests.cpp b/generated/tests/iotwireless-gen-tests/IoTWirelessIncludeTests.cpp
index dda052b29ff8..d5032d78a15b 100644
--- a/generated/tests/iotwireless-gen-tests/IoTWirelessIncludeTests.cpp
+++ b/generated/tests/iotwireless-gen-tests/IoTWirelessIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/iotwireless/IoTWirelessClient.h>
+#include <aws/iotwireless/IoTWirelessClientPagination.h>
 #include <aws/iotwireless/IoTWirelessEndpointProvider.h>
 #include <aws/iotwireless/IoTWirelessErrorMarshaller.h>
 #include <aws/iotwireless/IoTWirelessErrors.h>
+#include <aws/iotwireless/IoTWirelessPaginationBase.h>
 #include <aws/iotwireless/IoTWirelessRequest.h>
 #include <aws/iotwireless/IoTWirelessServiceClientModel.h>
+#include <aws/iotwireless/IoTWirelessWaiter.h>
 #include <aws/iotwireless/IoTWireless_EXPORTS.h>
+#include <aws/iotwireless/internal/IoTWirelessEndpointRules.h>
 #include <aws/iotwireless/model/AbpV1_0_x.h>
 #include <aws/iotwireless/model/AbpV1_1.h>
 #include <aws/iotwireless/model/Accuracy.h>
@@ -200,36 +204,46 @@
 #include <aws/iotwireless/model/Ip.h>
 #include <aws/iotwireless/model/JoinEventConfiguration.h>
 #include <aws/iotwireless/model/JoinResourceTypeEventConfiguration.h>
+#include <aws/iotwireless/model/ListDestinationsPaginationTraits.h>
 #include <aws/iotwireless/model/ListDestinationsRequest.h>
 #include <aws/iotwireless/model/ListDestinationsResult.h>
+#include <aws/iotwireless/model/ListDeviceProfilesPaginationTraits.h>
 #include <aws/iotwireless/model/ListDeviceProfilesRequest.h>
 #include <aws/iotwireless/model/ListDeviceProfilesResult.h>
 #include <aws/iotwireless/model/ListDevicesForWirelessDeviceImportTaskRequest.h>
 #include <aws/iotwireless/model/ListDevicesForWirelessDeviceImportTaskResult.h>
 #include <aws/iotwireless/model/ListEventConfigurationsRequest.h>
 #include <aws/iotwireless/model/ListEventConfigurationsResult.h>
+#include <aws/iotwireless/model/ListFuotaTasksPaginationTraits.h>
 #include <aws/iotwireless/model/ListFuotaTasksRequest.h>
 #include <aws/iotwireless/model/ListFuotaTasksResult.h>
+#include <aws/iotwireless/model/ListMulticastGroupsByFuotaTaskPaginationTraits.h>
 #include <aws/iotwireless/model/ListMulticastGroupsByFuotaTaskRequest.h>
 #include <aws/iotwireless/model/ListMulticastGroupsByFuotaTaskResult.h>
+#include <aws/iotwireless/model/ListMulticastGroupsPaginationTraits.h>
 #include <aws/iotwireless/model/ListMulticastGroupsRequest.h>
 #include <aws/iotwireless/model/ListMulticastGroupsResult.h>
+#include <aws/iotwireless/model/ListNetworkAnalyzerConfigurationsPaginationTraits.h>
 #include <aws/iotwireless/model/ListNetworkAnalyzerConfigurationsRequest.h>
 #include <aws/iotwireless/model/ListNetworkAnalyzerConfigurationsResult.h>
 #include <aws/iotwireless/model/ListPartnerAccountsRequest.h>
 #include <aws/iotwireless/model/ListPartnerAccountsResult.h>
+#include <aws/iotwireless/model/ListQueuedMessagesPaginationTraits.h>
 #include <aws/iotwireless/model/ListQueuedMessagesRequest.h>
 #include <aws/iotwireless/model/ListQueuedMessagesResult.h>
+#include <aws/iotwireless/model/ListServiceProfilesPaginationTraits.h>
 #include <aws/iotwireless/model/ListServiceProfilesRequest.h>
 #include <aws/iotwireless/model/ListServiceProfilesResult.h>
 #include <aws/iotwireless/model/ListTagsForResourceRequest.h>
 #include <aws/iotwireless/model/ListTagsForResourceResult.h>
 #include <aws/iotwireless/model/ListWirelessDeviceImportTasksRequest.h>
 #include <aws/iotwireless/model/ListWirelessDeviceImportTasksResult.h>
+#include <aws/iotwireless/model/ListWirelessDevicesPaginationTraits.h>
 #include <aws/iotwireless/model/ListWirelessDevicesRequest.h>
 #include <aws/iotwireless/model/ListWirelessDevicesResult.h>
 #include <aws/iotwireless/model/ListWirelessGatewayTaskDefinitionsRequest.h>
 #include <aws/iotwireless/model/ListWirelessGatewayTaskDefinitionsResult.h>
+#include <aws/iotwireless/model/ListWirelessGatewaysPaginationTraits.h>
 #include <aws/iotwireless/model/ListWirelessGatewaysRequest.h>
 #include <aws/iotwireless/model/ListWirelessGatewaysResult.h>
 #include <aws/iotwireless/model/LoRaWANConnectionStatusEventNotificationConfigurations.h>
diff --git a/generated/tests/ivs-gen-tests/IVSIncludeTests.cpp b/generated/tests/ivs-gen-tests/IVSIncludeTests.cpp
index 86fb09298a28..f108d204bded 100644
--- a/generated/tests/ivs-gen-tests/IVSIncludeTests.cpp
+++ b/generated/tests/ivs-gen-tests/IVSIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/ivs/IVSClient.h>
+#include <aws/ivs/IVSClientPagination.h>
 #include <aws/ivs/IVSEndpointProvider.h>
 #include <aws/ivs/IVSErrorMarshaller.h>
 #include <aws/ivs/IVSErrors.h>
+#include <aws/ivs/IVSPaginationBase.h>
 #include <aws/ivs/IVSRequest.h>
 #include <aws/ivs/IVSServiceClientModel.h>
+#include <aws/ivs/IVSWaiter.h>
 #include <aws/ivs/IVS_EXPORTS.h>
+#include <aws/ivs/internal/IVSEndpointRules.h>
 #include <aws/ivs/model/AccessDeniedException.h>
 #include <aws/ivs/model/AdConfiguration.h>
 #include <aws/ivs/model/AdConfigurationSummary.h>
@@ -74,20 +78,28 @@
 #include <aws/ivs/model/InsertAdBreakRequest.h>
 #include <aws/ivs/model/InsertAdBreakResult.h>
 #include <aws/ivs/model/InternalServerException.h>
+#include <aws/ivs/model/ListAdConfigurationsPaginationTraits.h>
 #include <aws/ivs/model/ListAdConfigurationsRequest.h>
 #include <aws/ivs/model/ListAdConfigurationsResult.h>
+#include <aws/ivs/model/ListChannelsPaginationTraits.h>
 #include <aws/ivs/model/ListChannelsRequest.h>
 #include <aws/ivs/model/ListChannelsResult.h>
+#include <aws/ivs/model/ListPlaybackKeyPairsPaginationTraits.h>
 #include <aws/ivs/model/ListPlaybackKeyPairsRequest.h>
 #include <aws/ivs/model/ListPlaybackKeyPairsResult.h>
+#include <aws/ivs/model/ListPlaybackRestrictionPoliciesPaginationTraits.h>
 #include <aws/ivs/model/ListPlaybackRestrictionPoliciesRequest.h>
 #include <aws/ivs/model/ListPlaybackRestrictionPoliciesResult.h>
+#include <aws/ivs/model/ListRecordingConfigurationsPaginationTraits.h>
 #include <aws/ivs/model/ListRecordingConfigurationsRequest.h>
 #include <aws/ivs/model/ListRecordingConfigurationsResult.h>
+#include <aws/ivs/model/ListStreamKeysPaginationTraits.h>
 #include <aws/ivs/model/ListStreamKeysRequest.h>
 #include <aws/ivs/model/ListStreamKeysResult.h>
+#include <aws/ivs/model/ListStreamSessionsPaginationTraits.h>
 #include <aws/ivs/model/ListStreamSessionsRequest.h>
 #include <aws/ivs/model/ListStreamSessionsResult.h>
+#include <aws/ivs/model/ListStreamsPaginationTraits.h>
 #include <aws/ivs/model/ListStreamsRequest.h>
 #include <aws/ivs/model/ListStreamsResult.h>
 #include <aws/ivs/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/ivs-realtime-gen-tests/IvsrealtimeIncludeTests.cpp b/generated/tests/ivs-realtime-gen-tests/IvsrealtimeIncludeTests.cpp
index c74261496709..3e2ce1850964 100644
--- a/generated/tests/ivs-realtime-gen-tests/IvsrealtimeIncludeTests.cpp
+++ b/generated/tests/ivs-realtime-gen-tests/IvsrealtimeIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/ivs-realtime/IvsrealtimeClient.h>
+#include <aws/ivs-realtime/IvsrealtimeClientPagination.h>
 #include <aws/ivs-realtime/IvsrealtimeEndpointProvider.h>
 #include <aws/ivs-realtime/IvsrealtimeErrorMarshaller.h>
 #include <aws/ivs-realtime/IvsrealtimeErrors.h>
+#include <aws/ivs-realtime/IvsrealtimePaginationBase.h>
 #include <aws/ivs-realtime/IvsrealtimeRequest.h>
 #include <aws/ivs-realtime/IvsrealtimeServiceClientModel.h>
+#include <aws/ivs-realtime/IvsrealtimeWaiter.h>
 #include <aws/ivs-realtime/Ivsrealtime_EXPORTS.h>
+#include <aws/ivs-realtime/internal/IvsrealtimeEndpointRules.h>
 #include <aws/ivs-realtime/model/AccessDeniedException.h>
 #include <aws/ivs-realtime/model/AutoParticipantRecordingConfiguration.h>
 #include <aws/ivs-realtime/model/ChannelDestinationConfiguration.h>
@@ -80,24 +84,34 @@
 #include <aws/ivs-realtime/model/IngestProtocol.h>
 #include <aws/ivs-realtime/model/InternalServerException.h>
 #include <aws/ivs-realtime/model/LayoutConfiguration.h>
+#include <aws/ivs-realtime/model/ListCompositionsPaginationTraits.h>
 #include <aws/ivs-realtime/model/ListCompositionsRequest.h>
 #include <aws/ivs-realtime/model/ListCompositionsResult.h>
+#include <aws/ivs-realtime/model/ListEncoderConfigurationsPaginationTraits.h>
 #include <aws/ivs-realtime/model/ListEncoderConfigurationsRequest.h>
 #include <aws/ivs-realtime/model/ListEncoderConfigurationsResult.h>
+#include <aws/ivs-realtime/model/ListIngestConfigurationsPaginationTraits.h>
 #include <aws/ivs-realtime/model/ListIngestConfigurationsRequest.h>
 #include <aws/ivs-realtime/model/ListIngestConfigurationsResult.h>
+#include <aws/ivs-realtime/model/ListParticipantEventsPaginationTraits.h>
 #include <aws/ivs-realtime/model/ListParticipantEventsRequest.h>
 #include <aws/ivs-realtime/model/ListParticipantEventsResult.h>
+#include <aws/ivs-realtime/model/ListParticipantReplicasPaginationTraits.h>
 #include <aws/ivs-realtime/model/ListParticipantReplicasRequest.h>
 #include <aws/ivs-realtime/model/ListParticipantReplicasResult.h>
+#include <aws/ivs-realtime/model/ListParticipantsPaginationTraits.h>
 #include <aws/ivs-realtime/model/ListParticipantsRequest.h>
 #include <aws/ivs-realtime/model/ListParticipantsResult.h>
+#include <aws/ivs-realtime/model/ListPublicKeysPaginationTraits.h>
 #include <aws/ivs-realtime/model/ListPublicKeysRequest.h>
 #include <aws/ivs-realtime/model/ListPublicKeysResult.h>
+#include <aws/ivs-realtime/model/ListStageSessionsPaginationTraits.h>
 #include <aws/ivs-realtime/model/ListStageSessionsRequest.h>
 #include <aws/ivs-realtime/model/ListStageSessionsResult.h>
+#include <aws/ivs-realtime/model/ListStagesPaginationTraits.h>
 #include <aws/ivs-realtime/model/ListStagesRequest.h>
 #include <aws/ivs-realtime/model/ListStagesResult.h>
+#include <aws/ivs-realtime/model/ListStorageConfigurationsPaginationTraits.h>
 #include <aws/ivs-realtime/model/ListStorageConfigurationsRequest.h>
 #include <aws/ivs-realtime/model/ListStorageConfigurationsResult.h>
 #include <aws/ivs-realtime/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/ivschat-gen-tests/IvschatIncludeTests.cpp b/generated/tests/ivschat-gen-tests/IvschatIncludeTests.cpp
index a56036fe6118..0603bef02d98 100644
--- a/generated/tests/ivschat-gen-tests/IvschatIncludeTests.cpp
+++ b/generated/tests/ivschat-gen-tests/IvschatIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/ivschat/IvschatClient.h>
+#include <aws/ivschat/IvschatClientPagination.h>
 #include <aws/ivschat/IvschatEndpointProvider.h>
 #include <aws/ivschat/IvschatErrorMarshaller.h>
 #include <aws/ivschat/IvschatErrors.h>
+#include <aws/ivschat/IvschatPaginationBase.h>
 #include <aws/ivschat/IvschatRequest.h>
 #include <aws/ivschat/IvschatServiceClientModel.h>
+#include <aws/ivschat/IvschatWaiter.h>
 #include <aws/ivschat/Ivschat_EXPORTS.h>
+#include <aws/ivschat/internal/IvschatEndpointRules.h>
 #include <aws/ivschat/model/ChatTokenCapability.h>
 #include <aws/ivschat/model/CloudWatchLogsDestinationConfiguration.h>
 #include <aws/ivschat/model/ConflictException.h>
@@ -36,8 +40,10 @@
 #include <aws/ivschat/model/GetLoggingConfigurationResult.h>
 #include <aws/ivschat/model/GetRoomRequest.h>
 #include <aws/ivschat/model/GetRoomResult.h>
+#include <aws/ivschat/model/ListLoggingConfigurationsPaginationTraits.h>
 #include <aws/ivschat/model/ListLoggingConfigurationsRequest.h>
 #include <aws/ivschat/model/ListLoggingConfigurationsResult.h>
+#include <aws/ivschat/model/ListRoomsPaginationTraits.h>
 #include <aws/ivschat/model/ListRoomsRequest.h>
 #include <aws/ivschat/model/ListRoomsResult.h>
 #include <aws/ivschat/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/kafka-gen-tests/KafkaIncludeTests.cpp b/generated/tests/kafka-gen-tests/KafkaIncludeTests.cpp
index 490287a3b78b..e2937c6e86df 100644
--- a/generated/tests/kafka-gen-tests/KafkaIncludeTests.cpp
+++ b/generated/tests/kafka-gen-tests/KafkaIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/kafka/KafkaClient.h>
+#include <aws/kafka/KafkaClientPagination.h>
 #include <aws/kafka/KafkaEndpointProvider.h>
 #include <aws/kafka/KafkaErrorMarshaller.h>
 #include <aws/kafka/KafkaErrors.h>
+#include <aws/kafka/KafkaPaginationBase.h>
 #include <aws/kafka/KafkaRequest.h>
 #include <aws/kafka/KafkaServiceClientModel.h>
+#include <aws/kafka/KafkaWaiter.h>
 #include <aws/kafka/Kafka_EXPORTS.h>
+#include <aws/kafka/internal/KafkaEndpointRules.h>
 #include <aws/kafka/model/AmazonMskCluster.h>
 #include <aws/kafka/model/ApacheKafkaCluster.h>
 #include <aws/kafka/model/AuthorizerLogs.h>
@@ -108,6 +112,7 @@
 #include <aws/kafka/model/DescribeConfigurationRevisionResult.h>
 #include <aws/kafka/model/DescribeReplicatorRequest.h>
 #include <aws/kafka/model/DescribeReplicatorResult.h>
+#include <aws/kafka/model/DescribeTopicPartitionsPaginationTraits.h>
 #include <aws/kafka/model/DescribeTopicPartitionsRequest.h>
 #include <aws/kafka/model/DescribeTopicPartitionsResult.h>
 #include <aws/kafka/model/DescribeTopicRequest.h>
@@ -154,32 +159,45 @@
 #include <aws/kafka/model/KafkaVersionStatus.h>
 #include <aws/kafka/model/ListChannelsRequest.h>
 #include <aws/kafka/model/ListChannelsResult.h>
+#include <aws/kafka/model/ListClientVpcConnectionsPaginationTraits.h>
 #include <aws/kafka/model/ListClientVpcConnectionsRequest.h>
 #include <aws/kafka/model/ListClientVpcConnectionsResult.h>
+#include <aws/kafka/model/ListClusterOperationsPaginationTraits.h>
 #include <aws/kafka/model/ListClusterOperationsRequest.h>
 #include <aws/kafka/model/ListClusterOperationsResult.h>
+#include <aws/kafka/model/ListClusterOperationsV2PaginationTraits.h>
 #include <aws/kafka/model/ListClusterOperationsV2Request.h>
 #include <aws/kafka/model/ListClusterOperationsV2Result.h>
+#include <aws/kafka/model/ListClustersPaginationTraits.h>
 #include <aws/kafka/model/ListClustersRequest.h>
 #include <aws/kafka/model/ListClustersResult.h>
+#include <aws/kafka/model/ListClustersV2PaginationTraits.h>
 #include <aws/kafka/model/ListClustersV2Request.h>
 #include <aws/kafka/model/ListClustersV2Result.h>
+#include <aws/kafka/model/ListConfigurationRevisionsPaginationTraits.h>
 #include <aws/kafka/model/ListConfigurationRevisionsRequest.h>
 #include <aws/kafka/model/ListConfigurationRevisionsResult.h>
+#include <aws/kafka/model/ListConfigurationsPaginationTraits.h>
 #include <aws/kafka/model/ListConfigurationsRequest.h>
 #include <aws/kafka/model/ListConfigurationsResult.h>
+#include <aws/kafka/model/ListKafkaVersionsPaginationTraits.h>
 #include <aws/kafka/model/ListKafkaVersionsRequest.h>
 #include <aws/kafka/model/ListKafkaVersionsResult.h>
+#include <aws/kafka/model/ListNodesPaginationTraits.h>
 #include <aws/kafka/model/ListNodesRequest.h>
 #include <aws/kafka/model/ListNodesResult.h>
+#include <aws/kafka/model/ListReplicatorsPaginationTraits.h>
 #include <aws/kafka/model/ListReplicatorsRequest.h>
 #include <aws/kafka/model/ListReplicatorsResult.h>
+#include <aws/kafka/model/ListScramSecretsPaginationTraits.h>
 #include <aws/kafka/model/ListScramSecretsRequest.h>
 #include <aws/kafka/model/ListScramSecretsResult.h>
 #include <aws/kafka/model/ListTagsForResourceRequest.h>
 #include <aws/kafka/model/ListTagsForResourceResult.h>
+#include <aws/kafka/model/ListTopicsPaginationTraits.h>
 #include <aws/kafka/model/ListTopicsRequest.h>
 #include <aws/kafka/model/ListTopicsResult.h>
+#include <aws/kafka/model/ListVpcConnectionsPaginationTraits.h>
 #include <aws/kafka/model/ListVpcConnectionsRequest.h>
 #include <aws/kafka/model/ListVpcConnectionsResult.h>
 #include <aws/kafka/model/LogDelivery.h>
diff --git a/generated/tests/kafkaconnect-gen-tests/KafkaConnectIncludeTests.cpp b/generated/tests/kafkaconnect-gen-tests/KafkaConnectIncludeTests.cpp
index b205b6b49981..f4d78fab4756 100644
--- a/generated/tests/kafkaconnect-gen-tests/KafkaConnectIncludeTests.cpp
+++ b/generated/tests/kafkaconnect-gen-tests/KafkaConnectIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/kafkaconnect/KafkaConnectClient.h>
+#include <aws/kafkaconnect/KafkaConnectClientPagination.h>
 #include <aws/kafkaconnect/KafkaConnectEndpointProvider.h>
 #include <aws/kafkaconnect/KafkaConnectErrorMarshaller.h>
 #include <aws/kafkaconnect/KafkaConnectErrors.h>
+#include <aws/kafkaconnect/KafkaConnectPaginationBase.h>
 #include <aws/kafkaconnect/KafkaConnectRequest.h>
 #include <aws/kafkaconnect/KafkaConnectServiceClientModel.h>
+#include <aws/kafkaconnect/KafkaConnectWaiter.h>
 #include <aws/kafkaconnect/KafkaConnect_EXPORTS.h>
+#include <aws/kafkaconnect/internal/KafkaConnectEndpointRules.h>
 #include <aws/kafkaconnect/model/ApacheKafkaCluster.h>
 #include <aws/kafkaconnect/model/ApacheKafkaClusterDescription.h>
 #include <aws/kafkaconnect/model/AutoScaling.h>
@@ -70,14 +74,18 @@
 #include <aws/kafkaconnect/model/KafkaClusterEncryptionInTransit.h>
 #include <aws/kafkaconnect/model/KafkaClusterEncryptionInTransitDescription.h>
 #include <aws/kafkaconnect/model/KafkaClusterEncryptionInTransitType.h>
+#include <aws/kafkaconnect/model/ListConnectorOperationsPaginationTraits.h>
 #include <aws/kafkaconnect/model/ListConnectorOperationsRequest.h>
 #include <aws/kafkaconnect/model/ListConnectorOperationsResult.h>
+#include <aws/kafkaconnect/model/ListConnectorsPaginationTraits.h>
 #include <aws/kafkaconnect/model/ListConnectorsRequest.h>
 #include <aws/kafkaconnect/model/ListConnectorsResult.h>
+#include <aws/kafkaconnect/model/ListCustomPluginsPaginationTraits.h>
 #include <aws/kafkaconnect/model/ListCustomPluginsRequest.h>
 #include <aws/kafkaconnect/model/ListCustomPluginsResult.h>
 #include <aws/kafkaconnect/model/ListTagsForResourceRequest.h>
 #include <aws/kafkaconnect/model/ListTagsForResourceResult.h>
+#include <aws/kafkaconnect/model/ListWorkerConfigurationsPaginationTraits.h>
 #include <aws/kafkaconnect/model/ListWorkerConfigurationsRequest.h>
 #include <aws/kafkaconnect/model/ListWorkerConfigurationsResult.h>
 #include <aws/kafkaconnect/model/LogDelivery.h>
diff --git a/generated/tests/kendra-gen-tests/KendraIncludeTests.cpp b/generated/tests/kendra-gen-tests/KendraIncludeTests.cpp
index 0402c0e114ab..63934ab295d2 100644
--- a/generated/tests/kendra-gen-tests/KendraIncludeTests.cpp
+++ b/generated/tests/kendra-gen-tests/KendraIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/kendra/KendraClient.h>
+#include <aws/kendra/KendraClientPagination.h>
 #include <aws/kendra/KendraEndpointProvider.h>
 #include <aws/kendra/KendraErrorMarshaller.h>
 #include <aws/kendra/KendraErrors.h>
+#include <aws/kendra/KendraPaginationBase.h>
 #include <aws/kendra/KendraRequest.h>
 #include <aws/kendra/KendraServiceClientModel.h>
+#include <aws/kendra/KendraWaiter.h>
 #include <aws/kendra/Kendra_EXPORTS.h>
+#include <aws/kendra/internal/KendraEndpointRules.h>
 #include <aws/kendra/model/AccessControlConfigurationSummary.h>
 #include <aws/kendra/model/AccessControlListConfiguration.h>
 #include <aws/kendra/model/AclConfiguration.h>
@@ -179,6 +183,7 @@
 #include <aws/kendra/model/FsxFileSystemType.h>
 #include <aws/kendra/model/GetQuerySuggestionsRequest.h>
 #include <aws/kendra/model/GetQuerySuggestionsResult.h>
+#include <aws/kendra/model/GetSnapshotsPaginationTraits.h>
 #include <aws/kendra/model/GetSnapshotsRequest.h>
 #include <aws/kendra/model/GetSnapshotsResult.h>
 #include <aws/kendra/model/GitHubConfiguration.h>
@@ -202,30 +207,41 @@
 #include <aws/kendra/model/JsonTokenTypeConfiguration.h>
 #include <aws/kendra/model/JwtTokenTypeConfiguration.h>
 #include <aws/kendra/model/KeyLocation.h>
+#include <aws/kendra/model/ListAccessControlConfigurationsPaginationTraits.h>
 #include <aws/kendra/model/ListAccessControlConfigurationsRequest.h>
 #include <aws/kendra/model/ListAccessControlConfigurationsResult.h>
+#include <aws/kendra/model/ListDataSourceSyncJobsPaginationTraits.h>
 #include <aws/kendra/model/ListDataSourceSyncJobsRequest.h>
 #include <aws/kendra/model/ListDataSourceSyncJobsResult.h>
+#include <aws/kendra/model/ListDataSourcesPaginationTraits.h>
 #include <aws/kendra/model/ListDataSourcesRequest.h>
 #include <aws/kendra/model/ListDataSourcesResult.h>
+#include <aws/kendra/model/ListEntityPersonasPaginationTraits.h>
 #include <aws/kendra/model/ListEntityPersonasRequest.h>
 #include <aws/kendra/model/ListEntityPersonasResult.h>
+#include <aws/kendra/model/ListExperienceEntitiesPaginationTraits.h>
 #include <aws/kendra/model/ListExperienceEntitiesRequest.h>
 #include <aws/kendra/model/ListExperienceEntitiesResult.h>
+#include <aws/kendra/model/ListExperiencesPaginationTraits.h>
 #include <aws/kendra/model/ListExperiencesRequest.h>
 #include <aws/kendra/model/ListExperiencesResult.h>
+#include <aws/kendra/model/ListFaqsPaginationTraits.h>
 #include <aws/kendra/model/ListFaqsRequest.h>
 #include <aws/kendra/model/ListFaqsResult.h>
 #include <aws/kendra/model/ListFeaturedResultsSetsRequest.h>
 #include <aws/kendra/model/ListFeaturedResultsSetsResult.h>
+#include <aws/kendra/model/ListGroupsOlderThanOrderingIdPaginationTraits.h>
 #include <aws/kendra/model/ListGroupsOlderThanOrderingIdRequest.h>
 #include <aws/kendra/model/ListGroupsOlderThanOrderingIdResult.h>
+#include <aws/kendra/model/ListIndicesPaginationTraits.h>
 #include <aws/kendra/model/ListIndicesRequest.h>
 #include <aws/kendra/model/ListIndicesResult.h>
+#include <aws/kendra/model/ListQuerySuggestionsBlockListsPaginationTraits.h>
 #include <aws/kendra/model/ListQuerySuggestionsBlockListsRequest.h>
 #include <aws/kendra/model/ListQuerySuggestionsBlockListsResult.h>
 #include <aws/kendra/model/ListTagsForResourceRequest.h>
 #include <aws/kendra/model/ListTagsForResourceResult.h>
+#include <aws/kendra/model/ListThesauriPaginationTraits.h>
 #include <aws/kendra/model/ListThesauriRequest.h>
 #include <aws/kendra/model/ListThesauriResult.h>
 #include <aws/kendra/model/MemberGroup.h>
diff --git a/generated/tests/kendra-ranking-gen-tests/KendraRankingIncludeTests.cpp b/generated/tests/kendra-ranking-gen-tests/KendraRankingIncludeTests.cpp
index c83ac321891c..7648ed09b556 100644
--- a/generated/tests/kendra-ranking-gen-tests/KendraRankingIncludeTests.cpp
+++ b/generated/tests/kendra-ranking-gen-tests/KendraRankingIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/kendra-ranking/KendraRankingClient.h>
+#include <aws/kendra-ranking/KendraRankingClientPagination.h>
 #include <aws/kendra-ranking/KendraRankingEndpointProvider.h>
 #include <aws/kendra-ranking/KendraRankingErrorMarshaller.h>
 #include <aws/kendra-ranking/KendraRankingErrors.h>
+#include <aws/kendra-ranking/KendraRankingPaginationBase.h>
 #include <aws/kendra-ranking/KendraRankingRequest.h>
 #include <aws/kendra-ranking/KendraRankingServiceClientModel.h>
+#include <aws/kendra-ranking/KendraRankingWaiter.h>
 #include <aws/kendra-ranking/KendraRanking_EXPORTS.h>
+#include <aws/kendra-ranking/internal/KendraRankingEndpointRules.h>
 #include <aws/kendra-ranking/model/CapacityUnitsConfiguration.h>
 #include <aws/kendra-ranking/model/CreateRescoreExecutionPlanRequest.h>
 #include <aws/kendra-ranking/model/CreateRescoreExecutionPlanResult.h>
@@ -20,6 +24,7 @@
 #include <aws/kendra-ranking/model/DescribeRescoreExecutionPlanRequest.h>
 #include <aws/kendra-ranking/model/DescribeRescoreExecutionPlanResult.h>
 #include <aws/kendra-ranking/model/Document.h>
+#include <aws/kendra-ranking/model/ListRescoreExecutionPlansPaginationTraits.h>
 #include <aws/kendra-ranking/model/ListRescoreExecutionPlansRequest.h>
 #include <aws/kendra-ranking/model/ListRescoreExecutionPlansResult.h>
 #include <aws/kendra-ranking/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/keyspaces-gen-tests/KeyspacesIncludeTests.cpp b/generated/tests/keyspaces-gen-tests/KeyspacesIncludeTests.cpp
index 1a92fd46fa99..7e3baa75db02 100644
--- a/generated/tests/keyspaces-gen-tests/KeyspacesIncludeTests.cpp
+++ b/generated/tests/keyspaces-gen-tests/KeyspacesIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/keyspaces/KeyspacesClient.h>
+#include <aws/keyspaces/KeyspacesClientPagination.h>
 #include <aws/keyspaces/KeyspacesEndpointProvider.h>
 #include <aws/keyspaces/KeyspacesErrorMarshaller.h>
 #include <aws/keyspaces/KeyspacesErrors.h>
+#include <aws/keyspaces/KeyspacesPaginationBase.h>
 #include <aws/keyspaces/KeyspacesRequest.h>
 #include <aws/keyspaces/KeyspacesServiceClientModel.h>
+#include <aws/keyspaces/KeyspacesWaiter.h>
 #include <aws/keyspaces/Keyspaces_EXPORTS.h>
+#include <aws/keyspaces/internal/KeyspacesEndpointRules.h>
 #include <aws/keyspaces/model/AutoScalingPolicy.h>
 #include <aws/keyspaces/model/AutoScalingSettings.h>
 #include <aws/keyspaces/model/AutoScalingSpecification.h>
@@ -52,12 +56,16 @@
 #include <aws/keyspaces/model/GetTypeResult.h>
 #include <aws/keyspaces/model/KeyspaceStatus.h>
 #include <aws/keyspaces/model/KeyspaceSummary.h>
+#include <aws/keyspaces/model/ListKeyspacesPaginationTraits.h>
 #include <aws/keyspaces/model/ListKeyspacesRequest.h>
 #include <aws/keyspaces/model/ListKeyspacesResult.h>
+#include <aws/keyspaces/model/ListTablesPaginationTraits.h>
 #include <aws/keyspaces/model/ListTablesRequest.h>
 #include <aws/keyspaces/model/ListTablesResult.h>
+#include <aws/keyspaces/model/ListTagsForResourcePaginationTraits.h>
 #include <aws/keyspaces/model/ListTagsForResourceRequest.h>
 #include <aws/keyspaces/model/ListTagsForResourceResult.h>
+#include <aws/keyspaces/model/ListTypesPaginationTraits.h>
 #include <aws/keyspaces/model/ListTypesRequest.h>
 #include <aws/keyspaces/model/ListTypesResult.h>
 #include <aws/keyspaces/model/PartitionKey.h>
diff --git a/generated/tests/keyspacesstreams-gen-tests/KeyspacesStreamsIncludeTests.cpp b/generated/tests/keyspacesstreams-gen-tests/KeyspacesStreamsIncludeTests.cpp
index 716b8c55ac8d..3e59d8802f37 100644
--- a/generated/tests/keyspacesstreams-gen-tests/KeyspacesStreamsIncludeTests.cpp
+++ b/generated/tests/keyspacesstreams-gen-tests/KeyspacesStreamsIncludeTests.cpp
@@ -7,16 +7,21 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/keyspacesstreams/KeyspacesStreamsClient.h>
+#include <aws/keyspacesstreams/KeyspacesStreamsClientPagination.h>
 #include <aws/keyspacesstreams/KeyspacesStreamsEndpointProvider.h>
 #include <aws/keyspacesstreams/KeyspacesStreamsErrorMarshaller.h>
 #include <aws/keyspacesstreams/KeyspacesStreamsErrors.h>
+#include <aws/keyspacesstreams/KeyspacesStreamsPaginationBase.h>
 #include <aws/keyspacesstreams/KeyspacesStreamsRequest.h>
 #include <aws/keyspacesstreams/KeyspacesStreamsServiceClientModel.h>
+#include <aws/keyspacesstreams/KeyspacesStreamsWaiter.h>
 #include <aws/keyspacesstreams/KeyspacesStreams_EXPORTS.h>
+#include <aws/keyspacesstreams/internal/KeyspacesStreamsEndpointRules.h>
 #include <aws/keyspacesstreams/model/GetRecordsRequest.h>
 #include <aws/keyspacesstreams/model/GetRecordsResult.h>
 #include <aws/keyspacesstreams/model/GetShardIteratorRequest.h>
 #include <aws/keyspacesstreams/model/GetShardIteratorResult.h>
+#include <aws/keyspacesstreams/model/GetStreamPaginationTraits.h>
 #include <aws/keyspacesstreams/model/GetStreamRequest.h>
 #include <aws/keyspacesstreams/model/GetStreamResult.h>
 #include <aws/keyspacesstreams/model/IteratorDescription.h>
@@ -26,6 +31,7 @@
 #include <aws/keyspacesstreams/model/KeyspacesCellValue.h>
 #include <aws/keyspacesstreams/model/KeyspacesMetadata.h>
 #include <aws/keyspacesstreams/model/KeyspacesRow.h>
+#include <aws/keyspacesstreams/model/ListStreamsPaginationTraits.h>
 #include <aws/keyspacesstreams/model/ListStreamsRequest.h>
 #include <aws/keyspacesstreams/model/ListStreamsResult.h>
 #include <aws/keyspacesstreams/model/OriginType.h>
diff --git a/generated/tests/kinesis-gen-tests/KinesisIncludeTests.cpp b/generated/tests/kinesis-gen-tests/KinesisIncludeTests.cpp
index 56011624bc93..c3753761266e 100644
--- a/generated/tests/kinesis-gen-tests/KinesisIncludeTests.cpp
+++ b/generated/tests/kinesis-gen-tests/KinesisIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/kinesis/KinesisClient.h>
+#include <aws/kinesis/KinesisClientPagination.h>
 #include <aws/kinesis/KinesisEndpointProvider.h>
 #include <aws/kinesis/KinesisErrorMarshaller.h>
 #include <aws/kinesis/KinesisErrors.h>
+#include <aws/kinesis/KinesisPaginationBase.h>
 #include <aws/kinesis/KinesisRequest.h>
 #include <aws/kinesis/KinesisServiceClientModel.h>
+#include <aws/kinesis/KinesisWaiter.h>
 #include <aws/kinesis/Kinesis_EXPORTS.h>
+#include <aws/kinesis/internal/KinesisEndpointRules.h>
 #include <aws/kinesis/model/AddTagsToStreamRequest.h>
 #include <aws/kinesis/model/ChildShard.h>
 #include <aws/kinesis/model/Consumer.h>
@@ -49,8 +53,10 @@
 #include <aws/kinesis/model/IncreaseStreamRetentionPeriodRequest.h>
 #include <aws/kinesis/model/ListShardsRequest.h>
 #include <aws/kinesis/model/ListShardsResult.h>
+#include <aws/kinesis/model/ListStreamConsumersPaginationTraits.h>
 #include <aws/kinesis/model/ListStreamConsumersRequest.h>
 #include <aws/kinesis/model/ListStreamConsumersResult.h>
+#include <aws/kinesis/model/ListStreamsPaginationTraits.h>
 #include <aws/kinesis/model/ListStreamsRequest.h>
 #include <aws/kinesis/model/ListStreamsResult.h>
 #include <aws/kinesis/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/kinesis-video-archived-media-gen-tests/KinesisVideoArchivedMediaIncludeTests.cpp b/generated/tests/kinesis-video-archived-media-gen-tests/KinesisVideoArchivedMediaIncludeTests.cpp
index 9bba711e1cb4..38e9745d235d 100644
--- a/generated/tests/kinesis-video-archived-media-gen-tests/KinesisVideoArchivedMediaIncludeTests.cpp
+++ b/generated/tests/kinesis-video-archived-media-gen-tests/KinesisVideoArchivedMediaIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/kinesis-video-archived-media/KinesisVideoArchivedMediaClient.h>
+#include <aws/kinesis-video-archived-media/KinesisVideoArchivedMediaClientPagination.h>
 #include <aws/kinesis-video-archived-media/KinesisVideoArchivedMediaEndpointProvider.h>
 #include <aws/kinesis-video-archived-media/KinesisVideoArchivedMediaErrorMarshaller.h>
 #include <aws/kinesis-video-archived-media/KinesisVideoArchivedMediaErrors.h>
+#include <aws/kinesis-video-archived-media/KinesisVideoArchivedMediaPaginationBase.h>
 #include <aws/kinesis-video-archived-media/KinesisVideoArchivedMediaRequest.h>
 #include <aws/kinesis-video-archived-media/KinesisVideoArchivedMediaServiceClientModel.h>
+#include <aws/kinesis-video-archived-media/KinesisVideoArchivedMediaWaiter.h>
 #include <aws/kinesis-video-archived-media/KinesisVideoArchivedMedia_EXPORTS.h>
+#include <aws/kinesis-video-archived-media/internal/KinesisVideoArchivedMediaEndpointRules.h>
 #include <aws/kinesis-video-archived-media/model/ClipFragmentSelector.h>
 #include <aws/kinesis-video-archived-media/model/ClipFragmentSelectorType.h>
 #include <aws/kinesis-video-archived-media/model/ClipTimestampRange.h>
@@ -34,6 +38,7 @@
 #include <aws/kinesis-video-archived-media/model/GetDASHStreamingSessionURLResult.h>
 #include <aws/kinesis-video-archived-media/model/GetHLSStreamingSessionURLRequest.h>
 #include <aws/kinesis-video-archived-media/model/GetHLSStreamingSessionURLResult.h>
+#include <aws/kinesis-video-archived-media/model/GetImagesPaginationTraits.h>
 #include <aws/kinesis-video-archived-media/model/GetImagesRequest.h>
 #include <aws/kinesis-video-archived-media/model/GetImagesResult.h>
 #include <aws/kinesis-video-archived-media/model/GetMediaForFragmentListRequest.h>
@@ -47,6 +52,7 @@
 #include <aws/kinesis-video-archived-media/model/Image.h>
 #include <aws/kinesis-video-archived-media/model/ImageError.h>
 #include <aws/kinesis-video-archived-media/model/ImageSelectorType.h>
+#include <aws/kinesis-video-archived-media/model/ListFragmentsPaginationTraits.h>
 #include <aws/kinesis-video-archived-media/model/ListFragmentsRequest.h>
 #include <aws/kinesis-video-archived-media/model/ListFragmentsResult.h>
 #include <aws/kinesis-video-archived-media/model/TimestampRange.h>
diff --git a/generated/tests/kinesis-video-media-gen-tests/KinesisVideoMediaIncludeTests.cpp b/generated/tests/kinesis-video-media-gen-tests/KinesisVideoMediaIncludeTests.cpp
index 69bb6bd309b2..f2d519b7189c 100644
--- a/generated/tests/kinesis-video-media-gen-tests/KinesisVideoMediaIncludeTests.cpp
+++ b/generated/tests/kinesis-video-media-gen-tests/KinesisVideoMediaIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/kinesis-video-media/KinesisVideoMediaEndpointProvider.h>
 #include <aws/kinesis-video-media/KinesisVideoMediaErrorMarshaller.h>
 #include <aws/kinesis-video-media/KinesisVideoMediaErrors.h>
+#include <aws/kinesis-video-media/KinesisVideoMediaPaginationBase.h>
 #include <aws/kinesis-video-media/KinesisVideoMediaRequest.h>
 #include <aws/kinesis-video-media/KinesisVideoMediaServiceClientModel.h>
+#include <aws/kinesis-video-media/KinesisVideoMediaWaiter.h>
 #include <aws/kinesis-video-media/KinesisVideoMedia_EXPORTS.h>
+#include <aws/kinesis-video-media/internal/KinesisVideoMediaEndpointRules.h>
 #include <aws/kinesis-video-media/model/GetMediaRequest.h>
 #include <aws/kinesis-video-media/model/GetMediaResult.h>
 #include <aws/kinesis-video-media/model/StartSelector.h>
diff --git a/generated/tests/kinesis-video-signaling-gen-tests/KinesisVideoSignalingChannelsIncludeTests.cpp b/generated/tests/kinesis-video-signaling-gen-tests/KinesisVideoSignalingChannelsIncludeTests.cpp
index 3025063647e4..0dfa6183bcc9 100644
--- a/generated/tests/kinesis-video-signaling-gen-tests/KinesisVideoSignalingChannelsIncludeTests.cpp
+++ b/generated/tests/kinesis-video-signaling-gen-tests/KinesisVideoSignalingChannelsIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/kinesis-video-signaling/KinesisVideoSignalingChannelsEndpointProvider.h>
 #include <aws/kinesis-video-signaling/KinesisVideoSignalingChannelsErrorMarshaller.h>
 #include <aws/kinesis-video-signaling/KinesisVideoSignalingChannelsErrors.h>
+#include <aws/kinesis-video-signaling/KinesisVideoSignalingChannelsPaginationBase.h>
 #include <aws/kinesis-video-signaling/KinesisVideoSignalingChannelsRequest.h>
 #include <aws/kinesis-video-signaling/KinesisVideoSignalingChannelsServiceClientModel.h>
+#include <aws/kinesis-video-signaling/KinesisVideoSignalingChannelsWaiter.h>
 #include <aws/kinesis-video-signaling/KinesisVideoSignalingChannels_EXPORTS.h>
+#include <aws/kinesis-video-signaling/internal/KinesisVideoSignalingChannelsEndpointRules.h>
 #include <aws/kinesis-video-signaling/model/GetIceServerConfigRequest.h>
 #include <aws/kinesis-video-signaling/model/GetIceServerConfigResult.h>
 #include <aws/kinesis-video-signaling/model/IceServer.h>
diff --git a/generated/tests/kinesis-video-webrtc-storage-gen-tests/KinesisVideoWebRTCStorageIncludeTests.cpp b/generated/tests/kinesis-video-webrtc-storage-gen-tests/KinesisVideoWebRTCStorageIncludeTests.cpp
index d70ab99b03d6..afc80349d465 100644
--- a/generated/tests/kinesis-video-webrtc-storage-gen-tests/KinesisVideoWebRTCStorageIncludeTests.cpp
+++ b/generated/tests/kinesis-video-webrtc-storage-gen-tests/KinesisVideoWebRTCStorageIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/kinesis-video-webrtc-storage/KinesisVideoWebRTCStorageEndpointProvider.h>
 #include <aws/kinesis-video-webrtc-storage/KinesisVideoWebRTCStorageErrorMarshaller.h>
 #include <aws/kinesis-video-webrtc-storage/KinesisVideoWebRTCStorageErrors.h>
+#include <aws/kinesis-video-webrtc-storage/KinesisVideoWebRTCStoragePaginationBase.h>
 #include <aws/kinesis-video-webrtc-storage/KinesisVideoWebRTCStorageRequest.h>
 #include <aws/kinesis-video-webrtc-storage/KinesisVideoWebRTCStorageServiceClientModel.h>
+#include <aws/kinesis-video-webrtc-storage/KinesisVideoWebRTCStorageWaiter.h>
 #include <aws/kinesis-video-webrtc-storage/KinesisVideoWebRTCStorage_EXPORTS.h>
+#include <aws/kinesis-video-webrtc-storage/internal/KinesisVideoWebRTCStorageEndpointRules.h>
 #include <aws/kinesis-video-webrtc-storage/model/JoinStorageSessionAsViewerRequest.h>
 #include <aws/kinesis-video-webrtc-storage/model/JoinStorageSessionRequest.h>
 
diff --git a/generated/tests/kinesisanalytics-gen-tests/KinesisAnalyticsIncludeTests.cpp b/generated/tests/kinesisanalytics-gen-tests/KinesisAnalyticsIncludeTests.cpp
index ea9fab773394..643929e3cd50 100644
--- a/generated/tests/kinesisanalytics-gen-tests/KinesisAnalyticsIncludeTests.cpp
+++ b/generated/tests/kinesisanalytics-gen-tests/KinesisAnalyticsIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/kinesisanalytics/KinesisAnalyticsEndpointProvider.h>
 #include <aws/kinesisanalytics/KinesisAnalyticsErrorMarshaller.h>
 #include <aws/kinesisanalytics/KinesisAnalyticsErrors.h>
+#include <aws/kinesisanalytics/KinesisAnalyticsPaginationBase.h>
 #include <aws/kinesisanalytics/KinesisAnalyticsRequest.h>
 #include <aws/kinesisanalytics/KinesisAnalyticsServiceClientModel.h>
+#include <aws/kinesisanalytics/KinesisAnalyticsWaiter.h>
 #include <aws/kinesisanalytics/KinesisAnalytics_EXPORTS.h>
+#include <aws/kinesisanalytics/internal/KinesisAnalyticsEndpointRules.h>
 #include <aws/kinesisanalytics/model/AddApplicationCloudWatchLoggingOptionRequest.h>
 #include <aws/kinesisanalytics/model/AddApplicationCloudWatchLoggingOptionResult.h>
 #include <aws/kinesisanalytics/model/AddApplicationInputProcessingConfigurationRequest.h>
diff --git a/generated/tests/kinesisanalyticsv2-gen-tests/KinesisAnalyticsV2IncludeTests.cpp b/generated/tests/kinesisanalyticsv2-gen-tests/KinesisAnalyticsV2IncludeTests.cpp
index 42ef55bf5f80..d4ad5b97ebd7 100644
--- a/generated/tests/kinesisanalyticsv2-gen-tests/KinesisAnalyticsV2IncludeTests.cpp
+++ b/generated/tests/kinesisanalyticsv2-gen-tests/KinesisAnalyticsV2IncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/kinesisanalyticsv2/KinesisAnalyticsV2Client.h>
+#include <aws/kinesisanalyticsv2/KinesisAnalyticsV2ClientPagination.h>
 #include <aws/kinesisanalyticsv2/KinesisAnalyticsV2EndpointProvider.h>
 #include <aws/kinesisanalyticsv2/KinesisAnalyticsV2ErrorMarshaller.h>
 #include <aws/kinesisanalyticsv2/KinesisAnalyticsV2Errors.h>
+#include <aws/kinesisanalyticsv2/KinesisAnalyticsV2PaginationBase.h>
 #include <aws/kinesisanalyticsv2/KinesisAnalyticsV2Request.h>
 #include <aws/kinesisanalyticsv2/KinesisAnalyticsV2ServiceClientModel.h>
+#include <aws/kinesisanalyticsv2/KinesisAnalyticsV2Waiter.h>
 #include <aws/kinesisanalyticsv2/KinesisAnalyticsV2_EXPORTS.h>
+#include <aws/kinesisanalyticsv2/internal/KinesisAnalyticsV2EndpointRules.h>
 #include <aws/kinesisanalyticsv2/model/AddApplicationCloudWatchLoggingOptionRequest.h>
 #include <aws/kinesisanalyticsv2/model/AddApplicationCloudWatchLoggingOptionResult.h>
 #include <aws/kinesisanalyticsv2/model/AddApplicationInputProcessingConfigurationRequest.h>
@@ -146,12 +150,16 @@
 #include <aws/kinesisanalyticsv2/model/LambdaOutput.h>
 #include <aws/kinesisanalyticsv2/model/LambdaOutputDescription.h>
 #include <aws/kinesisanalyticsv2/model/LambdaOutputUpdate.h>
+#include <aws/kinesisanalyticsv2/model/ListApplicationOperationsPaginationTraits.h>
 #include <aws/kinesisanalyticsv2/model/ListApplicationOperationsRequest.h>
 #include <aws/kinesisanalyticsv2/model/ListApplicationOperationsResult.h>
+#include <aws/kinesisanalyticsv2/model/ListApplicationSnapshotsPaginationTraits.h>
 #include <aws/kinesisanalyticsv2/model/ListApplicationSnapshotsRequest.h>
 #include <aws/kinesisanalyticsv2/model/ListApplicationSnapshotsResult.h>
+#include <aws/kinesisanalyticsv2/model/ListApplicationVersionsPaginationTraits.h>
 #include <aws/kinesisanalyticsv2/model/ListApplicationVersionsRequest.h>
 #include <aws/kinesisanalyticsv2/model/ListApplicationVersionsResult.h>
+#include <aws/kinesisanalyticsv2/model/ListApplicationsPaginationTraits.h>
 #include <aws/kinesisanalyticsv2/model/ListApplicationsRequest.h>
 #include <aws/kinesisanalyticsv2/model/ListApplicationsResult.h>
 #include <aws/kinesisanalyticsv2/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/kinesisvideo-gen-tests/KinesisVideoIncludeTests.cpp b/generated/tests/kinesisvideo-gen-tests/KinesisVideoIncludeTests.cpp
index 5ba79307e30b..1161fa716803 100644
--- a/generated/tests/kinesisvideo-gen-tests/KinesisVideoIncludeTests.cpp
+++ b/generated/tests/kinesisvideo-gen-tests/KinesisVideoIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/kinesisvideo/KinesisVideoClient.h>
+#include <aws/kinesisvideo/KinesisVideoClientPagination.h>
 #include <aws/kinesisvideo/KinesisVideoEndpointProvider.h>
 #include <aws/kinesisvideo/KinesisVideoErrorMarshaller.h>
 #include <aws/kinesisvideo/KinesisVideoErrors.h>
+#include <aws/kinesisvideo/KinesisVideoPaginationBase.h>
 #include <aws/kinesisvideo/KinesisVideoRequest.h>
 #include <aws/kinesisvideo/KinesisVideoServiceClientModel.h>
+#include <aws/kinesisvideo/KinesisVideoWaiter.h>
 #include <aws/kinesisvideo/KinesisVideo_EXPORTS.h>
+#include <aws/kinesisvideo/internal/KinesisVideoEndpointRules.h>
 #include <aws/kinesisvideo/model/APIName.h>
 #include <aws/kinesisvideo/model/ChannelInfo.h>
 #include <aws/kinesisvideo/model/ChannelNameCondition.h>
@@ -37,6 +41,7 @@
 #include <aws/kinesisvideo/model/DescribeEdgeConfigurationResult.h>
 #include <aws/kinesisvideo/model/DescribeImageGenerationConfigurationRequest.h>
 #include <aws/kinesisvideo/model/DescribeImageGenerationConfigurationResult.h>
+#include <aws/kinesisvideo/model/DescribeMappedResourceConfigurationPaginationTraits.h>
 #include <aws/kinesisvideo/model/DescribeMappedResourceConfigurationRequest.h>
 #include <aws/kinesisvideo/model/DescribeMappedResourceConfigurationResult.h>
 #include <aws/kinesisvideo/model/DescribeMediaStorageConfigurationRequest.h>
@@ -63,10 +68,13 @@
 #include <aws/kinesisvideo/model/LastRecorderStatus.h>
 #include <aws/kinesisvideo/model/LastUploaderStatus.h>
 #include <aws/kinesisvideo/model/ListEdgeAgentConfigurationsEdgeConfig.h>
+#include <aws/kinesisvideo/model/ListEdgeAgentConfigurationsPaginationTraits.h>
 #include <aws/kinesisvideo/model/ListEdgeAgentConfigurationsRequest.h>
 #include <aws/kinesisvideo/model/ListEdgeAgentConfigurationsResult.h>
+#include <aws/kinesisvideo/model/ListSignalingChannelsPaginationTraits.h>
 #include <aws/kinesisvideo/model/ListSignalingChannelsRequest.h>
 #include <aws/kinesisvideo/model/ListSignalingChannelsResult.h>
+#include <aws/kinesisvideo/model/ListStreamsPaginationTraits.h>
 #include <aws/kinesisvideo/model/ListStreamsRequest.h>
 #include <aws/kinesisvideo/model/ListStreamsResult.h>
 #include <aws/kinesisvideo/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/kms-gen-tests/KMSIncludeTests.cpp b/generated/tests/kms-gen-tests/KMSIncludeTests.cpp
index 7526b6953744..858a566a0936 100644
--- a/generated/tests/kms-gen-tests/KMSIncludeTests.cpp
+++ b/generated/tests/kms-gen-tests/KMSIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/kms/KMSClient.h>
+#include <aws/kms/KMSClientPagination.h>
 #include <aws/kms/KMSEndpointProvider.h>
 #include <aws/kms/KMSErrorMarshaller.h>
 #include <aws/kms/KMSErrors.h>
+#include <aws/kms/KMSPaginationBase.h>
 #include <aws/kms/KMSRequest.h>
 #include <aws/kms/KMSServiceClientModel.h>
+#include <aws/kms/KMSWaiter.h>
 #include <aws/kms/KMS_EXPORTS.h>
+#include <aws/kms/internal/KMSEndpointRules.h>
 #include <aws/kms/model/AlgorithmSpec.h>
 #include <aws/kms/model/AliasListEntry.h>
 #include <aws/kms/model/CancelKeyDeletionRequest.h>
@@ -41,6 +45,7 @@
 #include <aws/kms/model/DeleteImportedKeyMaterialResult.h>
 #include <aws/kms/model/DeriveSharedSecretRequest.h>
 #include <aws/kms/model/DeriveSharedSecretResult.h>
+#include <aws/kms/model/DescribeCustomKeyStoresPaginationTraits.h>
 #include <aws/kms/model/DescribeCustomKeyStoresRequest.h>
 #include <aws/kms/model/DescribeCustomKeyStoresResult.h>
 #include <aws/kms/model/DescribeKeyRequest.h>
@@ -97,18 +102,25 @@
 #include <aws/kms/model/KeySpec.h>
 #include <aws/kms/model/KeyState.h>
 #include <aws/kms/model/KeyUsageType.h>
+#include <aws/kms/model/ListAliasesPaginationTraits.h>
 #include <aws/kms/model/ListAliasesRequest.h>
 #include <aws/kms/model/ListAliasesResult.h>
+#include <aws/kms/model/ListGrantsPaginationTraits.h>
 #include <aws/kms/model/ListGrantsRequest.h>
 #include <aws/kms/model/ListGrantsResult.h>
+#include <aws/kms/model/ListKeyPoliciesPaginationTraits.h>
 #include <aws/kms/model/ListKeyPoliciesRequest.h>
 #include <aws/kms/model/ListKeyPoliciesResult.h>
+#include <aws/kms/model/ListKeyRotationsPaginationTraits.h>
 #include <aws/kms/model/ListKeyRotationsRequest.h>
 #include <aws/kms/model/ListKeyRotationsResult.h>
+#include <aws/kms/model/ListKeysPaginationTraits.h>
 #include <aws/kms/model/ListKeysRequest.h>
 #include <aws/kms/model/ListKeysResult.h>
+#include <aws/kms/model/ListResourceTagsPaginationTraits.h>
 #include <aws/kms/model/ListResourceTagsRequest.h>
 #include <aws/kms/model/ListResourceTagsResult.h>
+#include <aws/kms/model/ListRetirableGrantsPaginationTraits.h>
 #include <aws/kms/model/ListRetirableGrantsRequest.h>
 #include <aws/kms/model/ListRetirableGrantsResult.h>
 #include <aws/kms/model/MacAlgorithmSpec.h>
diff --git a/generated/tests/lakeformation-gen-tests/LakeFormationIncludeTests.cpp b/generated/tests/lakeformation-gen-tests/LakeFormationIncludeTests.cpp
index 4d50f40bf4af..65991aef62df 100644
--- a/generated/tests/lakeformation-gen-tests/LakeFormationIncludeTests.cpp
+++ b/generated/tests/lakeformation-gen-tests/LakeFormationIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/lakeformation/LakeFormationClient.h>
+#include <aws/lakeformation/LakeFormationClientPagination.h>
 #include <aws/lakeformation/LakeFormationEndpointProvider.h>
 #include <aws/lakeformation/LakeFormationErrorMarshaller.h>
 #include <aws/lakeformation/LakeFormationErrors.h>
+#include <aws/lakeformation/LakeFormationPaginationBase.h>
 #include <aws/lakeformation/LakeFormationRequest.h>
 #include <aws/lakeformation/LakeFormationServiceClientModel.h>
+#include <aws/lakeformation/LakeFormationWaiter.h>
 #include <aws/lakeformation/LakeFormation_EXPORTS.h>
+#include <aws/lakeformation/internal/LakeFormationEndpointRules.h>
 #include <aws/lakeformation/model/AddLFTagsToResourceRequest.h>
 #include <aws/lakeformation/model/AddLFTagsToResourceResult.h>
 #include <aws/lakeformation/model/AddObjectInput.h>
@@ -90,6 +94,7 @@
 #include <aws/lakeformation/model/GetDataLakePrincipalResult.h>
 #include <aws/lakeformation/model/GetDataLakeSettingsRequest.h>
 #include <aws/lakeformation/model/GetDataLakeSettingsResult.h>
+#include <aws/lakeformation/model/GetEffectivePermissionsForPathPaginationTraits.h>
 #include <aws/lakeformation/model/GetEffectivePermissionsForPathRequest.h>
 #include <aws/lakeformation/model/GetEffectivePermissionsForPathResult.h>
 #include <aws/lakeformation/model/GetLFTagExpressionRequest.h>
@@ -102,6 +107,7 @@
 #include <aws/lakeformation/model/GetQueryStatisticsResult.h>
 #include <aws/lakeformation/model/GetResourceLFTagsRequest.h>
 #include <aws/lakeformation/model/GetResourceLFTagsResult.h>
+#include <aws/lakeformation/model/GetTableObjectsPaginationTraits.h>
 #include <aws/lakeformation/model/GetTableObjectsRequest.h>
 #include <aws/lakeformation/model/GetTableObjectsResult.h>
 #include <aws/lakeformation/model/GetTemporaryDataLocationCredentialsRequest.h>
@@ -112,6 +118,7 @@
 #include <aws/lakeformation/model/GetTemporaryGlueTableCredentialsResult.h>
 #include <aws/lakeformation/model/GetWorkUnitResultsRequest.h>
 #include <aws/lakeformation/model/GetWorkUnitResultsResult.h>
+#include <aws/lakeformation/model/GetWorkUnitsPaginationTraits.h>
 #include <aws/lakeformation/model/GetWorkUnitsRequest.h>
 #include <aws/lakeformation/model/GetWorkUnitsResult.h>
 #include <aws/lakeformation/model/GrantPermissionsRequest.h>
@@ -124,20 +131,28 @@
 #include <aws/lakeformation/model/LFTagPair.h>
 #include <aws/lakeformation/model/LFTagPolicyResource.h>
 #include <aws/lakeformation/model/LakeFormationOptInsInfo.h>
+#include <aws/lakeformation/model/ListDataCellsFilterPaginationTraits.h>
 #include <aws/lakeformation/model/ListDataCellsFilterRequest.h>
 #include <aws/lakeformation/model/ListDataCellsFilterResult.h>
+#include <aws/lakeformation/model/ListLFTagExpressionsPaginationTraits.h>
 #include <aws/lakeformation/model/ListLFTagExpressionsRequest.h>
 #include <aws/lakeformation/model/ListLFTagExpressionsResult.h>
+#include <aws/lakeformation/model/ListLFTagsPaginationTraits.h>
 #include <aws/lakeformation/model/ListLFTagsRequest.h>
 #include <aws/lakeformation/model/ListLFTagsResult.h>
+#include <aws/lakeformation/model/ListLakeFormationOptInsPaginationTraits.h>
 #include <aws/lakeformation/model/ListLakeFormationOptInsRequest.h>
 #include <aws/lakeformation/model/ListLakeFormationOptInsResult.h>
+#include <aws/lakeformation/model/ListPermissionsPaginationTraits.h>
 #include <aws/lakeformation/model/ListPermissionsRequest.h>
 #include <aws/lakeformation/model/ListPermissionsResult.h>
+#include <aws/lakeformation/model/ListResourcesPaginationTraits.h>
 #include <aws/lakeformation/model/ListResourcesRequest.h>
 #include <aws/lakeformation/model/ListResourcesResult.h>
+#include <aws/lakeformation/model/ListTableStorageOptimizersPaginationTraits.h>
 #include <aws/lakeformation/model/ListTableStorageOptimizersRequest.h>
 #include <aws/lakeformation/model/ListTableStorageOptimizersResult.h>
+#include <aws/lakeformation/model/ListTransactionsPaginationTraits.h>
 #include <aws/lakeformation/model/ListTransactionsRequest.h>
 #include <aws/lakeformation/model/ListTransactionsResult.h>
 #include <aws/lakeformation/model/OptimizerType.h>
@@ -166,8 +181,10 @@
 #include <aws/lakeformation/model/RevokePermissionsRequest.h>
 #include <aws/lakeformation/model/RevokePermissionsResult.h>
 #include <aws/lakeformation/model/RowFilter.h>
+#include <aws/lakeformation/model/SearchDatabasesByLFTagsPaginationTraits.h>
 #include <aws/lakeformation/model/SearchDatabasesByLFTagsRequest.h>
 #include <aws/lakeformation/model/SearchDatabasesByLFTagsResult.h>
+#include <aws/lakeformation/model/SearchTablesByLFTagsPaginationTraits.h>
 #include <aws/lakeformation/model/SearchTablesByLFTagsRequest.h>
 #include <aws/lakeformation/model/SearchTablesByLFTagsResult.h>
 #include <aws/lakeformation/model/ServiceAuthorization.h>
diff --git a/generated/tests/lambda-core-gen-tests/LambdaCoreIncludeTests.cpp b/generated/tests/lambda-core-gen-tests/LambdaCoreIncludeTests.cpp
index 024bdde052df..b3121c1e27ee 100644
--- a/generated/tests/lambda-core-gen-tests/LambdaCoreIncludeTests.cpp
+++ b/generated/tests/lambda-core-gen-tests/LambdaCoreIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/lambda-core/LambdaCoreClient.h>
+#include <aws/lambda-core/LambdaCoreClientPagination.h>
 #include <aws/lambda-core/LambdaCoreEndpointProvider.h>
 #include <aws/lambda-core/LambdaCoreErrorMarshaller.h>
 #include <aws/lambda-core/LambdaCoreErrors.h>
+#include <aws/lambda-core/LambdaCorePaginationBase.h>
 #include <aws/lambda-core/LambdaCoreRequest.h>
 #include <aws/lambda-core/LambdaCoreServiceClientModel.h>
+#include <aws/lambda-core/LambdaCoreWaiter.h>
 #include <aws/lambda-core/LambdaCore_EXPORTS.h>
+#include <aws/lambda-core/internal/LambdaCoreEndpointRules.h>
 #include <aws/lambda-core/model/ComputeResourceType.h>
 #include <aws/lambda-core/model/CreateNetworkConnectorRequest.h>
 #include <aws/lambda-core/model/CreateNetworkConnectorResult.h>
@@ -21,6 +25,7 @@
 #include <aws/lambda-core/model/GetNetworkConnectorRequest.h>
 #include <aws/lambda-core/model/GetNetworkConnectorResult.h>
 #include <aws/lambda-core/model/InvalidParameterValueException.h>
+#include <aws/lambda-core/model/ListNetworkConnectorsPaginationTraits.h>
 #include <aws/lambda-core/model/ListNetworkConnectorsRequest.h>
 #include <aws/lambda-core/model/ListNetworkConnectorsResult.h>
 #include <aws/lambda-core/model/NetworkConnectorConfiguration.h>
diff --git a/generated/tests/lambda-gen-tests/LambdaIncludeTests.cpp b/generated/tests/lambda-gen-tests/LambdaIncludeTests.cpp
index 2a9ea336f362..a36346ca7fa4 100644
--- a/generated/tests/lambda-gen-tests/LambdaIncludeTests.cpp
+++ b/generated/tests/lambda-gen-tests/LambdaIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/lambda/LambdaClient.h>
+#include <aws/lambda/LambdaClientPagination.h>
 #include <aws/lambda/LambdaEndpointProvider.h>
 #include <aws/lambda/LambdaErrorMarshaller.h>
 #include <aws/lambda/LambdaErrors.h>
+#include <aws/lambda/LambdaPaginationBase.h>
 #include <aws/lambda/LambdaRequest.h>
 #include <aws/lambda/LambdaServiceClientModel.h>
+#include <aws/lambda/LambdaWaiter.h>
 #include <aws/lambda/Lambda_EXPORTS.h>
+#include <aws/lambda/internal/LambdaEndpointRules.h>
 #include <aws/lambda/model/AccountLimit.h>
 #include <aws/lambda/model/AccountUsage.h>
 #include <aws/lambda/model/AddLayerVersionPermissionRequest.h>
@@ -162,10 +166,12 @@
 #include <aws/lambda/model/GetCapacityProviderResult.h>
 #include <aws/lambda/model/GetCodeSigningConfigRequest.h>
 #include <aws/lambda/model/GetCodeSigningConfigResult.h>
+#include <aws/lambda/model/GetDurableExecutionHistoryPaginationTraits.h>
 #include <aws/lambda/model/GetDurableExecutionHistoryRequest.h>
 #include <aws/lambda/model/GetDurableExecutionHistoryResult.h>
 #include <aws/lambda/model/GetDurableExecutionRequest.h>
 #include <aws/lambda/model/GetDurableExecutionResult.h>
+#include <aws/lambda/model/GetDurableExecutionStatePaginationTraits.h>
 #include <aws/lambda/model/GetDurableExecutionStateRequest.h>
 #include <aws/lambda/model/GetDurableExecutionStateResult.h>
 #include <aws/lambda/model/GetEventSourceMappingRequest.h>
@@ -237,34 +243,48 @@
 #include <aws/lambda/model/LayerVersionContentOutput.h>
 #include <aws/lambda/model/LayerVersionsListItem.h>
 #include <aws/lambda/model/LayersListItem.h>
+#include <aws/lambda/model/ListAliasesPaginationTraits.h>
 #include <aws/lambda/model/ListAliasesRequest.h>
 #include <aws/lambda/model/ListAliasesResult.h>
+#include <aws/lambda/model/ListCapacityProvidersPaginationTraits.h>
 #include <aws/lambda/model/ListCapacityProvidersRequest.h>
 #include <aws/lambda/model/ListCapacityProvidersResult.h>
+#include <aws/lambda/model/ListCodeSigningConfigsPaginationTraits.h>
 #include <aws/lambda/model/ListCodeSigningConfigsRequest.h>
 #include <aws/lambda/model/ListCodeSigningConfigsResult.h>
+#include <aws/lambda/model/ListDurableExecutionsByFunctionPaginationTraits.h>
 #include <aws/lambda/model/ListDurableExecutionsByFunctionRequest.h>
 #include <aws/lambda/model/ListDurableExecutionsByFunctionResult.h>
+#include <aws/lambda/model/ListEventSourceMappingsPaginationTraits.h>
 #include <aws/lambda/model/ListEventSourceMappingsRequest.h>
 #include <aws/lambda/model/ListEventSourceMappingsResult.h>
+#include <aws/lambda/model/ListFunctionEventInvokeConfigsPaginationTraits.h>
 #include <aws/lambda/model/ListFunctionEventInvokeConfigsRequest.h>
 #include <aws/lambda/model/ListFunctionEventInvokeConfigsResult.h>
+#include <aws/lambda/model/ListFunctionUrlConfigsPaginationTraits.h>
 #include <aws/lambda/model/ListFunctionUrlConfigsRequest.h>
 #include <aws/lambda/model/ListFunctionUrlConfigsResult.h>
+#include <aws/lambda/model/ListFunctionVersionsByCapacityProviderPaginationTraits.h>
 #include <aws/lambda/model/ListFunctionVersionsByCapacityProviderRequest.h>
 #include <aws/lambda/model/ListFunctionVersionsByCapacityProviderResult.h>
+#include <aws/lambda/model/ListFunctionsByCodeSigningConfigPaginationTraits.h>
 #include <aws/lambda/model/ListFunctionsByCodeSigningConfigRequest.h>
 #include <aws/lambda/model/ListFunctionsByCodeSigningConfigResult.h>
+#include <aws/lambda/model/ListFunctionsPaginationTraits.h>
 #include <aws/lambda/model/ListFunctionsRequest.h>
 #include <aws/lambda/model/ListFunctionsResult.h>
+#include <aws/lambda/model/ListLayerVersionsPaginationTraits.h>
 #include <aws/lambda/model/ListLayerVersionsRequest.h>
 #include <aws/lambda/model/ListLayerVersionsResult.h>
+#include <aws/lambda/model/ListLayersPaginationTraits.h>
 #include <aws/lambda/model/ListLayersRequest.h>
 #include <aws/lambda/model/ListLayersResult.h>
+#include <aws/lambda/model/ListProvisionedConcurrencyConfigsPaginationTraits.h>
 #include <aws/lambda/model/ListProvisionedConcurrencyConfigsRequest.h>
 #include <aws/lambda/model/ListProvisionedConcurrencyConfigsResult.h>
 #include <aws/lambda/model/ListTagsRequest.h>
 #include <aws/lambda/model/ListTagsResult.h>
+#include <aws/lambda/model/ListVersionsByFunctionPaginationTraits.h>
 #include <aws/lambda/model/ListVersionsByFunctionRequest.h>
 #include <aws/lambda/model/ListVersionsByFunctionResult.h>
 #include <aws/lambda/model/LogFormat.h>
diff --git a/generated/tests/lambda-microvms-gen-tests/LambdaMicrovmsIncludeTests.cpp b/generated/tests/lambda-microvms-gen-tests/LambdaMicrovmsIncludeTests.cpp
index 7cc91972dfff..502c60d265b3 100644
--- a/generated/tests/lambda-microvms-gen-tests/LambdaMicrovmsIncludeTests.cpp
+++ b/generated/tests/lambda-microvms-gen-tests/LambdaMicrovmsIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/lambda-microvms/LambdaMicrovmsClient.h>
+#include <aws/lambda-microvms/LambdaMicrovmsClientPagination.h>
 #include <aws/lambda-microvms/LambdaMicrovmsEndpointProvider.h>
 #include <aws/lambda-microvms/LambdaMicrovmsErrorMarshaller.h>
 #include <aws/lambda-microvms/LambdaMicrovmsErrors.h>
+#include <aws/lambda-microvms/LambdaMicrovmsPaginationBase.h>
 #include <aws/lambda-microvms/LambdaMicrovmsRequest.h>
 #include <aws/lambda-microvms/LambdaMicrovmsServiceClientModel.h>
+#include <aws/lambda-microvms/LambdaMicrovmsWaiter.h>
 #include <aws/lambda-microvms/LambdaMicrovms_EXPORTS.h>
+#include <aws/lambda-microvms/internal/LambdaMicrovmsEndpointRules.h>
 #include <aws/lambda-microvms/model/Architecture.h>
 #include <aws/lambda-microvms/model/BuildState.h>
 #include <aws/lambda-microvms/model/Capability.h>
@@ -44,16 +48,22 @@
 #include <aws/lambda-microvms/model/IdlePolicy.h>
 #include <aws/lambda-microvms/model/InternalServerException.h>
 #include <aws/lambda-microvms/model/InvalidParameterValueException.h>
+#include <aws/lambda-microvms/model/ListManagedMicrovmImageVersionsPaginationTraits.h>
 #include <aws/lambda-microvms/model/ListManagedMicrovmImageVersionsRequest.h>
 #include <aws/lambda-microvms/model/ListManagedMicrovmImageVersionsResult.h>
+#include <aws/lambda-microvms/model/ListManagedMicrovmImagesPaginationTraits.h>
 #include <aws/lambda-microvms/model/ListManagedMicrovmImagesRequest.h>
 #include <aws/lambda-microvms/model/ListManagedMicrovmImagesResult.h>
+#include <aws/lambda-microvms/model/ListMicrovmImageBuildsPaginationTraits.h>
 #include <aws/lambda-microvms/model/ListMicrovmImageBuildsRequest.h>
 #include <aws/lambda-microvms/model/ListMicrovmImageBuildsResult.h>
+#include <aws/lambda-microvms/model/ListMicrovmImageVersionsPaginationTraits.h>
 #include <aws/lambda-microvms/model/ListMicrovmImageVersionsRequest.h>
 #include <aws/lambda-microvms/model/ListMicrovmImageVersionsResult.h>
+#include <aws/lambda-microvms/model/ListMicrovmImagesPaginationTraits.h>
 #include <aws/lambda-microvms/model/ListMicrovmImagesRequest.h>
 #include <aws/lambda-microvms/model/ListMicrovmImagesResult.h>
+#include <aws/lambda-microvms/model/ListMicrovmsPaginationTraits.h>
 #include <aws/lambda-microvms/model/ListMicrovmsRequest.h>
 #include <aws/lambda-microvms/model/ListMicrovmsResult.h>
 #include <aws/lambda-microvms/model/ListTagsRequest.h>
diff --git a/generated/tests/launch-wizard-gen-tests/LaunchWizardIncludeTests.cpp b/generated/tests/launch-wizard-gen-tests/LaunchWizardIncludeTests.cpp
index bd72ade33dbf..17e881df87af 100644
--- a/generated/tests/launch-wizard-gen-tests/LaunchWizardIncludeTests.cpp
+++ b/generated/tests/launch-wizard-gen-tests/LaunchWizardIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/launch-wizard/LaunchWizardClient.h>
+#include <aws/launch-wizard/LaunchWizardClientPagination.h>
 #include <aws/launch-wizard/LaunchWizardEndpointProvider.h>
 #include <aws/launch-wizard/LaunchWizardErrorMarshaller.h>
 #include <aws/launch-wizard/LaunchWizardErrors.h>
+#include <aws/launch-wizard/LaunchWizardPaginationBase.h>
 #include <aws/launch-wizard/LaunchWizardRequest.h>
 #include <aws/launch-wizard/LaunchWizardServiceClientModel.h>
+#include <aws/launch-wizard/LaunchWizardWaiter.h>
 #include <aws/launch-wizard/LaunchWizard_EXPORTS.h>
+#include <aws/launch-wizard/internal/LaunchWizardEndpointRules.h>
 #include <aws/launch-wizard/model/CreateDeploymentRequest.h>
 #include <aws/launch-wizard/model/CreateDeploymentResult.h>
 #include <aws/launch-wizard/model/DeleteDeploymentRequest.h>
@@ -37,16 +41,21 @@
 #include <aws/launch-wizard/model/GetWorkloadDeploymentPatternResult.h>
 #include <aws/launch-wizard/model/GetWorkloadRequest.h>
 #include <aws/launch-wizard/model/GetWorkloadResult.h>
+#include <aws/launch-wizard/model/ListDeploymentEventsPaginationTraits.h>
 #include <aws/launch-wizard/model/ListDeploymentEventsRequest.h>
 #include <aws/launch-wizard/model/ListDeploymentEventsResult.h>
+#include <aws/launch-wizard/model/ListDeploymentPatternVersionsPaginationTraits.h>
 #include <aws/launch-wizard/model/ListDeploymentPatternVersionsRequest.h>
 #include <aws/launch-wizard/model/ListDeploymentPatternVersionsResult.h>
+#include <aws/launch-wizard/model/ListDeploymentsPaginationTraits.h>
 #include <aws/launch-wizard/model/ListDeploymentsRequest.h>
 #include <aws/launch-wizard/model/ListDeploymentsResult.h>
 #include <aws/launch-wizard/model/ListTagsForResourceRequest.h>
 #include <aws/launch-wizard/model/ListTagsForResourceResult.h>
+#include <aws/launch-wizard/model/ListWorkloadDeploymentPatternsPaginationTraits.h>
 #include <aws/launch-wizard/model/ListWorkloadDeploymentPatternsRequest.h>
 #include <aws/launch-wizard/model/ListWorkloadDeploymentPatternsResult.h>
+#include <aws/launch-wizard/model/ListWorkloadsPaginationTraits.h>
 #include <aws/launch-wizard/model/ListWorkloadsRequest.h>
 #include <aws/launch-wizard/model/ListWorkloadsResult.h>
 #include <aws/launch-wizard/model/TagResourceRequest.h>
diff --git a/generated/tests/lex-gen-tests/LexRuntimeServiceIncludeTests.cpp b/generated/tests/lex-gen-tests/LexRuntimeServiceIncludeTests.cpp
index 3db9cdb53fd9..051245760ef1 100644
--- a/generated/tests/lex-gen-tests/LexRuntimeServiceIncludeTests.cpp
+++ b/generated/tests/lex-gen-tests/LexRuntimeServiceIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/lex/LexRuntimeServiceEndpointProvider.h>
 #include <aws/lex/LexRuntimeServiceErrorMarshaller.h>
 #include <aws/lex/LexRuntimeServiceErrors.h>
+#include <aws/lex/LexRuntimeServicePaginationBase.h>
 #include <aws/lex/LexRuntimeServiceRequest.h>
 #include <aws/lex/LexRuntimeServiceServiceClientModel.h>
+#include <aws/lex/LexRuntimeServiceWaiter.h>
 #include <aws/lex/LexRuntimeService_EXPORTS.h>
+#include <aws/lex/internal/LexRuntimeServiceEndpointRules.h>
 #include <aws/lex/model/ActiveContext.h>
 #include <aws/lex/model/ActiveContextTimeToLive.h>
 #include <aws/lex/model/Button.h>
diff --git a/generated/tests/lex-models-gen-tests/LexModelBuildingServiceIncludeTests.cpp b/generated/tests/lex-models-gen-tests/LexModelBuildingServiceIncludeTests.cpp
index 1d9b7ede95ce..aec220e1ca8e 100644
--- a/generated/tests/lex-models-gen-tests/LexModelBuildingServiceIncludeTests.cpp
+++ b/generated/tests/lex-models-gen-tests/LexModelBuildingServiceIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/lex-models/LexModelBuildingServiceEndpointProvider.h>
 #include <aws/lex-models/LexModelBuildingServiceErrorMarshaller.h>
 #include <aws/lex-models/LexModelBuildingServiceErrors.h>
+#include <aws/lex-models/LexModelBuildingServicePaginationBase.h>
 #include <aws/lex-models/LexModelBuildingServiceRequest.h>
 #include <aws/lex-models/LexModelBuildingServiceServiceClientModel.h>
+#include <aws/lex-models/LexModelBuildingServiceWaiter.h>
 #include <aws/lex-models/LexModelBuildingService_EXPORTS.h>
+#include <aws/lex-models/internal/LexModelBuildingServiceEndpointRules.h>
 #include <aws/lex-models/model/BotAliasMetadata.h>
 #include <aws/lex-models/model/BotChannelAssociation.h>
 #include <aws/lex-models/model/BotMetadata.h>
diff --git a/generated/tests/lexv2-models-gen-tests/LexModelsV2IncludeTests.cpp b/generated/tests/lexv2-models-gen-tests/LexModelsV2IncludeTests.cpp
index b827b78dcd4f..1e14b0f9437b 100644
--- a/generated/tests/lexv2-models-gen-tests/LexModelsV2IncludeTests.cpp
+++ b/generated/tests/lexv2-models-gen-tests/LexModelsV2IncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/lexv2-models/LexModelsV2Client.h>
+#include <aws/lexv2-models/LexModelsV2ClientPagination.h>
 #include <aws/lexv2-models/LexModelsV2EndpointProvider.h>
 #include <aws/lexv2-models/LexModelsV2ErrorMarshaller.h>
 #include <aws/lexv2-models/LexModelsV2Errors.h>
+#include <aws/lexv2-models/LexModelsV2PaginationBase.h>
 #include <aws/lexv2-models/LexModelsV2Request.h>
 #include <aws/lexv2-models/LexModelsV2ServiceClientModel.h>
+#include <aws/lexv2-models/LexModelsV2Waiter.h>
 #include <aws/lexv2-models/LexModelsV2_EXPORTS.h>
+#include <aws/lexv2-models/internal/LexModelsV2EndpointRules.h>
 #include <aws/lexv2-models/model/ActiveContext.h>
 #include <aws/lexv2-models/model/AdvancedRecognitionSetting.h>
 #include <aws/lexv2-models/model/AgentTurnResult.h>
@@ -240,6 +244,7 @@
 #include <aws/lexv2-models/model/DeleteUtterancesResult.h>
 #include <aws/lexv2-models/model/DescribeBotAliasRequest.h>
 #include <aws/lexv2-models/model/DescribeBotAliasResult.h>
+#include <aws/lexv2-models/model/DescribeBotAnalyzerRecommendationPaginationTraits.h>
 #include <aws/lexv2-models/model/DescribeBotAnalyzerRecommendationRequest.h>
 #include <aws/lexv2-models/model/DescribeBotAnalyzerRecommendationResult.h>
 #include <aws/lexv2-models/model/DescribeBotLocaleRequest.h>
@@ -350,68 +355,97 @@
 #include <aws/lexv2-models/model/KendraConfiguration.h>
 #include <aws/lexv2-models/model/LambdaCodeHook.h>
 #include <aws/lexv2-models/model/LexTranscriptFilter.h>
+#include <aws/lexv2-models/model/ListAggregatedUtterancesPaginationTraits.h>
 #include <aws/lexv2-models/model/ListAggregatedUtterancesRequest.h>
 #include <aws/lexv2-models/model/ListAggregatedUtterancesResult.h>
+#include <aws/lexv2-models/model/ListBotAliasReplicasPaginationTraits.h>
 #include <aws/lexv2-models/model/ListBotAliasReplicasRequest.h>
 #include <aws/lexv2-models/model/ListBotAliasReplicasResult.h>
+#include <aws/lexv2-models/model/ListBotAliasesPaginationTraits.h>
 #include <aws/lexv2-models/model/ListBotAliasesRequest.h>
 #include <aws/lexv2-models/model/ListBotAliasesResult.h>
+#include <aws/lexv2-models/model/ListBotAnalyzerHistoryPaginationTraits.h>
 #include <aws/lexv2-models/model/ListBotAnalyzerHistoryRequest.h>
 #include <aws/lexv2-models/model/ListBotAnalyzerHistoryResult.h>
+#include <aws/lexv2-models/model/ListBotLocalesPaginationTraits.h>
 #include <aws/lexv2-models/model/ListBotLocalesRequest.h>
 #include <aws/lexv2-models/model/ListBotLocalesResult.h>
+#include <aws/lexv2-models/model/ListBotRecommendationsPaginationTraits.h>
 #include <aws/lexv2-models/model/ListBotRecommendationsRequest.h>
 #include <aws/lexv2-models/model/ListBotRecommendationsResult.h>
 #include <aws/lexv2-models/model/ListBotReplicasRequest.h>
 #include <aws/lexv2-models/model/ListBotReplicasResult.h>
+#include <aws/lexv2-models/model/ListBotResourceGenerationsPaginationTraits.h>
 #include <aws/lexv2-models/model/ListBotResourceGenerationsRequest.h>
 #include <aws/lexv2-models/model/ListBotResourceGenerationsResult.h>
+#include <aws/lexv2-models/model/ListBotVersionReplicasPaginationTraits.h>
 #include <aws/lexv2-models/model/ListBotVersionReplicasRequest.h>
 #include <aws/lexv2-models/model/ListBotVersionReplicasResult.h>
+#include <aws/lexv2-models/model/ListBotVersionsPaginationTraits.h>
 #include <aws/lexv2-models/model/ListBotVersionsRequest.h>
 #include <aws/lexv2-models/model/ListBotVersionsResult.h>
+#include <aws/lexv2-models/model/ListBotsPaginationTraits.h>
 #include <aws/lexv2-models/model/ListBotsRequest.h>
 #include <aws/lexv2-models/model/ListBotsResult.h>
+#include <aws/lexv2-models/model/ListBuiltInIntentsPaginationTraits.h>
 #include <aws/lexv2-models/model/ListBuiltInIntentsRequest.h>
 #include <aws/lexv2-models/model/ListBuiltInIntentsResult.h>
+#include <aws/lexv2-models/model/ListBuiltInSlotTypesPaginationTraits.h>
 #include <aws/lexv2-models/model/ListBuiltInSlotTypesRequest.h>
 #include <aws/lexv2-models/model/ListBuiltInSlotTypesResult.h>
+#include <aws/lexv2-models/model/ListCustomVocabularyItemsPaginationTraits.h>
 #include <aws/lexv2-models/model/ListCustomVocabularyItemsRequest.h>
 #include <aws/lexv2-models/model/ListCustomVocabularyItemsResult.h>
+#include <aws/lexv2-models/model/ListExportsPaginationTraits.h>
 #include <aws/lexv2-models/model/ListExportsRequest.h>
 #include <aws/lexv2-models/model/ListExportsResult.h>
+#include <aws/lexv2-models/model/ListImportsPaginationTraits.h>
 #include <aws/lexv2-models/model/ListImportsRequest.h>
 #include <aws/lexv2-models/model/ListImportsResult.h>
+#include <aws/lexv2-models/model/ListIntentMetricsPaginationTraits.h>
 #include <aws/lexv2-models/model/ListIntentMetricsRequest.h>
 #include <aws/lexv2-models/model/ListIntentMetricsResult.h>
 #include <aws/lexv2-models/model/ListIntentPathsRequest.h>
 #include <aws/lexv2-models/model/ListIntentPathsResult.h>
+#include <aws/lexv2-models/model/ListIntentStageMetricsPaginationTraits.h>
 #include <aws/lexv2-models/model/ListIntentStageMetricsRequest.h>
 #include <aws/lexv2-models/model/ListIntentStageMetricsResult.h>
+#include <aws/lexv2-models/model/ListIntentsPaginationTraits.h>
 #include <aws/lexv2-models/model/ListIntentsRequest.h>
 #include <aws/lexv2-models/model/ListIntentsResult.h>
+#include <aws/lexv2-models/model/ListRecommendedIntentsPaginationTraits.h>
 #include <aws/lexv2-models/model/ListRecommendedIntentsRequest.h>
 #include <aws/lexv2-models/model/ListRecommendedIntentsResult.h>
+#include <aws/lexv2-models/model/ListSessionAnalyticsDataPaginationTraits.h>
 #include <aws/lexv2-models/model/ListSessionAnalyticsDataRequest.h>
 #include <aws/lexv2-models/model/ListSessionAnalyticsDataResult.h>
+#include <aws/lexv2-models/model/ListSessionMetricsPaginationTraits.h>
 #include <aws/lexv2-models/model/ListSessionMetricsRequest.h>
 #include <aws/lexv2-models/model/ListSessionMetricsResult.h>
+#include <aws/lexv2-models/model/ListSlotTypesPaginationTraits.h>
 #include <aws/lexv2-models/model/ListSlotTypesRequest.h>
 #include <aws/lexv2-models/model/ListSlotTypesResult.h>
+#include <aws/lexv2-models/model/ListSlotsPaginationTraits.h>
 #include <aws/lexv2-models/model/ListSlotsRequest.h>
 #include <aws/lexv2-models/model/ListSlotsResult.h>
 #include <aws/lexv2-models/model/ListTagsForResourceRequest.h>
 #include <aws/lexv2-models/model/ListTagsForResourceResult.h>
+#include <aws/lexv2-models/model/ListTestExecutionResultItemsPaginationTraits.h>
 #include <aws/lexv2-models/model/ListTestExecutionResultItemsRequest.h>
 #include <aws/lexv2-models/model/ListTestExecutionResultItemsResult.h>
+#include <aws/lexv2-models/model/ListTestExecutionsPaginationTraits.h>
 #include <aws/lexv2-models/model/ListTestExecutionsRequest.h>
 #include <aws/lexv2-models/model/ListTestExecutionsResult.h>
+#include <aws/lexv2-models/model/ListTestSetRecordsPaginationTraits.h>
 #include <aws/lexv2-models/model/ListTestSetRecordsRequest.h>
 #include <aws/lexv2-models/model/ListTestSetRecordsResult.h>
+#include <aws/lexv2-models/model/ListTestSetsPaginationTraits.h>
 #include <aws/lexv2-models/model/ListTestSetsRequest.h>
 #include <aws/lexv2-models/model/ListTestSetsResult.h>
+#include <aws/lexv2-models/model/ListUtteranceAnalyticsDataPaginationTraits.h>
 #include <aws/lexv2-models/model/ListUtteranceAnalyticsDataRequest.h>
 #include <aws/lexv2-models/model/ListUtteranceAnalyticsDataResult.h>
+#include <aws/lexv2-models/model/ListUtteranceMetricsPaginationTraits.h>
 #include <aws/lexv2-models/model/ListUtteranceMetricsRequest.h>
 #include <aws/lexv2-models/model/ListUtteranceMetricsResult.h>
 #include <aws/lexv2-models/model/MergeStrategy.h>
diff --git a/generated/tests/lexv2-runtime-gen-tests/LexRuntimeV2IncludeTests.cpp b/generated/tests/lexv2-runtime-gen-tests/LexRuntimeV2IncludeTests.cpp
index ecc7d11718e2..3939cfdd16fd 100644
--- a/generated/tests/lexv2-runtime-gen-tests/LexRuntimeV2IncludeTests.cpp
+++ b/generated/tests/lexv2-runtime-gen-tests/LexRuntimeV2IncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/lexv2-runtime/LexRuntimeV2EndpointProvider.h>
 #include <aws/lexv2-runtime/LexRuntimeV2ErrorMarshaller.h>
 #include <aws/lexv2-runtime/LexRuntimeV2Errors.h>
+#include <aws/lexv2-runtime/LexRuntimeV2PaginationBase.h>
 #include <aws/lexv2-runtime/LexRuntimeV2Request.h>
 #include <aws/lexv2-runtime/LexRuntimeV2ServiceClientModel.h>
+#include <aws/lexv2-runtime/LexRuntimeV2Waiter.h>
 #include <aws/lexv2-runtime/LexRuntimeV2_EXPORTS.h>
+#include <aws/lexv2-runtime/internal/LexRuntimeV2EndpointRules.h>
 #include <aws/lexv2-runtime/model/ActiveContext.h>
 #include <aws/lexv2-runtime/model/ActiveContextTimeToLive.h>
 #include <aws/lexv2-runtime/model/AudioInputEvent.h>
diff --git a/generated/tests/license-manager-gen-tests/LicenseManagerIncludeTests.cpp b/generated/tests/license-manager-gen-tests/LicenseManagerIncludeTests.cpp
index cbd237f7d4ea..13373de55d3f 100644
--- a/generated/tests/license-manager-gen-tests/LicenseManagerIncludeTests.cpp
+++ b/generated/tests/license-manager-gen-tests/LicenseManagerIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/license-manager/LicenseManagerEndpointProvider.h>
 #include <aws/license-manager/LicenseManagerErrorMarshaller.h>
 #include <aws/license-manager/LicenseManagerErrors.h>
+#include <aws/license-manager/LicenseManagerPaginationBase.h>
 #include <aws/license-manager/LicenseManagerRequest.h>
 #include <aws/license-manager/LicenseManagerServiceClientModel.h>
+#include <aws/license-manager/LicenseManagerWaiter.h>
 #include <aws/license-manager/LicenseManager_EXPORTS.h>
+#include <aws/license-manager/internal/LicenseManagerEndpointRules.h>
 #include <aws/license-manager/model/AcceptGrantRequest.h>
 #include <aws/license-manager/model/AcceptGrantResult.h>
 #include <aws/license-manager/model/ActivationOverrideBehavior.h>
diff --git a/generated/tests/license-manager-linux-subscriptions-gen-tests/LicenseManagerLinuxSubscriptionsIncludeTests.cpp b/generated/tests/license-manager-linux-subscriptions-gen-tests/LicenseManagerLinuxSubscriptionsIncludeTests.cpp
index 634523256fe0..a134ac3b3ed6 100644
--- a/generated/tests/license-manager-linux-subscriptions-gen-tests/LicenseManagerLinuxSubscriptionsIncludeTests.cpp
+++ b/generated/tests/license-manager-linux-subscriptions-gen-tests/LicenseManagerLinuxSubscriptionsIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/license-manager-linux-subscriptions/LicenseManagerLinuxSubscriptionsClient.h>
+#include <aws/license-manager-linux-subscriptions/LicenseManagerLinuxSubscriptionsClientPagination.h>
 #include <aws/license-manager-linux-subscriptions/LicenseManagerLinuxSubscriptionsEndpointProvider.h>
 #include <aws/license-manager-linux-subscriptions/LicenseManagerLinuxSubscriptionsErrorMarshaller.h>
 #include <aws/license-manager-linux-subscriptions/LicenseManagerLinuxSubscriptionsErrors.h>
+#include <aws/license-manager-linux-subscriptions/LicenseManagerLinuxSubscriptionsPaginationBase.h>
 #include <aws/license-manager-linux-subscriptions/LicenseManagerLinuxSubscriptionsRequest.h>
 #include <aws/license-manager-linux-subscriptions/LicenseManagerLinuxSubscriptionsServiceClientModel.h>
+#include <aws/license-manager-linux-subscriptions/LicenseManagerLinuxSubscriptionsWaiter.h>
 #include <aws/license-manager-linux-subscriptions/LicenseManagerLinuxSubscriptions_EXPORTS.h>
+#include <aws/license-manager-linux-subscriptions/internal/LicenseManagerLinuxSubscriptionsEndpointRules.h>
 #include <aws/license-manager-linux-subscriptions/model/DeregisterSubscriptionProviderRequest.h>
 #include <aws/license-manager-linux-subscriptions/model/DeregisterSubscriptionProviderResult.h>
 #include <aws/license-manager-linux-subscriptions/model/Filter.h>
@@ -23,10 +27,13 @@
 #include <aws/license-manager-linux-subscriptions/model/Instance.h>
 #include <aws/license-manager-linux-subscriptions/model/LinuxSubscriptionsDiscovery.h>
 #include <aws/license-manager-linux-subscriptions/model/LinuxSubscriptionsDiscoverySettings.h>
+#include <aws/license-manager-linux-subscriptions/model/ListLinuxSubscriptionInstancesPaginationTraits.h>
 #include <aws/license-manager-linux-subscriptions/model/ListLinuxSubscriptionInstancesRequest.h>
 #include <aws/license-manager-linux-subscriptions/model/ListLinuxSubscriptionInstancesResult.h>
+#include <aws/license-manager-linux-subscriptions/model/ListLinuxSubscriptionsPaginationTraits.h>
 #include <aws/license-manager-linux-subscriptions/model/ListLinuxSubscriptionsRequest.h>
 #include <aws/license-manager-linux-subscriptions/model/ListLinuxSubscriptionsResult.h>
+#include <aws/license-manager-linux-subscriptions/model/ListRegisteredSubscriptionProvidersPaginationTraits.h>
 #include <aws/license-manager-linux-subscriptions/model/ListRegisteredSubscriptionProvidersRequest.h>
 #include <aws/license-manager-linux-subscriptions/model/ListRegisteredSubscriptionProvidersResult.h>
 #include <aws/license-manager-linux-subscriptions/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/license-manager-user-subscriptions-gen-tests/LicenseManagerUserSubscriptionsIncludeTests.cpp b/generated/tests/license-manager-user-subscriptions-gen-tests/LicenseManagerUserSubscriptionsIncludeTests.cpp
index a8c8747fdfe0..55646f784ae6 100644
--- a/generated/tests/license-manager-user-subscriptions-gen-tests/LicenseManagerUserSubscriptionsIncludeTests.cpp
+++ b/generated/tests/license-manager-user-subscriptions-gen-tests/LicenseManagerUserSubscriptionsIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/license-manager-user-subscriptions/LicenseManagerUserSubscriptionsClient.h>
+#include <aws/license-manager-user-subscriptions/LicenseManagerUserSubscriptionsClientPagination.h>
 #include <aws/license-manager-user-subscriptions/LicenseManagerUserSubscriptionsEndpointProvider.h>
 #include <aws/license-manager-user-subscriptions/LicenseManagerUserSubscriptionsErrorMarshaller.h>
 #include <aws/license-manager-user-subscriptions/LicenseManagerUserSubscriptionsErrors.h>
+#include <aws/license-manager-user-subscriptions/LicenseManagerUserSubscriptionsPaginationBase.h>
 #include <aws/license-manager-user-subscriptions/LicenseManagerUserSubscriptionsRequest.h>
 #include <aws/license-manager-user-subscriptions/LicenseManagerUserSubscriptionsServiceClientModel.h>
+#include <aws/license-manager-user-subscriptions/LicenseManagerUserSubscriptionsWaiter.h>
 #include <aws/license-manager-user-subscriptions/LicenseManagerUserSubscriptions_EXPORTS.h>
+#include <aws/license-manager-user-subscriptions/internal/LicenseManagerUserSubscriptionsEndpointRules.h>
 #include <aws/license-manager-user-subscriptions/model/ActiveDirectoryIdentityProvider.h>
 #include <aws/license-manager-user-subscriptions/model/ActiveDirectorySettings.h>
 #include <aws/license-manager-user-subscriptions/model/ActiveDirectoryType.h>
@@ -38,16 +42,21 @@
 #include <aws/license-manager-user-subscriptions/model/LicenseServerEndpointProvisioningStatus.h>
 #include <aws/license-manager-user-subscriptions/model/LicenseServerHealthStatus.h>
 #include <aws/license-manager-user-subscriptions/model/LicenseServerSettings.h>
+#include <aws/license-manager-user-subscriptions/model/ListIdentityProvidersPaginationTraits.h>
 #include <aws/license-manager-user-subscriptions/model/ListIdentityProvidersRequest.h>
 #include <aws/license-manager-user-subscriptions/model/ListIdentityProvidersResult.h>
+#include <aws/license-manager-user-subscriptions/model/ListInstancesPaginationTraits.h>
 #include <aws/license-manager-user-subscriptions/model/ListInstancesRequest.h>
 #include <aws/license-manager-user-subscriptions/model/ListInstancesResult.h>
+#include <aws/license-manager-user-subscriptions/model/ListLicenseServerEndpointsPaginationTraits.h>
 #include <aws/license-manager-user-subscriptions/model/ListLicenseServerEndpointsRequest.h>
 #include <aws/license-manager-user-subscriptions/model/ListLicenseServerEndpointsResult.h>
+#include <aws/license-manager-user-subscriptions/model/ListProductSubscriptionsPaginationTraits.h>
 #include <aws/license-manager-user-subscriptions/model/ListProductSubscriptionsRequest.h>
 #include <aws/license-manager-user-subscriptions/model/ListProductSubscriptionsResult.h>
 #include <aws/license-manager-user-subscriptions/model/ListTagsForResourceRequest.h>
 #include <aws/license-manager-user-subscriptions/model/ListTagsForResourceResult.h>
+#include <aws/license-manager-user-subscriptions/model/ListUserAssociationsPaginationTraits.h>
 #include <aws/license-manager-user-subscriptions/model/ListUserAssociationsRequest.h>
 #include <aws/license-manager-user-subscriptions/model/ListUserAssociationsResult.h>
 #include <aws/license-manager-user-subscriptions/model/ProductUserSummary.h>
diff --git a/generated/tests/lightsail-gen-tests/LightsailIncludeTests.cpp b/generated/tests/lightsail-gen-tests/LightsailIncludeTests.cpp
index 9fda76871fa2..06935b1d9acf 100644
--- a/generated/tests/lightsail-gen-tests/LightsailIncludeTests.cpp
+++ b/generated/tests/lightsail-gen-tests/LightsailIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/lightsail/LightsailEndpointProvider.h>
 #include <aws/lightsail/LightsailErrorMarshaller.h>
 #include <aws/lightsail/LightsailErrors.h>
+#include <aws/lightsail/LightsailPaginationBase.h>
 #include <aws/lightsail/LightsailRequest.h>
 #include <aws/lightsail/LightsailServiceClientModel.h>
+#include <aws/lightsail/LightsailWaiter.h>
 #include <aws/lightsail/Lightsail_EXPORTS.h>
+#include <aws/lightsail/internal/LightsailEndpointRules.h>
 #include <aws/lightsail/model/AccessDeniedException.h>
 #include <aws/lightsail/model/AccessDirection.h>
 #include <aws/lightsail/model/AccessKey.h>
diff --git a/generated/tests/location-gen-tests/LocationServiceIncludeTests.cpp b/generated/tests/location-gen-tests/LocationServiceIncludeTests.cpp
index 8e010d211d5d..ef0528e9f338 100644
--- a/generated/tests/location-gen-tests/LocationServiceIncludeTests.cpp
+++ b/generated/tests/location-gen-tests/LocationServiceIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/location/LocationServiceClient.h>
+#include <aws/location/LocationServiceClientPagination.h>
 #include <aws/location/LocationServiceEndpointProvider.h>
 #include <aws/location/LocationServiceErrorMarshaller.h>
 #include <aws/location/LocationServiceErrors.h>
+#include <aws/location/LocationServicePaginationBase.h>
 #include <aws/location/LocationServiceRequest.h>
 #include <aws/location/LocationServiceServiceClientModel.h>
+#include <aws/location/LocationServiceWaiter.h>
 #include <aws/location/LocationService_EXPORTS.h>
+#include <aws/location/internal/LocationServiceEndpointRules.h>
 #include <aws/location/model/AndroidApp.h>
 #include <aws/location/model/ApiKeyFilter.h>
 #include <aws/location/model/ApiKeyRestrictions.h>
@@ -98,11 +102,13 @@
 #include <aws/location/model/DisassociateTrackerConsumerResult.h>
 #include <aws/location/model/DistanceUnit.h>
 #include <aws/location/model/ForecastGeofenceEventsDeviceState.h>
+#include <aws/location/model/ForecastGeofenceEventsPaginationTraits.h>
 #include <aws/location/model/ForecastGeofenceEventsRequest.h>
 #include <aws/location/model/ForecastGeofenceEventsResult.h>
 #include <aws/location/model/ForecastedEvent.h>
 #include <aws/location/model/ForecastedGeofenceEventType.h>
 #include <aws/location/model/GeofenceGeometry.h>
+#include <aws/location/model/GetDevicePositionHistoryPaginationTraits.h>
 #include <aws/location/model/GetDevicePositionHistoryRequest.h>
 #include <aws/location/model/GetDevicePositionHistoryResult.h>
 #include <aws/location/model/GetDevicePositionRequest.h>
@@ -135,34 +141,44 @@
 #include <aws/location/model/JobsFilter.h>
 #include <aws/location/model/Leg.h>
 #include <aws/location/model/LegGeometry.h>
+#include <aws/location/model/ListDevicePositionsPaginationTraits.h>
 #include <aws/location/model/ListDevicePositionsRequest.h>
 #include <aws/location/model/ListDevicePositionsResponseEntry.h>
 #include <aws/location/model/ListDevicePositionsResult.h>
+#include <aws/location/model/ListGeofenceCollectionsPaginationTraits.h>
 #include <aws/location/model/ListGeofenceCollectionsRequest.h>
 #include <aws/location/model/ListGeofenceCollectionsResponseEntry.h>
 #include <aws/location/model/ListGeofenceCollectionsResult.h>
 #include <aws/location/model/ListGeofenceResponseEntry.h>
+#include <aws/location/model/ListGeofencesPaginationTraits.h>
 #include <aws/location/model/ListGeofencesRequest.h>
 #include <aws/location/model/ListGeofencesResult.h>
+#include <aws/location/model/ListJobsPaginationTraits.h>
 #include <aws/location/model/ListJobsRequest.h>
 #include <aws/location/model/ListJobsResponseEntry.h>
 #include <aws/location/model/ListJobsResult.h>
+#include <aws/location/model/ListKeysPaginationTraits.h>
 #include <aws/location/model/ListKeysRequest.h>
 #include <aws/location/model/ListKeysResponseEntry.h>
 #include <aws/location/model/ListKeysResult.h>
+#include <aws/location/model/ListMapsPaginationTraits.h>
 #include <aws/location/model/ListMapsRequest.h>
 #include <aws/location/model/ListMapsResponseEntry.h>
 #include <aws/location/model/ListMapsResult.h>
+#include <aws/location/model/ListPlaceIndexesPaginationTraits.h>
 #include <aws/location/model/ListPlaceIndexesRequest.h>
 #include <aws/location/model/ListPlaceIndexesResponseEntry.h>
 #include <aws/location/model/ListPlaceIndexesResult.h>
+#include <aws/location/model/ListRouteCalculatorsPaginationTraits.h>
 #include <aws/location/model/ListRouteCalculatorsRequest.h>
 #include <aws/location/model/ListRouteCalculatorsResponseEntry.h>
 #include <aws/location/model/ListRouteCalculatorsResult.h>
 #include <aws/location/model/ListTagsForResourceRequest.h>
 #include <aws/location/model/ListTagsForResourceResult.h>
+#include <aws/location/model/ListTrackerConsumersPaginationTraits.h>
 #include <aws/location/model/ListTrackerConsumersRequest.h>
 #include <aws/location/model/ListTrackerConsumersResult.h>
+#include <aws/location/model/ListTrackersPaginationTraits.h>
 #include <aws/location/model/ListTrackersRequest.h>
 #include <aws/location/model/ListTrackersResponseEntry.h>
 #include <aws/location/model/ListTrackersResult.h>
diff --git a/generated/tests/logs-gen-tests/CloudWatchLogsIncludeTests.cpp b/generated/tests/logs-gen-tests/CloudWatchLogsIncludeTests.cpp
index 89894d403c2d..801b0a27c0ab 100644
--- a/generated/tests/logs-gen-tests/CloudWatchLogsIncludeTests.cpp
+++ b/generated/tests/logs-gen-tests/CloudWatchLogsIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/logs/CloudWatchLogsClient.h>
+#include <aws/logs/CloudWatchLogsClientPagination.h>
 #include <aws/logs/CloudWatchLogsEndpointProvider.h>
 #include <aws/logs/CloudWatchLogsErrorMarshaller.h>
 #include <aws/logs/CloudWatchLogsErrors.h>
+#include <aws/logs/CloudWatchLogsPaginationBase.h>
 #include <aws/logs/CloudWatchLogsRequest.h>
 #include <aws/logs/CloudWatchLogsServiceClientModel.h>
+#include <aws/logs/CloudWatchLogsWaiter.h>
 #include <aws/logs/CloudWatchLogs_EXPORTS.h>
+#include <aws/logs/internal/CloudWatchLogsEndpointRules.h>
 #include <aws/logs/model/AccountPolicy.h>
 #include <aws/logs/model/ActionStatus.h>
 #include <aws/logs/model/AddKeyEntry.h>
@@ -88,14 +92,19 @@
 #include <aws/logs/model/DeliverySourceStatusReason.h>
 #include <aws/logs/model/DescribeAccountPoliciesRequest.h>
 #include <aws/logs/model/DescribeAccountPoliciesResult.h>
+#include <aws/logs/model/DescribeConfigurationTemplatesPaginationTraits.h>
 #include <aws/logs/model/DescribeConfigurationTemplatesRequest.h>
 #include <aws/logs/model/DescribeConfigurationTemplatesResult.h>
+#include <aws/logs/model/DescribeDeliveriesPaginationTraits.h>
 #include <aws/logs/model/DescribeDeliveriesRequest.h>
 #include <aws/logs/model/DescribeDeliveriesResult.h>
+#include <aws/logs/model/DescribeDeliveryDestinationsPaginationTraits.h>
 #include <aws/logs/model/DescribeDeliveryDestinationsRequest.h>
 #include <aws/logs/model/DescribeDeliveryDestinationsResult.h>
+#include <aws/logs/model/DescribeDeliverySourcesPaginationTraits.h>
 #include <aws/logs/model/DescribeDeliverySourcesRequest.h>
 #include <aws/logs/model/DescribeDeliverySourcesResult.h>
+#include <aws/logs/model/DescribeDestinationsPaginationTraits.h>
 #include <aws/logs/model/DescribeDestinationsRequest.h>
 #include <aws/logs/model/DescribeDestinationsResult.h>
 #include <aws/logs/model/DescribeExportTasksRequest.h>
@@ -108,12 +117,15 @@
 #include <aws/logs/model/DescribeImportTasksResult.h>
 #include <aws/logs/model/DescribeIndexPoliciesRequest.h>
 #include <aws/logs/model/DescribeIndexPoliciesResult.h>
+#include <aws/logs/model/DescribeLogGroupsPaginationTraits.h>
 #include <aws/logs/model/DescribeLogGroupsRequest.h>
 #include <aws/logs/model/DescribeLogGroupsResult.h>
+#include <aws/logs/model/DescribeLogStreamsPaginationTraits.h>
 #include <aws/logs/model/DescribeLogStreamsRequest.h>
 #include <aws/logs/model/DescribeLogStreamsResult.h>
 #include <aws/logs/model/DescribeLookupTablesRequest.h>
 #include <aws/logs/model/DescribeLookupTablesResult.h>
+#include <aws/logs/model/DescribeMetricFiltersPaginationTraits.h>
 #include <aws/logs/model/DescribeMetricFiltersRequest.h>
 #include <aws/logs/model/DescribeMetricFiltersResult.h>
 #include <aws/logs/model/DescribeQueriesRequest.h>
@@ -122,6 +134,7 @@
 #include <aws/logs/model/DescribeQueryDefinitionsResult.h>
 #include <aws/logs/model/DescribeResourcePoliciesRequest.h>
 #include <aws/logs/model/DescribeResourcePoliciesResult.h>
+#include <aws/logs/model/DescribeSubscriptionFiltersPaginationTraits.h>
 #include <aws/logs/model/DescribeSubscriptionFiltersRequest.h>
 #include <aws/logs/model/DescribeSubscriptionFiltersResult.h>
 #include <aws/logs/model/Destination.h>
@@ -141,6 +154,7 @@
 #include <aws/logs/model/ExportTaskStatusCode.h>
 #include <aws/logs/model/FieldIndex.h>
 #include <aws/logs/model/FieldsData.h>
+#include <aws/logs/model/FilterLogEventsPaginationTraits.h>
 #include <aws/logs/model/FilterLogEventsRequest.h>
 #include <aws/logs/model/FilterLogEventsResult.h>
 #include <aws/logs/model/FilteredLogEvent.h>
@@ -159,6 +173,7 @@
 #include <aws/logs/model/GetIntegrationResult.h>
 #include <aws/logs/model/GetLogAnomalyDetectorRequest.h>
 #include <aws/logs/model/GetLogAnomalyDetectorResult.h>
+#include <aws/logs/model/GetLogEventsPaginationTraits.h>
 #include <aws/logs/model/GetLogEventsRequest.h>
 #include <aws/logs/model/GetLogEventsResult.h>
 #include <aws/logs/model/GetLogFieldsRequest.h>
@@ -175,6 +190,7 @@
 #include <aws/logs/model/GetLookupTableResult.h>
 #include <aws/logs/model/GetQueryResultsRequest.h>
 #include <aws/logs/model/GetQueryResultsResult.h>
+#include <aws/logs/model/GetScheduledQueryHistoryPaginationTraits.h>
 #include <aws/logs/model/GetScheduledQueryHistoryRequest.h>
 #include <aws/logs/model/GetScheduledQueryHistoryResult.h>
 #include <aws/logs/model/GetScheduledQueryRequest.h>
@@ -202,20 +218,26 @@
 #include <aws/logs/model/IntegrationType.h>
 #include <aws/logs/model/InvalidSequenceTokenException.h>
 #include <aws/logs/model/ListAggregateLogGroupSummariesGroupBy.h>
+#include <aws/logs/model/ListAggregateLogGroupSummariesPaginationTraits.h>
 #include <aws/logs/model/ListAggregateLogGroupSummariesRequest.h>
 #include <aws/logs/model/ListAggregateLogGroupSummariesResult.h>
+#include <aws/logs/model/ListAnomaliesPaginationTraits.h>
 #include <aws/logs/model/ListAnomaliesRequest.h>
 #include <aws/logs/model/ListAnomaliesResult.h>
 #include <aws/logs/model/ListIntegrationsRequest.h>
 #include <aws/logs/model/ListIntegrationsResult.h>
+#include <aws/logs/model/ListLogAnomalyDetectorsPaginationTraits.h>
 #include <aws/logs/model/ListLogAnomalyDetectorsRequest.h>
 #include <aws/logs/model/ListLogAnomalyDetectorsResult.h>
+#include <aws/logs/model/ListLogGroupsForQueryPaginationTraits.h>
 #include <aws/logs/model/ListLogGroupsForQueryRequest.h>
 #include <aws/logs/model/ListLogGroupsForQueryResult.h>
 #include <aws/logs/model/ListLogGroupsRequest.h>
 #include <aws/logs/model/ListLogGroupsResult.h>
+#include <aws/logs/model/ListScheduledQueriesPaginationTraits.h>
 #include <aws/logs/model/ListScheduledQueriesRequest.h>
 #include <aws/logs/model/ListScheduledQueriesResult.h>
+#include <aws/logs/model/ListSourcesForS3TableIntegrationPaginationTraits.h>
 #include <aws/logs/model/ListSourcesForS3TableIntegrationRequest.h>
 #include <aws/logs/model/ListSourcesForS3TableIntegrationResult.h>
 #include <aws/logs/model/ListSyslogConfigurationsRequest.h>
diff --git a/generated/tests/lookoutequipment-gen-tests/LookoutEquipmentIncludeTests.cpp b/generated/tests/lookoutequipment-gen-tests/LookoutEquipmentIncludeTests.cpp
index 8bed3af2303a..aca2d551b95d 100644
--- a/generated/tests/lookoutequipment-gen-tests/LookoutEquipmentIncludeTests.cpp
+++ b/generated/tests/lookoutequipment-gen-tests/LookoutEquipmentIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/lookoutequipment/LookoutEquipmentClient.h>
+#include <aws/lookoutequipment/LookoutEquipmentClientPagination.h>
 #include <aws/lookoutequipment/LookoutEquipmentEndpointProvider.h>
 #include <aws/lookoutequipment/LookoutEquipmentErrorMarshaller.h>
 #include <aws/lookoutequipment/LookoutEquipmentErrors.h>
+#include <aws/lookoutequipment/LookoutEquipmentPaginationBase.h>
 #include <aws/lookoutequipment/LookoutEquipmentRequest.h>
 #include <aws/lookoutequipment/LookoutEquipmentServiceClientModel.h>
+#include <aws/lookoutequipment/LookoutEquipmentWaiter.h>
 #include <aws/lookoutequipment/LookoutEquipment_EXPORTS.h>
+#include <aws/lookoutequipment/internal/LookoutEquipmentEndpointRules.h>
 #include <aws/lookoutequipment/model/AutoPromotionResult.h>
 #include <aws/lookoutequipment/model/CategoricalValues.h>
 #include <aws/lookoutequipment/model/CountPercent.h>
@@ -89,26 +93,37 @@
 #include <aws/lookoutequipment/model/LabelsS3InputConfiguration.h>
 #include <aws/lookoutequipment/model/LargeTimestampGaps.h>
 #include <aws/lookoutequipment/model/LatestInferenceResult.h>
+#include <aws/lookoutequipment/model/ListDataIngestionJobsPaginationTraits.h>
 #include <aws/lookoutequipment/model/ListDataIngestionJobsRequest.h>
 #include <aws/lookoutequipment/model/ListDataIngestionJobsResult.h>
+#include <aws/lookoutequipment/model/ListDatasetsPaginationTraits.h>
 #include <aws/lookoutequipment/model/ListDatasetsRequest.h>
 #include <aws/lookoutequipment/model/ListDatasetsResult.h>
+#include <aws/lookoutequipment/model/ListInferenceEventsPaginationTraits.h>
 #include <aws/lookoutequipment/model/ListInferenceEventsRequest.h>
 #include <aws/lookoutequipment/model/ListInferenceEventsResult.h>
+#include <aws/lookoutequipment/model/ListInferenceExecutionsPaginationTraits.h>
 #include <aws/lookoutequipment/model/ListInferenceExecutionsRequest.h>
 #include <aws/lookoutequipment/model/ListInferenceExecutionsResult.h>
+#include <aws/lookoutequipment/model/ListInferenceSchedulersPaginationTraits.h>
 #include <aws/lookoutequipment/model/ListInferenceSchedulersRequest.h>
 #include <aws/lookoutequipment/model/ListInferenceSchedulersResult.h>
+#include <aws/lookoutequipment/model/ListLabelGroupsPaginationTraits.h>
 #include <aws/lookoutequipment/model/ListLabelGroupsRequest.h>
 #include <aws/lookoutequipment/model/ListLabelGroupsResult.h>
+#include <aws/lookoutequipment/model/ListLabelsPaginationTraits.h>
 #include <aws/lookoutequipment/model/ListLabelsRequest.h>
 #include <aws/lookoutequipment/model/ListLabelsResult.h>
+#include <aws/lookoutequipment/model/ListModelVersionsPaginationTraits.h>
 #include <aws/lookoutequipment/model/ListModelVersionsRequest.h>
 #include <aws/lookoutequipment/model/ListModelVersionsResult.h>
+#include <aws/lookoutequipment/model/ListModelsPaginationTraits.h>
 #include <aws/lookoutequipment/model/ListModelsRequest.h>
 #include <aws/lookoutequipment/model/ListModelsResult.h>
+#include <aws/lookoutequipment/model/ListRetrainingSchedulersPaginationTraits.h>
 #include <aws/lookoutequipment/model/ListRetrainingSchedulersRequest.h>
 #include <aws/lookoutequipment/model/ListRetrainingSchedulersResult.h>
+#include <aws/lookoutequipment/model/ListSensorStatisticsPaginationTraits.h>
 #include <aws/lookoutequipment/model/ListSensorStatisticsRequest.h>
 #include <aws/lookoutequipment/model/ListSensorStatisticsResult.h>
 #include <aws/lookoutequipment/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/m2-gen-tests/MainframeModernizationIncludeTests.cpp b/generated/tests/m2-gen-tests/MainframeModernizationIncludeTests.cpp
index 59c9d7bca593..f8cd6cc69775 100644
--- a/generated/tests/m2-gen-tests/MainframeModernizationIncludeTests.cpp
+++ b/generated/tests/m2-gen-tests/MainframeModernizationIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/m2/MainframeModernizationClient.h>
+#include <aws/m2/MainframeModernizationClientPagination.h>
 #include <aws/m2/MainframeModernizationEndpointProvider.h>
 #include <aws/m2/MainframeModernizationErrorMarshaller.h>
 #include <aws/m2/MainframeModernizationErrors.h>
+#include <aws/m2/MainframeModernizationPaginationBase.h>
 #include <aws/m2/MainframeModernizationRequest.h>
 #include <aws/m2/MainframeModernizationServiceClientModel.h>
+#include <aws/m2/MainframeModernizationWaiter.h>
 #include <aws/m2/MainframeModernization_EXPORTS.h>
+#include <aws/m2/internal/MainframeModernizationEndpointRules.h>
 #include <aws/m2/model/AlternateKey.h>
 #include <aws/m2/model/ApplicationDeploymentLifecycle.h>
 #include <aws/m2/model/ApplicationLifecycle.h>
@@ -94,26 +98,36 @@
 #include <aws/m2/model/JobIdentifier.h>
 #include <aws/m2/model/JobStep.h>
 #include <aws/m2/model/JobStepRestartMarker.h>
+#include <aws/m2/model/ListApplicationVersionsPaginationTraits.h>
 #include <aws/m2/model/ListApplicationVersionsRequest.h>
 #include <aws/m2/model/ListApplicationVersionsResult.h>
+#include <aws/m2/model/ListApplicationsPaginationTraits.h>
 #include <aws/m2/model/ListApplicationsRequest.h>
 #include <aws/m2/model/ListApplicationsResult.h>
+#include <aws/m2/model/ListBatchJobDefinitionsPaginationTraits.h>
 #include <aws/m2/model/ListBatchJobDefinitionsRequest.h>
 #include <aws/m2/model/ListBatchJobDefinitionsResult.h>
+#include <aws/m2/model/ListBatchJobExecutionsPaginationTraits.h>
 #include <aws/m2/model/ListBatchJobExecutionsRequest.h>
 #include <aws/m2/model/ListBatchJobExecutionsResult.h>
 #include <aws/m2/model/ListBatchJobRestartPointsRequest.h>
 #include <aws/m2/model/ListBatchJobRestartPointsResult.h>
+#include <aws/m2/model/ListDataSetExportHistoryPaginationTraits.h>
 #include <aws/m2/model/ListDataSetExportHistoryRequest.h>
 #include <aws/m2/model/ListDataSetExportHistoryResult.h>
+#include <aws/m2/model/ListDataSetImportHistoryPaginationTraits.h>
 #include <aws/m2/model/ListDataSetImportHistoryRequest.h>
 #include <aws/m2/model/ListDataSetImportHistoryResult.h>
+#include <aws/m2/model/ListDataSetsPaginationTraits.h>
 #include <aws/m2/model/ListDataSetsRequest.h>
 #include <aws/m2/model/ListDataSetsResult.h>
+#include <aws/m2/model/ListDeploymentsPaginationTraits.h>
 #include <aws/m2/model/ListDeploymentsRequest.h>
 #include <aws/m2/model/ListDeploymentsResult.h>
+#include <aws/m2/model/ListEngineVersionsPaginationTraits.h>
 #include <aws/m2/model/ListEngineVersionsRequest.h>
 #include <aws/m2/model/ListEngineVersionsResult.h>
+#include <aws/m2/model/ListEnvironmentsPaginationTraits.h>
 #include <aws/m2/model/ListEnvironmentsRequest.h>
 #include <aws/m2/model/ListEnvironmentsResult.h>
 #include <aws/m2/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/machinelearning-gen-tests/MachineLearningIncludeTests.cpp b/generated/tests/machinelearning-gen-tests/MachineLearningIncludeTests.cpp
index afd6a8fd4530..e15192ea1731 100644
--- a/generated/tests/machinelearning-gen-tests/MachineLearningIncludeTests.cpp
+++ b/generated/tests/machinelearning-gen-tests/MachineLearningIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/machinelearning/MachineLearningClient.h>
+#include <aws/machinelearning/MachineLearningClientPagination.h>
 #include <aws/machinelearning/MachineLearningEndpointProvider.h>
 #include <aws/machinelearning/MachineLearningErrorMarshaller.h>
 #include <aws/machinelearning/MachineLearningErrors.h>
+#include <aws/machinelearning/MachineLearningPaginationBase.h>
 #include <aws/machinelearning/MachineLearningRequest.h>
 #include <aws/machinelearning/MachineLearningServiceClientModel.h>
+#include <aws/machinelearning/MachineLearningWaiter.h>
 #include <aws/machinelearning/MachineLearning_EXPORTS.h>
+#include <aws/machinelearning/internal/MachineLearningEndpointRules.h>
 #include <aws/machinelearning/model/AddTagsRequest.h>
 #include <aws/machinelearning/model/AddTagsResult.h>
 #include <aws/machinelearning/model/Algorithm.h>
@@ -46,12 +50,16 @@
 #include <aws/machinelearning/model/DeleteRealtimeEndpointResult.h>
 #include <aws/machinelearning/model/DeleteTagsRequest.h>
 #include <aws/machinelearning/model/DeleteTagsResult.h>
+#include <aws/machinelearning/model/DescribeBatchPredictionsPaginationTraits.h>
 #include <aws/machinelearning/model/DescribeBatchPredictionsRequest.h>
 #include <aws/machinelearning/model/DescribeBatchPredictionsResult.h>
+#include <aws/machinelearning/model/DescribeDataSourcesPaginationTraits.h>
 #include <aws/machinelearning/model/DescribeDataSourcesRequest.h>
 #include <aws/machinelearning/model/DescribeDataSourcesResult.h>
+#include <aws/machinelearning/model/DescribeEvaluationsPaginationTraits.h>
 #include <aws/machinelearning/model/DescribeEvaluationsRequest.h>
 #include <aws/machinelearning/model/DescribeEvaluationsResult.h>
+#include <aws/machinelearning/model/DescribeMLModelsPaginationTraits.h>
 #include <aws/machinelearning/model/DescribeMLModelsRequest.h>
 #include <aws/machinelearning/model/DescribeMLModelsResult.h>
 #include <aws/machinelearning/model/DescribeTagsRequest.h>
diff --git a/generated/tests/macie2-gen-tests/Macie2IncludeTests.cpp b/generated/tests/macie2-gen-tests/Macie2IncludeTests.cpp
index f5045bc9a74c..6d213134c18d 100644
--- a/generated/tests/macie2-gen-tests/Macie2IncludeTests.cpp
+++ b/generated/tests/macie2-gen-tests/Macie2IncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/macie2/Macie2Client.h>
+#include <aws/macie2/Macie2ClientPagination.h>
 #include <aws/macie2/Macie2EndpointProvider.h>
 #include <aws/macie2/Macie2ErrorMarshaller.h>
 #include <aws/macie2/Macie2Errors.h>
+#include <aws/macie2/Macie2PaginationBase.h>
 #include <aws/macie2/Macie2Request.h>
 #include <aws/macie2/Macie2ServiceClientModel.h>
+#include <aws/macie2/Macie2Waiter.h>
 #include <aws/macie2/Macie2_EXPORTS.h>
+#include <aws/macie2/internal/Macie2EndpointRules.h>
 #include <aws/macie2/model/AcceptInvitationRequest.h>
 #include <aws/macie2/model/AcceptInvitationResult.h>
 #include <aws/macie2/model/AccessControlList.h>
@@ -103,6 +107,7 @@
 #include <aws/macie2/model/DeleteInvitationsResult.h>
 #include <aws/macie2/model/DeleteMemberRequest.h>
 #include <aws/macie2/model/DeleteMemberResult.h>
+#include <aws/macie2/model/DescribeBucketsPaginationTraits.h>
 #include <aws/macie2/model/DescribeBucketsRequest.h>
 #include <aws/macie2/model/DescribeBucketsResult.h>
 #include <aws/macie2/model/DescribeClassificationJobRequest.h>
@@ -182,6 +187,7 @@
 #include <aws/macie2/model/GetSensitiveDataOccurrencesResult.h>
 #include <aws/macie2/model/GetSensitivityInspectionTemplateRequest.h>
 #include <aws/macie2/model/GetSensitivityInspectionTemplateResult.h>
+#include <aws/macie2/model/GetUsageStatisticsPaginationTraits.h>
 #include <aws/macie2/model/GetUsageStatisticsRequest.h>
 #include <aws/macie2/model/GetUsageStatisticsResult.h>
 #include <aws/macie2/model/GetUsageTotalsRequest.h>
@@ -208,20 +214,28 @@
 #include <aws/macie2/model/KeyValuePair.h>
 #include <aws/macie2/model/LastRunErrorStatus.h>
 #include <aws/macie2/model/LastRunErrorStatusCode.h>
+#include <aws/macie2/model/ListAllowListsPaginationTraits.h>
 #include <aws/macie2/model/ListAllowListsRequest.h>
 #include <aws/macie2/model/ListAllowListsResult.h>
+#include <aws/macie2/model/ListAutomatedDiscoveryAccountsPaginationTraits.h>
 #include <aws/macie2/model/ListAutomatedDiscoveryAccountsRequest.h>
 #include <aws/macie2/model/ListAutomatedDiscoveryAccountsResult.h>
+#include <aws/macie2/model/ListClassificationJobsPaginationTraits.h>
 #include <aws/macie2/model/ListClassificationJobsRequest.h>
 #include <aws/macie2/model/ListClassificationJobsResult.h>
+#include <aws/macie2/model/ListClassificationScopesPaginationTraits.h>
 #include <aws/macie2/model/ListClassificationScopesRequest.h>
 #include <aws/macie2/model/ListClassificationScopesResult.h>
+#include <aws/macie2/model/ListCustomDataIdentifiersPaginationTraits.h>
 #include <aws/macie2/model/ListCustomDataIdentifiersRequest.h>
 #include <aws/macie2/model/ListCustomDataIdentifiersResult.h>
+#include <aws/macie2/model/ListFindingsFiltersPaginationTraits.h>
 #include <aws/macie2/model/ListFindingsFiltersRequest.h>
 #include <aws/macie2/model/ListFindingsFiltersResult.h>
+#include <aws/macie2/model/ListFindingsPaginationTraits.h>
 #include <aws/macie2/model/ListFindingsRequest.h>
 #include <aws/macie2/model/ListFindingsResult.h>
+#include <aws/macie2/model/ListInvitationsPaginationTraits.h>
 #include <aws/macie2/model/ListInvitationsRequest.h>
 #include <aws/macie2/model/ListInvitationsResult.h>
 #include <aws/macie2/model/ListJobsFilterCriteria.h>
@@ -229,16 +243,22 @@
 #include <aws/macie2/model/ListJobsFilterTerm.h>
 #include <aws/macie2/model/ListJobsSortAttributeName.h>
 #include <aws/macie2/model/ListJobsSortCriteria.h>
+#include <aws/macie2/model/ListManagedDataIdentifiersPaginationTraits.h>
 #include <aws/macie2/model/ListManagedDataIdentifiersRequest.h>
 #include <aws/macie2/model/ListManagedDataIdentifiersResult.h>
+#include <aws/macie2/model/ListMembersPaginationTraits.h>
 #include <aws/macie2/model/ListMembersRequest.h>
 #include <aws/macie2/model/ListMembersResult.h>
+#include <aws/macie2/model/ListOrganizationAdminAccountsPaginationTraits.h>
 #include <aws/macie2/model/ListOrganizationAdminAccountsRequest.h>
 #include <aws/macie2/model/ListOrganizationAdminAccountsResult.h>
+#include <aws/macie2/model/ListResourceProfileArtifactsPaginationTraits.h>
 #include <aws/macie2/model/ListResourceProfileArtifactsRequest.h>
 #include <aws/macie2/model/ListResourceProfileArtifactsResult.h>
+#include <aws/macie2/model/ListResourceProfileDetectionsPaginationTraits.h>
 #include <aws/macie2/model/ListResourceProfileDetectionsRequest.h>
 #include <aws/macie2/model/ListResourceProfileDetectionsResult.h>
+#include <aws/macie2/model/ListSensitivityInspectionTemplatesPaginationTraits.h>
 #include <aws/macie2/model/ListSensitivityInspectionTemplatesRequest.h>
 #include <aws/macie2/model/ListSensitivityInspectionTemplatesResult.h>
 #include <aws/macie2/model/ListTagsForResourceRequest.h>
@@ -291,6 +311,7 @@
 #include <aws/macie2/model/SearchResourcesComparator.h>
 #include <aws/macie2/model/SearchResourcesCriteria.h>
 #include <aws/macie2/model/SearchResourcesCriteriaBlock.h>
+#include <aws/macie2/model/SearchResourcesPaginationTraits.h>
 #include <aws/macie2/model/SearchResourcesRequest.h>
 #include <aws/macie2/model/SearchResourcesResult.h>
 #include <aws/macie2/model/SearchResourcesSimpleCriterion.h>
diff --git a/generated/tests/mailmanager-gen-tests/MailManagerIncludeTests.cpp b/generated/tests/mailmanager-gen-tests/MailManagerIncludeTests.cpp
index ceeb2699c0e1..f0bd3dd9eb06 100644
--- a/generated/tests/mailmanager-gen-tests/MailManagerIncludeTests.cpp
+++ b/generated/tests/mailmanager-gen-tests/MailManagerIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/mailmanager/MailManagerClient.h>
+#include <aws/mailmanager/MailManagerClientPagination.h>
 #include <aws/mailmanager/MailManagerEndpointProvider.h>
 #include <aws/mailmanager/MailManagerErrorMarshaller.h>
 #include <aws/mailmanager/MailManagerErrors.h>
+#include <aws/mailmanager/MailManagerPaginationBase.h>
 #include <aws/mailmanager/MailManagerRequest.h>
 #include <aws/mailmanager/MailManagerServiceClientModel.h>
+#include <aws/mailmanager/MailManagerWaiter.h>
 #include <aws/mailmanager/MailManager_EXPORTS.h>
+#include <aws/mailmanager/internal/MailManagerEndpointRules.h>
 #include <aws/mailmanager/model/AcceptAction.h>
 #include <aws/mailmanager/model/ActionFailurePolicy.h>
 #include <aws/mailmanager/model/AddHeaderAction.h>
@@ -146,30 +150,42 @@
 #include <aws/mailmanager/model/InvokeLambdaAction.h>
 #include <aws/mailmanager/model/IpType.h>
 #include <aws/mailmanager/model/LambdaInvocationType.h>
+#include <aws/mailmanager/model/ListAddonInstancesPaginationTraits.h>
 #include <aws/mailmanager/model/ListAddonInstancesRequest.h>
 #include <aws/mailmanager/model/ListAddonInstancesResult.h>
+#include <aws/mailmanager/model/ListAddonSubscriptionsPaginationTraits.h>
 #include <aws/mailmanager/model/ListAddonSubscriptionsRequest.h>
 #include <aws/mailmanager/model/ListAddonSubscriptionsResult.h>
+#include <aws/mailmanager/model/ListAddressListImportJobsPaginationTraits.h>
 #include <aws/mailmanager/model/ListAddressListImportJobsRequest.h>
 #include <aws/mailmanager/model/ListAddressListImportJobsResult.h>
+#include <aws/mailmanager/model/ListAddressListsPaginationTraits.h>
 #include <aws/mailmanager/model/ListAddressListsRequest.h>
 #include <aws/mailmanager/model/ListAddressListsResult.h>
+#include <aws/mailmanager/model/ListArchiveExportsPaginationTraits.h>
 #include <aws/mailmanager/model/ListArchiveExportsRequest.h>
 #include <aws/mailmanager/model/ListArchiveExportsResult.h>
+#include <aws/mailmanager/model/ListArchiveSearchesPaginationTraits.h>
 #include <aws/mailmanager/model/ListArchiveSearchesRequest.h>
 #include <aws/mailmanager/model/ListArchiveSearchesResult.h>
+#include <aws/mailmanager/model/ListArchivesPaginationTraits.h>
 #include <aws/mailmanager/model/ListArchivesRequest.h>
 #include <aws/mailmanager/model/ListArchivesResult.h>
+#include <aws/mailmanager/model/ListIngressPointsPaginationTraits.h>
 #include <aws/mailmanager/model/ListIngressPointsRequest.h>
 #include <aws/mailmanager/model/ListIngressPointsResult.h>
+#include <aws/mailmanager/model/ListMembersOfAddressListPaginationTraits.h>
 #include <aws/mailmanager/model/ListMembersOfAddressListRequest.h>
 #include <aws/mailmanager/model/ListMembersOfAddressListResult.h>
+#include <aws/mailmanager/model/ListRelaysPaginationTraits.h>
 #include <aws/mailmanager/model/ListRelaysRequest.h>
 #include <aws/mailmanager/model/ListRelaysResult.h>
+#include <aws/mailmanager/model/ListRuleSetsPaginationTraits.h>
 #include <aws/mailmanager/model/ListRuleSetsRequest.h>
 #include <aws/mailmanager/model/ListRuleSetsResult.h>
 #include <aws/mailmanager/model/ListTagsForResourceRequest.h>
 #include <aws/mailmanager/model/ListTagsForResourceResult.h>
+#include <aws/mailmanager/model/ListTrafficPoliciesPaginationTraits.h>
 #include <aws/mailmanager/model/ListTrafficPoliciesRequest.h>
 #include <aws/mailmanager/model/ListTrafficPoliciesResult.h>
 #include <aws/mailmanager/model/MailFrom.h>
diff --git a/generated/tests/managedblockchain-gen-tests/ManagedBlockchainIncludeTests.cpp b/generated/tests/managedblockchain-gen-tests/ManagedBlockchainIncludeTests.cpp
index 46fce1cdb5c8..275a272fac2e 100644
--- a/generated/tests/managedblockchain-gen-tests/ManagedBlockchainIncludeTests.cpp
+++ b/generated/tests/managedblockchain-gen-tests/ManagedBlockchainIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/managedblockchain/ManagedBlockchainClient.h>
+#include <aws/managedblockchain/ManagedBlockchainClientPagination.h>
 #include <aws/managedblockchain/ManagedBlockchainEndpointProvider.h>
 #include <aws/managedblockchain/ManagedBlockchainErrorMarshaller.h>
 #include <aws/managedblockchain/ManagedBlockchainErrors.h>
+#include <aws/managedblockchain/ManagedBlockchainPaginationBase.h>
 #include <aws/managedblockchain/ManagedBlockchainRequest.h>
 #include <aws/managedblockchain/ManagedBlockchainServiceClientModel.h>
+#include <aws/managedblockchain/ManagedBlockchainWaiter.h>
 #include <aws/managedblockchain/ManagedBlockchain_EXPORTS.h>
+#include <aws/managedblockchain/internal/ManagedBlockchainEndpointRules.h>
 #include <aws/managedblockchain/model/Accessor.h>
 #include <aws/managedblockchain/model/AccessorNetworkType.h>
 #include <aws/managedblockchain/model/AccessorStatus.h>
@@ -50,18 +54,25 @@
 #include <aws/managedblockchain/model/Invitation.h>
 #include <aws/managedblockchain/model/InvitationStatus.h>
 #include <aws/managedblockchain/model/InviteAction.h>
+#include <aws/managedblockchain/model/ListAccessorsPaginationTraits.h>
 #include <aws/managedblockchain/model/ListAccessorsRequest.h>
 #include <aws/managedblockchain/model/ListAccessorsResult.h>
+#include <aws/managedblockchain/model/ListInvitationsPaginationTraits.h>
 #include <aws/managedblockchain/model/ListInvitationsRequest.h>
 #include <aws/managedblockchain/model/ListInvitationsResult.h>
+#include <aws/managedblockchain/model/ListMembersPaginationTraits.h>
 #include <aws/managedblockchain/model/ListMembersRequest.h>
 #include <aws/managedblockchain/model/ListMembersResult.h>
+#include <aws/managedblockchain/model/ListNetworksPaginationTraits.h>
 #include <aws/managedblockchain/model/ListNetworksRequest.h>
 #include <aws/managedblockchain/model/ListNetworksResult.h>
+#include <aws/managedblockchain/model/ListNodesPaginationTraits.h>
 #include <aws/managedblockchain/model/ListNodesRequest.h>
 #include <aws/managedblockchain/model/ListNodesResult.h>
+#include <aws/managedblockchain/model/ListProposalVotesPaginationTraits.h>
 #include <aws/managedblockchain/model/ListProposalVotesRequest.h>
 #include <aws/managedblockchain/model/ListProposalVotesResult.h>
+#include <aws/managedblockchain/model/ListProposalsPaginationTraits.h>
 #include <aws/managedblockchain/model/ListProposalsRequest.h>
 #include <aws/managedblockchain/model/ListProposalsResult.h>
 #include <aws/managedblockchain/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/managedblockchain-query-gen-tests/ManagedBlockchainQueryIncludeTests.cpp b/generated/tests/managedblockchain-query-gen-tests/ManagedBlockchainQueryIncludeTests.cpp
index 58e924da54ee..95053d7d5fcb 100644
--- a/generated/tests/managedblockchain-query-gen-tests/ManagedBlockchainQueryIncludeTests.cpp
+++ b/generated/tests/managedblockchain-query-gen-tests/ManagedBlockchainQueryIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/managedblockchain-query/ManagedBlockchainQueryClient.h>
+#include <aws/managedblockchain-query/ManagedBlockchainQueryClientPagination.h>
 #include <aws/managedblockchain-query/ManagedBlockchainQueryEndpointProvider.h>
 #include <aws/managedblockchain-query/ManagedBlockchainQueryErrorMarshaller.h>
 #include <aws/managedblockchain-query/ManagedBlockchainQueryErrors.h>
+#include <aws/managedblockchain-query/ManagedBlockchainQueryPaginationBase.h>
 #include <aws/managedblockchain-query/ManagedBlockchainQueryRequest.h>
 #include <aws/managedblockchain-query/ManagedBlockchainQueryServiceClientModel.h>
+#include <aws/managedblockchain-query/ManagedBlockchainQueryWaiter.h>
 #include <aws/managedblockchain-query/ManagedBlockchainQuery_EXPORTS.h>
+#include <aws/managedblockchain-query/internal/ManagedBlockchainQueryEndpointRules.h>
 #include <aws/managedblockchain-query/model/AddressIdentifierFilter.h>
 #include <aws/managedblockchain-query/model/AssetContract.h>
 #include <aws/managedblockchain-query/model/BatchGetTokenBalanceErrorItem.h>
@@ -35,16 +39,21 @@
 #include <aws/managedblockchain-query/model/GetTransactionRequest.h>
 #include <aws/managedblockchain-query/model/GetTransactionResult.h>
 #include <aws/managedblockchain-query/model/InternalServerException.h>
+#include <aws/managedblockchain-query/model/ListAssetContractsPaginationTraits.h>
 #include <aws/managedblockchain-query/model/ListAssetContractsRequest.h>
 #include <aws/managedblockchain-query/model/ListAssetContractsResult.h>
+#include <aws/managedblockchain-query/model/ListFilteredTransactionEventsPaginationTraits.h>
 #include <aws/managedblockchain-query/model/ListFilteredTransactionEventsRequest.h>
 #include <aws/managedblockchain-query/model/ListFilteredTransactionEventsResult.h>
 #include <aws/managedblockchain-query/model/ListFilteredTransactionEventsSort.h>
 #include <aws/managedblockchain-query/model/ListFilteredTransactionEventsSortBy.h>
+#include <aws/managedblockchain-query/model/ListTokenBalancesPaginationTraits.h>
 #include <aws/managedblockchain-query/model/ListTokenBalancesRequest.h>
 #include <aws/managedblockchain-query/model/ListTokenBalancesResult.h>
+#include <aws/managedblockchain-query/model/ListTransactionEventsPaginationTraits.h>
 #include <aws/managedblockchain-query/model/ListTransactionEventsRequest.h>
 #include <aws/managedblockchain-query/model/ListTransactionEventsResult.h>
+#include <aws/managedblockchain-query/model/ListTransactionsPaginationTraits.h>
 #include <aws/managedblockchain-query/model/ListTransactionsRequest.h>
 #include <aws/managedblockchain-query/model/ListTransactionsResult.h>
 #include <aws/managedblockchain-query/model/ListTransactionsSort.h>
diff --git a/generated/tests/marketplace-agreement-gen-tests/AgreementServiceIncludeTests.cpp b/generated/tests/marketplace-agreement-gen-tests/AgreementServiceIncludeTests.cpp
index b3b9a2085d39..6c64dc38539f 100644
--- a/generated/tests/marketplace-agreement-gen-tests/AgreementServiceIncludeTests.cpp
+++ b/generated/tests/marketplace-agreement-gen-tests/AgreementServiceIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/marketplace-agreement/AgreementServiceClient.h>
+#include <aws/marketplace-agreement/AgreementServiceClientPagination.h>
 #include <aws/marketplace-agreement/AgreementServiceEndpointProvider.h>
 #include <aws/marketplace-agreement/AgreementServiceErrorMarshaller.h>
 #include <aws/marketplace-agreement/AgreementServiceErrors.h>
+#include <aws/marketplace-agreement/AgreementServicePaginationBase.h>
 #include <aws/marketplace-agreement/AgreementServiceRequest.h>
 #include <aws/marketplace-agreement/AgreementServiceServiceClientModel.h>
+#include <aws/marketplace-agreement/AgreementServiceWaiter.h>
 #include <aws/marketplace-agreement/AgreementService_EXPORTS.h>
+#include <aws/marketplace-agreement/internal/AgreementServiceEndpointRules.h>
 #include <aws/marketplace-agreement/model/AcceptAgreementCancellationRequestRequest.h>
 #include <aws/marketplace-agreement/model/AcceptAgreementCancellationRequestResult.h>
 #include <aws/marketplace-agreement/model/AcceptAgreementPaymentRequestRequest.h>
@@ -70,10 +74,12 @@
 #include <aws/marketplace-agreement/model/FreeTrialPricingTerm.h>
 #include <aws/marketplace-agreement/model/GetAgreementCancellationRequestRequest.h>
 #include <aws/marketplace-agreement/model/GetAgreementCancellationRequestResult.h>
+#include <aws/marketplace-agreement/model/GetAgreementEntitlementsPaginationTraits.h>
 #include <aws/marketplace-agreement/model/GetAgreementEntitlementsRequest.h>
 #include <aws/marketplace-agreement/model/GetAgreementEntitlementsResult.h>
 #include <aws/marketplace-agreement/model/GetAgreementPaymentRequestRequest.h>
 #include <aws/marketplace-agreement/model/GetAgreementPaymentRequestResult.h>
+#include <aws/marketplace-agreement/model/GetAgreementTermsPaginationTraits.h>
 #include <aws/marketplace-agreement/model/GetAgreementTermsRequest.h>
 #include <aws/marketplace-agreement/model/GetAgreementTermsResult.h>
 #include <aws/marketplace-agreement/model/GetBillingAdjustmentRequestRequest.h>
@@ -87,14 +93,19 @@
 #include <aws/marketplace-agreement/model/ItemizedCharge.h>
 #include <aws/marketplace-agreement/model/LegalTerm.h>
 #include <aws/marketplace-agreement/model/LineItemGroupBy.h>
+#include <aws/marketplace-agreement/model/ListAgreementCancellationRequestsPaginationTraits.h>
 #include <aws/marketplace-agreement/model/ListAgreementCancellationRequestsRequest.h>
 #include <aws/marketplace-agreement/model/ListAgreementCancellationRequestsResult.h>
+#include <aws/marketplace-agreement/model/ListAgreementChargesPaginationTraits.h>
 #include <aws/marketplace-agreement/model/ListAgreementChargesRequest.h>
 #include <aws/marketplace-agreement/model/ListAgreementChargesResult.h>
+#include <aws/marketplace-agreement/model/ListAgreementInvoiceLineItemsPaginationTraits.h>
 #include <aws/marketplace-agreement/model/ListAgreementInvoiceLineItemsRequest.h>
 #include <aws/marketplace-agreement/model/ListAgreementInvoiceLineItemsResult.h>
+#include <aws/marketplace-agreement/model/ListAgreementPaymentRequestsPaginationTraits.h>
 #include <aws/marketplace-agreement/model/ListAgreementPaymentRequestsRequest.h>
 #include <aws/marketplace-agreement/model/ListAgreementPaymentRequestsResult.h>
+#include <aws/marketplace-agreement/model/ListBillingAdjustmentRequestsPaginationTraits.h>
 #include <aws/marketplace-agreement/model/ListBillingAdjustmentRequestsRequest.h>
 #include <aws/marketplace-agreement/model/ListBillingAdjustmentRequestsResult.h>
 #include <aws/marketplace-agreement/model/NetPaymentTerm.h>
@@ -120,6 +131,7 @@
 #include <aws/marketplace-agreement/model/ResourceNotFoundException.h>
 #include <aws/marketplace-agreement/model/ResourceType.h>
 #include <aws/marketplace-agreement/model/ScheduleItem.h>
+#include <aws/marketplace-agreement/model/SearchAgreementsPaginationTraits.h>
 #include <aws/marketplace-agreement/model/SearchAgreementsRequest.h>
 #include <aws/marketplace-agreement/model/SearchAgreementsResult.h>
 #include <aws/marketplace-agreement/model/Selector.h>
diff --git a/generated/tests/marketplace-catalog-gen-tests/MarketplaceCatalogIncludeTests.cpp b/generated/tests/marketplace-catalog-gen-tests/MarketplaceCatalogIncludeTests.cpp
index 12e53e3c0be8..7c45e338933d 100644
--- a/generated/tests/marketplace-catalog-gen-tests/MarketplaceCatalogIncludeTests.cpp
+++ b/generated/tests/marketplace-catalog-gen-tests/MarketplaceCatalogIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/marketplace-catalog/MarketplaceCatalogClient.h>
+#include <aws/marketplace-catalog/MarketplaceCatalogClientPagination.h>
 #include <aws/marketplace-catalog/MarketplaceCatalogEndpointProvider.h>
 #include <aws/marketplace-catalog/MarketplaceCatalogErrorMarshaller.h>
 #include <aws/marketplace-catalog/MarketplaceCatalogErrors.h>
+#include <aws/marketplace-catalog/MarketplaceCatalogPaginationBase.h>
 #include <aws/marketplace-catalog/MarketplaceCatalogRequest.h>
 #include <aws/marketplace-catalog/MarketplaceCatalogServiceClientModel.h>
+#include <aws/marketplace-catalog/MarketplaceCatalogWaiter.h>
 #include <aws/marketplace-catalog/MarketplaceCatalog_EXPORTS.h>
+#include <aws/marketplace-catalog/internal/MarketplaceCatalogEndpointRules.h>
 #include <aws/marketplace-catalog/model/AmiProductEntityIdFilter.h>
 #include <aws/marketplace-catalog/model/AmiProductFilters.h>
 #include <aws/marketplace-catalog/model/AmiProductLastModifiedDateFilter.h>
@@ -70,8 +74,10 @@
 #include <aws/marketplace-catalog/model/GetResourcePolicyRequest.h>
 #include <aws/marketplace-catalog/model/GetResourcePolicyResult.h>
 #include <aws/marketplace-catalog/model/Intent.h>
+#include <aws/marketplace-catalog/model/ListChangeSetsPaginationTraits.h>
 #include <aws/marketplace-catalog/model/ListChangeSetsRequest.h>
 #include <aws/marketplace-catalog/model/ListChangeSetsResult.h>
+#include <aws/marketplace-catalog/model/ListEntitiesPaginationTraits.h>
 #include <aws/marketplace-catalog/model/ListEntitiesRequest.h>
 #include <aws/marketplace-catalog/model/ListEntitiesResult.h>
 #include <aws/marketplace-catalog/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/marketplace-deployment-gen-tests/MarketplaceDeploymentIncludeTests.cpp b/generated/tests/marketplace-deployment-gen-tests/MarketplaceDeploymentIncludeTests.cpp
index f6d3c07ce3ac..598aeecb8b6f 100644
--- a/generated/tests/marketplace-deployment-gen-tests/MarketplaceDeploymentIncludeTests.cpp
+++ b/generated/tests/marketplace-deployment-gen-tests/MarketplaceDeploymentIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/marketplace-deployment/MarketplaceDeploymentEndpointProvider.h>
 #include <aws/marketplace-deployment/MarketplaceDeploymentErrorMarshaller.h>
 #include <aws/marketplace-deployment/MarketplaceDeploymentErrors.h>
+#include <aws/marketplace-deployment/MarketplaceDeploymentPaginationBase.h>
 #include <aws/marketplace-deployment/MarketplaceDeploymentRequest.h>
 #include <aws/marketplace-deployment/MarketplaceDeploymentServiceClientModel.h>
+#include <aws/marketplace-deployment/MarketplaceDeploymentWaiter.h>
 #include <aws/marketplace-deployment/MarketplaceDeployment_EXPORTS.h>
+#include <aws/marketplace-deployment/internal/MarketplaceDeploymentEndpointRules.h>
 #include <aws/marketplace-deployment/model/ConflictException.h>
 #include <aws/marketplace-deployment/model/DeploymentParameterInput.h>
 #include <aws/marketplace-deployment/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/marketplace-discovery-gen-tests/MarketplaceDiscoveryIncludeTests.cpp b/generated/tests/marketplace-discovery-gen-tests/MarketplaceDiscoveryIncludeTests.cpp
index 514c755fb713..674a0732e551 100644
--- a/generated/tests/marketplace-discovery-gen-tests/MarketplaceDiscoveryIncludeTests.cpp
+++ b/generated/tests/marketplace-discovery-gen-tests/MarketplaceDiscoveryIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/marketplace-discovery/MarketplaceDiscoveryClient.h>
+#include <aws/marketplace-discovery/MarketplaceDiscoveryClientPagination.h>
 #include <aws/marketplace-discovery/MarketplaceDiscoveryEndpointProvider.h>
 #include <aws/marketplace-discovery/MarketplaceDiscoveryErrorMarshaller.h>
 #include <aws/marketplace-discovery/MarketplaceDiscoveryErrors.h>
+#include <aws/marketplace-discovery/MarketplaceDiscoveryPaginationBase.h>
 #include <aws/marketplace-discovery/MarketplaceDiscoveryRequest.h>
 #include <aws/marketplace-discovery/MarketplaceDiscoveryServiceClientModel.h>
+#include <aws/marketplace-discovery/MarketplaceDiscoveryWaiter.h>
 #include <aws/marketplace-discovery/MarketplaceDiscovery_EXPORTS.h>
+#include <aws/marketplace-discovery/internal/MarketplaceDiscoveryEndpointRules.h>
 #include <aws/marketplace-discovery/model/AmazonMachineImageFulfillmentOption.h>
 #include <aws/marketplace-discovery/model/AmazonMachineImageOperatingSystem.h>
 #include <aws/marketplace-discovery/model/AmazonMachineImageRecommendation.h>
@@ -47,6 +51,7 @@
 #include <aws/marketplace-discovery/model/GetOfferResult.h>
 #include <aws/marketplace-discovery/model/GetOfferSetRequest.h>
 #include <aws/marketplace-discovery/model/GetOfferSetResult.h>
+#include <aws/marketplace-discovery/model/GetOfferTermsPaginationTraits.h>
 #include <aws/marketplace-discovery/model/GetOfferTermsRequest.h>
 #include <aws/marketplace-discovery/model/GetOfferTermsResult.h>
 #include <aws/marketplace-discovery/model/GetProductRequest.h>
@@ -56,8 +61,10 @@
 #include <aws/marketplace-discovery/model/HelmOperatingSystem.h>
 #include <aws/marketplace-discovery/model/LegalDocumentType.h>
 #include <aws/marketplace-discovery/model/LegalTerm.h>
+#include <aws/marketplace-discovery/model/ListFulfillmentOptionsPaginationTraits.h>
 #include <aws/marketplace-discovery/model/ListFulfillmentOptionsRequest.h>
 #include <aws/marketplace-discovery/model/ListFulfillmentOptionsResult.h>
+#include <aws/marketplace-discovery/model/ListPurchaseOptionsPaginationTraits.h>
 #include <aws/marketplace-discovery/model/ListPurchaseOptionsRequest.h>
 #include <aws/marketplace-discovery/model/ListPurchaseOptionsResult.h>
 #include <aws/marketplace-discovery/model/ListingAssociatedEntity.h>
@@ -106,10 +113,12 @@
 #include <aws/marketplace-discovery/model/SageMakerModelRecommendation.h>
 #include <aws/marketplace-discovery/model/ScheduleItem.h>
 #include <aws/marketplace-discovery/model/SearchFacetType.h>
+#include <aws/marketplace-discovery/model/SearchFacetsPaginationTraits.h>
 #include <aws/marketplace-discovery/model/SearchFacetsRequest.h>
 #include <aws/marketplace-discovery/model/SearchFacetsResult.h>
 #include <aws/marketplace-discovery/model/SearchFilter.h>
 #include <aws/marketplace-discovery/model/SearchFilterType.h>
+#include <aws/marketplace-discovery/model/SearchListingsPaginationTraits.h>
 #include <aws/marketplace-discovery/model/SearchListingsRequest.h>
 #include <aws/marketplace-discovery/model/SearchListingsResult.h>
 #include <aws/marketplace-discovery/model/SearchListingsSortBy.h>
diff --git a/generated/tests/marketplace-entitlement-gen-tests/MarketplaceEntitlementServiceIncludeTests.cpp b/generated/tests/marketplace-entitlement-gen-tests/MarketplaceEntitlementServiceIncludeTests.cpp
index a9902953683a..3003451f2add 100644
--- a/generated/tests/marketplace-entitlement-gen-tests/MarketplaceEntitlementServiceIncludeTests.cpp
+++ b/generated/tests/marketplace-entitlement-gen-tests/MarketplaceEntitlementServiceIncludeTests.cpp
@@ -7,15 +7,20 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/marketplace-entitlement/MarketplaceEntitlementServiceClient.h>
+#include <aws/marketplace-entitlement/MarketplaceEntitlementServiceClientPagination.h>
 #include <aws/marketplace-entitlement/MarketplaceEntitlementServiceEndpointProvider.h>
 #include <aws/marketplace-entitlement/MarketplaceEntitlementServiceErrorMarshaller.h>
 #include <aws/marketplace-entitlement/MarketplaceEntitlementServiceErrors.h>
+#include <aws/marketplace-entitlement/MarketplaceEntitlementServicePaginationBase.h>
 #include <aws/marketplace-entitlement/MarketplaceEntitlementServiceRequest.h>
 #include <aws/marketplace-entitlement/MarketplaceEntitlementServiceServiceClientModel.h>
+#include <aws/marketplace-entitlement/MarketplaceEntitlementServiceWaiter.h>
 #include <aws/marketplace-entitlement/MarketplaceEntitlementService_EXPORTS.h>
+#include <aws/marketplace-entitlement/internal/MarketplaceEntitlementServiceEndpointRules.h>
 #include <aws/marketplace-entitlement/model/Entitlement.h>
 #include <aws/marketplace-entitlement/model/EntitlementValue.h>
 #include <aws/marketplace-entitlement/model/GetEntitlementFilterName.h>
+#include <aws/marketplace-entitlement/model/GetEntitlementsPaginationTraits.h>
 #include <aws/marketplace-entitlement/model/GetEntitlementsRequest.h>
 #include <aws/marketplace-entitlement/model/GetEntitlementsResult.h>
 
diff --git a/generated/tests/marketplace-reporting-gen-tests/MarketplaceReportingIncludeTests.cpp b/generated/tests/marketplace-reporting-gen-tests/MarketplaceReportingIncludeTests.cpp
index 76da2931f6b9..1ecc6365207f 100644
--- a/generated/tests/marketplace-reporting-gen-tests/MarketplaceReportingIncludeTests.cpp
+++ b/generated/tests/marketplace-reporting-gen-tests/MarketplaceReportingIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/marketplace-reporting/MarketplaceReportingEndpointProvider.h>
 #include <aws/marketplace-reporting/MarketplaceReportingErrorMarshaller.h>
 #include <aws/marketplace-reporting/MarketplaceReportingErrors.h>
+#include <aws/marketplace-reporting/MarketplaceReportingPaginationBase.h>
 #include <aws/marketplace-reporting/MarketplaceReportingRequest.h>
 #include <aws/marketplace-reporting/MarketplaceReportingServiceClientModel.h>
+#include <aws/marketplace-reporting/MarketplaceReportingWaiter.h>
 #include <aws/marketplace-reporting/MarketplaceReporting_EXPORTS.h>
+#include <aws/marketplace-reporting/internal/MarketplaceReportingEndpointRules.h>
 #include <aws/marketplace-reporting/model/GetBuyerDashboardRequest.h>
 #include <aws/marketplace-reporting/model/GetBuyerDashboardResult.h>
 
diff --git a/generated/tests/marketplacecommerceanalytics-gen-tests/MarketplaceCommerceAnalyticsIncludeTests.cpp b/generated/tests/marketplacecommerceanalytics-gen-tests/MarketplaceCommerceAnalyticsIncludeTests.cpp
index 4ea892979e6a..58294c2a8ef7 100644
--- a/generated/tests/marketplacecommerceanalytics-gen-tests/MarketplaceCommerceAnalyticsIncludeTests.cpp
+++ b/generated/tests/marketplacecommerceanalytics-gen-tests/MarketplaceCommerceAnalyticsIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/marketplacecommerceanalytics/MarketplaceCommerceAnalyticsEndpointProvider.h>
 #include <aws/marketplacecommerceanalytics/MarketplaceCommerceAnalyticsErrorMarshaller.h>
 #include <aws/marketplacecommerceanalytics/MarketplaceCommerceAnalyticsErrors.h>
+#include <aws/marketplacecommerceanalytics/MarketplaceCommerceAnalyticsPaginationBase.h>
 #include <aws/marketplacecommerceanalytics/MarketplaceCommerceAnalyticsRequest.h>
 #include <aws/marketplacecommerceanalytics/MarketplaceCommerceAnalyticsServiceClientModel.h>
+#include <aws/marketplacecommerceanalytics/MarketplaceCommerceAnalyticsWaiter.h>
 #include <aws/marketplacecommerceanalytics/MarketplaceCommerceAnalytics_EXPORTS.h>
+#include <aws/marketplacecommerceanalytics/internal/MarketplaceCommerceAnalyticsEndpointRules.h>
 #include <aws/marketplacecommerceanalytics/model/DataSetType.h>
 #include <aws/marketplacecommerceanalytics/model/GenerateDataSetRequest.h>
 #include <aws/marketplacecommerceanalytics/model/GenerateDataSetResult.h>
diff --git a/generated/tests/mediaconnect-gen-tests/MediaConnectIncludeTests.cpp b/generated/tests/mediaconnect-gen-tests/MediaConnectIncludeTests.cpp
index 6b77e2572f2c..dfbdc835c787 100644
--- a/generated/tests/mediaconnect-gen-tests/MediaConnectIncludeTests.cpp
+++ b/generated/tests/mediaconnect-gen-tests/MediaConnectIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/mediaconnect/MediaConnectClient.h>
+#include <aws/mediaconnect/MediaConnectClientPagination.h>
 #include <aws/mediaconnect/MediaConnectEndpointProvider.h>
 #include <aws/mediaconnect/MediaConnectErrorMarshaller.h>
 #include <aws/mediaconnect/MediaConnectErrors.h>
+#include <aws/mediaconnect/MediaConnectPaginationBase.h>
 #include <aws/mediaconnect/MediaConnectRequest.h>
 #include <aws/mediaconnect/MediaConnectServiceClientModel.h>
+#include <aws/mediaconnect/MediaConnectWaiter.h>
 #include <aws/mediaconnect/MediaConnect_EXPORTS.h>
+#include <aws/mediaconnect/internal/MediaConnectEndpointRules.h>
 #include <aws/mediaconnect/model/AddBridgeFlowSourceRequest.h>
 #include <aws/mediaconnect/model/AddBridgeNetworkOutputRequest.h>
 #include <aws/mediaconnect/model/AddBridgeNetworkSourceRequest.h>
@@ -165,24 +169,34 @@
 #include <aws/mediaconnect/model/Interface.h>
 #include <aws/mediaconnect/model/InterfaceRequest.h>
 #include <aws/mediaconnect/model/KeyType.h>
+#include <aws/mediaconnect/model/ListBridgesPaginationTraits.h>
 #include <aws/mediaconnect/model/ListBridgesRequest.h>
 #include <aws/mediaconnect/model/ListBridgesResult.h>
+#include <aws/mediaconnect/model/ListEntitlementsPaginationTraits.h>
 #include <aws/mediaconnect/model/ListEntitlementsRequest.h>
 #include <aws/mediaconnect/model/ListEntitlementsResult.h>
+#include <aws/mediaconnect/model/ListFlowsPaginationTraits.h>
 #include <aws/mediaconnect/model/ListFlowsRequest.h>
 #include <aws/mediaconnect/model/ListFlowsResult.h>
+#include <aws/mediaconnect/model/ListGatewayInstancesPaginationTraits.h>
 #include <aws/mediaconnect/model/ListGatewayInstancesRequest.h>
 #include <aws/mediaconnect/model/ListGatewayInstancesResult.h>
+#include <aws/mediaconnect/model/ListGatewaysPaginationTraits.h>
 #include <aws/mediaconnect/model/ListGatewaysRequest.h>
 #include <aws/mediaconnect/model/ListGatewaysResult.h>
+#include <aws/mediaconnect/model/ListOfferingsPaginationTraits.h>
 #include <aws/mediaconnect/model/ListOfferingsRequest.h>
 #include <aws/mediaconnect/model/ListOfferingsResult.h>
+#include <aws/mediaconnect/model/ListReservationsPaginationTraits.h>
 #include <aws/mediaconnect/model/ListReservationsRequest.h>
 #include <aws/mediaconnect/model/ListReservationsResult.h>
+#include <aws/mediaconnect/model/ListRouterInputsPaginationTraits.h>
 #include <aws/mediaconnect/model/ListRouterInputsRequest.h>
 #include <aws/mediaconnect/model/ListRouterInputsResult.h>
+#include <aws/mediaconnect/model/ListRouterNetworkInterfacesPaginationTraits.h>
 #include <aws/mediaconnect/model/ListRouterNetworkInterfacesRequest.h>
 #include <aws/mediaconnect/model/ListRouterNetworkInterfacesResult.h>
+#include <aws/mediaconnect/model/ListRouterOutputsPaginationTraits.h>
 #include <aws/mediaconnect/model/ListRouterOutputsRequest.h>
 #include <aws/mediaconnect/model/ListRouterOutputsResult.h>
 #include <aws/mediaconnect/model/ListTagsForGlobalResourceRequest.h>
diff --git a/generated/tests/mediaconvert-gen-tests/MediaConvertIncludeTests.cpp b/generated/tests/mediaconvert-gen-tests/MediaConvertIncludeTests.cpp
index 97fe3c73fff7..1ba94a8f9caf 100644
--- a/generated/tests/mediaconvert-gen-tests/MediaConvertIncludeTests.cpp
+++ b/generated/tests/mediaconvert-gen-tests/MediaConvertIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/mediaconvert/MediaConvertClient.h>
+#include <aws/mediaconvert/MediaConvertClientPagination.h>
 #include <aws/mediaconvert/MediaConvertEndpointProvider.h>
 #include <aws/mediaconvert/MediaConvertErrorMarshaller.h>
 #include <aws/mediaconvert/MediaConvertErrors.h>
+#include <aws/mediaconvert/MediaConvertPaginationBase.h>
 #include <aws/mediaconvert/MediaConvertRequest.h>
 #include <aws/mediaconvert/MediaConvertServiceClientModel.h>
+#include <aws/mediaconvert/MediaConvertWaiter.h>
 #include <aws/mediaconvert/MediaConvert_EXPORTS.h>
+#include <aws/mediaconvert/internal/MediaConvertEndpointRules.h>
 #include <aws/mediaconvert/model/AacAudioDescriptionBroadcasterMix.h>
 #include <aws/mediaconvert/model/AacCodecProfile.h>
 #include <aws/mediaconvert/model/AacCodingMode.h>
@@ -456,16 +460,21 @@
 #include <aws/mediaconvert/model/JobsQueryStatus.h>
 #include <aws/mediaconvert/model/KantarWatermarkSettings.h>
 #include <aws/mediaconvert/model/LanguageCode.h>
+#include <aws/mediaconvert/model/ListJobTemplatesPaginationTraits.h>
 #include <aws/mediaconvert/model/ListJobTemplatesRequest.h>
 #include <aws/mediaconvert/model/ListJobTemplatesResult.h>
+#include <aws/mediaconvert/model/ListJobsPaginationTraits.h>
 #include <aws/mediaconvert/model/ListJobsRequest.h>
 #include <aws/mediaconvert/model/ListJobsResult.h>
+#include <aws/mediaconvert/model/ListPresetsPaginationTraits.h>
 #include <aws/mediaconvert/model/ListPresetsRequest.h>
 #include <aws/mediaconvert/model/ListPresetsResult.h>
+#include <aws/mediaconvert/model/ListQueuesPaginationTraits.h>
 #include <aws/mediaconvert/model/ListQueuesRequest.h>
 #include <aws/mediaconvert/model/ListQueuesResult.h>
 #include <aws/mediaconvert/model/ListTagsForResourceRequest.h>
 #include <aws/mediaconvert/model/ListTagsForResourceResult.h>
+#include <aws/mediaconvert/model/ListVersionsPaginationTraits.h>
 #include <aws/mediaconvert/model/ListVersionsRequest.h>
 #include <aws/mediaconvert/model/ListVersionsResult.h>
 #include <aws/mediaconvert/model/M2tsAudioBufferModel.h>
@@ -637,6 +646,7 @@
 #include <aws/mediaconvert/model/ScalingBehavior.h>
 #include <aws/mediaconvert/model/SccDestinationFramerate.h>
 #include <aws/mediaconvert/model/SccDestinationSettings.h>
+#include <aws/mediaconvert/model/SearchJobsPaginationTraits.h>
 #include <aws/mediaconvert/model/SearchJobsRequest.h>
 #include <aws/mediaconvert/model/SearchJobsResult.h>
 #include <aws/mediaconvert/model/ServiceOverride.h>
diff --git a/generated/tests/medialive-gen-tests/MediaLiveIncludeTests.cpp b/generated/tests/medialive-gen-tests/MediaLiveIncludeTests.cpp
index 7100543f9adc..e1ebb33ba8a4 100644
--- a/generated/tests/medialive-gen-tests/MediaLiveIncludeTests.cpp
+++ b/generated/tests/medialive-gen-tests/MediaLiveIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/medialive/MediaLiveClient.h>
+#include <aws/medialive/MediaLiveClientPagination.h>
 #include <aws/medialive/MediaLiveEndpointProvider.h>
 #include <aws/medialive/MediaLiveErrorMarshaller.h>
 #include <aws/medialive/MediaLiveErrors.h>
+#include <aws/medialive/MediaLivePaginationBase.h>
 #include <aws/medialive/MediaLiveRequest.h>
 #include <aws/medialive/MediaLiveServiceClientModel.h>
+#include <aws/medialive/MediaLiveWaiter.h>
 #include <aws/medialive/MediaLive_EXPORTS.h>
+#include <aws/medialive/internal/MediaLiveEndpointRules.h>
 #include <aws/medialive/model/AacCodingMode.h>
 #include <aws/medialive/model/AacInputType.h>
 #include <aws/medialive/model/AacProfile.h>
@@ -273,6 +277,7 @@
 #include <aws/medialive/model/DescribePrimaryChannelSettings.h>
 #include <aws/medialive/model/DescribeReservationRequest.h>
 #include <aws/medialive/model/DescribeReservationResult.h>
+#include <aws/medialive/model/DescribeSchedulePaginationTraits.h>
 #include <aws/medialive/model/DescribeScheduleRequest.h>
 #include <aws/medialive/model/DescribeScheduleResult.h>
 #include <aws/medialive/model/DescribeSdiSourceRequest.h>
@@ -542,48 +547,70 @@
 #include <aws/medialive/model/LastFrameClippingBehavior.h>
 #include <aws/medialive/model/LinkedChannelSettings.h>
 #include <aws/medialive/model/LinkedChannelType.h>
+#include <aws/medialive/model/ListAlertsPaginationTraits.h>
 #include <aws/medialive/model/ListAlertsRequest.h>
 #include <aws/medialive/model/ListAlertsResult.h>
+#include <aws/medialive/model/ListChannelPlacementGroupsPaginationTraits.h>
 #include <aws/medialive/model/ListChannelPlacementGroupsRequest.h>
 #include <aws/medialive/model/ListChannelPlacementGroupsSdkResult.h>
+#include <aws/medialive/model/ListChannelsPaginationTraits.h>
 #include <aws/medialive/model/ListChannelsRequest.h>
 #include <aws/medialive/model/ListChannelsResult.h>
+#include <aws/medialive/model/ListCloudWatchAlarmTemplateGroupsPaginationTraits.h>
 #include <aws/medialive/model/ListCloudWatchAlarmTemplateGroupsRequest.h>
 #include <aws/medialive/model/ListCloudWatchAlarmTemplateGroupsResult.h>
+#include <aws/medialive/model/ListCloudWatchAlarmTemplatesPaginationTraits.h>
 #include <aws/medialive/model/ListCloudWatchAlarmTemplatesRequest.h>
 #include <aws/medialive/model/ListCloudWatchAlarmTemplatesResult.h>
+#include <aws/medialive/model/ListClusterAlertsPaginationTraits.h>
 #include <aws/medialive/model/ListClusterAlertsRequest.h>
 #include <aws/medialive/model/ListClusterAlertsResult.h>
+#include <aws/medialive/model/ListClustersPaginationTraits.h>
 #include <aws/medialive/model/ListClustersRequest.h>
 #include <aws/medialive/model/ListClustersSdkResult.h>
+#include <aws/medialive/model/ListEventBridgeRuleTemplateGroupsPaginationTraits.h>
 #include <aws/medialive/model/ListEventBridgeRuleTemplateGroupsRequest.h>
 #include <aws/medialive/model/ListEventBridgeRuleTemplateGroupsResult.h>
+#include <aws/medialive/model/ListEventBridgeRuleTemplatesPaginationTraits.h>
 #include <aws/medialive/model/ListEventBridgeRuleTemplatesRequest.h>
 #include <aws/medialive/model/ListEventBridgeRuleTemplatesResult.h>
+#include <aws/medialive/model/ListInputDeviceTransfersPaginationTraits.h>
 #include <aws/medialive/model/ListInputDeviceTransfersRequest.h>
 #include <aws/medialive/model/ListInputDeviceTransfersResult.h>
+#include <aws/medialive/model/ListInputDevicesPaginationTraits.h>
 #include <aws/medialive/model/ListInputDevicesRequest.h>
 #include <aws/medialive/model/ListInputDevicesResult.h>
+#include <aws/medialive/model/ListInputSecurityGroupsPaginationTraits.h>
 #include <aws/medialive/model/ListInputSecurityGroupsRequest.h>
 #include <aws/medialive/model/ListInputSecurityGroupsResult.h>
+#include <aws/medialive/model/ListInputsPaginationTraits.h>
 #include <aws/medialive/model/ListInputsRequest.h>
 #include <aws/medialive/model/ListInputsResult.h>
+#include <aws/medialive/model/ListMultiplexAlertsPaginationTraits.h>
 #include <aws/medialive/model/ListMultiplexAlertsRequest.h>
 #include <aws/medialive/model/ListMultiplexAlertsResult.h>
+#include <aws/medialive/model/ListMultiplexProgramsPaginationTraits.h>
 #include <aws/medialive/model/ListMultiplexProgramsRequest.h>
 #include <aws/medialive/model/ListMultiplexProgramsResult.h>
+#include <aws/medialive/model/ListMultiplexesPaginationTraits.h>
 #include <aws/medialive/model/ListMultiplexesRequest.h>
 #include <aws/medialive/model/ListMultiplexesResult.h>
+#include <aws/medialive/model/ListNetworksPaginationTraits.h>
 #include <aws/medialive/model/ListNetworksRequest.h>
 #include <aws/medialive/model/ListNetworksSdkResult.h>
+#include <aws/medialive/model/ListNodesPaginationTraits.h>
 #include <aws/medialive/model/ListNodesRequest.h>
 #include <aws/medialive/model/ListNodesSdkResult.h>
+#include <aws/medialive/model/ListOfferingsPaginationTraits.h>
 #include <aws/medialive/model/ListOfferingsRequest.h>
 #include <aws/medialive/model/ListOfferingsResult.h>
+#include <aws/medialive/model/ListReservationsPaginationTraits.h>
 #include <aws/medialive/model/ListReservationsRequest.h>
 #include <aws/medialive/model/ListReservationsResult.h>
+#include <aws/medialive/model/ListSdiSourcesPaginationTraits.h>
 #include <aws/medialive/model/ListSdiSourcesRequest.h>
 #include <aws/medialive/model/ListSdiSourcesResult.h>
+#include <aws/medialive/model/ListSignalMapsPaginationTraits.h>
 #include <aws/medialive/model/ListSignalMapsRequest.h>
 #include <aws/medialive/model/ListSignalMapsResult.h>
 #include <aws/medialive/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/mediapackage-gen-tests/MediaPackageIncludeTests.cpp b/generated/tests/mediapackage-gen-tests/MediaPackageIncludeTests.cpp
index 6d82238e8917..966bc3b64398 100644
--- a/generated/tests/mediapackage-gen-tests/MediaPackageIncludeTests.cpp
+++ b/generated/tests/mediapackage-gen-tests/MediaPackageIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/mediapackage/MediaPackageClient.h>
+#include <aws/mediapackage/MediaPackageClientPagination.h>
 #include <aws/mediapackage/MediaPackageEndpointProvider.h>
 #include <aws/mediapackage/MediaPackageErrorMarshaller.h>
 #include <aws/mediapackage/MediaPackageErrors.h>
+#include <aws/mediapackage/MediaPackagePaginationBase.h>
 #include <aws/mediapackage/MediaPackageRequest.h>
 #include <aws/mediapackage/MediaPackageServiceClientModel.h>
+#include <aws/mediapackage/MediaPackageWaiter.h>
 #include <aws/mediapackage/MediaPackage_EXPORTS.h>
+#include <aws/mediapackage/internal/MediaPackageEndpointRules.h>
 #include <aws/mediapackage/model/AdMarkers.h>
 #include <aws/mediapackage/model/AdsOnDeliveryRestrictions.h>
 #include <aws/mediapackage/model/Authorization.h>
@@ -52,10 +56,13 @@
 #include <aws/mediapackage/model/HlsPackage.h>
 #include <aws/mediapackage/model/IngestEndpoint.h>
 #include <aws/mediapackage/model/IngressAccessLogs.h>
+#include <aws/mediapackage/model/ListChannelsPaginationTraits.h>
 #include <aws/mediapackage/model/ListChannelsRequest.h>
 #include <aws/mediapackage/model/ListChannelsResult.h>
+#include <aws/mediapackage/model/ListHarvestJobsPaginationTraits.h>
 #include <aws/mediapackage/model/ListHarvestJobsRequest.h>
 #include <aws/mediapackage/model/ListHarvestJobsResult.h>
+#include <aws/mediapackage/model/ListOriginEndpointsPaginationTraits.h>
 #include <aws/mediapackage/model/ListOriginEndpointsRequest.h>
 #include <aws/mediapackage/model/ListOriginEndpointsResult.h>
 #include <aws/mediapackage/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/mediapackage-vod-gen-tests/MediaPackageVodIncludeTests.cpp b/generated/tests/mediapackage-vod-gen-tests/MediaPackageVodIncludeTests.cpp
index a06faf5bb2d4..6d8d14b27e77 100644
--- a/generated/tests/mediapackage-vod-gen-tests/MediaPackageVodIncludeTests.cpp
+++ b/generated/tests/mediapackage-vod-gen-tests/MediaPackageVodIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/mediapackage-vod/MediaPackageVodClient.h>
+#include <aws/mediapackage-vod/MediaPackageVodClientPagination.h>
 #include <aws/mediapackage-vod/MediaPackageVodEndpointProvider.h>
 #include <aws/mediapackage-vod/MediaPackageVodErrorMarshaller.h>
 #include <aws/mediapackage-vod/MediaPackageVodErrors.h>
+#include <aws/mediapackage-vod/MediaPackageVodPaginationBase.h>
 #include <aws/mediapackage-vod/MediaPackageVodRequest.h>
 #include <aws/mediapackage-vod/MediaPackageVodServiceClientModel.h>
+#include <aws/mediapackage-vod/MediaPackageVodWaiter.h>
 #include <aws/mediapackage-vod/MediaPackageVod_EXPORTS.h>
+#include <aws/mediapackage-vod/internal/MediaPackageVodEndpointRules.h>
 #include <aws/mediapackage-vod/model/AdMarkers.h>
 #include <aws/mediapackage-vod/model/AssetShallow.h>
 #include <aws/mediapackage-vod/model/Authorization.h>
@@ -48,10 +52,13 @@
 #include <aws/mediapackage-vod/model/HlsEncryption.h>
 #include <aws/mediapackage-vod/model/HlsManifest.h>
 #include <aws/mediapackage-vod/model/HlsPackage.h>
+#include <aws/mediapackage-vod/model/ListAssetsPaginationTraits.h>
 #include <aws/mediapackage-vod/model/ListAssetsRequest.h>
 #include <aws/mediapackage-vod/model/ListAssetsResult.h>
+#include <aws/mediapackage-vod/model/ListPackagingConfigurationsPaginationTraits.h>
 #include <aws/mediapackage-vod/model/ListPackagingConfigurationsRequest.h>
 #include <aws/mediapackage-vod/model/ListPackagingConfigurationsResult.h>
+#include <aws/mediapackage-vod/model/ListPackagingGroupsPaginationTraits.h>
 #include <aws/mediapackage-vod/model/ListPackagingGroupsRequest.h>
 #include <aws/mediapackage-vod/model/ListPackagingGroupsResult.h>
 #include <aws/mediapackage-vod/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/mediapackagev2-gen-tests/Mediapackagev2IncludeTests.cpp b/generated/tests/mediapackagev2-gen-tests/Mediapackagev2IncludeTests.cpp
index a4f2ec67d1a8..93face61e902 100644
--- a/generated/tests/mediapackagev2-gen-tests/Mediapackagev2IncludeTests.cpp
+++ b/generated/tests/mediapackagev2-gen-tests/Mediapackagev2IncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/mediapackagev2/Mediapackagev2Client.h>
+#include <aws/mediapackagev2/Mediapackagev2ClientPagination.h>
 #include <aws/mediapackagev2/Mediapackagev2EndpointProvider.h>
 #include <aws/mediapackagev2/Mediapackagev2ErrorMarshaller.h>
 #include <aws/mediapackagev2/Mediapackagev2Errors.h>
+#include <aws/mediapackagev2/Mediapackagev2PaginationBase.h>
 #include <aws/mediapackagev2/Mediapackagev2Request.h>
 #include <aws/mediapackagev2/Mediapackagev2ServiceClientModel.h>
+#include <aws/mediapackagev2/Mediapackagev2Waiter.h>
 #include <aws/mediapackagev2/Mediapackagev2_EXPORTS.h>
+#include <aws/mediapackagev2/internal/Mediapackagev2EndpointRules.h>
 #include <aws/mediapackagev2/model/AdMarkerDash.h>
 #include <aws/mediapackagev2/model/AdMarkerHls.h>
 #include <aws/mediapackagev2/model/CancelHarvestJobRequest.h>
@@ -99,16 +103,20 @@
 #include <aws/mediapackagev2/model/InputSwitchConfiguration.h>
 #include <aws/mediapackagev2/model/InputType.h>
 #include <aws/mediapackagev2/model/IsmEncryptionMethod.h>
+#include <aws/mediapackagev2/model/ListChannelGroupsPaginationTraits.h>
 #include <aws/mediapackagev2/model/ListChannelGroupsRequest.h>
 #include <aws/mediapackagev2/model/ListChannelGroupsResult.h>
+#include <aws/mediapackagev2/model/ListChannelsPaginationTraits.h>
 #include <aws/mediapackagev2/model/ListChannelsRequest.h>
 #include <aws/mediapackagev2/model/ListChannelsResult.h>
 #include <aws/mediapackagev2/model/ListDashManifestConfiguration.h>
+#include <aws/mediapackagev2/model/ListHarvestJobsPaginationTraits.h>
 #include <aws/mediapackagev2/model/ListHarvestJobsRequest.h>
 #include <aws/mediapackagev2/model/ListHarvestJobsResult.h>
 #include <aws/mediapackagev2/model/ListHlsManifestConfiguration.h>
 #include <aws/mediapackagev2/model/ListLowLatencyHlsManifestConfiguration.h>
 #include <aws/mediapackagev2/model/ListMssManifestConfiguration.h>
+#include <aws/mediapackagev2/model/ListOriginEndpointsPaginationTraits.h>
 #include <aws/mediapackagev2/model/ListOriginEndpointsRequest.h>
 #include <aws/mediapackagev2/model/ListOriginEndpointsResult.h>
 #include <aws/mediapackagev2/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/mediastore-data-gen-tests/MediaStoreDataIncludeTests.cpp b/generated/tests/mediastore-data-gen-tests/MediaStoreDataIncludeTests.cpp
index 01505e5f2d49..c7c90e8efec1 100644
--- a/generated/tests/mediastore-data-gen-tests/MediaStoreDataIncludeTests.cpp
+++ b/generated/tests/mediastore-data-gen-tests/MediaStoreDataIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/mediastore-data/MediaStoreDataClient.h>
+#include <aws/mediastore-data/MediaStoreDataClientPagination.h>
 #include <aws/mediastore-data/MediaStoreDataEndpointProvider.h>
 #include <aws/mediastore-data/MediaStoreDataErrorMarshaller.h>
 #include <aws/mediastore-data/MediaStoreDataErrors.h>
+#include <aws/mediastore-data/MediaStoreDataPaginationBase.h>
 #include <aws/mediastore-data/MediaStoreDataRequest.h>
 #include <aws/mediastore-data/MediaStoreDataServiceClientModel.h>
+#include <aws/mediastore-data/MediaStoreDataWaiter.h>
 #include <aws/mediastore-data/MediaStoreData_EXPORTS.h>
+#include <aws/mediastore-data/internal/MediaStoreDataEndpointRules.h>
 #include <aws/mediastore-data/model/DeleteObjectRequest.h>
 #include <aws/mediastore-data/model/DeleteObjectResult.h>
 #include <aws/mediastore-data/model/DescribeObjectRequest.h>
@@ -21,6 +25,7 @@
 #include <aws/mediastore-data/model/GetObjectResult.h>
 #include <aws/mediastore-data/model/Item.h>
 #include <aws/mediastore-data/model/ItemType.h>
+#include <aws/mediastore-data/model/ListItemsPaginationTraits.h>
 #include <aws/mediastore-data/model/ListItemsRequest.h>
 #include <aws/mediastore-data/model/ListItemsResult.h>
 #include <aws/mediastore-data/model/PutObjectRequest.h>
diff --git a/generated/tests/mediastore-gen-tests/MediaStoreIncludeTests.cpp b/generated/tests/mediastore-gen-tests/MediaStoreIncludeTests.cpp
index 1ea44f936a3a..4cab3dcea10c 100644
--- a/generated/tests/mediastore-gen-tests/MediaStoreIncludeTests.cpp
+++ b/generated/tests/mediastore-gen-tests/MediaStoreIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/mediastore/MediaStoreClient.h>
+#include <aws/mediastore/MediaStoreClientPagination.h>
 #include <aws/mediastore/MediaStoreEndpointProvider.h>
 #include <aws/mediastore/MediaStoreErrorMarshaller.h>
 #include <aws/mediastore/MediaStoreErrors.h>
+#include <aws/mediastore/MediaStorePaginationBase.h>
 #include <aws/mediastore/MediaStoreRequest.h>
 #include <aws/mediastore/MediaStoreServiceClientModel.h>
+#include <aws/mediastore/MediaStoreWaiter.h>
 #include <aws/mediastore/MediaStore_EXPORTS.h>
+#include <aws/mediastore/internal/MediaStoreEndpointRules.h>
 #include <aws/mediastore/model/Container.h>
 #include <aws/mediastore/model/ContainerLevelMetrics.h>
 #include <aws/mediastore/model/ContainerStatus.h>
@@ -39,6 +43,7 @@
 #include <aws/mediastore/model/GetLifecyclePolicyResult.h>
 #include <aws/mediastore/model/GetMetricPolicyRequest.h>
 #include <aws/mediastore/model/GetMetricPolicyResult.h>
+#include <aws/mediastore/model/ListContainersPaginationTraits.h>
 #include <aws/mediastore/model/ListContainersRequest.h>
 #include <aws/mediastore/model/ListContainersResult.h>
 #include <aws/mediastore/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/mediatailor-gen-tests/MediaTailorIncludeTests.cpp b/generated/tests/mediatailor-gen-tests/MediaTailorIncludeTests.cpp
index 6c0b1fd614d5..d10f9bdabdbb 100644
--- a/generated/tests/mediatailor-gen-tests/MediaTailorIncludeTests.cpp
+++ b/generated/tests/mediatailor-gen-tests/MediaTailorIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/mediatailor/MediaTailorClient.h>
+#include <aws/mediatailor/MediaTailorClientPagination.h>
 #include <aws/mediatailor/MediaTailorEndpointProvider.h>
 #include <aws/mediatailor/MediaTailorErrorMarshaller.h>
 #include <aws/mediatailor/MediaTailorErrors.h>
+#include <aws/mediatailor/MediaTailorPaginationBase.h>
 #include <aws/mediatailor/MediaTailorRequest.h>
 #include <aws/mediatailor/MediaTailorServiceClientModel.h>
+#include <aws/mediatailor/MediaTailorWaiter.h>
 #include <aws/mediatailor/MediaTailor_EXPORTS.h>
+#include <aws/mediatailor/internal/MediaTailorEndpointRules.h>
 #include <aws/mediatailor/model/AccessConfiguration.h>
 #include <aws/mediatailor/model/AccessType.h>
 #include <aws/mediatailor/model/AdBreak.h>
@@ -96,6 +100,7 @@
 #include <aws/mediatailor/model/FunctionType.h>
 #include <aws/mediatailor/model/GetChannelPolicyRequest.h>
 #include <aws/mediatailor/model/GetChannelPolicyResult.h>
+#include <aws/mediatailor/model/GetChannelSchedulePaginationTraits.h>
 #include <aws/mediatailor/model/GetChannelScheduleRequest.h>
 #include <aws/mediatailor/model/GetChannelScheduleResult.h>
 #include <aws/mediatailor/model/GetFunctionRequest.h>
@@ -112,23 +117,31 @@
 #include <aws/mediatailor/model/HttpRequestConfiguration.h>
 #include <aws/mediatailor/model/InsertionMode.h>
 #include <aws/mediatailor/model/KeyValuePair.h>
+#include <aws/mediatailor/model/ListAlertsPaginationTraits.h>
 #include <aws/mediatailor/model/ListAlertsRequest.h>
 #include <aws/mediatailor/model/ListAlertsResult.h>
+#include <aws/mediatailor/model/ListChannelsPaginationTraits.h>
 #include <aws/mediatailor/model/ListChannelsRequest.h>
 #include <aws/mediatailor/model/ListChannelsResult.h>
+#include <aws/mediatailor/model/ListFunctionsPaginationTraits.h>
 #include <aws/mediatailor/model/ListFunctionsRequest.h>
 #include <aws/mediatailor/model/ListFunctionsResult.h>
+#include <aws/mediatailor/model/ListLiveSourcesPaginationTraits.h>
 #include <aws/mediatailor/model/ListLiveSourcesRequest.h>
 #include <aws/mediatailor/model/ListLiveSourcesResult.h>
+#include <aws/mediatailor/model/ListPlaybackConfigurationsPaginationTraits.h>
 #include <aws/mediatailor/model/ListPlaybackConfigurationsRequest.h>
 #include <aws/mediatailor/model/ListPlaybackConfigurationsResult.h>
 #include <aws/mediatailor/model/ListPrefetchScheduleType.h>
+#include <aws/mediatailor/model/ListPrefetchSchedulesPaginationTraits.h>
 #include <aws/mediatailor/model/ListPrefetchSchedulesRequest.h>
 #include <aws/mediatailor/model/ListPrefetchSchedulesResult.h>
+#include <aws/mediatailor/model/ListSourceLocationsPaginationTraits.h>
 #include <aws/mediatailor/model/ListSourceLocationsRequest.h>
 #include <aws/mediatailor/model/ListSourceLocationsResult.h>
 #include <aws/mediatailor/model/ListTagsForResourceRequest.h>
 #include <aws/mediatailor/model/ListTagsForResourceResult.h>
+#include <aws/mediatailor/model/ListVodSourcesPaginationTraits.h>
 #include <aws/mediatailor/model/ListVodSourcesRequest.h>
 #include <aws/mediatailor/model/ListVodSourcesResult.h>
 #include <aws/mediatailor/model/LivePreRollConfiguration.h>
diff --git a/generated/tests/medical-imaging-gen-tests/MedicalImagingIncludeTests.cpp b/generated/tests/medical-imaging-gen-tests/MedicalImagingIncludeTests.cpp
index 31e7c37b0a12..86fa43fac5ff 100644
--- a/generated/tests/medical-imaging-gen-tests/MedicalImagingIncludeTests.cpp
+++ b/generated/tests/medical-imaging-gen-tests/MedicalImagingIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/medical-imaging/MedicalImagingClient.h>
+#include <aws/medical-imaging/MedicalImagingClientPagination.h>
 #include <aws/medical-imaging/MedicalImagingEndpointProvider.h>
 #include <aws/medical-imaging/MedicalImagingErrorMarshaller.h>
 #include <aws/medical-imaging/MedicalImagingErrors.h>
+#include <aws/medical-imaging/MedicalImagingPaginationBase.h>
 #include <aws/medical-imaging/MedicalImagingRequest.h>
 #include <aws/medical-imaging/MedicalImagingServiceClientModel.h>
+#include <aws/medical-imaging/MedicalImagingWaiter.h>
 #include <aws/medical-imaging/MedicalImaging_EXPORTS.h>
+#include <aws/medical-imaging/internal/MedicalImagingEndpointRules.h>
 #include <aws/medical-imaging/model/CopyDestinationImageSet.h>
 #include <aws/medical-imaging/model/CopyDestinationImageSetProperties.h>
 #include <aws/medical-imaging/model/CopyImageSetInformation.h>
@@ -53,10 +57,13 @@
 #include <aws/medical-imaging/model/ImageSetsMetadataSummary.h>
 #include <aws/medical-imaging/model/ImportConfiguration.h>
 #include <aws/medical-imaging/model/JobStatus.h>
+#include <aws/medical-imaging/model/ListDICOMImportJobsPaginationTraits.h>
 #include <aws/medical-imaging/model/ListDICOMImportJobsRequest.h>
 #include <aws/medical-imaging/model/ListDICOMImportJobsResult.h>
+#include <aws/medical-imaging/model/ListDatastoresPaginationTraits.h>
 #include <aws/medical-imaging/model/ListDatastoresRequest.h>
 #include <aws/medical-imaging/model/ListDatastoresResult.h>
+#include <aws/medical-imaging/model/ListImageSetVersionsPaginationTraits.h>
 #include <aws/medical-imaging/model/ListImageSetVersionsRequest.h>
 #include <aws/medical-imaging/model/ListImageSetVersionsResult.h>
 #include <aws/medical-imaging/model/ListTagsForResourceRequest.h>
@@ -69,6 +76,7 @@
 #include <aws/medical-imaging/model/SearchByAttributeValue.h>
 #include <aws/medical-imaging/model/SearchCriteria.h>
 #include <aws/medical-imaging/model/SearchFilter.h>
+#include <aws/medical-imaging/model/SearchImageSetsPaginationTraits.h>
 #include <aws/medical-imaging/model/SearchImageSetsRequest.h>
 #include <aws/medical-imaging/model/SearchImageSetsResult.h>
 #include <aws/medical-imaging/model/Sort.h>
diff --git a/generated/tests/memorydb-gen-tests/MemoryDBIncludeTests.cpp b/generated/tests/memorydb-gen-tests/MemoryDBIncludeTests.cpp
index 961c12abddc5..57de5bf83bd2 100644
--- a/generated/tests/memorydb-gen-tests/MemoryDBIncludeTests.cpp
+++ b/generated/tests/memorydb-gen-tests/MemoryDBIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/memorydb/MemoryDBClient.h>
+#include <aws/memorydb/MemoryDBClientPagination.h>
 #include <aws/memorydb/MemoryDBEndpointProvider.h>
 #include <aws/memorydb/MemoryDBErrorMarshaller.h>
 #include <aws/memorydb/MemoryDBErrors.h>
+#include <aws/memorydb/MemoryDBPaginationBase.h>
 #include <aws/memorydb/MemoryDBRequest.h>
 #include <aws/memorydb/MemoryDBServiceClientModel.h>
+#include <aws/memorydb/MemoryDBWaiter.h>
 #include <aws/memorydb/MemoryDB_EXPORTS.h>
+#include <aws/memorydb/internal/MemoryDBEndpointRules.h>
 #include <aws/memorydb/model/ACL.h>
 #include <aws/memorydb/model/ACLPendingChanges.h>
 #include <aws/memorydb/model/ACLsUpdateStatus.h>
@@ -57,34 +61,47 @@
 #include <aws/memorydb/model/DeleteSubnetGroupResult.h>
 #include <aws/memorydb/model/DeleteUserRequest.h>
 #include <aws/memorydb/model/DeleteUserResult.h>
+#include <aws/memorydb/model/DescribeACLsPaginationTraits.h>
 #include <aws/memorydb/model/DescribeACLsRequest.h>
 #include <aws/memorydb/model/DescribeACLsResult.h>
+#include <aws/memorydb/model/DescribeClustersPaginationTraits.h>
 #include <aws/memorydb/model/DescribeClustersRequest.h>
 #include <aws/memorydb/model/DescribeClustersResult.h>
+#include <aws/memorydb/model/DescribeEngineVersionsPaginationTraits.h>
 #include <aws/memorydb/model/DescribeEngineVersionsRequest.h>
 #include <aws/memorydb/model/DescribeEngineVersionsResult.h>
+#include <aws/memorydb/model/DescribeEventsPaginationTraits.h>
 #include <aws/memorydb/model/DescribeEventsRequest.h>
 #include <aws/memorydb/model/DescribeEventsResult.h>
+#include <aws/memorydb/model/DescribeMultiRegionClustersPaginationTraits.h>
 #include <aws/memorydb/model/DescribeMultiRegionClustersRequest.h>
 #include <aws/memorydb/model/DescribeMultiRegionClustersResult.h>
 #include <aws/memorydb/model/DescribeMultiRegionParameterGroupsRequest.h>
 #include <aws/memorydb/model/DescribeMultiRegionParameterGroupsResult.h>
 #include <aws/memorydb/model/DescribeMultiRegionParametersRequest.h>
 #include <aws/memorydb/model/DescribeMultiRegionParametersResult.h>
+#include <aws/memorydb/model/DescribeParameterGroupsPaginationTraits.h>
 #include <aws/memorydb/model/DescribeParameterGroupsRequest.h>
 #include <aws/memorydb/model/DescribeParameterGroupsResult.h>
+#include <aws/memorydb/model/DescribeParametersPaginationTraits.h>
 #include <aws/memorydb/model/DescribeParametersRequest.h>
 #include <aws/memorydb/model/DescribeParametersResult.h>
+#include <aws/memorydb/model/DescribeReservedNodesOfferingsPaginationTraits.h>
 #include <aws/memorydb/model/DescribeReservedNodesOfferingsRequest.h>
 #include <aws/memorydb/model/DescribeReservedNodesOfferingsResult.h>
+#include <aws/memorydb/model/DescribeReservedNodesPaginationTraits.h>
 #include <aws/memorydb/model/DescribeReservedNodesRequest.h>
 #include <aws/memorydb/model/DescribeReservedNodesResult.h>
+#include <aws/memorydb/model/DescribeServiceUpdatesPaginationTraits.h>
 #include <aws/memorydb/model/DescribeServiceUpdatesRequest.h>
 #include <aws/memorydb/model/DescribeServiceUpdatesResult.h>
+#include <aws/memorydb/model/DescribeSnapshotsPaginationTraits.h>
 #include <aws/memorydb/model/DescribeSnapshotsRequest.h>
 #include <aws/memorydb/model/DescribeSnapshotsResult.h>
+#include <aws/memorydb/model/DescribeSubnetGroupsPaginationTraits.h>
 #include <aws/memorydb/model/DescribeSubnetGroupsRequest.h>
 #include <aws/memorydb/model/DescribeSubnetGroupsResult.h>
+#include <aws/memorydb/model/DescribeUsersPaginationTraits.h>
 #include <aws/memorydb/model/DescribeUsersRequest.h>
 #include <aws/memorydb/model/DescribeUsersResult.h>
 #include <aws/memorydb/model/Endpoint.h>
diff --git a/generated/tests/meteringmarketplace-gen-tests/MarketplaceMeteringIncludeTests.cpp b/generated/tests/meteringmarketplace-gen-tests/MarketplaceMeteringIncludeTests.cpp
index d62ae374bf7f..72edc5062b23 100644
--- a/generated/tests/meteringmarketplace-gen-tests/MarketplaceMeteringIncludeTests.cpp
+++ b/generated/tests/meteringmarketplace-gen-tests/MarketplaceMeteringIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/meteringmarketplace/MarketplaceMeteringEndpointProvider.h>
 #include <aws/meteringmarketplace/MarketplaceMeteringErrorMarshaller.h>
 #include <aws/meteringmarketplace/MarketplaceMeteringErrors.h>
+#include <aws/meteringmarketplace/MarketplaceMeteringPaginationBase.h>
 #include <aws/meteringmarketplace/MarketplaceMeteringRequest.h>
 #include <aws/meteringmarketplace/MarketplaceMeteringServiceClientModel.h>
+#include <aws/meteringmarketplace/MarketplaceMeteringWaiter.h>
 #include <aws/meteringmarketplace/MarketplaceMetering_EXPORTS.h>
+#include <aws/meteringmarketplace/internal/MarketplaceMeteringEndpointRules.h>
 #include <aws/meteringmarketplace/model/BatchMeterUsageRequest.h>
 #include <aws/meteringmarketplace/model/BatchMeterUsageResult.h>
 #include <aws/meteringmarketplace/model/MeterUsageRequest.h>
diff --git a/generated/tests/mgn-gen-tests/MgnIncludeTests.cpp b/generated/tests/mgn-gen-tests/MgnIncludeTests.cpp
index 8acf17a4a9a9..09aa30eeeab1 100644
--- a/generated/tests/mgn-gen-tests/MgnIncludeTests.cpp
+++ b/generated/tests/mgn-gen-tests/MgnIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/mgn/MgnClient.h>
+#include <aws/mgn/MgnClientPagination.h>
 #include <aws/mgn/MgnEndpointProvider.h>
 #include <aws/mgn/MgnErrorMarshaller.h>
 #include <aws/mgn/MgnErrors.h>
+#include <aws/mgn/MgnPaginationBase.h>
 #include <aws/mgn/MgnRequest.h>
 #include <aws/mgn/MgnServiceClientModel.h>
+#include <aws/mgn/MgnWaiter.h>
 #include <aws/mgn/Mgn_EXPORTS.h>
+#include <aws/mgn/internal/MgnEndpointRules.h>
 #include <aws/mgn/model/AccessDeniedException.h>
 #include <aws/mgn/model/ActionCategory.h>
 #include <aws/mgn/model/AnalyzerType.h>
@@ -79,18 +83,24 @@
 #include <aws/mgn/model/DeleteVcenterClientRequest.h>
 #include <aws/mgn/model/DeleteWaveRequest.h>
 #include <aws/mgn/model/DeleteWaveResult.h>
+#include <aws/mgn/model/DescribeJobLogItemsPaginationTraits.h>
 #include <aws/mgn/model/DescribeJobLogItemsRequest.h>
 #include <aws/mgn/model/DescribeJobLogItemsResult.h>
+#include <aws/mgn/model/DescribeJobsPaginationTraits.h>
 #include <aws/mgn/model/DescribeJobsRequest.h>
 #include <aws/mgn/model/DescribeJobsRequestFilters.h>
 #include <aws/mgn/model/DescribeJobsResult.h>
+#include <aws/mgn/model/DescribeLaunchConfigurationTemplatesPaginationTraits.h>
 #include <aws/mgn/model/DescribeLaunchConfigurationTemplatesRequest.h>
 #include <aws/mgn/model/DescribeLaunchConfigurationTemplatesResult.h>
+#include <aws/mgn/model/DescribeReplicationConfigurationTemplatesPaginationTraits.h>
 #include <aws/mgn/model/DescribeReplicationConfigurationTemplatesRequest.h>
 #include <aws/mgn/model/DescribeReplicationConfigurationTemplatesResult.h>
+#include <aws/mgn/model/DescribeSourceServersPaginationTraits.h>
 #include <aws/mgn/model/DescribeSourceServersRequest.h>
 #include <aws/mgn/model/DescribeSourceServersRequestFilters.h>
 #include <aws/mgn/model/DescribeSourceServersResult.h>
+#include <aws/mgn/model/DescribeVcenterClientsPaginationTraits.h>
 #include <aws/mgn/model/DescribeVcenterClientsRequest.h>
 #include <aws/mgn/model/DescribeVcenterClientsResult.h>
 #include <aws/mgn/model/DisassociateApplicationsRequest.h>
@@ -168,68 +178,91 @@
 #include <aws/mgn/model/LifeCycleLastTestInitiated.h>
 #include <aws/mgn/model/LifeCycleLastTestReverted.h>
 #include <aws/mgn/model/LifeCycleState.h>
+#include <aws/mgn/model/ListApplicationsPaginationTraits.h>
 #include <aws/mgn/model/ListApplicationsRequest.h>
 #include <aws/mgn/model/ListApplicationsRequestFilters.h>
 #include <aws/mgn/model/ListApplicationsResult.h>
+#include <aws/mgn/model/ListConnectorsPaginationTraits.h>
 #include <aws/mgn/model/ListConnectorsRequest.h>
 #include <aws/mgn/model/ListConnectorsRequestFilters.h>
 #include <aws/mgn/model/ListConnectorsResult.h>
+#include <aws/mgn/model/ListExportErrorsPaginationTraits.h>
 #include <aws/mgn/model/ListExportErrorsRequest.h>
 #include <aws/mgn/model/ListExportErrorsResult.h>
+#include <aws/mgn/model/ListExportsPaginationTraits.h>
 #include <aws/mgn/model/ListExportsRequest.h>
 #include <aws/mgn/model/ListExportsRequestFilters.h>
 #include <aws/mgn/model/ListExportsResult.h>
+#include <aws/mgn/model/ListImportErrorsPaginationTraits.h>
 #include <aws/mgn/model/ListImportErrorsRequest.h>
 #include <aws/mgn/model/ListImportErrorsResult.h>
 #include <aws/mgn/model/ListImportFileEnrichmentsFilters.h>
+#include <aws/mgn/model/ListImportFileEnrichmentsPaginationTraits.h>
 #include <aws/mgn/model/ListImportFileEnrichmentsRequest.h>
 #include <aws/mgn/model/ListImportFileEnrichmentsResult.h>
+#include <aws/mgn/model/ListImportsPaginationTraits.h>
 #include <aws/mgn/model/ListImportsRequest.h>
 #include <aws/mgn/model/ListImportsRequestFilters.h>
 #include <aws/mgn/model/ListImportsResult.h>
+#include <aws/mgn/model/ListManagedAccountsPaginationTraits.h>
 #include <aws/mgn/model/ListManagedAccountsRequest.h>
 #include <aws/mgn/model/ListManagedAccountsResult.h>
 #include <aws/mgn/model/ListNetworkMigrationAnalysesFilters.h>
+#include <aws/mgn/model/ListNetworkMigrationAnalysesPaginationTraits.h>
 #include <aws/mgn/model/ListNetworkMigrationAnalysesRequest.h>
 #include <aws/mgn/model/ListNetworkMigrationAnalysesResult.h>
 #include <aws/mgn/model/ListNetworkMigrationAnalysisResultsFilters.h>
+#include <aws/mgn/model/ListNetworkMigrationAnalysisResultsPaginationTraits.h>
 #include <aws/mgn/model/ListNetworkMigrationAnalysisResultsRequest.h>
 #include <aws/mgn/model/ListNetworkMigrationAnalysisResultsResult.h>
 #include <aws/mgn/model/ListNetworkMigrationCodeGenerationSegmentsFilters.h>
+#include <aws/mgn/model/ListNetworkMigrationCodeGenerationSegmentsPaginationTraits.h>
 #include <aws/mgn/model/ListNetworkMigrationCodeGenerationSegmentsRequest.h>
 #include <aws/mgn/model/ListNetworkMigrationCodeGenerationSegmentsResult.h>
 #include <aws/mgn/model/ListNetworkMigrationCodeGenerationsFilters.h>
+#include <aws/mgn/model/ListNetworkMigrationCodeGenerationsPaginationTraits.h>
 #include <aws/mgn/model/ListNetworkMigrationCodeGenerationsRequest.h>
 #include <aws/mgn/model/ListNetworkMigrationCodeGenerationsResult.h>
+#include <aws/mgn/model/ListNetworkMigrationDefinitionsPaginationTraits.h>
 #include <aws/mgn/model/ListNetworkMigrationDefinitionsRequest.h>
 #include <aws/mgn/model/ListNetworkMigrationDefinitionsRequestFilters.h>
 #include <aws/mgn/model/ListNetworkMigrationDefinitionsResult.h>
+#include <aws/mgn/model/ListNetworkMigrationDeployedStacksPaginationTraits.h>
 #include <aws/mgn/model/ListNetworkMigrationDeployedStacksRequest.h>
 #include <aws/mgn/model/ListNetworkMigrationDeployedStacksResult.h>
 #include <aws/mgn/model/ListNetworkMigrationDeployerJobFilters.h>
+#include <aws/mgn/model/ListNetworkMigrationDeploymentsPaginationTraits.h>
 #include <aws/mgn/model/ListNetworkMigrationDeploymentsRequest.h>
 #include <aws/mgn/model/ListNetworkMigrationDeploymentsResult.h>
 #include <aws/mgn/model/ListNetworkMigrationExecutionRequestFilters.h>
+#include <aws/mgn/model/ListNetworkMigrationExecutionsPaginationTraits.h>
 #include <aws/mgn/model/ListNetworkMigrationExecutionsRequest.h>
 #include <aws/mgn/model/ListNetworkMigrationExecutionsResult.h>
 #include <aws/mgn/model/ListNetworkMigrationMapperSegmentConstructsFilters.h>
+#include <aws/mgn/model/ListNetworkMigrationMapperSegmentConstructsPaginationTraits.h>
 #include <aws/mgn/model/ListNetworkMigrationMapperSegmentConstructsRequest.h>
 #include <aws/mgn/model/ListNetworkMigrationMapperSegmentConstructsResult.h>
 #include <aws/mgn/model/ListNetworkMigrationMapperSegmentsFilters.h>
+#include <aws/mgn/model/ListNetworkMigrationMapperSegmentsPaginationTraits.h>
 #include <aws/mgn/model/ListNetworkMigrationMapperSegmentsRequest.h>
 #include <aws/mgn/model/ListNetworkMigrationMapperSegmentsResult.h>
 #include <aws/mgn/model/ListNetworkMigrationMappingUpdatesFilters.h>
+#include <aws/mgn/model/ListNetworkMigrationMappingUpdatesPaginationTraits.h>
 #include <aws/mgn/model/ListNetworkMigrationMappingUpdatesRequest.h>
 #include <aws/mgn/model/ListNetworkMigrationMappingUpdatesResult.h>
 #include <aws/mgn/model/ListNetworkMigrationMappingsFilters.h>
+#include <aws/mgn/model/ListNetworkMigrationMappingsPaginationTraits.h>
 #include <aws/mgn/model/ListNetworkMigrationMappingsRequest.h>
 #include <aws/mgn/model/ListNetworkMigrationMappingsResult.h>
+#include <aws/mgn/model/ListSourceServerActionsPaginationTraits.h>
 #include <aws/mgn/model/ListSourceServerActionsRequest.h>
 #include <aws/mgn/model/ListSourceServerActionsResult.h>
 #include <aws/mgn/model/ListTagsForResourceRequest.h>
 #include <aws/mgn/model/ListTagsForResourceResult.h>
+#include <aws/mgn/model/ListTemplateActionsPaginationTraits.h>
 #include <aws/mgn/model/ListTemplateActionsRequest.h>
 #include <aws/mgn/model/ListTemplateActionsResult.h>
+#include <aws/mgn/model/ListWavesPaginationTraits.h>
 #include <aws/mgn/model/ListWavesRequest.h>
 #include <aws/mgn/model/ListWavesRequestFilters.h>
 #include <aws/mgn/model/ListWavesResult.h>
diff --git a/generated/tests/migration-hub-refactor-spaces-gen-tests/MigrationHubRefactorSpacesIncludeTests.cpp b/generated/tests/migration-hub-refactor-spaces-gen-tests/MigrationHubRefactorSpacesIncludeTests.cpp
index 71cc0157344d..1d769e5f9f6a 100644
--- a/generated/tests/migration-hub-refactor-spaces-gen-tests/MigrationHubRefactorSpacesIncludeTests.cpp
+++ b/generated/tests/migration-hub-refactor-spaces-gen-tests/MigrationHubRefactorSpacesIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/migration-hub-refactor-spaces/MigrationHubRefactorSpacesClient.h>
+#include <aws/migration-hub-refactor-spaces/MigrationHubRefactorSpacesClientPagination.h>
 #include <aws/migration-hub-refactor-spaces/MigrationHubRefactorSpacesEndpointProvider.h>
 #include <aws/migration-hub-refactor-spaces/MigrationHubRefactorSpacesErrorMarshaller.h>
 #include <aws/migration-hub-refactor-spaces/MigrationHubRefactorSpacesErrors.h>
+#include <aws/migration-hub-refactor-spaces/MigrationHubRefactorSpacesPaginationBase.h>
 #include <aws/migration-hub-refactor-spaces/MigrationHubRefactorSpacesRequest.h>
 #include <aws/migration-hub-refactor-spaces/MigrationHubRefactorSpacesServiceClientModel.h>
+#include <aws/migration-hub-refactor-spaces/MigrationHubRefactorSpacesWaiter.h>
 #include <aws/migration-hub-refactor-spaces/MigrationHubRefactorSpaces_EXPORTS.h>
+#include <aws/migration-hub-refactor-spaces/internal/MigrationHubRefactorSpacesEndpointRules.h>
 #include <aws/migration-hub-refactor-spaces/model/ApiGatewayEndpointType.h>
 #include <aws/migration-hub-refactor-spaces/model/ApiGatewayProxyConfig.h>
 #include <aws/migration-hub-refactor-spaces/model/ApiGatewayProxyInput.h>
@@ -59,14 +63,19 @@
 #include <aws/migration-hub-refactor-spaces/model/LambdaEndpointConfig.h>
 #include <aws/migration-hub-refactor-spaces/model/LambdaEndpointInput.h>
 #include <aws/migration-hub-refactor-spaces/model/LambdaEndpointSummary.h>
+#include <aws/migration-hub-refactor-spaces/model/ListApplicationsPaginationTraits.h>
 #include <aws/migration-hub-refactor-spaces/model/ListApplicationsRequest.h>
 #include <aws/migration-hub-refactor-spaces/model/ListApplicationsResult.h>
+#include <aws/migration-hub-refactor-spaces/model/ListEnvironmentVpcsPaginationTraits.h>
 #include <aws/migration-hub-refactor-spaces/model/ListEnvironmentVpcsRequest.h>
 #include <aws/migration-hub-refactor-spaces/model/ListEnvironmentVpcsResult.h>
+#include <aws/migration-hub-refactor-spaces/model/ListEnvironmentsPaginationTraits.h>
 #include <aws/migration-hub-refactor-spaces/model/ListEnvironmentsRequest.h>
 #include <aws/migration-hub-refactor-spaces/model/ListEnvironmentsResult.h>
+#include <aws/migration-hub-refactor-spaces/model/ListRoutesPaginationTraits.h>
 #include <aws/migration-hub-refactor-spaces/model/ListRoutesRequest.h>
 #include <aws/migration-hub-refactor-spaces/model/ListRoutesResult.h>
+#include <aws/migration-hub-refactor-spaces/model/ListServicesPaginationTraits.h>
 #include <aws/migration-hub-refactor-spaces/model/ListServicesRequest.h>
 #include <aws/migration-hub-refactor-spaces/model/ListServicesResult.h>
 #include <aws/migration-hub-refactor-spaces/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/migrationhub-config-gen-tests/MigrationHubConfigIncludeTests.cpp b/generated/tests/migrationhub-config-gen-tests/MigrationHubConfigIncludeTests.cpp
index 3e85f9bb4373..f6ad45bc6c28 100644
--- a/generated/tests/migrationhub-config-gen-tests/MigrationHubConfigIncludeTests.cpp
+++ b/generated/tests/migrationhub-config-gen-tests/MigrationHubConfigIncludeTests.cpp
@@ -7,16 +7,21 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/migrationhub-config/MigrationHubConfigClient.h>
+#include <aws/migrationhub-config/MigrationHubConfigClientPagination.h>
 #include <aws/migrationhub-config/MigrationHubConfigEndpointProvider.h>
 #include <aws/migrationhub-config/MigrationHubConfigErrorMarshaller.h>
 #include <aws/migrationhub-config/MigrationHubConfigErrors.h>
+#include <aws/migrationhub-config/MigrationHubConfigPaginationBase.h>
 #include <aws/migrationhub-config/MigrationHubConfigRequest.h>
 #include <aws/migrationhub-config/MigrationHubConfigServiceClientModel.h>
+#include <aws/migrationhub-config/MigrationHubConfigWaiter.h>
 #include <aws/migrationhub-config/MigrationHubConfig_EXPORTS.h>
+#include <aws/migrationhub-config/internal/MigrationHubConfigEndpointRules.h>
 #include <aws/migrationhub-config/model/CreateHomeRegionControlRequest.h>
 #include <aws/migrationhub-config/model/CreateHomeRegionControlResult.h>
 #include <aws/migrationhub-config/model/DeleteHomeRegionControlRequest.h>
 #include <aws/migrationhub-config/model/DeleteHomeRegionControlResult.h>
+#include <aws/migrationhub-config/model/DescribeHomeRegionControlsPaginationTraits.h>
 #include <aws/migrationhub-config/model/DescribeHomeRegionControlsRequest.h>
 #include <aws/migrationhub-config/model/DescribeHomeRegionControlsResult.h>
 #include <aws/migrationhub-config/model/GetHomeRegionRequest.h>
diff --git a/generated/tests/migrationhuborchestrator-gen-tests/MigrationHubOrchestratorIncludeTests.cpp b/generated/tests/migrationhuborchestrator-gen-tests/MigrationHubOrchestratorIncludeTests.cpp
index a12a0fcafcd0..508abb133a5f 100644
--- a/generated/tests/migrationhuborchestrator-gen-tests/MigrationHubOrchestratorIncludeTests.cpp
+++ b/generated/tests/migrationhuborchestrator-gen-tests/MigrationHubOrchestratorIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/migrationhuborchestrator/MigrationHubOrchestratorClient.h>
+#include <aws/migrationhuborchestrator/MigrationHubOrchestratorClientPagination.h>
 #include <aws/migrationhuborchestrator/MigrationHubOrchestratorEndpointProvider.h>
 #include <aws/migrationhuborchestrator/MigrationHubOrchestratorErrorMarshaller.h>
 #include <aws/migrationhuborchestrator/MigrationHubOrchestratorErrors.h>
+#include <aws/migrationhuborchestrator/MigrationHubOrchestratorPaginationBase.h>
 #include <aws/migrationhuborchestrator/MigrationHubOrchestratorRequest.h>
 #include <aws/migrationhuborchestrator/MigrationHubOrchestratorServiceClientModel.h>
+#include <aws/migrationhuborchestrator/MigrationHubOrchestratorWaiter.h>
 #include <aws/migrationhuborchestrator/MigrationHubOrchestrator_EXPORTS.h>
+#include <aws/migrationhuborchestrator/internal/MigrationHubOrchestratorEndpointRules.h>
 #include <aws/migrationhuborchestrator/model/CreateTemplateRequest.h>
 #include <aws/migrationhuborchestrator/model/CreateTemplateResult.h>
 #include <aws/migrationhuborchestrator/model/CreateWorkflowRequest.h>
@@ -42,20 +46,27 @@
 #include <aws/migrationhuborchestrator/model/GetWorkflowStepGroupResult.h>
 #include <aws/migrationhuborchestrator/model/GetWorkflowStepRequest.h>
 #include <aws/migrationhuborchestrator/model/GetWorkflowStepResult.h>
+#include <aws/migrationhuborchestrator/model/ListPluginsPaginationTraits.h>
 #include <aws/migrationhuborchestrator/model/ListPluginsRequest.h>
 #include <aws/migrationhuborchestrator/model/ListPluginsResult.h>
 #include <aws/migrationhuborchestrator/model/ListTagsForResourceRequest.h>
 #include <aws/migrationhuborchestrator/model/ListTagsForResourceResult.h>
+#include <aws/migrationhuborchestrator/model/ListTemplateStepGroupsPaginationTraits.h>
 #include <aws/migrationhuborchestrator/model/ListTemplateStepGroupsRequest.h>
 #include <aws/migrationhuborchestrator/model/ListTemplateStepGroupsResult.h>
+#include <aws/migrationhuborchestrator/model/ListTemplateStepsPaginationTraits.h>
 #include <aws/migrationhuborchestrator/model/ListTemplateStepsRequest.h>
 #include <aws/migrationhuborchestrator/model/ListTemplateStepsResult.h>
+#include <aws/migrationhuborchestrator/model/ListTemplatesPaginationTraits.h>
 #include <aws/migrationhuborchestrator/model/ListTemplatesRequest.h>
 #include <aws/migrationhuborchestrator/model/ListTemplatesResult.h>
+#include <aws/migrationhuborchestrator/model/ListWorkflowStepGroupsPaginationTraits.h>
 #include <aws/migrationhuborchestrator/model/ListWorkflowStepGroupsRequest.h>
 #include <aws/migrationhuborchestrator/model/ListWorkflowStepGroupsResult.h>
+#include <aws/migrationhuborchestrator/model/ListWorkflowStepsPaginationTraits.h>
 #include <aws/migrationhuborchestrator/model/ListWorkflowStepsRequest.h>
 #include <aws/migrationhuborchestrator/model/ListWorkflowStepsResult.h>
+#include <aws/migrationhuborchestrator/model/ListWorkflowsPaginationTraits.h>
 #include <aws/migrationhuborchestrator/model/ListWorkflowsRequest.h>
 #include <aws/migrationhuborchestrator/model/ListWorkflowsResult.h>
 #include <aws/migrationhuborchestrator/model/MigrationWorkflowStatusEnum.h>
diff --git a/generated/tests/migrationhubstrategy-gen-tests/MigrationHubStrategyRecommendationsIncludeTests.cpp b/generated/tests/migrationhubstrategy-gen-tests/MigrationHubStrategyRecommendationsIncludeTests.cpp
index 39dd5bfe59e3..5f7b48830912 100644
--- a/generated/tests/migrationhubstrategy-gen-tests/MigrationHubStrategyRecommendationsIncludeTests.cpp
+++ b/generated/tests/migrationhubstrategy-gen-tests/MigrationHubStrategyRecommendationsIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/migrationhubstrategy/MigrationHubStrategyRecommendationsClient.h>
+#include <aws/migrationhubstrategy/MigrationHubStrategyRecommendationsClientPagination.h>
 #include <aws/migrationhubstrategy/MigrationHubStrategyRecommendationsEndpointProvider.h>
 #include <aws/migrationhubstrategy/MigrationHubStrategyRecommendationsErrorMarshaller.h>
 #include <aws/migrationhubstrategy/MigrationHubStrategyRecommendationsErrors.h>
+#include <aws/migrationhubstrategy/MigrationHubStrategyRecommendationsPaginationBase.h>
 #include <aws/migrationhubstrategy/MigrationHubStrategyRecommendationsRequest.h>
 #include <aws/migrationhubstrategy/MigrationHubStrategyRecommendationsServiceClientModel.h>
+#include <aws/migrationhubstrategy/MigrationHubStrategyRecommendationsWaiter.h>
 #include <aws/migrationhubstrategy/MigrationHubStrategyRecommendations_EXPORTS.h>
+#include <aws/migrationhubstrategy/internal/MigrationHubStrategyRecommendationsEndpointRules.h>
 #include <aws/migrationhubstrategy/model/AnalysisStatusUnion.h>
 #include <aws/migrationhubstrategy/model/AnalysisType.h>
 #include <aws/migrationhubstrategy/model/AnalyzableServerSummary.h>
@@ -66,6 +70,7 @@
 #include <aws/migrationhubstrategy/model/GetPortfolioSummaryResult.h>
 #include <aws/migrationhubstrategy/model/GetRecommendationReportDetailsRequest.h>
 #include <aws/migrationhubstrategy/model/GetRecommendationReportDetailsResult.h>
+#include <aws/migrationhubstrategy/model/GetServerDetailsPaginationTraits.h>
 #include <aws/migrationhubstrategy/model/GetServerDetailsRequest.h>
 #include <aws/migrationhubstrategy/model/GetServerDetailsResult.h>
 #include <aws/migrationhubstrategy/model/GetServerStrategiesRequest.h>
@@ -80,14 +85,19 @@
 #include <aws/migrationhubstrategy/model/ImportFileTaskInformation.h>
 #include <aws/migrationhubstrategy/model/ImportFileTaskStatus.h>
 #include <aws/migrationhubstrategy/model/InclusionStatus.h>
+#include <aws/migrationhubstrategy/model/ListAnalyzableServersPaginationTraits.h>
 #include <aws/migrationhubstrategy/model/ListAnalyzableServersRequest.h>
 #include <aws/migrationhubstrategy/model/ListAnalyzableServersResult.h>
+#include <aws/migrationhubstrategy/model/ListApplicationComponentsPaginationTraits.h>
 #include <aws/migrationhubstrategy/model/ListApplicationComponentsRequest.h>
 #include <aws/migrationhubstrategy/model/ListApplicationComponentsResult.h>
+#include <aws/migrationhubstrategy/model/ListCollectorsPaginationTraits.h>
 #include <aws/migrationhubstrategy/model/ListCollectorsRequest.h>
 #include <aws/migrationhubstrategy/model/ListCollectorsResult.h>
+#include <aws/migrationhubstrategy/model/ListImportFileTaskPaginationTraits.h>
 #include <aws/migrationhubstrategy/model/ListImportFileTaskRequest.h>
 #include <aws/migrationhubstrategy/model/ListImportFileTaskResult.h>
+#include <aws/migrationhubstrategy/model/ListServersPaginationTraits.h>
 #include <aws/migrationhubstrategy/model/ListServersRequest.h>
 #include <aws/migrationhubstrategy/model/ListServersResult.h>
 #include <aws/migrationhubstrategy/model/ManagementPreference.h>
diff --git a/generated/tests/monitoring-gen-tests/CloudWatchIncludeTests.cpp b/generated/tests/monitoring-gen-tests/CloudWatchIncludeTests.cpp
index e0432aa172af..00a2a625a607 100644
--- a/generated/tests/monitoring-gen-tests/CloudWatchIncludeTests.cpp
+++ b/generated/tests/monitoring-gen-tests/CloudWatchIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/monitoring/CloudWatchClient.h>
+#include <aws/monitoring/CloudWatchClientPagination.h>
 #include <aws/monitoring/CloudWatchEndpointProvider.h>
 #include <aws/monitoring/CloudWatchErrorMarshaller.h>
 #include <aws/monitoring/CloudWatchErrors.h>
+#include <aws/monitoring/CloudWatchPaginationBase.h>
 #include <aws/monitoring/CloudWatchRequest.h>
 #include <aws/monitoring/CloudWatchServiceClientModel.h>
+#include <aws/monitoring/CloudWatchWaiter.h>
 #include <aws/monitoring/CloudWatch_EXPORTS.h>
+#include <aws/monitoring/internal/CloudWatchEndpointRules.h>
 #include <aws/monitoring/model/ActionsSuppressedBy.h>
 #include <aws/monitoring/model/AlarmContributor.h>
 #include <aws/monitoring/model/AlarmHistoryItem.h>
@@ -44,14 +48,18 @@
 #include <aws/monitoring/model/DeleteMetricStreamResult.h>
 #include <aws/monitoring/model/DescribeAlarmContributorsRequest.h>
 #include <aws/monitoring/model/DescribeAlarmContributorsResult.h>
+#include <aws/monitoring/model/DescribeAlarmHistoryPaginationTraits.h>
 #include <aws/monitoring/model/DescribeAlarmHistoryRequest.h>
 #include <aws/monitoring/model/DescribeAlarmHistoryResult.h>
 #include <aws/monitoring/model/DescribeAlarmsForMetricRequest.h>
 #include <aws/monitoring/model/DescribeAlarmsForMetricResult.h>
+#include <aws/monitoring/model/DescribeAlarmsPaginationTraits.h>
 #include <aws/monitoring/model/DescribeAlarmsRequest.h>
 #include <aws/monitoring/model/DescribeAlarmsResult.h>
+#include <aws/monitoring/model/DescribeAnomalyDetectorsPaginationTraits.h>
 #include <aws/monitoring/model/DescribeAnomalyDetectorsRequest.h>
 #include <aws/monitoring/model/DescribeAnomalyDetectorsResult.h>
+#include <aws/monitoring/model/DescribeInsightRulesPaginationTraits.h>
 #include <aws/monitoring/model/DescribeInsightRulesRequest.h>
 #include <aws/monitoring/model/DescribeInsightRulesResult.h>
 #include <aws/monitoring/model/Dimension.h>
@@ -77,6 +85,7 @@
 #include <aws/monitoring/model/GetDatasetResult.h>
 #include <aws/monitoring/model/GetInsightRuleReportRequest.h>
 #include <aws/monitoring/model/GetInsightRuleReportResult.h>
+#include <aws/monitoring/model/GetMetricDataPaginationTraits.h>
 #include <aws/monitoring/model/GetMetricDataRequest.h>
 #include <aws/monitoring/model/GetMetricDataResult.h>
 #include <aws/monitoring/model/GetMetricStatisticsRequest.h>
@@ -93,14 +102,19 @@
 #include <aws/monitoring/model/InsightRuleContributorDatapoint.h>
 #include <aws/monitoring/model/InsightRuleMetricDatapoint.h>
 #include <aws/monitoring/model/LabelOptions.h>
+#include <aws/monitoring/model/ListAlarmMuteRulesPaginationTraits.h>
 #include <aws/monitoring/model/ListAlarmMuteRulesRequest.h>
 #include <aws/monitoring/model/ListAlarmMuteRulesResult.h>
+#include <aws/monitoring/model/ListDashboardsPaginationTraits.h>
 #include <aws/monitoring/model/ListDashboardsRequest.h>
 #include <aws/monitoring/model/ListDashboardsResult.h>
+#include <aws/monitoring/model/ListManagedInsightRulesPaginationTraits.h>
 #include <aws/monitoring/model/ListManagedInsightRulesRequest.h>
 #include <aws/monitoring/model/ListManagedInsightRulesResult.h>
+#include <aws/monitoring/model/ListMetricStreamsPaginationTraits.h>
 #include <aws/monitoring/model/ListMetricStreamsRequest.h>
 #include <aws/monitoring/model/ListMetricStreamsResult.h>
+#include <aws/monitoring/model/ListMetricsPaginationTraits.h>
 #include <aws/monitoring/model/ListMetricsRequest.h>
 #include <aws/monitoring/model/ListMetricsResult.h>
 #include <aws/monitoring/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/mpa-gen-tests/MPAIncludeTests.cpp b/generated/tests/mpa-gen-tests/MPAIncludeTests.cpp
index 372ab8f1d471..0aeaa9bab652 100644
--- a/generated/tests/mpa-gen-tests/MPAIncludeTests.cpp
+++ b/generated/tests/mpa-gen-tests/MPAIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/mpa/MPAClient.h>
+#include <aws/mpa/MPAClientPagination.h>
 #include <aws/mpa/MPAEndpointProvider.h>
 #include <aws/mpa/MPAErrorMarshaller.h>
 #include <aws/mpa/MPAErrors.h>
+#include <aws/mpa/MPAPaginationBase.h>
 #include <aws/mpa/MPARequest.h>
 #include <aws/mpa/MPAServiceClientModel.h>
+#include <aws/mpa/MPAWaiter.h>
 #include <aws/mpa/MPA_EXPORTS.h>
+#include <aws/mpa/internal/MPAEndpointRules.h>
 #include <aws/mpa/model/ActionCompletionStrategy.h>
 #include <aws/mpa/model/AdditionalSecurityRequirement.h>
 #include <aws/mpa/model/ApprovalStrategy.h>
@@ -55,18 +59,24 @@
 #include <aws/mpa/model/IdentitySourceStatusCode.h>
 #include <aws/mpa/model/IdentitySourceType.h>
 #include <aws/mpa/model/IdentityStatus.h>
+#include <aws/mpa/model/ListApprovalTeamsPaginationTraits.h>
 #include <aws/mpa/model/ListApprovalTeamsRequest.h>
 #include <aws/mpa/model/ListApprovalTeamsResponseApprovalTeam.h>
 #include <aws/mpa/model/ListApprovalTeamsResult.h>
+#include <aws/mpa/model/ListIdentitySourcesPaginationTraits.h>
 #include <aws/mpa/model/ListIdentitySourcesRequest.h>
 #include <aws/mpa/model/ListIdentitySourcesResult.h>
+#include <aws/mpa/model/ListPoliciesPaginationTraits.h>
 #include <aws/mpa/model/ListPoliciesRequest.h>
 #include <aws/mpa/model/ListPoliciesResult.h>
+#include <aws/mpa/model/ListPolicyVersionsPaginationTraits.h>
 #include <aws/mpa/model/ListPolicyVersionsRequest.h>
 #include <aws/mpa/model/ListPolicyVersionsResult.h>
+#include <aws/mpa/model/ListResourcePoliciesPaginationTraits.h>
 #include <aws/mpa/model/ListResourcePoliciesRequest.h>
 #include <aws/mpa/model/ListResourcePoliciesResponseResourcePolicy.h>
 #include <aws/mpa/model/ListResourcePoliciesResult.h>
+#include <aws/mpa/model/ListSessionsPaginationTraits.h>
 #include <aws/mpa/model/ListSessionsRequest.h>
 #include <aws/mpa/model/ListSessionsResponseSession.h>
 #include <aws/mpa/model/ListSessionsResult.h>
diff --git a/generated/tests/mq-gen-tests/MQIncludeTests.cpp b/generated/tests/mq-gen-tests/MQIncludeTests.cpp
index 3b8a7963aaab..be5622f698a8 100644
--- a/generated/tests/mq-gen-tests/MQIncludeTests.cpp
+++ b/generated/tests/mq-gen-tests/MQIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/mq/MQClient.h>
+#include <aws/mq/MQClientPagination.h>
 #include <aws/mq/MQEndpointProvider.h>
 #include <aws/mq/MQErrorMarshaller.h>
 #include <aws/mq/MQErrors.h>
+#include <aws/mq/MQPaginationBase.h>
 #include <aws/mq/MQRequest.h>
 #include <aws/mq/MQServiceClientModel.h>
+#include <aws/mq/MQWaiter.h>
 #include <aws/mq/MQ_EXPORTS.h>
+#include <aws/mq/internal/MQEndpointRules.h>
 #include <aws/mq/model/ActionRequired.h>
 #include <aws/mq/model/AuthenticationStrategy.h>
 #include <aws/mq/model/AvailabilityZone.h>
@@ -58,6 +62,7 @@
 #include <aws/mq/model/DescribeConfigurationResult.h>
 #include <aws/mq/model/DescribeConfigurationRevisionRequest.h>
 #include <aws/mq/model/DescribeConfigurationRevisionResult.h>
+#include <aws/mq/model/DescribeSharedResourcesPaginationTraits.h>
 #include <aws/mq/model/DescribeSharedResourcesRequest.h>
 #include <aws/mq/model/DescribeSharedResourcesResult.h>
 #include <aws/mq/model/DescribeUserRequest.h>
@@ -69,6 +74,7 @@
 #include <aws/mq/model/InternalServerErrorException.h>
 #include <aws/mq/model/LdapServerMetadataInput.h>
 #include <aws/mq/model/LdapServerMetadataOutput.h>
+#include <aws/mq/model/ListBrokersPaginationTraits.h>
 #include <aws/mq/model/ListBrokersRequest.h>
 #include <aws/mq/model/ListBrokersResult.h>
 #include <aws/mq/model/ListConfigurationRevisionsRequest.h>
diff --git a/generated/tests/mturk-requester-gen-tests/MTurkIncludeTests.cpp b/generated/tests/mturk-requester-gen-tests/MTurkIncludeTests.cpp
index 69a137a75ffb..92ad2cefe1a5 100644
--- a/generated/tests/mturk-requester-gen-tests/MTurkIncludeTests.cpp
+++ b/generated/tests/mturk-requester-gen-tests/MTurkIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/mturk-requester/MTurkClient.h>
+#include <aws/mturk-requester/MTurkClientPagination.h>
 #include <aws/mturk-requester/MTurkEndpointProvider.h>
 #include <aws/mturk-requester/MTurkErrorMarshaller.h>
 #include <aws/mturk-requester/MTurkErrors.h>
+#include <aws/mturk-requester/MTurkPaginationBase.h>
 #include <aws/mturk-requester/MTurkRequest.h>
 #include <aws/mturk-requester/MTurkServiceClientModel.h>
+#include <aws/mturk-requester/MTurkWaiter.h>
 #include <aws/mturk-requester/MTurk_EXPORTS.h>
+#include <aws/mturk-requester/internal/MTurkEndpointRules.h>
 #include <aws/mturk-requester/model/AcceptQualificationRequestRequest.h>
 #include <aws/mturk-requester/model/AcceptQualificationRequestResult.h>
 #include <aws/mturk-requester/model/ApproveAssignmentRequest.h>
@@ -61,24 +65,34 @@
 #include <aws/mturk-requester/model/HITLayoutParameter.h>
 #include <aws/mturk-requester/model/HITReviewStatus.h>
 #include <aws/mturk-requester/model/HITStatus.h>
+#include <aws/mturk-requester/model/ListAssignmentsForHITPaginationTraits.h>
 #include <aws/mturk-requester/model/ListAssignmentsForHITRequest.h>
 #include <aws/mturk-requester/model/ListAssignmentsForHITResult.h>
+#include <aws/mturk-requester/model/ListBonusPaymentsPaginationTraits.h>
 #include <aws/mturk-requester/model/ListBonusPaymentsRequest.h>
 #include <aws/mturk-requester/model/ListBonusPaymentsResult.h>
+#include <aws/mturk-requester/model/ListHITsForQualificationTypePaginationTraits.h>
 #include <aws/mturk-requester/model/ListHITsForQualificationTypeRequest.h>
 #include <aws/mturk-requester/model/ListHITsForQualificationTypeResult.h>
+#include <aws/mturk-requester/model/ListHITsPaginationTraits.h>
 #include <aws/mturk-requester/model/ListHITsRequest.h>
 #include <aws/mturk-requester/model/ListHITsResult.h>
+#include <aws/mturk-requester/model/ListQualificationRequestsPaginationTraits.h>
 #include <aws/mturk-requester/model/ListQualificationRequestsRequest.h>
 #include <aws/mturk-requester/model/ListQualificationRequestsResult.h>
+#include <aws/mturk-requester/model/ListQualificationTypesPaginationTraits.h>
 #include <aws/mturk-requester/model/ListQualificationTypesRequest.h>
 #include <aws/mturk-requester/model/ListQualificationTypesResult.h>
+#include <aws/mturk-requester/model/ListReviewPolicyResultsForHITPaginationTraits.h>
 #include <aws/mturk-requester/model/ListReviewPolicyResultsForHITRequest.h>
 #include <aws/mturk-requester/model/ListReviewPolicyResultsForHITResult.h>
+#include <aws/mturk-requester/model/ListReviewableHITsPaginationTraits.h>
 #include <aws/mturk-requester/model/ListReviewableHITsRequest.h>
 #include <aws/mturk-requester/model/ListReviewableHITsResult.h>
+#include <aws/mturk-requester/model/ListWorkerBlocksPaginationTraits.h>
 #include <aws/mturk-requester/model/ListWorkerBlocksRequest.h>
 #include <aws/mturk-requester/model/ListWorkerBlocksResult.h>
+#include <aws/mturk-requester/model/ListWorkersWithQualificationTypePaginationTraits.h>
 #include <aws/mturk-requester/model/ListWorkersWithQualificationTypeRequest.h>
 #include <aws/mturk-requester/model/ListWorkersWithQualificationTypeResult.h>
 #include <aws/mturk-requester/model/Locale.h>
diff --git a/generated/tests/mwaa-gen-tests/MWAAIncludeTests.cpp b/generated/tests/mwaa-gen-tests/MWAAIncludeTests.cpp
index 7f8911de2fac..c6da9dea4e46 100644
--- a/generated/tests/mwaa-gen-tests/MWAAIncludeTests.cpp
+++ b/generated/tests/mwaa-gen-tests/MWAAIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/mwaa/MWAAClient.h>
+#include <aws/mwaa/MWAAClientPagination.h>
 #include <aws/mwaa/MWAAEndpointProvider.h>
 #include <aws/mwaa/MWAAErrorMarshaller.h>
 #include <aws/mwaa/MWAAErrors.h>
+#include <aws/mwaa/MWAAPaginationBase.h>
 #include <aws/mwaa/MWAARequest.h>
 #include <aws/mwaa/MWAAServiceClientModel.h>
+#include <aws/mwaa/MWAAWaiter.h>
 #include <aws/mwaa/MWAA_EXPORTS.h>
+#include <aws/mwaa/internal/MWAAEndpointRules.h>
 #include <aws/mwaa/model/CreateCliTokenRequest.h>
 #include <aws/mwaa/model/CreateCliTokenResult.h>
 #include <aws/mwaa/model/CreateEnvironmentRequest.h>
@@ -30,6 +34,7 @@
 #include <aws/mwaa/model/InvokeRestApiRequest.h>
 #include <aws/mwaa/model/InvokeRestApiResult.h>
 #include <aws/mwaa/model/LastUpdate.h>
+#include <aws/mwaa/model/ListEnvironmentsPaginationTraits.h>
 #include <aws/mwaa/model/ListEnvironmentsRequest.h>
 #include <aws/mwaa/model/ListEnvironmentsResult.h>
 #include <aws/mwaa/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/mwaa-serverless-gen-tests/MWAAServerlessIncludeTests.cpp b/generated/tests/mwaa-serverless-gen-tests/MWAAServerlessIncludeTests.cpp
index 83312142cdf5..7a231a1a141b 100644
--- a/generated/tests/mwaa-serverless-gen-tests/MWAAServerlessIncludeTests.cpp
+++ b/generated/tests/mwaa-serverless-gen-tests/MWAAServerlessIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/mwaa-serverless/MWAAServerlessClient.h>
+#include <aws/mwaa-serverless/MWAAServerlessClientPagination.h>
 #include <aws/mwaa-serverless/MWAAServerlessEndpointProvider.h>
 #include <aws/mwaa-serverless/MWAAServerlessErrorMarshaller.h>
 #include <aws/mwaa-serverless/MWAAServerlessErrors.h>
+#include <aws/mwaa-serverless/MWAAServerlessPaginationBase.h>
 #include <aws/mwaa-serverless/MWAAServerlessRequest.h>
 #include <aws/mwaa-serverless/MWAAServerlessServiceClientModel.h>
+#include <aws/mwaa-serverless/MWAAServerlessWaiter.h>
 #include <aws/mwaa-serverless/MWAAServerless_EXPORTS.h>
+#include <aws/mwaa-serverless/internal/MWAAServerlessEndpointRules.h>
 #include <aws/mwaa-serverless/model/ConflictException.h>
 #include <aws/mwaa-serverless/model/CreateWorkflowRequest.h>
 #include <aws/mwaa-serverless/model/CreateWorkflowResult.h>
@@ -30,12 +34,16 @@
 #include <aws/mwaa-serverless/model/InternalServerException.h>
 #include <aws/mwaa-serverless/model/ListTagsForResourceRequest.h>
 #include <aws/mwaa-serverless/model/ListTagsForResourceResult.h>
+#include <aws/mwaa-serverless/model/ListTaskInstancesPaginationTraits.h>
 #include <aws/mwaa-serverless/model/ListTaskInstancesRequest.h>
 #include <aws/mwaa-serverless/model/ListTaskInstancesResult.h>
+#include <aws/mwaa-serverless/model/ListWorkflowRunsPaginationTraits.h>
 #include <aws/mwaa-serverless/model/ListWorkflowRunsRequest.h>
 #include <aws/mwaa-serverless/model/ListWorkflowRunsResult.h>
+#include <aws/mwaa-serverless/model/ListWorkflowVersionsPaginationTraits.h>
 #include <aws/mwaa-serverless/model/ListWorkflowVersionsRequest.h>
 #include <aws/mwaa-serverless/model/ListWorkflowVersionsResult.h>
+#include <aws/mwaa-serverless/model/ListWorkflowsPaginationTraits.h>
 #include <aws/mwaa-serverless/model/ListWorkflowsRequest.h>
 #include <aws/mwaa-serverless/model/ListWorkflowsResult.h>
 #include <aws/mwaa-serverless/model/LoggingConfiguration.h>
diff --git a/generated/tests/neptune-gen-tests/NeptuneIncludeTests.cpp b/generated/tests/neptune-gen-tests/NeptuneIncludeTests.cpp
index 28c06375e2c4..f440a6f569dc 100644
--- a/generated/tests/neptune-gen-tests/NeptuneIncludeTests.cpp
+++ b/generated/tests/neptune-gen-tests/NeptuneIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/neptune/NeptuneClient.h>
+#include <aws/neptune/NeptuneClientPagination.h>
 #include <aws/neptune/NeptuneEndpointProvider.h>
 #include <aws/neptune/NeptuneErrorMarshaller.h>
 #include <aws/neptune/NeptuneErrors.h>
+#include <aws/neptune/NeptunePaginationBase.h>
 #include <aws/neptune/NeptuneRequest.h>
 #include <aws/neptune/NeptuneServiceClientModel.h>
+#include <aws/neptune/NeptuneWaiter.h>
 #include <aws/neptune/Neptune_EXPORTS.h>
+#include <aws/neptune/internal/NeptuneEndpointRules.h>
 #include <aws/neptune/model/AddRoleToDBClusterRequest.h>
 #include <aws/neptune/model/AddSourceIdentifierToSubscriptionRequest.h>
 #include <aws/neptune/model/AddSourceIdentifierToSubscriptionResult.h>
@@ -79,42 +83,58 @@
 #include <aws/neptune/model/DeleteEventSubscriptionResult.h>
 #include <aws/neptune/model/DeleteGlobalClusterRequest.h>
 #include <aws/neptune/model/DeleteGlobalClusterResult.h>
+#include <aws/neptune/model/DescribeDBClusterEndpointsPaginationTraits.h>
 #include <aws/neptune/model/DescribeDBClusterEndpointsRequest.h>
 #include <aws/neptune/model/DescribeDBClusterEndpointsResult.h>
+#include <aws/neptune/model/DescribeDBClusterParameterGroupsPaginationTraits.h>
 #include <aws/neptune/model/DescribeDBClusterParameterGroupsRequest.h>
 #include <aws/neptune/model/DescribeDBClusterParameterGroupsResult.h>
+#include <aws/neptune/model/DescribeDBClusterParametersPaginationTraits.h>
 #include <aws/neptune/model/DescribeDBClusterParametersRequest.h>
 #include <aws/neptune/model/DescribeDBClusterParametersResult.h>
 #include <aws/neptune/model/DescribeDBClusterSnapshotAttributesRequest.h>
 #include <aws/neptune/model/DescribeDBClusterSnapshotAttributesResult.h>
+#include <aws/neptune/model/DescribeDBClusterSnapshotsPaginationTraits.h>
 #include <aws/neptune/model/DescribeDBClusterSnapshotsRequest.h>
 #include <aws/neptune/model/DescribeDBClusterSnapshotsResult.h>
+#include <aws/neptune/model/DescribeDBClustersPaginationTraits.h>
 #include <aws/neptune/model/DescribeDBClustersRequest.h>
 #include <aws/neptune/model/DescribeDBClustersResult.h>
+#include <aws/neptune/model/DescribeDBEngineVersionsPaginationTraits.h>
 #include <aws/neptune/model/DescribeDBEngineVersionsRequest.h>
 #include <aws/neptune/model/DescribeDBEngineVersionsResult.h>
+#include <aws/neptune/model/DescribeDBInstancesPaginationTraits.h>
 #include <aws/neptune/model/DescribeDBInstancesRequest.h>
 #include <aws/neptune/model/DescribeDBInstancesResult.h>
+#include <aws/neptune/model/DescribeDBParameterGroupsPaginationTraits.h>
 #include <aws/neptune/model/DescribeDBParameterGroupsRequest.h>
 #include <aws/neptune/model/DescribeDBParameterGroupsResult.h>
+#include <aws/neptune/model/DescribeDBParametersPaginationTraits.h>
 #include <aws/neptune/model/DescribeDBParametersRequest.h>
 #include <aws/neptune/model/DescribeDBParametersResult.h>
+#include <aws/neptune/model/DescribeDBSubnetGroupsPaginationTraits.h>
 #include <aws/neptune/model/DescribeDBSubnetGroupsRequest.h>
 #include <aws/neptune/model/DescribeDBSubnetGroupsResult.h>
 #include <aws/neptune/model/DescribeEngineDefaultClusterParametersRequest.h>
 #include <aws/neptune/model/DescribeEngineDefaultClusterParametersResult.h>
+#include <aws/neptune/model/DescribeEngineDefaultParametersPaginationTraits.h>
 #include <aws/neptune/model/DescribeEngineDefaultParametersRequest.h>
 #include <aws/neptune/model/DescribeEngineDefaultParametersResult.h>
 #include <aws/neptune/model/DescribeEventCategoriesRequest.h>
 #include <aws/neptune/model/DescribeEventCategoriesResult.h>
+#include <aws/neptune/model/DescribeEventSubscriptionsPaginationTraits.h>
 #include <aws/neptune/model/DescribeEventSubscriptionsRequest.h>
 #include <aws/neptune/model/DescribeEventSubscriptionsResult.h>
+#include <aws/neptune/model/DescribeEventsPaginationTraits.h>
 #include <aws/neptune/model/DescribeEventsRequest.h>
 #include <aws/neptune/model/DescribeEventsResult.h>
+#include <aws/neptune/model/DescribeGlobalClustersPaginationTraits.h>
 #include <aws/neptune/model/DescribeGlobalClustersRequest.h>
 #include <aws/neptune/model/DescribeGlobalClustersResult.h>
+#include <aws/neptune/model/DescribeOrderableDBInstanceOptionsPaginationTraits.h>
 #include <aws/neptune/model/DescribeOrderableDBInstanceOptionsRequest.h>
 #include <aws/neptune/model/DescribeOrderableDBInstanceOptionsResult.h>
+#include <aws/neptune/model/DescribePendingMaintenanceActionsPaginationTraits.h>
 #include <aws/neptune/model/DescribePendingMaintenanceActionsRequest.h>
 #include <aws/neptune/model/DescribePendingMaintenanceActionsResult.h>
 #include <aws/neptune/model/DescribeValidDBInstanceModificationsRequest.h>
diff --git a/generated/tests/neptune-graph-gen-tests/NeptuneGraphIncludeTests.cpp b/generated/tests/neptune-graph-gen-tests/NeptuneGraphIncludeTests.cpp
index c26f27093c1c..f1e9078834f8 100644
--- a/generated/tests/neptune-graph-gen-tests/NeptuneGraphIncludeTests.cpp
+++ b/generated/tests/neptune-graph-gen-tests/NeptuneGraphIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/neptune-graph/NeptuneGraphClient.h>
+#include <aws/neptune-graph/NeptuneGraphClientPagination.h>
 #include <aws/neptune-graph/NeptuneGraphEndpointProvider.h>
 #include <aws/neptune-graph/NeptuneGraphErrorMarshaller.h>
 #include <aws/neptune-graph/NeptuneGraphErrors.h>
+#include <aws/neptune-graph/NeptuneGraphPaginationBase.h>
 #include <aws/neptune-graph/NeptuneGraphRequest.h>
 #include <aws/neptune-graph/NeptuneGraphServiceClientModel.h>
+#include <aws/neptune-graph/NeptuneGraphWaiter.h>
 #include <aws/neptune-graph/NeptuneGraph_EXPORTS.h>
+#include <aws/neptune-graph/internal/NeptuneGraphEndpointRules.h>
 #include <aws/neptune-graph/model/BlankNodeHandling.h>
 #include <aws/neptune-graph/model/CancelExportTaskRequest.h>
 #include <aws/neptune-graph/model/CancelExportTaskResult.h>
@@ -70,14 +74,19 @@
 #include <aws/neptune-graph/model/ImportTaskDetails.h>
 #include <aws/neptune-graph/model/ImportTaskStatus.h>
 #include <aws/neptune-graph/model/ImportTaskSummary.h>
+#include <aws/neptune-graph/model/ListExportTasksPaginationTraits.h>
 #include <aws/neptune-graph/model/ListExportTasksRequest.h>
 #include <aws/neptune-graph/model/ListExportTasksResult.h>
+#include <aws/neptune-graph/model/ListGraphSnapshotsPaginationTraits.h>
 #include <aws/neptune-graph/model/ListGraphSnapshotsRequest.h>
 #include <aws/neptune-graph/model/ListGraphSnapshotsResult.h>
+#include <aws/neptune-graph/model/ListGraphsPaginationTraits.h>
 #include <aws/neptune-graph/model/ListGraphsRequest.h>
 #include <aws/neptune-graph/model/ListGraphsResult.h>
+#include <aws/neptune-graph/model/ListImportTasksPaginationTraits.h>
 #include <aws/neptune-graph/model/ListImportTasksRequest.h>
 #include <aws/neptune-graph/model/ListImportTasksResult.h>
+#include <aws/neptune-graph/model/ListPrivateGraphEndpointsPaginationTraits.h>
 #include <aws/neptune-graph/model/ListPrivateGraphEndpointsRequest.h>
 #include <aws/neptune-graph/model/ListPrivateGraphEndpointsResult.h>
 #include <aws/neptune-graph/model/ListQueriesRequest.h>
diff --git a/generated/tests/neptunedata-gen-tests/NeptunedataIncludeTests.cpp b/generated/tests/neptunedata-gen-tests/NeptunedataIncludeTests.cpp
index 499b84227a57..9722327b0f18 100644
--- a/generated/tests/neptunedata-gen-tests/NeptunedataIncludeTests.cpp
+++ b/generated/tests/neptunedata-gen-tests/NeptunedataIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/neptunedata/NeptunedataEndpointProvider.h>
 #include <aws/neptunedata/NeptunedataErrorMarshaller.h>
 #include <aws/neptunedata/NeptunedataErrors.h>
+#include <aws/neptunedata/NeptunedataPaginationBase.h>
 #include <aws/neptunedata/NeptunedataRequest.h>
 #include <aws/neptunedata/NeptunedataServiceClientModel.h>
+#include <aws/neptunedata/NeptunedataWaiter.h>
 #include <aws/neptunedata/Neptunedata_EXPORTS.h>
+#include <aws/neptunedata/internal/NeptunedataEndpointRules.h>
 #include <aws/neptunedata/model/AccessDeniedException.h>
 #include <aws/neptunedata/model/Action.h>
 #include <aws/neptunedata/model/BadRequestException.h>
diff --git a/generated/tests/network-firewall-gen-tests/NetworkFirewallIncludeTests.cpp b/generated/tests/network-firewall-gen-tests/NetworkFirewallIncludeTests.cpp
index bf6234cb7234..769d0677e3f7 100644
--- a/generated/tests/network-firewall-gen-tests/NetworkFirewallIncludeTests.cpp
+++ b/generated/tests/network-firewall-gen-tests/NetworkFirewallIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/network-firewall/NetworkFirewallClient.h>
+#include <aws/network-firewall/NetworkFirewallClientPagination.h>
 #include <aws/network-firewall/NetworkFirewallEndpointProvider.h>
 #include <aws/network-firewall/NetworkFirewallErrorMarshaller.h>
 #include <aws/network-firewall/NetworkFirewallErrors.h>
+#include <aws/network-firewall/NetworkFirewallPaginationBase.h>
 #include <aws/network-firewall/NetworkFirewallRequest.h>
 #include <aws/network-firewall/NetworkFirewallServiceClientModel.h>
+#include <aws/network-firewall/NetworkFirewallWaiter.h>
 #include <aws/network-firewall/NetworkFirewall_EXPORTS.h>
+#include <aws/network-firewall/internal/NetworkFirewallEndpointRules.h>
 #include <aws/network-firewall/model/AZSyncState.h>
 #include <aws/network-firewall/model/AcceptNetworkFirewallTransitGatewayAttachmentRequest.h>
 #include <aws/network-firewall/model/AcceptNetworkFirewallTransitGatewayAttachmentResult.h>
@@ -147,6 +151,7 @@
 #include <aws/network-firewall/model/FlowOperationType.h>
 #include <aws/network-firewall/model/FlowTimeouts.h>
 #include <aws/network-firewall/model/GeneratedRulesType.h>
+#include <aws/network-firewall/model/GetAnalysisReportResultsPaginationTraits.h>
 #include <aws/network-firewall/model/GetAnalysisReportResultsRequest.h>
 #include <aws/network-firewall/model/GetAnalysisReportResultsResult.h>
 #include <aws/network-firewall/model/Header.h>
@@ -156,30 +161,43 @@
 #include <aws/network-firewall/model/IPSetMetadata.h>
 #include <aws/network-firewall/model/IPSetReference.h>
 #include <aws/network-firewall/model/IdentifiedType.h>
+#include <aws/network-firewall/model/ListAnalysisReportsPaginationTraits.h>
 #include <aws/network-firewall/model/ListAnalysisReportsRequest.h>
 #include <aws/network-firewall/model/ListAnalysisReportsResult.h>
+#include <aws/network-firewall/model/ListContainerAssociationsPaginationTraits.h>
 #include <aws/network-firewall/model/ListContainerAssociationsRequest.h>
 #include <aws/network-firewall/model/ListContainerAssociationsResult.h>
+#include <aws/network-firewall/model/ListFirewallPoliciesPaginationTraits.h>
 #include <aws/network-firewall/model/ListFirewallPoliciesRequest.h>
 #include <aws/network-firewall/model/ListFirewallPoliciesResult.h>
+#include <aws/network-firewall/model/ListFirewallsPaginationTraits.h>
 #include <aws/network-firewall/model/ListFirewallsRequest.h>
 #include <aws/network-firewall/model/ListFirewallsResult.h>
+#include <aws/network-firewall/model/ListFlowOperationResultsPaginationTraits.h>
 #include <aws/network-firewall/model/ListFlowOperationResultsRequest.h>
 #include <aws/network-firewall/model/ListFlowOperationResultsResult.h>
+#include <aws/network-firewall/model/ListFlowOperationsPaginationTraits.h>
 #include <aws/network-firewall/model/ListFlowOperationsRequest.h>
 #include <aws/network-firewall/model/ListFlowOperationsResult.h>
+#include <aws/network-firewall/model/ListProxiesPaginationTraits.h>
 #include <aws/network-firewall/model/ListProxiesRequest.h>
 #include <aws/network-firewall/model/ListProxiesResult.h>
+#include <aws/network-firewall/model/ListProxyConfigurationsPaginationTraits.h>
 #include <aws/network-firewall/model/ListProxyConfigurationsRequest.h>
 #include <aws/network-firewall/model/ListProxyConfigurationsResult.h>
+#include <aws/network-firewall/model/ListProxyRuleGroupsPaginationTraits.h>
 #include <aws/network-firewall/model/ListProxyRuleGroupsRequest.h>
 #include <aws/network-firewall/model/ListProxyRuleGroupsResult.h>
+#include <aws/network-firewall/model/ListRuleGroupsPaginationTraits.h>
 #include <aws/network-firewall/model/ListRuleGroupsRequest.h>
 #include <aws/network-firewall/model/ListRuleGroupsResult.h>
+#include <aws/network-firewall/model/ListTLSInspectionConfigurationsPaginationTraits.h>
 #include <aws/network-firewall/model/ListTLSInspectionConfigurationsRequest.h>
 #include <aws/network-firewall/model/ListTLSInspectionConfigurationsResult.h>
+#include <aws/network-firewall/model/ListTagsForResourcePaginationTraits.h>
 #include <aws/network-firewall/model/ListTagsForResourceRequest.h>
 #include <aws/network-firewall/model/ListTagsForResourceResult.h>
+#include <aws/network-firewall/model/ListVpcEndpointAssociationsPaginationTraits.h>
 #include <aws/network-firewall/model/ListVpcEndpointAssociationsRequest.h>
 #include <aws/network-firewall/model/ListVpcEndpointAssociationsResult.h>
 #include <aws/network-firewall/model/ListenerProperty.h>
diff --git a/generated/tests/networkflowmonitor-gen-tests/NetworkFlowMonitorIncludeTests.cpp b/generated/tests/networkflowmonitor-gen-tests/NetworkFlowMonitorIncludeTests.cpp
index d2018d61ecd3..db091f591aff 100644
--- a/generated/tests/networkflowmonitor-gen-tests/NetworkFlowMonitorIncludeTests.cpp
+++ b/generated/tests/networkflowmonitor-gen-tests/NetworkFlowMonitorIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/networkflowmonitor/NetworkFlowMonitorClient.h>
+#include <aws/networkflowmonitor/NetworkFlowMonitorClientPagination.h>
 #include <aws/networkflowmonitor/NetworkFlowMonitorEndpointProvider.h>
 #include <aws/networkflowmonitor/NetworkFlowMonitorErrorMarshaller.h>
 #include <aws/networkflowmonitor/NetworkFlowMonitorErrors.h>
+#include <aws/networkflowmonitor/NetworkFlowMonitorPaginationBase.h>
 #include <aws/networkflowmonitor/NetworkFlowMonitorRequest.h>
 #include <aws/networkflowmonitor/NetworkFlowMonitorServiceClientModel.h>
+#include <aws/networkflowmonitor/NetworkFlowMonitorWaiter.h>
 #include <aws/networkflowmonitor/NetworkFlowMonitor_EXPORTS.h>
+#include <aws/networkflowmonitor/internal/NetworkFlowMonitorEndpointRules.h>
 #include <aws/networkflowmonitor/model/CreateMonitorRequest.h>
 #include <aws/networkflowmonitor/model/CreateMonitorResult.h>
 #include <aws/networkflowmonitor/model/CreateScopeRequest.h>
@@ -24,10 +28,13 @@
 #include <aws/networkflowmonitor/model/DestinationCategory.h>
 #include <aws/networkflowmonitor/model/GetMonitorRequest.h>
 #include <aws/networkflowmonitor/model/GetMonitorResult.h>
+#include <aws/networkflowmonitor/model/GetQueryResultsMonitorTopContributorsPaginationTraits.h>
 #include <aws/networkflowmonitor/model/GetQueryResultsMonitorTopContributorsRequest.h>
 #include <aws/networkflowmonitor/model/GetQueryResultsMonitorTopContributorsResult.h>
+#include <aws/networkflowmonitor/model/GetQueryResultsWorkloadInsightsTopContributorsDataPaginationTraits.h>
 #include <aws/networkflowmonitor/model/GetQueryResultsWorkloadInsightsTopContributorsDataRequest.h>
 #include <aws/networkflowmonitor/model/GetQueryResultsWorkloadInsightsTopContributorsDataResult.h>
+#include <aws/networkflowmonitor/model/GetQueryResultsWorkloadInsightsTopContributorsPaginationTraits.h>
 #include <aws/networkflowmonitor/model/GetQueryResultsWorkloadInsightsTopContributorsRequest.h>
 #include <aws/networkflowmonitor/model/GetQueryResultsWorkloadInsightsTopContributorsResult.h>
 #include <aws/networkflowmonitor/model/GetQueryStatusMonitorTopContributorsRequest.h>
@@ -39,8 +46,10 @@
 #include <aws/networkflowmonitor/model/GetScopeRequest.h>
 #include <aws/networkflowmonitor/model/GetScopeResult.h>
 #include <aws/networkflowmonitor/model/KubernetesMetadata.h>
+#include <aws/networkflowmonitor/model/ListMonitorsPaginationTraits.h>
 #include <aws/networkflowmonitor/model/ListMonitorsRequest.h>
 #include <aws/networkflowmonitor/model/ListMonitorsResult.h>
+#include <aws/networkflowmonitor/model/ListScopesPaginationTraits.h>
 #include <aws/networkflowmonitor/model/ListScopesRequest.h>
 #include <aws/networkflowmonitor/model/ListScopesResult.h>
 #include <aws/networkflowmonitor/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/networkmanager-gen-tests/NetworkManagerIncludeTests.cpp b/generated/tests/networkmanager-gen-tests/NetworkManagerIncludeTests.cpp
index 685871e21592..e8a64e4eb5c2 100644
--- a/generated/tests/networkmanager-gen-tests/NetworkManagerIncludeTests.cpp
+++ b/generated/tests/networkmanager-gen-tests/NetworkManagerIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/networkmanager/NetworkManagerClient.h>
+#include <aws/networkmanager/NetworkManagerClientPagination.h>
 #include <aws/networkmanager/NetworkManagerEndpointProvider.h>
 #include <aws/networkmanager/NetworkManagerErrorMarshaller.h>
 #include <aws/networkmanager/NetworkManagerErrors.h>
+#include <aws/networkmanager/NetworkManagerPaginationBase.h>
 #include <aws/networkmanager/NetworkManagerRequest.h>
 #include <aws/networkmanager/NetworkManagerServiceClientModel.h>
+#include <aws/networkmanager/NetworkManagerWaiter.h>
 #include <aws/networkmanager/NetworkManager_EXPORTS.h>
+#include <aws/networkmanager/internal/NetworkManagerEndpointRules.h>
 #include <aws/networkmanager/model/AWSLocation.h>
 #include <aws/networkmanager/model/AcceptAttachmentRequest.h>
 #include <aws/networkmanager/model/AcceptAttachmentResult.h>
@@ -128,6 +132,7 @@
 #include <aws/networkmanager/model/DeleteSiteResult.h>
 #include <aws/networkmanager/model/DeregisterTransitGatewayRequest.h>
 #include <aws/networkmanager/model/DeregisterTransitGatewayResult.h>
+#include <aws/networkmanager/model/DescribeGlobalNetworksPaginationTraits.h>
 #include <aws/networkmanager/model/DescribeGlobalNetworksRequest.h>
 #include <aws/networkmanager/model/DescribeGlobalNetworksResult.h>
 #include <aws/networkmanager/model/Device.h>
@@ -146,38 +151,50 @@
 #include <aws/networkmanager/model/ExecuteCoreNetworkChangeSetResult.h>
 #include <aws/networkmanager/model/GetConnectAttachmentRequest.h>
 #include <aws/networkmanager/model/GetConnectAttachmentResult.h>
+#include <aws/networkmanager/model/GetConnectPeerAssociationsPaginationTraits.h>
 #include <aws/networkmanager/model/GetConnectPeerAssociationsRequest.h>
 #include <aws/networkmanager/model/GetConnectPeerAssociationsResult.h>
 #include <aws/networkmanager/model/GetConnectPeerRequest.h>
 #include <aws/networkmanager/model/GetConnectPeerResult.h>
+#include <aws/networkmanager/model/GetConnectionsPaginationTraits.h>
 #include <aws/networkmanager/model/GetConnectionsRequest.h>
 #include <aws/networkmanager/model/GetConnectionsResult.h>
+#include <aws/networkmanager/model/GetCoreNetworkChangeEventsPaginationTraits.h>
 #include <aws/networkmanager/model/GetCoreNetworkChangeEventsRequest.h>
 #include <aws/networkmanager/model/GetCoreNetworkChangeEventsResult.h>
+#include <aws/networkmanager/model/GetCoreNetworkChangeSetPaginationTraits.h>
 #include <aws/networkmanager/model/GetCoreNetworkChangeSetRequest.h>
 #include <aws/networkmanager/model/GetCoreNetworkChangeSetResult.h>
 #include <aws/networkmanager/model/GetCoreNetworkPolicyRequest.h>
 #include <aws/networkmanager/model/GetCoreNetworkPolicyResult.h>
 #include <aws/networkmanager/model/GetCoreNetworkRequest.h>
 #include <aws/networkmanager/model/GetCoreNetworkResult.h>
+#include <aws/networkmanager/model/GetCustomerGatewayAssociationsPaginationTraits.h>
 #include <aws/networkmanager/model/GetCustomerGatewayAssociationsRequest.h>
 #include <aws/networkmanager/model/GetCustomerGatewayAssociationsResult.h>
+#include <aws/networkmanager/model/GetDevicesPaginationTraits.h>
 #include <aws/networkmanager/model/GetDevicesRequest.h>
 #include <aws/networkmanager/model/GetDevicesResult.h>
 #include <aws/networkmanager/model/GetDirectConnectGatewayAttachmentRequest.h>
 #include <aws/networkmanager/model/GetDirectConnectGatewayAttachmentResult.h>
+#include <aws/networkmanager/model/GetLinkAssociationsPaginationTraits.h>
 #include <aws/networkmanager/model/GetLinkAssociationsRequest.h>
 #include <aws/networkmanager/model/GetLinkAssociationsResult.h>
+#include <aws/networkmanager/model/GetLinksPaginationTraits.h>
 #include <aws/networkmanager/model/GetLinksRequest.h>
 #include <aws/networkmanager/model/GetLinksResult.h>
+#include <aws/networkmanager/model/GetNetworkResourceCountsPaginationTraits.h>
 #include <aws/networkmanager/model/GetNetworkResourceCountsRequest.h>
 #include <aws/networkmanager/model/GetNetworkResourceCountsResult.h>
+#include <aws/networkmanager/model/GetNetworkResourceRelationshipsPaginationTraits.h>
 #include <aws/networkmanager/model/GetNetworkResourceRelationshipsRequest.h>
 #include <aws/networkmanager/model/GetNetworkResourceRelationshipsResult.h>
+#include <aws/networkmanager/model/GetNetworkResourcesPaginationTraits.h>
 #include <aws/networkmanager/model/GetNetworkResourcesRequest.h>
 #include <aws/networkmanager/model/GetNetworkResourcesResult.h>
 #include <aws/networkmanager/model/GetNetworkRoutesRequest.h>
 #include <aws/networkmanager/model/GetNetworkRoutesResult.h>
+#include <aws/networkmanager/model/GetNetworkTelemetryPaginationTraits.h>
 #include <aws/networkmanager/model/GetNetworkTelemetryRequest.h>
 #include <aws/networkmanager/model/GetNetworkTelemetryResult.h>
 #include <aws/networkmanager/model/GetResourcePolicyRequest.h>
@@ -186,12 +203,15 @@
 #include <aws/networkmanager/model/GetRouteAnalysisResult.h>
 #include <aws/networkmanager/model/GetSiteToSiteVpnAttachmentRequest.h>
 #include <aws/networkmanager/model/GetSiteToSiteVpnAttachmentResult.h>
+#include <aws/networkmanager/model/GetSitesPaginationTraits.h>
 #include <aws/networkmanager/model/GetSitesRequest.h>
 #include <aws/networkmanager/model/GetSitesResult.h>
+#include <aws/networkmanager/model/GetTransitGatewayConnectPeerAssociationsPaginationTraits.h>
 #include <aws/networkmanager/model/GetTransitGatewayConnectPeerAssociationsRequest.h>
 #include <aws/networkmanager/model/GetTransitGatewayConnectPeerAssociationsResult.h>
 #include <aws/networkmanager/model/GetTransitGatewayPeeringRequest.h>
 #include <aws/networkmanager/model/GetTransitGatewayPeeringResult.h>
+#include <aws/networkmanager/model/GetTransitGatewayRegistrationsPaginationTraits.h>
 #include <aws/networkmanager/model/GetTransitGatewayRegistrationsRequest.h>
 #include <aws/networkmanager/model/GetTransitGatewayRegistrationsResult.h>
 #include <aws/networkmanager/model/GetTransitGatewayRouteTableAttachmentRequest.h>
@@ -205,22 +225,30 @@
 #include <aws/networkmanager/model/LinkAssociation.h>
 #include <aws/networkmanager/model/LinkAssociationState.h>
 #include <aws/networkmanager/model/LinkState.h>
+#include <aws/networkmanager/model/ListAttachmentRoutingPolicyAssociationsPaginationTraits.h>
 #include <aws/networkmanager/model/ListAttachmentRoutingPolicyAssociationsRequest.h>
 #include <aws/networkmanager/model/ListAttachmentRoutingPolicyAssociationsResult.h>
+#include <aws/networkmanager/model/ListAttachmentsPaginationTraits.h>
 #include <aws/networkmanager/model/ListAttachmentsRequest.h>
 #include <aws/networkmanager/model/ListAttachmentsResult.h>
+#include <aws/networkmanager/model/ListConnectPeersPaginationTraits.h>
 #include <aws/networkmanager/model/ListConnectPeersRequest.h>
 #include <aws/networkmanager/model/ListConnectPeersResult.h>
+#include <aws/networkmanager/model/ListCoreNetworkPolicyVersionsPaginationTraits.h>
 #include <aws/networkmanager/model/ListCoreNetworkPolicyVersionsRequest.h>
 #include <aws/networkmanager/model/ListCoreNetworkPolicyVersionsResult.h>
+#include <aws/networkmanager/model/ListCoreNetworkPrefixListAssociationsPaginationTraits.h>
 #include <aws/networkmanager/model/ListCoreNetworkPrefixListAssociationsRequest.h>
 #include <aws/networkmanager/model/ListCoreNetworkPrefixListAssociationsResult.h>
+#include <aws/networkmanager/model/ListCoreNetworkRoutingInformationPaginationTraits.h>
 #include <aws/networkmanager/model/ListCoreNetworkRoutingInformationRequest.h>
 #include <aws/networkmanager/model/ListCoreNetworkRoutingInformationResult.h>
+#include <aws/networkmanager/model/ListCoreNetworksPaginationTraits.h>
 #include <aws/networkmanager/model/ListCoreNetworksRequest.h>
 #include <aws/networkmanager/model/ListCoreNetworksResult.h>
 #include <aws/networkmanager/model/ListOrganizationServiceAccessStatusRequest.h>
 #include <aws/networkmanager/model/ListOrganizationServiceAccessStatusResult.h>
+#include <aws/networkmanager/model/ListPeeringsPaginationTraits.h>
 #include <aws/networkmanager/model/ListPeeringsRequest.h>
 #include <aws/networkmanager/model/ListPeeringsResult.h>
 #include <aws/networkmanager/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/networkmonitor-gen-tests/NetworkMonitorIncludeTests.cpp b/generated/tests/networkmonitor-gen-tests/NetworkMonitorIncludeTests.cpp
index d460346ab8ee..8cd8396fb8db 100644
--- a/generated/tests/networkmonitor-gen-tests/NetworkMonitorIncludeTests.cpp
+++ b/generated/tests/networkmonitor-gen-tests/NetworkMonitorIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/networkmonitor/NetworkMonitorClient.h>
+#include <aws/networkmonitor/NetworkMonitorClientPagination.h>
 #include <aws/networkmonitor/NetworkMonitorEndpointProvider.h>
 #include <aws/networkmonitor/NetworkMonitorErrorMarshaller.h>
 #include <aws/networkmonitor/NetworkMonitorErrors.h>
+#include <aws/networkmonitor/NetworkMonitorPaginationBase.h>
 #include <aws/networkmonitor/NetworkMonitorRequest.h>
 #include <aws/networkmonitor/NetworkMonitorServiceClientModel.h>
+#include <aws/networkmonitor/NetworkMonitorWaiter.h>
 #include <aws/networkmonitor/NetworkMonitor_EXPORTS.h>
+#include <aws/networkmonitor/internal/NetworkMonitorEndpointRules.h>
 #include <aws/networkmonitor/model/AddressFamily.h>
 #include <aws/networkmonitor/model/CreateMonitorProbeInput.h>
 #include <aws/networkmonitor/model/CreateMonitorRequest.h>
@@ -27,6 +31,7 @@
 #include <aws/networkmonitor/model/GetMonitorResult.h>
 #include <aws/networkmonitor/model/GetProbeRequest.h>
 #include <aws/networkmonitor/model/GetProbeResult.h>
+#include <aws/networkmonitor/model/ListMonitorsPaginationTraits.h>
 #include <aws/networkmonitor/model/ListMonitorsRequest.h>
 #include <aws/networkmonitor/model/ListMonitorsResult.h>
 #include <aws/networkmonitor/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/notifications-gen-tests/NotificationsIncludeTests.cpp b/generated/tests/notifications-gen-tests/NotificationsIncludeTests.cpp
index 043da377b4be..c8ac38c0ce8e 100644
--- a/generated/tests/notifications-gen-tests/NotificationsIncludeTests.cpp
+++ b/generated/tests/notifications-gen-tests/NotificationsIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/notifications/NotificationsClient.h>
+#include <aws/notifications/NotificationsClientPagination.h>
 #include <aws/notifications/NotificationsEndpointProvider.h>
 #include <aws/notifications/NotificationsErrorMarshaller.h>
 #include <aws/notifications/NotificationsErrors.h>
+#include <aws/notifications/NotificationsPaginationBase.h>
 #include <aws/notifications/NotificationsRequest.h>
 #include <aws/notifications/NotificationsServiceClientModel.h>
+#include <aws/notifications/NotificationsWaiter.h>
 #include <aws/notifications/Notifications_EXPORTS.h>
+#include <aws/notifications/internal/NotificationsEndpointRules.h>
 #include <aws/notifications/model/AccessStatus.h>
 #include <aws/notifications/model/AccountContactType.h>
 #include <aws/notifications/model/AggregationDetail.h>
@@ -72,26 +76,37 @@
 #include <aws/notifications/model/GetNotificationEventResult.h>
 #include <aws/notifications/model/GetNotificationsAccessForOrganizationRequest.h>
 #include <aws/notifications/model/GetNotificationsAccessForOrganizationResult.h>
+#include <aws/notifications/model/ListChannelsPaginationTraits.h>
 #include <aws/notifications/model/ListChannelsRequest.h>
 #include <aws/notifications/model/ListChannelsResult.h>
+#include <aws/notifications/model/ListEventRulesPaginationTraits.h>
 #include <aws/notifications/model/ListEventRulesRequest.h>
 #include <aws/notifications/model/ListEventRulesResult.h>
+#include <aws/notifications/model/ListManagedNotificationChannelAssociationsPaginationTraits.h>
 #include <aws/notifications/model/ListManagedNotificationChannelAssociationsRequest.h>
 #include <aws/notifications/model/ListManagedNotificationChannelAssociationsResult.h>
+#include <aws/notifications/model/ListManagedNotificationChildEventsPaginationTraits.h>
 #include <aws/notifications/model/ListManagedNotificationChildEventsRequest.h>
 #include <aws/notifications/model/ListManagedNotificationChildEventsResult.h>
+#include <aws/notifications/model/ListManagedNotificationConfigurationsPaginationTraits.h>
 #include <aws/notifications/model/ListManagedNotificationConfigurationsRequest.h>
 #include <aws/notifications/model/ListManagedNotificationConfigurationsResult.h>
+#include <aws/notifications/model/ListManagedNotificationEventsPaginationTraits.h>
 #include <aws/notifications/model/ListManagedNotificationEventsRequest.h>
 #include <aws/notifications/model/ListManagedNotificationEventsResult.h>
+#include <aws/notifications/model/ListMemberAccountsPaginationTraits.h>
 #include <aws/notifications/model/ListMemberAccountsRequest.h>
 #include <aws/notifications/model/ListMemberAccountsResult.h>
+#include <aws/notifications/model/ListNotificationConfigurationsPaginationTraits.h>
 #include <aws/notifications/model/ListNotificationConfigurationsRequest.h>
 #include <aws/notifications/model/ListNotificationConfigurationsResult.h>
+#include <aws/notifications/model/ListNotificationEventsPaginationTraits.h>
 #include <aws/notifications/model/ListNotificationEventsRequest.h>
 #include <aws/notifications/model/ListNotificationEventsResult.h>
+#include <aws/notifications/model/ListNotificationHubsPaginationTraits.h>
 #include <aws/notifications/model/ListNotificationHubsRequest.h>
 #include <aws/notifications/model/ListNotificationHubsResult.h>
+#include <aws/notifications/model/ListOrganizationalUnitsPaginationTraits.h>
 #include <aws/notifications/model/ListOrganizationalUnitsRequest.h>
 #include <aws/notifications/model/ListOrganizationalUnitsResult.h>
 #include <aws/notifications/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/notificationscontacts-gen-tests/NotificationsContactsIncludeTests.cpp b/generated/tests/notificationscontacts-gen-tests/NotificationsContactsIncludeTests.cpp
index cc45dde9dab6..bbe68066f65a 100644
--- a/generated/tests/notificationscontacts-gen-tests/NotificationsContactsIncludeTests.cpp
+++ b/generated/tests/notificationscontacts-gen-tests/NotificationsContactsIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/notificationscontacts/NotificationsContactsClient.h>
+#include <aws/notificationscontacts/NotificationsContactsClientPagination.h>
 #include <aws/notificationscontacts/NotificationsContactsEndpointProvider.h>
 #include <aws/notificationscontacts/NotificationsContactsErrorMarshaller.h>
 #include <aws/notificationscontacts/NotificationsContactsErrors.h>
+#include <aws/notificationscontacts/NotificationsContactsPaginationBase.h>
 #include <aws/notificationscontacts/NotificationsContactsRequest.h>
 #include <aws/notificationscontacts/NotificationsContactsServiceClientModel.h>
+#include <aws/notificationscontacts/NotificationsContactsWaiter.h>
 #include <aws/notificationscontacts/NotificationsContacts_EXPORTS.h>
+#include <aws/notificationscontacts/internal/NotificationsContactsEndpointRules.h>
 #include <aws/notificationscontacts/model/ActivateEmailContactRequest.h>
 #include <aws/notificationscontacts/model/ActivateEmailContactResult.h>
 #include <aws/notificationscontacts/model/ConflictException.h>
@@ -24,6 +28,7 @@
 #include <aws/notificationscontacts/model/EmailContactStatus.h>
 #include <aws/notificationscontacts/model/GetEmailContactRequest.h>
 #include <aws/notificationscontacts/model/GetEmailContactResult.h>
+#include <aws/notificationscontacts/model/ListEmailContactsPaginationTraits.h>
 #include <aws/notificationscontacts/model/ListEmailContactsRequest.h>
 #include <aws/notificationscontacts/model/ListEmailContactsResult.h>
 #include <aws/notificationscontacts/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/nova-act-gen-tests/NovaActIncludeTests.cpp b/generated/tests/nova-act-gen-tests/NovaActIncludeTests.cpp
index 0ebcd6a34460..4a67587390ec 100644
--- a/generated/tests/nova-act-gen-tests/NovaActIncludeTests.cpp
+++ b/generated/tests/nova-act-gen-tests/NovaActIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/nova-act/NovaActClient.h>
+#include <aws/nova-act/NovaActClientPagination.h>
 #include <aws/nova-act/NovaActEndpointProvider.h>
 #include <aws/nova-act/NovaActErrorMarshaller.h>
 #include <aws/nova-act/NovaActErrors.h>
+#include <aws/nova-act/NovaActPaginationBase.h>
 #include <aws/nova-act/NovaActRequest.h>
 #include <aws/nova-act/NovaActServiceClientModel.h>
+#include <aws/nova-act/NovaActWaiter.h>
 #include <aws/nova-act/NovaAct_EXPORTS.h>
+#include <aws/nova-act/internal/NovaActEndpointRules.h>
 #include <aws/nova-act/model/ActError.h>
 #include <aws/nova-act/model/ActStatus.h>
 #include <aws/nova-act/model/ActSummary.h>
@@ -42,14 +46,18 @@
 #include <aws/nova-act/model/InternalServerExceptionReason.h>
 #include <aws/nova-act/model/InvokeActStepRequest.h>
 #include <aws/nova-act/model/InvokeActStepResult.h>
+#include <aws/nova-act/model/ListActsPaginationTraits.h>
 #include <aws/nova-act/model/ListActsRequest.h>
 #include <aws/nova-act/model/ListActsResult.h>
 #include <aws/nova-act/model/ListModelsRequest.h>
 #include <aws/nova-act/model/ListModelsResult.h>
+#include <aws/nova-act/model/ListSessionsPaginationTraits.h>
 #include <aws/nova-act/model/ListSessionsRequest.h>
 #include <aws/nova-act/model/ListSessionsResult.h>
+#include <aws/nova-act/model/ListWorkflowDefinitionsPaginationTraits.h>
 #include <aws/nova-act/model/ListWorkflowDefinitionsRequest.h>
 #include <aws/nova-act/model/ListWorkflowDefinitionsResult.h>
+#include <aws/nova-act/model/ListWorkflowRunsPaginationTraits.h>
 #include <aws/nova-act/model/ListWorkflowRunsRequest.h>
 #include <aws/nova-act/model/ListWorkflowRunsResult.h>
 #include <aws/nova-act/model/ModelAlias.h>
diff --git a/generated/tests/oam-gen-tests/OAMIncludeTests.cpp b/generated/tests/oam-gen-tests/OAMIncludeTests.cpp
index 11cbbcd6f8b6..6c2ef0caf433 100644
--- a/generated/tests/oam-gen-tests/OAMIncludeTests.cpp
+++ b/generated/tests/oam-gen-tests/OAMIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/oam/OAMClient.h>
+#include <aws/oam/OAMClientPagination.h>
 #include <aws/oam/OAMEndpointProvider.h>
 #include <aws/oam/OAMErrorMarshaller.h>
 #include <aws/oam/OAMErrors.h>
+#include <aws/oam/OAMPaginationBase.h>
 #include <aws/oam/OAMRequest.h>
 #include <aws/oam/OAMServiceClientModel.h>
+#include <aws/oam/OAMWaiter.h>
 #include <aws/oam/OAM_EXPORTS.h>
+#include <aws/oam/internal/OAMEndpointRules.h>
 #include <aws/oam/model/ConflictException.h>
 #include <aws/oam/model/CreateLinkRequest.h>
 #include <aws/oam/model/CreateLinkResult.h>
@@ -32,12 +36,15 @@
 #include <aws/oam/model/InvalidParameterException.h>
 #include <aws/oam/model/LinkConfiguration.h>
 #include <aws/oam/model/ListAttachedLinksItem.h>
+#include <aws/oam/model/ListAttachedLinksPaginationTraits.h>
 #include <aws/oam/model/ListAttachedLinksRequest.h>
 #include <aws/oam/model/ListAttachedLinksResult.h>
 #include <aws/oam/model/ListLinksItem.h>
+#include <aws/oam/model/ListLinksPaginationTraits.h>
 #include <aws/oam/model/ListLinksRequest.h>
 #include <aws/oam/model/ListLinksResult.h>
 #include <aws/oam/model/ListSinksItem.h>
+#include <aws/oam/model/ListSinksPaginationTraits.h>
 #include <aws/oam/model/ListSinksRequest.h>
 #include <aws/oam/model/ListSinksResult.h>
 #include <aws/oam/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/observabilityadmin-gen-tests/ObservabilityAdminIncludeTests.cpp b/generated/tests/observabilityadmin-gen-tests/ObservabilityAdminIncludeTests.cpp
index de164b4653f8..99ea1930316b 100644
--- a/generated/tests/observabilityadmin-gen-tests/ObservabilityAdminIncludeTests.cpp
+++ b/generated/tests/observabilityadmin-gen-tests/ObservabilityAdminIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/observabilityadmin/ObservabilityAdminClient.h>
+#include <aws/observabilityadmin/ObservabilityAdminClientPagination.h>
 #include <aws/observabilityadmin/ObservabilityAdminEndpointProvider.h>
 #include <aws/observabilityadmin/ObservabilityAdminErrorMarshaller.h>
 #include <aws/observabilityadmin/ObservabilityAdminErrors.h>
+#include <aws/observabilityadmin/ObservabilityAdminPaginationBase.h>
 #include <aws/observabilityadmin/ObservabilityAdminRequest.h>
 #include <aws/observabilityadmin/ObservabilityAdminServiceClientModel.h>
+#include <aws/observabilityadmin/ObservabilityAdminWaiter.h>
 #include <aws/observabilityadmin/ObservabilityAdmin_EXPORTS.h>
+#include <aws/observabilityadmin/internal/ObservabilityAdminEndpointRules.h>
 #include <aws/observabilityadmin/model/AccessDeniedException.h>
 #include <aws/observabilityadmin/model/Action.h>
 #include <aws/observabilityadmin/model/ActionCondition.h>
@@ -77,20 +81,27 @@
 #include <aws/observabilityadmin/model/IntegrationSummary.h>
 #include <aws/observabilityadmin/model/InternalServerException.h>
 #include <aws/observabilityadmin/model/LabelNameCondition.h>
+#include <aws/observabilityadmin/model/ListCentralizationRulesForOrganizationPaginationTraits.h>
 #include <aws/observabilityadmin/model/ListCentralizationRulesForOrganizationRequest.h>
 #include <aws/observabilityadmin/model/ListCentralizationRulesForOrganizationResult.h>
+#include <aws/observabilityadmin/model/ListResourceTelemetryForOrganizationPaginationTraits.h>
 #include <aws/observabilityadmin/model/ListResourceTelemetryForOrganizationRequest.h>
 #include <aws/observabilityadmin/model/ListResourceTelemetryForOrganizationResult.h>
+#include <aws/observabilityadmin/model/ListResourceTelemetryPaginationTraits.h>
 #include <aws/observabilityadmin/model/ListResourceTelemetryRequest.h>
 #include <aws/observabilityadmin/model/ListResourceTelemetryResult.h>
+#include <aws/observabilityadmin/model/ListS3TableIntegrationsPaginationTraits.h>
 #include <aws/observabilityadmin/model/ListS3TableIntegrationsRequest.h>
 #include <aws/observabilityadmin/model/ListS3TableIntegrationsResult.h>
 #include <aws/observabilityadmin/model/ListTagsForResourceRequest.h>
 #include <aws/observabilityadmin/model/ListTagsForResourceResult.h>
+#include <aws/observabilityadmin/model/ListTelemetryPipelinesPaginationTraits.h>
 #include <aws/observabilityadmin/model/ListTelemetryPipelinesRequest.h>
 #include <aws/observabilityadmin/model/ListTelemetryPipelinesResult.h>
+#include <aws/observabilityadmin/model/ListTelemetryRulesForOrganizationPaginationTraits.h>
 #include <aws/observabilityadmin/model/ListTelemetryRulesForOrganizationRequest.h>
 #include <aws/observabilityadmin/model/ListTelemetryRulesForOrganizationResult.h>
+#include <aws/observabilityadmin/model/ListTelemetryRulesPaginationTraits.h>
 #include <aws/observabilityadmin/model/ListTelemetryRulesRequest.h>
 #include <aws/observabilityadmin/model/ListTelemetryRulesResult.h>
 #include <aws/observabilityadmin/model/LogDeliveryParameters.h>
diff --git a/generated/tests/odb-gen-tests/OdbIncludeTests.cpp b/generated/tests/odb-gen-tests/OdbIncludeTests.cpp
index 8dd9a7fc352f..4124fcb887d5 100644
--- a/generated/tests/odb-gen-tests/OdbIncludeTests.cpp
+++ b/generated/tests/odb-gen-tests/OdbIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/odb/OdbClient.h>
+#include <aws/odb/OdbClientPagination.h>
 #include <aws/odb/OdbEndpointProvider.h>
 #include <aws/odb/OdbErrorMarshaller.h>
 #include <aws/odb/OdbErrors.h>
+#include <aws/odb/OdbPaginationBase.h>
 #include <aws/odb/OdbRequest.h>
 #include <aws/odb/OdbServiceClientModel.h>
+#include <aws/odb/OdbWaiter.h>
 #include <aws/odb/Odb_EXPORTS.h>
+#include <aws/odb/internal/OdbEndpointRules.h>
 #include <aws/odb/model/AcceptMarketplaceRegistrationRequest.h>
 #include <aws/odb/model/AcceptMarketplaceRegistrationResult.h>
 #include <aws/odb/model/Access.h>
@@ -184,44 +188,64 @@
 #include <aws/odb/model/IormLifecycleState.h>
 #include <aws/odb/model/KmsAccess.h>
 #include <aws/odb/model/LicenseModel.h>
+#include <aws/odb/model/ListAutonomousDatabaseBackupsPaginationTraits.h>
 #include <aws/odb/model/ListAutonomousDatabaseBackupsRequest.h>
 #include <aws/odb/model/ListAutonomousDatabaseBackupsResult.h>
+#include <aws/odb/model/ListAutonomousDatabaseCharacterSetsPaginationTraits.h>
 #include <aws/odb/model/ListAutonomousDatabaseCharacterSetsRequest.h>
 #include <aws/odb/model/ListAutonomousDatabaseCharacterSetsResult.h>
+#include <aws/odb/model/ListAutonomousDatabaseClonesPaginationTraits.h>
 #include <aws/odb/model/ListAutonomousDatabaseClonesRequest.h>
 #include <aws/odb/model/ListAutonomousDatabaseClonesResult.h>
+#include <aws/odb/model/ListAutonomousDatabasePeersPaginationTraits.h>
 #include <aws/odb/model/ListAutonomousDatabasePeersRequest.h>
 #include <aws/odb/model/ListAutonomousDatabasePeersResult.h>
+#include <aws/odb/model/ListAutonomousDatabaseVersionsPaginationTraits.h>
 #include <aws/odb/model/ListAutonomousDatabaseVersionsRequest.h>
 #include <aws/odb/model/ListAutonomousDatabaseVersionsResult.h>
+#include <aws/odb/model/ListAutonomousDatabasesPaginationTraits.h>
 #include <aws/odb/model/ListAutonomousDatabasesRequest.h>
 #include <aws/odb/model/ListAutonomousDatabasesResult.h>
+#include <aws/odb/model/ListAutonomousVirtualMachinesPaginationTraits.h>
 #include <aws/odb/model/ListAutonomousVirtualMachinesRequest.h>
 #include <aws/odb/model/ListAutonomousVirtualMachinesResult.h>
+#include <aws/odb/model/ListCloudAutonomousVmClustersPaginationTraits.h>
 #include <aws/odb/model/ListCloudAutonomousVmClustersRequest.h>
 #include <aws/odb/model/ListCloudAutonomousVmClustersResult.h>
+#include <aws/odb/model/ListCloudExadataInfrastructuresPaginationTraits.h>
 #include <aws/odb/model/ListCloudExadataInfrastructuresRequest.h>
 #include <aws/odb/model/ListCloudExadataInfrastructuresResult.h>
+#include <aws/odb/model/ListCloudVmClustersPaginationTraits.h>
 #include <aws/odb/model/ListCloudVmClustersRequest.h>
 #include <aws/odb/model/ListCloudVmClustersResult.h>
+#include <aws/odb/model/ListDbNodesPaginationTraits.h>
 #include <aws/odb/model/ListDbNodesRequest.h>
 #include <aws/odb/model/ListDbNodesResult.h>
+#include <aws/odb/model/ListDbServersPaginationTraits.h>
 #include <aws/odb/model/ListDbServersRequest.h>
 #include <aws/odb/model/ListDbServersResult.h>
+#include <aws/odb/model/ListDbSystemShapesPaginationTraits.h>
 #include <aws/odb/model/ListDbSystemShapesRequest.h>
 #include <aws/odb/model/ListDbSystemShapesResult.h>
+#include <aws/odb/model/ListExadbVmClustersPaginationTraits.h>
 #include <aws/odb/model/ListExadbVmClustersRequest.h>
 #include <aws/odb/model/ListExadbVmClustersResult.h>
+#include <aws/odb/model/ListExascaleDbStorageVaultsPaginationTraits.h>
 #include <aws/odb/model/ListExascaleDbStorageVaultsRequest.h>
 #include <aws/odb/model/ListExascaleDbStorageVaultsResult.h>
+#include <aws/odb/model/ListGiMinorVersionsPaginationTraits.h>
 #include <aws/odb/model/ListGiMinorVersionsRequest.h>
 #include <aws/odb/model/ListGiMinorVersionsResult.h>
+#include <aws/odb/model/ListGiVersionsPaginationTraits.h>
 #include <aws/odb/model/ListGiVersionsRequest.h>
 #include <aws/odb/model/ListGiVersionsResult.h>
+#include <aws/odb/model/ListOdbNetworksPaginationTraits.h>
 #include <aws/odb/model/ListOdbNetworksRequest.h>
 #include <aws/odb/model/ListOdbNetworksResult.h>
+#include <aws/odb/model/ListOdbPeeringConnectionsPaginationTraits.h>
 #include <aws/odb/model/ListOdbPeeringConnectionsRequest.h>
 #include <aws/odb/model/ListOdbPeeringConnectionsResult.h>
+#include <aws/odb/model/ListSystemVersionsPaginationTraits.h>
 #include <aws/odb/model/ListSystemVersionsRequest.h>
 #include <aws/odb/model/ListSystemVersionsResult.h>
 #include <aws/odb/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/omics-gen-tests/OmicsIncludeTests.cpp b/generated/tests/omics-gen-tests/OmicsIncludeTests.cpp
index 8887f4a797ae..679018b61ff3 100644
--- a/generated/tests/omics-gen-tests/OmicsIncludeTests.cpp
+++ b/generated/tests/omics-gen-tests/OmicsIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/omics/OmicsClient.h>
+#include <aws/omics/OmicsClientPagination.h>
 #include <aws/omics/OmicsEndpointProvider.h>
 #include <aws/omics/OmicsErrorMarshaller.h>
 #include <aws/omics/OmicsErrors.h>
+#include <aws/omics/OmicsPaginationBase.h>
 #include <aws/omics/OmicsRequest.h>
 #include <aws/omics/OmicsServiceClientModel.h>
+#include <aws/omics/OmicsWaiter.h>
 #include <aws/omics/Omics_EXPORTS.h>
+#include <aws/omics/internal/OmicsEndpointRules.h>
 #include <aws/omics/model/AbortMultipartReadSetUploadRequest.h>
 #include <aws/omics/model/AbortMultipartReadSetUploadResult.h>
 #include <aws/omics/model/Accelerators.h>
@@ -174,60 +178,85 @@
 #include <aws/omics/model/InlineSetting.h>
 #include <aws/omics/model/JobStatus.h>
 #include <aws/omics/model/ListAnnotationImportJobsFilter.h>
+#include <aws/omics/model/ListAnnotationImportJobsPaginationTraits.h>
 #include <aws/omics/model/ListAnnotationImportJobsRequest.h>
 #include <aws/omics/model/ListAnnotationImportJobsResult.h>
 #include <aws/omics/model/ListAnnotationStoreVersionsFilter.h>
+#include <aws/omics/model/ListAnnotationStoreVersionsPaginationTraits.h>
 #include <aws/omics/model/ListAnnotationStoreVersionsRequest.h>
 #include <aws/omics/model/ListAnnotationStoreVersionsResult.h>
 #include <aws/omics/model/ListAnnotationStoresFilter.h>
+#include <aws/omics/model/ListAnnotationStoresPaginationTraits.h>
 #include <aws/omics/model/ListAnnotationStoresRequest.h>
 #include <aws/omics/model/ListAnnotationStoresResult.h>
+#include <aws/omics/model/ListBatchPaginationTraits.h>
 #include <aws/omics/model/ListBatchRequest.h>
 #include <aws/omics/model/ListBatchResult.h>
+#include <aws/omics/model/ListConfigurationsPaginationTraits.h>
 #include <aws/omics/model/ListConfigurationsRequest.h>
 #include <aws/omics/model/ListConfigurationsResult.h>
+#include <aws/omics/model/ListMultipartReadSetUploadsPaginationTraits.h>
 #include <aws/omics/model/ListMultipartReadSetUploadsRequest.h>
 #include <aws/omics/model/ListMultipartReadSetUploadsResult.h>
+#include <aws/omics/model/ListReadSetActivationJobsPaginationTraits.h>
 #include <aws/omics/model/ListReadSetActivationJobsRequest.h>
 #include <aws/omics/model/ListReadSetActivationJobsResult.h>
+#include <aws/omics/model/ListReadSetExportJobsPaginationTraits.h>
 #include <aws/omics/model/ListReadSetExportJobsRequest.h>
 #include <aws/omics/model/ListReadSetExportJobsResult.h>
+#include <aws/omics/model/ListReadSetImportJobsPaginationTraits.h>
 #include <aws/omics/model/ListReadSetImportJobsRequest.h>
 #include <aws/omics/model/ListReadSetImportJobsResult.h>
+#include <aws/omics/model/ListReadSetUploadPartsPaginationTraits.h>
 #include <aws/omics/model/ListReadSetUploadPartsRequest.h>
 #include <aws/omics/model/ListReadSetUploadPartsResult.h>
+#include <aws/omics/model/ListReadSetsPaginationTraits.h>
 #include <aws/omics/model/ListReadSetsRequest.h>
 #include <aws/omics/model/ListReadSetsResult.h>
+#include <aws/omics/model/ListReferenceImportJobsPaginationTraits.h>
 #include <aws/omics/model/ListReferenceImportJobsRequest.h>
 #include <aws/omics/model/ListReferenceImportJobsResult.h>
+#include <aws/omics/model/ListReferenceStoresPaginationTraits.h>
 #include <aws/omics/model/ListReferenceStoresRequest.h>
 #include <aws/omics/model/ListReferenceStoresResult.h>
+#include <aws/omics/model/ListReferencesPaginationTraits.h>
 #include <aws/omics/model/ListReferencesRequest.h>
 #include <aws/omics/model/ListReferencesResult.h>
+#include <aws/omics/model/ListRunCachesPaginationTraits.h>
 #include <aws/omics/model/ListRunCachesRequest.h>
 #include <aws/omics/model/ListRunCachesResult.h>
+#include <aws/omics/model/ListRunGroupsPaginationTraits.h>
 #include <aws/omics/model/ListRunGroupsRequest.h>
 #include <aws/omics/model/ListRunGroupsResult.h>
+#include <aws/omics/model/ListRunTasksPaginationTraits.h>
 #include <aws/omics/model/ListRunTasksRequest.h>
 #include <aws/omics/model/ListRunTasksResult.h>
+#include <aws/omics/model/ListRunsInBatchPaginationTraits.h>
 #include <aws/omics/model/ListRunsInBatchRequest.h>
 #include <aws/omics/model/ListRunsInBatchResult.h>
+#include <aws/omics/model/ListRunsPaginationTraits.h>
 #include <aws/omics/model/ListRunsRequest.h>
 #include <aws/omics/model/ListRunsResult.h>
+#include <aws/omics/model/ListSequenceStoresPaginationTraits.h>
 #include <aws/omics/model/ListSequenceStoresRequest.h>
 #include <aws/omics/model/ListSequenceStoresResult.h>
+#include <aws/omics/model/ListSharesPaginationTraits.h>
 #include <aws/omics/model/ListSharesRequest.h>
 #include <aws/omics/model/ListSharesResult.h>
 #include <aws/omics/model/ListTagsForResourceRequest.h>
 #include <aws/omics/model/ListTagsForResourceResult.h>
 #include <aws/omics/model/ListVariantImportJobsFilter.h>
+#include <aws/omics/model/ListVariantImportJobsPaginationTraits.h>
 #include <aws/omics/model/ListVariantImportJobsRequest.h>
 #include <aws/omics/model/ListVariantImportJobsResult.h>
 #include <aws/omics/model/ListVariantStoresFilter.h>
+#include <aws/omics/model/ListVariantStoresPaginationTraits.h>
 #include <aws/omics/model/ListVariantStoresRequest.h>
 #include <aws/omics/model/ListVariantStoresResult.h>
+#include <aws/omics/model/ListWorkflowVersionsPaginationTraits.h>
 #include <aws/omics/model/ListWorkflowVersionsRequest.h>
 #include <aws/omics/model/ListWorkflowVersionsResult.h>
+#include <aws/omics/model/ListWorkflowsPaginationTraits.h>
 #include <aws/omics/model/ListWorkflowsRequest.h>
 #include <aws/omics/model/ListWorkflowsResult.h>
 #include <aws/omics/model/MultipartReadSetUploadListItem.h>
diff --git a/generated/tests/opensearch-gen-tests/OpenSearchServiceIncludeTests.cpp b/generated/tests/opensearch-gen-tests/OpenSearchServiceIncludeTests.cpp
index c154afb20f08..ea889f6b29ba 100644
--- a/generated/tests/opensearch-gen-tests/OpenSearchServiceIncludeTests.cpp
+++ b/generated/tests/opensearch-gen-tests/OpenSearchServiceIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/opensearch/OpenSearchServiceClient.h>
+#include <aws/opensearch/OpenSearchServiceClientPagination.h>
 #include <aws/opensearch/OpenSearchServiceEndpointProvider.h>
 #include <aws/opensearch/OpenSearchServiceErrorMarshaller.h>
 #include <aws/opensearch/OpenSearchServiceErrors.h>
+#include <aws/opensearch/OpenSearchServicePaginationBase.h>
 #include <aws/opensearch/OpenSearchServiceRequest.h>
 #include <aws/opensearch/OpenSearchServiceServiceClientModel.h>
+#include <aws/opensearch/OpenSearchServiceWaiter.h>
 #include <aws/opensearch/OpenSearchService_EXPORTS.h>
+#include <aws/opensearch/internal/OpenSearchServiceEndpointRules.h>
 #include <aws/opensearch/model/AIConfig.h>
 #include <aws/opensearch/model/AIMLOptionsInput.h>
 #include <aws/opensearch/model/AIMLOptionsOutput.h>
@@ -131,6 +135,7 @@
 #include <aws/opensearch/model/DeregisterCapabilityResult.h>
 #include <aws/opensearch/model/DescribeDataSourceAttachmentRequest.h>
 #include <aws/opensearch/model/DescribeDataSourceAttachmentResult.h>
+#include <aws/opensearch/model/DescribeDomainAutoTunesPaginationTraits.h>
 #include <aws/opensearch/model/DescribeDomainAutoTunesRequest.h>
 #include <aws/opensearch/model/DescribeDomainAutoTunesResult.h>
 #include <aws/opensearch/model/DescribeDomainChangeProgressRequest.h>
@@ -147,20 +152,25 @@
 #include <aws/opensearch/model/DescribeDomainsResult.h>
 #include <aws/opensearch/model/DescribeDryRunProgressRequest.h>
 #include <aws/opensearch/model/DescribeDryRunProgressResult.h>
+#include <aws/opensearch/model/DescribeInboundConnectionsPaginationTraits.h>
 #include <aws/opensearch/model/DescribeInboundConnectionsRequest.h>
 #include <aws/opensearch/model/DescribeInboundConnectionsResult.h>
 #include <aws/opensearch/model/DescribeInsightDetailsRequest.h>
 #include <aws/opensearch/model/DescribeInsightDetailsResult.h>
 #include <aws/opensearch/model/DescribeInstanceTypeLimitsRequest.h>
 #include <aws/opensearch/model/DescribeInstanceTypeLimitsResult.h>
+#include <aws/opensearch/model/DescribeOutboundConnectionsPaginationTraits.h>
 #include <aws/opensearch/model/DescribeOutboundConnectionsRequest.h>
 #include <aws/opensearch/model/DescribeOutboundConnectionsResult.h>
 #include <aws/opensearch/model/DescribePackagesFilter.h>
 #include <aws/opensearch/model/DescribePackagesFilterName.h>
+#include <aws/opensearch/model/DescribePackagesPaginationTraits.h>
 #include <aws/opensearch/model/DescribePackagesRequest.h>
 #include <aws/opensearch/model/DescribePackagesResult.h>
+#include <aws/opensearch/model/DescribeReservedInstanceOfferingsPaginationTraits.h>
 #include <aws/opensearch/model/DescribeReservedInstanceOfferingsRequest.h>
 #include <aws/opensearch/model/DescribeReservedInstanceOfferingsResult.h>
+#include <aws/opensearch/model/DescribeReservedInstancesPaginationTraits.h>
 #include <aws/opensearch/model/DescribeReservedInstancesRequest.h>
 #include <aws/opensearch/model/DescribeReservedInstancesResult.h>
 #include <aws/opensearch/model/DescribeVpcEndpointsRequest.h>
@@ -220,8 +230,10 @@
 #include <aws/opensearch/model/GetIndexResult.h>
 #include <aws/opensearch/model/GetMigrationRequest.h>
 #include <aws/opensearch/model/GetMigrationResult.h>
+#include <aws/opensearch/model/GetPackageVersionHistoryPaginationTraits.h>
 #include <aws/opensearch/model/GetPackageVersionHistoryRequest.h>
 #include <aws/opensearch/model/GetPackageVersionHistoryResult.h>
+#include <aws/opensearch/model/GetUpgradeHistoryPaginationTraits.h>
 #include <aws/opensearch/model/GetUpgradeHistoryRequest.h>
 #include <aws/opensearch/model/GetUpgradeHistoryResult.h>
 #include <aws/opensearch/model/GetUpgradeStatusRequest.h>
@@ -263,6 +275,7 @@
 #include <aws/opensearch/model/JWTOptionsOutput.h>
 #include <aws/opensearch/model/KeyStoreAccessOption.h>
 #include <aws/opensearch/model/Limits.h>
+#include <aws/opensearch/model/ListApplicationsPaginationTraits.h>
 #include <aws/opensearch/model/ListApplicationsRequest.h>
 #include <aws/opensearch/model/ListApplicationsResult.h>
 #include <aws/opensearch/model/ListDataSourceAttachmentsRequest.h>
@@ -271,24 +284,30 @@
 #include <aws/opensearch/model/ListDataSourcesResult.h>
 #include <aws/opensearch/model/ListDirectQueryDataSourcesRequest.h>
 #include <aws/opensearch/model/ListDirectQueryDataSourcesResult.h>
+#include <aws/opensearch/model/ListDomainMaintenancesPaginationTraits.h>
 #include <aws/opensearch/model/ListDomainMaintenancesRequest.h>
 #include <aws/opensearch/model/ListDomainMaintenancesResult.h>
 #include <aws/opensearch/model/ListDomainNamesRequest.h>
 #include <aws/opensearch/model/ListDomainNamesResult.h>
+#include <aws/opensearch/model/ListDomainsForPackagePaginationTraits.h>
 #include <aws/opensearch/model/ListDomainsForPackageRequest.h>
 #include <aws/opensearch/model/ListDomainsForPackageResult.h>
 #include <aws/opensearch/model/ListInsightsRequest.h>
 #include <aws/opensearch/model/ListInsightsResult.h>
+#include <aws/opensearch/model/ListInstanceTypeDetailsPaginationTraits.h>
 #include <aws/opensearch/model/ListInstanceTypeDetailsRequest.h>
 #include <aws/opensearch/model/ListInstanceTypeDetailsResult.h>
 #include <aws/opensearch/model/ListMigrationsRequest.h>
 #include <aws/opensearch/model/ListMigrationsResult.h>
+#include <aws/opensearch/model/ListPackagesForDomainPaginationTraits.h>
 #include <aws/opensearch/model/ListPackagesForDomainRequest.h>
 #include <aws/opensearch/model/ListPackagesForDomainResult.h>
+#include <aws/opensearch/model/ListScheduledActionsPaginationTraits.h>
 #include <aws/opensearch/model/ListScheduledActionsRequest.h>
 #include <aws/opensearch/model/ListScheduledActionsResult.h>
 #include <aws/opensearch/model/ListTagsRequest.h>
 #include <aws/opensearch/model/ListTagsResult.h>
+#include <aws/opensearch/model/ListVersionsPaginationTraits.h>
 #include <aws/opensearch/model/ListVersionsRequest.h>
 #include <aws/opensearch/model/ListVersionsResult.h>
 #include <aws/opensearch/model/ListVpcEndpointAccessRequest.h>
diff --git a/generated/tests/opensearchserverless-gen-tests/OpenSearchServerlessIncludeTests.cpp b/generated/tests/opensearchserverless-gen-tests/OpenSearchServerlessIncludeTests.cpp
index 0d48e6e08ef7..d9bdf225060b 100644
--- a/generated/tests/opensearchserverless-gen-tests/OpenSearchServerlessIncludeTests.cpp
+++ b/generated/tests/opensearchserverless-gen-tests/OpenSearchServerlessIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/opensearchserverless/OpenSearchServerlessClient.h>
+#include <aws/opensearchserverless/OpenSearchServerlessClientPagination.h>
 #include <aws/opensearchserverless/OpenSearchServerlessEndpointProvider.h>
 #include <aws/opensearchserverless/OpenSearchServerlessErrorMarshaller.h>
 #include <aws/opensearchserverless/OpenSearchServerlessErrors.h>
+#include <aws/opensearchserverless/OpenSearchServerlessPaginationBase.h>
 #include <aws/opensearchserverless/OpenSearchServerlessRequest.h>
 #include <aws/opensearchserverless/OpenSearchServerlessServiceClientModel.h>
+#include <aws/opensearchserverless/OpenSearchServerlessWaiter.h>
 #include <aws/opensearchserverless/OpenSearchServerless_EXPORTS.h>
+#include <aws/opensearchserverless/internal/OpenSearchServerlessEndpointRules.h>
 #include <aws/opensearchserverless/model/AccessPolicyDetail.h>
 #include <aws/opensearchserverless/model/AccessPolicyStats.h>
 #include <aws/opensearchserverless/model/AccessPolicySummary.h>
@@ -108,20 +112,27 @@
 #include <aws/opensearchserverless/model/LifecyclePolicyStats.h>
 #include <aws/opensearchserverless/model/LifecyclePolicySummary.h>
 #include <aws/opensearchserverless/model/LifecyclePolicyType.h>
+#include <aws/opensearchserverless/model/ListAccessPoliciesPaginationTraits.h>
 #include <aws/opensearchserverless/model/ListAccessPoliciesRequest.h>
 #include <aws/opensearchserverless/model/ListAccessPoliciesResult.h>
+#include <aws/opensearchserverless/model/ListCollectionGroupsPaginationTraits.h>
 #include <aws/opensearchserverless/model/ListCollectionGroupsRequest.h>
 #include <aws/opensearchserverless/model/ListCollectionGroupsResult.h>
+#include <aws/opensearchserverless/model/ListCollectionsPaginationTraits.h>
 #include <aws/opensearchserverless/model/ListCollectionsRequest.h>
 #include <aws/opensearchserverless/model/ListCollectionsResult.h>
+#include <aws/opensearchserverless/model/ListLifecyclePoliciesPaginationTraits.h>
 #include <aws/opensearchserverless/model/ListLifecyclePoliciesRequest.h>
 #include <aws/opensearchserverless/model/ListLifecyclePoliciesResult.h>
+#include <aws/opensearchserverless/model/ListSecurityConfigsPaginationTraits.h>
 #include <aws/opensearchserverless/model/ListSecurityConfigsRequest.h>
 #include <aws/opensearchserverless/model/ListSecurityConfigsResult.h>
+#include <aws/opensearchserverless/model/ListSecurityPoliciesPaginationTraits.h>
 #include <aws/opensearchserverless/model/ListSecurityPoliciesRequest.h>
 #include <aws/opensearchserverless/model/ListSecurityPoliciesResult.h>
 #include <aws/opensearchserverless/model/ListTagsForResourceRequest.h>
 #include <aws/opensearchserverless/model/ListTagsForResourceResult.h>
+#include <aws/opensearchserverless/model/ListVpcEndpointsPaginationTraits.h>
 #include <aws/opensearchserverless/model/ListVpcEndpointsRequest.h>
 #include <aws/opensearchserverless/model/ListVpcEndpointsResult.h>
 #include <aws/opensearchserverless/model/ResourceType.h>
diff --git a/generated/tests/organizations-gen-tests/OrganizationsIncludeTests.cpp b/generated/tests/organizations-gen-tests/OrganizationsIncludeTests.cpp
index f038dd532043..cc0e7b8eff5d 100644
--- a/generated/tests/organizations-gen-tests/OrganizationsIncludeTests.cpp
+++ b/generated/tests/organizations-gen-tests/OrganizationsIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/organizations/OrganizationsClient.h>
+#include <aws/organizations/OrganizationsClientPagination.h>
 #include <aws/organizations/OrganizationsEndpointProvider.h>
 #include <aws/organizations/OrganizationsErrorMarshaller.h>
 #include <aws/organizations/OrganizationsErrors.h>
+#include <aws/organizations/OrganizationsPaginationBase.h>
 #include <aws/organizations/OrganizationsRequest.h>
 #include <aws/organizations/OrganizationsServiceClientModel.h>
+#include <aws/organizations/OrganizationsWaiter.h>
 #include <aws/organizations/Organizations_EXPORTS.h>
+#include <aws/organizations/internal/OrganizationsEndpointRules.h>
 #include <aws/organizations/model/AcceptHandshakeRequest.h>
 #include <aws/organizations/model/AcceptHandshakeResult.h>
 #include <aws/organizations/model/AccessDeniedForDependencyException.h>
@@ -100,44 +104,62 @@
 #include <aws/organizations/model/InviteOrganizationToTransferResponsibilityRequest.h>
 #include <aws/organizations/model/InviteOrganizationToTransferResponsibilityResult.h>
 #include <aws/organizations/model/LeaveOrganizationRequest.h>
+#include <aws/organizations/model/ListAWSServiceAccessForOrganizationPaginationTraits.h>
 #include <aws/organizations/model/ListAWSServiceAccessForOrganizationRequest.h>
 #include <aws/organizations/model/ListAWSServiceAccessForOrganizationResult.h>
+#include <aws/organizations/model/ListAccountsForParentPaginationTraits.h>
 #include <aws/organizations/model/ListAccountsForParentRequest.h>
 #include <aws/organizations/model/ListAccountsForParentResult.h>
+#include <aws/organizations/model/ListAccountsPaginationTraits.h>
 #include <aws/organizations/model/ListAccountsRequest.h>
 #include <aws/organizations/model/ListAccountsResult.h>
+#include <aws/organizations/model/ListAccountsWithInvalidEffectivePolicyPaginationTraits.h>
 #include <aws/organizations/model/ListAccountsWithInvalidEffectivePolicyRequest.h>
 #include <aws/organizations/model/ListAccountsWithInvalidEffectivePolicyResult.h>
+#include <aws/organizations/model/ListChildrenPaginationTraits.h>
 #include <aws/organizations/model/ListChildrenRequest.h>
 #include <aws/organizations/model/ListChildrenResult.h>
+#include <aws/organizations/model/ListCreateAccountStatusPaginationTraits.h>
 #include <aws/organizations/model/ListCreateAccountStatusRequest.h>
 #include <aws/organizations/model/ListCreateAccountStatusResult.h>
+#include <aws/organizations/model/ListDelegatedAdministratorsPaginationTraits.h>
 #include <aws/organizations/model/ListDelegatedAdministratorsRequest.h>
 #include <aws/organizations/model/ListDelegatedAdministratorsResult.h>
+#include <aws/organizations/model/ListDelegatedServicesForAccountPaginationTraits.h>
 #include <aws/organizations/model/ListDelegatedServicesForAccountRequest.h>
 #include <aws/organizations/model/ListDelegatedServicesForAccountResult.h>
+#include <aws/organizations/model/ListEffectivePolicyValidationErrorsPaginationTraits.h>
 #include <aws/organizations/model/ListEffectivePolicyValidationErrorsRequest.h>
 #include <aws/organizations/model/ListEffectivePolicyValidationErrorsResult.h>
+#include <aws/organizations/model/ListHandshakesForAccountPaginationTraits.h>
 #include <aws/organizations/model/ListHandshakesForAccountRequest.h>
 #include <aws/organizations/model/ListHandshakesForAccountResult.h>
+#include <aws/organizations/model/ListHandshakesForOrganizationPaginationTraits.h>
 #include <aws/organizations/model/ListHandshakesForOrganizationRequest.h>
 #include <aws/organizations/model/ListHandshakesForOrganizationResult.h>
 #include <aws/organizations/model/ListInboundResponsibilityTransfersRequest.h>
 #include <aws/organizations/model/ListInboundResponsibilityTransfersResult.h>
+#include <aws/organizations/model/ListOrganizationalUnitsForParentPaginationTraits.h>
 #include <aws/organizations/model/ListOrganizationalUnitsForParentRequest.h>
 #include <aws/organizations/model/ListOrganizationalUnitsForParentResult.h>
 #include <aws/organizations/model/ListOutboundResponsibilityTransfersRequest.h>
 #include <aws/organizations/model/ListOutboundResponsibilityTransfersResult.h>
+#include <aws/organizations/model/ListParentsPaginationTraits.h>
 #include <aws/organizations/model/ListParentsRequest.h>
 #include <aws/organizations/model/ListParentsResult.h>
+#include <aws/organizations/model/ListPoliciesForTargetPaginationTraits.h>
 #include <aws/organizations/model/ListPoliciesForTargetRequest.h>
 #include <aws/organizations/model/ListPoliciesForTargetResult.h>
+#include <aws/organizations/model/ListPoliciesPaginationTraits.h>
 #include <aws/organizations/model/ListPoliciesRequest.h>
 #include <aws/organizations/model/ListPoliciesResult.h>
+#include <aws/organizations/model/ListRootsPaginationTraits.h>
 #include <aws/organizations/model/ListRootsRequest.h>
 #include <aws/organizations/model/ListRootsResult.h>
+#include <aws/organizations/model/ListTagsForResourcePaginationTraits.h>
 #include <aws/organizations/model/ListTagsForResourceRequest.h>
 #include <aws/organizations/model/ListTagsForResourceResult.h>
+#include <aws/organizations/model/ListTargetsForPolicyPaginationTraits.h>
 #include <aws/organizations/model/ListTargetsForPolicyRequest.h>
 #include <aws/organizations/model/ListTargetsForPolicyResult.h>
 #include <aws/organizations/model/MoveAccountRequest.h>
diff --git a/generated/tests/osis-gen-tests/OSISIncludeTests.cpp b/generated/tests/osis-gen-tests/OSISIncludeTests.cpp
index 3d9c8a9483af..b4b571762e3a 100644
--- a/generated/tests/osis-gen-tests/OSISIncludeTests.cpp
+++ b/generated/tests/osis-gen-tests/OSISIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/osis/OSISClient.h>
+#include <aws/osis/OSISClientPagination.h>
 #include <aws/osis/OSISEndpointProvider.h>
 #include <aws/osis/OSISErrorMarshaller.h>
 #include <aws/osis/OSISErrors.h>
+#include <aws/osis/OSISPaginationBase.h>
 #include <aws/osis/OSISRequest.h>
 #include <aws/osis/OSISServiceClientModel.h>
+#include <aws/osis/OSISWaiter.h>
 #include <aws/osis/OSIS_EXPORTS.h>
+#include <aws/osis/internal/OSISEndpointRules.h>
 #include <aws/osis/model/BufferOptions.h>
 #include <aws/osis/model/ChangeProgressStage.h>
 #include <aws/osis/model/ChangeProgressStageStatuses.h>
@@ -40,10 +44,13 @@
 #include <aws/osis/model/GetResourcePolicyResult.h>
 #include <aws/osis/model/ListPipelineBlueprintsRequest.h>
 #include <aws/osis/model/ListPipelineBlueprintsResult.h>
+#include <aws/osis/model/ListPipelineEndpointConnectionsPaginationTraits.h>
 #include <aws/osis/model/ListPipelineEndpointConnectionsRequest.h>
 #include <aws/osis/model/ListPipelineEndpointConnectionsResult.h>
+#include <aws/osis/model/ListPipelineEndpointsPaginationTraits.h>
 #include <aws/osis/model/ListPipelineEndpointsRequest.h>
 #include <aws/osis/model/ListPipelineEndpointsResult.h>
+#include <aws/osis/model/ListPipelinesPaginationTraits.h>
 #include <aws/osis/model/ListPipelinesRequest.h>
 #include <aws/osis/model/ListPipelinesResult.h>
 #include <aws/osis/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/outposts-gen-tests/OutpostsIncludeTests.cpp b/generated/tests/outposts-gen-tests/OutpostsIncludeTests.cpp
index a6d49ee125fb..da52f521b776 100644
--- a/generated/tests/outposts-gen-tests/OutpostsIncludeTests.cpp
+++ b/generated/tests/outposts-gen-tests/OutpostsIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/outposts/OutpostsClient.h>
+#include <aws/outposts/OutpostsClientPagination.h>
 #include <aws/outposts/OutpostsEndpointProvider.h>
 #include <aws/outposts/OutpostsErrorMarshaller.h>
 #include <aws/outposts/OutpostsErrors.h>
+#include <aws/outposts/OutpostsPaginationBase.h>
 #include <aws/outposts/OutpostsRequest.h>
 #include <aws/outposts/OutpostsServiceClientModel.h>
+#include <aws/outposts/OutpostsWaiter.h>
 #include <aws/outposts/Outposts_EXPORTS.h>
+#include <aws/outposts/internal/OutpostsEndpointRules.h>
 #include <aws/outposts/model/AWSServiceName.h>
 #include <aws/outposts/model/Address.h>
 #include <aws/outposts/model/AddressType.h>
@@ -71,12 +75,15 @@
 #include <aws/outposts/model/GetConnectionResult.h>
 #include <aws/outposts/model/GetOrderRequest.h>
 #include <aws/outposts/model/GetOrderResult.h>
+#include <aws/outposts/model/GetOutpostBillingInformationPaginationTraits.h>
 #include <aws/outposts/model/GetOutpostBillingInformationRequest.h>
 #include <aws/outposts/model/GetOutpostBillingInformationResult.h>
+#include <aws/outposts/model/GetOutpostInstanceTypesPaginationTraits.h>
 #include <aws/outposts/model/GetOutpostInstanceTypesRequest.h>
 #include <aws/outposts/model/GetOutpostInstanceTypesResult.h>
 #include <aws/outposts/model/GetOutpostRequest.h>
 #include <aws/outposts/model/GetOutpostResult.h>
+#include <aws/outposts/model/GetOutpostSupportedInstanceTypesPaginationTraits.h>
 #include <aws/outposts/model/GetOutpostSupportedInstanceTypesRequest.h>
 #include <aws/outposts/model/GetOutpostSupportedInstanceTypesResult.h>
 #include <aws/outposts/model/GetQuoteRequest.h>
@@ -94,24 +101,34 @@
 #include <aws/outposts/model/LineItemAssetInformation.h>
 #include <aws/outposts/model/LineItemRequest.h>
 #include <aws/outposts/model/LineItemStatus.h>
+#include <aws/outposts/model/ListAssetInstancesPaginationTraits.h>
 #include <aws/outposts/model/ListAssetInstancesRequest.h>
 #include <aws/outposts/model/ListAssetInstancesResult.h>
+#include <aws/outposts/model/ListAssetsPaginationTraits.h>
 #include <aws/outposts/model/ListAssetsRequest.h>
 #include <aws/outposts/model/ListAssetsResult.h>
+#include <aws/outposts/model/ListBlockingInstancesForCapacityTaskPaginationTraits.h>
 #include <aws/outposts/model/ListBlockingInstancesForCapacityTaskRequest.h>
 #include <aws/outposts/model/ListBlockingInstancesForCapacityTaskResult.h>
+#include <aws/outposts/model/ListCapacityTasksPaginationTraits.h>
 #include <aws/outposts/model/ListCapacityTasksRequest.h>
 #include <aws/outposts/model/ListCapacityTasksResult.h>
+#include <aws/outposts/model/ListCatalogItemsPaginationTraits.h>
 #include <aws/outposts/model/ListCatalogItemsRequest.h>
 #include <aws/outposts/model/ListCatalogItemsResult.h>
+#include <aws/outposts/model/ListOrderableInstanceTypesPaginationTraits.h>
 #include <aws/outposts/model/ListOrderableInstanceTypesRequest.h>
 #include <aws/outposts/model/ListOrderableInstanceTypesResult.h>
+#include <aws/outposts/model/ListOrdersPaginationTraits.h>
 #include <aws/outposts/model/ListOrdersRequest.h>
 #include <aws/outposts/model/ListOrdersResult.h>
+#include <aws/outposts/model/ListOutpostsPaginationTraits.h>
 #include <aws/outposts/model/ListOutpostsRequest.h>
 #include <aws/outposts/model/ListOutpostsResult.h>
+#include <aws/outposts/model/ListQuotesPaginationTraits.h>
 #include <aws/outposts/model/ListQuotesRequest.h>
 #include <aws/outposts/model/ListQuotesResult.h>
+#include <aws/outposts/model/ListSitesPaginationTraits.h>
 #include <aws/outposts/model/ListSitesRequest.h>
 #include <aws/outposts/model/ListSitesResult.h>
 #include <aws/outposts/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/partnercentral-account-gen-tests/PartnerCentralAccountIncludeTests.cpp b/generated/tests/partnercentral-account-gen-tests/PartnerCentralAccountIncludeTests.cpp
index ce886b1c9ec2..d6fd0559d534 100644
--- a/generated/tests/partnercentral-account-gen-tests/PartnerCentralAccountIncludeTests.cpp
+++ b/generated/tests/partnercentral-account-gen-tests/PartnerCentralAccountIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/partnercentral-account/PartnerCentralAccountClient.h>
+#include <aws/partnercentral-account/PartnerCentralAccountClientPagination.h>
 #include <aws/partnercentral-account/PartnerCentralAccountEndpointProvider.h>
 #include <aws/partnercentral-account/PartnerCentralAccountErrorMarshaller.h>
 #include <aws/partnercentral-account/PartnerCentralAccountErrors.h>
+#include <aws/partnercentral-account/PartnerCentralAccountPaginationBase.h>
 #include <aws/partnercentral-account/PartnerCentralAccountRequest.h>
 #include <aws/partnercentral-account/PartnerCentralAccountServiceClientModel.h>
+#include <aws/partnercentral-account/PartnerCentralAccountWaiter.h>
 #include <aws/partnercentral-account/PartnerCentralAccount_EXPORTS.h>
+#include <aws/partnercentral-account/internal/PartnerCentralAccountEndpointRules.h>
 #include <aws/partnercentral-account/model/AcceptConnectionInvitationRequest.h>
 #include <aws/partnercentral-account/model/AcceptConnectionInvitationResult.h>
 #include <aws/partnercentral-account/model/AccessDeniedException.h>
@@ -75,10 +79,13 @@
 #include <aws/partnercentral-account/model/Headquarters.h>
 #include <aws/partnercentral-account/model/IndustrySegment.h>
 #include <aws/partnercentral-account/model/InvitationStatus.h>
+#include <aws/partnercentral-account/model/ListConnectionInvitationsPaginationTraits.h>
 #include <aws/partnercentral-account/model/ListConnectionInvitationsRequest.h>
 #include <aws/partnercentral-account/model/ListConnectionInvitationsResult.h>
+#include <aws/partnercentral-account/model/ListConnectionsPaginationTraits.h>
 #include <aws/partnercentral-account/model/ListConnectionsRequest.h>
 #include <aws/partnercentral-account/model/ListConnectionsResult.h>
+#include <aws/partnercentral-account/model/ListPartnersPaginationTraits.h>
 #include <aws/partnercentral-account/model/ListPartnersRequest.h>
 #include <aws/partnercentral-account/model/ListPartnersResult.h>
 #include <aws/partnercentral-account/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/partnercentral-benefits-gen-tests/PartnerCentralBenefitsIncludeTests.cpp b/generated/tests/partnercentral-benefits-gen-tests/PartnerCentralBenefitsIncludeTests.cpp
index 25e2f8263829..5d3ab4de6630 100644
--- a/generated/tests/partnercentral-benefits-gen-tests/PartnerCentralBenefitsIncludeTests.cpp
+++ b/generated/tests/partnercentral-benefits-gen-tests/PartnerCentralBenefitsIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/partnercentral-benefits/PartnerCentralBenefitsClient.h>
+#include <aws/partnercentral-benefits/PartnerCentralBenefitsClientPagination.h>
 #include <aws/partnercentral-benefits/PartnerCentralBenefitsEndpointProvider.h>
 #include <aws/partnercentral-benefits/PartnerCentralBenefitsErrorMarshaller.h>
 #include <aws/partnercentral-benefits/PartnerCentralBenefitsErrors.h>
+#include <aws/partnercentral-benefits/PartnerCentralBenefitsPaginationBase.h>
 #include <aws/partnercentral-benefits/PartnerCentralBenefitsRequest.h>
 #include <aws/partnercentral-benefits/PartnerCentralBenefitsServiceClientModel.h>
+#include <aws/partnercentral-benefits/PartnerCentralBenefitsWaiter.h>
 #include <aws/partnercentral-benefits/PartnerCentralBenefits_EXPORTS.h>
+#include <aws/partnercentral-benefits/internal/PartnerCentralBenefitsEndpointRules.h>
 #include <aws/partnercentral-benefits/model/AccessDetails.h>
 #include <aws/partnercentral-benefits/model/AmendBenefitApplicationRequest.h>
 #include <aws/partnercentral-benefits/model/AmendBenefitApplicationResult.h>
@@ -50,10 +54,13 @@
 #include <aws/partnercentral-benefits/model/GetBenefitRequest.h>
 #include <aws/partnercentral-benefits/model/GetBenefitResult.h>
 #include <aws/partnercentral-benefits/model/IssuanceDetail.h>
+#include <aws/partnercentral-benefits/model/ListBenefitAllocationsPaginationTraits.h>
 #include <aws/partnercentral-benefits/model/ListBenefitAllocationsRequest.h>
 #include <aws/partnercentral-benefits/model/ListBenefitAllocationsResult.h>
+#include <aws/partnercentral-benefits/model/ListBenefitApplicationsPaginationTraits.h>
 #include <aws/partnercentral-benefits/model/ListBenefitApplicationsRequest.h>
 #include <aws/partnercentral-benefits/model/ListBenefitApplicationsResult.h>
+#include <aws/partnercentral-benefits/model/ListBenefitsPaginationTraits.h>
 #include <aws/partnercentral-benefits/model/ListBenefitsRequest.h>
 #include <aws/partnercentral-benefits/model/ListBenefitsResult.h>
 #include <aws/partnercentral-benefits/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/partnercentral-channel-gen-tests/PartnerCentralChannelIncludeTests.cpp b/generated/tests/partnercentral-channel-gen-tests/PartnerCentralChannelIncludeTests.cpp
index b6e194346bb5..cdffe3fe8b64 100644
--- a/generated/tests/partnercentral-channel-gen-tests/PartnerCentralChannelIncludeTests.cpp
+++ b/generated/tests/partnercentral-channel-gen-tests/PartnerCentralChannelIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/partnercentral-channel/PartnerCentralChannelClient.h>
+#include <aws/partnercentral-channel/PartnerCentralChannelClientPagination.h>
 #include <aws/partnercentral-channel/PartnerCentralChannelEndpointProvider.h>
 #include <aws/partnercentral-channel/PartnerCentralChannelErrorMarshaller.h>
 #include <aws/partnercentral-channel/PartnerCentralChannelErrors.h>
+#include <aws/partnercentral-channel/PartnerCentralChannelPaginationBase.h>
 #include <aws/partnercentral-channel/PartnerCentralChannelRequest.h>
 #include <aws/partnercentral-channel/PartnerCentralChannelServiceClientModel.h>
+#include <aws/partnercentral-channel/PartnerCentralChannelWaiter.h>
 #include <aws/partnercentral-channel/PartnerCentralChannel_EXPORTS.h>
+#include <aws/partnercentral-channel/internal/PartnerCentralChannelEndpointRules.h>
 #include <aws/partnercentral-channel/model/AcceptChannelHandshakeDetail.h>
 #include <aws/partnercentral-channel/model/AcceptChannelHandshakeRequest.h>
 #include <aws/partnercentral-channel/model/AcceptChannelHandshakeResult.h>
@@ -43,14 +47,17 @@
 #include <aws/partnercentral-channel/model/HandshakeDetail.h>
 #include <aws/partnercentral-channel/model/HandshakeStatus.h>
 #include <aws/partnercentral-channel/model/HandshakeType.h>
+#include <aws/partnercentral-channel/model/ListChannelHandshakesPaginationTraits.h>
 #include <aws/partnercentral-channel/model/ListChannelHandshakesRequest.h>
 #include <aws/partnercentral-channel/model/ListChannelHandshakesResult.h>
 #include <aws/partnercentral-channel/model/ListChannelHandshakesTypeFilters.h>
 #include <aws/partnercentral-channel/model/ListChannelHandshakesTypeSort.h>
+#include <aws/partnercentral-channel/model/ListProgramManagementAccountsPaginationTraits.h>
 #include <aws/partnercentral-channel/model/ListProgramManagementAccountsRequest.h>
 #include <aws/partnercentral-channel/model/ListProgramManagementAccountsResult.h>
 #include <aws/partnercentral-channel/model/ListProgramManagementAccountsSortBase.h>
 #include <aws/partnercentral-channel/model/ListProgramManagementAccountsSortName.h>
+#include <aws/partnercentral-channel/model/ListRelationshipsPaginationTraits.h>
 #include <aws/partnercentral-channel/model/ListRelationshipsRequest.h>
 #include <aws/partnercentral-channel/model/ListRelationshipsResult.h>
 #include <aws/partnercentral-channel/model/ListRelationshipsSortBase.h>
diff --git a/generated/tests/partnercentral-revenue-measurement-gen-tests/PartnerCentralRevenueMeasurementIncludeTests.cpp b/generated/tests/partnercentral-revenue-measurement-gen-tests/PartnerCentralRevenueMeasurementIncludeTests.cpp
index 81e856c39858..c27cb96d9ae3 100644
--- a/generated/tests/partnercentral-revenue-measurement-gen-tests/PartnerCentralRevenueMeasurementIncludeTests.cpp
+++ b/generated/tests/partnercentral-revenue-measurement-gen-tests/PartnerCentralRevenueMeasurementIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/partnercentral-revenue-measurement/PartnerCentralRevenueMeasurementClient.h>
+#include <aws/partnercentral-revenue-measurement/PartnerCentralRevenueMeasurementClientPagination.h>
 #include <aws/partnercentral-revenue-measurement/PartnerCentralRevenueMeasurementEndpointProvider.h>
 #include <aws/partnercentral-revenue-measurement/PartnerCentralRevenueMeasurementErrorMarshaller.h>
 #include <aws/partnercentral-revenue-measurement/PartnerCentralRevenueMeasurementErrors.h>
+#include <aws/partnercentral-revenue-measurement/PartnerCentralRevenueMeasurementPaginationBase.h>
 #include <aws/partnercentral-revenue-measurement/PartnerCentralRevenueMeasurementRequest.h>
 #include <aws/partnercentral-revenue-measurement/PartnerCentralRevenueMeasurementServiceClientModel.h>
+#include <aws/partnercentral-revenue-measurement/PartnerCentralRevenueMeasurementWaiter.h>
 #include <aws/partnercentral-revenue-measurement/PartnerCentralRevenueMeasurement_EXPORTS.h>
+#include <aws/partnercentral-revenue-measurement/internal/PartnerCentralRevenueMeasurementEndpointRules.h>
 #include <aws/partnercentral-revenue-measurement/model/AccessDeniedException.h>
 #include <aws/partnercentral-revenue-measurement/model/AccessDeniedExceptionReason.h>
 #include <aws/partnercentral-revenue-measurement/model/AllocationStatus.h>
@@ -39,12 +43,16 @@
 #include <aws/partnercentral-revenue-measurement/model/GetRevenueAttributionAllocationsTaskResult.h>
 #include <aws/partnercentral-revenue-measurement/model/GetRevenueAttributionRequest.h>
 #include <aws/partnercentral-revenue-measurement/model/GetRevenueAttributionResult.h>
+#include <aws/partnercentral-revenue-measurement/model/ListMarketplaceRevenueShareAllocationsPaginationTraits.h>
 #include <aws/partnercentral-revenue-measurement/model/ListMarketplaceRevenueShareAllocationsRequest.h>
 #include <aws/partnercentral-revenue-measurement/model/ListMarketplaceRevenueShareAllocationsResult.h>
+#include <aws/partnercentral-revenue-measurement/model/ListMarketplaceRevenueSharesPaginationTraits.h>
 #include <aws/partnercentral-revenue-measurement/model/ListMarketplaceRevenueSharesRequest.h>
 #include <aws/partnercentral-revenue-measurement/model/ListMarketplaceRevenueSharesResult.h>
+#include <aws/partnercentral-revenue-measurement/model/ListRevenueAttributionAllocationsPaginationTraits.h>
 #include <aws/partnercentral-revenue-measurement/model/ListRevenueAttributionAllocationsRequest.h>
 #include <aws/partnercentral-revenue-measurement/model/ListRevenueAttributionAllocationsResult.h>
+#include <aws/partnercentral-revenue-measurement/model/ListRevenueAttributionsPaginationTraits.h>
 #include <aws/partnercentral-revenue-measurement/model/ListRevenueAttributionsRequest.h>
 #include <aws/partnercentral-revenue-measurement/model/ListRevenueAttributionsResult.h>
 #include <aws/partnercentral-revenue-measurement/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/partnercentral-selling-gen-tests/PartnerCentralSellingIncludeTests.cpp b/generated/tests/partnercentral-selling-gen-tests/PartnerCentralSellingIncludeTests.cpp
index 84e93f6b7dfb..d1dbc71d0aee 100644
--- a/generated/tests/partnercentral-selling-gen-tests/PartnerCentralSellingIncludeTests.cpp
+++ b/generated/tests/partnercentral-selling-gen-tests/PartnerCentralSellingIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/partnercentral-selling/PartnerCentralSellingClient.h>
+#include <aws/partnercentral-selling/PartnerCentralSellingClientPagination.h>
 #include <aws/partnercentral-selling/PartnerCentralSellingEndpointProvider.h>
 #include <aws/partnercentral-selling/PartnerCentralSellingErrorMarshaller.h>
 #include <aws/partnercentral-selling/PartnerCentralSellingErrors.h>
+#include <aws/partnercentral-selling/PartnerCentralSellingPaginationBase.h>
 #include <aws/partnercentral-selling/PartnerCentralSellingRequest.h>
 #include <aws/partnercentral-selling/PartnerCentralSellingServiceClientModel.h>
+#include <aws/partnercentral-selling/PartnerCentralSellingWaiter.h>
 #include <aws/partnercentral-selling/PartnerCentralSelling_EXPORTS.h>
+#include <aws/partnercentral-selling/internal/PartnerCentralSellingEndpointRules.h>
 #include <aws/partnercentral-selling/model/AcceptEngagementInvitationRequest.h>
 #include <aws/partnercentral-selling/model/AccessDeniedException.h>
 #include <aws/partnercentral-selling/model/AccessDeniedExceptionErrorCode.h>
@@ -120,30 +124,42 @@
 #include <aws/partnercentral-selling/model/LifeCycleForView.h>
 #include <aws/partnercentral-selling/model/LifeCycleSummary.h>
 #include <aws/partnercentral-selling/model/ListEngagementByAcceptingInvitationTaskSummary.h>
+#include <aws/partnercentral-selling/model/ListEngagementByAcceptingInvitationTasksPaginationTraits.h>
 #include <aws/partnercentral-selling/model/ListEngagementByAcceptingInvitationTasksRequest.h>
 #include <aws/partnercentral-selling/model/ListEngagementByAcceptingInvitationTasksResult.h>
 #include <aws/partnercentral-selling/model/ListEngagementFromOpportunityTaskSummary.h>
+#include <aws/partnercentral-selling/model/ListEngagementFromOpportunityTasksPaginationTraits.h>
 #include <aws/partnercentral-selling/model/ListEngagementFromOpportunityTasksRequest.h>
 #include <aws/partnercentral-selling/model/ListEngagementFromOpportunityTasksResult.h>
+#include <aws/partnercentral-selling/model/ListEngagementInvitationsPaginationTraits.h>
 #include <aws/partnercentral-selling/model/ListEngagementInvitationsRequest.h>
 #include <aws/partnercentral-selling/model/ListEngagementInvitationsResult.h>
+#include <aws/partnercentral-selling/model/ListEngagementMembersPaginationTraits.h>
 #include <aws/partnercentral-selling/model/ListEngagementMembersRequest.h>
 #include <aws/partnercentral-selling/model/ListEngagementMembersResult.h>
+#include <aws/partnercentral-selling/model/ListEngagementResourceAssociationsPaginationTraits.h>
 #include <aws/partnercentral-selling/model/ListEngagementResourceAssociationsRequest.h>
 #include <aws/partnercentral-selling/model/ListEngagementResourceAssociationsResult.h>
+#include <aws/partnercentral-selling/model/ListEngagementsPaginationTraits.h>
 #include <aws/partnercentral-selling/model/ListEngagementsRequest.h>
 #include <aws/partnercentral-selling/model/ListEngagementsResult.h>
+#include <aws/partnercentral-selling/model/ListOpportunitiesPaginationTraits.h>
 #include <aws/partnercentral-selling/model/ListOpportunitiesRequest.h>
 #include <aws/partnercentral-selling/model/ListOpportunitiesResult.h>
 #include <aws/partnercentral-selling/model/ListOpportunityFromEngagementTaskSummary.h>
+#include <aws/partnercentral-selling/model/ListOpportunityFromEngagementTasksPaginationTraits.h>
 #include <aws/partnercentral-selling/model/ListOpportunityFromEngagementTasksRequest.h>
 #include <aws/partnercentral-selling/model/ListOpportunityFromEngagementTasksResult.h>
+#include <aws/partnercentral-selling/model/ListProspectingFromEngagementTasksPaginationTraits.h>
 #include <aws/partnercentral-selling/model/ListProspectingFromEngagementTasksRequest.h>
 #include <aws/partnercentral-selling/model/ListProspectingFromEngagementTasksResult.h>
+#include <aws/partnercentral-selling/model/ListResourceSnapshotJobsPaginationTraits.h>
 #include <aws/partnercentral-selling/model/ListResourceSnapshotJobsRequest.h>
 #include <aws/partnercentral-selling/model/ListResourceSnapshotJobsResult.h>
+#include <aws/partnercentral-selling/model/ListResourceSnapshotsPaginationTraits.h>
 #include <aws/partnercentral-selling/model/ListResourceSnapshotsRequest.h>
 #include <aws/partnercentral-selling/model/ListResourceSnapshotsResult.h>
+#include <aws/partnercentral-selling/model/ListSolutionsPaginationTraits.h>
 #include <aws/partnercentral-selling/model/ListSolutionsRequest.h>
 #include <aws/partnercentral-selling/model/ListSolutionsResult.h>
 #include <aws/partnercentral-selling/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/payment-cryptography-data-gen-tests/PaymentCryptographyDataIncludeTests.cpp b/generated/tests/payment-cryptography-data-gen-tests/PaymentCryptographyDataIncludeTests.cpp
index 8c80e2c22402..f8b24b211d1b 100644
--- a/generated/tests/payment-cryptography-data-gen-tests/PaymentCryptographyDataIncludeTests.cpp
+++ b/generated/tests/payment-cryptography-data-gen-tests/PaymentCryptographyDataIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/payment-cryptography-data/PaymentCryptographyDataEndpointProvider.h>
 #include <aws/payment-cryptography-data/PaymentCryptographyDataErrorMarshaller.h>
 #include <aws/payment-cryptography-data/PaymentCryptographyDataErrors.h>
+#include <aws/payment-cryptography-data/PaymentCryptographyDataPaginationBase.h>
 #include <aws/payment-cryptography-data/PaymentCryptographyDataRequest.h>
 #include <aws/payment-cryptography-data/PaymentCryptographyDataServiceClientModel.h>
+#include <aws/payment-cryptography-data/PaymentCryptographyDataWaiter.h>
 #include <aws/payment-cryptography-data/PaymentCryptographyData_EXPORTS.h>
+#include <aws/payment-cryptography-data/internal/PaymentCryptographyDataEndpointRules.h>
 #include <aws/payment-cryptography-data/model/AmexAttributes.h>
 #include <aws/payment-cryptography-data/model/AmexCardSecurityCodeVersion1.h>
 #include <aws/payment-cryptography-data/model/AmexCardSecurityCodeVersion2.h>
diff --git a/generated/tests/payment-cryptography-gen-tests/PaymentCryptographyIncludeTests.cpp b/generated/tests/payment-cryptography-gen-tests/PaymentCryptographyIncludeTests.cpp
index cb290db61fc1..6117bfd3767f 100644
--- a/generated/tests/payment-cryptography-gen-tests/PaymentCryptographyIncludeTests.cpp
+++ b/generated/tests/payment-cryptography-gen-tests/PaymentCryptographyIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/payment-cryptography/PaymentCryptographyClient.h>
+#include <aws/payment-cryptography/PaymentCryptographyClientPagination.h>
 #include <aws/payment-cryptography/PaymentCryptographyEndpointProvider.h>
 #include <aws/payment-cryptography/PaymentCryptographyErrorMarshaller.h>
 #include <aws/payment-cryptography/PaymentCryptographyErrors.h>
+#include <aws/payment-cryptography/PaymentCryptographyPaginationBase.h>
 #include <aws/payment-cryptography/PaymentCryptographyRequest.h>
 #include <aws/payment-cryptography/PaymentCryptographyServiceClientModel.h>
+#include <aws/payment-cryptography/PaymentCryptographyWaiter.h>
 #include <aws/payment-cryptography/PaymentCryptography_EXPORTS.h>
+#include <aws/payment-cryptography/internal/PaymentCryptographyEndpointRules.h>
 #include <aws/payment-cryptography/model/AddKeyReplicationRegionsRequest.h>
 #include <aws/payment-cryptography/model/AddKeyReplicationRegionsResult.h>
 #include <aws/payment-cryptography/model/Alias.h>
@@ -91,10 +95,13 @@
 #include <aws/payment-cryptography/model/KeyState.h>
 #include <aws/payment-cryptography/model/KeySummary.h>
 #include <aws/payment-cryptography/model/KeyUsage.h>
+#include <aws/payment-cryptography/model/ListAliasesPaginationTraits.h>
 #include <aws/payment-cryptography/model/ListAliasesRequest.h>
 #include <aws/payment-cryptography/model/ListAliasesResult.h>
+#include <aws/payment-cryptography/model/ListKeysPaginationTraits.h>
 #include <aws/payment-cryptography/model/ListKeysRequest.h>
 #include <aws/payment-cryptography/model/ListKeysResult.h>
+#include <aws/payment-cryptography/model/ListTagsForResourcePaginationTraits.h>
 #include <aws/payment-cryptography/model/ListTagsForResourceRequest.h>
 #include <aws/payment-cryptography/model/ListTagsForResourceResult.h>
 #include <aws/payment-cryptography/model/MpaOperation.h>
diff --git a/generated/tests/pca-connector-ad-gen-tests/PcaConnectorAdIncludeTests.cpp b/generated/tests/pca-connector-ad-gen-tests/PcaConnectorAdIncludeTests.cpp
index ee3e49426683..9840e7d9b16d 100644
--- a/generated/tests/pca-connector-ad-gen-tests/PcaConnectorAdIncludeTests.cpp
+++ b/generated/tests/pca-connector-ad-gen-tests/PcaConnectorAdIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/pca-connector-ad/PcaConnectorAdClient.h>
+#include <aws/pca-connector-ad/PcaConnectorAdClientPagination.h>
 #include <aws/pca-connector-ad/PcaConnectorAdEndpointProvider.h>
 #include <aws/pca-connector-ad/PcaConnectorAdErrorMarshaller.h>
 #include <aws/pca-connector-ad/PcaConnectorAdErrors.h>
+#include <aws/pca-connector-ad/PcaConnectorAdPaginationBase.h>
 #include <aws/pca-connector-ad/PcaConnectorAdRequest.h>
 #include <aws/pca-connector-ad/PcaConnectorAdServiceClientModel.h>
+#include <aws/pca-connector-ad/PcaConnectorAdWaiter.h>
 #include <aws/pca-connector-ad/PcaConnectorAd_EXPORTS.h>
+#include <aws/pca-connector-ad/internal/PcaConnectorAdEndpointRules.h>
 #include <aws/pca-connector-ad/model/AccessControlEntry.h>
 #include <aws/pca-connector-ad/model/AccessControlEntrySummary.h>
 #include <aws/pca-connector-ad/model/AccessRight.h>
@@ -73,16 +77,21 @@
 #include <aws/pca-connector-ad/model/KeyUsageProperty.h>
 #include <aws/pca-connector-ad/model/KeyUsagePropertyFlags.h>
 #include <aws/pca-connector-ad/model/KeyUsagePropertyType.h>
+#include <aws/pca-connector-ad/model/ListConnectorsPaginationTraits.h>
 #include <aws/pca-connector-ad/model/ListConnectorsRequest.h>
 #include <aws/pca-connector-ad/model/ListConnectorsResult.h>
+#include <aws/pca-connector-ad/model/ListDirectoryRegistrationsPaginationTraits.h>
 #include <aws/pca-connector-ad/model/ListDirectoryRegistrationsRequest.h>
 #include <aws/pca-connector-ad/model/ListDirectoryRegistrationsResult.h>
+#include <aws/pca-connector-ad/model/ListServicePrincipalNamesPaginationTraits.h>
 #include <aws/pca-connector-ad/model/ListServicePrincipalNamesRequest.h>
 #include <aws/pca-connector-ad/model/ListServicePrincipalNamesResult.h>
 #include <aws/pca-connector-ad/model/ListTagsForResourceRequest.h>
 #include <aws/pca-connector-ad/model/ListTagsForResourceResult.h>
+#include <aws/pca-connector-ad/model/ListTemplateGroupAccessControlEntriesPaginationTraits.h>
 #include <aws/pca-connector-ad/model/ListTemplateGroupAccessControlEntriesRequest.h>
 #include <aws/pca-connector-ad/model/ListTemplateGroupAccessControlEntriesResult.h>
+#include <aws/pca-connector-ad/model/ListTemplatesPaginationTraits.h>
 #include <aws/pca-connector-ad/model/ListTemplatesRequest.h>
 #include <aws/pca-connector-ad/model/ListTemplatesResult.h>
 #include <aws/pca-connector-ad/model/PrivateKeyAlgorithm.h>
diff --git a/generated/tests/pca-connector-scep-gen-tests/PcaConnectorScepIncludeTests.cpp b/generated/tests/pca-connector-scep-gen-tests/PcaConnectorScepIncludeTests.cpp
index dfc9476404d6..fb7d6db4c3e3 100644
--- a/generated/tests/pca-connector-scep-gen-tests/PcaConnectorScepIncludeTests.cpp
+++ b/generated/tests/pca-connector-scep-gen-tests/PcaConnectorScepIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/pca-connector-scep/PcaConnectorScepClient.h>
+#include <aws/pca-connector-scep/PcaConnectorScepClientPagination.h>
 #include <aws/pca-connector-scep/PcaConnectorScepEndpointProvider.h>
 #include <aws/pca-connector-scep/PcaConnectorScepErrorMarshaller.h>
 #include <aws/pca-connector-scep/PcaConnectorScepErrors.h>
+#include <aws/pca-connector-scep/PcaConnectorScepPaginationBase.h>
 #include <aws/pca-connector-scep/PcaConnectorScepRequest.h>
 #include <aws/pca-connector-scep/PcaConnectorScepServiceClientModel.h>
+#include <aws/pca-connector-scep/PcaConnectorScepWaiter.h>
 #include <aws/pca-connector-scep/PcaConnectorScep_EXPORTS.h>
+#include <aws/pca-connector-scep/internal/PcaConnectorScepEndpointRules.h>
 #include <aws/pca-connector-scep/model/Challenge.h>
 #include <aws/pca-connector-scep/model/ChallengeMetadata.h>
 #include <aws/pca-connector-scep/model/ChallengeMetadataSummary.h>
@@ -35,8 +39,10 @@
 #include <aws/pca-connector-scep/model/GetConnectorRequest.h>
 #include <aws/pca-connector-scep/model/GetConnectorResult.h>
 #include <aws/pca-connector-scep/model/IntuneConfiguration.h>
+#include <aws/pca-connector-scep/model/ListChallengeMetadataPaginationTraits.h>
 #include <aws/pca-connector-scep/model/ListChallengeMetadataRequest.h>
 #include <aws/pca-connector-scep/model/ListChallengeMetadataResult.h>
+#include <aws/pca-connector-scep/model/ListConnectorsPaginationTraits.h>
 #include <aws/pca-connector-scep/model/ListConnectorsRequest.h>
 #include <aws/pca-connector-scep/model/ListConnectorsResult.h>
 #include <aws/pca-connector-scep/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/pcs-gen-tests/PCSIncludeTests.cpp b/generated/tests/pcs-gen-tests/PCSIncludeTests.cpp
index 1fbff1c1e671..6d38556bbb1d 100644
--- a/generated/tests/pcs-gen-tests/PCSIncludeTests.cpp
+++ b/generated/tests/pcs-gen-tests/PCSIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/pcs/PCSClient.h>
+#include <aws/pcs/PCSClientPagination.h>
 #include <aws/pcs/PCSEndpointProvider.h>
 #include <aws/pcs/PCSErrorMarshaller.h>
 #include <aws/pcs/PCSErrors.h>
+#include <aws/pcs/PCSPaginationBase.h>
 #include <aws/pcs/PCSRequest.h>
 #include <aws/pcs/PCSServiceClientModel.h>
+#include <aws/pcs/PCSWaiter.h>
 #include <aws/pcs/PCS_EXPORTS.h>
+#include <aws/pcs/internal/PCSEndpointRules.h>
 #include <aws/pcs/model/Accounting.h>
 #include <aws/pcs/model/AccountingMode.h>
 #include <aws/pcs/model/AccountingRequest.h>
@@ -55,10 +59,13 @@
 #include <aws/pcs/model/InstanceConfig.h>
 #include <aws/pcs/model/JwtAuth.h>
 #include <aws/pcs/model/JwtKey.h>
+#include <aws/pcs/model/ListClustersPaginationTraits.h>
 #include <aws/pcs/model/ListClustersRequest.h>
 #include <aws/pcs/model/ListClustersResult.h>
+#include <aws/pcs/model/ListComputeNodeGroupsPaginationTraits.h>
 #include <aws/pcs/model/ListComputeNodeGroupsRequest.h>
 #include <aws/pcs/model/ListComputeNodeGroupsResult.h>
+#include <aws/pcs/model/ListQueuesPaginationTraits.h>
 #include <aws/pcs/model/ListQueuesRequest.h>
 #include <aws/pcs/model/ListQueuesResult.h>
 #include <aws/pcs/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/personalize-events-gen-tests/PersonalizeEventsIncludeTests.cpp b/generated/tests/personalize-events-gen-tests/PersonalizeEventsIncludeTests.cpp
index 78b487c2558b..aee869c7e50b 100644
--- a/generated/tests/personalize-events-gen-tests/PersonalizeEventsIncludeTests.cpp
+++ b/generated/tests/personalize-events-gen-tests/PersonalizeEventsIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/personalize-events/PersonalizeEventsEndpointProvider.h>
 #include <aws/personalize-events/PersonalizeEventsErrorMarshaller.h>
 #include <aws/personalize-events/PersonalizeEventsErrors.h>
+#include <aws/personalize-events/PersonalizeEventsPaginationBase.h>
 #include <aws/personalize-events/PersonalizeEventsRequest.h>
 #include <aws/personalize-events/PersonalizeEventsServiceClientModel.h>
+#include <aws/personalize-events/PersonalizeEventsWaiter.h>
 #include <aws/personalize-events/PersonalizeEvents_EXPORTS.h>
+#include <aws/personalize-events/internal/PersonalizeEventsEndpointRules.h>
 #include <aws/personalize-events/model/Action.h>
 #include <aws/personalize-events/model/ActionInteraction.h>
 #include <aws/personalize-events/model/Event.h>
diff --git a/generated/tests/personalize-gen-tests/PersonalizeIncludeTests.cpp b/generated/tests/personalize-gen-tests/PersonalizeIncludeTests.cpp
index cc6e34287087..88676edc3243 100644
--- a/generated/tests/personalize-gen-tests/PersonalizeIncludeTests.cpp
+++ b/generated/tests/personalize-gen-tests/PersonalizeIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/personalize/PersonalizeClient.h>
+#include <aws/personalize/PersonalizeClientPagination.h>
 #include <aws/personalize/PersonalizeEndpointProvider.h>
 #include <aws/personalize/PersonalizeErrorMarshaller.h>
 #include <aws/personalize/PersonalizeErrors.h>
+#include <aws/personalize/PersonalizePaginationBase.h>
 #include <aws/personalize/PersonalizeRequest.h>
 #include <aws/personalize/PersonalizeServiceClientModel.h>
+#include <aws/personalize/PersonalizeWaiter.h>
 #include <aws/personalize/Personalize_EXPORTS.h>
+#include <aws/personalize/internal/PersonalizeEndpointRules.h>
 #include <aws/personalize/model/Algorithm.h>
 #include <aws/personalize/model/AlgorithmImage.h>
 #include <aws/personalize/model/AutoMLConfig.h>
@@ -146,38 +150,54 @@
 #include <aws/personalize/model/ImportMode.h>
 #include <aws/personalize/model/IngestionMode.h>
 #include <aws/personalize/model/IntegerHyperParameterRange.h>
+#include <aws/personalize/model/ListBatchInferenceJobsPaginationTraits.h>
 #include <aws/personalize/model/ListBatchInferenceJobsRequest.h>
 #include <aws/personalize/model/ListBatchInferenceJobsResult.h>
+#include <aws/personalize/model/ListBatchSegmentJobsPaginationTraits.h>
 #include <aws/personalize/model/ListBatchSegmentJobsRequest.h>
 #include <aws/personalize/model/ListBatchSegmentJobsResult.h>
+#include <aws/personalize/model/ListCampaignsPaginationTraits.h>
 #include <aws/personalize/model/ListCampaignsRequest.h>
 #include <aws/personalize/model/ListCampaignsResult.h>
 #include <aws/personalize/model/ListDataDeletionJobsRequest.h>
 #include <aws/personalize/model/ListDataDeletionJobsResult.h>
+#include <aws/personalize/model/ListDatasetExportJobsPaginationTraits.h>
 #include <aws/personalize/model/ListDatasetExportJobsRequest.h>
 #include <aws/personalize/model/ListDatasetExportJobsResult.h>
+#include <aws/personalize/model/ListDatasetGroupsPaginationTraits.h>
 #include <aws/personalize/model/ListDatasetGroupsRequest.h>
 #include <aws/personalize/model/ListDatasetGroupsResult.h>
+#include <aws/personalize/model/ListDatasetImportJobsPaginationTraits.h>
 #include <aws/personalize/model/ListDatasetImportJobsRequest.h>
 #include <aws/personalize/model/ListDatasetImportJobsResult.h>
+#include <aws/personalize/model/ListDatasetsPaginationTraits.h>
 #include <aws/personalize/model/ListDatasetsRequest.h>
 #include <aws/personalize/model/ListDatasetsResult.h>
+#include <aws/personalize/model/ListEventTrackersPaginationTraits.h>
 #include <aws/personalize/model/ListEventTrackersRequest.h>
 #include <aws/personalize/model/ListEventTrackersResult.h>
+#include <aws/personalize/model/ListFiltersPaginationTraits.h>
 #include <aws/personalize/model/ListFiltersRequest.h>
 #include <aws/personalize/model/ListFiltersResult.h>
+#include <aws/personalize/model/ListMetricAttributionMetricsPaginationTraits.h>
 #include <aws/personalize/model/ListMetricAttributionMetricsRequest.h>
 #include <aws/personalize/model/ListMetricAttributionMetricsResult.h>
+#include <aws/personalize/model/ListMetricAttributionsPaginationTraits.h>
 #include <aws/personalize/model/ListMetricAttributionsRequest.h>
 #include <aws/personalize/model/ListMetricAttributionsResult.h>
+#include <aws/personalize/model/ListRecipesPaginationTraits.h>
 #include <aws/personalize/model/ListRecipesRequest.h>
 #include <aws/personalize/model/ListRecipesResult.h>
+#include <aws/personalize/model/ListRecommendersPaginationTraits.h>
 #include <aws/personalize/model/ListRecommendersRequest.h>
 #include <aws/personalize/model/ListRecommendersResult.h>
+#include <aws/personalize/model/ListSchemasPaginationTraits.h>
 #include <aws/personalize/model/ListSchemasRequest.h>
 #include <aws/personalize/model/ListSchemasResult.h>
+#include <aws/personalize/model/ListSolutionVersionsPaginationTraits.h>
 #include <aws/personalize/model/ListSolutionVersionsRequest.h>
 #include <aws/personalize/model/ListSolutionVersionsResult.h>
+#include <aws/personalize/model/ListSolutionsPaginationTraits.h>
 #include <aws/personalize/model/ListSolutionsRequest.h>
 #include <aws/personalize/model/ListSolutionsResult.h>
 #include <aws/personalize/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/personalize-runtime-gen-tests/PersonalizeRuntimeIncludeTests.cpp b/generated/tests/personalize-runtime-gen-tests/PersonalizeRuntimeIncludeTests.cpp
index a5663494e6bf..e1cfa2765433 100644
--- a/generated/tests/personalize-runtime-gen-tests/PersonalizeRuntimeIncludeTests.cpp
+++ b/generated/tests/personalize-runtime-gen-tests/PersonalizeRuntimeIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/personalize-runtime/PersonalizeRuntimeEndpointProvider.h>
 #include <aws/personalize-runtime/PersonalizeRuntimeErrorMarshaller.h>
 #include <aws/personalize-runtime/PersonalizeRuntimeErrors.h>
+#include <aws/personalize-runtime/PersonalizeRuntimePaginationBase.h>
 #include <aws/personalize-runtime/PersonalizeRuntimeRequest.h>
 #include <aws/personalize-runtime/PersonalizeRuntimeServiceClientModel.h>
+#include <aws/personalize-runtime/PersonalizeRuntimeWaiter.h>
 #include <aws/personalize-runtime/PersonalizeRuntime_EXPORTS.h>
+#include <aws/personalize-runtime/internal/PersonalizeRuntimeEndpointRules.h>
 #include <aws/personalize-runtime/model/GetActionRecommendationsRequest.h>
 #include <aws/personalize-runtime/model/GetActionRecommendationsResult.h>
 #include <aws/personalize-runtime/model/GetPersonalizedRankingRequest.h>
diff --git a/generated/tests/pi-gen-tests/PIIncludeTests.cpp b/generated/tests/pi-gen-tests/PIIncludeTests.cpp
index e4c7b6797e12..7bbbbb3b31e3 100644
--- a/generated/tests/pi-gen-tests/PIIncludeTests.cpp
+++ b/generated/tests/pi-gen-tests/PIIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/pi/PIClient.h>
+#include <aws/pi/PIClientPagination.h>
 #include <aws/pi/PIEndpointProvider.h>
 #include <aws/pi/PIErrorMarshaller.h>
 #include <aws/pi/PIErrors.h>
+#include <aws/pi/PIPaginationBase.h>
 #include <aws/pi/PIRequest.h>
 #include <aws/pi/PIServiceClientModel.h>
+#include <aws/pi/PIWaiter.h>
 #include <aws/pi/PI_EXPORTS.h>
+#include <aws/pi/internal/PIEndpointRules.h>
 #include <aws/pi/model/AcceptLanguage.h>
 #include <aws/pi/model/AnalysisReport.h>
 #include <aws/pi/model/AnalysisReportSummary.h>
@@ -24,6 +28,7 @@
 #include <aws/pi/model/DataPoint.h>
 #include <aws/pi/model/DeletePerformanceAnalysisReportRequest.h>
 #include <aws/pi/model/DeletePerformanceAnalysisReportResult.h>
+#include <aws/pi/model/DescribeDimensionKeysPaginationTraits.h>
 #include <aws/pi/model/DescribeDimensionKeysRequest.h>
 #include <aws/pi/model/DescribeDimensionKeysResult.h>
 #include <aws/pi/model/DetailStatus.h>
@@ -41,15 +46,20 @@
 #include <aws/pi/model/GetPerformanceAnalysisReportResult.h>
 #include <aws/pi/model/GetResourceMetadataRequest.h>
 #include <aws/pi/model/GetResourceMetadataResult.h>
+#include <aws/pi/model/GetResourceMetricsPaginationTraits.h>
 #include <aws/pi/model/GetResourceMetricsRequest.h>
 #include <aws/pi/model/GetResourceMetricsResult.h>
 #include <aws/pi/model/Insight.h>
+#include <aws/pi/model/ListAvailableResourceDimensionsPaginationTraits.h>
 #include <aws/pi/model/ListAvailableResourceDimensionsRequest.h>
 #include <aws/pi/model/ListAvailableResourceDimensionsResult.h>
+#include <aws/pi/model/ListAvailableResourceMetricsPaginationTraits.h>
 #include <aws/pi/model/ListAvailableResourceMetricsRequest.h>
 #include <aws/pi/model/ListAvailableResourceMetricsResult.h>
+#include <aws/pi/model/ListPerformanceAnalysisReportRecommendationsPaginationTraits.h>
 #include <aws/pi/model/ListPerformanceAnalysisReportRecommendationsRequest.h>
 #include <aws/pi/model/ListPerformanceAnalysisReportRecommendationsResult.h>
+#include <aws/pi/model/ListPerformanceAnalysisReportsPaginationTraits.h>
 #include <aws/pi/model/ListPerformanceAnalysisReportsRequest.h>
 #include <aws/pi/model/ListPerformanceAnalysisReportsResult.h>
 #include <aws/pi/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/pinpoint-email-gen-tests/PinpointEmailIncludeTests.cpp b/generated/tests/pinpoint-email-gen-tests/PinpointEmailIncludeTests.cpp
index e6382927402c..d2b8bdfd2f44 100644
--- a/generated/tests/pinpoint-email-gen-tests/PinpointEmailIncludeTests.cpp
+++ b/generated/tests/pinpoint-email-gen-tests/PinpointEmailIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/pinpoint-email/PinpointEmailClient.h>
+#include <aws/pinpoint-email/PinpointEmailClientPagination.h>
 #include <aws/pinpoint-email/PinpointEmailEndpointProvider.h>
 #include <aws/pinpoint-email/PinpointEmailErrorMarshaller.h>
 #include <aws/pinpoint-email/PinpointEmailErrors.h>
+#include <aws/pinpoint-email/PinpointEmailPaginationBase.h>
 #include <aws/pinpoint-email/PinpointEmailRequest.h>
 #include <aws/pinpoint-email/PinpointEmailServiceClientModel.h>
+#include <aws/pinpoint-email/PinpointEmailWaiter.h>
 #include <aws/pinpoint-email/PinpointEmail_EXPORTS.h>
+#include <aws/pinpoint-email/internal/PinpointEmailEndpointRules.h>
 #include <aws/pinpoint-email/model/BehaviorOnMxFailure.h>
 #include <aws/pinpoint-email/model/BlacklistEntry.h>
 #include <aws/pinpoint-email/model/Body.h>
@@ -64,6 +68,7 @@
 #include <aws/pinpoint-email/model/GetConfigurationSetResult.h>
 #include <aws/pinpoint-email/model/GetDedicatedIpRequest.h>
 #include <aws/pinpoint-email/model/GetDedicatedIpResult.h>
+#include <aws/pinpoint-email/model/GetDedicatedIpsPaginationTraits.h>
 #include <aws/pinpoint-email/model/GetDedicatedIpsRequest.h>
 #include <aws/pinpoint-email/model/GetDedicatedIpsResult.h>
 #include <aws/pinpoint-email/model/GetDeliverabilityDashboardOptionsRequest.h>
@@ -81,14 +86,19 @@
 #include <aws/pinpoint-email/model/InboxPlacementTrackingOption.h>
 #include <aws/pinpoint-email/model/IspPlacement.h>
 #include <aws/pinpoint-email/model/KinesisFirehoseDestination.h>
+#include <aws/pinpoint-email/model/ListConfigurationSetsPaginationTraits.h>
 #include <aws/pinpoint-email/model/ListConfigurationSetsRequest.h>
 #include <aws/pinpoint-email/model/ListConfigurationSetsResult.h>
+#include <aws/pinpoint-email/model/ListDedicatedIpPoolsPaginationTraits.h>
 #include <aws/pinpoint-email/model/ListDedicatedIpPoolsRequest.h>
 #include <aws/pinpoint-email/model/ListDedicatedIpPoolsResult.h>
+#include <aws/pinpoint-email/model/ListDeliverabilityTestReportsPaginationTraits.h>
 #include <aws/pinpoint-email/model/ListDeliverabilityTestReportsRequest.h>
 #include <aws/pinpoint-email/model/ListDeliverabilityTestReportsResult.h>
+#include <aws/pinpoint-email/model/ListDomainDeliverabilityCampaignsPaginationTraits.h>
 #include <aws/pinpoint-email/model/ListDomainDeliverabilityCampaignsRequest.h>
 #include <aws/pinpoint-email/model/ListDomainDeliverabilityCampaignsResult.h>
+#include <aws/pinpoint-email/model/ListEmailIdentitiesPaginationTraits.h>
 #include <aws/pinpoint-email/model/ListEmailIdentitiesRequest.h>
 #include <aws/pinpoint-email/model/ListEmailIdentitiesResult.h>
 #include <aws/pinpoint-email/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/pinpoint-gen-tests/PinpointIncludeTests.cpp b/generated/tests/pinpoint-gen-tests/PinpointIncludeTests.cpp
index 397667ec1ebb..de420e92cbe8 100644
--- a/generated/tests/pinpoint-gen-tests/PinpointIncludeTests.cpp
+++ b/generated/tests/pinpoint-gen-tests/PinpointIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/pinpoint/PinpointEndpointProvider.h>
 #include <aws/pinpoint/PinpointErrorMarshaller.h>
 #include <aws/pinpoint/PinpointErrors.h>
+#include <aws/pinpoint/PinpointPaginationBase.h>
 #include <aws/pinpoint/PinpointRequest.h>
 #include <aws/pinpoint/PinpointServiceClientModel.h>
+#include <aws/pinpoint/PinpointWaiter.h>
 #include <aws/pinpoint/Pinpoint_EXPORTS.h>
+#include <aws/pinpoint/internal/PinpointEndpointRules.h>
 #include <aws/pinpoint/model/ADMChannelRequest.h>
 #include <aws/pinpoint/model/ADMChannelResponse.h>
 #include <aws/pinpoint/model/ADMMessage.h>
diff --git a/generated/tests/pinpoint-sms-voice-v2-gen-tests/PinpointSMSVoiceV2IncludeTests.cpp b/generated/tests/pinpoint-sms-voice-v2-gen-tests/PinpointSMSVoiceV2IncludeTests.cpp
index 8fcb5c8bb4df..a1eb524ebc65 100644
--- a/generated/tests/pinpoint-sms-voice-v2-gen-tests/PinpointSMSVoiceV2IncludeTests.cpp
+++ b/generated/tests/pinpoint-sms-voice-v2-gen-tests/PinpointSMSVoiceV2IncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/pinpoint-sms-voice-v2/PinpointSMSVoiceV2Client.h>
+#include <aws/pinpoint-sms-voice-v2/PinpointSMSVoiceV2ClientPagination.h>
 #include <aws/pinpoint-sms-voice-v2/PinpointSMSVoiceV2EndpointProvider.h>
 #include <aws/pinpoint-sms-voice-v2/PinpointSMSVoiceV2ErrorMarshaller.h>
 #include <aws/pinpoint-sms-voice-v2/PinpointSMSVoiceV2Errors.h>
+#include <aws/pinpoint-sms-voice-v2/PinpointSMSVoiceV2PaginationBase.h>
 #include <aws/pinpoint-sms-voice-v2/PinpointSMSVoiceV2Request.h>
 #include <aws/pinpoint-sms-voice-v2/PinpointSMSVoiceV2ServiceClientModel.h>
+#include <aws/pinpoint-sms-voice-v2/PinpointSMSVoiceV2Waiter.h>
 #include <aws/pinpoint-sms-voice-v2/PinpointSMSVoiceV2_EXPORTS.h>
+#include <aws/pinpoint-sms-voice-v2/internal/PinpointSMSVoiceV2EndpointRules.h>
 #include <aws/pinpoint-sms-voice-v2/model/AccessDeniedException.h>
 #include <aws/pinpoint-sms-voice-v2/model/AccessDeniedExceptionReason.h>
 #include <aws/pinpoint-sms-voice-v2/model/AccountAttribute.h>
@@ -109,50 +113,73 @@
 #include <aws/pinpoint-sms-voice-v2/model/DeleteVerifiedDestinationNumberResult.h>
 #include <aws/pinpoint-sms-voice-v2/model/DeleteVoiceMessageSpendLimitOverrideRequest.h>
 #include <aws/pinpoint-sms-voice-v2/model/DeleteVoiceMessageSpendLimitOverrideResult.h>
+#include <aws/pinpoint-sms-voice-v2/model/DescribeAccountAttributesPaginationTraits.h>
 #include <aws/pinpoint-sms-voice-v2/model/DescribeAccountAttributesRequest.h>
 #include <aws/pinpoint-sms-voice-v2/model/DescribeAccountAttributesResult.h>
+#include <aws/pinpoint-sms-voice-v2/model/DescribeAccountLimitsPaginationTraits.h>
 #include <aws/pinpoint-sms-voice-v2/model/DescribeAccountLimitsRequest.h>
 #include <aws/pinpoint-sms-voice-v2/model/DescribeAccountLimitsResult.h>
+#include <aws/pinpoint-sms-voice-v2/model/DescribeConfigurationSetsPaginationTraits.h>
 #include <aws/pinpoint-sms-voice-v2/model/DescribeConfigurationSetsRequest.h>
 #include <aws/pinpoint-sms-voice-v2/model/DescribeConfigurationSetsResult.h>
+#include <aws/pinpoint-sms-voice-v2/model/DescribeKeywordsPaginationTraits.h>
 #include <aws/pinpoint-sms-voice-v2/model/DescribeKeywordsRequest.h>
 #include <aws/pinpoint-sms-voice-v2/model/DescribeKeywordsResult.h>
+#include <aws/pinpoint-sms-voice-v2/model/DescribeNotifyConfigurationsPaginationTraits.h>
 #include <aws/pinpoint-sms-voice-v2/model/DescribeNotifyConfigurationsRequest.h>
 #include <aws/pinpoint-sms-voice-v2/model/DescribeNotifyConfigurationsResult.h>
+#include <aws/pinpoint-sms-voice-v2/model/DescribeNotifyTemplatesPaginationTraits.h>
 #include <aws/pinpoint-sms-voice-v2/model/DescribeNotifyTemplatesRequest.h>
 #include <aws/pinpoint-sms-voice-v2/model/DescribeNotifyTemplatesResult.h>
+#include <aws/pinpoint-sms-voice-v2/model/DescribeOptOutListsPaginationTraits.h>
 #include <aws/pinpoint-sms-voice-v2/model/DescribeOptOutListsRequest.h>
 #include <aws/pinpoint-sms-voice-v2/model/DescribeOptOutListsResult.h>
+#include <aws/pinpoint-sms-voice-v2/model/DescribeOptedOutNumbersPaginationTraits.h>
 #include <aws/pinpoint-sms-voice-v2/model/DescribeOptedOutNumbersRequest.h>
 #include <aws/pinpoint-sms-voice-v2/model/DescribeOptedOutNumbersResult.h>
+#include <aws/pinpoint-sms-voice-v2/model/DescribePhoneNumbersPaginationTraits.h>
 #include <aws/pinpoint-sms-voice-v2/model/DescribePhoneNumbersRequest.h>
 #include <aws/pinpoint-sms-voice-v2/model/DescribePhoneNumbersResult.h>
+#include <aws/pinpoint-sms-voice-v2/model/DescribePoolsPaginationTraits.h>
 #include <aws/pinpoint-sms-voice-v2/model/DescribePoolsRequest.h>
 #include <aws/pinpoint-sms-voice-v2/model/DescribePoolsResult.h>
+#include <aws/pinpoint-sms-voice-v2/model/DescribeProtectConfigurationsPaginationTraits.h>
 #include <aws/pinpoint-sms-voice-v2/model/DescribeProtectConfigurationsRequest.h>
 #include <aws/pinpoint-sms-voice-v2/model/DescribeProtectConfigurationsResult.h>
+#include <aws/pinpoint-sms-voice-v2/model/DescribeRcsAgentCountryLaunchStatusPaginationTraits.h>
 #include <aws/pinpoint-sms-voice-v2/model/DescribeRcsAgentCountryLaunchStatusRequest.h>
 #include <aws/pinpoint-sms-voice-v2/model/DescribeRcsAgentCountryLaunchStatusResult.h>
+#include <aws/pinpoint-sms-voice-v2/model/DescribeRcsAgentsPaginationTraits.h>
 #include <aws/pinpoint-sms-voice-v2/model/DescribeRcsAgentsRequest.h>
 #include <aws/pinpoint-sms-voice-v2/model/DescribeRcsAgentsResult.h>
+#include <aws/pinpoint-sms-voice-v2/model/DescribeRegistrationAttachmentsPaginationTraits.h>
 #include <aws/pinpoint-sms-voice-v2/model/DescribeRegistrationAttachmentsRequest.h>
 #include <aws/pinpoint-sms-voice-v2/model/DescribeRegistrationAttachmentsResult.h>
+#include <aws/pinpoint-sms-voice-v2/model/DescribeRegistrationFieldDefinitionsPaginationTraits.h>
 #include <aws/pinpoint-sms-voice-v2/model/DescribeRegistrationFieldDefinitionsRequest.h>
 #include <aws/pinpoint-sms-voice-v2/model/DescribeRegistrationFieldDefinitionsResult.h>
+#include <aws/pinpoint-sms-voice-v2/model/DescribeRegistrationFieldValuesPaginationTraits.h>
 #include <aws/pinpoint-sms-voice-v2/model/DescribeRegistrationFieldValuesRequest.h>
 #include <aws/pinpoint-sms-voice-v2/model/DescribeRegistrationFieldValuesResult.h>
+#include <aws/pinpoint-sms-voice-v2/model/DescribeRegistrationSectionDefinitionsPaginationTraits.h>
 #include <aws/pinpoint-sms-voice-v2/model/DescribeRegistrationSectionDefinitionsRequest.h>
 #include <aws/pinpoint-sms-voice-v2/model/DescribeRegistrationSectionDefinitionsResult.h>
+#include <aws/pinpoint-sms-voice-v2/model/DescribeRegistrationTypeDefinitionsPaginationTraits.h>
 #include <aws/pinpoint-sms-voice-v2/model/DescribeRegistrationTypeDefinitionsRequest.h>
 #include <aws/pinpoint-sms-voice-v2/model/DescribeRegistrationTypeDefinitionsResult.h>
+#include <aws/pinpoint-sms-voice-v2/model/DescribeRegistrationVersionsPaginationTraits.h>
 #include <aws/pinpoint-sms-voice-v2/model/DescribeRegistrationVersionsRequest.h>
 #include <aws/pinpoint-sms-voice-v2/model/DescribeRegistrationVersionsResult.h>
+#include <aws/pinpoint-sms-voice-v2/model/DescribeRegistrationsPaginationTraits.h>
 #include <aws/pinpoint-sms-voice-v2/model/DescribeRegistrationsRequest.h>
 #include <aws/pinpoint-sms-voice-v2/model/DescribeRegistrationsResult.h>
+#include <aws/pinpoint-sms-voice-v2/model/DescribeSenderIdsPaginationTraits.h>
 #include <aws/pinpoint-sms-voice-v2/model/DescribeSenderIdsRequest.h>
 #include <aws/pinpoint-sms-voice-v2/model/DescribeSenderIdsResult.h>
+#include <aws/pinpoint-sms-voice-v2/model/DescribeSpendLimitsPaginationTraits.h>
 #include <aws/pinpoint-sms-voice-v2/model/DescribeSpendLimitsRequest.h>
 #include <aws/pinpoint-sms-voice-v2/model/DescribeSpendLimitsResult.h>
+#include <aws/pinpoint-sms-voice-v2/model/DescribeVerifiedDestinationNumbersPaginationTraits.h>
 #include <aws/pinpoint-sms-voice-v2/model/DescribeVerifiedDestinationNumbersRequest.h>
 #include <aws/pinpoint-sms-voice-v2/model/DescribeVerifiedDestinationNumbersResult.h>
 #include <aws/pinpoint-sms-voice-v2/model/DestinationCountryParameterKey.h>
@@ -177,12 +204,16 @@
 #include <aws/pinpoint-sms-voice-v2/model/KeywordInformation.h>
 #include <aws/pinpoint-sms-voice-v2/model/KinesisFirehoseDestination.h>
 #include <aws/pinpoint-sms-voice-v2/model/LanguageCode.h>
+#include <aws/pinpoint-sms-voice-v2/model/ListNotifyCountriesPaginationTraits.h>
 #include <aws/pinpoint-sms-voice-v2/model/ListNotifyCountriesRequest.h>
 #include <aws/pinpoint-sms-voice-v2/model/ListNotifyCountriesResult.h>
+#include <aws/pinpoint-sms-voice-v2/model/ListPoolOriginationIdentitiesPaginationTraits.h>
 #include <aws/pinpoint-sms-voice-v2/model/ListPoolOriginationIdentitiesRequest.h>
 #include <aws/pinpoint-sms-voice-v2/model/ListPoolOriginationIdentitiesResult.h>
+#include <aws/pinpoint-sms-voice-v2/model/ListProtectConfigurationRuleSetNumberOverridesPaginationTraits.h>
 #include <aws/pinpoint-sms-voice-v2/model/ListProtectConfigurationRuleSetNumberOverridesRequest.h>
 #include <aws/pinpoint-sms-voice-v2/model/ListProtectConfigurationRuleSetNumberOverridesResult.h>
+#include <aws/pinpoint-sms-voice-v2/model/ListRegistrationAssociationsPaginationTraits.h>
 #include <aws/pinpoint-sms-voice-v2/model/ListRegistrationAssociationsRequest.h>
 #include <aws/pinpoint-sms-voice-v2/model/ListRegistrationAssociationsResult.h>
 #include <aws/pinpoint-sms-voice-v2/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/pipes-gen-tests/PipesIncludeTests.cpp b/generated/tests/pipes-gen-tests/PipesIncludeTests.cpp
index bae146de91d0..85636b1e2aa4 100644
--- a/generated/tests/pipes-gen-tests/PipesIncludeTests.cpp
+++ b/generated/tests/pipes-gen-tests/PipesIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/pipes/PipesClient.h>
+#include <aws/pipes/PipesClientPagination.h>
 #include <aws/pipes/PipesEndpointProvider.h>
 #include <aws/pipes/PipesErrorMarshaller.h>
 #include <aws/pipes/PipesErrors.h>
+#include <aws/pipes/PipesPaginationBase.h>
 #include <aws/pipes/PipesRequest.h>
 #include <aws/pipes/PipesServiceClientModel.h>
+#include <aws/pipes/PipesWaiter.h>
 #include <aws/pipes/Pipes_EXPORTS.h>
+#include <aws/pipes/internal/PipesEndpointRules.h>
 #include <aws/pipes/model/AssignPublicIp.h>
 #include <aws/pipes/model/AwsVpcConfiguration.h>
 #include <aws/pipes/model/BatchArrayProperties.h>
@@ -55,6 +59,7 @@
 #include <aws/pipes/model/InternalException.h>
 #include <aws/pipes/model/KinesisStreamStartPosition.h>
 #include <aws/pipes/model/LaunchType.h>
+#include <aws/pipes/model/ListPipesPaginationTraits.h>
 #include <aws/pipes/model/ListPipesRequest.h>
 #include <aws/pipes/model/ListPipesResult.h>
 #include <aws/pipes/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/polly-gen-tests/PollyIncludeTests.cpp b/generated/tests/polly-gen-tests/PollyIncludeTests.cpp
index a49a08a85417..bfce3db70a14 100644
--- a/generated/tests/polly-gen-tests/PollyIncludeTests.cpp
+++ b/generated/tests/polly-gen-tests/PollyIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/polly/PollyClient.h>
+#include <aws/polly/PollyClientPagination.h>
 #include <aws/polly/PollyEndpointProvider.h>
 #include <aws/polly/PollyErrorMarshaller.h>
 #include <aws/polly/PollyErrors.h>
+#include <aws/polly/PollyPaginationBase.h>
 #include <aws/polly/PollyRequest.h>
 #include <aws/polly/PollyServiceClientModel.h>
+#include <aws/polly/PollyWaiter.h>
 #include <aws/polly/Polly_EXPORTS.h>
+#include <aws/polly/internal/PollyEndpointRules.h>
 #include <aws/polly/model/AudioEvent.h>
 #include <aws/polly/model/CloseStreamEvent.h>
 #include <aws/polly/model/DeleteLexiconRequest.h>
@@ -32,6 +36,7 @@
 #include <aws/polly/model/LexiconDescription.h>
 #include <aws/polly/model/ListLexiconsRequest.h>
 #include <aws/polly/model/ListLexiconsResult.h>
+#include <aws/polly/model/ListSpeechSynthesisTasksPaginationTraits.h>
 #include <aws/polly/model/ListSpeechSynthesisTasksRequest.h>
 #include <aws/polly/model/ListSpeechSynthesisTasksResult.h>
 #include <aws/polly/model/OutputFormat.h>
diff --git a/generated/tests/pricing-gen-tests/PricingIncludeTests.cpp b/generated/tests/pricing-gen-tests/PricingIncludeTests.cpp
index 73c4b20fc1fd..a8842f1df7c9 100644
--- a/generated/tests/pricing-gen-tests/PricingIncludeTests.cpp
+++ b/generated/tests/pricing-gen-tests/PricingIncludeTests.cpp
@@ -7,23 +7,31 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/pricing/PricingClient.h>
+#include <aws/pricing/PricingClientPagination.h>
 #include <aws/pricing/PricingEndpointProvider.h>
 #include <aws/pricing/PricingErrorMarshaller.h>
 #include <aws/pricing/PricingErrors.h>
+#include <aws/pricing/PricingPaginationBase.h>
 #include <aws/pricing/PricingRequest.h>
 #include <aws/pricing/PricingServiceClientModel.h>
+#include <aws/pricing/PricingWaiter.h>
 #include <aws/pricing/Pricing_EXPORTS.h>
+#include <aws/pricing/internal/PricingEndpointRules.h>
 #include <aws/pricing/model/AttributeValue.h>
+#include <aws/pricing/model/DescribeServicesPaginationTraits.h>
 #include <aws/pricing/model/DescribeServicesRequest.h>
 #include <aws/pricing/model/DescribeServicesResult.h>
 #include <aws/pricing/model/Filter.h>
 #include <aws/pricing/model/FilterType.h>
+#include <aws/pricing/model/GetAttributeValuesPaginationTraits.h>
 #include <aws/pricing/model/GetAttributeValuesRequest.h>
 #include <aws/pricing/model/GetAttributeValuesResult.h>
 #include <aws/pricing/model/GetPriceListFileUrlRequest.h>
 #include <aws/pricing/model/GetPriceListFileUrlResult.h>
+#include <aws/pricing/model/GetProductsPaginationTraits.h>
 #include <aws/pricing/model/GetProductsRequest.h>
 #include <aws/pricing/model/GetProductsResult.h>
+#include <aws/pricing/model/ListPriceListsPaginationTraits.h>
 #include <aws/pricing/model/ListPriceListsRequest.h>
 #include <aws/pricing/model/ListPriceListsResult.h>
 #include <aws/pricing/model/PriceList.h>
diff --git a/generated/tests/pricing-plan-manager-gen-tests/PricingPlanManagerIncludeTests.cpp b/generated/tests/pricing-plan-manager-gen-tests/PricingPlanManagerIncludeTests.cpp
index d20e4250222e..8beffa2bbb18 100644
--- a/generated/tests/pricing-plan-manager-gen-tests/PricingPlanManagerIncludeTests.cpp
+++ b/generated/tests/pricing-plan-manager-gen-tests/PricingPlanManagerIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/pricing-plan-manager/PricingPlanManagerClient.h>
+#include <aws/pricing-plan-manager/PricingPlanManagerClientPagination.h>
 #include <aws/pricing-plan-manager/PricingPlanManagerEndpointProvider.h>
 #include <aws/pricing-plan-manager/PricingPlanManagerErrorMarshaller.h>
 #include <aws/pricing-plan-manager/PricingPlanManagerErrors.h>
+#include <aws/pricing-plan-manager/PricingPlanManagerPaginationBase.h>
 #include <aws/pricing-plan-manager/PricingPlanManagerRequest.h>
 #include <aws/pricing-plan-manager/PricingPlanManagerServiceClientModel.h>
+#include <aws/pricing-plan-manager/PricingPlanManagerWaiter.h>
 #include <aws/pricing-plan-manager/PricingPlanManager_EXPORTS.h>
+#include <aws/pricing-plan-manager/internal/PricingPlanManagerEndpointRules.h>
 #include <aws/pricing-plan-manager/model/ApprovalMode.h>
 #include <aws/pricing-plan-manager/model/ApprovePaidSubscriptionRequest.h>
 #include <aws/pricing-plan-manager/model/ApprovePaidSubscriptionResult.h>
@@ -29,6 +33,7 @@
 #include <aws/pricing-plan-manager/model/DisassociateResourcesFromSubscriptionResult.h>
 #include <aws/pricing-plan-manager/model/GetSubscriptionRequest.h>
 #include <aws/pricing-plan-manager/model/GetSubscriptionResult.h>
+#include <aws/pricing-plan-manager/model/ListSubscriptionsPaginationTraits.h>
 #include <aws/pricing-plan-manager/model/ListSubscriptionsRequest.h>
 #include <aws/pricing-plan-manager/model/ListSubscriptionsResult.h>
 #include <aws/pricing-plan-manager/model/ResourceNotFoundException.h>
diff --git a/generated/tests/proton-gen-tests/ProtonIncludeTests.cpp b/generated/tests/proton-gen-tests/ProtonIncludeTests.cpp
index 59c676e0dfd7..4ca027ea8fff 100644
--- a/generated/tests/proton-gen-tests/ProtonIncludeTests.cpp
+++ b/generated/tests/proton-gen-tests/ProtonIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/proton/ProtonEndpointProvider.h>
 #include <aws/proton/ProtonErrorMarshaller.h>
 #include <aws/proton/ProtonErrors.h>
+#include <aws/proton/ProtonPaginationBase.h>
 #include <aws/proton/ProtonRequest.h>
 #include <aws/proton/ProtonServiceClientModel.h>
+#include <aws/proton/ProtonWaiter.h>
 #include <aws/proton/Proton_EXPORTS.h>
+#include <aws/proton/internal/ProtonEndpointRules.h>
 #include <aws/proton/model/AccountSettings.h>
 #include <aws/proton/model/BlockerStatus.h>
 #include <aws/proton/model/BlockerType.h>
diff --git a/generated/tests/qapps-gen-tests/QAppsIncludeTests.cpp b/generated/tests/qapps-gen-tests/QAppsIncludeTests.cpp
index 0a01ed872769..ae23fb6705fe 100644
--- a/generated/tests/qapps-gen-tests/QAppsIncludeTests.cpp
+++ b/generated/tests/qapps-gen-tests/QAppsIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/qapps/QAppsClient.h>
+#include <aws/qapps/QAppsClientPagination.h>
 #include <aws/qapps/QAppsEndpointProvider.h>
 #include <aws/qapps/QAppsErrorMarshaller.h>
 #include <aws/qapps/QAppsErrors.h>
+#include <aws/qapps/QAppsPaginationBase.h>
 #include <aws/qapps/QAppsRequest.h>
 #include <aws/qapps/QAppsServiceClientModel.h>
+#include <aws/qapps/QAppsWaiter.h>
 #include <aws/qapps/QApps_EXPORTS.h>
+#include <aws/qapps/internal/QAppsEndpointRules.h>
 #include <aws/qapps/model/AppDefinition.h>
 #include <aws/qapps/model/AppDefinitionInput.h>
 #include <aws/qapps/model/AppRequiredCapability.h>
@@ -74,10 +78,12 @@
 #include <aws/qapps/model/LibraryItemStatus.h>
 #include <aws/qapps/model/ListCategoriesRequest.h>
 #include <aws/qapps/model/ListCategoriesResult.h>
+#include <aws/qapps/model/ListLibraryItemsPaginationTraits.h>
 #include <aws/qapps/model/ListLibraryItemsRequest.h>
 #include <aws/qapps/model/ListLibraryItemsResult.h>
 #include <aws/qapps/model/ListQAppSessionDataRequest.h>
 #include <aws/qapps/model/ListQAppSessionDataResult.h>
+#include <aws/qapps/model/ListQAppsPaginationTraits.h>
 #include <aws/qapps/model/ListQAppsRequest.h>
 #include <aws/qapps/model/ListQAppsResult.h>
 #include <aws/qapps/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/qbusiness-gen-tests/QBusinessIncludeTests.cpp b/generated/tests/qbusiness-gen-tests/QBusinessIncludeTests.cpp
index 0f53559e77fe..7b141fc014e1 100644
--- a/generated/tests/qbusiness-gen-tests/QBusinessIncludeTests.cpp
+++ b/generated/tests/qbusiness-gen-tests/QBusinessIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/qbusiness/QBusinessClient.h>
+#include <aws/qbusiness/QBusinessClientPagination.h>
 #include <aws/qbusiness/QBusinessEndpointProvider.h>
 #include <aws/qbusiness/QBusinessErrorMarshaller.h>
 #include <aws/qbusiness/QBusinessErrors.h>
+#include <aws/qbusiness/QBusinessPaginationBase.h>
 #include <aws/qbusiness/QBusinessRequest.h>
 #include <aws/qbusiness/QBusinessServiceClientModel.h>
+#include <aws/qbusiness/QBusinessWaiter.h>
 #include <aws/qbusiness/QBusiness_EXPORTS.h>
+#include <aws/qbusiness/internal/QBusinessEndpointRules.h>
 #include <aws/qbusiness/model/APISchema.h>
 #include <aws/qbusiness/model/APISchemaType.h>
 #include <aws/qbusiness/model/AccessConfiguration.h>
@@ -186,6 +190,7 @@
 #include <aws/qbusiness/model/FailedDocument.h>
 #include <aws/qbusiness/model/GetApplicationRequest.h>
 #include <aws/qbusiness/model/GetApplicationResult.h>
+#include <aws/qbusiness/model/GetChatControlsConfigurationPaginationTraits.h>
 #include <aws/qbusiness/model/GetChatControlsConfigurationRequest.h>
 #include <aws/qbusiness/model/GetChatControlsConfigurationResult.h>
 #include <aws/qbusiness/model/GetChatResponseConfigurationRequest.h>
@@ -233,42 +238,60 @@
 #include <aws/qbusiness/model/InlineDocumentEnrichmentConfiguration.h>
 #include <aws/qbusiness/model/InstructionCollection.h>
 #include <aws/qbusiness/model/KendraIndexConfiguration.h>
+#include <aws/qbusiness/model/ListApplicationsPaginationTraits.h>
 #include <aws/qbusiness/model/ListApplicationsRequest.h>
 #include <aws/qbusiness/model/ListApplicationsResult.h>
+#include <aws/qbusiness/model/ListAttachmentsPaginationTraits.h>
 #include <aws/qbusiness/model/ListAttachmentsRequest.h>
 #include <aws/qbusiness/model/ListAttachmentsResult.h>
+#include <aws/qbusiness/model/ListChatResponseConfigurationsPaginationTraits.h>
 #include <aws/qbusiness/model/ListChatResponseConfigurationsRequest.h>
 #include <aws/qbusiness/model/ListChatResponseConfigurationsResult.h>
+#include <aws/qbusiness/model/ListConversationsPaginationTraits.h>
 #include <aws/qbusiness/model/ListConversationsRequest.h>
 #include <aws/qbusiness/model/ListConversationsResult.h>
+#include <aws/qbusiness/model/ListDataAccessorsPaginationTraits.h>
 #include <aws/qbusiness/model/ListDataAccessorsRequest.h>
 #include <aws/qbusiness/model/ListDataAccessorsResult.h>
+#include <aws/qbusiness/model/ListDataSourceSyncJobsPaginationTraits.h>
 #include <aws/qbusiness/model/ListDataSourceSyncJobsRequest.h>
 #include <aws/qbusiness/model/ListDataSourceSyncJobsResult.h>
+#include <aws/qbusiness/model/ListDataSourcesPaginationTraits.h>
 #include <aws/qbusiness/model/ListDataSourcesRequest.h>
 #include <aws/qbusiness/model/ListDataSourcesResult.h>
+#include <aws/qbusiness/model/ListDocumentsPaginationTraits.h>
 #include <aws/qbusiness/model/ListDocumentsRequest.h>
 #include <aws/qbusiness/model/ListDocumentsResult.h>
+#include <aws/qbusiness/model/ListGroupsPaginationTraits.h>
 #include <aws/qbusiness/model/ListGroupsRequest.h>
 #include <aws/qbusiness/model/ListGroupsResult.h>
+#include <aws/qbusiness/model/ListIndicesPaginationTraits.h>
 #include <aws/qbusiness/model/ListIndicesRequest.h>
 #include <aws/qbusiness/model/ListIndicesResult.h>
+#include <aws/qbusiness/model/ListMessagesPaginationTraits.h>
 #include <aws/qbusiness/model/ListMessagesRequest.h>
 #include <aws/qbusiness/model/ListMessagesResult.h>
+#include <aws/qbusiness/model/ListPluginActionsPaginationTraits.h>
 #include <aws/qbusiness/model/ListPluginActionsRequest.h>
 #include <aws/qbusiness/model/ListPluginActionsResult.h>
+#include <aws/qbusiness/model/ListPluginTypeActionsPaginationTraits.h>
 #include <aws/qbusiness/model/ListPluginTypeActionsRequest.h>
 #include <aws/qbusiness/model/ListPluginTypeActionsResult.h>
+#include <aws/qbusiness/model/ListPluginTypeMetadataPaginationTraits.h>
 #include <aws/qbusiness/model/ListPluginTypeMetadataRequest.h>
 #include <aws/qbusiness/model/ListPluginTypeMetadataResult.h>
+#include <aws/qbusiness/model/ListPluginsPaginationTraits.h>
 #include <aws/qbusiness/model/ListPluginsRequest.h>
 #include <aws/qbusiness/model/ListPluginsResult.h>
+#include <aws/qbusiness/model/ListRetrieversPaginationTraits.h>
 #include <aws/qbusiness/model/ListRetrieversRequest.h>
 #include <aws/qbusiness/model/ListRetrieversResult.h>
+#include <aws/qbusiness/model/ListSubscriptionsPaginationTraits.h>
 #include <aws/qbusiness/model/ListSubscriptionsRequest.h>
 #include <aws/qbusiness/model/ListSubscriptionsResult.h>
 #include <aws/qbusiness/model/ListTagsForResourceRequest.h>
 #include <aws/qbusiness/model/ListTagsForResourceResult.h>
+#include <aws/qbusiness/model/ListWebExperiencesPaginationTraits.h>
 #include <aws/qbusiness/model/ListWebExperiencesRequest.h>
 #include <aws/qbusiness/model/ListWebExperiencesResult.h>
 #include <aws/qbusiness/model/MediaExtractionConfiguration.h>
@@ -331,6 +354,7 @@
 #include <aws/qbusiness/model/SamlProviderConfiguration.h>
 #include <aws/qbusiness/model/ScoreAttributes.h>
 #include <aws/qbusiness/model/ScoreConfidence.h>
+#include <aws/qbusiness/model/SearchRelevantContentPaginationTraits.h>
 #include <aws/qbusiness/model/SearchRelevantContentRequest.h>
 #include <aws/qbusiness/model/SearchRelevantContentResult.h>
 #include <aws/qbusiness/model/ServiceQuotaExceededException.h>
diff --git a/generated/tests/qconnect-gen-tests/QConnectIncludeTests.cpp b/generated/tests/qconnect-gen-tests/QConnectIncludeTests.cpp
index c167a0cdf8fe..e33f6cd197c7 100644
--- a/generated/tests/qconnect-gen-tests/QConnectIncludeTests.cpp
+++ b/generated/tests/qconnect-gen-tests/QConnectIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/qconnect/QConnectClient.h>
+#include <aws/qconnect/QConnectClientPagination.h>
 #include <aws/qconnect/QConnectEndpointProvider.h>
 #include <aws/qconnect/QConnectErrorMarshaller.h>
 #include <aws/qconnect/QConnectErrors.h>
+#include <aws/qconnect/QConnectPaginationBase.h>
 #include <aws/qconnect/QConnectRequest.h>
 #include <aws/qconnect/QConnectServiceClientModel.h>
+#include <aws/qconnect/QConnectWaiter.h>
 #include <aws/qconnect/QConnect_EXPORTS.h>
+#include <aws/qconnect/internal/QConnectEndpointRules.h>
 #include <aws/qconnect/model/AIAgentAssociationConfigurationType.h>
 #include <aws/qconnect/model/AIAgentConfiguration.h>
 #include <aws/qconnect/model/AIAgentConfigurationData.h>
@@ -241,40 +245,58 @@
 #include <aws/qconnect/model/KnowledgeBaseSummary.h>
 #include <aws/qconnect/model/KnowledgeBaseType.h>
 #include <aws/qconnect/model/KnowledgeSource.h>
+#include <aws/qconnect/model/ListAIAgentVersionsPaginationTraits.h>
 #include <aws/qconnect/model/ListAIAgentVersionsRequest.h>
 #include <aws/qconnect/model/ListAIAgentVersionsResult.h>
+#include <aws/qconnect/model/ListAIAgentsPaginationTraits.h>
 #include <aws/qconnect/model/ListAIAgentsRequest.h>
 #include <aws/qconnect/model/ListAIAgentsResult.h>
+#include <aws/qconnect/model/ListAIGuardrailVersionsPaginationTraits.h>
 #include <aws/qconnect/model/ListAIGuardrailVersionsRequest.h>
 #include <aws/qconnect/model/ListAIGuardrailVersionsResult.h>
+#include <aws/qconnect/model/ListAIGuardrailsPaginationTraits.h>
 #include <aws/qconnect/model/ListAIGuardrailsRequest.h>
 #include <aws/qconnect/model/ListAIGuardrailsResult.h>
+#include <aws/qconnect/model/ListAIPromptVersionsPaginationTraits.h>
 #include <aws/qconnect/model/ListAIPromptVersionsRequest.h>
 #include <aws/qconnect/model/ListAIPromptVersionsResult.h>
+#include <aws/qconnect/model/ListAIPromptsPaginationTraits.h>
 #include <aws/qconnect/model/ListAIPromptsRequest.h>
 #include <aws/qconnect/model/ListAIPromptsResult.h>
+#include <aws/qconnect/model/ListAssistantAssociationsPaginationTraits.h>
 #include <aws/qconnect/model/ListAssistantAssociationsRequest.h>
 #include <aws/qconnect/model/ListAssistantAssociationsResult.h>
+#include <aws/qconnect/model/ListAssistantsPaginationTraits.h>
 #include <aws/qconnect/model/ListAssistantsRequest.h>
 #include <aws/qconnect/model/ListAssistantsResult.h>
+#include <aws/qconnect/model/ListContentAssociationsPaginationTraits.h>
 #include <aws/qconnect/model/ListContentAssociationsRequest.h>
 #include <aws/qconnect/model/ListContentAssociationsResult.h>
+#include <aws/qconnect/model/ListContentsPaginationTraits.h>
 #include <aws/qconnect/model/ListContentsRequest.h>
 #include <aws/qconnect/model/ListContentsResult.h>
+#include <aws/qconnect/model/ListImportJobsPaginationTraits.h>
 #include <aws/qconnect/model/ListImportJobsRequest.h>
 #include <aws/qconnect/model/ListImportJobsResult.h>
+#include <aws/qconnect/model/ListKnowledgeBasesPaginationTraits.h>
 #include <aws/qconnect/model/ListKnowledgeBasesRequest.h>
 #include <aws/qconnect/model/ListKnowledgeBasesResult.h>
+#include <aws/qconnect/model/ListMessageTemplateVersionsPaginationTraits.h>
 #include <aws/qconnect/model/ListMessageTemplateVersionsRequest.h>
 #include <aws/qconnect/model/ListMessageTemplateVersionsResult.h>
+#include <aws/qconnect/model/ListMessageTemplatesPaginationTraits.h>
 #include <aws/qconnect/model/ListMessageTemplatesRequest.h>
 #include <aws/qconnect/model/ListMessageTemplatesResult.h>
+#include <aws/qconnect/model/ListMessagesPaginationTraits.h>
 #include <aws/qconnect/model/ListMessagesRequest.h>
 #include <aws/qconnect/model/ListMessagesResult.h>
+#include <aws/qconnect/model/ListModelsPaginationTraits.h>
 #include <aws/qconnect/model/ListModelsRequest.h>
 #include <aws/qconnect/model/ListModelsResult.h>
+#include <aws/qconnect/model/ListQuickResponsesPaginationTraits.h>
 #include <aws/qconnect/model/ListQuickResponsesRequest.h>
 #include <aws/qconnect/model/ListQuickResponsesResult.h>
+#include <aws/qconnect/model/ListSpansPaginationTraits.h>
 #include <aws/qconnect/model/ListSpansRequest.h>
 #include <aws/qconnect/model/ListSpansResult.h>
 #include <aws/qconnect/model/ListTagsForResourceRequest.h>
@@ -379,13 +401,17 @@
 #include <aws/qconnect/model/RuntimeSessionDataValue.h>
 #include <aws/qconnect/model/SMSMessageTemplateContent.h>
 #include <aws/qconnect/model/SMSMessageTemplateContentBody.h>
+#include <aws/qconnect/model/SearchContentPaginationTraits.h>
 #include <aws/qconnect/model/SearchContentRequest.h>
 #include <aws/qconnect/model/SearchContentResult.h>
 #include <aws/qconnect/model/SearchExpression.h>
+#include <aws/qconnect/model/SearchMessageTemplatesPaginationTraits.h>
 #include <aws/qconnect/model/SearchMessageTemplatesRequest.h>
 #include <aws/qconnect/model/SearchMessageTemplatesResult.h>
+#include <aws/qconnect/model/SearchQuickResponsesPaginationTraits.h>
 #include <aws/qconnect/model/SearchQuickResponsesRequest.h>
 #include <aws/qconnect/model/SearchQuickResponsesResult.h>
+#include <aws/qconnect/model/SearchSessionsPaginationTraits.h>
 #include <aws/qconnect/model/SearchSessionsRequest.h>
 #include <aws/qconnect/model/SearchSessionsResult.h>
 #include <aws/qconnect/model/SeedUrl.h>
diff --git a/generated/tests/quicksight-gen-tests/QuickSightIncludeTests.cpp b/generated/tests/quicksight-gen-tests/QuickSightIncludeTests.cpp
index c06014992274..4c0f7e9e485d 100644
--- a/generated/tests/quicksight-gen-tests/QuickSightIncludeTests.cpp
+++ b/generated/tests/quicksight-gen-tests/QuickSightIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/quicksight/QuickSightClient.h>
+#include <aws/quicksight/QuickSightClientPagination.h>
 #include <aws/quicksight/QuickSightEndpointProvider.h>
 #include <aws/quicksight/QuickSightErrorMarshaller.h>
 #include <aws/quicksight/QuickSightErrors.h>
+#include <aws/quicksight/QuickSightPaginationBase.h>
 #include <aws/quicksight/QuickSightRequest.h>
 #include <aws/quicksight/QuickSightServiceClientModel.h>
+#include <aws/quicksight/QuickSightWaiter.h>
 #include <aws/quicksight/QuickSight_EXPORTS.h>
+#include <aws/quicksight/internal/QuickSightEndpointRules.h>
 #include <aws/quicksight/model/APIKeyConnectionMetadata.h>
 #include <aws/quicksight/model/AccessControlConfiguration.h>
 #include <aws/quicksight/model/AccessDeniedException.h>
@@ -720,9 +724,11 @@
 #include <aws/quicksight/model/DescribeDlpSettingResult.h>
 #include <aws/quicksight/model/DescribeFlowRequest.h>
 #include <aws/quicksight/model/DescribeFlowResult.h>
+#include <aws/quicksight/model/DescribeFolderPermissionsPaginationTraits.h>
 #include <aws/quicksight/model/DescribeFolderPermissionsRequest.h>
 #include <aws/quicksight/model/DescribeFolderPermissionsResult.h>
 #include <aws/quicksight/model/DescribeFolderRequest.h>
+#include <aws/quicksight/model/DescribeFolderResolvedPermissionsPaginationTraits.h>
 #include <aws/quicksight/model/DescribeFolderResolvedPermissionsRequest.h>
 #include <aws/quicksight/model/DescribeFolderResolvedPermissionsResult.h>
 #include <aws/quicksight/model/DescribeFolderResult.h>
@@ -1136,65 +1142,91 @@
 #include <aws/quicksight/model/LineInterpolation.h>
 #include <aws/quicksight/model/LineSeriesAxisDisplayOptions.h>
 #include <aws/quicksight/model/LinkSharingConfiguration.h>
+#include <aws/quicksight/model/ListActionConnectorsPaginationTraits.h>
 #include <aws/quicksight/model/ListActionConnectorsRequest.h>
 #include <aws/quicksight/model/ListActionConnectorsResult.h>
 #include <aws/quicksight/model/ListAgentsRequest.h>
 #include <aws/quicksight/model/ListAgentsResult.h>
+#include <aws/quicksight/model/ListAnalysesPaginationTraits.h>
 #include <aws/quicksight/model/ListAnalysesRequest.h>
 #include <aws/quicksight/model/ListAnalysesResult.h>
+#include <aws/quicksight/model/ListApprovalPoliciesPaginationTraits.h>
 #include <aws/quicksight/model/ListApprovalPoliciesRequest.h>
 #include <aws/quicksight/model/ListApprovalPoliciesResult.h>
+#include <aws/quicksight/model/ListAssetBundleExportJobsPaginationTraits.h>
 #include <aws/quicksight/model/ListAssetBundleExportJobsRequest.h>
 #include <aws/quicksight/model/ListAssetBundleExportJobsResult.h>
+#include <aws/quicksight/model/ListAssetBundleImportJobsPaginationTraits.h>
 #include <aws/quicksight/model/ListAssetBundleImportJobsRequest.h>
 #include <aws/quicksight/model/ListAssetBundleImportJobsResult.h>
+#include <aws/quicksight/model/ListBrandsPaginationTraits.h>
 #include <aws/quicksight/model/ListBrandsRequest.h>
 #include <aws/quicksight/model/ListBrandsResult.h>
 #include <aws/quicksight/model/ListControlDisplayOptions.h>
 #include <aws/quicksight/model/ListControlSearchOptions.h>
 #include <aws/quicksight/model/ListControlSelectAllOptions.h>
+#include <aws/quicksight/model/ListCustomPermissionsPaginationTraits.h>
 #include <aws/quicksight/model/ListCustomPermissionsRequest.h>
 #include <aws/quicksight/model/ListCustomPermissionsResult.h>
+#include <aws/quicksight/model/ListDashboardVersionsPaginationTraits.h>
 #include <aws/quicksight/model/ListDashboardVersionsRequest.h>
 #include <aws/quicksight/model/ListDashboardVersionsResult.h>
+#include <aws/quicksight/model/ListDashboardsPaginationTraits.h>
 #include <aws/quicksight/model/ListDashboardsRequest.h>
 #include <aws/quicksight/model/ListDashboardsResult.h>
+#include <aws/quicksight/model/ListDataSetsPaginationTraits.h>
 #include <aws/quicksight/model/ListDataSetsRequest.h>
 #include <aws/quicksight/model/ListDataSetsResult.h>
+#include <aws/quicksight/model/ListDataSourcesPaginationTraits.h>
 #include <aws/quicksight/model/ListDataSourcesRequest.h>
 #include <aws/quicksight/model/ListDataSourcesResult.h>
+#include <aws/quicksight/model/ListDlpSettingsPaginationTraits.h>
 #include <aws/quicksight/model/ListDlpSettingsRequest.h>
 #include <aws/quicksight/model/ListDlpSettingsResult.h>
+#include <aws/quicksight/model/ListFlowsPaginationTraits.h>
 #include <aws/quicksight/model/ListFlowsRequest.h>
 #include <aws/quicksight/model/ListFlowsResult.h>
+#include <aws/quicksight/model/ListFolderMembersPaginationTraits.h>
 #include <aws/quicksight/model/ListFolderMembersRequest.h>
 #include <aws/quicksight/model/ListFolderMembersResult.h>
+#include <aws/quicksight/model/ListFoldersForResourcePaginationTraits.h>
 #include <aws/quicksight/model/ListFoldersForResourceRequest.h>
 #include <aws/quicksight/model/ListFoldersForResourceResult.h>
+#include <aws/quicksight/model/ListFoldersPaginationTraits.h>
 #include <aws/quicksight/model/ListFoldersRequest.h>
 #include <aws/quicksight/model/ListFoldersResult.h>
+#include <aws/quicksight/model/ListGroupMembershipsPaginationTraits.h>
 #include <aws/quicksight/model/ListGroupMembershipsRequest.h>
 #include <aws/quicksight/model/ListGroupMembershipsResult.h>
+#include <aws/quicksight/model/ListGroupsPaginationTraits.h>
 #include <aws/quicksight/model/ListGroupsRequest.h>
 #include <aws/quicksight/model/ListGroupsResult.h>
+#include <aws/quicksight/model/ListIAMPolicyAssignmentsForUserPaginationTraits.h>
 #include <aws/quicksight/model/ListIAMPolicyAssignmentsForUserRequest.h>
 #include <aws/quicksight/model/ListIAMPolicyAssignmentsForUserResult.h>
+#include <aws/quicksight/model/ListIAMPolicyAssignmentsPaginationTraits.h>
 #include <aws/quicksight/model/ListIAMPolicyAssignmentsRequest.h>
 #include <aws/quicksight/model/ListIAMPolicyAssignmentsResult.h>
 #include <aws/quicksight/model/ListIdentityPropagationConfigsRequest.h>
 #include <aws/quicksight/model/ListIdentityPropagationConfigsResult.h>
+#include <aws/quicksight/model/ListIngestionsPaginationTraits.h>
 #include <aws/quicksight/model/ListIngestionsRequest.h>
 #include <aws/quicksight/model/ListIngestionsResult.h>
+#include <aws/quicksight/model/ListKnowledgeBasesPaginationTraits.h>
 #include <aws/quicksight/model/ListKnowledgeBasesRequest.h>
 #include <aws/quicksight/model/ListKnowledgeBasesResult.h>
+#include <aws/quicksight/model/ListLimitsProfilesPaginationTraits.h>
 #include <aws/quicksight/model/ListLimitsProfilesRequest.h>
 #include <aws/quicksight/model/ListLimitsProfilesResult.h>
+#include <aws/quicksight/model/ListNamespacesPaginationTraits.h>
 #include <aws/quicksight/model/ListNamespacesRequest.h>
 #include <aws/quicksight/model/ListNamespacesResult.h>
+#include <aws/quicksight/model/ListOAuthClientApplicationsPaginationTraits.h>
 #include <aws/quicksight/model/ListOAuthClientApplicationsRequest.h>
 #include <aws/quicksight/model/ListOAuthClientApplicationsResult.h>
 #include <aws/quicksight/model/ListRefreshSchedulesRequest.h>
 #include <aws/quicksight/model/ListRefreshSchedulesResult.h>
+#include <aws/quicksight/model/ListRoleMembershipsPaginationTraits.h>
 #include <aws/quicksight/model/ListRoleMembershipsRequest.h>
 #include <aws/quicksight/model/ListRoleMembershipsResult.h>
 #include <aws/quicksight/model/ListSelfUpgradesRequest.h>
@@ -1205,32 +1237,42 @@
 #include <aws/quicksight/model/ListSpacesResult.h>
 #include <aws/quicksight/model/ListTagsForResourceRequest.h>
 #include <aws/quicksight/model/ListTagsForResourceResult.h>
+#include <aws/quicksight/model/ListTemplateAliasesPaginationTraits.h>
 #include <aws/quicksight/model/ListTemplateAliasesRequest.h>
 #include <aws/quicksight/model/ListTemplateAliasesResult.h>
+#include <aws/quicksight/model/ListTemplateVersionsPaginationTraits.h>
 #include <aws/quicksight/model/ListTemplateVersionsRequest.h>
 #include <aws/quicksight/model/ListTemplateVersionsResult.h>
+#include <aws/quicksight/model/ListTemplatesPaginationTraits.h>
 #include <aws/quicksight/model/ListTemplatesRequest.h>
 #include <aws/quicksight/model/ListTemplatesResult.h>
 #include <aws/quicksight/model/ListThemeAliasesRequest.h>
 #include <aws/quicksight/model/ListThemeAliasesResult.h>
+#include <aws/quicksight/model/ListThemeVersionsPaginationTraits.h>
 #include <aws/quicksight/model/ListThemeVersionsRequest.h>
 #include <aws/quicksight/model/ListThemeVersionsResult.h>
+#include <aws/quicksight/model/ListThemesPaginationTraits.h>
 #include <aws/quicksight/model/ListThemesRequest.h>
 #include <aws/quicksight/model/ListThemesResult.h>
 #include <aws/quicksight/model/ListTopicRefreshSchedulesRequest.h>
 #include <aws/quicksight/model/ListTopicRefreshSchedulesResult.h>
 #include <aws/quicksight/model/ListTopicReviewedAnswersRequest.h>
 #include <aws/quicksight/model/ListTopicReviewedAnswersResult.h>
+#include <aws/quicksight/model/ListTopicsPaginationTraits.h>
 #include <aws/quicksight/model/ListTopicsRequest.h>
 #include <aws/quicksight/model/ListTopicsResult.h>
+#include <aws/quicksight/model/ListTopicsV2PaginationTraits.h>
 #include <aws/quicksight/model/ListTopicsV2Request.h>
 #include <aws/quicksight/model/ListTopicsV2Result.h>
+#include <aws/quicksight/model/ListUserGroupsPaginationTraits.h>
 #include <aws/quicksight/model/ListUserGroupsRequest.h>
 #include <aws/quicksight/model/ListUserGroupsResult.h>
 #include <aws/quicksight/model/ListUsersIndexCapacityRequest.h>
 #include <aws/quicksight/model/ListUsersIndexCapacityResult.h>
+#include <aws/quicksight/model/ListUsersPaginationTraits.h>
 #include <aws/quicksight/model/ListUsersRequest.h>
 #include <aws/quicksight/model/ListUsersResult.h>
+#include <aws/quicksight/model/ListVPCConnectionsPaginationTraits.h>
 #include <aws/quicksight/model/ListVPCConnectionsRequest.h>
 #include <aws/quicksight/model/ListVPCConnectionsResult.h>
 #include <aws/quicksight/model/LoadingAnimation.h>
@@ -1522,32 +1564,43 @@
 #include <aws/quicksight/model/ScheduleRefreshOnEntity.h>
 #include <aws/quicksight/model/SchedulesConfigurations.h>
 #include <aws/quicksight/model/ScrollBarOptions.h>
+#include <aws/quicksight/model/SearchActionConnectorsPaginationTraits.h>
 #include <aws/quicksight/model/SearchActionConnectorsRequest.h>
 #include <aws/quicksight/model/SearchActionConnectorsResult.h>
 #include <aws/quicksight/model/SearchAgentsRequest.h>
 #include <aws/quicksight/model/SearchAgentsResult.h>
+#include <aws/quicksight/model/SearchAnalysesPaginationTraits.h>
 #include <aws/quicksight/model/SearchAnalysesRequest.h>
 #include <aws/quicksight/model/SearchAnalysesResult.h>
+#include <aws/quicksight/model/SearchDashboardsPaginationTraits.h>
 #include <aws/quicksight/model/SearchDashboardsRequest.h>
 #include <aws/quicksight/model/SearchDashboardsResult.h>
+#include <aws/quicksight/model/SearchDataSetsPaginationTraits.h>
 #include <aws/quicksight/model/SearchDataSetsRequest.h>
 #include <aws/quicksight/model/SearchDataSetsResult.h>
+#include <aws/quicksight/model/SearchDataSourcesPaginationTraits.h>
 #include <aws/quicksight/model/SearchDataSourcesRequest.h>
 #include <aws/quicksight/model/SearchDataSourcesResult.h>
 #include <aws/quicksight/model/SearchFilterOperator.h>
 #include <aws/quicksight/model/SearchFlowsFilter.h>
+#include <aws/quicksight/model/SearchFlowsPaginationTraits.h>
 #include <aws/quicksight/model/SearchFlowsRequest.h>
 #include <aws/quicksight/model/SearchFlowsResult.h>
+#include <aws/quicksight/model/SearchFoldersPaginationTraits.h>
 #include <aws/quicksight/model/SearchFoldersRequest.h>
 #include <aws/quicksight/model/SearchFoldersResult.h>
+#include <aws/quicksight/model/SearchGroupsPaginationTraits.h>
 #include <aws/quicksight/model/SearchGroupsRequest.h>
 #include <aws/quicksight/model/SearchGroupsResult.h>
+#include <aws/quicksight/model/SearchKnowledgeBasesPaginationTraits.h>
 #include <aws/quicksight/model/SearchKnowledgeBasesRequest.h>
 #include <aws/quicksight/model/SearchKnowledgeBasesResult.h>
 #include <aws/quicksight/model/SearchSpacesRequest.h>
 #include <aws/quicksight/model/SearchSpacesResult.h>
+#include <aws/quicksight/model/SearchTopicsPaginationTraits.h>
 #include <aws/quicksight/model/SearchTopicsRequest.h>
 #include <aws/quicksight/model/SearchTopicsResult.h>
+#include <aws/quicksight/model/SearchTopicsV2PaginationTraits.h>
 #include <aws/quicksight/model/SearchTopicsV2Request.h>
 #include <aws/quicksight/model/SearchTopicsV2Result.h>
 #include <aws/quicksight/model/SecondaryValueOptions.h>
diff --git a/generated/tests/ram-gen-tests/RAMIncludeTests.cpp b/generated/tests/ram-gen-tests/RAMIncludeTests.cpp
index 7856bf97be42..71bd511bb23c 100644
--- a/generated/tests/ram-gen-tests/RAMIncludeTests.cpp
+++ b/generated/tests/ram-gen-tests/RAMIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/ram/RAMClient.h>
+#include <aws/ram/RAMClientPagination.h>
 #include <aws/ram/RAMEndpointProvider.h>
 #include <aws/ram/RAMErrorMarshaller.h>
 #include <aws/ram/RAMErrors.h>
+#include <aws/ram/RAMPaginationBase.h>
 #include <aws/ram/RAMRequest.h>
 #include <aws/ram/RAMServiceClientModel.h>
+#include <aws/ram/RAMWaiter.h>
 #include <aws/ram/RAM_EXPORTS.h>
+#include <aws/ram/internal/RAMEndpointRules.h>
 #include <aws/ram/model/AcceptResourceShareInvitationRequest.h>
 #include <aws/ram/model/AcceptResourceShareInvitationResult.h>
 #include <aws/ram/model/AssociateResourceSharePermissionRequest.h>
@@ -41,32 +45,46 @@
 #include <aws/ram/model/EnableSharingWithAwsOrganizationResult.h>
 #include <aws/ram/model/GetPermissionRequest.h>
 #include <aws/ram/model/GetPermissionResult.h>
+#include <aws/ram/model/GetResourcePoliciesPaginationTraits.h>
 #include <aws/ram/model/GetResourcePoliciesRequest.h>
 #include <aws/ram/model/GetResourcePoliciesResult.h>
+#include <aws/ram/model/GetResourceShareAssociationsPaginationTraits.h>
 #include <aws/ram/model/GetResourceShareAssociationsRequest.h>
 #include <aws/ram/model/GetResourceShareAssociationsResult.h>
+#include <aws/ram/model/GetResourceShareInvitationsPaginationTraits.h>
 #include <aws/ram/model/GetResourceShareInvitationsRequest.h>
 #include <aws/ram/model/GetResourceShareInvitationsResult.h>
+#include <aws/ram/model/GetResourceSharesPaginationTraits.h>
 #include <aws/ram/model/GetResourceSharesRequest.h>
 #include <aws/ram/model/GetResourceSharesResult.h>
+#include <aws/ram/model/ListPendingInvitationResourcesPaginationTraits.h>
 #include <aws/ram/model/ListPendingInvitationResourcesRequest.h>
 #include <aws/ram/model/ListPendingInvitationResourcesResult.h>
+#include <aws/ram/model/ListPermissionAssociationsPaginationTraits.h>
 #include <aws/ram/model/ListPermissionAssociationsRequest.h>
 #include <aws/ram/model/ListPermissionAssociationsResult.h>
+#include <aws/ram/model/ListPermissionVersionsPaginationTraits.h>
 #include <aws/ram/model/ListPermissionVersionsRequest.h>
 #include <aws/ram/model/ListPermissionVersionsResult.h>
+#include <aws/ram/model/ListPermissionsPaginationTraits.h>
 #include <aws/ram/model/ListPermissionsRequest.h>
 #include <aws/ram/model/ListPermissionsResult.h>
+#include <aws/ram/model/ListPrincipalsPaginationTraits.h>
 #include <aws/ram/model/ListPrincipalsRequest.h>
 #include <aws/ram/model/ListPrincipalsResult.h>
+#include <aws/ram/model/ListReplacePermissionAssociationsWorkPaginationTraits.h>
 #include <aws/ram/model/ListReplacePermissionAssociationsWorkRequest.h>
 #include <aws/ram/model/ListReplacePermissionAssociationsWorkResult.h>
+#include <aws/ram/model/ListResourceSharePermissionsPaginationTraits.h>
 #include <aws/ram/model/ListResourceSharePermissionsRequest.h>
 #include <aws/ram/model/ListResourceSharePermissionsResult.h>
+#include <aws/ram/model/ListResourceTypesPaginationTraits.h>
 #include <aws/ram/model/ListResourceTypesRequest.h>
 #include <aws/ram/model/ListResourceTypesResult.h>
+#include <aws/ram/model/ListResourcesPaginationTraits.h>
 #include <aws/ram/model/ListResourcesRequest.h>
 #include <aws/ram/model/ListResourcesResult.h>
+#include <aws/ram/model/ListSourceAssociationsPaginationTraits.h>
 #include <aws/ram/model/ListSourceAssociationsRequest.h>
 #include <aws/ram/model/ListSourceAssociationsResult.h>
 #include <aws/ram/model/PermissionFeatureSet.h>
diff --git a/generated/tests/rbin-gen-tests/RecycleBinIncludeTests.cpp b/generated/tests/rbin-gen-tests/RecycleBinIncludeTests.cpp
index db05cecb2a2c..ba577ff96adf 100644
--- a/generated/tests/rbin-gen-tests/RecycleBinIncludeTests.cpp
+++ b/generated/tests/rbin-gen-tests/RecycleBinIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/rbin/RecycleBinClient.h>
+#include <aws/rbin/RecycleBinClientPagination.h>
 #include <aws/rbin/RecycleBinEndpointProvider.h>
 #include <aws/rbin/RecycleBinErrorMarshaller.h>
 #include <aws/rbin/RecycleBinErrors.h>
+#include <aws/rbin/RecycleBinPaginationBase.h>
 #include <aws/rbin/RecycleBinRequest.h>
 #include <aws/rbin/RecycleBinServiceClientModel.h>
+#include <aws/rbin/RecycleBinWaiter.h>
 #include <aws/rbin/RecycleBin_EXPORTS.h>
+#include <aws/rbin/internal/RecycleBinEndpointRules.h>
 #include <aws/rbin/model/ConflictException.h>
 #include <aws/rbin/model/ConflictExceptionReason.h>
 #include <aws/rbin/model/CreateRuleRequest.h>
@@ -21,6 +25,7 @@
 #include <aws/rbin/model/DeleteRuleResult.h>
 #include <aws/rbin/model/GetRuleRequest.h>
 #include <aws/rbin/model/GetRuleResult.h>
+#include <aws/rbin/model/ListRulesPaginationTraits.h>
 #include <aws/rbin/model/ListRulesRequest.h>
 #include <aws/rbin/model/ListRulesResult.h>
 #include <aws/rbin/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/rds-data-gen-tests/RDSDataServiceIncludeTests.cpp b/generated/tests/rds-data-gen-tests/RDSDataServiceIncludeTests.cpp
index 8d6fe925ab6b..ffc3f1f2506f 100644
--- a/generated/tests/rds-data-gen-tests/RDSDataServiceIncludeTests.cpp
+++ b/generated/tests/rds-data-gen-tests/RDSDataServiceIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/rds-data/RDSDataServiceEndpointProvider.h>
 #include <aws/rds-data/RDSDataServiceErrorMarshaller.h>
 #include <aws/rds-data/RDSDataServiceErrors.h>
+#include <aws/rds-data/RDSDataServicePaginationBase.h>
 #include <aws/rds-data/RDSDataServiceRequest.h>
 #include <aws/rds-data/RDSDataServiceServiceClientModel.h>
+#include <aws/rds-data/RDSDataServiceWaiter.h>
 #include <aws/rds-data/RDSDataService_EXPORTS.h>
+#include <aws/rds-data/internal/RDSDataServiceEndpointRules.h>
 #include <aws/rds-data/model/ArrayValue.h>
 #include <aws/rds-data/model/BatchExecuteStatementRequest.h>
 #include <aws/rds-data/model/BatchExecuteStatementResult.h>
diff --git a/generated/tests/rds-gen-tests/RDSIncludeTests.cpp b/generated/tests/rds-gen-tests/RDSIncludeTests.cpp
index 7688fcc2640a..15ae0e54e7a2 100644
--- a/generated/tests/rds-gen-tests/RDSIncludeTests.cpp
+++ b/generated/tests/rds-gen-tests/RDSIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/rds/RDSClient.h>
+#include <aws/rds/RDSClientPagination.h>
 #include <aws/rds/RDSEndpointProvider.h>
 #include <aws/rds/RDSErrorMarshaller.h>
 #include <aws/rds/RDSErrors.h>
+#include <aws/rds/RDSPaginationBase.h>
 #include <aws/rds/RDSRequest.h>
 #include <aws/rds/RDSServiceClientModel.h>
+#include <aws/rds/RDSWaiter.h>
 #include <aws/rds/RDS_EXPORTS.h>
+#include <aws/rds/internal/RDSEndpointRules.h>
 #include <aws/rds/model/AccountQuota.h>
 #include <aws/rds/model/ActivityStreamMode.h>
 #include <aws/rds/model/ActivityStreamPolicyStatus.h>
@@ -184,95 +188,136 @@
 #include <aws/rds/model/DeregisterDBProxyTargetsResult.h>
 #include <aws/rds/model/DescribeAccountAttributesRequest.h>
 #include <aws/rds/model/DescribeAccountAttributesResult.h>
+#include <aws/rds/model/DescribeBlueGreenDeploymentsPaginationTraits.h>
 #include <aws/rds/model/DescribeBlueGreenDeploymentsRequest.h>
 #include <aws/rds/model/DescribeBlueGreenDeploymentsResult.h>
+#include <aws/rds/model/DescribeCertificatesPaginationTraits.h>
 #include <aws/rds/model/DescribeCertificatesRequest.h>
 #include <aws/rds/model/DescribeCertificatesResult.h>
+#include <aws/rds/model/DescribeDBClusterAutomatedBackupsPaginationTraits.h>
 #include <aws/rds/model/DescribeDBClusterAutomatedBackupsRequest.h>
 #include <aws/rds/model/DescribeDBClusterAutomatedBackupsResult.h>
+#include <aws/rds/model/DescribeDBClusterBacktracksPaginationTraits.h>
 #include <aws/rds/model/DescribeDBClusterBacktracksRequest.h>
 #include <aws/rds/model/DescribeDBClusterBacktracksResult.h>
+#include <aws/rds/model/DescribeDBClusterEndpointsPaginationTraits.h>
 #include <aws/rds/model/DescribeDBClusterEndpointsRequest.h>
 #include <aws/rds/model/DescribeDBClusterEndpointsResult.h>
+#include <aws/rds/model/DescribeDBClusterParameterGroupsPaginationTraits.h>
 #include <aws/rds/model/DescribeDBClusterParameterGroupsRequest.h>
 #include <aws/rds/model/DescribeDBClusterParameterGroupsResult.h>
+#include <aws/rds/model/DescribeDBClusterParametersPaginationTraits.h>
 #include <aws/rds/model/DescribeDBClusterParametersRequest.h>
 #include <aws/rds/model/DescribeDBClusterParametersResult.h>
 #include <aws/rds/model/DescribeDBClusterSnapshotAttributesRequest.h>
 #include <aws/rds/model/DescribeDBClusterSnapshotAttributesResult.h>
+#include <aws/rds/model/DescribeDBClusterSnapshotsPaginationTraits.h>
 #include <aws/rds/model/DescribeDBClusterSnapshotsRequest.h>
 #include <aws/rds/model/DescribeDBClusterSnapshotsResult.h>
+#include <aws/rds/model/DescribeDBClustersPaginationTraits.h>
 #include <aws/rds/model/DescribeDBClustersRequest.h>
 #include <aws/rds/model/DescribeDBClustersResult.h>
+#include <aws/rds/model/DescribeDBEngineVersionsPaginationTraits.h>
 #include <aws/rds/model/DescribeDBEngineVersionsRequest.h>
 #include <aws/rds/model/DescribeDBEngineVersionsResult.h>
+#include <aws/rds/model/DescribeDBInstanceAutomatedBackupsPaginationTraits.h>
 #include <aws/rds/model/DescribeDBInstanceAutomatedBackupsRequest.h>
 #include <aws/rds/model/DescribeDBInstanceAutomatedBackupsResult.h>
+#include <aws/rds/model/DescribeDBInstancesPaginationTraits.h>
 #include <aws/rds/model/DescribeDBInstancesRequest.h>
 #include <aws/rds/model/DescribeDBInstancesResult.h>
 #include <aws/rds/model/DescribeDBLogFilesDetails.h>
+#include <aws/rds/model/DescribeDBLogFilesPaginationTraits.h>
 #include <aws/rds/model/DescribeDBLogFilesRequest.h>
 #include <aws/rds/model/DescribeDBLogFilesResult.h>
+#include <aws/rds/model/DescribeDBMajorEngineVersionsPaginationTraits.h>
 #include <aws/rds/model/DescribeDBMajorEngineVersionsRequest.h>
 #include <aws/rds/model/DescribeDBMajorEngineVersionsResult.h>
+#include <aws/rds/model/DescribeDBParameterGroupsPaginationTraits.h>
 #include <aws/rds/model/DescribeDBParameterGroupsRequest.h>
 #include <aws/rds/model/DescribeDBParameterGroupsResult.h>
+#include <aws/rds/model/DescribeDBParametersPaginationTraits.h>
 #include <aws/rds/model/DescribeDBParametersRequest.h>
 #include <aws/rds/model/DescribeDBParametersResult.h>
+#include <aws/rds/model/DescribeDBProxiesPaginationTraits.h>
 #include <aws/rds/model/DescribeDBProxiesRequest.h>
 #include <aws/rds/model/DescribeDBProxiesResult.h>
+#include <aws/rds/model/DescribeDBProxyEndpointsPaginationTraits.h>
 #include <aws/rds/model/DescribeDBProxyEndpointsRequest.h>
 #include <aws/rds/model/DescribeDBProxyEndpointsResult.h>
+#include <aws/rds/model/DescribeDBProxyTargetGroupsPaginationTraits.h>
 #include <aws/rds/model/DescribeDBProxyTargetGroupsRequest.h>
 #include <aws/rds/model/DescribeDBProxyTargetGroupsResult.h>
+#include <aws/rds/model/DescribeDBProxyTargetsPaginationTraits.h>
 #include <aws/rds/model/DescribeDBProxyTargetsRequest.h>
 #include <aws/rds/model/DescribeDBProxyTargetsResult.h>
+#include <aws/rds/model/DescribeDBRecommendationsPaginationTraits.h>
 #include <aws/rds/model/DescribeDBRecommendationsRequest.h>
 #include <aws/rds/model/DescribeDBRecommendationsResult.h>
+#include <aws/rds/model/DescribeDBSecurityGroupsPaginationTraits.h>
 #include <aws/rds/model/DescribeDBSecurityGroupsRequest.h>
 #include <aws/rds/model/DescribeDBSecurityGroupsResult.h>
 #include <aws/rds/model/DescribeDBShardGroupsRequest.h>
 #include <aws/rds/model/DescribeDBShardGroupsResult.h>
 #include <aws/rds/model/DescribeDBSnapshotAttributesRequest.h>
 #include <aws/rds/model/DescribeDBSnapshotAttributesResult.h>
+#include <aws/rds/model/DescribeDBSnapshotTenantDatabasesPaginationTraits.h>
 #include <aws/rds/model/DescribeDBSnapshotTenantDatabasesRequest.h>
 #include <aws/rds/model/DescribeDBSnapshotTenantDatabasesResult.h>
+#include <aws/rds/model/DescribeDBSnapshotsPaginationTraits.h>
 #include <aws/rds/model/DescribeDBSnapshotsRequest.h>
 #include <aws/rds/model/DescribeDBSnapshotsResult.h>
+#include <aws/rds/model/DescribeDBSubnetGroupsPaginationTraits.h>
 #include <aws/rds/model/DescribeDBSubnetGroupsRequest.h>
 #include <aws/rds/model/DescribeDBSubnetGroupsResult.h>
+#include <aws/rds/model/DescribeEngineDefaultClusterParametersPaginationTraits.h>
 #include <aws/rds/model/DescribeEngineDefaultClusterParametersRequest.h>
 #include <aws/rds/model/DescribeEngineDefaultClusterParametersResult.h>
+#include <aws/rds/model/DescribeEngineDefaultParametersPaginationTraits.h>
 #include <aws/rds/model/DescribeEngineDefaultParametersRequest.h>
 #include <aws/rds/model/DescribeEngineDefaultParametersResult.h>
 #include <aws/rds/model/DescribeEventCategoriesRequest.h>
 #include <aws/rds/model/DescribeEventCategoriesResult.h>
+#include <aws/rds/model/DescribeEventSubscriptionsPaginationTraits.h>
 #include <aws/rds/model/DescribeEventSubscriptionsRequest.h>
 #include <aws/rds/model/DescribeEventSubscriptionsResult.h>
+#include <aws/rds/model/DescribeEventsPaginationTraits.h>
 #include <aws/rds/model/DescribeEventsRequest.h>
 #include <aws/rds/model/DescribeEventsResult.h>
+#include <aws/rds/model/DescribeExportTasksPaginationTraits.h>
 #include <aws/rds/model/DescribeExportTasksRequest.h>
 #include <aws/rds/model/DescribeExportTasksResult.h>
+#include <aws/rds/model/DescribeGlobalClustersPaginationTraits.h>
 #include <aws/rds/model/DescribeGlobalClustersRequest.h>
 #include <aws/rds/model/DescribeGlobalClustersResult.h>
+#include <aws/rds/model/DescribeIntegrationsPaginationTraits.h>
 #include <aws/rds/model/DescribeIntegrationsRequest.h>
 #include <aws/rds/model/DescribeIntegrationsResult.h>
+#include <aws/rds/model/DescribeOptionGroupOptionsPaginationTraits.h>
 #include <aws/rds/model/DescribeOptionGroupOptionsRequest.h>
 #include <aws/rds/model/DescribeOptionGroupOptionsResult.h>
+#include <aws/rds/model/DescribeOptionGroupsPaginationTraits.h>
 #include <aws/rds/model/DescribeOptionGroupsRequest.h>
 #include <aws/rds/model/DescribeOptionGroupsResult.h>
+#include <aws/rds/model/DescribeOrderableDBInstanceOptionsPaginationTraits.h>
 #include <aws/rds/model/DescribeOrderableDBInstanceOptionsRequest.h>
 #include <aws/rds/model/DescribeOrderableDBInstanceOptionsResult.h>
+#include <aws/rds/model/DescribePendingMaintenanceActionsPaginationTraits.h>
 #include <aws/rds/model/DescribePendingMaintenanceActionsRequest.h>
 #include <aws/rds/model/DescribePendingMaintenanceActionsResult.h>
+#include <aws/rds/model/DescribeReservedDBInstancesOfferingsPaginationTraits.h>
 #include <aws/rds/model/DescribeReservedDBInstancesOfferingsRequest.h>
 #include <aws/rds/model/DescribeReservedDBInstancesOfferingsResult.h>
+#include <aws/rds/model/DescribeReservedDBInstancesPaginationTraits.h>
 #include <aws/rds/model/DescribeReservedDBInstancesRequest.h>
 #include <aws/rds/model/DescribeReservedDBInstancesResult.h>
+#include <aws/rds/model/DescribeServerlessV2PlatformVersionsPaginationTraits.h>
 #include <aws/rds/model/DescribeServerlessV2PlatformVersionsRequest.h>
 #include <aws/rds/model/DescribeServerlessV2PlatformVersionsResult.h>
+#include <aws/rds/model/DescribeSourceRegionsPaginationTraits.h>
 #include <aws/rds/model/DescribeSourceRegionsRequest.h>
 #include <aws/rds/model/DescribeSourceRegionsResult.h>
+#include <aws/rds/model/DescribeTenantDatabasesPaginationTraits.h>
 #include <aws/rds/model/DescribeTenantDatabasesRequest.h>
 #include <aws/rds/model/DescribeTenantDatabasesResult.h>
 #include <aws/rds/model/DescribeValidDBInstanceModificationsRequest.h>
@@ -282,6 +327,7 @@
 #include <aws/rds/model/DocLink.h>
 #include <aws/rds/model/DomainMembership.h>
 #include <aws/rds/model/DoubleRange.h>
+#include <aws/rds/model/DownloadDBLogFilePortionPaginationTraits.h>
 #include <aws/rds/model/DownloadDBLogFilePortionRequest.h>
 #include <aws/rds/model/DownloadDBLogFilePortionResult.h>
 #include <aws/rds/model/EC2SecurityGroup.h>
diff --git a/generated/tests/redshift-data-gen-tests/RedshiftDataAPIServiceIncludeTests.cpp b/generated/tests/redshift-data-gen-tests/RedshiftDataAPIServiceIncludeTests.cpp
index 96b851d7c416..d4d3f57786b6 100644
--- a/generated/tests/redshift-data-gen-tests/RedshiftDataAPIServiceIncludeTests.cpp
+++ b/generated/tests/redshift-data-gen-tests/RedshiftDataAPIServiceIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/redshift-data/RedshiftDataAPIServiceClient.h>
+#include <aws/redshift-data/RedshiftDataAPIServiceClientPagination.h>
 #include <aws/redshift-data/RedshiftDataAPIServiceEndpointProvider.h>
 #include <aws/redshift-data/RedshiftDataAPIServiceErrorMarshaller.h>
 #include <aws/redshift-data/RedshiftDataAPIServiceErrors.h>
+#include <aws/redshift-data/RedshiftDataAPIServicePaginationBase.h>
 #include <aws/redshift-data/RedshiftDataAPIServiceRequest.h>
 #include <aws/redshift-data/RedshiftDataAPIServiceServiceClientModel.h>
+#include <aws/redshift-data/RedshiftDataAPIServiceWaiter.h>
 #include <aws/redshift-data/RedshiftDataAPIService_EXPORTS.h>
+#include <aws/redshift-data/internal/RedshiftDataAPIServiceEndpointRules.h>
 #include <aws/redshift-data/model/BatchExecuteStatementException.h>
 #include <aws/redshift-data/model/BatchExecuteStatementRequest.h>
 #include <aws/redshift-data/model/BatchExecuteStatementResult.h>
@@ -21,6 +25,7 @@
 #include <aws/redshift-data/model/ColumnMetadata.h>
 #include <aws/redshift-data/model/DescribeStatementRequest.h>
 #include <aws/redshift-data/model/DescribeStatementResult.h>
+#include <aws/redshift-data/model/DescribeTablePaginationTraits.h>
 #include <aws/redshift-data/model/DescribeTableRequest.h>
 #include <aws/redshift-data/model/DescribeTableResult.h>
 #include <aws/redshift-data/model/ExecuteStatementException.h>
@@ -28,18 +33,25 @@
 #include <aws/redshift-data/model/ExecuteStatementResult.h>
 #include <aws/redshift-data/model/ExecutionMode.h>
 #include <aws/redshift-data/model/Field.h>
+#include <aws/redshift-data/model/GetStatementResultPaginationTraits.h>
 #include <aws/redshift-data/model/GetStatementResultRequest.h>
 #include <aws/redshift-data/model/GetStatementResultResult.h>
+#include <aws/redshift-data/model/GetStatementResultV2PaginationTraits.h>
 #include <aws/redshift-data/model/GetStatementResultV2Request.h>
 #include <aws/redshift-data/model/GetStatementResultV2Result.h>
+#include <aws/redshift-data/model/ListDatabasesPaginationTraits.h>
 #include <aws/redshift-data/model/ListDatabasesRequest.h>
 #include <aws/redshift-data/model/ListDatabasesResult.h>
+#include <aws/redshift-data/model/ListSchemasPaginationTraits.h>
 #include <aws/redshift-data/model/ListSchemasRequest.h>
 #include <aws/redshift-data/model/ListSchemasResult.h>
+#include <aws/redshift-data/model/ListSessionsPaginationTraits.h>
 #include <aws/redshift-data/model/ListSessionsRequest.h>
 #include <aws/redshift-data/model/ListSessionsResult.h>
+#include <aws/redshift-data/model/ListStatementsPaginationTraits.h>
 #include <aws/redshift-data/model/ListStatementsRequest.h>
 #include <aws/redshift-data/model/ListStatementsResult.h>
+#include <aws/redshift-data/model/ListTablesPaginationTraits.h>
 #include <aws/redshift-data/model/ListTablesRequest.h>
 #include <aws/redshift-data/model/ListTablesResult.h>
 #include <aws/redshift-data/model/QueryRecords.h>
diff --git a/generated/tests/redshift-gen-tests/RedshiftIncludeTests.cpp b/generated/tests/redshift-gen-tests/RedshiftIncludeTests.cpp
index 5b83506e5e96..80694b69a49c 100644
--- a/generated/tests/redshift-gen-tests/RedshiftIncludeTests.cpp
+++ b/generated/tests/redshift-gen-tests/RedshiftIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/redshift/RedshiftClient.h>
+#include <aws/redshift/RedshiftClientPagination.h>
 #include <aws/redshift/RedshiftEndpointProvider.h>
 #include <aws/redshift/RedshiftErrorMarshaller.h>
 #include <aws/redshift/RedshiftErrors.h>
+#include <aws/redshift/RedshiftPaginationBase.h>
 #include <aws/redshift/RedshiftRequest.h>
 #include <aws/redshift/RedshiftServiceClientModel.h>
+#include <aws/redshift/RedshiftWaiter.h>
 #include <aws/redshift/Redshift_EXPORTS.h>
+#include <aws/redshift/internal/RedshiftEndpointRules.h>
 #include <aws/redshift/model/AcceptReservedNodeExchangeRequest.h>
 #include <aws/redshift/model/AcceptReservedNodeExchangeResult.h>
 #include <aws/redshift/model/AccountAttribute.h>
@@ -145,86 +149,121 @@
 #include <aws/redshift/model/DescribeAccountAttributesResult.h>
 #include <aws/redshift/model/DescribeAuthenticationProfilesRequest.h>
 #include <aws/redshift/model/DescribeAuthenticationProfilesResult.h>
+#include <aws/redshift/model/DescribeClusterDbRevisionsPaginationTraits.h>
 #include <aws/redshift/model/DescribeClusterDbRevisionsRequest.h>
 #include <aws/redshift/model/DescribeClusterDbRevisionsResult.h>
+#include <aws/redshift/model/DescribeClusterParameterGroupsPaginationTraits.h>
 #include <aws/redshift/model/DescribeClusterParameterGroupsRequest.h>
 #include <aws/redshift/model/DescribeClusterParameterGroupsResult.h>
+#include <aws/redshift/model/DescribeClusterParametersPaginationTraits.h>
 #include <aws/redshift/model/DescribeClusterParametersRequest.h>
 #include <aws/redshift/model/DescribeClusterParametersResult.h>
+#include <aws/redshift/model/DescribeClusterSecurityGroupsPaginationTraits.h>
 #include <aws/redshift/model/DescribeClusterSecurityGroupsRequest.h>
 #include <aws/redshift/model/DescribeClusterSecurityGroupsResult.h>
+#include <aws/redshift/model/DescribeClusterSnapshotsPaginationTraits.h>
 #include <aws/redshift/model/DescribeClusterSnapshotsRequest.h>
 #include <aws/redshift/model/DescribeClusterSnapshotsResult.h>
+#include <aws/redshift/model/DescribeClusterSubnetGroupsPaginationTraits.h>
 #include <aws/redshift/model/DescribeClusterSubnetGroupsRequest.h>
 #include <aws/redshift/model/DescribeClusterSubnetGroupsResult.h>
+#include <aws/redshift/model/DescribeClusterTracksPaginationTraits.h>
 #include <aws/redshift/model/DescribeClusterTracksRequest.h>
 #include <aws/redshift/model/DescribeClusterTracksResult.h>
+#include <aws/redshift/model/DescribeClusterVersionsPaginationTraits.h>
 #include <aws/redshift/model/DescribeClusterVersionsRequest.h>
 #include <aws/redshift/model/DescribeClusterVersionsResult.h>
+#include <aws/redshift/model/DescribeClustersPaginationTraits.h>
 #include <aws/redshift/model/DescribeClustersRequest.h>
 #include <aws/redshift/model/DescribeClustersResult.h>
+#include <aws/redshift/model/DescribeCustomDomainAssociationsPaginationTraits.h>
 #include <aws/redshift/model/DescribeCustomDomainAssociationsRequest.h>
 #include <aws/redshift/model/DescribeCustomDomainAssociationsResult.h>
+#include <aws/redshift/model/DescribeDataSharesForConsumerPaginationTraits.h>
 #include <aws/redshift/model/DescribeDataSharesForConsumerRequest.h>
 #include <aws/redshift/model/DescribeDataSharesForConsumerResult.h>
+#include <aws/redshift/model/DescribeDataSharesForProducerPaginationTraits.h>
 #include <aws/redshift/model/DescribeDataSharesForProducerRequest.h>
 #include <aws/redshift/model/DescribeDataSharesForProducerResult.h>
+#include <aws/redshift/model/DescribeDataSharesPaginationTraits.h>
 #include <aws/redshift/model/DescribeDataSharesRequest.h>
 #include <aws/redshift/model/DescribeDataSharesResult.h>
+#include <aws/redshift/model/DescribeDefaultClusterParametersPaginationTraits.h>
 #include <aws/redshift/model/DescribeDefaultClusterParametersRequest.h>
 #include <aws/redshift/model/DescribeDefaultClusterParametersResult.h>
+#include <aws/redshift/model/DescribeEndpointAccessPaginationTraits.h>
 #include <aws/redshift/model/DescribeEndpointAccessRequest.h>
 #include <aws/redshift/model/DescribeEndpointAccessResult.h>
+#include <aws/redshift/model/DescribeEndpointAuthorizationPaginationTraits.h>
 #include <aws/redshift/model/DescribeEndpointAuthorizationRequest.h>
 #include <aws/redshift/model/DescribeEndpointAuthorizationResult.h>
 #include <aws/redshift/model/DescribeEventCategoriesRequest.h>
 #include <aws/redshift/model/DescribeEventCategoriesResult.h>
+#include <aws/redshift/model/DescribeEventSubscriptionsPaginationTraits.h>
 #include <aws/redshift/model/DescribeEventSubscriptionsRequest.h>
 #include <aws/redshift/model/DescribeEventSubscriptionsResult.h>
+#include <aws/redshift/model/DescribeEventsPaginationTraits.h>
 #include <aws/redshift/model/DescribeEventsRequest.h>
 #include <aws/redshift/model/DescribeEventsResult.h>
+#include <aws/redshift/model/DescribeHsmClientCertificatesPaginationTraits.h>
 #include <aws/redshift/model/DescribeHsmClientCertificatesRequest.h>
 #include <aws/redshift/model/DescribeHsmClientCertificatesResult.h>
+#include <aws/redshift/model/DescribeHsmConfigurationsPaginationTraits.h>
 #include <aws/redshift/model/DescribeHsmConfigurationsRequest.h>
 #include <aws/redshift/model/DescribeHsmConfigurationsResult.h>
+#include <aws/redshift/model/DescribeInboundIntegrationsPaginationTraits.h>
 #include <aws/redshift/model/DescribeInboundIntegrationsRequest.h>
 #include <aws/redshift/model/DescribeInboundIntegrationsResult.h>
 #include <aws/redshift/model/DescribeIntegrationsFilter.h>
 #include <aws/redshift/model/DescribeIntegrationsFilterName.h>
+#include <aws/redshift/model/DescribeIntegrationsPaginationTraits.h>
 #include <aws/redshift/model/DescribeIntegrationsRequest.h>
 #include <aws/redshift/model/DescribeIntegrationsResult.h>
 #include <aws/redshift/model/DescribeLoggingStatusRequest.h>
 #include <aws/redshift/model/DescribeLoggingStatusResult.h>
+#include <aws/redshift/model/DescribeNodeConfigurationOptionsPaginationTraits.h>
 #include <aws/redshift/model/DescribeNodeConfigurationOptionsRequest.h>
 #include <aws/redshift/model/DescribeNodeConfigurationOptionsResult.h>
+#include <aws/redshift/model/DescribeOrderableClusterOptionsPaginationTraits.h>
 #include <aws/redshift/model/DescribeOrderableClusterOptionsRequest.h>
 #include <aws/redshift/model/DescribeOrderableClusterOptionsResult.h>
 #include <aws/redshift/model/DescribePartnersRequest.h>
 #include <aws/redshift/model/DescribePartnersResult.h>
+#include <aws/redshift/model/DescribeQev2IdcApplicationsPaginationTraits.h>
 #include <aws/redshift/model/DescribeQev2IdcApplicationsRequest.h>
 #include <aws/redshift/model/DescribeQev2IdcApplicationsResult.h>
+#include <aws/redshift/model/DescribeRedshiftIdcApplicationsPaginationTraits.h>
 #include <aws/redshift/model/DescribeRedshiftIdcApplicationsRequest.h>
 #include <aws/redshift/model/DescribeRedshiftIdcApplicationsResult.h>
+#include <aws/redshift/model/DescribeReservedNodeExchangeStatusPaginationTraits.h>
 #include <aws/redshift/model/DescribeReservedNodeExchangeStatusRequest.h>
 #include <aws/redshift/model/DescribeReservedNodeExchangeStatusResult.h>
+#include <aws/redshift/model/DescribeReservedNodeOfferingsPaginationTraits.h>
 #include <aws/redshift/model/DescribeReservedNodeOfferingsRequest.h>
 #include <aws/redshift/model/DescribeReservedNodeOfferingsResult.h>
+#include <aws/redshift/model/DescribeReservedNodesPaginationTraits.h>
 #include <aws/redshift/model/DescribeReservedNodesRequest.h>
 #include <aws/redshift/model/DescribeReservedNodesResult.h>
 #include <aws/redshift/model/DescribeResizeRequest.h>
 #include <aws/redshift/model/DescribeResizeResult.h>
+#include <aws/redshift/model/DescribeScheduledActionsPaginationTraits.h>
 #include <aws/redshift/model/DescribeScheduledActionsRequest.h>
 #include <aws/redshift/model/DescribeScheduledActionsResult.h>
+#include <aws/redshift/model/DescribeSnapshotCopyGrantsPaginationTraits.h>
 #include <aws/redshift/model/DescribeSnapshotCopyGrantsRequest.h>
 #include <aws/redshift/model/DescribeSnapshotCopyGrantsResult.h>
+#include <aws/redshift/model/DescribeSnapshotSchedulesPaginationTraits.h>
 #include <aws/redshift/model/DescribeSnapshotSchedulesRequest.h>
 #include <aws/redshift/model/DescribeSnapshotSchedulesResult.h>
 #include <aws/redshift/model/DescribeStorageRequest.h>
 #include <aws/redshift/model/DescribeStorageResult.h>
+#include <aws/redshift/model/DescribeTableRestoreStatusPaginationTraits.h>
 #include <aws/redshift/model/DescribeTableRestoreStatusRequest.h>
 #include <aws/redshift/model/DescribeTableRestoreStatusResult.h>
+#include <aws/redshift/model/DescribeTagsPaginationTraits.h>
 #include <aws/redshift/model/DescribeTagsRequest.h>
 #include <aws/redshift/model/DescribeTagsResult.h>
+#include <aws/redshift/model/DescribeUsageLimitsPaginationTraits.h>
 #include <aws/redshift/model/DescribeUsageLimitsRequest.h>
 #include <aws/redshift/model/DescribeUsageLimitsResult.h>
 #include <aws/redshift/model/DisableLoggingRequest.h>
@@ -254,8 +293,10 @@
 #include <aws/redshift/model/GetClusterCredentialsWithIAMResult.h>
 #include <aws/redshift/model/GetIdentityCenterAuthTokenRequest.h>
 #include <aws/redshift/model/GetIdentityCenterAuthTokenResult.h>
+#include <aws/redshift/model/GetReservedNodeExchangeConfigurationOptionsPaginationTraits.h>
 #include <aws/redshift/model/GetReservedNodeExchangeConfigurationOptionsRequest.h>
 #include <aws/redshift/model/GetReservedNodeExchangeConfigurationOptionsResult.h>
+#include <aws/redshift/model/GetReservedNodeExchangeOfferingsPaginationTraits.h>
 #include <aws/redshift/model/GetReservedNodeExchangeOfferingsRequest.h>
 #include <aws/redshift/model/GetReservedNodeExchangeOfferingsResult.h>
 #include <aws/redshift/model/GetResourcePolicyRequest.h>
@@ -272,6 +313,7 @@
 #include <aws/redshift/model/LakeFormationScopeUnion.h>
 #include <aws/redshift/model/LakehouseIdcRegistration.h>
 #include <aws/redshift/model/LakehouseRegistration.h>
+#include <aws/redshift/model/ListRecommendationsPaginationTraits.h>
 #include <aws/redshift/model/ListRecommendationsRequest.h>
 #include <aws/redshift/model/ListRecommendationsResult.h>
 #include <aws/redshift/model/LogDestinationType.h>
diff --git a/generated/tests/redshift-serverless-gen-tests/RedshiftServerlessIncludeTests.cpp b/generated/tests/redshift-serverless-gen-tests/RedshiftServerlessIncludeTests.cpp
index 7c5695737378..3f5564103e32 100644
--- a/generated/tests/redshift-serverless-gen-tests/RedshiftServerlessIncludeTests.cpp
+++ b/generated/tests/redshift-serverless-gen-tests/RedshiftServerlessIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/redshift-serverless/RedshiftServerlessClient.h>
+#include <aws/redshift-serverless/RedshiftServerlessClientPagination.h>
 #include <aws/redshift-serverless/RedshiftServerlessEndpointProvider.h>
 #include <aws/redshift-serverless/RedshiftServerlessErrorMarshaller.h>
 #include <aws/redshift-serverless/RedshiftServerlessErrors.h>
+#include <aws/redshift-serverless/RedshiftServerlessPaginationBase.h>
 #include <aws/redshift-serverless/RedshiftServerlessRequest.h>
 #include <aws/redshift-serverless/RedshiftServerlessServiceClientModel.h>
+#include <aws/redshift-serverless/RedshiftServerlessWaiter.h>
 #include <aws/redshift-serverless/RedshiftServerless_EXPORTS.h>
+#include <aws/redshift-serverless/internal/RedshiftServerlessEndpointRules.h>
 #include <aws/redshift-serverless/model/AccessDeniedException.h>
 #include <aws/redshift-serverless/model/Association.h>
 #include <aws/redshift-serverless/model/ConfigParameter.h>
@@ -89,34 +93,48 @@
 #include <aws/redshift-serverless/model/GetWorkgroupResult.h>
 #include <aws/redshift-serverless/model/LakehouseIdcRegistration.h>
 #include <aws/redshift-serverless/model/LakehouseRegistration.h>
+#include <aws/redshift-serverless/model/ListCustomDomainAssociationsPaginationTraits.h>
 #include <aws/redshift-serverless/model/ListCustomDomainAssociationsRequest.h>
 #include <aws/redshift-serverless/model/ListCustomDomainAssociationsResult.h>
+#include <aws/redshift-serverless/model/ListEndpointAccessPaginationTraits.h>
 #include <aws/redshift-serverless/model/ListEndpointAccessRequest.h>
 #include <aws/redshift-serverless/model/ListEndpointAccessResult.h>
+#include <aws/redshift-serverless/model/ListManagedWorkgroupsPaginationTraits.h>
 #include <aws/redshift-serverless/model/ListManagedWorkgroupsRequest.h>
 #include <aws/redshift-serverless/model/ListManagedWorkgroupsResult.h>
+#include <aws/redshift-serverless/model/ListNamespacesPaginationTraits.h>
 #include <aws/redshift-serverless/model/ListNamespacesRequest.h>
 #include <aws/redshift-serverless/model/ListNamespacesResult.h>
+#include <aws/redshift-serverless/model/ListRecoveryPointsPaginationTraits.h>
 #include <aws/redshift-serverless/model/ListRecoveryPointsRequest.h>
 #include <aws/redshift-serverless/model/ListRecoveryPointsResult.h>
+#include <aws/redshift-serverless/model/ListReservationOfferingsPaginationTraits.h>
 #include <aws/redshift-serverless/model/ListReservationOfferingsRequest.h>
 #include <aws/redshift-serverless/model/ListReservationOfferingsResult.h>
+#include <aws/redshift-serverless/model/ListReservationsPaginationTraits.h>
 #include <aws/redshift-serverless/model/ListReservationsRequest.h>
 #include <aws/redshift-serverless/model/ListReservationsResult.h>
+#include <aws/redshift-serverless/model/ListScheduledActionsPaginationTraits.h>
 #include <aws/redshift-serverless/model/ListScheduledActionsRequest.h>
 #include <aws/redshift-serverless/model/ListScheduledActionsResult.h>
+#include <aws/redshift-serverless/model/ListSnapshotCopyConfigurationsPaginationTraits.h>
 #include <aws/redshift-serverless/model/ListSnapshotCopyConfigurationsRequest.h>
 #include <aws/redshift-serverless/model/ListSnapshotCopyConfigurationsResult.h>
+#include <aws/redshift-serverless/model/ListSnapshotsPaginationTraits.h>
 #include <aws/redshift-serverless/model/ListSnapshotsRequest.h>
 #include <aws/redshift-serverless/model/ListSnapshotsResult.h>
+#include <aws/redshift-serverless/model/ListTableRestoreStatusPaginationTraits.h>
 #include <aws/redshift-serverless/model/ListTableRestoreStatusRequest.h>
 #include <aws/redshift-serverless/model/ListTableRestoreStatusResult.h>
 #include <aws/redshift-serverless/model/ListTagsForResourceRequest.h>
 #include <aws/redshift-serverless/model/ListTagsForResourceResult.h>
+#include <aws/redshift-serverless/model/ListTracksPaginationTraits.h>
 #include <aws/redshift-serverless/model/ListTracksRequest.h>
 #include <aws/redshift-serverless/model/ListTracksResult.h>
+#include <aws/redshift-serverless/model/ListUsageLimitsPaginationTraits.h>
 #include <aws/redshift-serverless/model/ListUsageLimitsRequest.h>
 #include <aws/redshift-serverless/model/ListUsageLimitsResult.h>
+#include <aws/redshift-serverless/model/ListWorkgroupsPaginationTraits.h>
 #include <aws/redshift-serverless/model/ListWorkgroupsRequest.h>
 #include <aws/redshift-serverless/model/ListWorkgroupsResult.h>
 #include <aws/redshift-serverless/model/LogExport.h>
diff --git a/generated/tests/rekognition-gen-tests/RekognitionIncludeTests.cpp b/generated/tests/rekognition-gen-tests/RekognitionIncludeTests.cpp
index a6c8ededc8c7..dd1dae2f0f2d 100644
--- a/generated/tests/rekognition-gen-tests/RekognitionIncludeTests.cpp
+++ b/generated/tests/rekognition-gen-tests/RekognitionIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/rekognition/RekognitionClient.h>
+#include <aws/rekognition/RekognitionClientPagination.h>
 #include <aws/rekognition/RekognitionEndpointProvider.h>
 #include <aws/rekognition/RekognitionErrorMarshaller.h>
 #include <aws/rekognition/RekognitionErrors.h>
+#include <aws/rekognition/RekognitionPaginationBase.h>
 #include <aws/rekognition/RekognitionRequest.h>
 #include <aws/rekognition/RekognitionServiceClientModel.h>
+#include <aws/rekognition/RekognitionWaiter.h>
 #include <aws/rekognition/Rekognition_EXPORTS.h>
+#include <aws/rekognition/internal/RekognitionEndpointRules.h>
 #include <aws/rekognition/model/AgeRange.h>
 #include <aws/rekognition/model/Asset.h>
 #include <aws/rekognition/model/AssociateFacesRequest.h>
@@ -96,8 +100,10 @@
 #include <aws/rekognition/model/DescribeCollectionResult.h>
 #include <aws/rekognition/model/DescribeDatasetRequest.h>
 #include <aws/rekognition/model/DescribeDatasetResult.h>
+#include <aws/rekognition/model/DescribeProjectVersionsPaginationTraits.h>
 #include <aws/rekognition/model/DescribeProjectVersionsRequest.h>
 #include <aws/rekognition/model/DescribeProjectVersionsResult.h>
+#include <aws/rekognition/model/DescribeProjectsPaginationTraits.h>
 #include <aws/rekognition/model/DescribeProjectsRequest.h>
 #include <aws/rekognition/model/DescribeProjectsResult.h>
 #include <aws/rekognition/model/DescribeStreamProcessorRequest.h>
@@ -152,26 +158,34 @@
 #include <aws/rekognition/model/Geometry.h>
 #include <aws/rekognition/model/GetCelebrityInfoRequest.h>
 #include <aws/rekognition/model/GetCelebrityInfoResult.h>
+#include <aws/rekognition/model/GetCelebrityRecognitionPaginationTraits.h>
 #include <aws/rekognition/model/GetCelebrityRecognitionRequest.h>
 #include <aws/rekognition/model/GetCelebrityRecognitionResult.h>
+#include <aws/rekognition/model/GetContentModerationPaginationTraits.h>
 #include <aws/rekognition/model/GetContentModerationRequest.h>
 #include <aws/rekognition/model/GetContentModerationRequestMetadata.h>
 #include <aws/rekognition/model/GetContentModerationResult.h>
+#include <aws/rekognition/model/GetFaceDetectionPaginationTraits.h>
 #include <aws/rekognition/model/GetFaceDetectionRequest.h>
 #include <aws/rekognition/model/GetFaceDetectionResult.h>
 #include <aws/rekognition/model/GetFaceLivenessSessionResultsRequest.h>
 #include <aws/rekognition/model/GetFaceLivenessSessionResultsResult.h>
+#include <aws/rekognition/model/GetFaceSearchPaginationTraits.h>
 #include <aws/rekognition/model/GetFaceSearchRequest.h>
 #include <aws/rekognition/model/GetFaceSearchResult.h>
+#include <aws/rekognition/model/GetLabelDetectionPaginationTraits.h>
 #include <aws/rekognition/model/GetLabelDetectionRequest.h>
 #include <aws/rekognition/model/GetLabelDetectionRequestMetadata.h>
 #include <aws/rekognition/model/GetLabelDetectionResult.h>
 #include <aws/rekognition/model/GetMediaAnalysisJobRequest.h>
 #include <aws/rekognition/model/GetMediaAnalysisJobResult.h>
+#include <aws/rekognition/model/GetPersonTrackingPaginationTraits.h>
 #include <aws/rekognition/model/GetPersonTrackingRequest.h>
 #include <aws/rekognition/model/GetPersonTrackingResult.h>
+#include <aws/rekognition/model/GetSegmentDetectionPaginationTraits.h>
 #include <aws/rekognition/model/GetSegmentDetectionRequest.h>
 #include <aws/rekognition/model/GetSegmentDetectionResult.h>
+#include <aws/rekognition/model/GetTextDetectionPaginationTraits.h>
 #include <aws/rekognition/model/GetTextDetectionRequest.h>
 #include <aws/rekognition/model/GetTextDetectionResult.h>
 #include <aws/rekognition/model/GroundTruthManifest.h>
@@ -199,22 +213,30 @@
 #include <aws/rekognition/model/LabelDetectionSortBy.h>
 #include <aws/rekognition/model/Landmark.h>
 #include <aws/rekognition/model/LandmarkType.h>
+#include <aws/rekognition/model/ListCollectionsPaginationTraits.h>
 #include <aws/rekognition/model/ListCollectionsRequest.h>
 #include <aws/rekognition/model/ListCollectionsResult.h>
+#include <aws/rekognition/model/ListDatasetEntriesPaginationTraits.h>
 #include <aws/rekognition/model/ListDatasetEntriesRequest.h>
 #include <aws/rekognition/model/ListDatasetEntriesResult.h>
+#include <aws/rekognition/model/ListDatasetLabelsPaginationTraits.h>
 #include <aws/rekognition/model/ListDatasetLabelsRequest.h>
 #include <aws/rekognition/model/ListDatasetLabelsResult.h>
+#include <aws/rekognition/model/ListFacesPaginationTraits.h>
 #include <aws/rekognition/model/ListFacesRequest.h>
 #include <aws/rekognition/model/ListFacesResult.h>
+#include <aws/rekognition/model/ListMediaAnalysisJobsPaginationTraits.h>
 #include <aws/rekognition/model/ListMediaAnalysisJobsRequest.h>
 #include <aws/rekognition/model/ListMediaAnalysisJobsResult.h>
+#include <aws/rekognition/model/ListProjectPoliciesPaginationTraits.h>
 #include <aws/rekognition/model/ListProjectPoliciesRequest.h>
 #include <aws/rekognition/model/ListProjectPoliciesResult.h>
+#include <aws/rekognition/model/ListStreamProcessorsPaginationTraits.h>
 #include <aws/rekognition/model/ListStreamProcessorsRequest.h>
 #include <aws/rekognition/model/ListStreamProcessorsResult.h>
 #include <aws/rekognition/model/ListTagsForResourceRequest.h>
 #include <aws/rekognition/model/ListTagsForResourceResult.h>
+#include <aws/rekognition/model/ListUsersPaginationTraits.h>
 #include <aws/rekognition/model/ListUsersRequest.h>
 #include <aws/rekognition/model/ListUsersResult.h>
 #include <aws/rekognition/model/LivenessOutputConfig.h>
diff --git a/generated/tests/repostspace-gen-tests/RepostspaceIncludeTests.cpp b/generated/tests/repostspace-gen-tests/RepostspaceIncludeTests.cpp
index 68e6574416ed..bb4d987fa137 100644
--- a/generated/tests/repostspace-gen-tests/RepostspaceIncludeTests.cpp
+++ b/generated/tests/repostspace-gen-tests/RepostspaceIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/repostspace/RepostspaceClient.h>
+#include <aws/repostspace/RepostspaceClientPagination.h>
 #include <aws/repostspace/RepostspaceEndpointProvider.h>
 #include <aws/repostspace/RepostspaceErrorMarshaller.h>
 #include <aws/repostspace/RepostspaceErrors.h>
+#include <aws/repostspace/RepostspacePaginationBase.h>
 #include <aws/repostspace/RepostspaceRequest.h>
 #include <aws/repostspace/RepostspaceServiceClientModel.h>
+#include <aws/repostspace/RepostspaceWaiter.h>
 #include <aws/repostspace/Repostspace_EXPORTS.h>
+#include <aws/repostspace/internal/RepostspaceEndpointRules.h>
 #include <aws/repostspace/model/BatchAddChannelRoleToAccessorsRequest.h>
 #include <aws/repostspace/model/BatchAddChannelRoleToAccessorsResult.h>
 #include <aws/repostspace/model/BatchAddRoleRequest.h>
@@ -40,8 +44,10 @@
 #include <aws/repostspace/model/GetSpaceRequest.h>
 #include <aws/repostspace/model/GetSpaceResult.h>
 #include <aws/repostspace/model/InternalServerException.h>
+#include <aws/repostspace/model/ListChannelsPaginationTraits.h>
 #include <aws/repostspace/model/ListChannelsRequest.h>
 #include <aws/repostspace/model/ListChannelsResult.h>
+#include <aws/repostspace/model/ListSpacesPaginationTraits.h>
 #include <aws/repostspace/model/ListSpacesRequest.h>
 #include <aws/repostspace/model/ListSpacesResult.h>
 #include <aws/repostspace/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/resiliencehub-gen-tests/ResilienceHubIncludeTests.cpp b/generated/tests/resiliencehub-gen-tests/ResilienceHubIncludeTests.cpp
index b8a3b6e12e0a..2768d7d3c7b2 100644
--- a/generated/tests/resiliencehub-gen-tests/ResilienceHubIncludeTests.cpp
+++ b/generated/tests/resiliencehub-gen-tests/ResilienceHubIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/resiliencehub/ResilienceHubClient.h>
+#include <aws/resiliencehub/ResilienceHubClientPagination.h>
 #include <aws/resiliencehub/ResilienceHubEndpointProvider.h>
 #include <aws/resiliencehub/ResilienceHubErrorMarshaller.h>
 #include <aws/resiliencehub/ResilienceHubErrors.h>
+#include <aws/resiliencehub/ResilienceHubPaginationBase.h>
 #include <aws/resiliencehub/ResilienceHubRequest.h>
 #include <aws/resiliencehub/ResilienceHubServiceClientModel.h>
+#include <aws/resiliencehub/ResilienceHubWaiter.h>
 #include <aws/resiliencehub/ResilienceHub_EXPORTS.h>
+#include <aws/resiliencehub/internal/ResilienceHubEndpointRules.h>
 #include <aws/resiliencehub/model/AcceptGroupingRecommendationEntry.h>
 #include <aws/resiliencehub/model/AcceptResourceGroupingRecommendationsRequest.h>
 #include <aws/resiliencehub/model/AcceptResourceGroupingRecommendationsResult.h>
@@ -124,46 +128,66 @@
 #include <aws/resiliencehub/model/HaArchitecture.h>
 #include <aws/resiliencehub/model/ImportResourcesToDraftAppVersionRequest.h>
 #include <aws/resiliencehub/model/ImportResourcesToDraftAppVersionResult.h>
+#include <aws/resiliencehub/model/ListAlarmRecommendationsPaginationTraits.h>
 #include <aws/resiliencehub/model/ListAlarmRecommendationsRequest.h>
 #include <aws/resiliencehub/model/ListAlarmRecommendationsResult.h>
+#include <aws/resiliencehub/model/ListAppAssessmentComplianceDriftsPaginationTraits.h>
 #include <aws/resiliencehub/model/ListAppAssessmentComplianceDriftsRequest.h>
 #include <aws/resiliencehub/model/ListAppAssessmentComplianceDriftsResult.h>
+#include <aws/resiliencehub/model/ListAppAssessmentResourceDriftsPaginationTraits.h>
 #include <aws/resiliencehub/model/ListAppAssessmentResourceDriftsRequest.h>
 #include <aws/resiliencehub/model/ListAppAssessmentResourceDriftsResult.h>
+#include <aws/resiliencehub/model/ListAppAssessmentsPaginationTraits.h>
 #include <aws/resiliencehub/model/ListAppAssessmentsRequest.h>
 #include <aws/resiliencehub/model/ListAppAssessmentsResult.h>
+#include <aws/resiliencehub/model/ListAppComponentCompliancesPaginationTraits.h>
 #include <aws/resiliencehub/model/ListAppComponentCompliancesRequest.h>
 #include <aws/resiliencehub/model/ListAppComponentCompliancesResult.h>
+#include <aws/resiliencehub/model/ListAppComponentRecommendationsPaginationTraits.h>
 #include <aws/resiliencehub/model/ListAppComponentRecommendationsRequest.h>
 #include <aws/resiliencehub/model/ListAppComponentRecommendationsResult.h>
+#include <aws/resiliencehub/model/ListAppInputSourcesPaginationTraits.h>
 #include <aws/resiliencehub/model/ListAppInputSourcesRequest.h>
 #include <aws/resiliencehub/model/ListAppInputSourcesResult.h>
+#include <aws/resiliencehub/model/ListAppVersionAppComponentsPaginationTraits.h>
 #include <aws/resiliencehub/model/ListAppVersionAppComponentsRequest.h>
 #include <aws/resiliencehub/model/ListAppVersionAppComponentsResult.h>
+#include <aws/resiliencehub/model/ListAppVersionResourceMappingsPaginationTraits.h>
 #include <aws/resiliencehub/model/ListAppVersionResourceMappingsRequest.h>
 #include <aws/resiliencehub/model/ListAppVersionResourceMappingsResult.h>
+#include <aws/resiliencehub/model/ListAppVersionResourcesPaginationTraits.h>
 #include <aws/resiliencehub/model/ListAppVersionResourcesRequest.h>
 #include <aws/resiliencehub/model/ListAppVersionResourcesResult.h>
+#include <aws/resiliencehub/model/ListAppVersionsPaginationTraits.h>
 #include <aws/resiliencehub/model/ListAppVersionsRequest.h>
 #include <aws/resiliencehub/model/ListAppVersionsResult.h>
+#include <aws/resiliencehub/model/ListAppsPaginationTraits.h>
 #include <aws/resiliencehub/model/ListAppsRequest.h>
 #include <aws/resiliencehub/model/ListAppsResult.h>
+#include <aws/resiliencehub/model/ListMetricsPaginationTraits.h>
 #include <aws/resiliencehub/model/ListMetricsRequest.h>
 #include <aws/resiliencehub/model/ListMetricsResult.h>
+#include <aws/resiliencehub/model/ListRecommendationTemplatesPaginationTraits.h>
 #include <aws/resiliencehub/model/ListRecommendationTemplatesRequest.h>
 #include <aws/resiliencehub/model/ListRecommendationTemplatesResult.h>
+#include <aws/resiliencehub/model/ListResiliencyPoliciesPaginationTraits.h>
 #include <aws/resiliencehub/model/ListResiliencyPoliciesRequest.h>
 #include <aws/resiliencehub/model/ListResiliencyPoliciesResult.h>
+#include <aws/resiliencehub/model/ListResourceGroupingRecommendationsPaginationTraits.h>
 #include <aws/resiliencehub/model/ListResourceGroupingRecommendationsRequest.h>
 #include <aws/resiliencehub/model/ListResourceGroupingRecommendationsResult.h>
+#include <aws/resiliencehub/model/ListSopRecommendationsPaginationTraits.h>
 #include <aws/resiliencehub/model/ListSopRecommendationsRequest.h>
 #include <aws/resiliencehub/model/ListSopRecommendationsResult.h>
+#include <aws/resiliencehub/model/ListSuggestedResiliencyPoliciesPaginationTraits.h>
 #include <aws/resiliencehub/model/ListSuggestedResiliencyPoliciesRequest.h>
 #include <aws/resiliencehub/model/ListSuggestedResiliencyPoliciesResult.h>
 #include <aws/resiliencehub/model/ListTagsForResourceRequest.h>
 #include <aws/resiliencehub/model/ListTagsForResourceResult.h>
+#include <aws/resiliencehub/model/ListTestRecommendationsPaginationTraits.h>
 #include <aws/resiliencehub/model/ListTestRecommendationsRequest.h>
 #include <aws/resiliencehub/model/ListTestRecommendationsResult.h>
+#include <aws/resiliencehub/model/ListUnsupportedAppVersionResourcesPaginationTraits.h>
 #include <aws/resiliencehub/model/ListUnsupportedAppVersionResourcesRequest.h>
 #include <aws/resiliencehub/model/ListUnsupportedAppVersionResourcesResult.h>
 #include <aws/resiliencehub/model/LogicalResourceId.h>
diff --git a/generated/tests/resiliencehubv2-gen-tests/Resiliencehubv2IncludeTests.cpp b/generated/tests/resiliencehubv2-gen-tests/Resiliencehubv2IncludeTests.cpp
index 0995ba9ea6d4..d8050e3b429c 100644
--- a/generated/tests/resiliencehubv2-gen-tests/Resiliencehubv2IncludeTests.cpp
+++ b/generated/tests/resiliencehubv2-gen-tests/Resiliencehubv2IncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/resiliencehubv2/Resiliencehubv2Client.h>
+#include <aws/resiliencehubv2/Resiliencehubv2ClientPagination.h>
 #include <aws/resiliencehubv2/Resiliencehubv2EndpointProvider.h>
 #include <aws/resiliencehubv2/Resiliencehubv2ErrorMarshaller.h>
 #include <aws/resiliencehubv2/Resiliencehubv2Errors.h>
+#include <aws/resiliencehubv2/Resiliencehubv2PaginationBase.h>
 #include <aws/resiliencehubv2/Resiliencehubv2Request.h>
 #include <aws/resiliencehubv2/Resiliencehubv2ServiceClientModel.h>
+#include <aws/resiliencehubv2/Resiliencehubv2Waiter.h>
 #include <aws/resiliencehubv2/Resiliencehubv2_EXPORTS.h>
+#include <aws/resiliencehubv2/internal/Resiliencehubv2EndpointRules.h>
 #include <aws/resiliencehubv2/model/AccountTargeting.h>
 #include <aws/resiliencehubv2/model/Achievability.h>
 #include <aws/resiliencehubv2/model/AchievabilityStatus.h>
@@ -114,50 +118,71 @@
 #include <aws/resiliencehubv2/model/InputSource.h>
 #include <aws/resiliencehubv2/model/InputSourceSummary.h>
 #include <aws/resiliencehubv2/model/InputSourceType.h>
+#include <aws/resiliencehubv2/model/ListAssertionsPaginationTraits.h>
 #include <aws/resiliencehubv2/model/ListAssertionsRequest.h>
 #include <aws/resiliencehubv2/model/ListAssertionsResult.h>
+#include <aws/resiliencehubv2/model/ListDependenciesPaginationTraits.h>
 #include <aws/resiliencehubv2/model/ListDependenciesRequest.h>
 #include <aws/resiliencehubv2/model/ListDependenciesResult.h>
+#include <aws/resiliencehubv2/model/ListFailureModeAssessmentsPaginationTraits.h>
 #include <aws/resiliencehubv2/model/ListFailureModeAssessmentsRequest.h>
 #include <aws/resiliencehubv2/model/ListFailureModeAssessmentsResult.h>
+#include <aws/resiliencehubv2/model/ListFailureModeFindingsPaginationTraits.h>
 #include <aws/resiliencehubv2/model/ListFailureModeFindingsRequest.h>
 #include <aws/resiliencehubv2/model/ListFailureModeFindingsResult.h>
+#include <aws/resiliencehubv2/model/ListInputSourcesPaginationTraits.h>
 #include <aws/resiliencehubv2/model/ListInputSourcesRequest.h>
 #include <aws/resiliencehubv2/model/ListInputSourcesResult.h>
+#include <aws/resiliencehubv2/model/ListPoliciesPaginationTraits.h>
 #include <aws/resiliencehubv2/model/ListPoliciesRequest.h>
 #include <aws/resiliencehubv2/model/ListPoliciesResult.h>
+#include <aws/resiliencehubv2/model/ListReportsPaginationTraits.h>
 #include <aws/resiliencehubv2/model/ListReportsRequest.h>
 #include <aws/resiliencehubv2/model/ListReportsResult.h>
+#include <aws/resiliencehubv2/model/ListResolvedTestRunTargetResourcesPaginationTraits.h>
 #include <aws/resiliencehubv2/model/ListResolvedTestRunTargetResourcesRequest.h>
 #include <aws/resiliencehubv2/model/ListResolvedTestRunTargetResourcesResult.h>
+#include <aws/resiliencehubv2/model/ListResourcesPaginationTraits.h>
 #include <aws/resiliencehubv2/model/ListResourcesRequest.h>
 #include <aws/resiliencehubv2/model/ListResourcesResult.h>
+#include <aws/resiliencehubv2/model/ListServiceEventsPaginationTraits.h>
 #include <aws/resiliencehubv2/model/ListServiceEventsRequest.h>
 #include <aws/resiliencehubv2/model/ListServiceEventsResult.h>
+#include <aws/resiliencehubv2/model/ListServiceFunctionsPaginationTraits.h>
 #include <aws/resiliencehubv2/model/ListServiceFunctionsRequest.h>
 #include <aws/resiliencehubv2/model/ListServiceFunctionsResult.h>
+#include <aws/resiliencehubv2/model/ListServiceTopologyEdgesPaginationTraits.h>
 #include <aws/resiliencehubv2/model/ListServiceTopologyEdgesRequest.h>
 #include <aws/resiliencehubv2/model/ListServiceTopologyEdgesResult.h>
+#include <aws/resiliencehubv2/model/ListServicesPaginationTraits.h>
 #include <aws/resiliencehubv2/model/ListServicesRequest.h>
 #include <aws/resiliencehubv2/model/ListServicesResult.h>
+#include <aws/resiliencehubv2/model/ListSystemEventsPaginationTraits.h>
 #include <aws/resiliencehubv2/model/ListSystemEventsRequest.h>
 #include <aws/resiliencehubv2/model/ListSystemEventsResult.h>
+#include <aws/resiliencehubv2/model/ListSystemsPaginationTraits.h>
 #include <aws/resiliencehubv2/model/ListSystemsRequest.h>
 #include <aws/resiliencehubv2/model/ListSystemsResult.h>
 #include <aws/resiliencehubv2/model/ListTagsForResourceRequest.h>
 #include <aws/resiliencehubv2/model/ListTagsForResourceResult.h>
+#include <aws/resiliencehubv2/model/ListTestRunEventsPaginationTraits.h>
 #include <aws/resiliencehubv2/model/ListTestRunEventsRequest.h>
 #include <aws/resiliencehubv2/model/ListTestRunEventsResult.h>
+#include <aws/resiliencehubv2/model/ListTestRunSourcesPaginationTraits.h>
 #include <aws/resiliencehubv2/model/ListTestRunSourcesRequest.h>
 #include <aws/resiliencehubv2/model/ListTestRunSourcesResult.h>
+#include <aws/resiliencehubv2/model/ListTestRunsPaginationTraits.h>
 #include <aws/resiliencehubv2/model/ListTestRunsRequest.h>
 #include <aws/resiliencehubv2/model/ListTestRunsResult.h>
+#include <aws/resiliencehubv2/model/ListTestSourcesPaginationTraits.h>
 #include <aws/resiliencehubv2/model/ListTestSourcesRequest.h>
 #include <aws/resiliencehubv2/model/ListTestSourcesResult.h>
 #include <aws/resiliencehubv2/model/ListTestTemplatesRequest.h>
 #include <aws/resiliencehubv2/model/ListTestTemplatesResult.h>
+#include <aws/resiliencehubv2/model/ListTestsPaginationTraits.h>
 #include <aws/resiliencehubv2/model/ListTestsRequest.h>
 #include <aws/resiliencehubv2/model/ListTestsResult.h>
+#include <aws/resiliencehubv2/model/ListUserJourneysPaginationTraits.h>
 #include <aws/resiliencehubv2/model/ListUserJourneysRequest.h>
 #include <aws/resiliencehubv2/model/ListUserJourneysResult.h>
 #include <aws/resiliencehubv2/model/LoggingConfiguration.h>
diff --git a/generated/tests/resource-explorer-2-gen-tests/ResourceExplorer2IncludeTests.cpp b/generated/tests/resource-explorer-2-gen-tests/ResourceExplorer2IncludeTests.cpp
index 172371df8c83..8a3f852017f0 100644
--- a/generated/tests/resource-explorer-2-gen-tests/ResourceExplorer2IncludeTests.cpp
+++ b/generated/tests/resource-explorer-2-gen-tests/ResourceExplorer2IncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/resource-explorer-2/ResourceExplorer2Client.h>
+#include <aws/resource-explorer-2/ResourceExplorer2ClientPagination.h>
 #include <aws/resource-explorer-2/ResourceExplorer2EndpointProvider.h>
 #include <aws/resource-explorer-2/ResourceExplorer2ErrorMarshaller.h>
 #include <aws/resource-explorer-2/ResourceExplorer2Errors.h>
+#include <aws/resource-explorer-2/ResourceExplorer2PaginationBase.h>
 #include <aws/resource-explorer-2/ResourceExplorer2Request.h>
 #include <aws/resource-explorer-2/ResourceExplorer2ServiceClientModel.h>
+#include <aws/resource-explorer-2/ResourceExplorer2Waiter.h>
 #include <aws/resource-explorer-2/ResourceExplorer2_EXPORTS.h>
+#include <aws/resource-explorer-2/internal/ResourceExplorer2EndpointRules.h>
 #include <aws/resource-explorer-2/model/AWSServiceAccessStatus.h>
 #include <aws/resource-explorer-2/model/AssociateDefaultViewRequest.h>
 #include <aws/resource-explorer-2/model/AssociateDefaultViewResult.h>
@@ -41,6 +45,7 @@
 #include <aws/resource-explorer-2/model/GetIndexResult.h>
 #include <aws/resource-explorer-2/model/GetManagedViewRequest.h>
 #include <aws/resource-explorer-2/model/GetManagedViewResult.h>
+#include <aws/resource-explorer-2/model/GetResourceExplorerSetupPaginationTraits.h>
 #include <aws/resource-explorer-2/model/GetResourceExplorerSetupRequest.h>
 #include <aws/resource-explorer-2/model/GetResourceExplorerSetupResult.h>
 #include <aws/resource-explorer-2/model/GetServiceIndexRequest.h>
@@ -54,24 +59,33 @@
 #include <aws/resource-explorer-2/model/IndexState.h>
 #include <aws/resource-explorer-2/model/IndexStatus.h>
 #include <aws/resource-explorer-2/model/IndexType.h>
+#include <aws/resource-explorer-2/model/ListIndexesForMembersPaginationTraits.h>
 #include <aws/resource-explorer-2/model/ListIndexesForMembersRequest.h>
 #include <aws/resource-explorer-2/model/ListIndexesForMembersResult.h>
+#include <aws/resource-explorer-2/model/ListIndexesPaginationTraits.h>
 #include <aws/resource-explorer-2/model/ListIndexesRequest.h>
 #include <aws/resource-explorer-2/model/ListIndexesResult.h>
+#include <aws/resource-explorer-2/model/ListManagedViewsPaginationTraits.h>
 #include <aws/resource-explorer-2/model/ListManagedViewsRequest.h>
 #include <aws/resource-explorer-2/model/ListManagedViewsResult.h>
+#include <aws/resource-explorer-2/model/ListResourcesPaginationTraits.h>
 #include <aws/resource-explorer-2/model/ListResourcesRequest.h>
 #include <aws/resource-explorer-2/model/ListResourcesResult.h>
+#include <aws/resource-explorer-2/model/ListServiceIndexesPaginationTraits.h>
 #include <aws/resource-explorer-2/model/ListServiceIndexesRequest.h>
 #include <aws/resource-explorer-2/model/ListServiceIndexesResult.h>
+#include <aws/resource-explorer-2/model/ListServiceViewsPaginationTraits.h>
 #include <aws/resource-explorer-2/model/ListServiceViewsRequest.h>
 #include <aws/resource-explorer-2/model/ListServiceViewsResult.h>
+#include <aws/resource-explorer-2/model/ListStreamingAccessForServicesPaginationTraits.h>
 #include <aws/resource-explorer-2/model/ListStreamingAccessForServicesRequest.h>
 #include <aws/resource-explorer-2/model/ListStreamingAccessForServicesResult.h>
+#include <aws/resource-explorer-2/model/ListSupportedResourceTypesPaginationTraits.h>
 #include <aws/resource-explorer-2/model/ListSupportedResourceTypesRequest.h>
 #include <aws/resource-explorer-2/model/ListSupportedResourceTypesResult.h>
 #include <aws/resource-explorer-2/model/ListTagsForResourceRequest.h>
 #include <aws/resource-explorer-2/model/ListTagsForResourceResult.h>
+#include <aws/resource-explorer-2/model/ListViewsPaginationTraits.h>
 #include <aws/resource-explorer-2/model/ListViewsRequest.h>
 #include <aws/resource-explorer-2/model/ListViewsResult.h>
 #include <aws/resource-explorer-2/model/ManagedView.h>
@@ -84,6 +98,7 @@
 #include <aws/resource-explorer-2/model/ResourceCount.h>
 #include <aws/resource-explorer-2/model/ResourceProperty.h>
 #include <aws/resource-explorer-2/model/SearchFilter.h>
+#include <aws/resource-explorer-2/model/SearchPaginationTraits.h>
 #include <aws/resource-explorer-2/model/SearchRequest.h>
 #include <aws/resource-explorer-2/model/SearchResult.h>
 #include <aws/resource-explorer-2/model/ServiceLinkedRecorderInfo.h>
diff --git a/generated/tests/resource-groups-gen-tests/ResourceGroupsIncludeTests.cpp b/generated/tests/resource-groups-gen-tests/ResourceGroupsIncludeTests.cpp
index a0780035a643..84cf325d3f37 100644
--- a/generated/tests/resource-groups-gen-tests/ResourceGroupsIncludeTests.cpp
+++ b/generated/tests/resource-groups-gen-tests/ResourceGroupsIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/resource-groups/ResourceGroupsClient.h>
+#include <aws/resource-groups/ResourceGroupsClientPagination.h>
 #include <aws/resource-groups/ResourceGroupsEndpointProvider.h>
 #include <aws/resource-groups/ResourceGroupsErrorMarshaller.h>
 #include <aws/resource-groups/ResourceGroupsErrors.h>
+#include <aws/resource-groups/ResourceGroupsPaginationBase.h>
 #include <aws/resource-groups/ResourceGroupsRequest.h>
 #include <aws/resource-groups/ResourceGroupsServiceClientModel.h>
+#include <aws/resource-groups/ResourceGroupsWaiter.h>
 #include <aws/resource-groups/ResourceGroups_EXPORTS.h>
+#include <aws/resource-groups/internal/ResourceGroupsEndpointRules.h>
 #include <aws/resource-groups/model/AccountSettings.h>
 #include <aws/resource-groups/model/CancelTagSyncTaskRequest.h>
 #include <aws/resource-groups/model/CreateGroupRequest.h>
@@ -49,15 +53,19 @@
 #include <aws/resource-groups/model/GroupingStatusesItem.h>
 #include <aws/resource-groups/model/GroupingType.h>
 #include <aws/resource-groups/model/ListGroupResourcesItem.h>
+#include <aws/resource-groups/model/ListGroupResourcesPaginationTraits.h>
 #include <aws/resource-groups/model/ListGroupResourcesRequest.h>
 #include <aws/resource-groups/model/ListGroupResourcesResult.h>
 #include <aws/resource-groups/model/ListGroupingStatusesFilter.h>
 #include <aws/resource-groups/model/ListGroupingStatusesFilterName.h>
+#include <aws/resource-groups/model/ListGroupingStatusesPaginationTraits.h>
 #include <aws/resource-groups/model/ListGroupingStatusesRequest.h>
 #include <aws/resource-groups/model/ListGroupingStatusesResult.h>
+#include <aws/resource-groups/model/ListGroupsPaginationTraits.h>
 #include <aws/resource-groups/model/ListGroupsRequest.h>
 #include <aws/resource-groups/model/ListGroupsResult.h>
 #include <aws/resource-groups/model/ListTagSyncTasksFilter.h>
+#include <aws/resource-groups/model/ListTagSyncTasksPaginationTraits.h>
 #include <aws/resource-groups/model/ListTagSyncTasksRequest.h>
 #include <aws/resource-groups/model/ListTagSyncTasksResult.h>
 #include <aws/resource-groups/model/PendingResource.h>
@@ -72,6 +80,7 @@
 #include <aws/resource-groups/model/ResourceQuery.h>
 #include <aws/resource-groups/model/ResourceStatus.h>
 #include <aws/resource-groups/model/ResourceStatusValue.h>
+#include <aws/resource-groups/model/SearchResourcesPaginationTraits.h>
 #include <aws/resource-groups/model/SearchResourcesRequest.h>
 #include <aws/resource-groups/model/SearchResourcesResult.h>
 #include <aws/resource-groups/model/StartTagSyncTaskRequest.h>
diff --git a/generated/tests/resourcegroupstaggingapi-gen-tests/ResourceGroupsTaggingAPIIncludeTests.cpp b/generated/tests/resourcegroupstaggingapi-gen-tests/ResourceGroupsTaggingAPIIncludeTests.cpp
index 7f7d9edf65f2..a64bc8ab574f 100644
--- a/generated/tests/resourcegroupstaggingapi-gen-tests/ResourceGroupsTaggingAPIIncludeTests.cpp
+++ b/generated/tests/resourcegroupstaggingapi-gen-tests/ResourceGroupsTaggingAPIIncludeTests.cpp
@@ -7,26 +7,35 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/resourcegroupstaggingapi/ResourceGroupsTaggingAPIClient.h>
+#include <aws/resourcegroupstaggingapi/ResourceGroupsTaggingAPIClientPagination.h>
 #include <aws/resourcegroupstaggingapi/ResourceGroupsTaggingAPIEndpointProvider.h>
 #include <aws/resourcegroupstaggingapi/ResourceGroupsTaggingAPIErrorMarshaller.h>
 #include <aws/resourcegroupstaggingapi/ResourceGroupsTaggingAPIErrors.h>
+#include <aws/resourcegroupstaggingapi/ResourceGroupsTaggingAPIPaginationBase.h>
 #include <aws/resourcegroupstaggingapi/ResourceGroupsTaggingAPIRequest.h>
 #include <aws/resourcegroupstaggingapi/ResourceGroupsTaggingAPIServiceClientModel.h>
+#include <aws/resourcegroupstaggingapi/ResourceGroupsTaggingAPIWaiter.h>
 #include <aws/resourcegroupstaggingapi/ResourceGroupsTaggingAPI_EXPORTS.h>
+#include <aws/resourcegroupstaggingapi/internal/ResourceGroupsTaggingAPIEndpointRules.h>
 #include <aws/resourcegroupstaggingapi/model/ComplianceDetails.h>
 #include <aws/resourcegroupstaggingapi/model/DescribeReportCreationRequest.h>
 #include <aws/resourcegroupstaggingapi/model/DescribeReportCreationResult.h>
 #include <aws/resourcegroupstaggingapi/model/ErrorCode.h>
 #include <aws/resourcegroupstaggingapi/model/FailureInfo.h>
+#include <aws/resourcegroupstaggingapi/model/GetComplianceSummaryPaginationTraits.h>
 #include <aws/resourcegroupstaggingapi/model/GetComplianceSummaryRequest.h>
 #include <aws/resourcegroupstaggingapi/model/GetComplianceSummaryResult.h>
+#include <aws/resourcegroupstaggingapi/model/GetResourcesPaginationTraits.h>
 #include <aws/resourcegroupstaggingapi/model/GetResourcesRequest.h>
 #include <aws/resourcegroupstaggingapi/model/GetResourcesResult.h>
+#include <aws/resourcegroupstaggingapi/model/GetTagKeysPaginationTraits.h>
 #include <aws/resourcegroupstaggingapi/model/GetTagKeysRequest.h>
 #include <aws/resourcegroupstaggingapi/model/GetTagKeysResult.h>
+#include <aws/resourcegroupstaggingapi/model/GetTagValuesPaginationTraits.h>
 #include <aws/resourcegroupstaggingapi/model/GetTagValuesRequest.h>
 #include <aws/resourcegroupstaggingapi/model/GetTagValuesResult.h>
 #include <aws/resourcegroupstaggingapi/model/GroupByAttribute.h>
+#include <aws/resourcegroupstaggingapi/model/ListRequiredTagsPaginationTraits.h>
 #include <aws/resourcegroupstaggingapi/model/ListRequiredTagsRequest.h>
 #include <aws/resourcegroupstaggingapi/model/ListRequiredTagsResult.h>
 #include <aws/resourcegroupstaggingapi/model/RequiredTag.h>
diff --git a/generated/tests/rolesanywhere-gen-tests/RolesAnywhereIncludeTests.cpp b/generated/tests/rolesanywhere-gen-tests/RolesAnywhereIncludeTests.cpp
index d08a0c9ee61e..a7cc4e32a861 100644
--- a/generated/tests/rolesanywhere-gen-tests/RolesAnywhereIncludeTests.cpp
+++ b/generated/tests/rolesanywhere-gen-tests/RolesAnywhereIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/rolesanywhere/RolesAnywhereClient.h>
+#include <aws/rolesanywhere/RolesAnywhereClientPagination.h>
 #include <aws/rolesanywhere/RolesAnywhereEndpointProvider.h>
 #include <aws/rolesanywhere/RolesAnywhereErrorMarshaller.h>
 #include <aws/rolesanywhere/RolesAnywhereErrors.h>
+#include <aws/rolesanywhere/RolesAnywherePaginationBase.h>
 #include <aws/rolesanywhere/RolesAnywhereRequest.h>
 #include <aws/rolesanywhere/RolesAnywhereServiceClientModel.h>
+#include <aws/rolesanywhere/RolesAnywhereWaiter.h>
 #include <aws/rolesanywhere/RolesAnywhere_EXPORTS.h>
+#include <aws/rolesanywhere/internal/RolesAnywhereEndpointRules.h>
 #include <aws/rolesanywhere/model/AttributeMapping.h>
 #include <aws/rolesanywhere/model/CertificateField.h>
 #include <aws/rolesanywhere/model/CreateProfileRequest.h>
@@ -52,14 +56,18 @@
 #include <aws/rolesanywhere/model/ImportCrlRequest.h>
 #include <aws/rolesanywhere/model/ImportCrlResult.h>
 #include <aws/rolesanywhere/model/InstanceProperty.h>
+#include <aws/rolesanywhere/model/ListCrlsPaginationTraits.h>
 #include <aws/rolesanywhere/model/ListCrlsRequest.h>
 #include <aws/rolesanywhere/model/ListCrlsResult.h>
+#include <aws/rolesanywhere/model/ListProfilesPaginationTraits.h>
 #include <aws/rolesanywhere/model/ListProfilesRequest.h>
 #include <aws/rolesanywhere/model/ListProfilesResult.h>
+#include <aws/rolesanywhere/model/ListSubjectsPaginationTraits.h>
 #include <aws/rolesanywhere/model/ListSubjectsRequest.h>
 #include <aws/rolesanywhere/model/ListSubjectsResult.h>
 #include <aws/rolesanywhere/model/ListTagsForResourceRequest.h>
 #include <aws/rolesanywhere/model/ListTagsForResourceResult.h>
+#include <aws/rolesanywhere/model/ListTrustAnchorsPaginationTraits.h>
 #include <aws/rolesanywhere/model/ListTrustAnchorsRequest.h>
 #include <aws/rolesanywhere/model/ListTrustAnchorsResult.h>
 #include <aws/rolesanywhere/model/MappingRule.h>
diff --git a/generated/tests/route53-gen-tests/Route53IncludeTests.cpp b/generated/tests/route53-gen-tests/Route53IncludeTests.cpp
index dc6eb76d52df..2a714bf0e3b6 100644
--- a/generated/tests/route53-gen-tests/Route53IncludeTests.cpp
+++ b/generated/tests/route53-gen-tests/Route53IncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/route53/Route53Client.h>
+#include <aws/route53/Route53ClientPagination.h>
 #include <aws/route53/Route53EndpointProvider.h>
 #include <aws/route53/Route53ErrorMarshaller.h>
 #include <aws/route53/Route53Errors.h>
+#include <aws/route53/Route53PaginationBase.h>
 #include <aws/route53/Route53Request.h>
 #include <aws/route53/Route53ServiceClientModel.h>
+#include <aws/route53/Route53Waiter.h>
 #include <aws/route53/Route53_EXPORTS.h>
+#include <aws/route53/internal/Route53EndpointRules.h>
 #include <aws/route53/model/AcceleratedRecoveryStatus.h>
 #include <aws/route53/model/AccountLimit.h>
 #include <aws/route53/model/AccountLimitType.h>
@@ -149,22 +153,28 @@
 #include <aws/route53/model/InvalidChangeBatch.h>
 #include <aws/route53/model/KeySigningKey.h>
 #include <aws/route53/model/LinkedService.h>
+#include <aws/route53/model/ListCidrBlocksPaginationTraits.h>
 #include <aws/route53/model/ListCidrBlocksRequest.h>
 #include <aws/route53/model/ListCidrBlocksResult.h>
+#include <aws/route53/model/ListCidrCollectionsPaginationTraits.h>
 #include <aws/route53/model/ListCidrCollectionsRequest.h>
 #include <aws/route53/model/ListCidrCollectionsResult.h>
+#include <aws/route53/model/ListCidrLocationsPaginationTraits.h>
 #include <aws/route53/model/ListCidrLocationsRequest.h>
 #include <aws/route53/model/ListCidrLocationsResult.h>
 #include <aws/route53/model/ListGeoLocationsRequest.h>
 #include <aws/route53/model/ListGeoLocationsResult.h>
+#include <aws/route53/model/ListHealthChecksPaginationTraits.h>
 #include <aws/route53/model/ListHealthChecksRequest.h>
 #include <aws/route53/model/ListHealthChecksResult.h>
 #include <aws/route53/model/ListHostedZonesByNameRequest.h>
 #include <aws/route53/model/ListHostedZonesByNameResult.h>
 #include <aws/route53/model/ListHostedZonesByVPCRequest.h>
 #include <aws/route53/model/ListHostedZonesByVPCResult.h>
+#include <aws/route53/model/ListHostedZonesPaginationTraits.h>
 #include <aws/route53/model/ListHostedZonesRequest.h>
 #include <aws/route53/model/ListHostedZonesResult.h>
+#include <aws/route53/model/ListQueryLoggingConfigsPaginationTraits.h>
 #include <aws/route53/model/ListQueryLoggingConfigsRequest.h>
 #include <aws/route53/model/ListQueryLoggingConfigsResult.h>
 #include <aws/route53/model/ListResourceRecordSetsRequest.h>
diff --git a/generated/tests/route53-recovery-cluster-gen-tests/Route53RecoveryClusterIncludeTests.cpp b/generated/tests/route53-recovery-cluster-gen-tests/Route53RecoveryClusterIncludeTests.cpp
index 8388288659e7..21c868725448 100644
--- a/generated/tests/route53-recovery-cluster-gen-tests/Route53RecoveryClusterIncludeTests.cpp
+++ b/generated/tests/route53-recovery-cluster-gen-tests/Route53RecoveryClusterIncludeTests.cpp
@@ -7,16 +7,21 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/route53-recovery-cluster/Route53RecoveryClusterClient.h>
+#include <aws/route53-recovery-cluster/Route53RecoveryClusterClientPagination.h>
 #include <aws/route53-recovery-cluster/Route53RecoveryClusterEndpointProvider.h>
 #include <aws/route53-recovery-cluster/Route53RecoveryClusterErrorMarshaller.h>
 #include <aws/route53-recovery-cluster/Route53RecoveryClusterErrors.h>
+#include <aws/route53-recovery-cluster/Route53RecoveryClusterPaginationBase.h>
 #include <aws/route53-recovery-cluster/Route53RecoveryClusterRequest.h>
 #include <aws/route53-recovery-cluster/Route53RecoveryClusterServiceClientModel.h>
+#include <aws/route53-recovery-cluster/Route53RecoveryClusterWaiter.h>
 #include <aws/route53-recovery-cluster/Route53RecoveryCluster_EXPORTS.h>
+#include <aws/route53-recovery-cluster/internal/Route53RecoveryClusterEndpointRules.h>
 #include <aws/route53-recovery-cluster/model/ConflictException.h>
 #include <aws/route53-recovery-cluster/model/GetRoutingControlStateRequest.h>
 #include <aws/route53-recovery-cluster/model/GetRoutingControlStateResult.h>
 #include <aws/route53-recovery-cluster/model/InternalServerException.h>
+#include <aws/route53-recovery-cluster/model/ListRoutingControlsPaginationTraits.h>
 #include <aws/route53-recovery-cluster/model/ListRoutingControlsRequest.h>
 #include <aws/route53-recovery-cluster/model/ListRoutingControlsResult.h>
 #include <aws/route53-recovery-cluster/model/ResourceNotFoundException.h>
diff --git a/generated/tests/route53-recovery-control-config-gen-tests/Route53RecoveryControlConfigIncludeTests.cpp b/generated/tests/route53-recovery-control-config-gen-tests/Route53RecoveryControlConfigIncludeTests.cpp
index 9cd53fff944b..7e9b301f199b 100644
--- a/generated/tests/route53-recovery-control-config-gen-tests/Route53RecoveryControlConfigIncludeTests.cpp
+++ b/generated/tests/route53-recovery-control-config-gen-tests/Route53RecoveryControlConfigIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/route53-recovery-control-config/Route53RecoveryControlConfigClient.h>
+#include <aws/route53-recovery-control-config/Route53RecoveryControlConfigClientPagination.h>
 #include <aws/route53-recovery-control-config/Route53RecoveryControlConfigEndpointProvider.h>
 #include <aws/route53-recovery-control-config/Route53RecoveryControlConfigErrorMarshaller.h>
 #include <aws/route53-recovery-control-config/Route53RecoveryControlConfigErrors.h>
+#include <aws/route53-recovery-control-config/Route53RecoveryControlConfigPaginationBase.h>
 #include <aws/route53-recovery-control-config/Route53RecoveryControlConfigRequest.h>
 #include <aws/route53-recovery-control-config/Route53RecoveryControlConfigServiceClientModel.h>
+#include <aws/route53-recovery-control-config/Route53RecoveryControlConfigWaiter.h>
 #include <aws/route53-recovery-control-config/Route53RecoveryControlConfig_EXPORTS.h>
+#include <aws/route53-recovery-control-config/internal/Route53RecoveryControlConfigEndpointRules.h>
 #include <aws/route53-recovery-control-config/model/AssertionRule.h>
 #include <aws/route53-recovery-control-config/model/AssertionRuleUpdate.h>
 #include <aws/route53-recovery-control-config/model/Cluster.h>
@@ -46,14 +50,19 @@
 #include <aws/route53-recovery-control-config/model/GatingRuleUpdate.h>
 #include <aws/route53-recovery-control-config/model/GetResourcePolicyRequest.h>
 #include <aws/route53-recovery-control-config/model/GetResourcePolicyResult.h>
+#include <aws/route53-recovery-control-config/model/ListAssociatedRoute53HealthChecksPaginationTraits.h>
 #include <aws/route53-recovery-control-config/model/ListAssociatedRoute53HealthChecksRequest.h>
 #include <aws/route53-recovery-control-config/model/ListAssociatedRoute53HealthChecksResult.h>
+#include <aws/route53-recovery-control-config/model/ListClustersPaginationTraits.h>
 #include <aws/route53-recovery-control-config/model/ListClustersRequest.h>
 #include <aws/route53-recovery-control-config/model/ListClustersResult.h>
+#include <aws/route53-recovery-control-config/model/ListControlPanelsPaginationTraits.h>
 #include <aws/route53-recovery-control-config/model/ListControlPanelsRequest.h>
 #include <aws/route53-recovery-control-config/model/ListControlPanelsResult.h>
+#include <aws/route53-recovery-control-config/model/ListRoutingControlsPaginationTraits.h>
 #include <aws/route53-recovery-control-config/model/ListRoutingControlsRequest.h>
 #include <aws/route53-recovery-control-config/model/ListRoutingControlsResult.h>
+#include <aws/route53-recovery-control-config/model/ListSafetyRulesPaginationTraits.h>
 #include <aws/route53-recovery-control-config/model/ListSafetyRulesRequest.h>
 #include <aws/route53-recovery-control-config/model/ListSafetyRulesResult.h>
 #include <aws/route53-recovery-control-config/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/route53-recovery-readiness-gen-tests/Route53RecoveryReadinessIncludeTests.cpp b/generated/tests/route53-recovery-readiness-gen-tests/Route53RecoveryReadinessIncludeTests.cpp
index cf6e23998c43..b938a033efae 100644
--- a/generated/tests/route53-recovery-readiness-gen-tests/Route53RecoveryReadinessIncludeTests.cpp
+++ b/generated/tests/route53-recovery-readiness-gen-tests/Route53RecoveryReadinessIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/route53-recovery-readiness/Route53RecoveryReadinessClient.h>
+#include <aws/route53-recovery-readiness/Route53RecoveryReadinessClientPagination.h>
 #include <aws/route53-recovery-readiness/Route53RecoveryReadinessEndpointProvider.h>
 #include <aws/route53-recovery-readiness/Route53RecoveryReadinessErrorMarshaller.h>
 #include <aws/route53-recovery-readiness/Route53RecoveryReadinessErrors.h>
+#include <aws/route53-recovery-readiness/Route53RecoveryReadinessPaginationBase.h>
 #include <aws/route53-recovery-readiness/Route53RecoveryReadinessRequest.h>
 #include <aws/route53-recovery-readiness/Route53RecoveryReadinessServiceClientModel.h>
+#include <aws/route53-recovery-readiness/Route53RecoveryReadinessWaiter.h>
 #include <aws/route53-recovery-readiness/Route53RecoveryReadiness_EXPORTS.h>
+#include <aws/route53-recovery-readiness/internal/Route53RecoveryReadinessEndpointRules.h>
 #include <aws/route53-recovery-readiness/model/CellOutput.h>
 #include <aws/route53-recovery-readiness/model/CreateCellRequest.h>
 #include <aws/route53-recovery-readiness/model/CreateCellResult.h>
@@ -33,33 +37,43 @@
 #include <aws/route53-recovery-readiness/model/DeleteResourceSetRequest.h>
 #include <aws/route53-recovery-readiness/model/GetArchitectureRecommendationsRequest.h>
 #include <aws/route53-recovery-readiness/model/GetArchitectureRecommendationsResult.h>
+#include <aws/route53-recovery-readiness/model/GetCellReadinessSummaryPaginationTraits.h>
 #include <aws/route53-recovery-readiness/model/GetCellReadinessSummaryRequest.h>
 #include <aws/route53-recovery-readiness/model/GetCellReadinessSummaryResult.h>
 #include <aws/route53-recovery-readiness/model/GetCellRequest.h>
 #include <aws/route53-recovery-readiness/model/GetCellResult.h>
 #include <aws/route53-recovery-readiness/model/GetReadinessCheckRequest.h>
+#include <aws/route53-recovery-readiness/model/GetReadinessCheckResourceStatusPaginationTraits.h>
 #include <aws/route53-recovery-readiness/model/GetReadinessCheckResourceStatusRequest.h>
 #include <aws/route53-recovery-readiness/model/GetReadinessCheckResourceStatusResult.h>
 #include <aws/route53-recovery-readiness/model/GetReadinessCheckResult.h>
+#include <aws/route53-recovery-readiness/model/GetReadinessCheckStatusPaginationTraits.h>
 #include <aws/route53-recovery-readiness/model/GetReadinessCheckStatusRequest.h>
 #include <aws/route53-recovery-readiness/model/GetReadinessCheckStatusResult.h>
+#include <aws/route53-recovery-readiness/model/GetRecoveryGroupReadinessSummaryPaginationTraits.h>
 #include <aws/route53-recovery-readiness/model/GetRecoveryGroupReadinessSummaryRequest.h>
 #include <aws/route53-recovery-readiness/model/GetRecoveryGroupReadinessSummaryResult.h>
 #include <aws/route53-recovery-readiness/model/GetRecoveryGroupRequest.h>
 #include <aws/route53-recovery-readiness/model/GetRecoveryGroupResult.h>
 #include <aws/route53-recovery-readiness/model/GetResourceSetRequest.h>
 #include <aws/route53-recovery-readiness/model/GetResourceSetResult.h>
+#include <aws/route53-recovery-readiness/model/ListCellsPaginationTraits.h>
 #include <aws/route53-recovery-readiness/model/ListCellsRequest.h>
 #include <aws/route53-recovery-readiness/model/ListCellsResult.h>
+#include <aws/route53-recovery-readiness/model/ListCrossAccountAuthorizationsPaginationTraits.h>
 #include <aws/route53-recovery-readiness/model/ListCrossAccountAuthorizationsRequest.h>
 #include <aws/route53-recovery-readiness/model/ListCrossAccountAuthorizationsResult.h>
+#include <aws/route53-recovery-readiness/model/ListReadinessChecksPaginationTraits.h>
 #include <aws/route53-recovery-readiness/model/ListReadinessChecksRequest.h>
 #include <aws/route53-recovery-readiness/model/ListReadinessChecksResult.h>
+#include <aws/route53-recovery-readiness/model/ListRecoveryGroupsPaginationTraits.h>
 #include <aws/route53-recovery-readiness/model/ListRecoveryGroupsRequest.h>
 #include <aws/route53-recovery-readiness/model/ListRecoveryGroupsResult.h>
+#include <aws/route53-recovery-readiness/model/ListResourceSetsPaginationTraits.h>
 #include <aws/route53-recovery-readiness/model/ListResourceSetsRequest.h>
 #include <aws/route53-recovery-readiness/model/ListResourceSetsResult.h>
 #include <aws/route53-recovery-readiness/model/ListRulesOutput.h>
+#include <aws/route53-recovery-readiness/model/ListRulesPaginationTraits.h>
 #include <aws/route53-recovery-readiness/model/ListRulesRequest.h>
 #include <aws/route53-recovery-readiness/model/ListRulesResult.h>
 #include <aws/route53-recovery-readiness/model/ListTagsForResourcesRequest.h>
diff --git a/generated/tests/route53domains-gen-tests/Route53DomainsIncludeTests.cpp b/generated/tests/route53domains-gen-tests/Route53DomainsIncludeTests.cpp
index 0dafe22036b4..ef4f1b3aa71b 100644
--- a/generated/tests/route53domains-gen-tests/Route53DomainsIncludeTests.cpp
+++ b/generated/tests/route53domains-gen-tests/Route53DomainsIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/route53domains/Route53DomainsClient.h>
+#include <aws/route53domains/Route53DomainsClientPagination.h>
 #include <aws/route53domains/Route53DomainsEndpointProvider.h>
 #include <aws/route53domains/Route53DomainsErrorMarshaller.h>
 #include <aws/route53domains/Route53DomainsErrors.h>
+#include <aws/route53domains/Route53DomainsPaginationBase.h>
 #include <aws/route53domains/Route53DomainsRequest.h>
 #include <aws/route53domains/Route53DomainsServiceClientModel.h>
+#include <aws/route53domains/Route53DomainsWaiter.h>
 #include <aws/route53domains/Route53Domains_EXPORTS.h>
+#include <aws/route53domains/internal/Route53DomainsEndpointRules.h>
 #include <aws/route53domains/model/AcceptDomainTransferFromAnotherAwsAccountRequest.h>
 #include <aws/route53domains/model/AcceptDomainTransferFromAnotherAwsAccountResult.h>
 #include <aws/route53domains/model/AssociateDelegationSignerToDomainRequest.h>
@@ -62,11 +66,14 @@
 #include <aws/route53domains/model/GetOperationDetailRequest.h>
 #include <aws/route53domains/model/GetOperationDetailResult.h>
 #include <aws/route53domains/model/ListDomainsAttributeName.h>
+#include <aws/route53domains/model/ListDomainsPaginationTraits.h>
 #include <aws/route53domains/model/ListDomainsRequest.h>
 #include <aws/route53domains/model/ListDomainsResult.h>
+#include <aws/route53domains/model/ListOperationsPaginationTraits.h>
 #include <aws/route53domains/model/ListOperationsRequest.h>
 #include <aws/route53domains/model/ListOperationsResult.h>
 #include <aws/route53domains/model/ListOperationsSortAttributeName.h>
+#include <aws/route53domains/model/ListPricesPaginationTraits.h>
 #include <aws/route53domains/model/ListPricesRequest.h>
 #include <aws/route53domains/model/ListPricesResult.h>
 #include <aws/route53domains/model/ListTagsForDomainRequest.h>
@@ -108,6 +115,7 @@
 #include <aws/route53domains/model/UpdateDomainNameserversResult.h>
 #include <aws/route53domains/model/UpdateTagsForDomainRequest.h>
 #include <aws/route53domains/model/UpdateTagsForDomainResult.h>
+#include <aws/route53domains/model/ViewBillingPaginationTraits.h>
 #include <aws/route53domains/model/ViewBillingRequest.h>
 #include <aws/route53domains/model/ViewBillingResult.h>
 
diff --git a/generated/tests/route53globalresolver-gen-tests/Route53GlobalResolverIncludeTests.cpp b/generated/tests/route53globalresolver-gen-tests/Route53GlobalResolverIncludeTests.cpp
index 878038530e5e..605669a401a4 100644
--- a/generated/tests/route53globalresolver-gen-tests/Route53GlobalResolverIncludeTests.cpp
+++ b/generated/tests/route53globalresolver-gen-tests/Route53GlobalResolverIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/route53globalresolver/Route53GlobalResolverClient.h>
+#include <aws/route53globalresolver/Route53GlobalResolverClientPagination.h>
 #include <aws/route53globalresolver/Route53GlobalResolverEndpointProvider.h>
 #include <aws/route53globalresolver/Route53GlobalResolverErrorMarshaller.h>
 #include <aws/route53globalresolver/Route53GlobalResolverErrors.h>
+#include <aws/route53globalresolver/Route53GlobalResolverPaginationBase.h>
 #include <aws/route53globalresolver/Route53GlobalResolverRequest.h>
 #include <aws/route53globalresolver/Route53GlobalResolverServiceClientModel.h>
+#include <aws/route53globalresolver/Route53GlobalResolverWaiter.h>
 #include <aws/route53globalresolver/Route53GlobalResolver_EXPORTS.h>
+#include <aws/route53globalresolver/internal/Route53GlobalResolverEndpointRules.h>
 #include <aws/route53globalresolver/model/AccessSourcesItem.h>
 #include <aws/route53globalresolver/model/AccessTokenItem.h>
 #include <aws/route53globalresolver/model/AssociateHostedZoneRequest.h>
@@ -100,24 +104,34 @@
 #include <aws/route53globalresolver/model/ImportFirewallDomainsResult.h>
 #include <aws/route53globalresolver/model/InternalServerException.h>
 #include <aws/route53globalresolver/model/IpAddressType.h>
+#include <aws/route53globalresolver/model/ListAccessSourcesPaginationTraits.h>
 #include <aws/route53globalresolver/model/ListAccessSourcesRequest.h>
 #include <aws/route53globalresolver/model/ListAccessSourcesResult.h>
+#include <aws/route53globalresolver/model/ListAccessTokensPaginationTraits.h>
 #include <aws/route53globalresolver/model/ListAccessTokensRequest.h>
 #include <aws/route53globalresolver/model/ListAccessTokensResult.h>
+#include <aws/route53globalresolver/model/ListDNSViewsPaginationTraits.h>
 #include <aws/route53globalresolver/model/ListDNSViewsRequest.h>
 #include <aws/route53globalresolver/model/ListDNSViewsResult.h>
+#include <aws/route53globalresolver/model/ListFirewallDomainListsPaginationTraits.h>
 #include <aws/route53globalresolver/model/ListFirewallDomainListsRequest.h>
 #include <aws/route53globalresolver/model/ListFirewallDomainListsResult.h>
+#include <aws/route53globalresolver/model/ListFirewallDomainsPaginationTraits.h>
 #include <aws/route53globalresolver/model/ListFirewallDomainsRequest.h>
 #include <aws/route53globalresolver/model/ListFirewallDomainsResult.h>
+#include <aws/route53globalresolver/model/ListFirewallRulesPaginationTraits.h>
 #include <aws/route53globalresolver/model/ListFirewallRulesRequest.h>
 #include <aws/route53globalresolver/model/ListFirewallRulesResult.h>
+#include <aws/route53globalresolver/model/ListGlobalResolversPaginationTraits.h>
 #include <aws/route53globalresolver/model/ListGlobalResolversRequest.h>
 #include <aws/route53globalresolver/model/ListGlobalResolversResult.h>
+#include <aws/route53globalresolver/model/ListHostedZoneAssociationsPaginationTraits.h>
 #include <aws/route53globalresolver/model/ListHostedZoneAssociationsRequest.h>
 #include <aws/route53globalresolver/model/ListHostedZoneAssociationsResult.h>
+#include <aws/route53globalresolver/model/ListManagedFirewallDomainListsPaginationTraits.h>
 #include <aws/route53globalresolver/model/ListManagedFirewallDomainListsRequest.h>
 #include <aws/route53globalresolver/model/ListManagedFirewallDomainListsResult.h>
+#include <aws/route53globalresolver/model/ListSharedDNSViewsPaginationTraits.h>
 #include <aws/route53globalresolver/model/ListSharedDNSViewsRequest.h>
 #include <aws/route53globalresolver/model/ListSharedDNSViewsResult.h>
 #include <aws/route53globalresolver/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/route53profiles-gen-tests/Route53ProfilesIncludeTests.cpp b/generated/tests/route53profiles-gen-tests/Route53ProfilesIncludeTests.cpp
index e05d6d39ec1f..01eb13f83fe8 100644
--- a/generated/tests/route53profiles-gen-tests/Route53ProfilesIncludeTests.cpp
+++ b/generated/tests/route53profiles-gen-tests/Route53ProfilesIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/route53profiles/Route53ProfilesClient.h>
+#include <aws/route53profiles/Route53ProfilesClientPagination.h>
 #include <aws/route53profiles/Route53ProfilesEndpointProvider.h>
 #include <aws/route53profiles/Route53ProfilesErrorMarshaller.h>
 #include <aws/route53profiles/Route53ProfilesErrors.h>
+#include <aws/route53profiles/Route53ProfilesPaginationBase.h>
 #include <aws/route53profiles/Route53ProfilesRequest.h>
 #include <aws/route53profiles/Route53ProfilesServiceClientModel.h>
+#include <aws/route53profiles/Route53ProfilesWaiter.h>
 #include <aws/route53profiles/Route53Profiles_EXPORTS.h>
+#include <aws/route53profiles/internal/Route53ProfilesEndpointRules.h>
 #include <aws/route53profiles/model/AssociateProfileRequest.h>
 #include <aws/route53profiles/model/AssociateProfileResult.h>
 #include <aws/route53profiles/model/AssociateResourceToProfileRequest.h>
@@ -33,10 +37,13 @@
 #include <aws/route53profiles/model/GetProfileResult.h>
 #include <aws/route53profiles/model/InvalidParameterException.h>
 #include <aws/route53profiles/model/LimitExceededException.h>
+#include <aws/route53profiles/model/ListProfileAssociationsPaginationTraits.h>
 #include <aws/route53profiles/model/ListProfileAssociationsRequest.h>
 #include <aws/route53profiles/model/ListProfileAssociationsResult.h>
+#include <aws/route53profiles/model/ListProfileResourceAssociationsPaginationTraits.h>
 #include <aws/route53profiles/model/ListProfileResourceAssociationsRequest.h>
 #include <aws/route53profiles/model/ListProfileResourceAssociationsResult.h>
+#include <aws/route53profiles/model/ListProfilesPaginationTraits.h>
 #include <aws/route53profiles/model/ListProfilesRequest.h>
 #include <aws/route53profiles/model/ListProfilesResult.h>
 #include <aws/route53profiles/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/route53resolver-gen-tests/Route53ResolverIncludeTests.cpp b/generated/tests/route53resolver-gen-tests/Route53ResolverIncludeTests.cpp
index 85db71c10df4..672823ed8e65 100644
--- a/generated/tests/route53resolver-gen-tests/Route53ResolverIncludeTests.cpp
+++ b/generated/tests/route53resolver-gen-tests/Route53ResolverIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/route53resolver/Route53ResolverClient.h>
+#include <aws/route53resolver/Route53ResolverClientPagination.h>
 #include <aws/route53resolver/Route53ResolverEndpointProvider.h>
 #include <aws/route53resolver/Route53ResolverErrorMarshaller.h>
 #include <aws/route53resolver/Route53ResolverErrors.h>
+#include <aws/route53resolver/Route53ResolverPaginationBase.h>
 #include <aws/route53resolver/Route53ResolverRequest.h>
 #include <aws/route53resolver/Route53ResolverServiceClientModel.h>
+#include <aws/route53resolver/Route53ResolverWaiter.h>
 #include <aws/route53resolver/Route53Resolver_EXPORTS.h>
+#include <aws/route53resolver/internal/Route53ResolverEndpointRules.h>
 #include <aws/route53resolver/model/Action.h>
 #include <aws/route53resolver/model/AssociateFirewallRuleGroupRequest.h>
 #include <aws/route53resolver/model/AssociateFirewallRuleGroupResult.h>
@@ -133,38 +137,55 @@
 #include <aws/route53resolver/model/IpAddressStatus.h>
 #include <aws/route53resolver/model/IpAddressUpdate.h>
 #include <aws/route53resolver/model/LimitExceededException.h>
+#include <aws/route53resolver/model/ListFirewallConfigsPaginationTraits.h>
 #include <aws/route53resolver/model/ListFirewallConfigsRequest.h>
 #include <aws/route53resolver/model/ListFirewallConfigsResult.h>
+#include <aws/route53resolver/model/ListFirewallDomainListsPaginationTraits.h>
 #include <aws/route53resolver/model/ListFirewallDomainListsRequest.h>
 #include <aws/route53resolver/model/ListFirewallDomainListsResult.h>
+#include <aws/route53resolver/model/ListFirewallDomainsPaginationTraits.h>
 #include <aws/route53resolver/model/ListFirewallDomainsRequest.h>
 #include <aws/route53resolver/model/ListFirewallDomainsResult.h>
+#include <aws/route53resolver/model/ListFirewallRuleGroupAssociationsPaginationTraits.h>
 #include <aws/route53resolver/model/ListFirewallRuleGroupAssociationsRequest.h>
 #include <aws/route53resolver/model/ListFirewallRuleGroupAssociationsResult.h>
+#include <aws/route53resolver/model/ListFirewallRuleGroupsPaginationTraits.h>
 #include <aws/route53resolver/model/ListFirewallRuleGroupsRequest.h>
 #include <aws/route53resolver/model/ListFirewallRuleGroupsResult.h>
+#include <aws/route53resolver/model/ListFirewallRuleTypesPaginationTraits.h>
 #include <aws/route53resolver/model/ListFirewallRuleTypesRequest.h>
 #include <aws/route53resolver/model/ListFirewallRuleTypesResult.h>
+#include <aws/route53resolver/model/ListFirewallRulesPaginationTraits.h>
 #include <aws/route53resolver/model/ListFirewallRulesRequest.h>
 #include <aws/route53resolver/model/ListFirewallRulesResult.h>
+#include <aws/route53resolver/model/ListOutpostResolversPaginationTraits.h>
 #include <aws/route53resolver/model/ListOutpostResolversRequest.h>
 #include <aws/route53resolver/model/ListOutpostResolversResult.h>
+#include <aws/route53resolver/model/ListResolverConfigsPaginationTraits.h>
 #include <aws/route53resolver/model/ListResolverConfigsRequest.h>
 #include <aws/route53resolver/model/ListResolverConfigsResult.h>
+#include <aws/route53resolver/model/ListResolverDnssecConfigsPaginationTraits.h>
 #include <aws/route53resolver/model/ListResolverDnssecConfigsRequest.h>
 #include <aws/route53resolver/model/ListResolverDnssecConfigsResult.h>
+#include <aws/route53resolver/model/ListResolverEndpointIpAddressesPaginationTraits.h>
 #include <aws/route53resolver/model/ListResolverEndpointIpAddressesRequest.h>
 #include <aws/route53resolver/model/ListResolverEndpointIpAddressesResult.h>
+#include <aws/route53resolver/model/ListResolverEndpointsPaginationTraits.h>
 #include <aws/route53resolver/model/ListResolverEndpointsRequest.h>
 #include <aws/route53resolver/model/ListResolverEndpointsResult.h>
+#include <aws/route53resolver/model/ListResolverQueryLogConfigAssociationsPaginationTraits.h>
 #include <aws/route53resolver/model/ListResolverQueryLogConfigAssociationsRequest.h>
 #include <aws/route53resolver/model/ListResolverQueryLogConfigAssociationsResult.h>
+#include <aws/route53resolver/model/ListResolverQueryLogConfigsPaginationTraits.h>
 #include <aws/route53resolver/model/ListResolverQueryLogConfigsRequest.h>
 #include <aws/route53resolver/model/ListResolverQueryLogConfigsResult.h>
+#include <aws/route53resolver/model/ListResolverRuleAssociationsPaginationTraits.h>
 #include <aws/route53resolver/model/ListResolverRuleAssociationsRequest.h>
 #include <aws/route53resolver/model/ListResolverRuleAssociationsResult.h>
+#include <aws/route53resolver/model/ListResolverRulesPaginationTraits.h>
 #include <aws/route53resolver/model/ListResolverRulesRequest.h>
 #include <aws/route53resolver/model/ListResolverRulesResult.h>
+#include <aws/route53resolver/model/ListTagsForResourcePaginationTraits.h>
 #include <aws/route53resolver/model/ListTagsForResourceRequest.h>
 #include <aws/route53resolver/model/ListTagsForResourceResult.h>
 #include <aws/route53resolver/model/MutationProtectionStatus.h>
diff --git a/generated/tests/rtbfabric-gen-tests/RTBFabricIncludeTests.cpp b/generated/tests/rtbfabric-gen-tests/RTBFabricIncludeTests.cpp
index 362cd4334dbf..0852446a4eab 100644
--- a/generated/tests/rtbfabric-gen-tests/RTBFabricIncludeTests.cpp
+++ b/generated/tests/rtbfabric-gen-tests/RTBFabricIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/rtbfabric/RTBFabricClient.h>
+#include <aws/rtbfabric/RTBFabricClientPagination.h>
 #include <aws/rtbfabric/RTBFabricEndpointProvider.h>
 #include <aws/rtbfabric/RTBFabricErrorMarshaller.h>
 #include <aws/rtbfabric/RTBFabricErrors.h>
+#include <aws/rtbfabric/RTBFabricPaginationBase.h>
 #include <aws/rtbfabric/RTBFabricRequest.h>
 #include <aws/rtbfabric/RTBFabricServiceClientModel.h>
+#include <aws/rtbfabric/RTBFabricWaiter.h>
 #include <aws/rtbfabric/RTBFabric_EXPORTS.h>
+#include <aws/rtbfabric/internal/RTBFabricEndpointRules.h>
 #include <aws/rtbfabric/model/AcceptLinkRequest.h>
 #include <aws/rtbfabric/model/AcceptLinkResult.h>
 #include <aws/rtbfabric/model/Action.h>
@@ -76,15 +80,20 @@
 #include <aws/rtbfabric/model/LinkLogSettings.h>
 #include <aws/rtbfabric/model/LinkRoutingRuleSummary.h>
 #include <aws/rtbfabric/model/LinkStatus.h>
+#include <aws/rtbfabric/model/ListCertificateAssociationsPaginationTraits.h>
 #include <aws/rtbfabric/model/ListCertificateAssociationsRequest.h>
 #include <aws/rtbfabric/model/ListCertificateAssociationsResult.h>
+#include <aws/rtbfabric/model/ListLinkRoutingRulesPaginationTraits.h>
 #include <aws/rtbfabric/model/ListLinkRoutingRulesRequest.h>
 #include <aws/rtbfabric/model/ListLinkRoutingRulesResult.h>
+#include <aws/rtbfabric/model/ListLinksPaginationTraits.h>
 #include <aws/rtbfabric/model/ListLinksRequest.h>
 #include <aws/rtbfabric/model/ListLinksResponseStructure.h>
 #include <aws/rtbfabric/model/ListLinksResult.h>
+#include <aws/rtbfabric/model/ListRequesterGatewaysPaginationTraits.h>
 #include <aws/rtbfabric/model/ListRequesterGatewaysRequest.h>
 #include <aws/rtbfabric/model/ListRequesterGatewaysResult.h>
+#include <aws/rtbfabric/model/ListResponderGatewaysPaginationTraits.h>
 #include <aws/rtbfabric/model/ListResponderGatewaysRequest.h>
 #include <aws/rtbfabric/model/ListResponderGatewaysResult.h>
 #include <aws/rtbfabric/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/rum-gen-tests/CloudWatchRUMIncludeTests.cpp b/generated/tests/rum-gen-tests/CloudWatchRUMIncludeTests.cpp
index 9a24c45c559e..82bb4ec79f8e 100644
--- a/generated/tests/rum-gen-tests/CloudWatchRUMIncludeTests.cpp
+++ b/generated/tests/rum-gen-tests/CloudWatchRUMIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/rum/CloudWatchRUMClient.h>
+#include <aws/rum/CloudWatchRUMClientPagination.h>
 #include <aws/rum/CloudWatchRUMEndpointProvider.h>
 #include <aws/rum/CloudWatchRUMErrorMarshaller.h>
 #include <aws/rum/CloudWatchRUMErrors.h>
+#include <aws/rum/CloudWatchRUMPaginationBase.h>
 #include <aws/rum/CloudWatchRUMRequest.h>
 #include <aws/rum/CloudWatchRUMServiceClientModel.h>
+#include <aws/rum/CloudWatchRUMWaiter.h>
 #include <aws/rum/CloudWatchRUM_EXPORTS.h>
+#include <aws/rum/internal/CloudWatchRUMEndpointRules.h>
 #include <aws/rum/model/AppMonitor.h>
 #include <aws/rum/model/AppMonitorConfiguration.h>
 #include <aws/rum/model/AppMonitorDetails.h>
@@ -24,6 +28,7 @@
 #include <aws/rum/model/BatchDeleteRumMetricDefinitionsError.h>
 #include <aws/rum/model/BatchDeleteRumMetricDefinitionsRequest.h>
 #include <aws/rum/model/BatchDeleteRumMetricDefinitionsResult.h>
+#include <aws/rum/model/BatchGetRumMetricDefinitionsPaginationTraits.h>
 #include <aws/rum/model/BatchGetRumMetricDefinitionsRequest.h>
 #include <aws/rum/model/BatchGetRumMetricDefinitionsResult.h>
 #include <aws/rum/model/ConflictException.h>
@@ -41,6 +46,7 @@
 #include <aws/rum/model/DeleteRumMetricsDestinationResult.h>
 #include <aws/rum/model/DeobfuscationConfiguration.h>
 #include <aws/rum/model/DeobfuscationStatus.h>
+#include <aws/rum/model/GetAppMonitorDataPaginationTraits.h>
 #include <aws/rum/model/GetAppMonitorDataRequest.h>
 #include <aws/rum/model/GetAppMonitorDataResult.h>
 #include <aws/rum/model/GetAppMonitorRequest.h>
@@ -49,8 +55,10 @@
 #include <aws/rum/model/GetResourcePolicyResult.h>
 #include <aws/rum/model/InternalServerException.h>
 #include <aws/rum/model/JavaScriptSourceMaps.h>
+#include <aws/rum/model/ListAppMonitorsPaginationTraits.h>
 #include <aws/rum/model/ListAppMonitorsRequest.h>
 #include <aws/rum/model/ListAppMonitorsResult.h>
+#include <aws/rum/model/ListRumMetricsDestinationsPaginationTraits.h>
 #include <aws/rum/model/ListRumMetricsDestinationsRequest.h>
 #include <aws/rum/model/ListRumMetricsDestinationsResult.h>
 #include <aws/rum/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/s3-crt-gen-tests/S3CrtIncludeTests.cpp b/generated/tests/s3-crt-gen-tests/S3CrtIncludeTests.cpp
index 5f42b10b8d19..892c4c32b508 100644
--- a/generated/tests/s3-crt-gen-tests/S3CrtIncludeTests.cpp
+++ b/generated/tests/s3-crt-gen-tests/S3CrtIncludeTests.cpp
@@ -9,17 +9,21 @@
 #include <aws/s3-crt/ClientConfiguration.h>
 #include <aws/s3-crt/S3CrtClient.h>
 #include <aws/s3-crt/S3CrtClientConfiguration.h>
+#include <aws/s3-crt/S3CrtClientPagination.h>
 #include <aws/s3-crt/S3CrtEndpointProvider.h>
 #include <aws/s3-crt/S3CrtErrorMarshaller.h>
 #include <aws/s3-crt/S3CrtErrors.h>
 #include <aws/s3-crt/S3CrtIdentityProviderAdapter.h>
+#include <aws/s3-crt/S3CrtPaginationBase.h>
 #include <aws/s3-crt/S3CrtRequest.h>
 #include <aws/s3-crt/S3CrtServiceClientModel.h>
+#include <aws/s3-crt/S3CrtWaiter.h>
 #include <aws/s3-crt/S3Crt_EXPORTS.h>
 #include <aws/s3-crt/S3ExpressIdentity.h>
 #include <aws/s3-crt/S3ExpressIdentityProvider.h>
 #include <aws/s3-crt/S3ExpressSigner.h>
 #include <aws/s3-crt/S3ExpressSignerProvider.h>
+#include <aws/s3-crt/internal/S3CrtEndpointRules.h>
 #include <aws/s3-crt/model/AbacStatus.h>
 #include <aws/s3-crt/model/AbortIncompleteMultipartUpload.h>
 #include <aws/s3-crt/model/AbortMultipartUploadRequest.h>
@@ -251,20 +255,25 @@
 #include <aws/s3-crt/model/ListBucketInventoryConfigurationsResult.h>
 #include <aws/s3-crt/model/ListBucketMetricsConfigurationsRequest.h>
 #include <aws/s3-crt/model/ListBucketMetricsConfigurationsResult.h>
+#include <aws/s3-crt/model/ListBucketsPaginationTraits.h>
 #include <aws/s3-crt/model/ListBucketsRequest.h>
 #include <aws/s3-crt/model/ListBucketsResult.h>
+#include <aws/s3-crt/model/ListDirectoryBucketsPaginationTraits.h>
 #include <aws/s3-crt/model/ListDirectoryBucketsRequest.h>
 #include <aws/s3-crt/model/ListDirectoryBucketsResult.h>
 #include <aws/s3-crt/model/ListMultipartUploadsRequest.h>
 #include <aws/s3-crt/model/ListMultipartUploadsResult.h>
+#include <aws/s3-crt/model/ListObjectAnnotationsPaginationTraits.h>
 #include <aws/s3-crt/model/ListObjectAnnotationsRequest.h>
 #include <aws/s3-crt/model/ListObjectAnnotationsResult.h>
 #include <aws/s3-crt/model/ListObjectVersionsRequest.h>
 #include <aws/s3-crt/model/ListObjectVersionsResult.h>
 #include <aws/s3-crt/model/ListObjectsRequest.h>
 #include <aws/s3-crt/model/ListObjectsResult.h>
+#include <aws/s3-crt/model/ListObjectsV2PaginationTraits.h>
 #include <aws/s3-crt/model/ListObjectsV2Request.h>
 #include <aws/s3-crt/model/ListObjectsV2Result.h>
+#include <aws/s3-crt/model/ListPartsPaginationTraits.h>
 #include <aws/s3-crt/model/ListPartsRequest.h>
 #include <aws/s3-crt/model/ListPartsResult.h>
 #include <aws/s3-crt/model/LocationInfo.h>
diff --git a/generated/tests/s3-gen-tests/S3IncludeTests.cpp b/generated/tests/s3-gen-tests/S3IncludeTests.cpp
index e99e14bb5595..1bb72fb5d016 100644
--- a/generated/tests/s3-gen-tests/S3IncludeTests.cpp
+++ b/generated/tests/s3-gen-tests/S3IncludeTests.cpp
@@ -8,6 +8,7 @@
 
 #include <aws/s3/S3Client.h>
 #include <aws/s3/S3ClientConfiguration.h>
+#include <aws/s3/S3ClientPagination.h>
 #include <aws/s3/S3EndpointProvider.h>
 #include <aws/s3/S3ErrorMarshaller.h>
 #include <aws/s3/S3Errors.h>
@@ -15,9 +16,12 @@
 #include <aws/s3/S3ExpressIdentityProvider.h>
 #include <aws/s3/S3ExpressSigner.h>
 #include <aws/s3/S3ExpressSignerProvider.h>
+#include <aws/s3/S3PaginationBase.h>
 #include <aws/s3/S3Request.h>
 #include <aws/s3/S3ServiceClientModel.h>
+#include <aws/s3/S3Waiter.h>
 #include <aws/s3/S3_EXPORTS.h>
+#include <aws/s3/internal/S3EndpointRules.h>
 #include <aws/s3/model/AbacStatus.h>
 #include <aws/s3/model/AbortIncompleteMultipartUpload.h>
 #include <aws/s3/model/AbortMultipartUploadRequest.h>
@@ -249,20 +253,25 @@
 #include <aws/s3/model/ListBucketInventoryConfigurationsResult.h>
 #include <aws/s3/model/ListBucketMetricsConfigurationsRequest.h>
 #include <aws/s3/model/ListBucketMetricsConfigurationsResult.h>
+#include <aws/s3/model/ListBucketsPaginationTraits.h>
 #include <aws/s3/model/ListBucketsRequest.h>
 #include <aws/s3/model/ListBucketsResult.h>
+#include <aws/s3/model/ListDirectoryBucketsPaginationTraits.h>
 #include <aws/s3/model/ListDirectoryBucketsRequest.h>
 #include <aws/s3/model/ListDirectoryBucketsResult.h>
 #include <aws/s3/model/ListMultipartUploadsRequest.h>
 #include <aws/s3/model/ListMultipartUploadsResult.h>
+#include <aws/s3/model/ListObjectAnnotationsPaginationTraits.h>
 #include <aws/s3/model/ListObjectAnnotationsRequest.h>
 #include <aws/s3/model/ListObjectAnnotationsResult.h>
 #include <aws/s3/model/ListObjectVersionsRequest.h>
 #include <aws/s3/model/ListObjectVersionsResult.h>
 #include <aws/s3/model/ListObjectsRequest.h>
 #include <aws/s3/model/ListObjectsResult.h>
+#include <aws/s3/model/ListObjectsV2PaginationTraits.h>
 #include <aws/s3/model/ListObjectsV2Request.h>
 #include <aws/s3/model/ListObjectsV2Result.h>
+#include <aws/s3/model/ListPartsPaginationTraits.h>
 #include <aws/s3/model/ListPartsRequest.h>
 #include <aws/s3/model/ListPartsResult.h>
 #include <aws/s3/model/LocationInfo.h>
diff --git a/generated/tests/s3control-gen-tests/S3ControlIncludeTests.cpp b/generated/tests/s3control-gen-tests/S3ControlIncludeTests.cpp
index 0c85f1e6e5a6..5eb209f9d276 100644
--- a/generated/tests/s3control-gen-tests/S3ControlIncludeTests.cpp
+++ b/generated/tests/s3control-gen-tests/S3ControlIncludeTests.cpp
@@ -8,12 +8,16 @@
 
 #include <aws/s3control/S3ControlClient.h>
 #include <aws/s3control/S3ControlClientConfiguration.h>
+#include <aws/s3control/S3ControlClientPagination.h>
 #include <aws/s3control/S3ControlEndpointProvider.h>
 #include <aws/s3control/S3ControlErrorMarshaller.h>
 #include <aws/s3control/S3ControlErrors.h>
+#include <aws/s3control/S3ControlPaginationBase.h>
 #include <aws/s3control/S3ControlRequest.h>
 #include <aws/s3control/S3ControlServiceClientModel.h>
+#include <aws/s3control/S3ControlWaiter.h>
 #include <aws/s3control/S3Control_EXPORTS.h>
+#include <aws/s3control/internal/S3ControlEndpointRules.h>
 #include <aws/s3control/model/AbortIncompleteMultipartUpload.h>
 #include <aws/s3control/model/AccessControlTranslation.h>
 #include <aws/s3control/model/AccessGrantsLocationConfiguration.h>
@@ -187,32 +191,44 @@
 #include <aws/s3control/model/LifecycleRuleFilter.h>
 #include <aws/s3control/model/ListAccessGrantEntry.h>
 #include <aws/s3control/model/ListAccessGrantsInstanceEntry.h>
+#include <aws/s3control/model/ListAccessGrantsInstancesPaginationTraits.h>
 #include <aws/s3control/model/ListAccessGrantsInstancesRequest.h>
 #include <aws/s3control/model/ListAccessGrantsInstancesResult.h>
 #include <aws/s3control/model/ListAccessGrantsLocationsEntry.h>
+#include <aws/s3control/model/ListAccessGrantsLocationsPaginationTraits.h>
 #include <aws/s3control/model/ListAccessGrantsLocationsRequest.h>
 #include <aws/s3control/model/ListAccessGrantsLocationsResult.h>
+#include <aws/s3control/model/ListAccessGrantsPaginationTraits.h>
 #include <aws/s3control/model/ListAccessGrantsRequest.h>
 #include <aws/s3control/model/ListAccessGrantsResult.h>
+#include <aws/s3control/model/ListAccessPointsForDirectoryBucketsPaginationTraits.h>
 #include <aws/s3control/model/ListAccessPointsForDirectoryBucketsRequest.h>
 #include <aws/s3control/model/ListAccessPointsForDirectoryBucketsResult.h>
+#include <aws/s3control/model/ListAccessPointsForObjectLambdaPaginationTraits.h>
 #include <aws/s3control/model/ListAccessPointsForObjectLambdaRequest.h>
 #include <aws/s3control/model/ListAccessPointsForObjectLambdaResult.h>
+#include <aws/s3control/model/ListAccessPointsPaginationTraits.h>
 #include <aws/s3control/model/ListAccessPointsRequest.h>
 #include <aws/s3control/model/ListAccessPointsResult.h>
 #include <aws/s3control/model/ListCallerAccessGrantsEntry.h>
+#include <aws/s3control/model/ListCallerAccessGrantsPaginationTraits.h>
 #include <aws/s3control/model/ListCallerAccessGrantsRequest.h>
 #include <aws/s3control/model/ListCallerAccessGrantsResult.h>
+#include <aws/s3control/model/ListJobsPaginationTraits.h>
 #include <aws/s3control/model/ListJobsRequest.h>
 #include <aws/s3control/model/ListJobsResult.h>
+#include <aws/s3control/model/ListMultiRegionAccessPointsPaginationTraits.h>
 #include <aws/s3control/model/ListMultiRegionAccessPointsRequest.h>
 #include <aws/s3control/model/ListMultiRegionAccessPointsResult.h>
+#include <aws/s3control/model/ListRegionalBucketsPaginationTraits.h>
 #include <aws/s3control/model/ListRegionalBucketsRequest.h>
 #include <aws/s3control/model/ListRegionalBucketsResult.h>
 #include <aws/s3control/model/ListStorageLensConfigurationEntry.h>
+#include <aws/s3control/model/ListStorageLensConfigurationsPaginationTraits.h>
 #include <aws/s3control/model/ListStorageLensConfigurationsRequest.h>
 #include <aws/s3control/model/ListStorageLensConfigurationsResult.h>
 #include <aws/s3control/model/ListStorageLensGroupEntry.h>
+#include <aws/s3control/model/ListStorageLensGroupsPaginationTraits.h>
 #include <aws/s3control/model/ListStorageLensGroupsRequest.h>
 #include <aws/s3control/model/ListStorageLensGroupsResult.h>
 #include <aws/s3control/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/s3files-gen-tests/S3FilesIncludeTests.cpp b/generated/tests/s3files-gen-tests/S3FilesIncludeTests.cpp
index 729a6d273189..1f840040b727 100644
--- a/generated/tests/s3files-gen-tests/S3FilesIncludeTests.cpp
+++ b/generated/tests/s3files-gen-tests/S3FilesIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/s3files/S3FilesClient.h>
+#include <aws/s3files/S3FilesClientPagination.h>
 #include <aws/s3files/S3FilesEndpointProvider.h>
 #include <aws/s3files/S3FilesErrorMarshaller.h>
 #include <aws/s3files/S3FilesErrors.h>
+#include <aws/s3files/S3FilesPaginationBase.h>
 #include <aws/s3files/S3FilesRequest.h>
 #include <aws/s3files/S3FilesServiceClientModel.h>
+#include <aws/s3files/S3FilesWaiter.h>
 #include <aws/s3files/S3Files_EXPORTS.h>
+#include <aws/s3files/internal/S3FilesEndpointRules.h>
 #include <aws/s3files/model/ConflictException.h>
 #include <aws/s3files/model/CreateAccessPointRequest.h>
 #include <aws/s3files/model/CreateAccessPointResult.h>
@@ -42,14 +46,18 @@
 #include <aws/s3files/model/IpAddressType.h>
 #include <aws/s3files/model/LifeCycleState.h>
 #include <aws/s3files/model/ListAccessPointsDescription.h>
+#include <aws/s3files/model/ListAccessPointsPaginationTraits.h>
 #include <aws/s3files/model/ListAccessPointsRequest.h>
 #include <aws/s3files/model/ListAccessPointsResult.h>
 #include <aws/s3files/model/ListFileSystemsDescription.h>
+#include <aws/s3files/model/ListFileSystemsPaginationTraits.h>
 #include <aws/s3files/model/ListFileSystemsRequest.h>
 #include <aws/s3files/model/ListFileSystemsResult.h>
 #include <aws/s3files/model/ListMountTargetsDescription.h>
+#include <aws/s3files/model/ListMountTargetsPaginationTraits.h>
 #include <aws/s3files/model/ListMountTargetsRequest.h>
 #include <aws/s3files/model/ListMountTargetsResult.h>
+#include <aws/s3files/model/ListTagsForResourcePaginationTraits.h>
 #include <aws/s3files/model/ListTagsForResourceRequest.h>
 #include <aws/s3files/model/ListTagsForResourceResult.h>
 #include <aws/s3files/model/PosixUser.h>
diff --git a/generated/tests/s3outposts-gen-tests/S3OutpostsIncludeTests.cpp b/generated/tests/s3outposts-gen-tests/S3OutpostsIncludeTests.cpp
index 140c2450e6e4..096cd51376e6 100644
--- a/generated/tests/s3outposts-gen-tests/S3OutpostsIncludeTests.cpp
+++ b/generated/tests/s3outposts-gen-tests/S3OutpostsIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/s3outposts/S3OutpostsClient.h>
+#include <aws/s3outposts/S3OutpostsClientPagination.h>
 #include <aws/s3outposts/S3OutpostsEndpointProvider.h>
 #include <aws/s3outposts/S3OutpostsErrorMarshaller.h>
 #include <aws/s3outposts/S3OutpostsErrors.h>
+#include <aws/s3outposts/S3OutpostsPaginationBase.h>
 #include <aws/s3outposts/S3OutpostsRequest.h>
 #include <aws/s3outposts/S3OutpostsServiceClientModel.h>
+#include <aws/s3outposts/S3OutpostsWaiter.h>
 #include <aws/s3outposts/S3Outposts_EXPORTS.h>
+#include <aws/s3outposts/internal/S3OutpostsEndpointRules.h>
 #include <aws/s3outposts/model/CreateEndpointRequest.h>
 #include <aws/s3outposts/model/CreateEndpointResult.h>
 #include <aws/s3outposts/model/DeleteEndpointRequest.h>
@@ -20,10 +24,13 @@
 #include <aws/s3outposts/model/EndpointAccessType.h>
 #include <aws/s3outposts/model/EndpointStatus.h>
 #include <aws/s3outposts/model/FailedReason.h>
+#include <aws/s3outposts/model/ListEndpointsPaginationTraits.h>
 #include <aws/s3outposts/model/ListEndpointsRequest.h>
 #include <aws/s3outposts/model/ListEndpointsResult.h>
+#include <aws/s3outposts/model/ListOutpostsWithS3PaginationTraits.h>
 #include <aws/s3outposts/model/ListOutpostsWithS3Request.h>
 #include <aws/s3outposts/model/ListOutpostsWithS3Result.h>
+#include <aws/s3outposts/model/ListSharedEndpointsPaginationTraits.h>
 #include <aws/s3outposts/model/ListSharedEndpointsRequest.h>
 #include <aws/s3outposts/model/ListSharedEndpointsResult.h>
 #include <aws/s3outposts/model/NetworkInterface.h>
diff --git a/generated/tests/s3tables-gen-tests/S3TablesIncludeTests.cpp b/generated/tests/s3tables-gen-tests/S3TablesIncludeTests.cpp
index 69ca8884dffb..34ed2eb4db7f 100644
--- a/generated/tests/s3tables-gen-tests/S3TablesIncludeTests.cpp
+++ b/generated/tests/s3tables-gen-tests/S3TablesIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/s3tables/S3TablesClient.h>
+#include <aws/s3tables/S3TablesClientPagination.h>
 #include <aws/s3tables/S3TablesEndpointProvider.h>
 #include <aws/s3tables/S3TablesErrorMarshaller.h>
 #include <aws/s3tables/S3TablesErrors.h>
+#include <aws/s3tables/S3TablesPaginationBase.h>
 #include <aws/s3tables/S3TablesRequest.h>
 #include <aws/s3tables/S3TablesServiceClientModel.h>
+#include <aws/s3tables/S3TablesWaiter.h>
 #include <aws/s3tables/S3Tables_EXPORTS.h>
+#include <aws/s3tables/internal/S3TablesEndpointRules.h>
 #include <aws/s3tables/model/CreateNamespaceRequest.h>
 #include <aws/s3tables/model/CreateNamespaceResult.h>
 #include <aws/s3tables/model/CreateTableBucketRequest.h>
@@ -82,10 +86,13 @@
 #include <aws/s3tables/model/IcebergUnreferencedFileRemovalSettings.h>
 #include <aws/s3tables/model/JobStatus.h>
 #include <aws/s3tables/model/LastSuccessfulReplicatedUpdate.h>
+#include <aws/s3tables/model/ListNamespacesPaginationTraits.h>
 #include <aws/s3tables/model/ListNamespacesRequest.h>
 #include <aws/s3tables/model/ListNamespacesResult.h>
+#include <aws/s3tables/model/ListTableBucketsPaginationTraits.h>
 #include <aws/s3tables/model/ListTableBucketsRequest.h>
 #include <aws/s3tables/model/ListTableBucketsResult.h>
+#include <aws/s3tables/model/ListTablesPaginationTraits.h>
 #include <aws/s3tables/model/ListTablesRequest.h>
 #include <aws/s3tables/model/ListTablesResult.h>
 #include <aws/s3tables/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/s3vectors-gen-tests/S3VectorsIncludeTests.cpp b/generated/tests/s3vectors-gen-tests/S3VectorsIncludeTests.cpp
index abb66dcefbaa..03e61459b375 100644
--- a/generated/tests/s3vectors-gen-tests/S3VectorsIncludeTests.cpp
+++ b/generated/tests/s3vectors-gen-tests/S3VectorsIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/s3vectors/S3VectorsClient.h>
+#include <aws/s3vectors/S3VectorsClientPagination.h>
 #include <aws/s3vectors/S3VectorsEndpointProvider.h>
 #include <aws/s3vectors/S3VectorsErrorMarshaller.h>
 #include <aws/s3vectors/S3VectorsErrors.h>
+#include <aws/s3vectors/S3VectorsPaginationBase.h>
 #include <aws/s3vectors/S3VectorsRequest.h>
 #include <aws/s3vectors/S3VectorsServiceClientModel.h>
+#include <aws/s3vectors/S3VectorsWaiter.h>
 #include <aws/s3vectors/S3Vectors_EXPORTS.h>
+#include <aws/s3vectors/internal/S3VectorsEndpointRules.h>
 #include <aws/s3vectors/model/CreateIndexRequest.h>
 #include <aws/s3vectors/model/CreateIndexResult.h>
 #include <aws/s3vectors/model/CreateVectorBucketRequest.h>
@@ -39,13 +43,16 @@
 #include <aws/s3vectors/model/GetVectorsResult.h>
 #include <aws/s3vectors/model/Index.h>
 #include <aws/s3vectors/model/IndexSummary.h>
+#include <aws/s3vectors/model/ListIndexesPaginationTraits.h>
 #include <aws/s3vectors/model/ListIndexesRequest.h>
 #include <aws/s3vectors/model/ListIndexesResult.h>
 #include <aws/s3vectors/model/ListOutputVector.h>
 #include <aws/s3vectors/model/ListTagsForResourceRequest.h>
 #include <aws/s3vectors/model/ListTagsForResourceResult.h>
+#include <aws/s3vectors/model/ListVectorBucketsPaginationTraits.h>
 #include <aws/s3vectors/model/ListVectorBucketsRequest.h>
 #include <aws/s3vectors/model/ListVectorBucketsResult.h>
+#include <aws/s3vectors/model/ListVectorsPaginationTraits.h>
 #include <aws/s3vectors/model/ListVectorsRequest.h>
 #include <aws/s3vectors/model/ListVectorsResult.h>
 #include <aws/s3vectors/model/MetadataConfiguration.h>
@@ -55,6 +62,7 @@
 #include <aws/s3vectors/model/PutVectorsRequest.h>
 #include <aws/s3vectors/model/PutVectorsResult.h>
 #include <aws/s3vectors/model/QueryOutputVector.h>
+#include <aws/s3vectors/model/QueryVectorsPaginationTraits.h>
 #include <aws/s3vectors/model/QueryVectorsRequest.h>
 #include <aws/s3vectors/model/QueryVectorsResult.h>
 #include <aws/s3vectors/model/SseType.h>
diff --git a/generated/tests/sagemaker-a2i-runtime-gen-tests/AugmentedAIRuntimeIncludeTests.cpp b/generated/tests/sagemaker-a2i-runtime-gen-tests/AugmentedAIRuntimeIncludeTests.cpp
index 3d07c6bf4622..282f3b454449 100644
--- a/generated/tests/sagemaker-a2i-runtime-gen-tests/AugmentedAIRuntimeIncludeTests.cpp
+++ b/generated/tests/sagemaker-a2i-runtime-gen-tests/AugmentedAIRuntimeIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/sagemaker-a2i-runtime/AugmentedAIRuntimeClient.h>
+#include <aws/sagemaker-a2i-runtime/AugmentedAIRuntimeClientPagination.h>
 #include <aws/sagemaker-a2i-runtime/AugmentedAIRuntimeEndpointProvider.h>
 #include <aws/sagemaker-a2i-runtime/AugmentedAIRuntimeErrorMarshaller.h>
 #include <aws/sagemaker-a2i-runtime/AugmentedAIRuntimeErrors.h>
+#include <aws/sagemaker-a2i-runtime/AugmentedAIRuntimePaginationBase.h>
 #include <aws/sagemaker-a2i-runtime/AugmentedAIRuntimeRequest.h>
 #include <aws/sagemaker-a2i-runtime/AugmentedAIRuntimeServiceClientModel.h>
+#include <aws/sagemaker-a2i-runtime/AugmentedAIRuntimeWaiter.h>
 #include <aws/sagemaker-a2i-runtime/AugmentedAIRuntime_EXPORTS.h>
+#include <aws/sagemaker-a2i-runtime/internal/AugmentedAIRuntimeEndpointRules.h>
 #include <aws/sagemaker-a2i-runtime/model/ContentClassifier.h>
 #include <aws/sagemaker-a2i-runtime/model/DeleteHumanLoopRequest.h>
 #include <aws/sagemaker-a2i-runtime/model/DeleteHumanLoopResult.h>
@@ -23,6 +27,7 @@
 #include <aws/sagemaker-a2i-runtime/model/HumanLoopOutput.h>
 #include <aws/sagemaker-a2i-runtime/model/HumanLoopStatus.h>
 #include <aws/sagemaker-a2i-runtime/model/HumanLoopSummary.h>
+#include <aws/sagemaker-a2i-runtime/model/ListHumanLoopsPaginationTraits.h>
 #include <aws/sagemaker-a2i-runtime/model/ListHumanLoopsRequest.h>
 #include <aws/sagemaker-a2i-runtime/model/ListHumanLoopsResult.h>
 #include <aws/sagemaker-a2i-runtime/model/SortOrder.h>
diff --git a/generated/tests/sagemaker-edge-gen-tests/SagemakerEdgeManagerIncludeTests.cpp b/generated/tests/sagemaker-edge-gen-tests/SagemakerEdgeManagerIncludeTests.cpp
index a1200d583a74..9ea33567c8a2 100644
--- a/generated/tests/sagemaker-edge-gen-tests/SagemakerEdgeManagerIncludeTests.cpp
+++ b/generated/tests/sagemaker-edge-gen-tests/SagemakerEdgeManagerIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/sagemaker-edge/SagemakerEdgeManagerEndpointProvider.h>
 #include <aws/sagemaker-edge/SagemakerEdgeManagerErrorMarshaller.h>
 #include <aws/sagemaker-edge/SagemakerEdgeManagerErrors.h>
+#include <aws/sagemaker-edge/SagemakerEdgeManagerPaginationBase.h>
 #include <aws/sagemaker-edge/SagemakerEdgeManagerRequest.h>
 #include <aws/sagemaker-edge/SagemakerEdgeManagerServiceClientModel.h>
+#include <aws/sagemaker-edge/SagemakerEdgeManagerWaiter.h>
 #include <aws/sagemaker-edge/SagemakerEdgeManager_EXPORTS.h>
+#include <aws/sagemaker-edge/internal/SagemakerEdgeManagerEndpointRules.h>
 #include <aws/sagemaker-edge/model/Checksum.h>
 #include <aws/sagemaker-edge/model/ChecksumType.h>
 #include <aws/sagemaker-edge/model/Definition.h>
diff --git a/generated/tests/sagemaker-featurestore-runtime-gen-tests/SageMakerFeatureStoreRuntimeIncludeTests.cpp b/generated/tests/sagemaker-featurestore-runtime-gen-tests/SageMakerFeatureStoreRuntimeIncludeTests.cpp
index 9dff458da4bc..872e74dda0ca 100644
--- a/generated/tests/sagemaker-featurestore-runtime-gen-tests/SageMakerFeatureStoreRuntimeIncludeTests.cpp
+++ b/generated/tests/sagemaker-featurestore-runtime-gen-tests/SageMakerFeatureStoreRuntimeIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/sagemaker-featurestore-runtime/SageMakerFeatureStoreRuntimeClient.h>
+#include <aws/sagemaker-featurestore-runtime/SageMakerFeatureStoreRuntimeClientPagination.h>
 #include <aws/sagemaker-featurestore-runtime/SageMakerFeatureStoreRuntimeEndpointProvider.h>
 #include <aws/sagemaker-featurestore-runtime/SageMakerFeatureStoreRuntimeErrorMarshaller.h>
 #include <aws/sagemaker-featurestore-runtime/SageMakerFeatureStoreRuntimeErrors.h>
+#include <aws/sagemaker-featurestore-runtime/SageMakerFeatureStoreRuntimePaginationBase.h>
 #include <aws/sagemaker-featurestore-runtime/SageMakerFeatureStoreRuntimeRequest.h>
 #include <aws/sagemaker-featurestore-runtime/SageMakerFeatureStoreRuntimeServiceClientModel.h>
+#include <aws/sagemaker-featurestore-runtime/SageMakerFeatureStoreRuntimeWaiter.h>
 #include <aws/sagemaker-featurestore-runtime/SageMakerFeatureStoreRuntime_EXPORTS.h>
+#include <aws/sagemaker-featurestore-runtime/internal/SageMakerFeatureStoreRuntimeEndpointRules.h>
 #include <aws/sagemaker-featurestore-runtime/model/BatchGetRecordError.h>
 #include <aws/sagemaker-featurestore-runtime/model/BatchGetRecordIdentifier.h>
 #include <aws/sagemaker-featurestore-runtime/model/BatchGetRecordRequest.h>
@@ -28,6 +32,7 @@
 #include <aws/sagemaker-featurestore-runtime/model/FeatureValue.h>
 #include <aws/sagemaker-featurestore-runtime/model/GetRecordRequest.h>
 #include <aws/sagemaker-featurestore-runtime/model/GetRecordResult.h>
+#include <aws/sagemaker-featurestore-runtime/model/ListRecordsPaginationTraits.h>
 #include <aws/sagemaker-featurestore-runtime/model/ListRecordsRequest.h>
 #include <aws/sagemaker-featurestore-runtime/model/ListRecordsResult.h>
 #include <aws/sagemaker-featurestore-runtime/model/PutRecordRequest.h>
diff --git a/generated/tests/sagemaker-gen-tests/SageMakerIncludeTests.cpp b/generated/tests/sagemaker-gen-tests/SageMakerIncludeTests.cpp
index b0383c36578e..a46fa05e2787 100644
--- a/generated/tests/sagemaker-gen-tests/SageMakerIncludeTests.cpp
+++ b/generated/tests/sagemaker-gen-tests/SageMakerIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/sagemaker/SageMakerClient.h>
+#include <aws/sagemaker/SageMakerClientPagination.h>
 #include <aws/sagemaker/SageMakerEndpointProvider.h>
 #include <aws/sagemaker/SageMakerErrorMarshaller.h>
 #include <aws/sagemaker/SageMakerErrors.h>
+#include <aws/sagemaker/SageMakerPaginationBase.h>
 #include <aws/sagemaker/SageMakerRequest.h>
 #include <aws/sagemaker/SageMakerServiceClientModel.h>
+#include <aws/sagemaker/SageMakerWaiter.h>
 #include <aws/sagemaker/SageMaker_EXPORTS.h>
+#include <aws/sagemaker/internal/SageMakerEndpointRules.h>
 #include <aws/sagemaker/model/AIAdapterModelPackageEntry.h>
 #include <aws/sagemaker/model/AIAdapterS3Entry.h>
 #include <aws/sagemaker/model/AIAdapterSource.h>
@@ -388,6 +392,7 @@
 #include <aws/sagemaker/model/CreateFeatureGroupResult.h>
 #include <aws/sagemaker/model/CreateFlowDefinitionRequest.h>
 #include <aws/sagemaker/model/CreateFlowDefinitionResult.h>
+#include <aws/sagemaker/model/CreateHubContentPresignedUrlsPaginationTraits.h>
 #include <aws/sagemaker/model/CreateHubContentPresignedUrlsRequest.h>
 #include <aws/sagemaker/model/CreateHubContentPresignedUrlsResult.h>
 #include <aws/sagemaker/model/CreateHubContentReferenceRequest.h>
@@ -735,6 +740,7 @@
 #include <aws/sagemaker/model/DescribeSubscribedWorkteamResult.h>
 #include <aws/sagemaker/model/DescribeTrainingJobRequest.h>
 #include <aws/sagemaker/model/DescribeTrainingJobResult.h>
+#include <aws/sagemaker/model/DescribeTrainingPlanExtensionHistoryPaginationTraits.h>
 #include <aws/sagemaker/model/DescribeTrainingPlanExtensionHistoryRequest.h>
 #include <aws/sagemaker/model/DescribeTrainingPlanExtensionHistoryResult.h>
 #include <aws/sagemaker/model/DescribeTrainingPlanRequest.h>
@@ -1041,73 +1047,104 @@
 #include <aws/sagemaker/model/LineageGroupSummary.h>
 #include <aws/sagemaker/model/LineageMetadata.h>
 #include <aws/sagemaker/model/LineageType.h>
+#include <aws/sagemaker/model/ListAIBenchmarkJobsPaginationTraits.h>
 #include <aws/sagemaker/model/ListAIBenchmarkJobsRequest.h>
 #include <aws/sagemaker/model/ListAIBenchmarkJobsResult.h>
 #include <aws/sagemaker/model/ListAIBenchmarkJobsSortBy.h>
+#include <aws/sagemaker/model/ListAIRecommendationJobsPaginationTraits.h>
 #include <aws/sagemaker/model/ListAIRecommendationJobsRequest.h>
 #include <aws/sagemaker/model/ListAIRecommendationJobsResult.h>
 #include <aws/sagemaker/model/ListAIRecommendationJobsSortBy.h>
+#include <aws/sagemaker/model/ListAIWorkloadConfigsPaginationTraits.h>
 #include <aws/sagemaker/model/ListAIWorkloadConfigsRequest.h>
 #include <aws/sagemaker/model/ListAIWorkloadConfigsResult.h>
 #include <aws/sagemaker/model/ListAIWorkloadConfigsSortBy.h>
+#include <aws/sagemaker/model/ListActionsPaginationTraits.h>
 #include <aws/sagemaker/model/ListActionsRequest.h>
 #include <aws/sagemaker/model/ListActionsResult.h>
+#include <aws/sagemaker/model/ListAlgorithmsPaginationTraits.h>
 #include <aws/sagemaker/model/ListAlgorithmsRequest.h>
 #include <aws/sagemaker/model/ListAlgorithmsResult.h>
+#include <aws/sagemaker/model/ListAliasesPaginationTraits.h>
 #include <aws/sagemaker/model/ListAliasesRequest.h>
 #include <aws/sagemaker/model/ListAliasesResult.h>
+#include <aws/sagemaker/model/ListAppImageConfigsPaginationTraits.h>
 #include <aws/sagemaker/model/ListAppImageConfigsRequest.h>
 #include <aws/sagemaker/model/ListAppImageConfigsResult.h>
+#include <aws/sagemaker/model/ListAppsPaginationTraits.h>
 #include <aws/sagemaker/model/ListAppsRequest.h>
 #include <aws/sagemaker/model/ListAppsResult.h>
+#include <aws/sagemaker/model/ListArtifactsPaginationTraits.h>
 #include <aws/sagemaker/model/ListArtifactsRequest.h>
 #include <aws/sagemaker/model/ListArtifactsResult.h>
+#include <aws/sagemaker/model/ListAssociationsPaginationTraits.h>
 #include <aws/sagemaker/model/ListAssociationsRequest.h>
 #include <aws/sagemaker/model/ListAssociationsResult.h>
+#include <aws/sagemaker/model/ListAutoMLJobsPaginationTraits.h>
 #include <aws/sagemaker/model/ListAutoMLJobsRequest.h>
 #include <aws/sagemaker/model/ListAutoMLJobsResult.h>
+#include <aws/sagemaker/model/ListCandidatesForAutoMLJobPaginationTraits.h>
 #include <aws/sagemaker/model/ListCandidatesForAutoMLJobRequest.h>
 #include <aws/sagemaker/model/ListCandidatesForAutoMLJobResult.h>
+#include <aws/sagemaker/model/ListClusterEventsPaginationTraits.h>
 #include <aws/sagemaker/model/ListClusterEventsRequest.h>
 #include <aws/sagemaker/model/ListClusterEventsResult.h>
+#include <aws/sagemaker/model/ListClusterNodesPaginationTraits.h>
 #include <aws/sagemaker/model/ListClusterNodesRequest.h>
 #include <aws/sagemaker/model/ListClusterNodesResult.h>
+#include <aws/sagemaker/model/ListClusterSchedulerConfigsPaginationTraits.h>
 #include <aws/sagemaker/model/ListClusterSchedulerConfigsRequest.h>
 #include <aws/sagemaker/model/ListClusterSchedulerConfigsResult.h>
+#include <aws/sagemaker/model/ListClustersPaginationTraits.h>
 #include <aws/sagemaker/model/ListClustersRequest.h>
 #include <aws/sagemaker/model/ListClustersResult.h>
+#include <aws/sagemaker/model/ListCodeRepositoriesPaginationTraits.h>
 #include <aws/sagemaker/model/ListCodeRepositoriesRequest.h>
 #include <aws/sagemaker/model/ListCodeRepositoriesResult.h>
+#include <aws/sagemaker/model/ListCompilationJobsPaginationTraits.h>
 #include <aws/sagemaker/model/ListCompilationJobsRequest.h>
 #include <aws/sagemaker/model/ListCompilationJobsResult.h>
 #include <aws/sagemaker/model/ListCompilationJobsSortBy.h>
+#include <aws/sagemaker/model/ListComputeQuotasPaginationTraits.h>
 #include <aws/sagemaker/model/ListComputeQuotasRequest.h>
 #include <aws/sagemaker/model/ListComputeQuotasResult.h>
+#include <aws/sagemaker/model/ListContextsPaginationTraits.h>
 #include <aws/sagemaker/model/ListContextsRequest.h>
 #include <aws/sagemaker/model/ListContextsResult.h>
+#include <aws/sagemaker/model/ListDataQualityJobDefinitionsPaginationTraits.h>
 #include <aws/sagemaker/model/ListDataQualityJobDefinitionsRequest.h>
 #include <aws/sagemaker/model/ListDataQualityJobDefinitionsResult.h>
+#include <aws/sagemaker/model/ListDeviceFleetsPaginationTraits.h>
 #include <aws/sagemaker/model/ListDeviceFleetsRequest.h>
 #include <aws/sagemaker/model/ListDeviceFleetsResult.h>
 #include <aws/sagemaker/model/ListDeviceFleetsSortBy.h>
+#include <aws/sagemaker/model/ListDevicesPaginationTraits.h>
 #include <aws/sagemaker/model/ListDevicesRequest.h>
 #include <aws/sagemaker/model/ListDevicesResult.h>
+#include <aws/sagemaker/model/ListDomainsPaginationTraits.h>
 #include <aws/sagemaker/model/ListDomainsRequest.h>
 #include <aws/sagemaker/model/ListDomainsResult.h>
+#include <aws/sagemaker/model/ListEdgeDeploymentPlansPaginationTraits.h>
 #include <aws/sagemaker/model/ListEdgeDeploymentPlansRequest.h>
 #include <aws/sagemaker/model/ListEdgeDeploymentPlansResult.h>
 #include <aws/sagemaker/model/ListEdgeDeploymentPlansSortBy.h>
+#include <aws/sagemaker/model/ListEdgePackagingJobsPaginationTraits.h>
 #include <aws/sagemaker/model/ListEdgePackagingJobsRequest.h>
 #include <aws/sagemaker/model/ListEdgePackagingJobsResult.h>
 #include <aws/sagemaker/model/ListEdgePackagingJobsSortBy.h>
+#include <aws/sagemaker/model/ListEndpointConfigsPaginationTraits.h>
 #include <aws/sagemaker/model/ListEndpointConfigsRequest.h>
 #include <aws/sagemaker/model/ListEndpointConfigsResult.h>
+#include <aws/sagemaker/model/ListEndpointsPaginationTraits.h>
 #include <aws/sagemaker/model/ListEndpointsRequest.h>
 #include <aws/sagemaker/model/ListEndpointsResult.h>
+#include <aws/sagemaker/model/ListExperimentsPaginationTraits.h>
 #include <aws/sagemaker/model/ListExperimentsRequest.h>
 #include <aws/sagemaker/model/ListExperimentsResult.h>
+#include <aws/sagemaker/model/ListFeatureGroupsPaginationTraits.h>
 #include <aws/sagemaker/model/ListFeatureGroupsRequest.h>
 #include <aws/sagemaker/model/ListFeatureGroupsResult.h>
+#include <aws/sagemaker/model/ListFlowDefinitionsPaginationTraits.h>
 #include <aws/sagemaker/model/ListFlowDefinitionsRequest.h>
 #include <aws/sagemaker/model/ListFlowDefinitionsResult.h>
 #include <aws/sagemaker/model/ListHubContentVersionsRequest.h>
@@ -1116,120 +1153,176 @@
 #include <aws/sagemaker/model/ListHubContentsResult.h>
 #include <aws/sagemaker/model/ListHubsRequest.h>
 #include <aws/sagemaker/model/ListHubsResult.h>
+#include <aws/sagemaker/model/ListHumanTaskUisPaginationTraits.h>
 #include <aws/sagemaker/model/ListHumanTaskUisRequest.h>
 #include <aws/sagemaker/model/ListHumanTaskUisResult.h>
+#include <aws/sagemaker/model/ListHyperParameterTuningJobsPaginationTraits.h>
 #include <aws/sagemaker/model/ListHyperParameterTuningJobsRequest.h>
 #include <aws/sagemaker/model/ListHyperParameterTuningJobsResult.h>
+#include <aws/sagemaker/model/ListImageVersionsPaginationTraits.h>
 #include <aws/sagemaker/model/ListImageVersionsRequest.h>
 #include <aws/sagemaker/model/ListImageVersionsResult.h>
+#include <aws/sagemaker/model/ListImagesPaginationTraits.h>
 #include <aws/sagemaker/model/ListImagesRequest.h>
 #include <aws/sagemaker/model/ListImagesResult.h>
+#include <aws/sagemaker/model/ListInferenceComponentsPaginationTraits.h>
 #include <aws/sagemaker/model/ListInferenceComponentsRequest.h>
 #include <aws/sagemaker/model/ListInferenceComponentsResult.h>
+#include <aws/sagemaker/model/ListInferenceExperimentsPaginationTraits.h>
 #include <aws/sagemaker/model/ListInferenceExperimentsRequest.h>
 #include <aws/sagemaker/model/ListInferenceExperimentsResult.h>
+#include <aws/sagemaker/model/ListInferenceRecommendationsJobStepsPaginationTraits.h>
 #include <aws/sagemaker/model/ListInferenceRecommendationsJobStepsRequest.h>
 #include <aws/sagemaker/model/ListInferenceRecommendationsJobStepsResult.h>
+#include <aws/sagemaker/model/ListInferenceRecommendationsJobsPaginationTraits.h>
 #include <aws/sagemaker/model/ListInferenceRecommendationsJobsRequest.h>
 #include <aws/sagemaker/model/ListInferenceRecommendationsJobsResult.h>
 #include <aws/sagemaker/model/ListInferenceRecommendationsJobsSortBy.h>
+#include <aws/sagemaker/model/ListJobSchemaVersionsPaginationTraits.h>
 #include <aws/sagemaker/model/ListJobSchemaVersionsRequest.h>
 #include <aws/sagemaker/model/ListJobSchemaVersionsResult.h>
+#include <aws/sagemaker/model/ListJobsPaginationTraits.h>
 #include <aws/sagemaker/model/ListJobsRequest.h>
 #include <aws/sagemaker/model/ListJobsResult.h>
+#include <aws/sagemaker/model/ListLabelingJobsForWorkteamPaginationTraits.h>
 #include <aws/sagemaker/model/ListLabelingJobsForWorkteamRequest.h>
 #include <aws/sagemaker/model/ListLabelingJobsForWorkteamResult.h>
 #include <aws/sagemaker/model/ListLabelingJobsForWorkteamSortByOptions.h>
+#include <aws/sagemaker/model/ListLabelingJobsPaginationTraits.h>
 #include <aws/sagemaker/model/ListLabelingJobsRequest.h>
 #include <aws/sagemaker/model/ListLabelingJobsResult.h>
+#include <aws/sagemaker/model/ListLineageGroupsPaginationTraits.h>
 #include <aws/sagemaker/model/ListLineageGroupsRequest.h>
 #include <aws/sagemaker/model/ListLineageGroupsResult.h>
+#include <aws/sagemaker/model/ListMlflowAppsPaginationTraits.h>
 #include <aws/sagemaker/model/ListMlflowAppsRequest.h>
 #include <aws/sagemaker/model/ListMlflowAppsResult.h>
+#include <aws/sagemaker/model/ListMlflowTrackingServersPaginationTraits.h>
 #include <aws/sagemaker/model/ListMlflowTrackingServersRequest.h>
 #include <aws/sagemaker/model/ListMlflowTrackingServersResult.h>
+#include <aws/sagemaker/model/ListModelBiasJobDefinitionsPaginationTraits.h>
 #include <aws/sagemaker/model/ListModelBiasJobDefinitionsRequest.h>
 #include <aws/sagemaker/model/ListModelBiasJobDefinitionsResult.h>
+#include <aws/sagemaker/model/ListModelCardExportJobsPaginationTraits.h>
 #include <aws/sagemaker/model/ListModelCardExportJobsRequest.h>
 #include <aws/sagemaker/model/ListModelCardExportJobsResult.h>
+#include <aws/sagemaker/model/ListModelCardVersionsPaginationTraits.h>
 #include <aws/sagemaker/model/ListModelCardVersionsRequest.h>
 #include <aws/sagemaker/model/ListModelCardVersionsResult.h>
+#include <aws/sagemaker/model/ListModelCardsPaginationTraits.h>
 #include <aws/sagemaker/model/ListModelCardsRequest.h>
 #include <aws/sagemaker/model/ListModelCardsResult.h>
+#include <aws/sagemaker/model/ListModelExplainabilityJobDefinitionsPaginationTraits.h>
 #include <aws/sagemaker/model/ListModelExplainabilityJobDefinitionsRequest.h>
 #include <aws/sagemaker/model/ListModelExplainabilityJobDefinitionsResult.h>
+#include <aws/sagemaker/model/ListModelMetadataPaginationTraits.h>
 #include <aws/sagemaker/model/ListModelMetadataRequest.h>
 #include <aws/sagemaker/model/ListModelMetadataResult.h>
+#include <aws/sagemaker/model/ListModelPackageGroupsPaginationTraits.h>
 #include <aws/sagemaker/model/ListModelPackageGroupsRequest.h>
 #include <aws/sagemaker/model/ListModelPackageGroupsResult.h>
+#include <aws/sagemaker/model/ListModelPackagesPaginationTraits.h>
 #include <aws/sagemaker/model/ListModelPackagesRequest.h>
 #include <aws/sagemaker/model/ListModelPackagesResult.h>
+#include <aws/sagemaker/model/ListModelQualityJobDefinitionsPaginationTraits.h>
 #include <aws/sagemaker/model/ListModelQualityJobDefinitionsRequest.h>
 #include <aws/sagemaker/model/ListModelQualityJobDefinitionsResult.h>
+#include <aws/sagemaker/model/ListModelsPaginationTraits.h>
 #include <aws/sagemaker/model/ListModelsRequest.h>
 #include <aws/sagemaker/model/ListModelsResult.h>
+#include <aws/sagemaker/model/ListMonitoringAlertHistoryPaginationTraits.h>
 #include <aws/sagemaker/model/ListMonitoringAlertHistoryRequest.h>
 #include <aws/sagemaker/model/ListMonitoringAlertHistoryResult.h>
+#include <aws/sagemaker/model/ListMonitoringAlertsPaginationTraits.h>
 #include <aws/sagemaker/model/ListMonitoringAlertsRequest.h>
 #include <aws/sagemaker/model/ListMonitoringAlertsResult.h>
+#include <aws/sagemaker/model/ListMonitoringExecutionsPaginationTraits.h>
 #include <aws/sagemaker/model/ListMonitoringExecutionsRequest.h>
 #include <aws/sagemaker/model/ListMonitoringExecutionsResult.h>
+#include <aws/sagemaker/model/ListMonitoringSchedulesPaginationTraits.h>
 #include <aws/sagemaker/model/ListMonitoringSchedulesRequest.h>
 #include <aws/sagemaker/model/ListMonitoringSchedulesResult.h>
+#include <aws/sagemaker/model/ListNotebookInstanceLifecycleConfigsPaginationTraits.h>
 #include <aws/sagemaker/model/ListNotebookInstanceLifecycleConfigsRequest.h>
 #include <aws/sagemaker/model/ListNotebookInstanceLifecycleConfigsResult.h>
+#include <aws/sagemaker/model/ListNotebookInstancesPaginationTraits.h>
 #include <aws/sagemaker/model/ListNotebookInstancesRequest.h>
 #include <aws/sagemaker/model/ListNotebookInstancesResult.h>
+#include <aws/sagemaker/model/ListOptimizationJobsPaginationTraits.h>
 #include <aws/sagemaker/model/ListOptimizationJobsRequest.h>
 #include <aws/sagemaker/model/ListOptimizationJobsResult.h>
 #include <aws/sagemaker/model/ListOptimizationJobsSortBy.h>
+#include <aws/sagemaker/model/ListPartnerAppsPaginationTraits.h>
 #include <aws/sagemaker/model/ListPartnerAppsRequest.h>
 #include <aws/sagemaker/model/ListPartnerAppsResult.h>
+#include <aws/sagemaker/model/ListPipelineExecutionStepsPaginationTraits.h>
 #include <aws/sagemaker/model/ListPipelineExecutionStepsRequest.h>
 #include <aws/sagemaker/model/ListPipelineExecutionStepsResult.h>
+#include <aws/sagemaker/model/ListPipelineExecutionsPaginationTraits.h>
 #include <aws/sagemaker/model/ListPipelineExecutionsRequest.h>
 #include <aws/sagemaker/model/ListPipelineExecutionsResult.h>
+#include <aws/sagemaker/model/ListPipelineParametersForExecutionPaginationTraits.h>
 #include <aws/sagemaker/model/ListPipelineParametersForExecutionRequest.h>
 #include <aws/sagemaker/model/ListPipelineParametersForExecutionResult.h>
+#include <aws/sagemaker/model/ListPipelineVersionsPaginationTraits.h>
 #include <aws/sagemaker/model/ListPipelineVersionsRequest.h>
 #include <aws/sagemaker/model/ListPipelineVersionsResult.h>
+#include <aws/sagemaker/model/ListPipelinesPaginationTraits.h>
 #include <aws/sagemaker/model/ListPipelinesRequest.h>
 #include <aws/sagemaker/model/ListPipelinesResult.h>
+#include <aws/sagemaker/model/ListProcessingJobsPaginationTraits.h>
 #include <aws/sagemaker/model/ListProcessingJobsRequest.h>
 #include <aws/sagemaker/model/ListProcessingJobsResult.h>
+#include <aws/sagemaker/model/ListProjectsPaginationTraits.h>
 #include <aws/sagemaker/model/ListProjectsRequest.h>
 #include <aws/sagemaker/model/ListProjectsResult.h>
+#include <aws/sagemaker/model/ListResourceCatalogsPaginationTraits.h>
 #include <aws/sagemaker/model/ListResourceCatalogsRequest.h>
 #include <aws/sagemaker/model/ListResourceCatalogsResult.h>
+#include <aws/sagemaker/model/ListSpacesPaginationTraits.h>
 #include <aws/sagemaker/model/ListSpacesRequest.h>
 #include <aws/sagemaker/model/ListSpacesResult.h>
+#include <aws/sagemaker/model/ListStageDevicesPaginationTraits.h>
 #include <aws/sagemaker/model/ListStageDevicesRequest.h>
 #include <aws/sagemaker/model/ListStageDevicesResult.h>
+#include <aws/sagemaker/model/ListStudioLifecycleConfigsPaginationTraits.h>
 #include <aws/sagemaker/model/ListStudioLifecycleConfigsRequest.h>
 #include <aws/sagemaker/model/ListStudioLifecycleConfigsResult.h>
+#include <aws/sagemaker/model/ListSubscribedWorkteamsPaginationTraits.h>
 #include <aws/sagemaker/model/ListSubscribedWorkteamsRequest.h>
 #include <aws/sagemaker/model/ListSubscribedWorkteamsResult.h>
+#include <aws/sagemaker/model/ListTagsPaginationTraits.h>
 #include <aws/sagemaker/model/ListTagsRequest.h>
 #include <aws/sagemaker/model/ListTagsResult.h>
+#include <aws/sagemaker/model/ListTrainingJobsForHyperParameterTuningJobPaginationTraits.h>
 #include <aws/sagemaker/model/ListTrainingJobsForHyperParameterTuningJobRequest.h>
 #include <aws/sagemaker/model/ListTrainingJobsForHyperParameterTuningJobResult.h>
+#include <aws/sagemaker/model/ListTrainingJobsPaginationTraits.h>
 #include <aws/sagemaker/model/ListTrainingJobsRequest.h>
 #include <aws/sagemaker/model/ListTrainingJobsResult.h>
+#include <aws/sagemaker/model/ListTrainingPlansPaginationTraits.h>
 #include <aws/sagemaker/model/ListTrainingPlansRequest.h>
 #include <aws/sagemaker/model/ListTrainingPlansResult.h>
+#include <aws/sagemaker/model/ListTransformJobsPaginationTraits.h>
 #include <aws/sagemaker/model/ListTransformJobsRequest.h>
 #include <aws/sagemaker/model/ListTransformJobsResult.h>
+#include <aws/sagemaker/model/ListTrialComponentsPaginationTraits.h>
 #include <aws/sagemaker/model/ListTrialComponentsRequest.h>
 #include <aws/sagemaker/model/ListTrialComponentsResult.h>
+#include <aws/sagemaker/model/ListTrialsPaginationTraits.h>
 #include <aws/sagemaker/model/ListTrialsRequest.h>
 #include <aws/sagemaker/model/ListTrialsResult.h>
+#include <aws/sagemaker/model/ListUltraServersByReservedCapacityPaginationTraits.h>
 #include <aws/sagemaker/model/ListUltraServersByReservedCapacityRequest.h>
 #include <aws/sagemaker/model/ListUltraServersByReservedCapacityResult.h>
+#include <aws/sagemaker/model/ListUserProfilesPaginationTraits.h>
 #include <aws/sagemaker/model/ListUserProfilesRequest.h>
 #include <aws/sagemaker/model/ListUserProfilesResult.h>
+#include <aws/sagemaker/model/ListWorkforcesPaginationTraits.h>
 #include <aws/sagemaker/model/ListWorkforcesRequest.h>
 #include <aws/sagemaker/model/ListWorkforcesResult.h>
 #include <aws/sagemaker/model/ListWorkforcesSortByOptions.h>
+#include <aws/sagemaker/model/ListWorkteamsPaginationTraits.h>
 #include <aws/sagemaker/model/ListWorkteamsRequest.h>
 #include <aws/sagemaker/model/ListWorkteamsResult.h>
 #include <aws/sagemaker/model/ListWorkteamsSortByOptions.h>
@@ -1510,6 +1603,7 @@
 #include <aws/sagemaker/model/PutModelPackageGroupPolicyResult.h>
 #include <aws/sagemaker/model/QualityCheckStepMetadata.h>
 #include <aws/sagemaker/model/QueryFilters.h>
+#include <aws/sagemaker/model/QueryLineagePaginationTraits.h>
 #include <aws/sagemaker/model/QueryLineageRequest.h>
 #include <aws/sagemaker/model/QueryLineageResult.h>
 #include <aws/sagemaker/model/RSessionAppSettings.h>
@@ -1599,6 +1693,7 @@
 #include <aws/sagemaker/model/SchedulerConfigComponent.h>
 #include <aws/sagemaker/model/SchedulerResourceStatus.h>
 #include <aws/sagemaker/model/SearchExpression.h>
+#include <aws/sagemaker/model/SearchPaginationTraits.h>
 #include <aws/sagemaker/model/SearchRecord.h>
 #include <aws/sagemaker/model/SearchRequest.h>
 #include <aws/sagemaker/model/SearchResult.h>
diff --git a/generated/tests/sagemaker-geospatial-gen-tests/SageMakerGeospatialIncludeTests.cpp b/generated/tests/sagemaker-geospatial-gen-tests/SageMakerGeospatialIncludeTests.cpp
index e42c193d8e92..01ea977976cb 100644
--- a/generated/tests/sagemaker-geospatial-gen-tests/SageMakerGeospatialIncludeTests.cpp
+++ b/generated/tests/sagemaker-geospatial-gen-tests/SageMakerGeospatialIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/sagemaker-geospatial/SageMakerGeospatialClient.h>
+#include <aws/sagemaker-geospatial/SageMakerGeospatialClientPagination.h>
 #include <aws/sagemaker-geospatial/SageMakerGeospatialEndpointProvider.h>
 #include <aws/sagemaker-geospatial/SageMakerGeospatialErrorMarshaller.h>
 #include <aws/sagemaker-geospatial/SageMakerGeospatialErrors.h>
+#include <aws/sagemaker-geospatial/SageMakerGeospatialPaginationBase.h>
 #include <aws/sagemaker-geospatial/SageMakerGeospatialRequest.h>
 #include <aws/sagemaker-geospatial/SageMakerGeospatialServiceClientModel.h>
+#include <aws/sagemaker-geospatial/SageMakerGeospatialWaiter.h>
 #include <aws/sagemaker-geospatial/SageMakerGeospatial_EXPORTS.h>
+#include <aws/sagemaker-geospatial/internal/SageMakerGeospatialEndpointRules.h>
 #include <aws/sagemaker-geospatial/model/AlgorithmNameCloudRemoval.h>
 #include <aws/sagemaker-geospatial/model/AlgorithmNameGeoMosaic.h>
 #include <aws/sagemaker-geospatial/model/AlgorithmNameResampling.h>
@@ -64,13 +68,16 @@
 #include <aws/sagemaker-geospatial/model/LandCoverSegmentationConfigInput.h>
 #include <aws/sagemaker-geospatial/model/LandsatCloudCoverLandInput.h>
 #include <aws/sagemaker-geospatial/model/ListEarthObservationJobOutputConfig.h>
+#include <aws/sagemaker-geospatial/model/ListEarthObservationJobsPaginationTraits.h>
 #include <aws/sagemaker-geospatial/model/ListEarthObservationJobsRequest.h>
 #include <aws/sagemaker-geospatial/model/ListEarthObservationJobsResult.h>
+#include <aws/sagemaker-geospatial/model/ListRasterDataCollectionsPaginationTraits.h>
 #include <aws/sagemaker-geospatial/model/ListRasterDataCollectionsRequest.h>
 #include <aws/sagemaker-geospatial/model/ListRasterDataCollectionsResult.h>
 #include <aws/sagemaker-geospatial/model/ListTagsForResourceRequest.h>
 #include <aws/sagemaker-geospatial/model/ListTagsForResourceResult.h>
 #include <aws/sagemaker-geospatial/model/ListVectorEnrichmentJobOutputConfig.h>
+#include <aws/sagemaker-geospatial/model/ListVectorEnrichmentJobsPaginationTraits.h>
 #include <aws/sagemaker-geospatial/model/ListVectorEnrichmentJobsRequest.h>
 #include <aws/sagemaker-geospatial/model/ListVectorEnrichmentJobsResult.h>
 #include <aws/sagemaker-geospatial/model/LogicalOperator.h>
@@ -96,6 +103,7 @@
 #include <aws/sagemaker-geospatial/model/ResamplingConfigInput.h>
 #include <aws/sagemaker-geospatial/model/ResourceNotFoundException.h>
 #include <aws/sagemaker-geospatial/model/ReverseGeocodingConfig.h>
+#include <aws/sagemaker-geospatial/model/SearchRasterDataCollectionPaginationTraits.h>
 #include <aws/sagemaker-geospatial/model/SearchRasterDataCollectionRequest.h>
 #include <aws/sagemaker-geospatial/model/SearchRasterDataCollectionResult.h>
 #include <aws/sagemaker-geospatial/model/ServiceQuotaExceededException.h>
diff --git a/generated/tests/sagemaker-metrics-gen-tests/SageMakerMetricsIncludeTests.cpp b/generated/tests/sagemaker-metrics-gen-tests/SageMakerMetricsIncludeTests.cpp
index a6c0b6fc334c..64da9645a746 100644
--- a/generated/tests/sagemaker-metrics-gen-tests/SageMakerMetricsIncludeTests.cpp
+++ b/generated/tests/sagemaker-metrics-gen-tests/SageMakerMetricsIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/sagemaker-metrics/SageMakerMetricsEndpointProvider.h>
 #include <aws/sagemaker-metrics/SageMakerMetricsErrorMarshaller.h>
 #include <aws/sagemaker-metrics/SageMakerMetricsErrors.h>
+#include <aws/sagemaker-metrics/SageMakerMetricsPaginationBase.h>
 #include <aws/sagemaker-metrics/SageMakerMetricsRequest.h>
 #include <aws/sagemaker-metrics/SageMakerMetricsServiceClientModel.h>
+#include <aws/sagemaker-metrics/SageMakerMetricsWaiter.h>
 #include <aws/sagemaker-metrics/SageMakerMetrics_EXPORTS.h>
+#include <aws/sagemaker-metrics/internal/SageMakerMetricsEndpointRules.h>
 #include <aws/sagemaker-metrics/model/BatchGetMetricsRequest.h>
 #include <aws/sagemaker-metrics/model/BatchGetMetricsResult.h>
 #include <aws/sagemaker-metrics/model/BatchPutMetricsError.h>
diff --git a/generated/tests/sagemaker-runtime-gen-tests/SageMakerRuntimeIncludeTests.cpp b/generated/tests/sagemaker-runtime-gen-tests/SageMakerRuntimeIncludeTests.cpp
index 21972d5f3683..6440f946fbc9 100644
--- a/generated/tests/sagemaker-runtime-gen-tests/SageMakerRuntimeIncludeTests.cpp
+++ b/generated/tests/sagemaker-runtime-gen-tests/SageMakerRuntimeIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/sagemaker-runtime/SageMakerRuntimeEndpointProvider.h>
 #include <aws/sagemaker-runtime/SageMakerRuntimeErrorMarshaller.h>
 #include <aws/sagemaker-runtime/SageMakerRuntimeErrors.h>
+#include <aws/sagemaker-runtime/SageMakerRuntimePaginationBase.h>
 #include <aws/sagemaker-runtime/SageMakerRuntimeRequest.h>
 #include <aws/sagemaker-runtime/SageMakerRuntimeServiceClientModel.h>
+#include <aws/sagemaker-runtime/SageMakerRuntimeWaiter.h>
 #include <aws/sagemaker-runtime/SageMakerRuntime_EXPORTS.h>
+#include <aws/sagemaker-runtime/internal/SageMakerRuntimeEndpointRules.h>
 #include <aws/sagemaker-runtime/model/InvokeEndpointAsyncRequest.h>
 #include <aws/sagemaker-runtime/model/InvokeEndpointAsyncResult.h>
 #include <aws/sagemaker-runtime/model/InvokeEndpointRequest.h>
diff --git a/generated/tests/sagemaker-runtime-http2-gen-tests/SageMakerRuntimeHTTP2IncludeTests.cpp b/generated/tests/sagemaker-runtime-http2-gen-tests/SageMakerRuntimeHTTP2IncludeTests.cpp
index 358c9598ad20..2917b4c30b5b 100644
--- a/generated/tests/sagemaker-runtime-http2-gen-tests/SageMakerRuntimeHTTP2IncludeTests.cpp
+++ b/generated/tests/sagemaker-runtime-http2-gen-tests/SageMakerRuntimeHTTP2IncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/sagemaker-runtime-http2/SageMakerRuntimeHTTP2EndpointProvider.h>
 #include <aws/sagemaker-runtime-http2/SageMakerRuntimeHTTP2ErrorMarshaller.h>
 #include <aws/sagemaker-runtime-http2/SageMakerRuntimeHTTP2Errors.h>
+#include <aws/sagemaker-runtime-http2/SageMakerRuntimeHTTP2PaginationBase.h>
 #include <aws/sagemaker-runtime-http2/SageMakerRuntimeHTTP2Request.h>
 #include <aws/sagemaker-runtime-http2/SageMakerRuntimeHTTP2ServiceClientModel.h>
+#include <aws/sagemaker-runtime-http2/SageMakerRuntimeHTTP2Waiter.h>
 #include <aws/sagemaker-runtime-http2/SageMakerRuntimeHTTP2_EXPORTS.h>
+#include <aws/sagemaker-runtime-http2/internal/SageMakerRuntimeHTTP2EndpointRules.h>
 #include <aws/sagemaker-runtime-http2/model/InputValidationError.h>
 #include <aws/sagemaker-runtime-http2/model/InternalServerError.h>
 #include <aws/sagemaker-runtime-http2/model/InvokeEndpointWithBidirectionalStreamHandler.h>
diff --git a/generated/tests/sagemakerjobruntime-gen-tests/SagemakerJobRuntimeIncludeTests.cpp b/generated/tests/sagemakerjobruntime-gen-tests/SagemakerJobRuntimeIncludeTests.cpp
index b94e0fd702e6..8a8561a9c8df 100644
--- a/generated/tests/sagemakerjobruntime-gen-tests/SagemakerJobRuntimeIncludeTests.cpp
+++ b/generated/tests/sagemakerjobruntime-gen-tests/SagemakerJobRuntimeIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/sagemakerjobruntime/SagemakerJobRuntimeEndpointProvider.h>
 #include <aws/sagemakerjobruntime/SagemakerJobRuntimeErrorMarshaller.h>
 #include <aws/sagemakerjobruntime/SagemakerJobRuntimeErrors.h>
+#include <aws/sagemakerjobruntime/SagemakerJobRuntimePaginationBase.h>
 #include <aws/sagemakerjobruntime/SagemakerJobRuntimeRequest.h>
 #include <aws/sagemakerjobruntime/SagemakerJobRuntimeServiceClientModel.h>
+#include <aws/sagemakerjobruntime/SagemakerJobRuntimeWaiter.h>
 #include <aws/sagemakerjobruntime/SagemakerJobRuntime_EXPORTS.h>
+#include <aws/sagemakerjobruntime/internal/SagemakerJobRuntimeEndpointRules.h>
 #include <aws/sagemakerjobruntime/model/CompleteRolloutRequest.h>
 #include <aws/sagemakerjobruntime/model/CompleteRolloutResult.h>
 #include <aws/sagemakerjobruntime/model/CompletionStatus.h>
diff --git a/generated/tests/savingsplans-gen-tests/SavingsPlansIncludeTests.cpp b/generated/tests/savingsplans-gen-tests/SavingsPlansIncludeTests.cpp
index d4760069b5c7..7700f6b2a436 100644
--- a/generated/tests/savingsplans-gen-tests/SavingsPlansIncludeTests.cpp
+++ b/generated/tests/savingsplans-gen-tests/SavingsPlansIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/savingsplans/SavingsPlansEndpointProvider.h>
 #include <aws/savingsplans/SavingsPlansErrorMarshaller.h>
 #include <aws/savingsplans/SavingsPlansErrors.h>
+#include <aws/savingsplans/SavingsPlansPaginationBase.h>
 #include <aws/savingsplans/SavingsPlansRequest.h>
 #include <aws/savingsplans/SavingsPlansServiceClientModel.h>
+#include <aws/savingsplans/SavingsPlansWaiter.h>
 #include <aws/savingsplans/SavingsPlans_EXPORTS.h>
+#include <aws/savingsplans/internal/SavingsPlansEndpointRules.h>
 #include <aws/savingsplans/model/CreateSavingsPlanRequest.h>
 #include <aws/savingsplans/model/CreateSavingsPlanResult.h>
 #include <aws/savingsplans/model/CurrencyCode.h>
diff --git a/generated/tests/scheduler-gen-tests/SchedulerIncludeTests.cpp b/generated/tests/scheduler-gen-tests/SchedulerIncludeTests.cpp
index 72c5443eddf4..f5211cdaac75 100644
--- a/generated/tests/scheduler-gen-tests/SchedulerIncludeTests.cpp
+++ b/generated/tests/scheduler-gen-tests/SchedulerIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/scheduler/SchedulerClient.h>
+#include <aws/scheduler/SchedulerClientPagination.h>
 #include <aws/scheduler/SchedulerEndpointProvider.h>
 #include <aws/scheduler/SchedulerErrorMarshaller.h>
 #include <aws/scheduler/SchedulerErrors.h>
+#include <aws/scheduler/SchedulerPaginationBase.h>
 #include <aws/scheduler/SchedulerRequest.h>
 #include <aws/scheduler/SchedulerServiceClientModel.h>
+#include <aws/scheduler/SchedulerWaiter.h>
 #include <aws/scheduler/Scheduler_EXPORTS.h>
+#include <aws/scheduler/internal/SchedulerEndpointRules.h>
 #include <aws/scheduler/model/ActionAfterCompletion.h>
 #include <aws/scheduler/model/AssignPublicIp.h>
 #include <aws/scheduler/model/AwsVpcConfiguration.h>
@@ -36,8 +40,10 @@
 #include <aws/scheduler/model/GetScheduleResult.h>
 #include <aws/scheduler/model/KinesisParameters.h>
 #include <aws/scheduler/model/LaunchType.h>
+#include <aws/scheduler/model/ListScheduleGroupsPaginationTraits.h>
 #include <aws/scheduler/model/ListScheduleGroupsRequest.h>
 #include <aws/scheduler/model/ListScheduleGroupsResult.h>
+#include <aws/scheduler/model/ListSchedulesPaginationTraits.h>
 #include <aws/scheduler/model/ListSchedulesRequest.h>
 #include <aws/scheduler/model/ListSchedulesResult.h>
 #include <aws/scheduler/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/schemas-gen-tests/SchemasIncludeTests.cpp b/generated/tests/schemas-gen-tests/SchemasIncludeTests.cpp
index 3ab8cf9fe9d5..65a17faf082e 100644
--- a/generated/tests/schemas-gen-tests/SchemasIncludeTests.cpp
+++ b/generated/tests/schemas-gen-tests/SchemasIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/schemas/SchemasClient.h>
+#include <aws/schemas/SchemasClientPagination.h>
 #include <aws/schemas/SchemasEndpointProvider.h>
 #include <aws/schemas/SchemasErrorMarshaller.h>
 #include <aws/schemas/SchemasErrors.h>
+#include <aws/schemas/SchemasPaginationBase.h>
 #include <aws/schemas/SchemasRequest.h>
 #include <aws/schemas/SchemasServiceClientModel.h>
+#include <aws/schemas/SchemasWaiter.h>
 #include <aws/schemas/Schemas_EXPORTS.h>
+#include <aws/schemas/internal/SchemasEndpointRules.h>
 #include <aws/schemas/model/BadRequestException.h>
 #include <aws/schemas/model/CodeGenerationStatus.h>
 #include <aws/schemas/model/ConflictException.h>
@@ -48,12 +52,16 @@
 #include <aws/schemas/model/GetResourcePolicyResult.h>
 #include <aws/schemas/model/GoneException.h>
 #include <aws/schemas/model/InternalServerErrorException.h>
+#include <aws/schemas/model/ListDiscoverersPaginationTraits.h>
 #include <aws/schemas/model/ListDiscoverersRequest.h>
 #include <aws/schemas/model/ListDiscoverersResult.h>
+#include <aws/schemas/model/ListRegistriesPaginationTraits.h>
 #include <aws/schemas/model/ListRegistriesRequest.h>
 #include <aws/schemas/model/ListRegistriesResult.h>
+#include <aws/schemas/model/ListSchemaVersionsPaginationTraits.h>
 #include <aws/schemas/model/ListSchemaVersionsRequest.h>
 #include <aws/schemas/model/ListSchemaVersionsResult.h>
+#include <aws/schemas/model/ListSchemasPaginationTraits.h>
 #include <aws/schemas/model/ListSchemasRequest.h>
 #include <aws/schemas/model/ListSchemasResult.h>
 #include <aws/schemas/model/ListTagsForResourceRequest.h>
@@ -69,6 +77,7 @@
 #include <aws/schemas/model/SchemaVersionSummary.h>
 #include <aws/schemas/model/SearchSchemaSummary.h>
 #include <aws/schemas/model/SearchSchemaVersionSummary.h>
+#include <aws/schemas/model/SearchSchemasPaginationTraits.h>
 #include <aws/schemas/model/SearchSchemasRequest.h>
 #include <aws/schemas/model/SearchSchemasResult.h>
 #include <aws/schemas/model/ServiceUnavailableException.h>
diff --git a/generated/tests/sdb-gen-tests/SimpleDBIncludeTests.cpp b/generated/tests/sdb-gen-tests/SimpleDBIncludeTests.cpp
index 59cdcbe401c8..4a0f81131d80 100644
--- a/generated/tests/sdb-gen-tests/SimpleDBIncludeTests.cpp
+++ b/generated/tests/sdb-gen-tests/SimpleDBIncludeTests.cpp
@@ -10,8 +10,10 @@
 #include <aws/sdb/SimpleDBEndpointProvider.h>
 #include <aws/sdb/SimpleDBErrorMarshaller.h>
 #include <aws/sdb/SimpleDBErrors.h>
+#include <aws/sdb/SimpleDBPaginationBase.h>
 #include <aws/sdb/SimpleDBRequest.h>
 #include <aws/sdb/SimpleDBServiceClientModel.h>
+#include <aws/sdb/SimpleDBWaiter.h>
 #include <aws/sdb/SimpleDB_EXPORTS.h>
 #include <aws/sdb/internal/SimpleDBEndpointRules.h>
 #include <aws/sdb/model/Attribute.h>
diff --git a/generated/tests/secretsmanager-gen-tests/SecretsManagerIncludeTests.cpp b/generated/tests/secretsmanager-gen-tests/SecretsManagerIncludeTests.cpp
index ff24dfa57ad0..34bd1ade3336 100644
--- a/generated/tests/secretsmanager-gen-tests/SecretsManagerIncludeTests.cpp
+++ b/generated/tests/secretsmanager-gen-tests/SecretsManagerIncludeTests.cpp
@@ -7,13 +7,18 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/secretsmanager/SecretsManagerClient.h>
+#include <aws/secretsmanager/SecretsManagerClientPagination.h>
 #include <aws/secretsmanager/SecretsManagerEndpointProvider.h>
 #include <aws/secretsmanager/SecretsManagerErrorMarshaller.h>
 #include <aws/secretsmanager/SecretsManagerErrors.h>
+#include <aws/secretsmanager/SecretsManagerPaginationBase.h>
 #include <aws/secretsmanager/SecretsManagerRequest.h>
 #include <aws/secretsmanager/SecretsManagerServiceClientModel.h>
+#include <aws/secretsmanager/SecretsManagerWaiter.h>
 #include <aws/secretsmanager/SecretsManager_EXPORTS.h>
+#include <aws/secretsmanager/internal/SecretsManagerEndpointRules.h>
 #include <aws/secretsmanager/model/APIErrorType.h>
+#include <aws/secretsmanager/model/BatchGetSecretValuePaginationTraits.h>
 #include <aws/secretsmanager/model/BatchGetSecretValueRequest.h>
 #include <aws/secretsmanager/model/BatchGetSecretValueResult.h>
 #include <aws/secretsmanager/model/CancelRotateSecretRequest.h>
@@ -35,8 +40,10 @@
 #include <aws/secretsmanager/model/GetResourcePolicyResult.h>
 #include <aws/secretsmanager/model/GetSecretValueRequest.h>
 #include <aws/secretsmanager/model/GetSecretValueResult.h>
+#include <aws/secretsmanager/model/ListSecretVersionIdsPaginationTraits.h>
 #include <aws/secretsmanager/model/ListSecretVersionIdsRequest.h>
 #include <aws/secretsmanager/model/ListSecretVersionIdsResult.h>
+#include <aws/secretsmanager/model/ListSecretsPaginationTraits.h>
 #include <aws/secretsmanager/model/ListSecretsRequest.h>
 #include <aws/secretsmanager/model/ListSecretsResult.h>
 #include <aws/secretsmanager/model/PutResourcePolicyRequest.h>
diff --git a/generated/tests/security-ir-gen-tests/SecurityIRIncludeTests.cpp b/generated/tests/security-ir-gen-tests/SecurityIRIncludeTests.cpp
index 75823d88f36a..6ffdd5b3591d 100644
--- a/generated/tests/security-ir-gen-tests/SecurityIRIncludeTests.cpp
+++ b/generated/tests/security-ir-gen-tests/SecurityIRIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/security-ir/SecurityIRClient.h>
+#include <aws/security-ir/SecurityIRClientPagination.h>
 #include <aws/security-ir/SecurityIREndpointProvider.h>
 #include <aws/security-ir/SecurityIRErrorMarshaller.h>
 #include <aws/security-ir/SecurityIRErrors.h>
+#include <aws/security-ir/SecurityIRPaginationBase.h>
 #include <aws/security-ir/SecurityIRRequest.h>
 #include <aws/security-ir/SecurityIRServiceClientModel.h>
+#include <aws/security-ir/SecurityIRWaiter.h>
 #include <aws/security-ir/SecurityIR_EXPORTS.h>
+#include <aws/security-ir/internal/SecurityIREndpointRules.h>
 #include <aws/security-ir/model/ActionType.h>
 #include <aws/security-ir/model/AwsRegion.h>
 #include <aws/security-ir/model/BatchGetMemberAccountDetailsRequest.h>
@@ -53,17 +57,22 @@
 #include <aws/security-ir/model/InternalServerException.h>
 #include <aws/security-ir/model/InvestigationAction.h>
 #include <aws/security-ir/model/InvestigationFeedback.h>
+#include <aws/security-ir/model/ListCaseEditsPaginationTraits.h>
 #include <aws/security-ir/model/ListCaseEditsRequest.h>
 #include <aws/security-ir/model/ListCaseEditsResult.h>
 #include <aws/security-ir/model/ListCasesItem.h>
+#include <aws/security-ir/model/ListCasesPaginationTraits.h>
 #include <aws/security-ir/model/ListCasesRequest.h>
 #include <aws/security-ir/model/ListCasesResult.h>
 #include <aws/security-ir/model/ListCommentsItem.h>
+#include <aws/security-ir/model/ListCommentsPaginationTraits.h>
 #include <aws/security-ir/model/ListCommentsRequest.h>
 #include <aws/security-ir/model/ListCommentsResult.h>
+#include <aws/security-ir/model/ListInvestigationsPaginationTraits.h>
 #include <aws/security-ir/model/ListInvestigationsRequest.h>
 #include <aws/security-ir/model/ListInvestigationsResult.h>
 #include <aws/security-ir/model/ListMembershipItem.h>
+#include <aws/security-ir/model/ListMembershipsPaginationTraits.h>
 #include <aws/security-ir/model/ListMembershipsRequest.h>
 #include <aws/security-ir/model/ListMembershipsResult.h>
 #include <aws/security-ir/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/securityagent-gen-tests/SecurityAgentIncludeTests.cpp b/generated/tests/securityagent-gen-tests/SecurityAgentIncludeTests.cpp
index a1710818f032..994fcf1dd81e 100644
--- a/generated/tests/securityagent-gen-tests/SecurityAgentIncludeTests.cpp
+++ b/generated/tests/securityagent-gen-tests/SecurityAgentIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/securityagent/SecurityAgentClient.h>
+#include <aws/securityagent/SecurityAgentClientPagination.h>
 #include <aws/securityagent/SecurityAgentEndpointProvider.h>
 #include <aws/securityagent/SecurityAgentErrorMarshaller.h>
 #include <aws/securityagent/SecurityAgentErrors.h>
+#include <aws/securityagent/SecurityAgentPaginationBase.h>
 #include <aws/securityagent/SecurityAgentRequest.h>
 #include <aws/securityagent/SecurityAgentServiceClientModel.h>
+#include <aws/securityagent/SecurityAgentWaiter.h>
 #include <aws/securityagent/SecurityAgent_EXPORTS.h>
+#include <aws/securityagent/internal/SecurityAgentEndpointRules.h>
 #include <aws/securityagent/model/AWSResources.h>
 #include <aws/securityagent/model/AccessType.h>
 #include <aws/securityagent/model/Actor.h>
@@ -190,51 +194,73 @@
 #include <aws/securityagent/model/IpAddressType.h>
 #include <aws/securityagent/model/JobStatus.h>
 #include <aws/securityagent/model/JobType.h>
+#include <aws/securityagent/model/ListAgentSpacesPaginationTraits.h>
 #include <aws/securityagent/model/ListAgentSpacesRequest.h>
 #include <aws/securityagent/model/ListAgentSpacesResult.h>
+#include <aws/securityagent/model/ListApplicationsPaginationTraits.h>
 #include <aws/securityagent/model/ListApplicationsRequest.h>
 #include <aws/securityagent/model/ListApplicationsResult.h>
+#include <aws/securityagent/model/ListArtifactsPaginationTraits.h>
 #include <aws/securityagent/model/ListArtifactsRequest.h>
 #include <aws/securityagent/model/ListArtifactsResult.h>
+#include <aws/securityagent/model/ListCodeReviewJobTasksPaginationTraits.h>
 #include <aws/securityagent/model/ListCodeReviewJobTasksRequest.h>
 #include <aws/securityagent/model/ListCodeReviewJobTasksResult.h>
+#include <aws/securityagent/model/ListCodeReviewJobsForCodeReviewPaginationTraits.h>
 #include <aws/securityagent/model/ListCodeReviewJobsForCodeReviewRequest.h>
 #include <aws/securityagent/model/ListCodeReviewJobsForCodeReviewResult.h>
+#include <aws/securityagent/model/ListCodeReviewsPaginationTraits.h>
 #include <aws/securityagent/model/ListCodeReviewsRequest.h>
 #include <aws/securityagent/model/ListCodeReviewsResult.h>
+#include <aws/securityagent/model/ListDiscoveredEndpointsPaginationTraits.h>
 #include <aws/securityagent/model/ListDiscoveredEndpointsRequest.h>
 #include <aws/securityagent/model/ListDiscoveredEndpointsResult.h>
+#include <aws/securityagent/model/ListFindingsPaginationTraits.h>
 #include <aws/securityagent/model/ListFindingsRequest.h>
 #include <aws/securityagent/model/ListFindingsResult.h>
+#include <aws/securityagent/model/ListIntegratedResourcesPaginationTraits.h>
 #include <aws/securityagent/model/ListIntegratedResourcesRequest.h>
 #include <aws/securityagent/model/ListIntegratedResourcesResult.h>
+#include <aws/securityagent/model/ListIntegrationsPaginationTraits.h>
 #include <aws/securityagent/model/ListIntegrationsRequest.h>
 #include <aws/securityagent/model/ListIntegrationsResult.h>
+#include <aws/securityagent/model/ListMembershipsPaginationTraits.h>
 #include <aws/securityagent/model/ListMembershipsRequest.h>
 #include <aws/securityagent/model/ListMembershipsResult.h>
+#include <aws/securityagent/model/ListPentestJobTasksPaginationTraits.h>
 #include <aws/securityagent/model/ListPentestJobTasksRequest.h>
 #include <aws/securityagent/model/ListPentestJobTasksResult.h>
+#include <aws/securityagent/model/ListPentestJobsForPentestPaginationTraits.h>
 #include <aws/securityagent/model/ListPentestJobsForPentestRequest.h>
 #include <aws/securityagent/model/ListPentestJobsForPentestResult.h>
+#include <aws/securityagent/model/ListPentestsPaginationTraits.h>
 #include <aws/securityagent/model/ListPentestsRequest.h>
 #include <aws/securityagent/model/ListPentestsResult.h>
+#include <aws/securityagent/model/ListPrivateConnectionsPaginationTraits.h>
 #include <aws/securityagent/model/ListPrivateConnectionsRequest.h>
 #include <aws/securityagent/model/ListPrivateConnectionsResult.h>
 #include <aws/securityagent/model/ListSecurityRequirementPackFilter.h>
+#include <aws/securityagent/model/ListSecurityRequirementPacksPaginationTraits.h>
 #include <aws/securityagent/model/ListSecurityRequirementPacksRequest.h>
 #include <aws/securityagent/model/ListSecurityRequirementPacksResult.h>
+#include <aws/securityagent/model/ListSecurityRequirementsPaginationTraits.h>
 #include <aws/securityagent/model/ListSecurityRequirementsRequest.h>
 #include <aws/securityagent/model/ListSecurityRequirementsResult.h>
 #include <aws/securityagent/model/ListTagsForResourceRequest.h>
 #include <aws/securityagent/model/ListTagsForResourceResult.h>
+#include <aws/securityagent/model/ListTargetDomainsPaginationTraits.h>
 #include <aws/securityagent/model/ListTargetDomainsRequest.h>
 #include <aws/securityagent/model/ListTargetDomainsResult.h>
+#include <aws/securityagent/model/ListThreatModelJobTasksPaginationTraits.h>
 #include <aws/securityagent/model/ListThreatModelJobTasksRequest.h>
 #include <aws/securityagent/model/ListThreatModelJobTasksResult.h>
+#include <aws/securityagent/model/ListThreatModelJobsPaginationTraits.h>
 #include <aws/securityagent/model/ListThreatModelJobsRequest.h>
 #include <aws/securityagent/model/ListThreatModelJobsResult.h>
+#include <aws/securityagent/model/ListThreatModelsPaginationTraits.h>
 #include <aws/securityagent/model/ListThreatModelsRequest.h>
 #include <aws/securityagent/model/ListThreatModelsResult.h>
+#include <aws/securityagent/model/ListThreatsPaginationTraits.h>
 #include <aws/securityagent/model/ListThreatsRequest.h>
 #include <aws/securityagent/model/ListThreatsResult.h>
 #include <aws/securityagent/model/LogLocation.h>
diff --git a/generated/tests/securityhub-gen-tests/SecurityHubIncludeTests.cpp b/generated/tests/securityhub-gen-tests/SecurityHubIncludeTests.cpp
index 8cf4cfe4ba34..189a98df2415 100644
--- a/generated/tests/securityhub-gen-tests/SecurityHubIncludeTests.cpp
+++ b/generated/tests/securityhub-gen-tests/SecurityHubIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/securityhub/SecurityHubClient.h>
+#include <aws/securityhub/SecurityHubClientPagination.h>
 #include <aws/securityhub/SecurityHubEndpointProvider.h>
 #include <aws/securityhub/SecurityHubErrorMarshaller.h>
 #include <aws/securityhub/SecurityHubErrors.h>
+#include <aws/securityhub/SecurityHubPaginationBase.h>
 #include <aws/securityhub/SecurityHubRequest.h>
 #include <aws/securityhub/SecurityHubServiceClientModel.h>
+#include <aws/securityhub/SecurityHubWaiter.h>
 #include <aws/securityhub/SecurityHub_EXPORTS.h>
+#include <aws/securityhub/internal/SecurityHubEndpointRules.h>
 #include <aws/securityhub/model/AIDetails.h>
 #include <aws/securityhub/model/AcceptAdministratorInvitationRequest.h>
 #include <aws/securityhub/model/AcceptAdministratorInvitationResult.h>
@@ -675,20 +679,25 @@
 #include <aws/securityhub/model/DeleteInvitationsResult.h>
 #include <aws/securityhub/model/DeleteMembersRequest.h>
 #include <aws/securityhub/model/DeleteMembersResult.h>
+#include <aws/securityhub/model/DescribeActionTargetsPaginationTraits.h>
 #include <aws/securityhub/model/DescribeActionTargetsRequest.h>
 #include <aws/securityhub/model/DescribeActionTargetsResult.h>
 #include <aws/securityhub/model/DescribeHubRequest.h>
 #include <aws/securityhub/model/DescribeHubResult.h>
 #include <aws/securityhub/model/DescribeOrganizationConfigurationRequest.h>
 #include <aws/securityhub/model/DescribeOrganizationConfigurationResult.h>
+#include <aws/securityhub/model/DescribeProductsPaginationTraits.h>
 #include <aws/securityhub/model/DescribeProductsRequest.h>
 #include <aws/securityhub/model/DescribeProductsResult.h>
+#include <aws/securityhub/model/DescribeProductsV2PaginationTraits.h>
 #include <aws/securityhub/model/DescribeProductsV2Request.h>
 #include <aws/securityhub/model/DescribeProductsV2Result.h>
 #include <aws/securityhub/model/DescribeSecurityHubV2Request.h>
 #include <aws/securityhub/model/DescribeSecurityHubV2Result.h>
+#include <aws/securityhub/model/DescribeStandardsControlsPaginationTraits.h>
 #include <aws/securityhub/model/DescribeStandardsControlsRequest.h>
 #include <aws/securityhub/model/DescribeStandardsControlsResult.h>
+#include <aws/securityhub/model/DescribeStandardsPaginationTraits.h>
 #include <aws/securityhub/model/DescribeStandardsRequest.h>
 #include <aws/securityhub/model/DescribeStandardsResult.h>
 #include <aws/securityhub/model/Detection.h>
@@ -764,34 +773,43 @@
 #include <aws/securityhub/model/GetConnectorResult.h>
 #include <aws/securityhub/model/GetConnectorV2Request.h>
 #include <aws/securityhub/model/GetConnectorV2Result.h>
+#include <aws/securityhub/model/GetEnabledStandardsPaginationTraits.h>
 #include <aws/securityhub/model/GetEnabledStandardsRequest.h>
 #include <aws/securityhub/model/GetEnabledStandardsResult.h>
 #include <aws/securityhub/model/GetFindingAggregatorRequest.h>
 #include <aws/securityhub/model/GetFindingAggregatorResult.h>
+#include <aws/securityhub/model/GetFindingHistoryPaginationTraits.h>
 #include <aws/securityhub/model/GetFindingHistoryRequest.h>
 #include <aws/securityhub/model/GetFindingHistoryResult.h>
 #include <aws/securityhub/model/GetFindingStatisticsV2Request.h>
 #include <aws/securityhub/model/GetFindingStatisticsV2Result.h>
+#include <aws/securityhub/model/GetFindingsPaginationTraits.h>
 #include <aws/securityhub/model/GetFindingsRequest.h>
 #include <aws/securityhub/model/GetFindingsResult.h>
+#include <aws/securityhub/model/GetFindingsTrendsV2PaginationTraits.h>
 #include <aws/securityhub/model/GetFindingsTrendsV2Request.h>
 #include <aws/securityhub/model/GetFindingsTrendsV2Result.h>
+#include <aws/securityhub/model/GetFindingsV2PaginationTraits.h>
 #include <aws/securityhub/model/GetFindingsV2Request.h>
 #include <aws/securityhub/model/GetFindingsV2Result.h>
 #include <aws/securityhub/model/GetInsightResultsRequest.h>
 #include <aws/securityhub/model/GetInsightResultsResult.h>
+#include <aws/securityhub/model/GetInsightsPaginationTraits.h>
 #include <aws/securityhub/model/GetInsightsRequest.h>
 #include <aws/securityhub/model/GetInsightsResult.h>
 #include <aws/securityhub/model/GetInvitationsCountRequest.h>
 #include <aws/securityhub/model/GetInvitationsCountResult.h>
 #include <aws/securityhub/model/GetMembersRequest.h>
 #include <aws/securityhub/model/GetMembersResult.h>
+#include <aws/securityhub/model/GetRecommendedPolicyV2PaginationTraits.h>
 #include <aws/securityhub/model/GetRecommendedPolicyV2Request.h>
 #include <aws/securityhub/model/GetRecommendedPolicyV2Result.h>
 #include <aws/securityhub/model/GetResourcesStatisticsV2Request.h>
 #include <aws/securityhub/model/GetResourcesStatisticsV2Result.h>
+#include <aws/securityhub/model/GetResourcesTrendsV2PaginationTraits.h>
 #include <aws/securityhub/model/GetResourcesTrendsV2Request.h>
 #include <aws/securityhub/model/GetResourcesTrendsV2Result.h>
+#include <aws/securityhub/model/GetResourcesV2PaginationTraits.h>
 #include <aws/securityhub/model/GetResourcesV2Request.h>
 #include <aws/securityhub/model/GetResourcesV2Result.h>
 #include <aws/securityhub/model/GetSecurityControlDefinitionRequest.h>
@@ -829,34 +847,45 @@
 #include <aws/securityhub/model/JiraCloudUpdateConfiguration.h>
 #include <aws/securityhub/model/KeywordFilter.h>
 #include <aws/securityhub/model/LimitExceededException.h>
+#include <aws/securityhub/model/ListAggregatorsV2PaginationTraits.h>
 #include <aws/securityhub/model/ListAggregatorsV2Request.h>
 #include <aws/securityhub/model/ListAggregatorsV2Result.h>
 #include <aws/securityhub/model/ListAutomationRulesRequest.h>
 #include <aws/securityhub/model/ListAutomationRulesResult.h>
 #include <aws/securityhub/model/ListAutomationRulesV2Request.h>
 #include <aws/securityhub/model/ListAutomationRulesV2Result.h>
+#include <aws/securityhub/model/ListConfigurationPoliciesPaginationTraits.h>
 #include <aws/securityhub/model/ListConfigurationPoliciesRequest.h>
 #include <aws/securityhub/model/ListConfigurationPoliciesResult.h>
+#include <aws/securityhub/model/ListConfigurationPolicyAssociationsPaginationTraits.h>
 #include <aws/securityhub/model/ListConfigurationPolicyAssociationsRequest.h>
 #include <aws/securityhub/model/ListConfigurationPolicyAssociationsResult.h>
 #include <aws/securityhub/model/ListConnectorsRequest.h>
 #include <aws/securityhub/model/ListConnectorsResult.h>
 #include <aws/securityhub/model/ListConnectorsV2Request.h>
 #include <aws/securityhub/model/ListConnectorsV2Result.h>
+#include <aws/securityhub/model/ListEnabledProductsForImportPaginationTraits.h>
 #include <aws/securityhub/model/ListEnabledProductsForImportRequest.h>
 #include <aws/securityhub/model/ListEnabledProductsForImportResult.h>
+#include <aws/securityhub/model/ListFindingAggregatorsPaginationTraits.h>
 #include <aws/securityhub/model/ListFindingAggregatorsRequest.h>
 #include <aws/securityhub/model/ListFindingAggregatorsResult.h>
+#include <aws/securityhub/model/ListFreeTrialStatusesV2PaginationTraits.h>
 #include <aws/securityhub/model/ListFreeTrialStatusesV2Request.h>
 #include <aws/securityhub/model/ListFreeTrialStatusesV2Result.h>
+#include <aws/securityhub/model/ListInvitationsPaginationTraits.h>
 #include <aws/securityhub/model/ListInvitationsRequest.h>
 #include <aws/securityhub/model/ListInvitationsResult.h>
+#include <aws/securityhub/model/ListMembersPaginationTraits.h>
 #include <aws/securityhub/model/ListMembersRequest.h>
 #include <aws/securityhub/model/ListMembersResult.h>
+#include <aws/securityhub/model/ListOrganizationAdminAccountsPaginationTraits.h>
 #include <aws/securityhub/model/ListOrganizationAdminAccountsRequest.h>
 #include <aws/securityhub/model/ListOrganizationAdminAccountsResult.h>
+#include <aws/securityhub/model/ListSecurityControlDefinitionsPaginationTraits.h>
 #include <aws/securityhub/model/ListSecurityControlDefinitionsRequest.h>
 #include <aws/securityhub/model/ListSecurityControlDefinitionsResult.h>
+#include <aws/securityhub/model/ListStandardsControlAssociationsPaginationTraits.h>
 #include <aws/securityhub/model/ListStandardsControlAssociationsRequest.h>
 #include <aws/securityhub/model/ListStandardsControlAssociationsResult.h>
 #include <aws/securityhub/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/securitylake-gen-tests/SecurityLakeIncludeTests.cpp b/generated/tests/securitylake-gen-tests/SecurityLakeIncludeTests.cpp
index 3bf95f0fb976..2a8a3dd4d770 100644
--- a/generated/tests/securitylake-gen-tests/SecurityLakeIncludeTests.cpp
+++ b/generated/tests/securitylake-gen-tests/SecurityLakeIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/securitylake/SecurityLakeClient.h>
+#include <aws/securitylake/SecurityLakeClientPagination.h>
 #include <aws/securitylake/SecurityLakeEndpointProvider.h>
 #include <aws/securitylake/SecurityLakeErrorMarshaller.h>
 #include <aws/securitylake/SecurityLakeErrors.h>
+#include <aws/securitylake/SecurityLakePaginationBase.h>
 #include <aws/securitylake/SecurityLakeRequest.h>
 #include <aws/securitylake/SecurityLakeServiceClientModel.h>
+#include <aws/securitylake/SecurityLakeWaiter.h>
 #include <aws/securitylake/SecurityLake_EXPORTS.h>
+#include <aws/securitylake/internal/SecurityLakeEndpointRules.h>
 #include <aws/securitylake/model/AccessDeniedException.h>
 #include <aws/securitylake/model/AccessType.h>
 #include <aws/securitylake/model/AwsIdentity.h>
@@ -73,18 +77,22 @@
 #include <aws/securitylake/model/GetDataLakeExceptionSubscriptionResult.h>
 #include <aws/securitylake/model/GetDataLakeOrganizationConfigurationRequest.h>
 #include <aws/securitylake/model/GetDataLakeOrganizationConfigurationResult.h>
+#include <aws/securitylake/model/GetDataLakeSourcesPaginationTraits.h>
 #include <aws/securitylake/model/GetDataLakeSourcesRequest.h>
 #include <aws/securitylake/model/GetDataLakeSourcesResult.h>
 #include <aws/securitylake/model/GetSubscriberRequest.h>
 #include <aws/securitylake/model/GetSubscriberResult.h>
 #include <aws/securitylake/model/HttpMethod.h>
 #include <aws/securitylake/model/HttpsNotificationConfiguration.h>
+#include <aws/securitylake/model/ListDataLakeExceptionsPaginationTraits.h>
 #include <aws/securitylake/model/ListDataLakeExceptionsRequest.h>
 #include <aws/securitylake/model/ListDataLakeExceptionsResult.h>
 #include <aws/securitylake/model/ListDataLakesRequest.h>
 #include <aws/securitylake/model/ListDataLakesResult.h>
+#include <aws/securitylake/model/ListLogSourcesPaginationTraits.h>
 #include <aws/securitylake/model/ListLogSourcesRequest.h>
 #include <aws/securitylake/model/ListLogSourcesResult.h>
+#include <aws/securitylake/model/ListSubscribersPaginationTraits.h>
 #include <aws/securitylake/model/ListSubscribersRequest.h>
 #include <aws/securitylake/model/ListSubscribersResult.h>
 #include <aws/securitylake/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/serverlessrepo-gen-tests/ServerlessApplicationRepositoryIncludeTests.cpp b/generated/tests/serverlessrepo-gen-tests/ServerlessApplicationRepositoryIncludeTests.cpp
index 5cb594d61084..60e34226b322 100644
--- a/generated/tests/serverlessrepo-gen-tests/ServerlessApplicationRepositoryIncludeTests.cpp
+++ b/generated/tests/serverlessrepo-gen-tests/ServerlessApplicationRepositoryIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/serverlessrepo/ServerlessApplicationRepositoryClient.h>
+#include <aws/serverlessrepo/ServerlessApplicationRepositoryClientPagination.h>
 #include <aws/serverlessrepo/ServerlessApplicationRepositoryEndpointProvider.h>
 #include <aws/serverlessrepo/ServerlessApplicationRepositoryErrorMarshaller.h>
 #include <aws/serverlessrepo/ServerlessApplicationRepositoryErrors.h>
+#include <aws/serverlessrepo/ServerlessApplicationRepositoryPaginationBase.h>
 #include <aws/serverlessrepo/ServerlessApplicationRepositoryRequest.h>
 #include <aws/serverlessrepo/ServerlessApplicationRepositoryServiceClientModel.h>
+#include <aws/serverlessrepo/ServerlessApplicationRepositoryWaiter.h>
 #include <aws/serverlessrepo/ServerlessApplicationRepository_EXPORTS.h>
+#include <aws/serverlessrepo/internal/ServerlessApplicationRepositoryEndpointRules.h>
 #include <aws/serverlessrepo/model/ApplicationDependencySummary.h>
 #include <aws/serverlessrepo/model/ApplicationPolicyStatement.h>
 #include <aws/serverlessrepo/model/ApplicationSummary.h>
@@ -36,10 +40,13 @@
 #include <aws/serverlessrepo/model/GetCloudFormationTemplateRequest.h>
 #include <aws/serverlessrepo/model/GetCloudFormationTemplateResult.h>
 #include <aws/serverlessrepo/model/InternalServerErrorException.h>
+#include <aws/serverlessrepo/model/ListApplicationDependenciesPaginationTraits.h>
 #include <aws/serverlessrepo/model/ListApplicationDependenciesRequest.h>
 #include <aws/serverlessrepo/model/ListApplicationDependenciesResult.h>
+#include <aws/serverlessrepo/model/ListApplicationVersionsPaginationTraits.h>
 #include <aws/serverlessrepo/model/ListApplicationVersionsRequest.h>
 #include <aws/serverlessrepo/model/ListApplicationVersionsResult.h>
+#include <aws/serverlessrepo/model/ListApplicationsPaginationTraits.h>
 #include <aws/serverlessrepo/model/ListApplicationsRequest.h>
 #include <aws/serverlessrepo/model/ListApplicationsResult.h>
 #include <aws/serverlessrepo/model/NotFoundException.h>
diff --git a/generated/tests/service-quotas-gen-tests/ServiceQuotasIncludeTests.cpp b/generated/tests/service-quotas-gen-tests/ServiceQuotasIncludeTests.cpp
index 9c7c24a91c91..30efa0bc1f46 100644
--- a/generated/tests/service-quotas-gen-tests/ServiceQuotasIncludeTests.cpp
+++ b/generated/tests/service-quotas-gen-tests/ServiceQuotasIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/service-quotas/ServiceQuotasClient.h>
+#include <aws/service-quotas/ServiceQuotasClientPagination.h>
 #include <aws/service-quotas/ServiceQuotasEndpointProvider.h>
 #include <aws/service-quotas/ServiceQuotasErrorMarshaller.h>
 #include <aws/service-quotas/ServiceQuotasErrors.h>
+#include <aws/service-quotas/ServiceQuotasPaginationBase.h>
 #include <aws/service-quotas/ServiceQuotasRequest.h>
 #include <aws/service-quotas/ServiceQuotasServiceClientModel.h>
+#include <aws/service-quotas/ServiceQuotasWaiter.h>
 #include <aws/service-quotas/ServiceQuotas_EXPORTS.h>
+#include <aws/service-quotas/internal/ServiceQuotasEndpointRules.h>
 #include <aws/service-quotas/model/AppliedLevelEnum.h>
 #include <aws/service-quotas/model/AssociateServiceQuotaTemplateRequest.h>
 #include <aws/service-quotas/model/AssociateServiceQuotaTemplateResult.h>
@@ -38,16 +42,22 @@
 #include <aws/service-quotas/model/GetServiceQuotaIncreaseRequestFromTemplateResult.h>
 #include <aws/service-quotas/model/GetServiceQuotaRequest.h>
 #include <aws/service-quotas/model/GetServiceQuotaResult.h>
+#include <aws/service-quotas/model/ListAWSDefaultServiceQuotasPaginationTraits.h>
 #include <aws/service-quotas/model/ListAWSDefaultServiceQuotasRequest.h>
 #include <aws/service-quotas/model/ListAWSDefaultServiceQuotasResult.h>
+#include <aws/service-quotas/model/ListRequestedServiceQuotaChangeHistoryByQuotaPaginationTraits.h>
 #include <aws/service-quotas/model/ListRequestedServiceQuotaChangeHistoryByQuotaRequest.h>
 #include <aws/service-quotas/model/ListRequestedServiceQuotaChangeHistoryByQuotaResult.h>
+#include <aws/service-quotas/model/ListRequestedServiceQuotaChangeHistoryPaginationTraits.h>
 #include <aws/service-quotas/model/ListRequestedServiceQuotaChangeHistoryRequest.h>
 #include <aws/service-quotas/model/ListRequestedServiceQuotaChangeHistoryResult.h>
+#include <aws/service-quotas/model/ListServiceQuotaIncreaseRequestsInTemplatePaginationTraits.h>
 #include <aws/service-quotas/model/ListServiceQuotaIncreaseRequestsInTemplateRequest.h>
 #include <aws/service-quotas/model/ListServiceQuotaIncreaseRequestsInTemplateResult.h>
+#include <aws/service-quotas/model/ListServiceQuotasPaginationTraits.h>
 #include <aws/service-quotas/model/ListServiceQuotasRequest.h>
 #include <aws/service-quotas/model/ListServiceQuotasResult.h>
+#include <aws/service-quotas/model/ListServicesPaginationTraits.h>
 #include <aws/service-quotas/model/ListServicesRequest.h>
 #include <aws/service-quotas/model/ListServicesResult.h>
 #include <aws/service-quotas/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/servicecatalog-appregistry-gen-tests/AppRegistryIncludeTests.cpp b/generated/tests/servicecatalog-appregistry-gen-tests/AppRegistryIncludeTests.cpp
index dc5fa642daaf..e4f458dc3abf 100644
--- a/generated/tests/servicecatalog-appregistry-gen-tests/AppRegistryIncludeTests.cpp
+++ b/generated/tests/servicecatalog-appregistry-gen-tests/AppRegistryIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/servicecatalog-appregistry/AppRegistryClient.h>
+#include <aws/servicecatalog-appregistry/AppRegistryClientPagination.h>
 #include <aws/servicecatalog-appregistry/AppRegistryEndpointProvider.h>
 #include <aws/servicecatalog-appregistry/AppRegistryErrorMarshaller.h>
 #include <aws/servicecatalog-appregistry/AppRegistryErrors.h>
+#include <aws/servicecatalog-appregistry/AppRegistryPaginationBase.h>
 #include <aws/servicecatalog-appregistry/AppRegistryRequest.h>
 #include <aws/servicecatalog-appregistry/AppRegistryServiceClientModel.h>
+#include <aws/servicecatalog-appregistry/AppRegistryWaiter.h>
 #include <aws/servicecatalog-appregistry/AppRegistry_EXPORTS.h>
+#include <aws/servicecatalog-appregistry/internal/AppRegistryEndpointRules.h>
 #include <aws/servicecatalog-appregistry/model/AppRegistryConfiguration.h>
 #include <aws/servicecatalog-appregistry/model/Application.h>
 #include <aws/servicecatalog-appregistry/model/ApplicationSummary.h>
@@ -47,14 +51,19 @@
 #include <aws/servicecatalog-appregistry/model/GetConfigurationRequest.h>
 #include <aws/servicecatalog-appregistry/model/GetConfigurationResult.h>
 #include <aws/servicecatalog-appregistry/model/Integrations.h>
+#include <aws/servicecatalog-appregistry/model/ListApplicationsPaginationTraits.h>
 #include <aws/servicecatalog-appregistry/model/ListApplicationsRequest.h>
 #include <aws/servicecatalog-appregistry/model/ListApplicationsResult.h>
+#include <aws/servicecatalog-appregistry/model/ListAssociatedAttributeGroupsPaginationTraits.h>
 #include <aws/servicecatalog-appregistry/model/ListAssociatedAttributeGroupsRequest.h>
 #include <aws/servicecatalog-appregistry/model/ListAssociatedAttributeGroupsResult.h>
+#include <aws/servicecatalog-appregistry/model/ListAssociatedResourcesPaginationTraits.h>
 #include <aws/servicecatalog-appregistry/model/ListAssociatedResourcesRequest.h>
 #include <aws/servicecatalog-appregistry/model/ListAssociatedResourcesResult.h>
+#include <aws/servicecatalog-appregistry/model/ListAttributeGroupsForApplicationPaginationTraits.h>
 #include <aws/servicecatalog-appregistry/model/ListAttributeGroupsForApplicationRequest.h>
 #include <aws/servicecatalog-appregistry/model/ListAttributeGroupsForApplicationResult.h>
+#include <aws/servicecatalog-appregistry/model/ListAttributeGroupsPaginationTraits.h>
 #include <aws/servicecatalog-appregistry/model/ListAttributeGroupsRequest.h>
 #include <aws/servicecatalog-appregistry/model/ListAttributeGroupsResult.h>
 #include <aws/servicecatalog-appregistry/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/servicecatalog-gen-tests/ServiceCatalogIncludeTests.cpp b/generated/tests/servicecatalog-gen-tests/ServiceCatalogIncludeTests.cpp
index c8f7e716894d..c3fb8e849004 100644
--- a/generated/tests/servicecatalog-gen-tests/ServiceCatalogIncludeTests.cpp
+++ b/generated/tests/servicecatalog-gen-tests/ServiceCatalogIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/servicecatalog/ServiceCatalogClient.h>
+#include <aws/servicecatalog/ServiceCatalogClientPagination.h>
 #include <aws/servicecatalog/ServiceCatalogEndpointProvider.h>
 #include <aws/servicecatalog/ServiceCatalogErrorMarshaller.h>
 #include <aws/servicecatalog/ServiceCatalogErrors.h>
+#include <aws/servicecatalog/ServiceCatalogPaginationBase.h>
 #include <aws/servicecatalog/ServiceCatalogRequest.h>
 #include <aws/servicecatalog/ServiceCatalogServiceClientModel.h>
+#include <aws/servicecatalog/ServiceCatalogWaiter.h>
 #include <aws/servicecatalog/ServiceCatalog_EXPORTS.h>
+#include <aws/servicecatalog/internal/ServiceCatalogEndpointRules.h>
 #include <aws/servicecatalog/model/AcceptPortfolioShareRequest.h>
 #include <aws/servicecatalog/model/AcceptPortfolioShareResult.h>
 #include <aws/servicecatalog/model/AccessLevelFilter.h>
@@ -83,6 +87,7 @@
 #include <aws/servicecatalog/model/DescribePortfolioShareStatusRequest.h>
 #include <aws/servicecatalog/model/DescribePortfolioShareStatusResult.h>
 #include <aws/servicecatalog/model/DescribePortfolioShareType.h>
+#include <aws/servicecatalog/model/DescribePortfolioSharesPaginationTraits.h>
 #include <aws/servicecatalog/model/DescribePortfolioSharesRequest.h>
 #include <aws/servicecatalog/model/DescribePortfolioSharesResult.h>
 #include <aws/servicecatalog/model/DescribeProductAsAdminRequest.h>
@@ -132,6 +137,7 @@
 #include <aws/servicecatalog/model/FailedServiceActionAssociation.h>
 #include <aws/servicecatalog/model/GetAWSOrganizationsAccessStatusRequest.h>
 #include <aws/servicecatalog/model/GetAWSOrganizationsAccessStatusResult.h>
+#include <aws/servicecatalog/model/GetProvisionedProductOutputsPaginationTraits.h>
 #include <aws/servicecatalog/model/GetProvisionedProductOutputsRequest.h>
 #include <aws/servicecatalog/model/GetProvisionedProductOutputsResult.h>
 #include <aws/servicecatalog/model/ImportAsProvisionedProductRequest.h>
@@ -140,26 +146,36 @@
 #include <aws/servicecatalog/model/LastSyncStatus.h>
 #include <aws/servicecatalog/model/LaunchPath.h>
 #include <aws/servicecatalog/model/LaunchPathSummary.h>
+#include <aws/servicecatalog/model/ListAcceptedPortfolioSharesPaginationTraits.h>
 #include <aws/servicecatalog/model/ListAcceptedPortfolioSharesRequest.h>
 #include <aws/servicecatalog/model/ListAcceptedPortfolioSharesResult.h>
+#include <aws/servicecatalog/model/ListBudgetsForResourcePaginationTraits.h>
 #include <aws/servicecatalog/model/ListBudgetsForResourceRequest.h>
 #include <aws/servicecatalog/model/ListBudgetsForResourceResult.h>
+#include <aws/servicecatalog/model/ListConstraintsForPortfolioPaginationTraits.h>
 #include <aws/servicecatalog/model/ListConstraintsForPortfolioRequest.h>
 #include <aws/servicecatalog/model/ListConstraintsForPortfolioResult.h>
+#include <aws/servicecatalog/model/ListLaunchPathsPaginationTraits.h>
 #include <aws/servicecatalog/model/ListLaunchPathsRequest.h>
 #include <aws/servicecatalog/model/ListLaunchPathsResult.h>
+#include <aws/servicecatalog/model/ListOrganizationPortfolioAccessPaginationTraits.h>
 #include <aws/servicecatalog/model/ListOrganizationPortfolioAccessRequest.h>
 #include <aws/servicecatalog/model/ListOrganizationPortfolioAccessResult.h>
+#include <aws/servicecatalog/model/ListPortfolioAccessPaginationTraits.h>
 #include <aws/servicecatalog/model/ListPortfolioAccessRequest.h>
 #include <aws/servicecatalog/model/ListPortfolioAccessResult.h>
+#include <aws/servicecatalog/model/ListPortfoliosForProductPaginationTraits.h>
 #include <aws/servicecatalog/model/ListPortfoliosForProductRequest.h>
 #include <aws/servicecatalog/model/ListPortfoliosForProductResult.h>
+#include <aws/servicecatalog/model/ListPortfoliosPaginationTraits.h>
 #include <aws/servicecatalog/model/ListPortfoliosRequest.h>
 #include <aws/servicecatalog/model/ListPortfoliosResult.h>
+#include <aws/servicecatalog/model/ListPrincipalsForPortfolioPaginationTraits.h>
 #include <aws/servicecatalog/model/ListPrincipalsForPortfolioRequest.h>
 #include <aws/servicecatalog/model/ListPrincipalsForPortfolioResult.h>
 #include <aws/servicecatalog/model/ListProvisionedProductPlansRequest.h>
 #include <aws/servicecatalog/model/ListProvisionedProductPlansResult.h>
+#include <aws/servicecatalog/model/ListProvisioningArtifactsForServiceActionPaginationTraits.h>
 #include <aws/servicecatalog/model/ListProvisioningArtifactsForServiceActionRequest.h>
 #include <aws/servicecatalog/model/ListProvisioningArtifactsForServiceActionResult.h>
 #include <aws/servicecatalog/model/ListProvisioningArtifactsRequest.h>
@@ -167,15 +183,19 @@
 #include <aws/servicecatalog/model/ListRecordHistoryRequest.h>
 #include <aws/servicecatalog/model/ListRecordHistoryResult.h>
 #include <aws/servicecatalog/model/ListRecordHistorySearchFilter.h>
+#include <aws/servicecatalog/model/ListResourcesForTagOptionPaginationTraits.h>
 #include <aws/servicecatalog/model/ListResourcesForTagOptionRequest.h>
 #include <aws/servicecatalog/model/ListResourcesForTagOptionResult.h>
+#include <aws/servicecatalog/model/ListServiceActionsForProvisioningArtifactPaginationTraits.h>
 #include <aws/servicecatalog/model/ListServiceActionsForProvisioningArtifactRequest.h>
 #include <aws/servicecatalog/model/ListServiceActionsForProvisioningArtifactResult.h>
+#include <aws/servicecatalog/model/ListServiceActionsPaginationTraits.h>
 #include <aws/servicecatalog/model/ListServiceActionsRequest.h>
 #include <aws/servicecatalog/model/ListServiceActionsResult.h>
 #include <aws/servicecatalog/model/ListStackInstancesForProvisionedProductRequest.h>
 #include <aws/servicecatalog/model/ListStackInstancesForProvisionedProductResult.h>
 #include <aws/servicecatalog/model/ListTagOptionsFilters.h>
+#include <aws/servicecatalog/model/ListTagOptionsPaginationTraits.h>
 #include <aws/servicecatalog/model/ListTagOptionsRequest.h>
 #include <aws/servicecatalog/model/ListTagOptionsResult.h>
 #include <aws/servicecatalog/model/NotifyProvisionProductEngineWorkflowResultRequest.h>
@@ -239,10 +259,13 @@
 #include <aws/servicecatalog/model/ResourceTargetDefinition.h>
 #include <aws/servicecatalog/model/ScanProvisionedProductsRequest.h>
 #include <aws/servicecatalog/model/ScanProvisionedProductsResult.h>
+#include <aws/servicecatalog/model/SearchProductsAsAdminPaginationTraits.h>
 #include <aws/servicecatalog/model/SearchProductsAsAdminRequest.h>
 #include <aws/servicecatalog/model/SearchProductsAsAdminResult.h>
+#include <aws/servicecatalog/model/SearchProductsPaginationTraits.h>
 #include <aws/servicecatalog/model/SearchProductsRequest.h>
 #include <aws/servicecatalog/model/SearchProductsResult.h>
+#include <aws/servicecatalog/model/SearchProvisionedProductsPaginationTraits.h>
 #include <aws/servicecatalog/model/SearchProvisionedProductsRequest.h>
 #include <aws/servicecatalog/model/SearchProvisionedProductsResult.h>
 #include <aws/servicecatalog/model/ServiceActionAssociation.h>
diff --git a/generated/tests/servicediscovery-gen-tests/ServiceDiscoveryIncludeTests.cpp b/generated/tests/servicediscovery-gen-tests/ServiceDiscoveryIncludeTests.cpp
index d96fa60d7464..1556e7c327e4 100644
--- a/generated/tests/servicediscovery-gen-tests/ServiceDiscoveryIncludeTests.cpp
+++ b/generated/tests/servicediscovery-gen-tests/ServiceDiscoveryIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/servicediscovery/ServiceDiscoveryClient.h>
+#include <aws/servicediscovery/ServiceDiscoveryClientPagination.h>
 #include <aws/servicediscovery/ServiceDiscoveryEndpointProvider.h>
 #include <aws/servicediscovery/ServiceDiscoveryErrorMarshaller.h>
 #include <aws/servicediscovery/ServiceDiscoveryErrors.h>
+#include <aws/servicediscovery/ServiceDiscoveryPaginationBase.h>
 #include <aws/servicediscovery/ServiceDiscoveryRequest.h>
 #include <aws/servicediscovery/ServiceDiscoveryServiceClientModel.h>
+#include <aws/servicediscovery/ServiceDiscoveryWaiter.h>
 #include <aws/servicediscovery/ServiceDiscovery_EXPORTS.h>
+#include <aws/servicediscovery/internal/ServiceDiscoveryEndpointRules.h>
 #include <aws/servicediscovery/model/CreateHttpNamespaceRequest.h>
 #include <aws/servicediscovery/model/CreateHttpNamespaceResult.h>
 #include <aws/servicediscovery/model/CreatePrivateDnsNamespaceRequest.h>
@@ -42,6 +46,7 @@
 #include <aws/servicediscovery/model/FilterCondition.h>
 #include <aws/servicediscovery/model/GetInstanceRequest.h>
 #include <aws/servicediscovery/model/GetInstanceResult.h>
+#include <aws/servicediscovery/model/GetInstancesHealthStatusPaginationTraits.h>
 #include <aws/servicediscovery/model/GetInstancesHealthStatusRequest.h>
 #include <aws/servicediscovery/model/GetInstancesHealthStatusResult.h>
 #include <aws/servicediscovery/model/GetNamespaceRequest.h>
@@ -62,12 +67,16 @@
 #include <aws/servicediscovery/model/HttpProperties.h>
 #include <aws/servicediscovery/model/Instance.h>
 #include <aws/servicediscovery/model/InstanceSummary.h>
+#include <aws/servicediscovery/model/ListInstancesPaginationTraits.h>
 #include <aws/servicediscovery/model/ListInstancesRequest.h>
 #include <aws/servicediscovery/model/ListInstancesResult.h>
+#include <aws/servicediscovery/model/ListNamespacesPaginationTraits.h>
 #include <aws/servicediscovery/model/ListNamespacesRequest.h>
 #include <aws/servicediscovery/model/ListNamespacesResult.h>
+#include <aws/servicediscovery/model/ListOperationsPaginationTraits.h>
 #include <aws/servicediscovery/model/ListOperationsRequest.h>
 #include <aws/servicediscovery/model/ListOperationsResult.h>
+#include <aws/servicediscovery/model/ListServicesPaginationTraits.h>
 #include <aws/servicediscovery/model/ListServicesRequest.h>
 #include <aws/servicediscovery/model/ListServicesResult.h>
 #include <aws/servicediscovery/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/sesv2-gen-tests/SESV2IncludeTests.cpp b/generated/tests/sesv2-gen-tests/SESV2IncludeTests.cpp
index 076857097e6e..f71dfed9b1f1 100644
--- a/generated/tests/sesv2-gen-tests/SESV2IncludeTests.cpp
+++ b/generated/tests/sesv2-gen-tests/SESV2IncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/sesv2/SESV2Client.h>
+#include <aws/sesv2/SESV2ClientPagination.h>
 #include <aws/sesv2/SESV2EndpointProvider.h>
 #include <aws/sesv2/SESV2ErrorMarshaller.h>
 #include <aws/sesv2/SESV2Errors.h>
+#include <aws/sesv2/SESV2PaginationBase.h>
 #include <aws/sesv2/SESV2Request.h>
 #include <aws/sesv2/SESV2ServiceClientModel.h>
+#include <aws/sesv2/SESV2Waiter.h>
 #include <aws/sesv2/SESV2_EXPORTS.h>
+#include <aws/sesv2/internal/SESV2EndpointRules.h>
 #include <aws/sesv2/model/AccountDetails.h>
 #include <aws/sesv2/model/ArchivingOptions.h>
 #include <aws/sesv2/model/Attachment.h>
@@ -159,6 +163,7 @@
 #include <aws/sesv2/model/GetDedicatedIpPoolResult.h>
 #include <aws/sesv2/model/GetDedicatedIpRequest.h>
 #include <aws/sesv2/model/GetDedicatedIpResult.h>
+#include <aws/sesv2/model/GetDedicatedIpsPaginationTraits.h>
 #include <aws/sesv2/model/GetDedicatedIpsRequest.h>
 #include <aws/sesv2/model/GetDedicatedIpsResult.h>
 #include <aws/sesv2/model/GetDeliverabilityDashboardOptionsRequest.h>
@@ -205,46 +210,64 @@
 #include <aws/sesv2/model/IspPlacement.h>
 #include <aws/sesv2/model/JobStatus.h>
 #include <aws/sesv2/model/KinesisFirehoseDestination.h>
+#include <aws/sesv2/model/ListConfigurationSetsPaginationTraits.h>
 #include <aws/sesv2/model/ListConfigurationSetsRequest.h>
 #include <aws/sesv2/model/ListConfigurationSetsResult.h>
+#include <aws/sesv2/model/ListContactListsPaginationTraits.h>
 #include <aws/sesv2/model/ListContactListsRequest.h>
 #include <aws/sesv2/model/ListContactListsResult.h>
 #include <aws/sesv2/model/ListContactsFilter.h>
+#include <aws/sesv2/model/ListContactsPaginationTraits.h>
 #include <aws/sesv2/model/ListContactsRequest.h>
 #include <aws/sesv2/model/ListContactsResult.h>
+#include <aws/sesv2/model/ListCustomVerificationEmailTemplatesPaginationTraits.h>
 #include <aws/sesv2/model/ListCustomVerificationEmailTemplatesRequest.h>
 #include <aws/sesv2/model/ListCustomVerificationEmailTemplatesResult.h>
+#include <aws/sesv2/model/ListDedicatedIpPoolsPaginationTraits.h>
 #include <aws/sesv2/model/ListDedicatedIpPoolsRequest.h>
 #include <aws/sesv2/model/ListDedicatedIpPoolsResult.h>
+#include <aws/sesv2/model/ListDeliverabilityTestReportsPaginationTraits.h>
 #include <aws/sesv2/model/ListDeliverabilityTestReportsRequest.h>
 #include <aws/sesv2/model/ListDeliverabilityTestReportsResult.h>
+#include <aws/sesv2/model/ListDomainDeliverabilityCampaignsPaginationTraits.h>
 #include <aws/sesv2/model/ListDomainDeliverabilityCampaignsRequest.h>
 #include <aws/sesv2/model/ListDomainDeliverabilityCampaignsResult.h>
+#include <aws/sesv2/model/ListEmailIdentitiesPaginationTraits.h>
 #include <aws/sesv2/model/ListEmailIdentitiesRequest.h>
 #include <aws/sesv2/model/ListEmailIdentitiesResult.h>
+#include <aws/sesv2/model/ListEmailTemplatesPaginationTraits.h>
 #include <aws/sesv2/model/ListEmailTemplatesRequest.h>
 #include <aws/sesv2/model/ListEmailTemplatesResult.h>
+#include <aws/sesv2/model/ListExportJobsPaginationTraits.h>
 #include <aws/sesv2/model/ListExportJobsRequest.h>
 #include <aws/sesv2/model/ListExportJobsResult.h>
+#include <aws/sesv2/model/ListImportJobsPaginationTraits.h>
 #include <aws/sesv2/model/ListImportJobsRequest.h>
 #include <aws/sesv2/model/ListImportJobsResult.h>
 #include <aws/sesv2/model/ListManagementOptions.h>
+#include <aws/sesv2/model/ListMultiRegionEndpointsPaginationTraits.h>
 #include <aws/sesv2/model/ListMultiRegionEndpointsRequest.h>
 #include <aws/sesv2/model/ListMultiRegionEndpointsResult.h>
 #include <aws/sesv2/model/ListRecommendationsFilterKey.h>
+#include <aws/sesv2/model/ListRecommendationsPaginationTraits.h>
 #include <aws/sesv2/model/ListRecommendationsRequest.h>
 #include <aws/sesv2/model/ListRecommendationsResult.h>
+#include <aws/sesv2/model/ListReputationEntitiesPaginationTraits.h>
 #include <aws/sesv2/model/ListReputationEntitiesRequest.h>
 #include <aws/sesv2/model/ListReputationEntitiesResult.h>
+#include <aws/sesv2/model/ListResourceTenantsPaginationTraits.h>
 #include <aws/sesv2/model/ListResourceTenantsRequest.h>
 #include <aws/sesv2/model/ListResourceTenantsResult.h>
+#include <aws/sesv2/model/ListSuppressedDestinationsPaginationTraits.h>
 #include <aws/sesv2/model/ListSuppressedDestinationsRequest.h>
 #include <aws/sesv2/model/ListSuppressedDestinationsResult.h>
 #include <aws/sesv2/model/ListTagsForResourceRequest.h>
 #include <aws/sesv2/model/ListTagsForResourceResult.h>
 #include <aws/sesv2/model/ListTenantResourcesFilterKey.h>
+#include <aws/sesv2/model/ListTenantResourcesPaginationTraits.h>
 #include <aws/sesv2/model/ListTenantResourcesRequest.h>
 #include <aws/sesv2/model/ListTenantResourcesResult.h>
+#include <aws/sesv2/model/ListTenantsPaginationTraits.h>
 #include <aws/sesv2/model/ListTenantsRequest.h>
 #include <aws/sesv2/model/ListTenantsResult.h>
 #include <aws/sesv2/model/MailFromAttributes.h>
diff --git a/generated/tests/shield-gen-tests/ShieldIncludeTests.cpp b/generated/tests/shield-gen-tests/ShieldIncludeTests.cpp
index 8a498b999f8d..76b9654c6704 100644
--- a/generated/tests/shield-gen-tests/ShieldIncludeTests.cpp
+++ b/generated/tests/shield-gen-tests/ShieldIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/shield/ShieldClient.h>
+#include <aws/shield/ShieldClientPagination.h>
 #include <aws/shield/ShieldEndpointProvider.h>
 #include <aws/shield/ShieldErrorMarshaller.h>
 #include <aws/shield/ShieldErrors.h>
+#include <aws/shield/ShieldPaginationBase.h>
 #include <aws/shield/ShieldRequest.h>
 #include <aws/shield/ShieldServiceClientModel.h>
+#include <aws/shield/ShieldWaiter.h>
 #include <aws/shield/Shield_EXPORTS.h>
+#include <aws/shield/internal/ShieldEndpointRules.h>
 #include <aws/shield/model/ApplicationLayerAutomaticResponseConfiguration.h>
 #include <aws/shield/model/ApplicationLayerAutomaticResponseStatus.h>
 #include <aws/shield/model/AssociateDRTLogBucketRequest.h>
@@ -82,12 +86,16 @@
 #include <aws/shield/model/InvalidParameterException.h>
 #include <aws/shield/model/Limit.h>
 #include <aws/shield/model/LimitsExceededException.h>
+#include <aws/shield/model/ListAttacksPaginationTraits.h>
 #include <aws/shield/model/ListAttacksRequest.h>
 #include <aws/shield/model/ListAttacksResult.h>
+#include <aws/shield/model/ListProtectionGroupsPaginationTraits.h>
 #include <aws/shield/model/ListProtectionGroupsRequest.h>
 #include <aws/shield/model/ListProtectionGroupsResult.h>
+#include <aws/shield/model/ListProtectionsPaginationTraits.h>
 #include <aws/shield/model/ListProtectionsRequest.h>
 #include <aws/shield/model/ListProtectionsResult.h>
+#include <aws/shield/model/ListResourcesInProtectionGroupPaginationTraits.h>
 #include <aws/shield/model/ListResourcesInProtectionGroupRequest.h>
 #include <aws/shield/model/ListResourcesInProtectionGroupResult.h>
 #include <aws/shield/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/signer-data-gen-tests/SignerDataIncludeTests.cpp b/generated/tests/signer-data-gen-tests/SignerDataIncludeTests.cpp
index 451ff9321304..03d115ca9c67 100644
--- a/generated/tests/signer-data-gen-tests/SignerDataIncludeTests.cpp
+++ b/generated/tests/signer-data-gen-tests/SignerDataIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/signer-data/SignerDataEndpointProvider.h>
 #include <aws/signer-data/SignerDataErrorMarshaller.h>
 #include <aws/signer-data/SignerDataErrors.h>
+#include <aws/signer-data/SignerDataPaginationBase.h>
 #include <aws/signer-data/SignerDataRequest.h>
 #include <aws/signer-data/SignerDataServiceClientModel.h>
+#include <aws/signer-data/SignerDataWaiter.h>
 #include <aws/signer-data/SignerData_EXPORTS.h>
+#include <aws/signer-data/internal/SignerDataEndpointRules.h>
 #include <aws/signer-data/model/AccessDeniedException.h>
 #include <aws/signer-data/model/GetRevocationStatusRequest.h>
 #include <aws/signer-data/model/GetRevocationStatusResult.h>
diff --git a/generated/tests/signer-gen-tests/SignerIncludeTests.cpp b/generated/tests/signer-gen-tests/SignerIncludeTests.cpp
index 13aebbde25bf..566b50e3875a 100644
--- a/generated/tests/signer-gen-tests/SignerIncludeTests.cpp
+++ b/generated/tests/signer-gen-tests/SignerIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/signer/SignerClient.h>
+#include <aws/signer/SignerClientPagination.h>
 #include <aws/signer/SignerEndpointProvider.h>
 #include <aws/signer/SignerErrorMarshaller.h>
 #include <aws/signer/SignerErrors.h>
+#include <aws/signer/SignerPaginationBase.h>
 #include <aws/signer/SignerRequest.h>
 #include <aws/signer/SignerServiceClientModel.h>
+#include <aws/signer/SignerWaiter.h>
 #include <aws/signer/Signer_EXPORTS.h>
+#include <aws/signer/internal/SignerEndpointRules.h>
 #include <aws/signer/model/AccessDeniedException.h>
 #include <aws/signer/model/AddProfilePermissionRequest.h>
 #include <aws/signer/model/AddProfilePermissionResult.h>
@@ -37,10 +41,13 @@
 #include <aws/signer/model/InternalServiceErrorException.h>
 #include <aws/signer/model/ListProfilePermissionsRequest.h>
 #include <aws/signer/model/ListProfilePermissionsResult.h>
+#include <aws/signer/model/ListSigningJobsPaginationTraits.h>
 #include <aws/signer/model/ListSigningJobsRequest.h>
 #include <aws/signer/model/ListSigningJobsResult.h>
+#include <aws/signer/model/ListSigningPlatformsPaginationTraits.h>
 #include <aws/signer/model/ListSigningPlatformsRequest.h>
 #include <aws/signer/model/ListSigningPlatformsResult.h>
+#include <aws/signer/model/ListSigningProfilesPaginationTraits.h>
 #include <aws/signer/model/ListSigningProfilesRequest.h>
 #include <aws/signer/model/ListSigningProfilesResult.h>
 #include <aws/signer/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/signin-gen-tests/SigninIncludeTests.cpp b/generated/tests/signin-gen-tests/SigninIncludeTests.cpp
index a6456baa72af..94b6eba08a27 100644
--- a/generated/tests/signin-gen-tests/SigninIncludeTests.cpp
+++ b/generated/tests/signin-gen-tests/SigninIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/signin/SigninClient.h>
+#include <aws/signin/SigninClientPagination.h>
 #include <aws/signin/SigninEndpointProvider.h>
 #include <aws/signin/SigninErrorMarshaller.h>
 #include <aws/signin/SigninErrors.h>
+#include <aws/signin/SigninPaginationBase.h>
 #include <aws/signin/SigninRequest.h>
 #include <aws/signin/SigninServiceClientModel.h>
+#include <aws/signin/SigninWaiter.h>
 #include <aws/signin/Signin_EXPORTS.h>
+#include <aws/signin/internal/SigninEndpointRules.h>
 #include <aws/signin/model/AccessDeniedException.h>
 #include <aws/signin/model/AccessToken.h>
 #include <aws/signin/model/ConflictException.h>
@@ -33,6 +37,7 @@
 #include <aws/signin/model/InternalServerException.h>
 #include <aws/signin/model/IntrospectOAuth2TokenWithIAMRequest.h>
 #include <aws/signin/model/IntrospectOAuth2TokenWithIAMResult.h>
+#include <aws/signin/model/ListResourcePermissionStatementsPaginationTraits.h>
 #include <aws/signin/model/ListResourcePermissionStatementsRequest.h>
 #include <aws/signin/model/ListResourcePermissionStatementsResult.h>
 #include <aws/signin/model/OAuth2ErrorCode.h>
diff --git a/generated/tests/simpledbv2-gen-tests/SimpleDBv2IncludeTests.cpp b/generated/tests/simpledbv2-gen-tests/SimpleDBv2IncludeTests.cpp
index 9e0a32a1b8ab..dc7a1c0fe9bb 100644
--- a/generated/tests/simpledbv2-gen-tests/SimpleDBv2IncludeTests.cpp
+++ b/generated/tests/simpledbv2-gen-tests/SimpleDBv2IncludeTests.cpp
@@ -7,16 +7,21 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/simpledbv2/SimpleDBv2Client.h>
+#include <aws/simpledbv2/SimpleDBv2ClientPagination.h>
 #include <aws/simpledbv2/SimpleDBv2EndpointProvider.h>
 #include <aws/simpledbv2/SimpleDBv2ErrorMarshaller.h>
 #include <aws/simpledbv2/SimpleDBv2Errors.h>
+#include <aws/simpledbv2/SimpleDBv2PaginationBase.h>
 #include <aws/simpledbv2/SimpleDBv2Request.h>
 #include <aws/simpledbv2/SimpleDBv2ServiceClientModel.h>
+#include <aws/simpledbv2/SimpleDBv2Waiter.h>
 #include <aws/simpledbv2/SimpleDBv2_EXPORTS.h>
+#include <aws/simpledbv2/internal/SimpleDBv2EndpointRules.h>
 #include <aws/simpledbv2/model/ExportStatus.h>
 #include <aws/simpledbv2/model/ExportSummary.h>
 #include <aws/simpledbv2/model/GetExportRequest.h>
 #include <aws/simpledbv2/model/GetExportResult.h>
+#include <aws/simpledbv2/model/ListExportsPaginationTraits.h>
 #include <aws/simpledbv2/model/ListExportsRequest.h>
 #include <aws/simpledbv2/model/ListExportsResult.h>
 #include <aws/simpledbv2/model/S3SseAlgorithm.h>
diff --git a/generated/tests/sms-voice-gen-tests/PinpointSMSVoiceIncludeTests.cpp b/generated/tests/sms-voice-gen-tests/PinpointSMSVoiceIncludeTests.cpp
index e2cf0712e6c0..797256959df3 100644
--- a/generated/tests/sms-voice-gen-tests/PinpointSMSVoiceIncludeTests.cpp
+++ b/generated/tests/sms-voice-gen-tests/PinpointSMSVoiceIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/sms-voice/PinpointSMSVoiceEndpointProvider.h>
 #include <aws/sms-voice/PinpointSMSVoiceErrorMarshaller.h>
 #include <aws/sms-voice/PinpointSMSVoiceErrors.h>
+#include <aws/sms-voice/PinpointSMSVoicePaginationBase.h>
 #include <aws/sms-voice/PinpointSMSVoiceRequest.h>
 #include <aws/sms-voice/PinpointSMSVoiceServiceClientModel.h>
+#include <aws/sms-voice/PinpointSMSVoiceWaiter.h>
 #include <aws/sms-voice/PinpointSMSVoice_EXPORTS.h>
+#include <aws/sms-voice/internal/PinpointSMSVoiceEndpointRules.h>
 #include <aws/sms-voice/model/CallInstructionsMessageType.h>
 #include <aws/sms-voice/model/CloudWatchLogsDestination.h>
 #include <aws/sms-voice/model/CreateConfigurationSetEventDestinationRequest.h>
diff --git a/generated/tests/snow-device-management-gen-tests/SnowDeviceManagementIncludeTests.cpp b/generated/tests/snow-device-management-gen-tests/SnowDeviceManagementIncludeTests.cpp
index 4171a8c62fc2..dd98602a54cb 100644
--- a/generated/tests/snow-device-management-gen-tests/SnowDeviceManagementIncludeTests.cpp
+++ b/generated/tests/snow-device-management-gen-tests/SnowDeviceManagementIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/snow-device-management/SnowDeviceManagementClient.h>
+#include <aws/snow-device-management/SnowDeviceManagementClientPagination.h>
 #include <aws/snow-device-management/SnowDeviceManagementEndpointProvider.h>
 #include <aws/snow-device-management/SnowDeviceManagementErrorMarshaller.h>
 #include <aws/snow-device-management/SnowDeviceManagementErrors.h>
+#include <aws/snow-device-management/SnowDeviceManagementPaginationBase.h>
 #include <aws/snow-device-management/SnowDeviceManagementRequest.h>
 #include <aws/snow-device-management/SnowDeviceManagementServiceClientModel.h>
+#include <aws/snow-device-management/SnowDeviceManagementWaiter.h>
 #include <aws/snow-device-management/SnowDeviceManagement_EXPORTS.h>
+#include <aws/snow-device-management/internal/SnowDeviceManagementEndpointRules.h>
 #include <aws/snow-device-management/model/AttachmentStatus.h>
 #include <aws/snow-device-management/model/CancelTaskRequest.h>
 #include <aws/snow-device-management/model/CancelTaskResult.h>
@@ -39,14 +43,18 @@
 #include <aws/snow-device-management/model/InstanceStateName.h>
 #include <aws/snow-device-management/model/InstanceSummary.h>
 #include <aws/snow-device-management/model/IpAddressAssignment.h>
+#include <aws/snow-device-management/model/ListDeviceResourcesPaginationTraits.h>
 #include <aws/snow-device-management/model/ListDeviceResourcesRequest.h>
 #include <aws/snow-device-management/model/ListDeviceResourcesResult.h>
+#include <aws/snow-device-management/model/ListDevicesPaginationTraits.h>
 #include <aws/snow-device-management/model/ListDevicesRequest.h>
 #include <aws/snow-device-management/model/ListDevicesResult.h>
+#include <aws/snow-device-management/model/ListExecutionsPaginationTraits.h>
 #include <aws/snow-device-management/model/ListExecutionsRequest.h>
 #include <aws/snow-device-management/model/ListExecutionsResult.h>
 #include <aws/snow-device-management/model/ListTagsForResourceRequest.h>
 #include <aws/snow-device-management/model/ListTagsForResourceResult.h>
+#include <aws/snow-device-management/model/ListTasksPaginationTraits.h>
 #include <aws/snow-device-management/model/ListTasksRequest.h>
 #include <aws/snow-device-management/model/ListTasksResult.h>
 #include <aws/snow-device-management/model/PhysicalConnectorType.h>
diff --git a/generated/tests/snowball-gen-tests/SnowballIncludeTests.cpp b/generated/tests/snowball-gen-tests/SnowballIncludeTests.cpp
index 3f79e2ece0da..a0e09275c742 100644
--- a/generated/tests/snowball-gen-tests/SnowballIncludeTests.cpp
+++ b/generated/tests/snowball-gen-tests/SnowballIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/snowball/SnowballClient.h>
+#include <aws/snowball/SnowballClientPagination.h>
 #include <aws/snowball/SnowballEndpointProvider.h>
 #include <aws/snowball/SnowballErrorMarshaller.h>
 #include <aws/snowball/SnowballErrors.h>
+#include <aws/snowball/SnowballPaginationBase.h>
 #include <aws/snowball/SnowballRequest.h>
 #include <aws/snowball/SnowballServiceClientModel.h>
+#include <aws/snowball/SnowballWaiter.h>
 #include <aws/snowball/Snowball_EXPORTS.h>
+#include <aws/snowball/internal/SnowballEndpointRules.h>
 #include <aws/snowball/model/Address.h>
 #include <aws/snowball/model/AddressType.h>
 #include <aws/snowball/model/CancelClusterRequest.h>
@@ -38,6 +42,7 @@
 #include <aws/snowball/model/DependentService.h>
 #include <aws/snowball/model/DescribeAddressRequest.h>
 #include <aws/snowball/model/DescribeAddressResult.h>
+#include <aws/snowball/model/DescribeAddressesPaginationTraits.h>
 #include <aws/snowball/model/DescribeAddressesRequest.h>
 #include <aws/snowball/model/DescribeAddressesResult.h>
 #include <aws/snowball/model/DescribeClusterRequest.h>
@@ -70,16 +75,22 @@
 #include <aws/snowball/model/JobType.h>
 #include <aws/snowball/model/KeyRange.h>
 #include <aws/snowball/model/LambdaResource.h>
+#include <aws/snowball/model/ListClusterJobsPaginationTraits.h>
 #include <aws/snowball/model/ListClusterJobsRequest.h>
 #include <aws/snowball/model/ListClusterJobsResult.h>
+#include <aws/snowball/model/ListClustersPaginationTraits.h>
 #include <aws/snowball/model/ListClustersRequest.h>
 #include <aws/snowball/model/ListClustersResult.h>
+#include <aws/snowball/model/ListCompatibleImagesPaginationTraits.h>
 #include <aws/snowball/model/ListCompatibleImagesRequest.h>
 #include <aws/snowball/model/ListCompatibleImagesResult.h>
+#include <aws/snowball/model/ListJobsPaginationTraits.h>
 #include <aws/snowball/model/ListJobsRequest.h>
 #include <aws/snowball/model/ListJobsResult.h>
+#include <aws/snowball/model/ListLongTermPricingPaginationTraits.h>
 #include <aws/snowball/model/ListLongTermPricingRequest.h>
 #include <aws/snowball/model/ListLongTermPricingResult.h>
+#include <aws/snowball/model/ListPickupLocationsPaginationTraits.h>
 #include <aws/snowball/model/ListPickupLocationsRequest.h>
 #include <aws/snowball/model/ListPickupLocationsResult.h>
 #include <aws/snowball/model/ListServiceVersionsRequest.h>
diff --git a/generated/tests/sns-gen-tests/SNSIncludeTests.cpp b/generated/tests/sns-gen-tests/SNSIncludeTests.cpp
index 4bc7ae64a3e6..ae9913562e7e 100644
--- a/generated/tests/sns-gen-tests/SNSIncludeTests.cpp
+++ b/generated/tests/sns-gen-tests/SNSIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/sns/SNSClient.h>
+#include <aws/sns/SNSClientPagination.h>
 #include <aws/sns/SNSEndpointProvider.h>
 #include <aws/sns/SNSErrorMarshaller.h>
 #include <aws/sns/SNSErrors.h>
+#include <aws/sns/SNSPaginationBase.h>
 #include <aws/sns/SNSRequest.h>
 #include <aws/sns/SNSServiceClientModel.h>
+#include <aws/sns/SNSWaiter.h>
 #include <aws/sns/SNS_EXPORTS.h>
+#include <aws/sns/internal/SNSEndpointRules.h>
 #include <aws/sns/model/AddPermissionRequest.h>
 #include <aws/sns/model/BatchResultErrorEntry.h>
 #include <aws/sns/model/CheckIfPhoneNumberIsOptedOutRequest.h>
@@ -47,22 +51,30 @@
 #include <aws/sns/model/GetTopicAttributesRequest.h>
 #include <aws/sns/model/GetTopicAttributesResult.h>
 #include <aws/sns/model/LanguageCodeString.h>
+#include <aws/sns/model/ListEndpointsByPlatformApplicationPaginationTraits.h>
 #include <aws/sns/model/ListEndpointsByPlatformApplicationRequest.h>
 #include <aws/sns/model/ListEndpointsByPlatformApplicationResult.h>
+#include <aws/sns/model/ListOriginationNumbersPaginationTraits.h>
 #include <aws/sns/model/ListOriginationNumbersRequest.h>
 #include <aws/sns/model/ListOriginationNumbersResult.h>
+#include <aws/sns/model/ListPhoneNumbersOptedOutPaginationTraits.h>
 #include <aws/sns/model/ListPhoneNumbersOptedOutRequest.h>
 #include <aws/sns/model/ListPhoneNumbersOptedOutResult.h>
+#include <aws/sns/model/ListPlatformApplicationsPaginationTraits.h>
 #include <aws/sns/model/ListPlatformApplicationsRequest.h>
 #include <aws/sns/model/ListPlatformApplicationsResult.h>
+#include <aws/sns/model/ListSMSSandboxPhoneNumbersPaginationTraits.h>
 #include <aws/sns/model/ListSMSSandboxPhoneNumbersRequest.h>
 #include <aws/sns/model/ListSMSSandboxPhoneNumbersResult.h>
+#include <aws/sns/model/ListSubscriptionsByTopicPaginationTraits.h>
 #include <aws/sns/model/ListSubscriptionsByTopicRequest.h>
 #include <aws/sns/model/ListSubscriptionsByTopicResult.h>
+#include <aws/sns/model/ListSubscriptionsPaginationTraits.h>
 #include <aws/sns/model/ListSubscriptionsRequest.h>
 #include <aws/sns/model/ListSubscriptionsResult.h>
 #include <aws/sns/model/ListTagsForResourceRequest.h>
 #include <aws/sns/model/ListTagsForResourceResult.h>
+#include <aws/sns/model/ListTopicsPaginationTraits.h>
 #include <aws/sns/model/ListTopicsRequest.h>
 #include <aws/sns/model/ListTopicsResult.h>
 #include <aws/sns/model/MessageAttributeValue.h>
diff --git a/generated/tests/socialmessaging-gen-tests/SocialMessagingIncludeTests.cpp b/generated/tests/socialmessaging-gen-tests/SocialMessagingIncludeTests.cpp
index fe71e05aa42a..4cef25fa8fd0 100644
--- a/generated/tests/socialmessaging-gen-tests/SocialMessagingIncludeTests.cpp
+++ b/generated/tests/socialmessaging-gen-tests/SocialMessagingIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/socialmessaging/SocialMessagingClient.h>
+#include <aws/socialmessaging/SocialMessagingClientPagination.h>
 #include <aws/socialmessaging/SocialMessagingEndpointProvider.h>
 #include <aws/socialmessaging/SocialMessagingErrorMarshaller.h>
 #include <aws/socialmessaging/SocialMessagingErrors.h>
+#include <aws/socialmessaging/SocialMessagingPaginationBase.h>
 #include <aws/socialmessaging/SocialMessagingRequest.h>
 #include <aws/socialmessaging/SocialMessagingServiceClientModel.h>
+#include <aws/socialmessaging/SocialMessagingWaiter.h>
 #include <aws/socialmessaging/SocialMessaging_EXPORTS.h>
+#include <aws/socialmessaging/internal/SocialMessagingEndpointRules.h>
 #include <aws/socialmessaging/model/AssociateWhatsAppBusinessAccountRequest.h>
 #include <aws/socialmessaging/model/AssociateWhatsAppBusinessAccountResult.h>
 #include <aws/socialmessaging/model/CreateWhatsAppDatasetRequest.h>
@@ -53,16 +57,21 @@
 #include <aws/socialmessaging/model/LinkedWhatsAppBusinessAccount.h>
 #include <aws/socialmessaging/model/LinkedWhatsAppBusinessAccountIdMetaData.h>
 #include <aws/socialmessaging/model/LinkedWhatsAppBusinessAccountSummary.h>
+#include <aws/socialmessaging/model/ListLinkedWhatsAppBusinessAccountsPaginationTraits.h>
 #include <aws/socialmessaging/model/ListLinkedWhatsAppBusinessAccountsRequest.h>
 #include <aws/socialmessaging/model/ListLinkedWhatsAppBusinessAccountsResult.h>
 #include <aws/socialmessaging/model/ListTagsForResourceRequest.h>
 #include <aws/socialmessaging/model/ListTagsForResourceResult.h>
+#include <aws/socialmessaging/model/ListWhatsAppFlowAssetsPaginationTraits.h>
 #include <aws/socialmessaging/model/ListWhatsAppFlowAssetsRequest.h>
 #include <aws/socialmessaging/model/ListWhatsAppFlowAssetsResult.h>
+#include <aws/socialmessaging/model/ListWhatsAppFlowsPaginationTraits.h>
 #include <aws/socialmessaging/model/ListWhatsAppFlowsRequest.h>
 #include <aws/socialmessaging/model/ListWhatsAppFlowsResult.h>
+#include <aws/socialmessaging/model/ListWhatsAppMessageTemplatesPaginationTraits.h>
 #include <aws/socialmessaging/model/ListWhatsAppMessageTemplatesRequest.h>
 #include <aws/socialmessaging/model/ListWhatsAppMessageTemplatesResult.h>
+#include <aws/socialmessaging/model/ListWhatsAppTemplateLibraryPaginationTraits.h>
 #include <aws/socialmessaging/model/ListWhatsAppTemplateLibraryRequest.h>
 #include <aws/socialmessaging/model/ListWhatsAppTemplateLibraryResult.h>
 #include <aws/socialmessaging/model/MetaFlowApplicationInfo.h>
diff --git a/generated/tests/sqs-gen-tests/SQSIncludeTests.cpp b/generated/tests/sqs-gen-tests/SQSIncludeTests.cpp
index e40a2310f126..abc0985850d8 100644
--- a/generated/tests/sqs-gen-tests/SQSIncludeTests.cpp
+++ b/generated/tests/sqs-gen-tests/SQSIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/sqs/SQSClient.h>
+#include <aws/sqs/SQSClientPagination.h>
 #include <aws/sqs/SQSEndpointProvider.h>
 #include <aws/sqs/SQSErrorMarshaller.h>
 #include <aws/sqs/SQSErrors.h>
+#include <aws/sqs/SQSPaginationBase.h>
 #include <aws/sqs/SQSRequest.h>
 #include <aws/sqs/SQSServiceClientModel.h>
+#include <aws/sqs/SQSWaiter.h>
 #include <aws/sqs/SQS_EXPORTS.h>
+#include <aws/sqs/internal/SQSEndpointRules.h>
 #include <aws/sqs/model/AddPermissionRequest.h>
 #include <aws/sqs/model/BatchResultErrorEntry.h>
 #include <aws/sqs/model/CancelMessageMoveTaskRequest.h>
@@ -34,6 +38,7 @@
 #include <aws/sqs/model/GetQueueAttributesResult.h>
 #include <aws/sqs/model/GetQueueUrlRequest.h>
 #include <aws/sqs/model/GetQueueUrlResult.h>
+#include <aws/sqs/model/ListDeadLetterSourceQueuesPaginationTraits.h>
 #include <aws/sqs/model/ListDeadLetterSourceQueuesRequest.h>
 #include <aws/sqs/model/ListDeadLetterSourceQueuesResult.h>
 #include <aws/sqs/model/ListMessageMoveTasksRequest.h>
@@ -41,6 +46,7 @@
 #include <aws/sqs/model/ListMessageMoveTasksResultEntry.h>
 #include <aws/sqs/model/ListQueueTagsRequest.h>
 #include <aws/sqs/model/ListQueueTagsResult.h>
+#include <aws/sqs/model/ListQueuesPaginationTraits.h>
 #include <aws/sqs/model/ListQueuesRequest.h>
 #include <aws/sqs/model/ListQueuesResult.h>
 #include <aws/sqs/model/Message.h>
diff --git a/generated/tests/ssm-contacts-gen-tests/SSMContactsIncludeTests.cpp b/generated/tests/ssm-contacts-gen-tests/SSMContactsIncludeTests.cpp
index 51b0722f2d5c..f941bf089514 100644
--- a/generated/tests/ssm-contacts-gen-tests/SSMContactsIncludeTests.cpp
+++ b/generated/tests/ssm-contacts-gen-tests/SSMContactsIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/ssm-contacts/SSMContactsClient.h>
+#include <aws/ssm-contacts/SSMContactsClientPagination.h>
 #include <aws/ssm-contacts/SSMContactsEndpointProvider.h>
 #include <aws/ssm-contacts/SSMContactsErrorMarshaller.h>
 #include <aws/ssm-contacts/SSMContactsErrors.h>
+#include <aws/ssm-contacts/SSMContactsPaginationBase.h>
 #include <aws/ssm-contacts/SSMContactsRequest.h>
 #include <aws/ssm-contacts/SSMContactsServiceClientModel.h>
+#include <aws/ssm-contacts/SSMContactsWaiter.h>
 #include <aws/ssm-contacts/SSMContacts_EXPORTS.h>
+#include <aws/ssm-contacts/internal/SSMContactsEndpointRules.h>
 #include <aws/ssm-contacts/model/AcceptCodeValidation.h>
 #include <aws/ssm-contacts/model/AcceptPageRequest.h>
 #include <aws/ssm-contacts/model/AcceptPageResult.h>
@@ -66,26 +70,37 @@
 #include <aws/ssm-contacts/model/GetRotationResult.h>
 #include <aws/ssm-contacts/model/HandOffTime.h>
 #include <aws/ssm-contacts/model/InternalServerException.h>
+#include <aws/ssm-contacts/model/ListContactChannelsPaginationTraits.h>
 #include <aws/ssm-contacts/model/ListContactChannelsRequest.h>
 #include <aws/ssm-contacts/model/ListContactChannelsResult.h>
+#include <aws/ssm-contacts/model/ListContactsPaginationTraits.h>
 #include <aws/ssm-contacts/model/ListContactsRequest.h>
 #include <aws/ssm-contacts/model/ListContactsResult.h>
+#include <aws/ssm-contacts/model/ListEngagementsPaginationTraits.h>
 #include <aws/ssm-contacts/model/ListEngagementsRequest.h>
 #include <aws/ssm-contacts/model/ListEngagementsResult.h>
+#include <aws/ssm-contacts/model/ListPageReceiptsPaginationTraits.h>
 #include <aws/ssm-contacts/model/ListPageReceiptsRequest.h>
 #include <aws/ssm-contacts/model/ListPageReceiptsResult.h>
+#include <aws/ssm-contacts/model/ListPageResolutionsPaginationTraits.h>
 #include <aws/ssm-contacts/model/ListPageResolutionsRequest.h>
 #include <aws/ssm-contacts/model/ListPageResolutionsResult.h>
+#include <aws/ssm-contacts/model/ListPagesByContactPaginationTraits.h>
 #include <aws/ssm-contacts/model/ListPagesByContactRequest.h>
 #include <aws/ssm-contacts/model/ListPagesByContactResult.h>
+#include <aws/ssm-contacts/model/ListPagesByEngagementPaginationTraits.h>
 #include <aws/ssm-contacts/model/ListPagesByEngagementRequest.h>
 #include <aws/ssm-contacts/model/ListPagesByEngagementResult.h>
+#include <aws/ssm-contacts/model/ListPreviewRotationShiftsPaginationTraits.h>
 #include <aws/ssm-contacts/model/ListPreviewRotationShiftsRequest.h>
 #include <aws/ssm-contacts/model/ListPreviewRotationShiftsResult.h>
+#include <aws/ssm-contacts/model/ListRotationOverridesPaginationTraits.h>
 #include <aws/ssm-contacts/model/ListRotationOverridesRequest.h>
 #include <aws/ssm-contacts/model/ListRotationOverridesResult.h>
+#include <aws/ssm-contacts/model/ListRotationShiftsPaginationTraits.h>
 #include <aws/ssm-contacts/model/ListRotationShiftsRequest.h>
 #include <aws/ssm-contacts/model/ListRotationShiftsResult.h>
+#include <aws/ssm-contacts/model/ListRotationsPaginationTraits.h>
 #include <aws/ssm-contacts/model/ListRotationsRequest.h>
 #include <aws/ssm-contacts/model/ListRotationsResult.h>
 #include <aws/ssm-contacts/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/ssm-gen-tests/SSMIncludeTests.cpp b/generated/tests/ssm-gen-tests/SSMIncludeTests.cpp
index a43ebc8c4418..ed8dee1521e2 100644
--- a/generated/tests/ssm-gen-tests/SSMIncludeTests.cpp
+++ b/generated/tests/ssm-gen-tests/SSMIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/ssm/SSMClient.h>
+#include <aws/ssm/SSMClientPagination.h>
 #include <aws/ssm/SSMEndpointProvider.h>
 #include <aws/ssm/SSMErrorMarshaller.h>
 #include <aws/ssm/SSMErrors.h>
+#include <aws/ssm/SSMPaginationBase.h>
 #include <aws/ssm/SSMRequest.h>
 #include <aws/ssm/SSMServiceClientModel.h>
+#include <aws/ssm/SSMWaiter.h>
 #include <aws/ssm/SSM_EXPORTS.h>
+#include <aws/ssm/internal/SSMEndpointRules.h>
 #include <aws/ssm/model/AccessRequestStatus.h>
 #include <aws/ssm/model/AccessType.h>
 #include <aws/ssm/model/AccountSharingInfo.h>
@@ -146,70 +150,99 @@
 #include <aws/ssm/model/DeregisterTaskFromMaintenanceWindowResult.h>
 #include <aws/ssm/model/DescribeActivationsFilter.h>
 #include <aws/ssm/model/DescribeActivationsFilterKeys.h>
+#include <aws/ssm/model/DescribeActivationsPaginationTraits.h>
 #include <aws/ssm/model/DescribeActivationsRequest.h>
 #include <aws/ssm/model/DescribeActivationsResult.h>
+#include <aws/ssm/model/DescribeAssociationExecutionTargetsPaginationTraits.h>
 #include <aws/ssm/model/DescribeAssociationExecutionTargetsRequest.h>
 #include <aws/ssm/model/DescribeAssociationExecutionTargetsResult.h>
+#include <aws/ssm/model/DescribeAssociationExecutionsPaginationTraits.h>
 #include <aws/ssm/model/DescribeAssociationExecutionsRequest.h>
 #include <aws/ssm/model/DescribeAssociationExecutionsResult.h>
 #include <aws/ssm/model/DescribeAssociationRequest.h>
 #include <aws/ssm/model/DescribeAssociationResult.h>
+#include <aws/ssm/model/DescribeAutomationExecutionsPaginationTraits.h>
 #include <aws/ssm/model/DescribeAutomationExecutionsRequest.h>
 #include <aws/ssm/model/DescribeAutomationExecutionsResult.h>
+#include <aws/ssm/model/DescribeAutomationStepExecutionsPaginationTraits.h>
 #include <aws/ssm/model/DescribeAutomationStepExecutionsRequest.h>
 #include <aws/ssm/model/DescribeAutomationStepExecutionsResult.h>
+#include <aws/ssm/model/DescribeAvailablePatchesPaginationTraits.h>
 #include <aws/ssm/model/DescribeAvailablePatchesRequest.h>
 #include <aws/ssm/model/DescribeAvailablePatchesResult.h>
 #include <aws/ssm/model/DescribeDocumentPermissionRequest.h>
 #include <aws/ssm/model/DescribeDocumentPermissionResult.h>
 #include <aws/ssm/model/DescribeDocumentRequest.h>
 #include <aws/ssm/model/DescribeDocumentResult.h>
+#include <aws/ssm/model/DescribeEffectiveInstanceAssociationsPaginationTraits.h>
 #include <aws/ssm/model/DescribeEffectiveInstanceAssociationsRequest.h>
 #include <aws/ssm/model/DescribeEffectiveInstanceAssociationsResult.h>
+#include <aws/ssm/model/DescribeEffectivePatchesForPatchBaselinePaginationTraits.h>
 #include <aws/ssm/model/DescribeEffectivePatchesForPatchBaselineRequest.h>
 #include <aws/ssm/model/DescribeEffectivePatchesForPatchBaselineResult.h>
+#include <aws/ssm/model/DescribeInstanceAssociationsStatusPaginationTraits.h>
 #include <aws/ssm/model/DescribeInstanceAssociationsStatusRequest.h>
 #include <aws/ssm/model/DescribeInstanceAssociationsStatusResult.h>
+#include <aws/ssm/model/DescribeInstanceInformationPaginationTraits.h>
 #include <aws/ssm/model/DescribeInstanceInformationRequest.h>
 #include <aws/ssm/model/DescribeInstanceInformationResult.h>
+#include <aws/ssm/model/DescribeInstancePatchStatesForPatchGroupPaginationTraits.h>
 #include <aws/ssm/model/DescribeInstancePatchStatesForPatchGroupRequest.h>
 #include <aws/ssm/model/DescribeInstancePatchStatesForPatchGroupResult.h>
+#include <aws/ssm/model/DescribeInstancePatchStatesPaginationTraits.h>
 #include <aws/ssm/model/DescribeInstancePatchStatesRequest.h>
 #include <aws/ssm/model/DescribeInstancePatchStatesResult.h>
+#include <aws/ssm/model/DescribeInstancePatchesPaginationTraits.h>
 #include <aws/ssm/model/DescribeInstancePatchesRequest.h>
 #include <aws/ssm/model/DescribeInstancePatchesResult.h>
+#include <aws/ssm/model/DescribeInstancePropertiesPaginationTraits.h>
 #include <aws/ssm/model/DescribeInstancePropertiesRequest.h>
 #include <aws/ssm/model/DescribeInstancePropertiesResult.h>
+#include <aws/ssm/model/DescribeInventoryDeletionsPaginationTraits.h>
 #include <aws/ssm/model/DescribeInventoryDeletionsRequest.h>
 #include <aws/ssm/model/DescribeInventoryDeletionsResult.h>
+#include <aws/ssm/model/DescribeMaintenanceWindowExecutionTaskInvocationsPaginationTraits.h>
 #include <aws/ssm/model/DescribeMaintenanceWindowExecutionTaskInvocationsRequest.h>
 #include <aws/ssm/model/DescribeMaintenanceWindowExecutionTaskInvocationsResult.h>
+#include <aws/ssm/model/DescribeMaintenanceWindowExecutionTasksPaginationTraits.h>
 #include <aws/ssm/model/DescribeMaintenanceWindowExecutionTasksRequest.h>
 #include <aws/ssm/model/DescribeMaintenanceWindowExecutionTasksResult.h>
+#include <aws/ssm/model/DescribeMaintenanceWindowExecutionsPaginationTraits.h>
 #include <aws/ssm/model/DescribeMaintenanceWindowExecutionsRequest.h>
 #include <aws/ssm/model/DescribeMaintenanceWindowExecutionsResult.h>
+#include <aws/ssm/model/DescribeMaintenanceWindowSchedulePaginationTraits.h>
 #include <aws/ssm/model/DescribeMaintenanceWindowScheduleRequest.h>
 #include <aws/ssm/model/DescribeMaintenanceWindowScheduleResult.h>
+#include <aws/ssm/model/DescribeMaintenanceWindowTargetsPaginationTraits.h>
 #include <aws/ssm/model/DescribeMaintenanceWindowTargetsRequest.h>
 #include <aws/ssm/model/DescribeMaintenanceWindowTargetsResult.h>
+#include <aws/ssm/model/DescribeMaintenanceWindowTasksPaginationTraits.h>
 #include <aws/ssm/model/DescribeMaintenanceWindowTasksRequest.h>
 #include <aws/ssm/model/DescribeMaintenanceWindowTasksResult.h>
+#include <aws/ssm/model/DescribeMaintenanceWindowsForTargetPaginationTraits.h>
 #include <aws/ssm/model/DescribeMaintenanceWindowsForTargetRequest.h>
 #include <aws/ssm/model/DescribeMaintenanceWindowsForTargetResult.h>
+#include <aws/ssm/model/DescribeMaintenanceWindowsPaginationTraits.h>
 #include <aws/ssm/model/DescribeMaintenanceWindowsRequest.h>
 #include <aws/ssm/model/DescribeMaintenanceWindowsResult.h>
+#include <aws/ssm/model/DescribeOpsItemsPaginationTraits.h>
 #include <aws/ssm/model/DescribeOpsItemsRequest.h>
 #include <aws/ssm/model/DescribeOpsItemsResult.h>
+#include <aws/ssm/model/DescribeParametersPaginationTraits.h>
 #include <aws/ssm/model/DescribeParametersRequest.h>
 #include <aws/ssm/model/DescribeParametersResult.h>
+#include <aws/ssm/model/DescribePatchBaselinesPaginationTraits.h>
 #include <aws/ssm/model/DescribePatchBaselinesRequest.h>
 #include <aws/ssm/model/DescribePatchBaselinesResult.h>
 #include <aws/ssm/model/DescribePatchGroupStateRequest.h>
 #include <aws/ssm/model/DescribePatchGroupStateResult.h>
+#include <aws/ssm/model/DescribePatchGroupsPaginationTraits.h>
 #include <aws/ssm/model/DescribePatchGroupsRequest.h>
 #include <aws/ssm/model/DescribePatchGroupsResult.h>
+#include <aws/ssm/model/DescribePatchPropertiesPaginationTraits.h>
 #include <aws/ssm/model/DescribePatchPropertiesRequest.h>
 #include <aws/ssm/model/DescribePatchPropertiesResult.h>
+#include <aws/ssm/model/DescribeSessionsPaginationTraits.h>
 #include <aws/ssm/model/DescribeSessionsRequest.h>
 #include <aws/ssm/model/DescribeSessionsResult.h>
 #include <aws/ssm/model/DisassociateOpsItemRelatedItemRequest.h>
@@ -265,8 +298,10 @@
 #include <aws/ssm/model/GetDocumentResult.h>
 #include <aws/ssm/model/GetExecutionPreviewRequest.h>
 #include <aws/ssm/model/GetExecutionPreviewResult.h>
+#include <aws/ssm/model/GetInventoryPaginationTraits.h>
 #include <aws/ssm/model/GetInventoryRequest.h>
 #include <aws/ssm/model/GetInventoryResult.h>
+#include <aws/ssm/model/GetInventorySchemaPaginationTraits.h>
 #include <aws/ssm/model/GetInventorySchemaRequest.h>
 #include <aws/ssm/model/GetInventorySchemaResult.h>
 #include <aws/ssm/model/GetMaintenanceWindowExecutionRequest.h>
@@ -283,12 +318,15 @@
 #include <aws/ssm/model/GetOpsItemResult.h>
 #include <aws/ssm/model/GetOpsMetadataRequest.h>
 #include <aws/ssm/model/GetOpsMetadataResult.h>
+#include <aws/ssm/model/GetOpsSummaryPaginationTraits.h>
 #include <aws/ssm/model/GetOpsSummaryRequest.h>
 #include <aws/ssm/model/GetOpsSummaryResult.h>
+#include <aws/ssm/model/GetParameterHistoryPaginationTraits.h>
 #include <aws/ssm/model/GetParameterHistoryRequest.h>
 #include <aws/ssm/model/GetParameterHistoryResult.h>
 #include <aws/ssm/model/GetParameterRequest.h>
 #include <aws/ssm/model/GetParameterResult.h>
+#include <aws/ssm/model/GetParametersByPathPaginationTraits.h>
 #include <aws/ssm/model/GetParametersByPathRequest.h>
 #include <aws/ssm/model/GetParametersByPathResult.h>
 #include <aws/ssm/model/GetParametersRequest.h>
@@ -297,6 +335,7 @@
 #include <aws/ssm/model/GetPatchBaselineForPatchGroupResult.h>
 #include <aws/ssm/model/GetPatchBaselineRequest.h>
 #include <aws/ssm/model/GetPatchBaselineResult.h>
+#include <aws/ssm/model/GetResourcePoliciesPaginationTraits.h>
 #include <aws/ssm/model/GetResourcePoliciesRequest.h>
 #include <aws/ssm/model/GetResourcePoliciesResponseEntry.h>
 #include <aws/ssm/model/GetResourcePoliciesResult.h>
@@ -342,40 +381,56 @@
 #include <aws/ssm/model/LabelParameterVersionRequest.h>
 #include <aws/ssm/model/LabelParameterVersionResult.h>
 #include <aws/ssm/model/LastResourceDataSyncStatus.h>
+#include <aws/ssm/model/ListAssociationVersionsPaginationTraits.h>
 #include <aws/ssm/model/ListAssociationVersionsRequest.h>
 #include <aws/ssm/model/ListAssociationVersionsResult.h>
+#include <aws/ssm/model/ListAssociationsPaginationTraits.h>
 #include <aws/ssm/model/ListAssociationsRequest.h>
 #include <aws/ssm/model/ListAssociationsResult.h>
+#include <aws/ssm/model/ListCloudConnectorsPaginationTraits.h>
 #include <aws/ssm/model/ListCloudConnectorsRequest.h>
 #include <aws/ssm/model/ListCloudConnectorsResult.h>
+#include <aws/ssm/model/ListCommandInvocationsPaginationTraits.h>
 #include <aws/ssm/model/ListCommandInvocationsRequest.h>
 #include <aws/ssm/model/ListCommandInvocationsResult.h>
+#include <aws/ssm/model/ListCommandsPaginationTraits.h>
 #include <aws/ssm/model/ListCommandsRequest.h>
 #include <aws/ssm/model/ListCommandsResult.h>
+#include <aws/ssm/model/ListComplianceItemsPaginationTraits.h>
 #include <aws/ssm/model/ListComplianceItemsRequest.h>
 #include <aws/ssm/model/ListComplianceItemsResult.h>
+#include <aws/ssm/model/ListComplianceSummariesPaginationTraits.h>
 #include <aws/ssm/model/ListComplianceSummariesRequest.h>
 #include <aws/ssm/model/ListComplianceSummariesResult.h>
 #include <aws/ssm/model/ListDocumentMetadataHistoryRequest.h>
 #include <aws/ssm/model/ListDocumentMetadataHistoryResult.h>
+#include <aws/ssm/model/ListDocumentVersionsPaginationTraits.h>
 #include <aws/ssm/model/ListDocumentVersionsRequest.h>
 #include <aws/ssm/model/ListDocumentVersionsResult.h>
+#include <aws/ssm/model/ListDocumentsPaginationTraits.h>
 #include <aws/ssm/model/ListDocumentsRequest.h>
 #include <aws/ssm/model/ListDocumentsResult.h>
 #include <aws/ssm/model/ListInventoryEntriesRequest.h>
 #include <aws/ssm/model/ListInventoryEntriesResult.h>
+#include <aws/ssm/model/ListNodesPaginationTraits.h>
 #include <aws/ssm/model/ListNodesRequest.h>
 #include <aws/ssm/model/ListNodesResult.h>
+#include <aws/ssm/model/ListNodesSummaryPaginationTraits.h>
 #include <aws/ssm/model/ListNodesSummaryRequest.h>
 #include <aws/ssm/model/ListNodesSummaryResult.h>
+#include <aws/ssm/model/ListOpsItemEventsPaginationTraits.h>
 #include <aws/ssm/model/ListOpsItemEventsRequest.h>
 #include <aws/ssm/model/ListOpsItemEventsResult.h>
+#include <aws/ssm/model/ListOpsItemRelatedItemsPaginationTraits.h>
 #include <aws/ssm/model/ListOpsItemRelatedItemsRequest.h>
 #include <aws/ssm/model/ListOpsItemRelatedItemsResult.h>
+#include <aws/ssm/model/ListOpsMetadataPaginationTraits.h>
 #include <aws/ssm/model/ListOpsMetadataRequest.h>
 #include <aws/ssm/model/ListOpsMetadataResult.h>
+#include <aws/ssm/model/ListResourceComplianceSummariesPaginationTraits.h>
 #include <aws/ssm/model/ListResourceComplianceSummariesRequest.h>
 #include <aws/ssm/model/ListResourceComplianceSummariesResult.h>
+#include <aws/ssm/model/ListResourceDataSyncPaginationTraits.h>
 #include <aws/ssm/model/ListResourceDataSyncRequest.h>
 #include <aws/ssm/model/ListResourceDataSyncResult.h>
 #include <aws/ssm/model/ListTagsForResourceRequest.h>
@@ -603,6 +658,7 @@
 #include <aws/ssm/model/UpdateResourceDataSyncResult.h>
 #include <aws/ssm/model/UpdateServiceSettingRequest.h>
 #include <aws/ssm/model/UpdateServiceSettingResult.h>
+#include <aws/ssm/model/ValidateCloudConnectorPaginationTraits.h>
 #include <aws/ssm/model/ValidateCloudConnectorRequest.h>
 #include <aws/ssm/model/ValidateCloudConnectorResult.h>
 #include <aws/ssm/model/ValidationException.h>
diff --git a/generated/tests/ssm-guiconnect-gen-tests/SSMGuiConnectIncludeTests.cpp b/generated/tests/ssm-guiconnect-gen-tests/SSMGuiConnectIncludeTests.cpp
index 75ff409d4b95..71fbd21d54ad 100644
--- a/generated/tests/ssm-guiconnect-gen-tests/SSMGuiConnectIncludeTests.cpp
+++ b/generated/tests/ssm-guiconnect-gen-tests/SSMGuiConnectIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/ssm-guiconnect/SSMGuiConnectEndpointProvider.h>
 #include <aws/ssm-guiconnect/SSMGuiConnectErrorMarshaller.h>
 #include <aws/ssm-guiconnect/SSMGuiConnectErrors.h>
+#include <aws/ssm-guiconnect/SSMGuiConnectPaginationBase.h>
 #include <aws/ssm-guiconnect/SSMGuiConnectRequest.h>
 #include <aws/ssm-guiconnect/SSMGuiConnectServiceClientModel.h>
+#include <aws/ssm-guiconnect/SSMGuiConnectWaiter.h>
 #include <aws/ssm-guiconnect/SSMGuiConnect_EXPORTS.h>
+#include <aws/ssm-guiconnect/internal/SSMGuiConnectEndpointRules.h>
 #include <aws/ssm-guiconnect/model/ConnectionRecordingPreferences.h>
 #include <aws/ssm-guiconnect/model/DeleteConnectionRecordingPreferencesRequest.h>
 #include <aws/ssm-guiconnect/model/DeleteConnectionRecordingPreferencesResult.h>
diff --git a/generated/tests/ssm-incidents-gen-tests/SSMIncidentsIncludeTests.cpp b/generated/tests/ssm-incidents-gen-tests/SSMIncidentsIncludeTests.cpp
index 4b389ceac40a..0f3e437c7106 100644
--- a/generated/tests/ssm-incidents-gen-tests/SSMIncidentsIncludeTests.cpp
+++ b/generated/tests/ssm-incidents-gen-tests/SSMIncidentsIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/ssm-incidents/SSMIncidentsClient.h>
+#include <aws/ssm-incidents/SSMIncidentsClientPagination.h>
 #include <aws/ssm-incidents/SSMIncidentsEndpointProvider.h>
 #include <aws/ssm-incidents/SSMIncidentsErrorMarshaller.h>
 #include <aws/ssm-incidents/SSMIncidentsErrors.h>
+#include <aws/ssm-incidents/SSMIncidentsPaginationBase.h>
 #include <aws/ssm-incidents/SSMIncidentsRequest.h>
 #include <aws/ssm-incidents/SSMIncidentsServiceClientModel.h>
+#include <aws/ssm-incidents/SSMIncidentsWaiter.h>
 #include <aws/ssm-incidents/SSMIncidents_EXPORTS.h>
+#include <aws/ssm-incidents/internal/SSMIncidentsEndpointRules.h>
 #include <aws/ssm-incidents/model/Action.h>
 #include <aws/ssm-incidents/model/AddRegionAction.h>
 #include <aws/ssm-incidents/model/AttributeValueList.h>
@@ -54,6 +58,7 @@
 #include <aws/ssm-incidents/model/GetIncidentRecordResult.h>
 #include <aws/ssm-incidents/model/GetReplicationSetRequest.h>
 #include <aws/ssm-incidents/model/GetReplicationSetResult.h>
+#include <aws/ssm-incidents/model/GetResourcePoliciesPaginationTraits.h>
 #include <aws/ssm-incidents/model/GetResourcePoliciesRequest.h>
 #include <aws/ssm-incidents/model/GetResourcePoliciesResult.h>
 #include <aws/ssm-incidents/model/GetResponsePlanRequest.h>
@@ -69,18 +74,24 @@
 #include <aws/ssm-incidents/model/ItemIdentifier.h>
 #include <aws/ssm-incidents/model/ItemType.h>
 #include <aws/ssm-incidents/model/ItemValue.h>
+#include <aws/ssm-incidents/model/ListIncidentFindingsPaginationTraits.h>
 #include <aws/ssm-incidents/model/ListIncidentFindingsRequest.h>
 #include <aws/ssm-incidents/model/ListIncidentFindingsResult.h>
+#include <aws/ssm-incidents/model/ListIncidentRecordsPaginationTraits.h>
 #include <aws/ssm-incidents/model/ListIncidentRecordsRequest.h>
 #include <aws/ssm-incidents/model/ListIncidentRecordsResult.h>
+#include <aws/ssm-incidents/model/ListRelatedItemsPaginationTraits.h>
 #include <aws/ssm-incidents/model/ListRelatedItemsRequest.h>
 #include <aws/ssm-incidents/model/ListRelatedItemsResult.h>
+#include <aws/ssm-incidents/model/ListReplicationSetsPaginationTraits.h>
 #include <aws/ssm-incidents/model/ListReplicationSetsRequest.h>
 #include <aws/ssm-incidents/model/ListReplicationSetsResult.h>
+#include <aws/ssm-incidents/model/ListResponsePlansPaginationTraits.h>
 #include <aws/ssm-incidents/model/ListResponsePlansRequest.h>
 #include <aws/ssm-incidents/model/ListResponsePlansResult.h>
 #include <aws/ssm-incidents/model/ListTagsForResourceRequest.h>
 #include <aws/ssm-incidents/model/ListTagsForResourceResult.h>
+#include <aws/ssm-incidents/model/ListTimelineEventsPaginationTraits.h>
 #include <aws/ssm-incidents/model/ListTimelineEventsRequest.h>
 #include <aws/ssm-incidents/model/ListTimelineEventsResult.h>
 #include <aws/ssm-incidents/model/NotificationTargetItem.h>
diff --git a/generated/tests/ssm-quicksetup-gen-tests/SSMQuickSetupIncludeTests.cpp b/generated/tests/ssm-quicksetup-gen-tests/SSMQuickSetupIncludeTests.cpp
index f78bae887c59..3d1f1aafae41 100644
--- a/generated/tests/ssm-quicksetup-gen-tests/SSMQuickSetupIncludeTests.cpp
+++ b/generated/tests/ssm-quicksetup-gen-tests/SSMQuickSetupIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/ssm-quicksetup/SSMQuickSetupClient.h>
+#include <aws/ssm-quicksetup/SSMQuickSetupClientPagination.h>
 #include <aws/ssm-quicksetup/SSMQuickSetupEndpointProvider.h>
 #include <aws/ssm-quicksetup/SSMQuickSetupErrorMarshaller.h>
 #include <aws/ssm-quicksetup/SSMQuickSetupErrors.h>
+#include <aws/ssm-quicksetup/SSMQuickSetupPaginationBase.h>
 #include <aws/ssm-quicksetup/SSMQuickSetupRequest.h>
 #include <aws/ssm-quicksetup/SSMQuickSetupServiceClientModel.h>
+#include <aws/ssm-quicksetup/SSMQuickSetupWaiter.h>
 #include <aws/ssm-quicksetup/SSMQuickSetup_EXPORTS.h>
+#include <aws/ssm-quicksetup/internal/SSMQuickSetupEndpointRules.h>
 #include <aws/ssm-quicksetup/model/ConfigurationDefinition.h>
 #include <aws/ssm-quicksetup/model/ConfigurationDefinitionInput.h>
 #include <aws/ssm-quicksetup/model/ConfigurationDefinitionSummary.h>
@@ -28,8 +32,10 @@
 #include <aws/ssm-quicksetup/model/GetConfigurationResult.h>
 #include <aws/ssm-quicksetup/model/GetServiceSettingsRequest.h>
 #include <aws/ssm-quicksetup/model/GetServiceSettingsResult.h>
+#include <aws/ssm-quicksetup/model/ListConfigurationManagersPaginationTraits.h>
 #include <aws/ssm-quicksetup/model/ListConfigurationManagersRequest.h>
 #include <aws/ssm-quicksetup/model/ListConfigurationManagersResult.h>
+#include <aws/ssm-quicksetup/model/ListConfigurationsPaginationTraits.h>
 #include <aws/ssm-quicksetup/model/ListConfigurationsRequest.h>
 #include <aws/ssm-quicksetup/model/ListConfigurationsResult.h>
 #include <aws/ssm-quicksetup/model/ListQuickSetupTypesRequest.h>
diff --git a/generated/tests/ssm-sap-gen-tests/SsmSapIncludeTests.cpp b/generated/tests/ssm-sap-gen-tests/SsmSapIncludeTests.cpp
index 683a32e80227..f222b5a2b076 100644
--- a/generated/tests/ssm-sap-gen-tests/SsmSapIncludeTests.cpp
+++ b/generated/tests/ssm-sap-gen-tests/SsmSapIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/ssm-sap/SsmSapClient.h>
+#include <aws/ssm-sap/SsmSapClientPagination.h>
 #include <aws/ssm-sap/SsmSapEndpointProvider.h>
 #include <aws/ssm-sap/SsmSapErrorMarshaller.h>
 #include <aws/ssm-sap/SsmSapErrors.h>
+#include <aws/ssm-sap/SsmSapPaginationBase.h>
 #include <aws/ssm-sap/SsmSapRequest.h>
 #include <aws/ssm-sap/SsmSapServiceClientModel.h>
+#include <aws/ssm-sap/SsmSapWaiter.h>
 #include <aws/ssm-sap/SsmSap_EXPORTS.h>
+#include <aws/ssm-sap/internal/SsmSapEndpointRules.h>
 #include <aws/ssm-sap/model/AllocationType.h>
 #include <aws/ssm-sap/model/Application.h>
 #include <aws/ssm-sap/model/ApplicationCredential.h>
@@ -62,22 +66,31 @@
 #include <aws/ssm-sap/model/Host.h>
 #include <aws/ssm-sap/model/HostRole.h>
 #include <aws/ssm-sap/model/IpAddressMember.h>
+#include <aws/ssm-sap/model/ListApplicationsPaginationTraits.h>
 #include <aws/ssm-sap/model/ListApplicationsRequest.h>
 #include <aws/ssm-sap/model/ListApplicationsResult.h>
+#include <aws/ssm-sap/model/ListComponentsPaginationTraits.h>
 #include <aws/ssm-sap/model/ListComponentsRequest.h>
 #include <aws/ssm-sap/model/ListComponentsResult.h>
+#include <aws/ssm-sap/model/ListConfigurationCheckDefinitionsPaginationTraits.h>
 #include <aws/ssm-sap/model/ListConfigurationCheckDefinitionsRequest.h>
 #include <aws/ssm-sap/model/ListConfigurationCheckDefinitionsResult.h>
+#include <aws/ssm-sap/model/ListConfigurationCheckOperationsPaginationTraits.h>
 #include <aws/ssm-sap/model/ListConfigurationCheckOperationsRequest.h>
 #include <aws/ssm-sap/model/ListConfigurationCheckOperationsResult.h>
+#include <aws/ssm-sap/model/ListDatabasesPaginationTraits.h>
 #include <aws/ssm-sap/model/ListDatabasesRequest.h>
 #include <aws/ssm-sap/model/ListDatabasesResult.h>
+#include <aws/ssm-sap/model/ListOperationEventsPaginationTraits.h>
 #include <aws/ssm-sap/model/ListOperationEventsRequest.h>
 #include <aws/ssm-sap/model/ListOperationEventsResult.h>
+#include <aws/ssm-sap/model/ListOperationsPaginationTraits.h>
 #include <aws/ssm-sap/model/ListOperationsRequest.h>
 #include <aws/ssm-sap/model/ListOperationsResult.h>
+#include <aws/ssm-sap/model/ListSubCheckResultsPaginationTraits.h>
 #include <aws/ssm-sap/model/ListSubCheckResultsRequest.h>
 #include <aws/ssm-sap/model/ListSubCheckResultsResult.h>
+#include <aws/ssm-sap/model/ListSubCheckRuleResultsPaginationTraits.h>
 #include <aws/ssm-sap/model/ListSubCheckRuleResultsRequest.h>
 #include <aws/ssm-sap/model/ListSubCheckRuleResultsResult.h>
 #include <aws/ssm-sap/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/sso-admin-gen-tests/SSOAdminIncludeTests.cpp b/generated/tests/sso-admin-gen-tests/SSOAdminIncludeTests.cpp
index 8c94a0b6ae3f..dd45892b8447 100644
--- a/generated/tests/sso-admin-gen-tests/SSOAdminIncludeTests.cpp
+++ b/generated/tests/sso-admin-gen-tests/SSOAdminIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/sso-admin/SSOAdminClient.h>
+#include <aws/sso-admin/SSOAdminClientPagination.h>
 #include <aws/sso-admin/SSOAdminEndpointProvider.h>
 #include <aws/sso-admin/SSOAdminErrorMarshaller.h>
 #include <aws/sso-admin/SSOAdminErrors.h>
+#include <aws/sso-admin/SSOAdminPaginationBase.h>
 #include <aws/sso-admin/SSOAdminRequest.h>
 #include <aws/sso-admin/SSOAdminServiceClientModel.h>
+#include <aws/sso-admin/SSOAdminWaiter.h>
 #include <aws/sso-admin/SSOAdmin_EXPORTS.h>
+#include <aws/sso-admin/internal/SSOAdminEndpointRules.h>
 #include <aws/sso-admin/model/AccessControlAttribute.h>
 #include <aws/sso-admin/model/AccessControlAttributeValue.h>
 #include <aws/sso-admin/model/AccessDeniedException.h>
@@ -131,49 +135,70 @@
 #include <aws/sso-admin/model/JwtBearerGrant.h>
 #include <aws/sso-admin/model/KmsKeyStatus.h>
 #include <aws/sso-admin/model/KmsKeyType.h>
+#include <aws/sso-admin/model/ListAccountAssignmentCreationStatusPaginationTraits.h>
 #include <aws/sso-admin/model/ListAccountAssignmentCreationStatusRequest.h>
 #include <aws/sso-admin/model/ListAccountAssignmentCreationStatusResult.h>
+#include <aws/sso-admin/model/ListAccountAssignmentDeletionStatusPaginationTraits.h>
 #include <aws/sso-admin/model/ListAccountAssignmentDeletionStatusRequest.h>
 #include <aws/sso-admin/model/ListAccountAssignmentDeletionStatusResult.h>
 #include <aws/sso-admin/model/ListAccountAssignmentsFilter.h>
+#include <aws/sso-admin/model/ListAccountAssignmentsForPrincipalPaginationTraits.h>
 #include <aws/sso-admin/model/ListAccountAssignmentsForPrincipalRequest.h>
 #include <aws/sso-admin/model/ListAccountAssignmentsForPrincipalResult.h>
+#include <aws/sso-admin/model/ListAccountAssignmentsPaginationTraits.h>
 #include <aws/sso-admin/model/ListAccountAssignmentsRequest.h>
 #include <aws/sso-admin/model/ListAccountAssignmentsResult.h>
+#include <aws/sso-admin/model/ListAccountsForProvisionedPermissionSetPaginationTraits.h>
 #include <aws/sso-admin/model/ListAccountsForProvisionedPermissionSetRequest.h>
 #include <aws/sso-admin/model/ListAccountsForProvisionedPermissionSetResult.h>
+#include <aws/sso-admin/model/ListApplicationAccessScopesPaginationTraits.h>
 #include <aws/sso-admin/model/ListApplicationAccessScopesRequest.h>
 #include <aws/sso-admin/model/ListApplicationAccessScopesResult.h>
 #include <aws/sso-admin/model/ListApplicationAssignmentsFilter.h>
+#include <aws/sso-admin/model/ListApplicationAssignmentsForPrincipalPaginationTraits.h>
 #include <aws/sso-admin/model/ListApplicationAssignmentsForPrincipalRequest.h>
 #include <aws/sso-admin/model/ListApplicationAssignmentsForPrincipalResult.h>
+#include <aws/sso-admin/model/ListApplicationAssignmentsPaginationTraits.h>
 #include <aws/sso-admin/model/ListApplicationAssignmentsRequest.h>
 #include <aws/sso-admin/model/ListApplicationAssignmentsResult.h>
+#include <aws/sso-admin/model/ListApplicationAuthenticationMethodsPaginationTraits.h>
 #include <aws/sso-admin/model/ListApplicationAuthenticationMethodsRequest.h>
 #include <aws/sso-admin/model/ListApplicationAuthenticationMethodsResult.h>
+#include <aws/sso-admin/model/ListApplicationGrantsPaginationTraits.h>
 #include <aws/sso-admin/model/ListApplicationGrantsRequest.h>
 #include <aws/sso-admin/model/ListApplicationGrantsResult.h>
+#include <aws/sso-admin/model/ListApplicationProvidersPaginationTraits.h>
 #include <aws/sso-admin/model/ListApplicationProvidersRequest.h>
 #include <aws/sso-admin/model/ListApplicationProvidersResult.h>
 #include <aws/sso-admin/model/ListApplicationsFilter.h>
+#include <aws/sso-admin/model/ListApplicationsPaginationTraits.h>
 #include <aws/sso-admin/model/ListApplicationsRequest.h>
 #include <aws/sso-admin/model/ListApplicationsResult.h>
+#include <aws/sso-admin/model/ListCustomerManagedPolicyReferencesInPermissionSetPaginationTraits.h>
 #include <aws/sso-admin/model/ListCustomerManagedPolicyReferencesInPermissionSetRequest.h>
 #include <aws/sso-admin/model/ListCustomerManagedPolicyReferencesInPermissionSetResult.h>
+#include <aws/sso-admin/model/ListInstancesPaginationTraits.h>
 #include <aws/sso-admin/model/ListInstancesRequest.h>
 #include <aws/sso-admin/model/ListInstancesResult.h>
+#include <aws/sso-admin/model/ListManagedPoliciesInPermissionSetPaginationTraits.h>
 #include <aws/sso-admin/model/ListManagedPoliciesInPermissionSetRequest.h>
 #include <aws/sso-admin/model/ListManagedPoliciesInPermissionSetResult.h>
+#include <aws/sso-admin/model/ListPermissionSetProvisioningStatusPaginationTraits.h>
 #include <aws/sso-admin/model/ListPermissionSetProvisioningStatusRequest.h>
 #include <aws/sso-admin/model/ListPermissionSetProvisioningStatusResult.h>
+#include <aws/sso-admin/model/ListPermissionSetsPaginationTraits.h>
+#include <aws/sso-admin/model/ListPermissionSetsProvisionedToAccountPaginationTraits.h>
 #include <aws/sso-admin/model/ListPermissionSetsProvisionedToAccountRequest.h>
 #include <aws/sso-admin/model/ListPermissionSetsProvisionedToAccountResult.h>
 #include <aws/sso-admin/model/ListPermissionSetsRequest.h>
 #include <aws/sso-admin/model/ListPermissionSetsResult.h>
+#include <aws/sso-admin/model/ListRegionsPaginationTraits.h>
 #include <aws/sso-admin/model/ListRegionsRequest.h>
 #include <aws/sso-admin/model/ListRegionsResult.h>
+#include <aws/sso-admin/model/ListTagsForResourcePaginationTraits.h>
 #include <aws/sso-admin/model/ListTagsForResourceRequest.h>
 #include <aws/sso-admin/model/ListTagsForResourceResult.h>
+#include <aws/sso-admin/model/ListTrustedTokenIssuersPaginationTraits.h>
 #include <aws/sso-admin/model/ListTrustedTokenIssuersRequest.h>
 #include <aws/sso-admin/model/ListTrustedTokenIssuersResult.h>
 #include <aws/sso-admin/model/OidcJwtConfiguration.h>
diff --git a/generated/tests/sso-gen-tests/SSOIncludeTests.cpp b/generated/tests/sso-gen-tests/SSOIncludeTests.cpp
index 16342e5c2860..c0fd9ad06cad 100644
--- a/generated/tests/sso-gen-tests/SSOIncludeTests.cpp
+++ b/generated/tests/sso-gen-tests/SSOIncludeTests.cpp
@@ -7,17 +7,23 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/sso/SSOClient.h>
+#include <aws/sso/SSOClientPagination.h>
 #include <aws/sso/SSOEndpointProvider.h>
 #include <aws/sso/SSOErrorMarshaller.h>
 #include <aws/sso/SSOErrors.h>
+#include <aws/sso/SSOPaginationBase.h>
 #include <aws/sso/SSORequest.h>
 #include <aws/sso/SSOServiceClientModel.h>
+#include <aws/sso/SSOWaiter.h>
 #include <aws/sso/SSO_EXPORTS.h>
+#include <aws/sso/internal/SSOEndpointRules.h>
 #include <aws/sso/model/AccountInfo.h>
 #include <aws/sso/model/GetRoleCredentialsRequest.h>
 #include <aws/sso/model/GetRoleCredentialsResult.h>
+#include <aws/sso/model/ListAccountRolesPaginationTraits.h>
 #include <aws/sso/model/ListAccountRolesRequest.h>
 #include <aws/sso/model/ListAccountRolesResult.h>
+#include <aws/sso/model/ListAccountsPaginationTraits.h>
 #include <aws/sso/model/ListAccountsRequest.h>
 #include <aws/sso/model/ListAccountsResult.h>
 #include <aws/sso/model/LogoutRequest.h>
diff --git a/generated/tests/sso-oidc-gen-tests/SSOOIDCIncludeTests.cpp b/generated/tests/sso-oidc-gen-tests/SSOOIDCIncludeTests.cpp
index 8324b9777ac9..1bb8234ddc7c 100644
--- a/generated/tests/sso-oidc-gen-tests/SSOOIDCIncludeTests.cpp
+++ b/generated/tests/sso-oidc-gen-tests/SSOOIDCIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/sso-oidc/SSOOIDCEndpointProvider.h>
 #include <aws/sso-oidc/SSOOIDCErrorMarshaller.h>
 #include <aws/sso-oidc/SSOOIDCErrors.h>
+#include <aws/sso-oidc/SSOOIDCPaginationBase.h>
 #include <aws/sso-oidc/SSOOIDCRequest.h>
 #include <aws/sso-oidc/SSOOIDCServiceClientModel.h>
+#include <aws/sso-oidc/SSOOIDCWaiter.h>
 #include <aws/sso-oidc/SSOOIDC_EXPORTS.h>
+#include <aws/sso-oidc/internal/SSOOIDCEndpointRules.h>
 #include <aws/sso-oidc/model/AccessDeniedException.h>
 #include <aws/sso-oidc/model/AccessDeniedExceptionReason.h>
 #include <aws/sso-oidc/model/AuthorizationPendingException.h>
diff --git a/generated/tests/states-gen-tests/SFNIncludeTests.cpp b/generated/tests/states-gen-tests/SFNIncludeTests.cpp
index be35449554f9..82c30790588c 100644
--- a/generated/tests/states-gen-tests/SFNIncludeTests.cpp
+++ b/generated/tests/states-gen-tests/SFNIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/states/SFNClient.h>
+#include <aws/states/SFNClientPagination.h>
 #include <aws/states/SFNEndpointProvider.h>
 #include <aws/states/SFNErrorMarshaller.h>
 #include <aws/states/SFNErrors.h>
+#include <aws/states/SFNPaginationBase.h>
 #include <aws/states/SFNRequest.h>
 #include <aws/states/SFNServiceClientModel.h>
+#include <aws/states/SFNWaiter.h>
 #include <aws/states/SFN_EXPORTS.h>
+#include <aws/states/internal/SFNEndpointRules.h>
 #include <aws/states/model/ActivityFailedEventDetails.h>
 #include <aws/states/model/ActivityListItem.h>
 #include <aws/states/model/ActivityScheduleFailedEventDetails.h>
@@ -65,6 +69,7 @@
 #include <aws/states/model/ExecutionTimedOutEventDetails.h>
 #include <aws/states/model/GetActivityTaskRequest.h>
 #include <aws/states/model/GetActivityTaskResult.h>
+#include <aws/states/model/GetExecutionHistoryPaginationTraits.h>
 #include <aws/states/model/GetExecutionHistoryRequest.h>
 #include <aws/states/model/GetExecutionHistoryResult.h>
 #include <aws/states/model/HistoryEvent.h>
@@ -84,16 +89,20 @@
 #include <aws/states/model/LambdaFunctionStartFailedEventDetails.h>
 #include <aws/states/model/LambdaFunctionSucceededEventDetails.h>
 #include <aws/states/model/LambdaFunctionTimedOutEventDetails.h>
+#include <aws/states/model/ListActivitiesPaginationTraits.h>
 #include <aws/states/model/ListActivitiesRequest.h>
 #include <aws/states/model/ListActivitiesResult.h>
+#include <aws/states/model/ListExecutionsPaginationTraits.h>
 #include <aws/states/model/ListExecutionsRequest.h>
 #include <aws/states/model/ListExecutionsResult.h>
+#include <aws/states/model/ListMapRunsPaginationTraits.h>
 #include <aws/states/model/ListMapRunsRequest.h>
 #include <aws/states/model/ListMapRunsResult.h>
 #include <aws/states/model/ListStateMachineAliasesRequest.h>
 #include <aws/states/model/ListStateMachineAliasesResult.h>
 #include <aws/states/model/ListStateMachineVersionsRequest.h>
 #include <aws/states/model/ListStateMachineVersionsResult.h>
+#include <aws/states/model/ListStateMachinesPaginationTraits.h>
 #include <aws/states/model/ListStateMachinesRequest.h>
 #include <aws/states/model/ListStateMachinesResult.h>
 #include <aws/states/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/storagegateway-gen-tests/StorageGatewayIncludeTests.cpp b/generated/tests/storagegateway-gen-tests/StorageGatewayIncludeTests.cpp
index 49518bcbad45..f081ade84ac6 100644
--- a/generated/tests/storagegateway-gen-tests/StorageGatewayIncludeTests.cpp
+++ b/generated/tests/storagegateway-gen-tests/StorageGatewayIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/storagegateway/StorageGatewayClient.h>
+#include <aws/storagegateway/StorageGatewayClientPagination.h>
 #include <aws/storagegateway/StorageGatewayEndpointProvider.h>
 #include <aws/storagegateway/StorageGatewayErrorMarshaller.h>
 #include <aws/storagegateway/StorageGatewayErrors.h>
+#include <aws/storagegateway/StorageGatewayPaginationBase.h>
 #include <aws/storagegateway/StorageGatewayRequest.h>
 #include <aws/storagegateway/StorageGatewayServiceClientModel.h>
+#include <aws/storagegateway/StorageGatewayWaiter.h>
 #include <aws/storagegateway/StorageGateway_EXPORTS.h>
+#include <aws/storagegateway/internal/StorageGatewayEndpointRules.h>
 #include <aws/storagegateway/model/ActivateGatewayRequest.h>
 #include <aws/storagegateway/model/ActivateGatewayResult.h>
 #include <aws/storagegateway/model/ActiveDirectoryStatus.h>
@@ -119,14 +123,18 @@
 #include <aws/storagegateway/model/DescribeSnapshotScheduleResult.h>
 #include <aws/storagegateway/model/DescribeStorediSCSIVolumesRequest.h>
 #include <aws/storagegateway/model/DescribeStorediSCSIVolumesResult.h>
+#include <aws/storagegateway/model/DescribeTapeArchivesPaginationTraits.h>
 #include <aws/storagegateway/model/DescribeTapeArchivesRequest.h>
 #include <aws/storagegateway/model/DescribeTapeArchivesResult.h>
+#include <aws/storagegateway/model/DescribeTapeRecoveryPointsPaginationTraits.h>
 #include <aws/storagegateway/model/DescribeTapeRecoveryPointsRequest.h>
 #include <aws/storagegateway/model/DescribeTapeRecoveryPointsResult.h>
+#include <aws/storagegateway/model/DescribeTapesPaginationTraits.h>
 #include <aws/storagegateway/model/DescribeTapesRequest.h>
 #include <aws/storagegateway/model/DescribeTapesResult.h>
 #include <aws/storagegateway/model/DescribeUploadBufferRequest.h>
 #include <aws/storagegateway/model/DescribeUploadBufferResult.h>
+#include <aws/storagegateway/model/DescribeVTLDevicesPaginationTraits.h>
 #include <aws/storagegateway/model/DescribeVTLDevicesRequest.h>
 #include <aws/storagegateway/model/DescribeVTLDevicesResult.h>
 #include <aws/storagegateway/model/DescribeWorkingStorageRequest.h>
@@ -158,26 +166,34 @@
 #include <aws/storagegateway/model/JoinDomainResult.h>
 #include <aws/storagegateway/model/ListAutomaticTapeCreationPoliciesRequest.h>
 #include <aws/storagegateway/model/ListAutomaticTapeCreationPoliciesResult.h>
+#include <aws/storagegateway/model/ListCacheReportsPaginationTraits.h>
 #include <aws/storagegateway/model/ListCacheReportsRequest.h>
 #include <aws/storagegateway/model/ListCacheReportsResult.h>
+#include <aws/storagegateway/model/ListFileSharesPaginationTraits.h>
 #include <aws/storagegateway/model/ListFileSharesRequest.h>
 #include <aws/storagegateway/model/ListFileSharesResult.h>
+#include <aws/storagegateway/model/ListFileSystemAssociationsPaginationTraits.h>
 #include <aws/storagegateway/model/ListFileSystemAssociationsRequest.h>
 #include <aws/storagegateway/model/ListFileSystemAssociationsResult.h>
+#include <aws/storagegateway/model/ListGatewaysPaginationTraits.h>
 #include <aws/storagegateway/model/ListGatewaysRequest.h>
 #include <aws/storagegateway/model/ListGatewaysResult.h>
 #include <aws/storagegateway/model/ListLocalDisksRequest.h>
 #include <aws/storagegateway/model/ListLocalDisksResult.h>
+#include <aws/storagegateway/model/ListTagsForResourcePaginationTraits.h>
 #include <aws/storagegateway/model/ListTagsForResourceRequest.h>
 #include <aws/storagegateway/model/ListTagsForResourceResult.h>
+#include <aws/storagegateway/model/ListTapePoolsPaginationTraits.h>
 #include <aws/storagegateway/model/ListTapePoolsRequest.h>
 #include <aws/storagegateway/model/ListTapePoolsResult.h>
+#include <aws/storagegateway/model/ListTapesPaginationTraits.h>
 #include <aws/storagegateway/model/ListTapesRequest.h>
 #include <aws/storagegateway/model/ListTapesResult.h>
 #include <aws/storagegateway/model/ListVolumeInitiatorsRequest.h>
 #include <aws/storagegateway/model/ListVolumeInitiatorsResult.h>
 #include <aws/storagegateway/model/ListVolumeRecoveryPointsRequest.h>
 #include <aws/storagegateway/model/ListVolumeRecoveryPointsResult.h>
+#include <aws/storagegateway/model/ListVolumesPaginationTraits.h>
 #include <aws/storagegateway/model/ListVolumesRequest.h>
 #include <aws/storagegateway/model/ListVolumesResult.h>
 #include <aws/storagegateway/model/NFSFileShareDefaults.h>
diff --git a/generated/tests/sts-gen-tests/STSIncludeTests.cpp b/generated/tests/sts-gen-tests/STSIncludeTests.cpp
index 39d6e4a9a7f0..58122bdd7bf6 100644
--- a/generated/tests/sts-gen-tests/STSIncludeTests.cpp
+++ b/generated/tests/sts-gen-tests/STSIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/sts/STSEndpointProvider.h>
 #include <aws/sts/STSErrorMarshaller.h>
 #include <aws/sts/STSErrors.h>
+#include <aws/sts/STSPaginationBase.h>
 #include <aws/sts/STSRequest.h>
 #include <aws/sts/STSServiceClientModel.h>
+#include <aws/sts/STSWaiter.h>
 #include <aws/sts/STS_EXPORTS.h>
+#include <aws/sts/internal/STSEndpointRules.h>
 #include <aws/sts/model/AssumeRoleRequest.h>
 #include <aws/sts/model/AssumeRoleResult.h>
 #include <aws/sts/model/AssumeRoleWithSAMLRequest.h>
diff --git a/generated/tests/supplychain-gen-tests/SupplyChainIncludeTests.cpp b/generated/tests/supplychain-gen-tests/SupplyChainIncludeTests.cpp
index c49894629e9f..3c856b1e9e89 100644
--- a/generated/tests/supplychain-gen-tests/SupplyChainIncludeTests.cpp
+++ b/generated/tests/supplychain-gen-tests/SupplyChainIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/supplychain/SupplyChainClient.h>
+#include <aws/supplychain/SupplyChainClientPagination.h>
 #include <aws/supplychain/SupplyChainEndpointProvider.h>
 #include <aws/supplychain/SupplyChainErrorMarshaller.h>
 #include <aws/supplychain/SupplyChainErrors.h>
+#include <aws/supplychain/SupplyChainPaginationBase.h>
 #include <aws/supplychain/SupplyChainRequest.h>
 #include <aws/supplychain/SupplyChainServiceClientModel.h>
+#include <aws/supplychain/SupplyChainWaiter.h>
 #include <aws/supplychain/SupplyChain_EXPORTS.h>
+#include <aws/supplychain/internal/SupplyChainEndpointRules.h>
 #include <aws/supplychain/model/BillOfMaterialsImportJob.h>
 #include <aws/supplychain/model/ConfigurationJobStatus.h>
 #include <aws/supplychain/model/CreateBillOfMaterialsImportJobRequest.h>
@@ -93,16 +97,22 @@
 #include <aws/supplychain/model/GetInstanceResult.h>
 #include <aws/supplychain/model/Instance.h>
 #include <aws/supplychain/model/InstanceState.h>
+#include <aws/supplychain/model/ListDataIntegrationEventsPaginationTraits.h>
 #include <aws/supplychain/model/ListDataIntegrationEventsRequest.h>
 #include <aws/supplychain/model/ListDataIntegrationEventsResult.h>
+#include <aws/supplychain/model/ListDataIntegrationFlowExecutionsPaginationTraits.h>
 #include <aws/supplychain/model/ListDataIntegrationFlowExecutionsRequest.h>
 #include <aws/supplychain/model/ListDataIntegrationFlowExecutionsResult.h>
+#include <aws/supplychain/model/ListDataIntegrationFlowsPaginationTraits.h>
 #include <aws/supplychain/model/ListDataIntegrationFlowsRequest.h>
 #include <aws/supplychain/model/ListDataIntegrationFlowsResult.h>
+#include <aws/supplychain/model/ListDataLakeDatasetsPaginationTraits.h>
 #include <aws/supplychain/model/ListDataLakeDatasetsRequest.h>
 #include <aws/supplychain/model/ListDataLakeDatasetsResult.h>
+#include <aws/supplychain/model/ListDataLakeNamespacesPaginationTraits.h>
 #include <aws/supplychain/model/ListDataLakeNamespacesRequest.h>
 #include <aws/supplychain/model/ListDataLakeNamespacesResult.h>
+#include <aws/supplychain/model/ListInstancesPaginationTraits.h>
 #include <aws/supplychain/model/ListInstancesRequest.h>
 #include <aws/supplychain/model/ListInstancesResult.h>
 #include <aws/supplychain/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/support-app-gen-tests/SupportAppIncludeTests.cpp b/generated/tests/support-app-gen-tests/SupportAppIncludeTests.cpp
index dc80b5337a1e..d2ad6c4226f4 100644
--- a/generated/tests/support-app-gen-tests/SupportAppIncludeTests.cpp
+++ b/generated/tests/support-app-gen-tests/SupportAppIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/support-app/SupportAppClient.h>
+#include <aws/support-app/SupportAppClientPagination.h>
 #include <aws/support-app/SupportAppEndpointProvider.h>
 #include <aws/support-app/SupportAppErrorMarshaller.h>
 #include <aws/support-app/SupportAppErrors.h>
+#include <aws/support-app/SupportAppPaginationBase.h>
 #include <aws/support-app/SupportAppRequest.h>
 #include <aws/support-app/SupportAppServiceClientModel.h>
+#include <aws/support-app/SupportAppWaiter.h>
 #include <aws/support-app/SupportApp_EXPORTS.h>
+#include <aws/support-app/internal/SupportAppEndpointRules.h>
 #include <aws/support-app/model/AccountType.h>
 #include <aws/support-app/model/CreateSlackChannelConfigurationRequest.h>
 #include <aws/support-app/model/CreateSlackChannelConfigurationResult.h>
@@ -24,8 +28,10 @@
 #include <aws/support-app/model/DeleteSlackWorkspaceConfigurationResult.h>
 #include <aws/support-app/model/GetAccountAliasRequest.h>
 #include <aws/support-app/model/GetAccountAliasResult.h>
+#include <aws/support-app/model/ListSlackChannelConfigurationsPaginationTraits.h>
 #include <aws/support-app/model/ListSlackChannelConfigurationsRequest.h>
 #include <aws/support-app/model/ListSlackChannelConfigurationsResult.h>
+#include <aws/support-app/model/ListSlackWorkspaceConfigurationsPaginationTraits.h>
 #include <aws/support-app/model/ListSlackWorkspaceConfigurationsRequest.h>
 #include <aws/support-app/model/ListSlackWorkspaceConfigurationsResult.h>
 #include <aws/support-app/model/NotificationSeverityLevel.h>
diff --git a/generated/tests/support-gen-tests/SupportIncludeTests.cpp b/generated/tests/support-gen-tests/SupportIncludeTests.cpp
index b5fe9e580756..0adb2e43c80b 100644
--- a/generated/tests/support-gen-tests/SupportIncludeTests.cpp
+++ b/generated/tests/support-gen-tests/SupportIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/support/SupportClient.h>
+#include <aws/support/SupportClientPagination.h>
 #include <aws/support/SupportEndpointProvider.h>
 #include <aws/support/SupportErrorMarshaller.h>
 #include <aws/support/SupportErrors.h>
+#include <aws/support/SupportPaginationBase.h>
 #include <aws/support/SupportRequest.h>
 #include <aws/support/SupportServiceClientModel.h>
+#include <aws/support/SupportWaiter.h>
 #include <aws/support/Support_EXPORTS.h>
+#include <aws/support/internal/SupportEndpointRules.h>
 #include <aws/support/model/AddAttachmentsToSetRequest.h>
 #include <aws/support/model/AddAttachmentsToSetResult.h>
 #include <aws/support/model/AddCommunicationToCaseRequest.h>
@@ -28,8 +32,10 @@
 #include <aws/support/model/DateInterval.h>
 #include <aws/support/model/DescribeAttachmentRequest.h>
 #include <aws/support/model/DescribeAttachmentResult.h>
+#include <aws/support/model/DescribeCasesPaginationTraits.h>
 #include <aws/support/model/DescribeCasesRequest.h>
 #include <aws/support/model/DescribeCasesResult.h>
+#include <aws/support/model/DescribeCommunicationsPaginationTraits.h>
 #include <aws/support/model/DescribeCommunicationsRequest.h>
 #include <aws/support/model/DescribeCommunicationsResult.h>
 #include <aws/support/model/DescribeCreateCaseOptionsRequest.h>
diff --git a/generated/tests/supportauthz-gen-tests/SupportAuthZIncludeTests.cpp b/generated/tests/supportauthz-gen-tests/SupportAuthZIncludeTests.cpp
index 148e5ebde40b..29856447092c 100644
--- a/generated/tests/supportauthz-gen-tests/SupportAuthZIncludeTests.cpp
+++ b/generated/tests/supportauthz-gen-tests/SupportAuthZIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/supportauthz/SupportAuthZClient.h>
+#include <aws/supportauthz/SupportAuthZClientPagination.h>
 #include <aws/supportauthz/SupportAuthZEndpointProvider.h>
 #include <aws/supportauthz/SupportAuthZErrorMarshaller.h>
 #include <aws/supportauthz/SupportAuthZErrors.h>
+#include <aws/supportauthz/SupportAuthZPaginationBase.h>
 #include <aws/supportauthz/SupportAuthZRequest.h>
 #include <aws/supportauthz/SupportAuthZServiceClientModel.h>
+#include <aws/supportauthz/SupportAuthZWaiter.h>
 #include <aws/supportauthz/SupportAuthZ_EXPORTS.h>
+#include <aws/supportauthz/internal/SupportAuthZEndpointRules.h>
 #include <aws/supportauthz/model/ActionSet.h>
 #include <aws/supportauthz/model/ActionSummary.h>
 #include <aws/supportauthz/model/Condition.h>
@@ -26,10 +30,13 @@
 #include <aws/supportauthz/model/GetSupportPermitRequest.h>
 #include <aws/supportauthz/model/GetSupportPermitResult.h>
 #include <aws/supportauthz/model/InternalServerException.h>
+#include <aws/supportauthz/model/ListActionsPaginationTraits.h>
 #include <aws/supportauthz/model/ListActionsRequest.h>
 #include <aws/supportauthz/model/ListActionsResult.h>
+#include <aws/supportauthz/model/ListSupportPermitRequestsPaginationTraits.h>
 #include <aws/supportauthz/model/ListSupportPermitRequestsRequest.h>
 #include <aws/supportauthz/model/ListSupportPermitRequestsResult.h>
+#include <aws/supportauthz/model/ListSupportPermitsPaginationTraits.h>
 #include <aws/supportauthz/model/ListSupportPermitsRequest.h>
 #include <aws/supportauthz/model/ListSupportPermitsResult.h>
 #include <aws/supportauthz/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/sustainability-gen-tests/SustainabilityIncludeTests.cpp b/generated/tests/sustainability-gen-tests/SustainabilityIncludeTests.cpp
index 8a52e9af8183..4896820b00b6 100644
--- a/generated/tests/sustainability-gen-tests/SustainabilityIncludeTests.cpp
+++ b/generated/tests/sustainability-gen-tests/SustainabilityIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/sustainability/SustainabilityClient.h>
+#include <aws/sustainability/SustainabilityClientPagination.h>
 #include <aws/sustainability/SustainabilityEndpointProvider.h>
 #include <aws/sustainability/SustainabilityErrorMarshaller.h>
 #include <aws/sustainability/SustainabilityErrors.h>
+#include <aws/sustainability/SustainabilityPaginationBase.h>
 #include <aws/sustainability/SustainabilityRequest.h>
 #include <aws/sustainability/SustainabilityServiceClientModel.h>
+#include <aws/sustainability/SustainabilityWaiter.h>
 #include <aws/sustainability/Sustainability_EXPORTS.h>
+#include <aws/sustainability/internal/SustainabilityEndpointRules.h>
 #include <aws/sustainability/model/Dimension.h>
 #include <aws/sustainability/model/DimensionEntry.h>
 #include <aws/sustainability/model/Emissions.h>
@@ -21,12 +25,16 @@
 #include <aws/sustainability/model/EstimatedCarbonEmissions.h>
 #include <aws/sustainability/model/EstimatedWaterAllocation.h>
 #include <aws/sustainability/model/FilterExpression.h>
+#include <aws/sustainability/model/GetEstimatedCarbonEmissionsDimensionValuesPaginationTraits.h>
 #include <aws/sustainability/model/GetEstimatedCarbonEmissionsDimensionValuesRequest.h>
 #include <aws/sustainability/model/GetEstimatedCarbonEmissionsDimensionValuesResult.h>
+#include <aws/sustainability/model/GetEstimatedCarbonEmissionsPaginationTraits.h>
 #include <aws/sustainability/model/GetEstimatedCarbonEmissionsRequest.h>
 #include <aws/sustainability/model/GetEstimatedCarbonEmissionsResult.h>
+#include <aws/sustainability/model/GetEstimatedWaterAllocationDimensionValuesPaginationTraits.h>
 #include <aws/sustainability/model/GetEstimatedWaterAllocationDimensionValuesRequest.h>
 #include <aws/sustainability/model/GetEstimatedWaterAllocationDimensionValuesResult.h>
+#include <aws/sustainability/model/GetEstimatedWaterAllocationPaginationTraits.h>
 #include <aws/sustainability/model/GetEstimatedWaterAllocationRequest.h>
 #include <aws/sustainability/model/GetEstimatedWaterAllocationResult.h>
 #include <aws/sustainability/model/GranularityConfiguration.h>
diff --git a/generated/tests/swf-gen-tests/SWFIncludeTests.cpp b/generated/tests/swf-gen-tests/SWFIncludeTests.cpp
index 2581cc4d0539..ab9b56c973e8 100644
--- a/generated/tests/swf-gen-tests/SWFIncludeTests.cpp
+++ b/generated/tests/swf-gen-tests/SWFIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/swf/SWFClient.h>
+#include <aws/swf/SWFClientPagination.h>
 #include <aws/swf/SWFEndpointProvider.h>
 #include <aws/swf/SWFErrorMarshaller.h>
 #include <aws/swf/SWFErrors.h>
+#include <aws/swf/SWFPaginationBase.h>
 #include <aws/swf/SWFRequest.h>
 #include <aws/swf/SWFServiceClientModel.h>
+#include <aws/swf/SWFWaiter.h>
 #include <aws/swf/SWF_EXPORTS.h>
+#include <aws/swf/internal/SWFEndpointRules.h>
 #include <aws/swf/model/ActivityTaskCancelRequestedEventAttributes.h>
 #include <aws/swf/model/ActivityTaskCanceledEventAttributes.h>
 #include <aws/swf/model/ActivityTaskCompletedEventAttributes.h>
@@ -83,6 +87,7 @@
 #include <aws/swf/model/FailWorkflowExecutionDecisionAttributes.h>
 #include <aws/swf/model/FailWorkflowExecutionFailedCause.h>
 #include <aws/swf/model/FailWorkflowExecutionFailedEventAttributes.h>
+#include <aws/swf/model/GetWorkflowExecutionHistoryPaginationTraits.h>
 #include <aws/swf/model/GetWorkflowExecutionHistoryRequest.h>
 #include <aws/swf/model/GetWorkflowExecutionHistoryResult.h>
 #include <aws/swf/model/HistoryEvent.h>
@@ -92,21 +97,27 @@
 #include <aws/swf/model/LambdaFunctionStartedEventAttributes.h>
 #include <aws/swf/model/LambdaFunctionTimedOutEventAttributes.h>
 #include <aws/swf/model/LambdaFunctionTimeoutType.h>
+#include <aws/swf/model/ListActivityTypesPaginationTraits.h>
 #include <aws/swf/model/ListActivityTypesRequest.h>
 #include <aws/swf/model/ListActivityTypesResult.h>
+#include <aws/swf/model/ListClosedWorkflowExecutionsPaginationTraits.h>
 #include <aws/swf/model/ListClosedWorkflowExecutionsRequest.h>
 #include <aws/swf/model/ListClosedWorkflowExecutionsResult.h>
+#include <aws/swf/model/ListDomainsPaginationTraits.h>
 #include <aws/swf/model/ListDomainsRequest.h>
 #include <aws/swf/model/ListDomainsResult.h>
+#include <aws/swf/model/ListOpenWorkflowExecutionsPaginationTraits.h>
 #include <aws/swf/model/ListOpenWorkflowExecutionsRequest.h>
 #include <aws/swf/model/ListOpenWorkflowExecutionsResult.h>
 #include <aws/swf/model/ListTagsForResourceRequest.h>
 #include <aws/swf/model/ListTagsForResourceResult.h>
+#include <aws/swf/model/ListWorkflowTypesPaginationTraits.h>
 #include <aws/swf/model/ListWorkflowTypesRequest.h>
 #include <aws/swf/model/ListWorkflowTypesResult.h>
 #include <aws/swf/model/MarkerRecordedEventAttributes.h>
 #include <aws/swf/model/PollForActivityTaskRequest.h>
 #include <aws/swf/model/PollForActivityTaskResult.h>
+#include <aws/swf/model/PollForDecisionTaskPaginationTraits.h>
 #include <aws/swf/model/PollForDecisionTaskRequest.h>
 #include <aws/swf/model/PollForDecisionTaskResult.h>
 #include <aws/swf/model/RecordActivityTaskHeartbeatRequest.h>
diff --git a/generated/tests/synthetics-gen-tests/SyntheticsIncludeTests.cpp b/generated/tests/synthetics-gen-tests/SyntheticsIncludeTests.cpp
index 26813c560360..9490bab4a6e1 100644
--- a/generated/tests/synthetics-gen-tests/SyntheticsIncludeTests.cpp
+++ b/generated/tests/synthetics-gen-tests/SyntheticsIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/synthetics/SyntheticsClient.h>
+#include <aws/synthetics/SyntheticsClientPagination.h>
 #include <aws/synthetics/SyntheticsEndpointProvider.h>
 #include <aws/synthetics/SyntheticsErrorMarshaller.h>
 #include <aws/synthetics/SyntheticsErrors.h>
+#include <aws/synthetics/SyntheticsPaginationBase.h>
 #include <aws/synthetics/SyntheticsRequest.h>
 #include <aws/synthetics/SyntheticsServiceClientModel.h>
+#include <aws/synthetics/SyntheticsWaiter.h>
 #include <aws/synthetics/Synthetics_EXPORTS.h>
+#include <aws/synthetics/internal/SyntheticsEndpointRules.h>
 #include <aws/synthetics/model/AddReplicaLocationInput.h>
 #include <aws/synthetics/model/ArtifactConfigInput.h>
 #include <aws/synthetics/model/ArtifactConfigOutput.h>
@@ -50,10 +54,13 @@
 #include <aws/synthetics/model/DeleteGroupResult.h>
 #include <aws/synthetics/model/Dependency.h>
 #include <aws/synthetics/model/DependencyType.h>
+#include <aws/synthetics/model/DescribeCanariesLastRunPaginationTraits.h>
 #include <aws/synthetics/model/DescribeCanariesLastRunRequest.h>
 #include <aws/synthetics/model/DescribeCanariesLastRunResult.h>
+#include <aws/synthetics/model/DescribeCanariesPaginationTraits.h>
 #include <aws/synthetics/model/DescribeCanariesRequest.h>
 #include <aws/synthetics/model/DescribeCanariesResult.h>
+#include <aws/synthetics/model/DescribeRuntimeVersionsPaginationTraits.h>
 #include <aws/synthetics/model/DescribeRuntimeVersionsRequest.h>
 #include <aws/synthetics/model/DescribeRuntimeVersionsResult.h>
 #include <aws/synthetics/model/DisassociateResourceRequest.h>
@@ -63,16 +70,20 @@
 #include <aws/synthetics/model/EngineConfig.h>
 #include <aws/synthetics/model/GetCanaryRequest.h>
 #include <aws/synthetics/model/GetCanaryResult.h>
+#include <aws/synthetics/model/GetCanaryRunsPaginationTraits.h>
 #include <aws/synthetics/model/GetCanaryRunsRequest.h>
 #include <aws/synthetics/model/GetCanaryRunsResult.h>
 #include <aws/synthetics/model/GetGroupRequest.h>
 #include <aws/synthetics/model/GetGroupResult.h>
 #include <aws/synthetics/model/Group.h>
 #include <aws/synthetics/model/GroupSummary.h>
+#include <aws/synthetics/model/ListAssociatedGroupsPaginationTraits.h>
 #include <aws/synthetics/model/ListAssociatedGroupsRequest.h>
 #include <aws/synthetics/model/ListAssociatedGroupsResult.h>
+#include <aws/synthetics/model/ListGroupResourcesPaginationTraits.h>
 #include <aws/synthetics/model/ListGroupResourcesRequest.h>
 #include <aws/synthetics/model/ListGroupResourcesResult.h>
+#include <aws/synthetics/model/ListGroupsPaginationTraits.h>
 #include <aws/synthetics/model/ListGroupsRequest.h>
 #include <aws/synthetics/model/ListGroupsResult.h>
 #include <aws/synthetics/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/taxsettings-gen-tests/TaxSettingsIncludeTests.cpp b/generated/tests/taxsettings-gen-tests/TaxSettingsIncludeTests.cpp
index 63a9a7ff0333..a168cca774b0 100644
--- a/generated/tests/taxsettings-gen-tests/TaxSettingsIncludeTests.cpp
+++ b/generated/tests/taxsettings-gen-tests/TaxSettingsIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/taxsettings/TaxSettingsClient.h>
+#include <aws/taxsettings/TaxSettingsClientPagination.h>
 #include <aws/taxsettings/TaxSettingsEndpointProvider.h>
 #include <aws/taxsettings/TaxSettingsErrorMarshaller.h>
 #include <aws/taxsettings/TaxSettingsErrors.h>
+#include <aws/taxsettings/TaxSettingsPaginationBase.h>
 #include <aws/taxsettings/TaxSettingsRequest.h>
 #include <aws/taxsettings/TaxSettingsServiceClientModel.h>
+#include <aws/taxsettings/TaxSettingsWaiter.h>
 #include <aws/taxsettings/TaxSettings_EXPORTS.h>
+#include <aws/taxsettings/internal/TaxSettingsEndpointRules.h>
 #include <aws/taxsettings/model/AccountDetails.h>
 #include <aws/taxsettings/model/AccountMetaData.h>
 #include <aws/taxsettings/model/AdditionalInfoRequest.h>
@@ -67,10 +71,13 @@
 #include <aws/taxsettings/model/ItalyAdditionalInfo.h>
 #include <aws/taxsettings/model/Jurisdiction.h>
 #include <aws/taxsettings/model/KenyaAdditionalInfo.h>
+#include <aws/taxsettings/model/ListSupplementalTaxRegistrationsPaginationTraits.h>
 #include <aws/taxsettings/model/ListSupplementalTaxRegistrationsRequest.h>
 #include <aws/taxsettings/model/ListSupplementalTaxRegistrationsResult.h>
+#include <aws/taxsettings/model/ListTaxExemptionsPaginationTraits.h>
 #include <aws/taxsettings/model/ListTaxExemptionsRequest.h>
 #include <aws/taxsettings/model/ListTaxExemptionsResult.h>
+#include <aws/taxsettings/model/ListTaxRegistrationsPaginationTraits.h>
 #include <aws/taxsettings/model/ListTaxRegistrationsRequest.h>
 #include <aws/taxsettings/model/ListTaxRegistrationsResult.h>
 #include <aws/taxsettings/model/MalaysiaAdditionalInfo.h>
diff --git a/generated/tests/textract-gen-tests/TextractIncludeTests.cpp b/generated/tests/textract-gen-tests/TextractIncludeTests.cpp
index c5e8ea4808e5..9bee08e51941 100644
--- a/generated/tests/textract-gen-tests/TextractIncludeTests.cpp
+++ b/generated/tests/textract-gen-tests/TextractIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/textract/TextractClient.h>
+#include <aws/textract/TextractClientPagination.h>
 #include <aws/textract/TextractEndpointProvider.h>
 #include <aws/textract/TextractErrorMarshaller.h>
 #include <aws/textract/TextractErrors.h>
+#include <aws/textract/TextractPaginationBase.h>
 #include <aws/textract/TextractRequest.h>
 #include <aws/textract/TextractServiceClientModel.h>
+#include <aws/textract/TextractWaiter.h>
 #include <aws/textract/Textract_EXPORTS.h>
+#include <aws/textract/internal/TextractEndpointRules.h>
 #include <aws/textract/model/Adapter.h>
 #include <aws/textract/model/AdapterOverview.h>
 #include <aws/textract/model/AdapterVersionDatasetConfig.h>
@@ -86,8 +90,10 @@
 #include <aws/textract/model/LendingSummary.h>
 #include <aws/textract/model/LineItemFields.h>
 #include <aws/textract/model/LineItemGroup.h>
+#include <aws/textract/model/ListAdapterVersionsPaginationTraits.h>
 #include <aws/textract/model/ListAdapterVersionsRequest.h>
 #include <aws/textract/model/ListAdapterVersionsResult.h>
+#include <aws/textract/model/ListAdaptersPaginationTraits.h>
 #include <aws/textract/model/ListAdaptersRequest.h>
 #include <aws/textract/model/ListAdaptersResult.h>
 #include <aws/textract/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/timestream-influxdb-gen-tests/TimestreamInfluxDBIncludeTests.cpp b/generated/tests/timestream-influxdb-gen-tests/TimestreamInfluxDBIncludeTests.cpp
index 106f11689cf9..e7e470957dec 100644
--- a/generated/tests/timestream-influxdb-gen-tests/TimestreamInfluxDBIncludeTests.cpp
+++ b/generated/tests/timestream-influxdb-gen-tests/TimestreamInfluxDBIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/timestream-influxdb/TimestreamInfluxDBClient.h>
+#include <aws/timestream-influxdb/TimestreamInfluxDBClientPagination.h>
 #include <aws/timestream-influxdb/TimestreamInfluxDBEndpointProvider.h>
 #include <aws/timestream-influxdb/TimestreamInfluxDBErrorMarshaller.h>
 #include <aws/timestream-influxdb/TimestreamInfluxDBErrors.h>
+#include <aws/timestream-influxdb/TimestreamInfluxDBPaginationBase.h>
 #include <aws/timestream-influxdb/TimestreamInfluxDBRequest.h>
 #include <aws/timestream-influxdb/TimestreamInfluxDBServiceClientModel.h>
+#include <aws/timestream-influxdb/TimestreamInfluxDBWaiter.h>
 #include <aws/timestream-influxdb/TimestreamInfluxDB_EXPORTS.h>
+#include <aws/timestream-influxdb/internal/TimestreamInfluxDBEndpointRules.h>
 #include <aws/timestream-influxdb/model/AutomatedDbBackupType.h>
 #include <aws/timestream-influxdb/model/ClusterConfiguration.h>
 #include <aws/timestream-influxdb/model/ClusterDeploymentType.h>
@@ -61,14 +65,19 @@
 #include <aws/timestream-influxdb/model/InfluxDBv3CoreParameters.h>
 #include <aws/timestream-influxdb/model/InfluxDBv3EnterpriseParameters.h>
 #include <aws/timestream-influxdb/model/InstanceMode.h>
+#include <aws/timestream-influxdb/model/ListDbBackupsPaginationTraits.h>
 #include <aws/timestream-influxdb/model/ListDbBackupsRequest.h>
 #include <aws/timestream-influxdb/model/ListDbBackupsResult.h>
+#include <aws/timestream-influxdb/model/ListDbClustersPaginationTraits.h>
 #include <aws/timestream-influxdb/model/ListDbClustersRequest.h>
 #include <aws/timestream-influxdb/model/ListDbClustersResult.h>
+#include <aws/timestream-influxdb/model/ListDbInstancesForClusterPaginationTraits.h>
 #include <aws/timestream-influxdb/model/ListDbInstancesForClusterRequest.h>
 #include <aws/timestream-influxdb/model/ListDbInstancesForClusterResult.h>
+#include <aws/timestream-influxdb/model/ListDbInstancesPaginationTraits.h>
 #include <aws/timestream-influxdb/model/ListDbInstancesRequest.h>
 #include <aws/timestream-influxdb/model/ListDbInstancesResult.h>
+#include <aws/timestream-influxdb/model/ListDbParameterGroupsPaginationTraits.h>
 #include <aws/timestream-influxdb/model/ListDbParameterGroupsRequest.h>
 #include <aws/timestream-influxdb/model/ListDbParameterGroupsResult.h>
 #include <aws/timestream-influxdb/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/timestream-query-gen-tests/TimestreamQueryIncludeTests.cpp b/generated/tests/timestream-query-gen-tests/TimestreamQueryIncludeTests.cpp
index ef897a1e06a6..193accf65469 100644
--- a/generated/tests/timestream-query-gen-tests/TimestreamQueryIncludeTests.cpp
+++ b/generated/tests/timestream-query-gen-tests/TimestreamQueryIncludeTests.cpp
@@ -8,12 +8,16 @@
 
 #include <aws/timestream-query/TimestreamQueryClient.h>
 #include <aws/timestream-query/TimestreamQueryClientConfiguration.h>
+#include <aws/timestream-query/TimestreamQueryClientPagination.h>
 #include <aws/timestream-query/TimestreamQueryEndpointProvider.h>
 #include <aws/timestream-query/TimestreamQueryErrorMarshaller.h>
 #include <aws/timestream-query/TimestreamQueryErrors.h>
+#include <aws/timestream-query/TimestreamQueryPaginationBase.h>
 #include <aws/timestream-query/TimestreamQueryRequest.h>
 #include <aws/timestream-query/TimestreamQueryServiceClientModel.h>
+#include <aws/timestream-query/TimestreamQueryWaiter.h>
 #include <aws/timestream-query/TimestreamQuery_EXPORTS.h>
+#include <aws/timestream-query/internal/TimestreamQueryEndpointRules.h>
 #include <aws/timestream-query/model/AccountSettingsNotificationConfiguration.h>
 #include <aws/timestream-query/model/CancelQueryRequest.h>
 #include <aws/timestream-query/model/CancelQueryResult.h>
@@ -38,8 +42,10 @@
 #include <aws/timestream-query/model/ExecutionStats.h>
 #include <aws/timestream-query/model/LastUpdate.h>
 #include <aws/timestream-query/model/LastUpdateStatus.h>
+#include <aws/timestream-query/model/ListScheduledQueriesPaginationTraits.h>
 #include <aws/timestream-query/model/ListScheduledQueriesRequest.h>
 #include <aws/timestream-query/model/ListScheduledQueriesResult.h>
+#include <aws/timestream-query/model/ListTagsForResourcePaginationTraits.h>
 #include <aws/timestream-query/model/ListTagsForResourceRequest.h>
 #include <aws/timestream-query/model/ListTagsForResourceResult.h>
 #include <aws/timestream-query/model/MeasureValueType.h>
@@ -57,6 +63,7 @@
 #include <aws/timestream-query/model/QueryInsights.h>
 #include <aws/timestream-query/model/QueryInsightsMode.h>
 #include <aws/timestream-query/model/QueryInsightsResponse.h>
+#include <aws/timestream-query/model/QueryPaginationTraits.h>
 #include <aws/timestream-query/model/QueryPricingModel.h>
 #include <aws/timestream-query/model/QueryRequest.h>
 #include <aws/timestream-query/model/QueryResult.h>
diff --git a/generated/tests/timestream-write-gen-tests/TimestreamWriteIncludeTests.cpp b/generated/tests/timestream-write-gen-tests/TimestreamWriteIncludeTests.cpp
index 22cbfff93120..c1e212ea91be 100644
--- a/generated/tests/timestream-write-gen-tests/TimestreamWriteIncludeTests.cpp
+++ b/generated/tests/timestream-write-gen-tests/TimestreamWriteIncludeTests.cpp
@@ -8,12 +8,16 @@
 
 #include <aws/timestream-write/TimestreamWriteClient.h>
 #include <aws/timestream-write/TimestreamWriteClientConfiguration.h>
+#include <aws/timestream-write/TimestreamWriteClientPagination.h>
 #include <aws/timestream-write/TimestreamWriteEndpointProvider.h>
 #include <aws/timestream-write/TimestreamWriteErrorMarshaller.h>
 #include <aws/timestream-write/TimestreamWriteErrors.h>
+#include <aws/timestream-write/TimestreamWritePaginationBase.h>
 #include <aws/timestream-write/TimestreamWriteRequest.h>
 #include <aws/timestream-write/TimestreamWriteServiceClientModel.h>
+#include <aws/timestream-write/TimestreamWriteWaiter.h>
 #include <aws/timestream-write/TimestreamWrite_EXPORTS.h>
+#include <aws/timestream-write/internal/TimestreamWriteEndpointRules.h>
 #include <aws/timestream-write/model/BatchLoadDataFormat.h>
 #include <aws/timestream-write/model/BatchLoadProgressReport.h>
 #include <aws/timestream-write/model/BatchLoadStatus.h>
@@ -46,10 +50,13 @@
 #include <aws/timestream-write/model/DimensionMapping.h>
 #include <aws/timestream-write/model/DimensionValueType.h>
 #include <aws/timestream-write/model/Endpoint.h>
+#include <aws/timestream-write/model/ListBatchLoadTasksPaginationTraits.h>
 #include <aws/timestream-write/model/ListBatchLoadTasksRequest.h>
 #include <aws/timestream-write/model/ListBatchLoadTasksResult.h>
+#include <aws/timestream-write/model/ListDatabasesPaginationTraits.h>
 #include <aws/timestream-write/model/ListDatabasesRequest.h>
 #include <aws/timestream-write/model/ListDatabasesResult.h>
+#include <aws/timestream-write/model/ListTablesPaginationTraits.h>
 #include <aws/timestream-write/model/ListTablesRequest.h>
 #include <aws/timestream-write/model/ListTablesResult.h>
 #include <aws/timestream-write/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/tnb-gen-tests/TnbIncludeTests.cpp b/generated/tests/tnb-gen-tests/TnbIncludeTests.cpp
index 5889310acd97..90e2736dab78 100644
--- a/generated/tests/tnb-gen-tests/TnbIncludeTests.cpp
+++ b/generated/tests/tnb-gen-tests/TnbIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/tnb/TnbClient.h>
+#include <aws/tnb/TnbClientPagination.h>
 #include <aws/tnb/TnbEndpointProvider.h>
 #include <aws/tnb/TnbErrorMarshaller.h>
 #include <aws/tnb/TnbErrors.h>
+#include <aws/tnb/TnbPaginationBase.h>
 #include <aws/tnb/TnbRequest.h>
 #include <aws/tnb/TnbServiceClientModel.h>
+#include <aws/tnb/TnbWaiter.h>
 #include <aws/tnb/Tnb_EXPORTS.h>
+#include <aws/tnb/internal/TnbEndpointRules.h>
 #include <aws/tnb/model/CancelSolNetworkOperationRequest.h>
 #include <aws/tnb/model/CreateSolFunctionPackageRequest.h>
 #include <aws/tnb/model/CreateSolFunctionPackageResult.h>
@@ -61,22 +65,27 @@
 #include <aws/tnb/model/LcmOperationType.h>
 #include <aws/tnb/model/ListSolFunctionInstanceInfo.h>
 #include <aws/tnb/model/ListSolFunctionInstanceMetadata.h>
+#include <aws/tnb/model/ListSolFunctionInstancesPaginationTraits.h>
 #include <aws/tnb/model/ListSolFunctionInstancesRequest.h>
 #include <aws/tnb/model/ListSolFunctionInstancesResult.h>
 #include <aws/tnb/model/ListSolFunctionPackageInfo.h>
 #include <aws/tnb/model/ListSolFunctionPackageMetadata.h>
+#include <aws/tnb/model/ListSolFunctionPackagesPaginationTraits.h>
 #include <aws/tnb/model/ListSolFunctionPackagesRequest.h>
 #include <aws/tnb/model/ListSolFunctionPackagesResult.h>
 #include <aws/tnb/model/ListSolNetworkInstanceInfo.h>
 #include <aws/tnb/model/ListSolNetworkInstanceMetadata.h>
+#include <aws/tnb/model/ListSolNetworkInstancesPaginationTraits.h>
 #include <aws/tnb/model/ListSolNetworkInstancesRequest.h>
 #include <aws/tnb/model/ListSolNetworkInstancesResult.h>
 #include <aws/tnb/model/ListSolNetworkOperationsInfo.h>
 #include <aws/tnb/model/ListSolNetworkOperationsMetadata.h>
+#include <aws/tnb/model/ListSolNetworkOperationsPaginationTraits.h>
 #include <aws/tnb/model/ListSolNetworkOperationsRequest.h>
 #include <aws/tnb/model/ListSolNetworkOperationsResult.h>
 #include <aws/tnb/model/ListSolNetworkPackageInfo.h>
 #include <aws/tnb/model/ListSolNetworkPackageMetadata.h>
+#include <aws/tnb/model/ListSolNetworkPackagesPaginationTraits.h>
 #include <aws/tnb/model/ListSolNetworkPackagesRequest.h>
 #include <aws/tnb/model/ListSolNetworkPackagesResult.h>
 #include <aws/tnb/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/transcribe-gen-tests/TranscribeServiceIncludeTests.cpp b/generated/tests/transcribe-gen-tests/TranscribeServiceIncludeTests.cpp
index edbfd4d55651..712b3bfdbc2a 100644
--- a/generated/tests/transcribe-gen-tests/TranscribeServiceIncludeTests.cpp
+++ b/generated/tests/transcribe-gen-tests/TranscribeServiceIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/transcribe/TranscribeServiceClient.h>
+#include <aws/transcribe/TranscribeServiceClientPagination.h>
 #include <aws/transcribe/TranscribeServiceEndpointProvider.h>
 #include <aws/transcribe/TranscribeServiceErrorMarshaller.h>
 #include <aws/transcribe/TranscribeServiceErrors.h>
+#include <aws/transcribe/TranscribeServicePaginationBase.h>
 #include <aws/transcribe/TranscribeServiceRequest.h>
 #include <aws/transcribe/TranscribeServiceServiceClientModel.h>
+#include <aws/transcribe/TranscribeServiceWaiter.h>
 #include <aws/transcribe/TranscribeService_EXPORTS.h>
+#include <aws/transcribe/internal/TranscribeServiceEndpointRules.h>
 #include <aws/transcribe/model/AbsoluteTimeRange.h>
 #include <aws/transcribe/model/BaseModelName.h>
 #include <aws/transcribe/model/CLMLanguageCode.h>
@@ -75,24 +79,33 @@
 #include <aws/transcribe/model/LanguageCodeItem.h>
 #include <aws/transcribe/model/LanguageIdSettings.h>
 #include <aws/transcribe/model/LanguageModel.h>
+#include <aws/transcribe/model/ListCallAnalyticsCategoriesPaginationTraits.h>
 #include <aws/transcribe/model/ListCallAnalyticsCategoriesRequest.h>
 #include <aws/transcribe/model/ListCallAnalyticsCategoriesResult.h>
+#include <aws/transcribe/model/ListCallAnalyticsJobsPaginationTraits.h>
 #include <aws/transcribe/model/ListCallAnalyticsJobsRequest.h>
 #include <aws/transcribe/model/ListCallAnalyticsJobsResult.h>
+#include <aws/transcribe/model/ListLanguageModelsPaginationTraits.h>
 #include <aws/transcribe/model/ListLanguageModelsRequest.h>
 #include <aws/transcribe/model/ListLanguageModelsResult.h>
+#include <aws/transcribe/model/ListMedicalScribeJobsPaginationTraits.h>
 #include <aws/transcribe/model/ListMedicalScribeJobsRequest.h>
 #include <aws/transcribe/model/ListMedicalScribeJobsResult.h>
+#include <aws/transcribe/model/ListMedicalTranscriptionJobsPaginationTraits.h>
 #include <aws/transcribe/model/ListMedicalTranscriptionJobsRequest.h>
 #include <aws/transcribe/model/ListMedicalTranscriptionJobsResult.h>
+#include <aws/transcribe/model/ListMedicalVocabulariesPaginationTraits.h>
 #include <aws/transcribe/model/ListMedicalVocabulariesRequest.h>
 #include <aws/transcribe/model/ListMedicalVocabulariesResult.h>
 #include <aws/transcribe/model/ListTagsForResourceRequest.h>
 #include <aws/transcribe/model/ListTagsForResourceResult.h>
+#include <aws/transcribe/model/ListTranscriptionJobsPaginationTraits.h>
 #include <aws/transcribe/model/ListTranscriptionJobsRequest.h>
 #include <aws/transcribe/model/ListTranscriptionJobsResult.h>
+#include <aws/transcribe/model/ListVocabulariesPaginationTraits.h>
 #include <aws/transcribe/model/ListVocabulariesRequest.h>
 #include <aws/transcribe/model/ListVocabulariesResult.h>
+#include <aws/transcribe/model/ListVocabularyFiltersPaginationTraits.h>
 #include <aws/transcribe/model/ListVocabularyFiltersRequest.h>
 #include <aws/transcribe/model/ListVocabularyFiltersResult.h>
 #include <aws/transcribe/model/Media.h>
diff --git a/generated/tests/transcribestreaming-gen-tests/TranscribeStreamingServiceIncludeTests.cpp b/generated/tests/transcribestreaming-gen-tests/TranscribeStreamingServiceIncludeTests.cpp
index b9739fdb31b6..0bd5900c5457 100644
--- a/generated/tests/transcribestreaming-gen-tests/TranscribeStreamingServiceIncludeTests.cpp
+++ b/generated/tests/transcribestreaming-gen-tests/TranscribeStreamingServiceIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/transcribestreaming/TranscribeStreamingServiceEndpointProvider.h>
 #include <aws/transcribestreaming/TranscribeStreamingServiceErrorMarshaller.h>
 #include <aws/transcribestreaming/TranscribeStreamingServiceErrors.h>
+#include <aws/transcribestreaming/TranscribeStreamingServicePaginationBase.h>
 #include <aws/transcribestreaming/TranscribeStreamingServiceRequest.h>
 #include <aws/transcribestreaming/TranscribeStreamingServiceServiceClientModel.h>
+#include <aws/transcribestreaming/TranscribeStreamingServiceWaiter.h>
 #include <aws/transcribestreaming/TranscribeStreamingService_EXPORTS.h>
+#include <aws/transcribestreaming/internal/TranscribeStreamingServiceEndpointRules.h>
 #include <aws/transcribestreaming/model/Alternative.h>
 #include <aws/transcribestreaming/model/AudioEvent.h>
 #include <aws/transcribestreaming/model/AudioStream.h>
diff --git a/generated/tests/translate-gen-tests/TranslateIncludeTests.cpp b/generated/tests/translate-gen-tests/TranslateIncludeTests.cpp
index d31bc16de82d..c35c18784f6e 100644
--- a/generated/tests/translate-gen-tests/TranslateIncludeTests.cpp
+++ b/generated/tests/translate-gen-tests/TranslateIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/translate/TranslateClient.h>
+#include <aws/translate/TranslateClientPagination.h>
 #include <aws/translate/TranslateEndpointProvider.h>
 #include <aws/translate/TranslateErrorMarshaller.h>
 #include <aws/translate/TranslateErrors.h>
+#include <aws/translate/TranslatePaginationBase.h>
 #include <aws/translate/TranslateRequest.h>
 #include <aws/translate/TranslateServiceClientModel.h>
+#include <aws/translate/TranslateWaiter.h>
 #include <aws/translate/Translate_EXPORTS.h>
+#include <aws/translate/internal/TranslateEndpointRules.h>
 #include <aws/translate/model/AppliedTerminology.h>
 #include <aws/translate/model/Brevity.h>
 #include <aws/translate/model/CreateParallelDataRequest.h>
@@ -39,14 +43,18 @@
 #include <aws/translate/model/JobDetails.h>
 #include <aws/translate/model/JobStatus.h>
 #include <aws/translate/model/Language.h>
+#include <aws/translate/model/ListLanguagesPaginationTraits.h>
 #include <aws/translate/model/ListLanguagesRequest.h>
 #include <aws/translate/model/ListLanguagesResult.h>
+#include <aws/translate/model/ListParallelDataPaginationTraits.h>
 #include <aws/translate/model/ListParallelDataRequest.h>
 #include <aws/translate/model/ListParallelDataResult.h>
 #include <aws/translate/model/ListTagsForResourceRequest.h>
 #include <aws/translate/model/ListTagsForResourceResult.h>
+#include <aws/translate/model/ListTerminologiesPaginationTraits.h>
 #include <aws/translate/model/ListTerminologiesRequest.h>
 #include <aws/translate/model/ListTerminologiesResult.h>
+#include <aws/translate/model/ListTextTranslationJobsPaginationTraits.h>
 #include <aws/translate/model/ListTextTranslationJobsRequest.h>
 #include <aws/translate/model/ListTextTranslationJobsResult.h>
 #include <aws/translate/model/MergeStrategy.h>
diff --git a/generated/tests/trustedadvisor-gen-tests/TrustedAdvisorIncludeTests.cpp b/generated/tests/trustedadvisor-gen-tests/TrustedAdvisorIncludeTests.cpp
index 4cd9d37ec65c..19f4aa7bd1c4 100644
--- a/generated/tests/trustedadvisor-gen-tests/TrustedAdvisorIncludeTests.cpp
+++ b/generated/tests/trustedadvisor-gen-tests/TrustedAdvisorIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/trustedadvisor/TrustedAdvisorClient.h>
+#include <aws/trustedadvisor/TrustedAdvisorClientPagination.h>
 #include <aws/trustedadvisor/TrustedAdvisorEndpointProvider.h>
 #include <aws/trustedadvisor/TrustedAdvisorErrorMarshaller.h>
 #include <aws/trustedadvisor/TrustedAdvisorErrors.h>
+#include <aws/trustedadvisor/TrustedAdvisorPaginationBase.h>
 #include <aws/trustedadvisor/TrustedAdvisorRequest.h>
 #include <aws/trustedadvisor/TrustedAdvisorServiceClientModel.h>
+#include <aws/trustedadvisor/TrustedAdvisorWaiter.h>
 #include <aws/trustedadvisor/TrustedAdvisor_EXPORTS.h>
+#include <aws/trustedadvisor/internal/TrustedAdvisorEndpointRules.h>
 #include <aws/trustedadvisor/model/AccountRecommendationLifecycleSummary.h>
 #include <aws/trustedadvisor/model/BatchUpdateRecommendationResourceExclusionRequest.h>
 #include <aws/trustedadvisor/model/BatchUpdateRecommendationResourceExclusionResult.h>
@@ -22,18 +26,25 @@
 #include <aws/trustedadvisor/model/GetOrganizationRecommendationResult.h>
 #include <aws/trustedadvisor/model/GetRecommendationRequest.h>
 #include <aws/trustedadvisor/model/GetRecommendationResult.h>
+#include <aws/trustedadvisor/model/ListChecksPaginationTraits.h>
 #include <aws/trustedadvisor/model/ListChecksRequest.h>
 #include <aws/trustedadvisor/model/ListChecksResult.h>
+#include <aws/trustedadvisor/model/ListOrganizationRecommendationAccountsPaginationTraits.h>
 #include <aws/trustedadvisor/model/ListOrganizationRecommendationAccountsRequest.h>
 #include <aws/trustedadvisor/model/ListOrganizationRecommendationAccountsResult.h>
+#include <aws/trustedadvisor/model/ListOrganizationRecommendationResourcesPaginationTraits.h>
 #include <aws/trustedadvisor/model/ListOrganizationRecommendationResourcesRequest.h>
 #include <aws/trustedadvisor/model/ListOrganizationRecommendationResourcesResult.h>
+#include <aws/trustedadvisor/model/ListOrganizationRecommendationsPaginationTraits.h>
 #include <aws/trustedadvisor/model/ListOrganizationRecommendationsRequest.h>
 #include <aws/trustedadvisor/model/ListOrganizationRecommendationsResult.h>
+#include <aws/trustedadvisor/model/ListRecommendationResourcesPaginationTraits.h>
 #include <aws/trustedadvisor/model/ListRecommendationResourcesRequest.h>
 #include <aws/trustedadvisor/model/ListRecommendationResourcesResult.h>
+#include <aws/trustedadvisor/model/ListRecommendationsForResourcePaginationTraits.h>
 #include <aws/trustedadvisor/model/ListRecommendationsForResourceRequest.h>
 #include <aws/trustedadvisor/model/ListRecommendationsForResourceResult.h>
+#include <aws/trustedadvisor/model/ListRecommendationsPaginationTraits.h>
 #include <aws/trustedadvisor/model/ListRecommendationsRequest.h>
 #include <aws/trustedadvisor/model/ListRecommendationsResult.h>
 #include <aws/trustedadvisor/model/OrganizationRecommendation.h>
diff --git a/generated/tests/uxc-gen-tests/UxcIncludeTests.cpp b/generated/tests/uxc-gen-tests/UxcIncludeTests.cpp
index 6426b9977e1f..74165495cee0 100644
--- a/generated/tests/uxc-gen-tests/UxcIncludeTests.cpp
+++ b/generated/tests/uxc-gen-tests/UxcIncludeTests.cpp
@@ -7,15 +7,20 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/uxc/UxcClient.h>
+#include <aws/uxc/UxcClientPagination.h>
 #include <aws/uxc/UxcEndpointProvider.h>
 #include <aws/uxc/UxcErrorMarshaller.h>
 #include <aws/uxc/UxcErrors.h>
+#include <aws/uxc/UxcPaginationBase.h>
 #include <aws/uxc/UxcRequest.h>
 #include <aws/uxc/UxcServiceClientModel.h>
+#include <aws/uxc/UxcWaiter.h>
 #include <aws/uxc/Uxc_EXPORTS.h>
+#include <aws/uxc/internal/UxcEndpointRules.h>
 #include <aws/uxc/model/AccountColor.h>
 #include <aws/uxc/model/GetAccountCustomizationsRequest.h>
 #include <aws/uxc/model/GetAccountCustomizationsResult.h>
+#include <aws/uxc/model/ListServicesPaginationTraits.h>
 #include <aws/uxc/model/ListServicesRequest.h>
 #include <aws/uxc/model/ListServicesResult.h>
 #include <aws/uxc/model/UpdateAccountCustomizationsRequest.h>
diff --git a/generated/tests/verifiedpermissions-gen-tests/VerifiedPermissionsIncludeTests.cpp b/generated/tests/verifiedpermissions-gen-tests/VerifiedPermissionsIncludeTests.cpp
index ea5b1b215654..84a83ccc7164 100644
--- a/generated/tests/verifiedpermissions-gen-tests/VerifiedPermissionsIncludeTests.cpp
+++ b/generated/tests/verifiedpermissions-gen-tests/VerifiedPermissionsIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/verifiedpermissions/VerifiedPermissionsClient.h>
+#include <aws/verifiedpermissions/VerifiedPermissionsClientPagination.h>
 #include <aws/verifiedpermissions/VerifiedPermissionsEndpointProvider.h>
 #include <aws/verifiedpermissions/VerifiedPermissionsErrorMarshaller.h>
 #include <aws/verifiedpermissions/VerifiedPermissionsErrors.h>
+#include <aws/verifiedpermissions/VerifiedPermissionsPaginationBase.h>
 #include <aws/verifiedpermissions/VerifiedPermissionsRequest.h>
 #include <aws/verifiedpermissions/VerifiedPermissionsServiceClientModel.h>
+#include <aws/verifiedpermissions/VerifiedPermissionsWaiter.h>
 #include <aws/verifiedpermissions/VerifiedPermissions_EXPORTS.h>
+#include <aws/verifiedpermissions/internal/VerifiedPermissionsEndpointRules.h>
 #include <aws/verifiedpermissions/model/ActionIdentifier.h>
 #include <aws/verifiedpermissions/model/AliasState.h>
 #include <aws/verifiedpermissions/model/AttributeValue.h>
@@ -94,14 +98,19 @@
 #include <aws/verifiedpermissions/model/IsAuthorizedWithTokenResult.h>
 #include <aws/verifiedpermissions/model/KmsEncryptionSettings.h>
 #include <aws/verifiedpermissions/model/KmsEncryptionState.h>
+#include <aws/verifiedpermissions/model/ListIdentitySourcesPaginationTraits.h>
 #include <aws/verifiedpermissions/model/ListIdentitySourcesRequest.h>
 #include <aws/verifiedpermissions/model/ListIdentitySourcesResult.h>
+#include <aws/verifiedpermissions/model/ListPoliciesPaginationTraits.h>
 #include <aws/verifiedpermissions/model/ListPoliciesRequest.h>
 #include <aws/verifiedpermissions/model/ListPoliciesResult.h>
+#include <aws/verifiedpermissions/model/ListPolicyStoreAliasesPaginationTraits.h>
 #include <aws/verifiedpermissions/model/ListPolicyStoreAliasesRequest.h>
 #include <aws/verifiedpermissions/model/ListPolicyStoreAliasesResult.h>
+#include <aws/verifiedpermissions/model/ListPolicyStoresPaginationTraits.h>
 #include <aws/verifiedpermissions/model/ListPolicyStoresRequest.h>
 #include <aws/verifiedpermissions/model/ListPolicyStoresResult.h>
+#include <aws/verifiedpermissions/model/ListPolicyTemplatesPaginationTraits.h>
 #include <aws/verifiedpermissions/model/ListPolicyTemplatesRequest.h>
 #include <aws/verifiedpermissions/model/ListPolicyTemplatesResult.h>
 #include <aws/verifiedpermissions/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/voice-id-gen-tests/VoiceIDIncludeTests.cpp b/generated/tests/voice-id-gen-tests/VoiceIDIncludeTests.cpp
index a3b59602db08..9191284af19f 100644
--- a/generated/tests/voice-id-gen-tests/VoiceIDIncludeTests.cpp
+++ b/generated/tests/voice-id-gen-tests/VoiceIDIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/voice-id/VoiceIDClient.h>
+#include <aws/voice-id/VoiceIDClientPagination.h>
 #include <aws/voice-id/VoiceIDEndpointProvider.h>
 #include <aws/voice-id/VoiceIDErrorMarshaller.h>
 #include <aws/voice-id/VoiceIDErrors.h>
+#include <aws/voice-id/VoiceIDPaginationBase.h>
 #include <aws/voice-id/VoiceIDRequest.h>
 #include <aws/voice-id/VoiceIDServiceClientModel.h>
+#include <aws/voice-id/VoiceIDWaiter.h>
 #include <aws/voice-id/VoiceID_EXPORTS.h>
+#include <aws/voice-id/internal/VoiceIDEndpointRules.h>
 #include <aws/voice-id/model/AssociateFraudsterRequest.h>
 #include <aws/voice-id/model/AssociateFraudsterResult.h>
 #include <aws/voice-id/model/AuthenticationConfiguration.h>
@@ -66,18 +70,24 @@
 #include <aws/voice-id/model/InputDataConfig.h>
 #include <aws/voice-id/model/JobProgress.h>
 #include <aws/voice-id/model/KnownFraudsterRisk.h>
+#include <aws/voice-id/model/ListDomainsPaginationTraits.h>
 #include <aws/voice-id/model/ListDomainsRequest.h>
 #include <aws/voice-id/model/ListDomainsResult.h>
+#include <aws/voice-id/model/ListFraudsterRegistrationJobsPaginationTraits.h>
 #include <aws/voice-id/model/ListFraudsterRegistrationJobsRequest.h>
 #include <aws/voice-id/model/ListFraudsterRegistrationJobsResult.h>
+#include <aws/voice-id/model/ListFraudstersPaginationTraits.h>
 #include <aws/voice-id/model/ListFraudstersRequest.h>
 #include <aws/voice-id/model/ListFraudstersResult.h>
+#include <aws/voice-id/model/ListSpeakerEnrollmentJobsPaginationTraits.h>
 #include <aws/voice-id/model/ListSpeakerEnrollmentJobsRequest.h>
 #include <aws/voice-id/model/ListSpeakerEnrollmentJobsResult.h>
+#include <aws/voice-id/model/ListSpeakersPaginationTraits.h>
 #include <aws/voice-id/model/ListSpeakersRequest.h>
 #include <aws/voice-id/model/ListSpeakersResult.h>
 #include <aws/voice-id/model/ListTagsForResourceRequest.h>
 #include <aws/voice-id/model/ListTagsForResourceResult.h>
+#include <aws/voice-id/model/ListWatchlistsPaginationTraits.h>
 #include <aws/voice-id/model/ListWatchlistsRequest.h>
 #include <aws/voice-id/model/ListWatchlistsResult.h>
 #include <aws/voice-id/model/OptOutSpeakerRequest.h>
diff --git a/generated/tests/vpc-lattice-gen-tests/VPCLatticeIncludeTests.cpp b/generated/tests/vpc-lattice-gen-tests/VPCLatticeIncludeTests.cpp
index 92a9487dd318..f781ccbfa563 100644
--- a/generated/tests/vpc-lattice-gen-tests/VPCLatticeIncludeTests.cpp
+++ b/generated/tests/vpc-lattice-gen-tests/VPCLatticeIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/vpc-lattice/VPCLatticeClient.h>
+#include <aws/vpc-lattice/VPCLatticeClientPagination.h>
 #include <aws/vpc-lattice/VPCLatticeEndpointProvider.h>
 #include <aws/vpc-lattice/VPCLatticeErrorMarshaller.h>
 #include <aws/vpc-lattice/VPCLatticeErrors.h>
+#include <aws/vpc-lattice/VPCLatticePaginationBase.h>
 #include <aws/vpc-lattice/VPCLatticeRequest.h>
 #include <aws/vpc-lattice/VPCLatticeServiceClientModel.h>
+#include <aws/vpc-lattice/VPCLatticeWaiter.h>
 #include <aws/vpc-lattice/VPCLattice_EXPORTS.h>
+#include <aws/vpc-lattice/internal/VPCLatticeEndpointRules.h>
 #include <aws/vpc-lattice/model/AccessLogSubscriptionSummary.h>
 #include <aws/vpc-lattice/model/ArnResource.h>
 #include <aws/vpc-lattice/model/AuthPolicyState.h>
@@ -117,36 +121,51 @@
 #include <aws/vpc-lattice/model/IpAddressType.h>
 #include <aws/vpc-lattice/model/IpResource.h>
 #include <aws/vpc-lattice/model/LambdaEventStructureVersion.h>
+#include <aws/vpc-lattice/model/ListAccessLogSubscriptionsPaginationTraits.h>
 #include <aws/vpc-lattice/model/ListAccessLogSubscriptionsRequest.h>
 #include <aws/vpc-lattice/model/ListAccessLogSubscriptionsResult.h>
+#include <aws/vpc-lattice/model/ListDomainVerificationsPaginationTraits.h>
 #include <aws/vpc-lattice/model/ListDomainVerificationsRequest.h>
 #include <aws/vpc-lattice/model/ListDomainVerificationsResult.h>
+#include <aws/vpc-lattice/model/ListListenersPaginationTraits.h>
 #include <aws/vpc-lattice/model/ListListenersRequest.h>
 #include <aws/vpc-lattice/model/ListListenersResult.h>
+#include <aws/vpc-lattice/model/ListResourceConfigurationsPaginationTraits.h>
 #include <aws/vpc-lattice/model/ListResourceConfigurationsRequest.h>
 #include <aws/vpc-lattice/model/ListResourceConfigurationsResult.h>
+#include <aws/vpc-lattice/model/ListResourceEndpointAssociationsPaginationTraits.h>
 #include <aws/vpc-lattice/model/ListResourceEndpointAssociationsRequest.h>
 #include <aws/vpc-lattice/model/ListResourceEndpointAssociationsResult.h>
+#include <aws/vpc-lattice/model/ListResourceGatewaysPaginationTraits.h>
 #include <aws/vpc-lattice/model/ListResourceGatewaysRequest.h>
 #include <aws/vpc-lattice/model/ListResourceGatewaysResult.h>
+#include <aws/vpc-lattice/model/ListRulesPaginationTraits.h>
 #include <aws/vpc-lattice/model/ListRulesRequest.h>
 #include <aws/vpc-lattice/model/ListRulesResult.h>
+#include <aws/vpc-lattice/model/ListServiceNetworkResourceAssociationsPaginationTraits.h>
 #include <aws/vpc-lattice/model/ListServiceNetworkResourceAssociationsRequest.h>
 #include <aws/vpc-lattice/model/ListServiceNetworkResourceAssociationsResult.h>
+#include <aws/vpc-lattice/model/ListServiceNetworkServiceAssociationsPaginationTraits.h>
 #include <aws/vpc-lattice/model/ListServiceNetworkServiceAssociationsRequest.h>
 #include <aws/vpc-lattice/model/ListServiceNetworkServiceAssociationsResult.h>
+#include <aws/vpc-lattice/model/ListServiceNetworkVpcAssociationsPaginationTraits.h>
 #include <aws/vpc-lattice/model/ListServiceNetworkVpcAssociationsRequest.h>
 #include <aws/vpc-lattice/model/ListServiceNetworkVpcAssociationsResult.h>
+#include <aws/vpc-lattice/model/ListServiceNetworkVpcEndpointAssociationsPaginationTraits.h>
 #include <aws/vpc-lattice/model/ListServiceNetworkVpcEndpointAssociationsRequest.h>
 #include <aws/vpc-lattice/model/ListServiceNetworkVpcEndpointAssociationsResult.h>
+#include <aws/vpc-lattice/model/ListServiceNetworksPaginationTraits.h>
 #include <aws/vpc-lattice/model/ListServiceNetworksRequest.h>
 #include <aws/vpc-lattice/model/ListServiceNetworksResult.h>
+#include <aws/vpc-lattice/model/ListServicesPaginationTraits.h>
 #include <aws/vpc-lattice/model/ListServicesRequest.h>
 #include <aws/vpc-lattice/model/ListServicesResult.h>
 #include <aws/vpc-lattice/model/ListTagsForResourceRequest.h>
 #include <aws/vpc-lattice/model/ListTagsForResourceResult.h>
+#include <aws/vpc-lattice/model/ListTargetGroupsPaginationTraits.h>
 #include <aws/vpc-lattice/model/ListTargetGroupsRequest.h>
 #include <aws/vpc-lattice/model/ListTargetGroupsResult.h>
+#include <aws/vpc-lattice/model/ListTargetsPaginationTraits.h>
 #include <aws/vpc-lattice/model/ListTargetsRequest.h>
 #include <aws/vpc-lattice/model/ListTargetsResult.h>
 #include <aws/vpc-lattice/model/ListenerProtocol.h>
diff --git a/generated/tests/waf-gen-tests/WAFIncludeTests.cpp b/generated/tests/waf-gen-tests/WAFIncludeTests.cpp
index 674591e5713e..297c2cefc481 100644
--- a/generated/tests/waf-gen-tests/WAFIncludeTests.cpp
+++ b/generated/tests/waf-gen-tests/WAFIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/waf/WAFEndpointProvider.h>
 #include <aws/waf/WAFErrorMarshaller.h>
 #include <aws/waf/WAFErrors.h>
+#include <aws/waf/WAFPaginationBase.h>
 #include <aws/waf/WAFRequest.h>
 #include <aws/waf/WAFServiceClientModel.h>
+#include <aws/waf/WAFWaiter.h>
 #include <aws/waf/WAF_EXPORTS.h>
+#include <aws/waf/internal/WAFEndpointRules.h>
 #include <aws/waf/model/ActivatedRule.h>
 #include <aws/waf/model/ByteMatchSet.h>
 #include <aws/waf/model/ByteMatchSetSummary.h>
diff --git a/generated/tests/waf-regional-gen-tests/WAFRegionalIncludeTests.cpp b/generated/tests/waf-regional-gen-tests/WAFRegionalIncludeTests.cpp
index 06e14916da67..57b8f1768536 100644
--- a/generated/tests/waf-regional-gen-tests/WAFRegionalIncludeTests.cpp
+++ b/generated/tests/waf-regional-gen-tests/WAFRegionalIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/waf-regional/WAFRegionalEndpointProvider.h>
 #include <aws/waf-regional/WAFRegionalErrorMarshaller.h>
 #include <aws/waf-regional/WAFRegionalErrors.h>
+#include <aws/waf-regional/WAFRegionalPaginationBase.h>
 #include <aws/waf-regional/WAFRegionalRequest.h>
 #include <aws/waf-regional/WAFRegionalServiceClientModel.h>
+#include <aws/waf-regional/WAFRegionalWaiter.h>
 #include <aws/waf-regional/WAFRegional_EXPORTS.h>
+#include <aws/waf-regional/internal/WAFRegionalEndpointRules.h>
 #include <aws/waf-regional/model/ActivatedRule.h>
 #include <aws/waf-regional/model/AssociateWebACLRequest.h>
 #include <aws/waf-regional/model/AssociateWebACLResult.h>
diff --git a/generated/tests/wafv2-gen-tests/WAFV2IncludeTests.cpp b/generated/tests/wafv2-gen-tests/WAFV2IncludeTests.cpp
index 679aed4ddbed..5c01d81aca05 100644
--- a/generated/tests/wafv2-gen-tests/WAFV2IncludeTests.cpp
+++ b/generated/tests/wafv2-gen-tests/WAFV2IncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/wafv2/WAFV2EndpointProvider.h>
 #include <aws/wafv2/WAFV2ErrorMarshaller.h>
 #include <aws/wafv2/WAFV2Errors.h>
+#include <aws/wafv2/WAFV2PaginationBase.h>
 #include <aws/wafv2/WAFV2Request.h>
 #include <aws/wafv2/WAFV2ServiceClientModel.h>
+#include <aws/wafv2/WAFV2Waiter.h>
 #include <aws/wafv2/WAFV2_EXPORTS.h>
+#include <aws/wafv2/internal/WAFV2EndpointRules.h>
 #include <aws/wafv2/model/APIKeySummary.h>
 #include <aws/wafv2/model/AWSManagedRulesACFPRuleSet.h>
 #include <aws/wafv2/model/AWSManagedRulesATPRuleSet.h>
diff --git a/generated/tests/wellarchitected-gen-tests/WellArchitectedIncludeTests.cpp b/generated/tests/wellarchitected-gen-tests/WellArchitectedIncludeTests.cpp
index 5a562cd8323e..a352d25a75b0 100644
--- a/generated/tests/wellarchitected-gen-tests/WellArchitectedIncludeTests.cpp
+++ b/generated/tests/wellarchitected-gen-tests/WellArchitectedIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/wellarchitected/WellArchitectedClient.h>
+#include <aws/wellarchitected/WellArchitectedClientPagination.h>
 #include <aws/wellarchitected/WellArchitectedEndpointProvider.h>
 #include <aws/wellarchitected/WellArchitectedErrorMarshaller.h>
 #include <aws/wellarchitected/WellArchitectedErrors.h>
+#include <aws/wellarchitected/WellArchitectedPaginationBase.h>
 #include <aws/wellarchitected/WellArchitectedRequest.h>
 #include <aws/wellarchitected/WellArchitectedServiceClientModel.h>
+#include <aws/wellarchitected/WellArchitectedWaiter.h>
 #include <aws/wellarchitected/WellArchitected_EXPORTS.h>
+#include <aws/wellarchitected/internal/WellArchitectedEndpointRules.h>
 #include <aws/wellarchitected/model/AccountJiraConfigurationInput.h>
 #include <aws/wellarchitected/model/AccountJiraConfigurationOutput.h>
 #include <aws/wellarchitected/model/AccountJiraIssueManagementStatus.h>
@@ -113,6 +117,7 @@
 #include <aws/wellarchitected/model/GetAgentRecommendationResult.h>
 #include <aws/wellarchitected/model/GetAnswerRequest.h>
 #include <aws/wellarchitected/model/GetAnswerResult.h>
+#include <aws/wellarchitected/model/GetConsolidatedReportPaginationTraits.h>
 #include <aws/wellarchitected/model/GetConsolidatedReportRequest.h>
 #include <aws/wellarchitected/model/GetConsolidatedReportResult.h>
 #include <aws/wellarchitected/model/GetGlobalSettingsRequest.h>
@@ -163,54 +168,78 @@
 #include <aws/wellarchitected/model/LensSummary.h>
 #include <aws/wellarchitected/model/LensType.h>
 #include <aws/wellarchitected/model/LensUpgradeSummary.h>
+#include <aws/wellarchitected/model/ListAgentContextsPaginationTraits.h>
 #include <aws/wellarchitected/model/ListAgentContextsRequest.h>
 #include <aws/wellarchitected/model/ListAgentContextsResult.h>
+#include <aws/wellarchitected/model/ListAgentGoalsPaginationTraits.h>
 #include <aws/wellarchitected/model/ListAgentGoalsRequest.h>
 #include <aws/wellarchitected/model/ListAgentGoalsResult.h>
+#include <aws/wellarchitected/model/ListAgentProfilesPaginationTraits.h>
 #include <aws/wellarchitected/model/ListAgentProfilesRequest.h>
 #include <aws/wellarchitected/model/ListAgentProfilesResult.h>
+#include <aws/wellarchitected/model/ListAgentRecommendationGenerationsPaginationTraits.h>
 #include <aws/wellarchitected/model/ListAgentRecommendationGenerationsRequest.h>
 #include <aws/wellarchitected/model/ListAgentRecommendationGenerationsResult.h>
+#include <aws/wellarchitected/model/ListAgentRecommendationItemsPaginationTraits.h>
 #include <aws/wellarchitected/model/ListAgentRecommendationItemsRequest.h>
 #include <aws/wellarchitected/model/ListAgentRecommendationItemsResult.h>
+#include <aws/wellarchitected/model/ListAgentRecommendationsPaginationTraits.h>
 #include <aws/wellarchitected/model/ListAgentRecommendationsRequest.h>
 #include <aws/wellarchitected/model/ListAgentRecommendationsResult.h>
+#include <aws/wellarchitected/model/ListAnswersPaginationTraits.h>
 #include <aws/wellarchitected/model/ListAnswersRequest.h>
 #include <aws/wellarchitected/model/ListAnswersResult.h>
+#include <aws/wellarchitected/model/ListCheckDetailsPaginationTraits.h>
 #include <aws/wellarchitected/model/ListCheckDetailsRequest.h>
 #include <aws/wellarchitected/model/ListCheckDetailsResult.h>
+#include <aws/wellarchitected/model/ListCheckSummariesPaginationTraits.h>
 #include <aws/wellarchitected/model/ListCheckSummariesRequest.h>
 #include <aws/wellarchitected/model/ListCheckSummariesResult.h>
+#include <aws/wellarchitected/model/ListLensReviewImprovementsPaginationTraits.h>
 #include <aws/wellarchitected/model/ListLensReviewImprovementsRequest.h>
 #include <aws/wellarchitected/model/ListLensReviewImprovementsResult.h>
+#include <aws/wellarchitected/model/ListLensReviewsPaginationTraits.h>
 #include <aws/wellarchitected/model/ListLensReviewsRequest.h>
 #include <aws/wellarchitected/model/ListLensReviewsResult.h>
+#include <aws/wellarchitected/model/ListLensSharesPaginationTraits.h>
 #include <aws/wellarchitected/model/ListLensSharesRequest.h>
 #include <aws/wellarchitected/model/ListLensSharesResult.h>
+#include <aws/wellarchitected/model/ListLensesPaginationTraits.h>
 #include <aws/wellarchitected/model/ListLensesRequest.h>
 #include <aws/wellarchitected/model/ListLensesResult.h>
+#include <aws/wellarchitected/model/ListMilestonesPaginationTraits.h>
 #include <aws/wellarchitected/model/ListMilestonesRequest.h>
 #include <aws/wellarchitected/model/ListMilestonesResult.h>
+#include <aws/wellarchitected/model/ListNotificationsPaginationTraits.h>
 #include <aws/wellarchitected/model/ListNotificationsRequest.h>
 #include <aws/wellarchitected/model/ListNotificationsResult.h>
+#include <aws/wellarchitected/model/ListProfileNotificationsPaginationTraits.h>
 #include <aws/wellarchitected/model/ListProfileNotificationsRequest.h>
 #include <aws/wellarchitected/model/ListProfileNotificationsResult.h>
+#include <aws/wellarchitected/model/ListProfileSharesPaginationTraits.h>
 #include <aws/wellarchitected/model/ListProfileSharesRequest.h>
 #include <aws/wellarchitected/model/ListProfileSharesResult.h>
+#include <aws/wellarchitected/model/ListProfilesPaginationTraits.h>
 #include <aws/wellarchitected/model/ListProfilesRequest.h>
 #include <aws/wellarchitected/model/ListProfilesResult.h>
+#include <aws/wellarchitected/model/ListReviewTemplateAnswersPaginationTraits.h>
 #include <aws/wellarchitected/model/ListReviewTemplateAnswersRequest.h>
 #include <aws/wellarchitected/model/ListReviewTemplateAnswersResult.h>
+#include <aws/wellarchitected/model/ListReviewTemplatesPaginationTraits.h>
 #include <aws/wellarchitected/model/ListReviewTemplatesRequest.h>
 #include <aws/wellarchitected/model/ListReviewTemplatesResult.h>
+#include <aws/wellarchitected/model/ListShareInvitationsPaginationTraits.h>
 #include <aws/wellarchitected/model/ListShareInvitationsRequest.h>
 #include <aws/wellarchitected/model/ListShareInvitationsResult.h>
 #include <aws/wellarchitected/model/ListTagsForResourceRequest.h>
 #include <aws/wellarchitected/model/ListTagsForResourceResult.h>
+#include <aws/wellarchitected/model/ListTemplateSharesPaginationTraits.h>
 #include <aws/wellarchitected/model/ListTemplateSharesRequest.h>
 #include <aws/wellarchitected/model/ListTemplateSharesResult.h>
+#include <aws/wellarchitected/model/ListWorkloadSharesPaginationTraits.h>
 #include <aws/wellarchitected/model/ListWorkloadSharesRequest.h>
 #include <aws/wellarchitected/model/ListWorkloadSharesResult.h>
+#include <aws/wellarchitected/model/ListWorkloadsPaginationTraits.h>
 #include <aws/wellarchitected/model/ListWorkloadsRequest.h>
 #include <aws/wellarchitected/model/ListWorkloadsResult.h>
 #include <aws/wellarchitected/model/MetricType.h>
diff --git a/generated/tests/wickr-gen-tests/WickrIncludeTests.cpp b/generated/tests/wickr-gen-tests/WickrIncludeTests.cpp
index d40d20d67549..67a1ba23cbf9 100644
--- a/generated/tests/wickr-gen-tests/WickrIncludeTests.cpp
+++ b/generated/tests/wickr-gen-tests/WickrIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/wickr/WickrClient.h>
+#include <aws/wickr/WickrClientPagination.h>
 #include <aws/wickr/WickrEndpointProvider.h>
 #include <aws/wickr/WickrErrorMarshaller.h>
 #include <aws/wickr/WickrErrors.h>
+#include <aws/wickr/WickrPaginationBase.h>
 #include <aws/wickr/WickrRequest.h>
 #include <aws/wickr/WickrServiceClientModel.h>
+#include <aws/wickr/WickrWaiter.h>
 #include <aws/wickr/Wickr_EXPORTS.h>
+#include <aws/wickr/internal/WickrEndpointRules.h>
 #include <aws/wickr/model/AccessLevel.h>
 #include <aws/wickr/model/BasicDeviceObject.h>
 #include <aws/wickr/model/BatchCreateUserRequest.h>
@@ -82,20 +86,28 @@
 #include <aws/wickr/model/GetUsersCountResult.h>
 #include <aws/wickr/model/GuestUser.h>
 #include <aws/wickr/model/GuestUserHistoryCount.h>
+#include <aws/wickr/model/ListBlockedGuestUsersPaginationTraits.h>
 #include <aws/wickr/model/ListBlockedGuestUsersRequest.h>
 #include <aws/wickr/model/ListBlockedGuestUsersResult.h>
+#include <aws/wickr/model/ListBotsPaginationTraits.h>
 #include <aws/wickr/model/ListBotsRequest.h>
 #include <aws/wickr/model/ListBotsResult.h>
+#include <aws/wickr/model/ListDevicesForUserPaginationTraits.h>
 #include <aws/wickr/model/ListDevicesForUserRequest.h>
 #include <aws/wickr/model/ListDevicesForUserResult.h>
+#include <aws/wickr/model/ListGuestUsersPaginationTraits.h>
 #include <aws/wickr/model/ListGuestUsersRequest.h>
 #include <aws/wickr/model/ListGuestUsersResult.h>
+#include <aws/wickr/model/ListNetworksPaginationTraits.h>
 #include <aws/wickr/model/ListNetworksRequest.h>
 #include <aws/wickr/model/ListNetworksResult.h>
+#include <aws/wickr/model/ListSecurityGroupUsersPaginationTraits.h>
 #include <aws/wickr/model/ListSecurityGroupUsersRequest.h>
 #include <aws/wickr/model/ListSecurityGroupUsersResult.h>
+#include <aws/wickr/model/ListSecurityGroupsPaginationTraits.h>
 #include <aws/wickr/model/ListSecurityGroupsRequest.h>
 #include <aws/wickr/model/ListSecurityGroupsResult.h>
+#include <aws/wickr/model/ListUsersPaginationTraits.h>
 #include <aws/wickr/model/ListUsersRequest.h>
 #include <aws/wickr/model/ListUsersResult.h>
 #include <aws/wickr/model/Network.h>
diff --git a/generated/tests/wisdom-gen-tests/ConnectWisdomServiceIncludeTests.cpp b/generated/tests/wisdom-gen-tests/ConnectWisdomServiceIncludeTests.cpp
index 9ac110b920cb..e99a659c8292 100644
--- a/generated/tests/wisdom-gen-tests/ConnectWisdomServiceIncludeTests.cpp
+++ b/generated/tests/wisdom-gen-tests/ConnectWisdomServiceIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/wisdom/ConnectWisdomServiceClient.h>
+#include <aws/wisdom/ConnectWisdomServiceClientPagination.h>
 #include <aws/wisdom/ConnectWisdomServiceEndpointProvider.h>
 #include <aws/wisdom/ConnectWisdomServiceErrorMarshaller.h>
 #include <aws/wisdom/ConnectWisdomServiceErrors.h>
+#include <aws/wisdom/ConnectWisdomServicePaginationBase.h>
 #include <aws/wisdom/ConnectWisdomServiceRequest.h>
 #include <aws/wisdom/ConnectWisdomServiceServiceClientModel.h>
+#include <aws/wisdom/ConnectWisdomServiceWaiter.h>
 #include <aws/wisdom/ConnectWisdomService_EXPORTS.h>
+#include <aws/wisdom/internal/ConnectWisdomServiceEndpointRules.h>
 #include <aws/wisdom/model/AppIntegrationsConfiguration.h>
 #include <aws/wisdom/model/AssistantAssociationData.h>
 #include <aws/wisdom/model/AssistantAssociationInputData.h>
@@ -88,16 +92,22 @@
 #include <aws/wisdom/model/KnowledgeBaseStatus.h>
 #include <aws/wisdom/model/KnowledgeBaseSummary.h>
 #include <aws/wisdom/model/KnowledgeBaseType.h>
+#include <aws/wisdom/model/ListAssistantAssociationsPaginationTraits.h>
 #include <aws/wisdom/model/ListAssistantAssociationsRequest.h>
 #include <aws/wisdom/model/ListAssistantAssociationsResult.h>
+#include <aws/wisdom/model/ListAssistantsPaginationTraits.h>
 #include <aws/wisdom/model/ListAssistantsRequest.h>
 #include <aws/wisdom/model/ListAssistantsResult.h>
+#include <aws/wisdom/model/ListContentsPaginationTraits.h>
 #include <aws/wisdom/model/ListContentsRequest.h>
 #include <aws/wisdom/model/ListContentsResult.h>
+#include <aws/wisdom/model/ListImportJobsPaginationTraits.h>
 #include <aws/wisdom/model/ListImportJobsRequest.h>
 #include <aws/wisdom/model/ListImportJobsResult.h>
+#include <aws/wisdom/model/ListKnowledgeBasesPaginationTraits.h>
 #include <aws/wisdom/model/ListKnowledgeBasesRequest.h>
 #include <aws/wisdom/model/ListKnowledgeBasesResult.h>
+#include <aws/wisdom/model/ListQuickResponsesPaginationTraits.h>
 #include <aws/wisdom/model/ListQuickResponsesRequest.h>
 #include <aws/wisdom/model/ListQuickResponsesResult.h>
 #include <aws/wisdom/model/ListTagsForResourceRequest.h>
@@ -133,11 +143,14 @@
 #include <aws/wisdom/model/RenderingConfiguration.h>
 #include <aws/wisdom/model/ResourceNotFoundException.h>
 #include <aws/wisdom/model/ResultData.h>
+#include <aws/wisdom/model/SearchContentPaginationTraits.h>
 #include <aws/wisdom/model/SearchContentRequest.h>
 #include <aws/wisdom/model/SearchContentResult.h>
 #include <aws/wisdom/model/SearchExpression.h>
+#include <aws/wisdom/model/SearchQuickResponsesPaginationTraits.h>
 #include <aws/wisdom/model/SearchQuickResponsesRequest.h>
 #include <aws/wisdom/model/SearchQuickResponsesResult.h>
+#include <aws/wisdom/model/SearchSessionsPaginationTraits.h>
 #include <aws/wisdom/model/SearchSessionsRequest.h>
 #include <aws/wisdom/model/SearchSessionsResult.h>
 #include <aws/wisdom/model/ServerSideEncryptionConfiguration.h>
diff --git a/generated/tests/workdocs-gen-tests/WorkDocsIncludeTests.cpp b/generated/tests/workdocs-gen-tests/WorkDocsIncludeTests.cpp
index 7641c938046c..988e50621f7d 100644
--- a/generated/tests/workdocs-gen-tests/WorkDocsIncludeTests.cpp
+++ b/generated/tests/workdocs-gen-tests/WorkDocsIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/workdocs/WorkDocsClient.h>
+#include <aws/workdocs/WorkDocsClientPagination.h>
 #include <aws/workdocs/WorkDocsEndpointProvider.h>
 #include <aws/workdocs/WorkDocsErrorMarshaller.h>
 #include <aws/workdocs/WorkDocsErrors.h>
+#include <aws/workdocs/WorkDocsPaginationBase.h>
 #include <aws/workdocs/WorkDocsRequest.h>
 #include <aws/workdocs/WorkDocsServiceClientModel.h>
+#include <aws/workdocs/WorkDocsWaiter.h>
 #include <aws/workdocs/WorkDocs_EXPORTS.h>
+#include <aws/workdocs/internal/WorkDocsEndpointRules.h>
 #include <aws/workdocs/model/AbortDocumentVersionUploadRequest.h>
 #include <aws/workdocs/model/ActivateUserRequest.h>
 #include <aws/workdocs/model/ActivateUserResult.h>
@@ -52,22 +56,31 @@
 #include <aws/workdocs/model/DeleteLabelsResult.h>
 #include <aws/workdocs/model/DeleteNotificationSubscriptionRequest.h>
 #include <aws/workdocs/model/DeleteUserRequest.h>
+#include <aws/workdocs/model/DescribeActivitiesPaginationTraits.h>
 #include <aws/workdocs/model/DescribeActivitiesRequest.h>
 #include <aws/workdocs/model/DescribeActivitiesResult.h>
+#include <aws/workdocs/model/DescribeCommentsPaginationTraits.h>
 #include <aws/workdocs/model/DescribeCommentsRequest.h>
 #include <aws/workdocs/model/DescribeCommentsResult.h>
+#include <aws/workdocs/model/DescribeDocumentVersionsPaginationTraits.h>
 #include <aws/workdocs/model/DescribeDocumentVersionsRequest.h>
 #include <aws/workdocs/model/DescribeDocumentVersionsResult.h>
+#include <aws/workdocs/model/DescribeFolderContentsPaginationTraits.h>
 #include <aws/workdocs/model/DescribeFolderContentsRequest.h>
 #include <aws/workdocs/model/DescribeFolderContentsResult.h>
+#include <aws/workdocs/model/DescribeGroupsPaginationTraits.h>
 #include <aws/workdocs/model/DescribeGroupsRequest.h>
 #include <aws/workdocs/model/DescribeGroupsResult.h>
+#include <aws/workdocs/model/DescribeNotificationSubscriptionsPaginationTraits.h>
 #include <aws/workdocs/model/DescribeNotificationSubscriptionsRequest.h>
 #include <aws/workdocs/model/DescribeNotificationSubscriptionsResult.h>
+#include <aws/workdocs/model/DescribeResourcePermissionsPaginationTraits.h>
 #include <aws/workdocs/model/DescribeResourcePermissionsRequest.h>
 #include <aws/workdocs/model/DescribeResourcePermissionsResult.h>
+#include <aws/workdocs/model/DescribeRootFoldersPaginationTraits.h>
 #include <aws/workdocs/model/DescribeRootFoldersRequest.h>
 #include <aws/workdocs/model/DescribeRootFoldersResult.h>
+#include <aws/workdocs/model/DescribeUsersPaginationTraits.h>
 #include <aws/workdocs/model/DescribeUsersRequest.h>
 #include <aws/workdocs/model/DescribeUsersResult.h>
 #include <aws/workdocs/model/DocumentMetadata.h>
@@ -126,6 +139,7 @@
 #include <aws/workdocs/model/SearchPrincipalType.h>
 #include <aws/workdocs/model/SearchQueryScopeType.h>
 #include <aws/workdocs/model/SearchResourceType.h>
+#include <aws/workdocs/model/SearchResourcesPaginationTraits.h>
 #include <aws/workdocs/model/SearchResourcesRequest.h>
 #include <aws/workdocs/model/SearchResourcesResult.h>
 #include <aws/workdocs/model/SearchSortResult.h>
diff --git a/generated/tests/workmail-gen-tests/WorkMailIncludeTests.cpp b/generated/tests/workmail-gen-tests/WorkMailIncludeTests.cpp
index c00bcb8ebecb..4e48342cdf1a 100644
--- a/generated/tests/workmail-gen-tests/WorkMailIncludeTests.cpp
+++ b/generated/tests/workmail-gen-tests/WorkMailIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/workmail/WorkMailClient.h>
+#include <aws/workmail/WorkMailClientPagination.h>
 #include <aws/workmail/WorkMailEndpointProvider.h>
 #include <aws/workmail/WorkMailErrorMarshaller.h>
 #include <aws/workmail/WorkMailErrors.h>
+#include <aws/workmail/WorkMailPaginationBase.h>
 #include <aws/workmail/WorkMailRequest.h>
 #include <aws/workmail/WorkMailServiceClientModel.h>
+#include <aws/workmail/WorkMailWaiter.h>
 #include <aws/workmail/WorkMail_EXPORTS.h>
+#include <aws/workmail/internal/WorkMailEndpointRules.h>
 #include <aws/workmail/model/AccessControlRule.h>
 #include <aws/workmail/model/AccessControlRuleEffect.h>
 #include <aws/workmail/model/AccessEffect.h>
@@ -141,42 +145,57 @@
 #include <aws/workmail/model/LambdaAvailabilityProvider.h>
 #include <aws/workmail/model/ListAccessControlRulesRequest.h>
 #include <aws/workmail/model/ListAccessControlRulesResult.h>
+#include <aws/workmail/model/ListAliasesPaginationTraits.h>
 #include <aws/workmail/model/ListAliasesRequest.h>
 #include <aws/workmail/model/ListAliasesResult.h>
+#include <aws/workmail/model/ListAvailabilityConfigurationsPaginationTraits.h>
 #include <aws/workmail/model/ListAvailabilityConfigurationsRequest.h>
 #include <aws/workmail/model/ListAvailabilityConfigurationsResult.h>
+#include <aws/workmail/model/ListGroupMembersPaginationTraits.h>
 #include <aws/workmail/model/ListGroupMembersRequest.h>
 #include <aws/workmail/model/ListGroupMembersResult.h>
 #include <aws/workmail/model/ListGroupsFilters.h>
 #include <aws/workmail/model/ListGroupsForEntityFilters.h>
+#include <aws/workmail/model/ListGroupsForEntityPaginationTraits.h>
 #include <aws/workmail/model/ListGroupsForEntityRequest.h>
 #include <aws/workmail/model/ListGroupsForEntityResult.h>
+#include <aws/workmail/model/ListGroupsPaginationTraits.h>
 #include <aws/workmail/model/ListGroupsRequest.h>
 #include <aws/workmail/model/ListGroupsResult.h>
+#include <aws/workmail/model/ListImpersonationRolesPaginationTraits.h>
 #include <aws/workmail/model/ListImpersonationRolesRequest.h>
 #include <aws/workmail/model/ListImpersonationRolesResult.h>
+#include <aws/workmail/model/ListMailDomainsPaginationTraits.h>
 #include <aws/workmail/model/ListMailDomainsRequest.h>
 #include <aws/workmail/model/ListMailDomainsResult.h>
+#include <aws/workmail/model/ListMailboxExportJobsPaginationTraits.h>
 #include <aws/workmail/model/ListMailboxExportJobsRequest.h>
 #include <aws/workmail/model/ListMailboxExportJobsResult.h>
+#include <aws/workmail/model/ListMailboxPermissionsPaginationTraits.h>
 #include <aws/workmail/model/ListMailboxPermissionsRequest.h>
 #include <aws/workmail/model/ListMailboxPermissionsResult.h>
+#include <aws/workmail/model/ListMobileDeviceAccessOverridesPaginationTraits.h>
 #include <aws/workmail/model/ListMobileDeviceAccessOverridesRequest.h>
 #include <aws/workmail/model/ListMobileDeviceAccessOverridesResult.h>
 #include <aws/workmail/model/ListMobileDeviceAccessRulesRequest.h>
 #include <aws/workmail/model/ListMobileDeviceAccessRulesResult.h>
+#include <aws/workmail/model/ListOrganizationsPaginationTraits.h>
 #include <aws/workmail/model/ListOrganizationsRequest.h>
 #include <aws/workmail/model/ListOrganizationsResult.h>
+#include <aws/workmail/model/ListPersonalAccessTokensPaginationTraits.h>
 #include <aws/workmail/model/ListPersonalAccessTokensRequest.h>
 #include <aws/workmail/model/ListPersonalAccessTokensResult.h>
+#include <aws/workmail/model/ListResourceDelegatesPaginationTraits.h>
 #include <aws/workmail/model/ListResourceDelegatesRequest.h>
 #include <aws/workmail/model/ListResourceDelegatesResult.h>
 #include <aws/workmail/model/ListResourcesFilters.h>
+#include <aws/workmail/model/ListResourcesPaginationTraits.h>
 #include <aws/workmail/model/ListResourcesRequest.h>
 #include <aws/workmail/model/ListResourcesResult.h>
 #include <aws/workmail/model/ListTagsForResourceRequest.h>
 #include <aws/workmail/model/ListTagsForResourceResult.h>
 #include <aws/workmail/model/ListUsersFilters.h>
+#include <aws/workmail/model/ListUsersPaginationTraits.h>
 #include <aws/workmail/model/ListUsersRequest.h>
 #include <aws/workmail/model/ListUsersResult.h>
 #include <aws/workmail/model/MailDomainSummary.h>
diff --git a/generated/tests/workmailmessageflow-gen-tests/WorkMailMessageFlowIncludeTests.cpp b/generated/tests/workmailmessageflow-gen-tests/WorkMailMessageFlowIncludeTests.cpp
index 153ff2e756e3..5edcab816cc9 100644
--- a/generated/tests/workmailmessageflow-gen-tests/WorkMailMessageFlowIncludeTests.cpp
+++ b/generated/tests/workmailmessageflow-gen-tests/WorkMailMessageFlowIncludeTests.cpp
@@ -10,9 +10,12 @@
 #include <aws/workmailmessageflow/WorkMailMessageFlowEndpointProvider.h>
 #include <aws/workmailmessageflow/WorkMailMessageFlowErrorMarshaller.h>
 #include <aws/workmailmessageflow/WorkMailMessageFlowErrors.h>
+#include <aws/workmailmessageflow/WorkMailMessageFlowPaginationBase.h>
 #include <aws/workmailmessageflow/WorkMailMessageFlowRequest.h>
 #include <aws/workmailmessageflow/WorkMailMessageFlowServiceClientModel.h>
+#include <aws/workmailmessageflow/WorkMailMessageFlowWaiter.h>
 #include <aws/workmailmessageflow/WorkMailMessageFlow_EXPORTS.h>
+#include <aws/workmailmessageflow/internal/WorkMailMessageFlowEndpointRules.h>
 #include <aws/workmailmessageflow/model/GetRawMessageContentRequest.h>
 #include <aws/workmailmessageflow/model/GetRawMessageContentResult.h>
 #include <aws/workmailmessageflow/model/PutRawMessageContentRequest.h>
diff --git a/generated/tests/workspaces-gen-tests/WorkSpacesIncludeTests.cpp b/generated/tests/workspaces-gen-tests/WorkSpacesIncludeTests.cpp
index 984ccc9f8146..d45ac9d3c4bc 100644
--- a/generated/tests/workspaces-gen-tests/WorkSpacesIncludeTests.cpp
+++ b/generated/tests/workspaces-gen-tests/WorkSpacesIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/workspaces/WorkSpacesClient.h>
+#include <aws/workspaces/WorkSpacesClientPagination.h>
 #include <aws/workspaces/WorkSpacesEndpointProvider.h>
 #include <aws/workspaces/WorkSpacesErrorMarshaller.h>
 #include <aws/workspaces/WorkSpacesErrors.h>
+#include <aws/workspaces/WorkSpacesPaginationBase.h>
 #include <aws/workspaces/WorkSpacesRequest.h>
 #include <aws/workspaces/WorkSpacesServiceClientModel.h>
+#include <aws/workspaces/WorkSpacesWaiter.h>
 #include <aws/workspaces/WorkSpaces_EXPORTS.h>
+#include <aws/workspaces/internal/WorkSpacesEndpointRules.h>
 #include <aws/workspaces/model/AGAModeForDirectoryEnum.h>
 #include <aws/workspaces/model/AGAModeForWorkSpaceEnum.h>
 #include <aws/workspaces/model/AGAPreferredProtocolForDirectory.h>
@@ -126,8 +130,10 @@
 #include <aws/workspaces/model/DescribeAccountModificationsResult.h>
 #include <aws/workspaces/model/DescribeAccountRequest.h>
 #include <aws/workspaces/model/DescribeAccountResult.h>
+#include <aws/workspaces/model/DescribeApplicationAssociationsPaginationTraits.h>
 #include <aws/workspaces/model/DescribeApplicationAssociationsRequest.h>
 #include <aws/workspaces/model/DescribeApplicationAssociationsResult.h>
+#include <aws/workspaces/model/DescribeApplicationsPaginationTraits.h>
 #include <aws/workspaces/model/DescribeApplicationsRequest.h>
 #include <aws/workspaces/model/DescribeApplicationsResult.h>
 #include <aws/workspaces/model/DescribeBundleAssociationsRequest.h>
@@ -152,10 +158,12 @@
 #include <aws/workspaces/model/DescribeTagsResult.h>
 #include <aws/workspaces/model/DescribeWorkspaceAssociationsRequest.h>
 #include <aws/workspaces/model/DescribeWorkspaceAssociationsResult.h>
+#include <aws/workspaces/model/DescribeWorkspaceBundlesPaginationTraits.h>
 #include <aws/workspaces/model/DescribeWorkspaceBundlesRequest.h>
 #include <aws/workspaces/model/DescribeWorkspaceBundlesResult.h>
 #include <aws/workspaces/model/DescribeWorkspaceDirectoriesFilter.h>
 #include <aws/workspaces/model/DescribeWorkspaceDirectoriesFilterName.h>
+#include <aws/workspaces/model/DescribeWorkspaceDirectoriesPaginationTraits.h>
 #include <aws/workspaces/model/DescribeWorkspaceDirectoriesRequest.h>
 #include <aws/workspaces/model/DescribeWorkspaceDirectoriesResult.h>
 #include <aws/workspaces/model/DescribeWorkspaceImagePermissionsRequest.h>
@@ -166,6 +174,7 @@
 #include <aws/workspaces/model/DescribeWorkspaceSnapshotsResult.h>
 #include <aws/workspaces/model/DescribeWorkspacesConnectionStatusRequest.h>
 #include <aws/workspaces/model/DescribeWorkspacesConnectionStatusResult.h>
+#include <aws/workspaces/model/DescribeWorkspacesPaginationTraits.h>
 #include <aws/workspaces/model/DescribeWorkspacesPoolSessionsRequest.h>
 #include <aws/workspaces/model/DescribeWorkspacesPoolSessionsResult.h>
 #include <aws/workspaces/model/DescribeWorkspacesPoolsFilter.h>
@@ -207,6 +216,7 @@
 #include <aws/workspaces/model/IosClientBrandingAttributes.h>
 #include <aws/workspaces/model/IosImportClientBrandingAttributes.h>
 #include <aws/workspaces/model/IpRuleItem.h>
+#include <aws/workspaces/model/ListAccountLinksPaginationTraits.h>
 #include <aws/workspaces/model/ListAccountLinksRequest.h>
 #include <aws/workspaces/model/ListAccountLinksResult.h>
 #include <aws/workspaces/model/ListAvailableManagementCidrRangesRequest.h>
diff --git a/generated/tests/workspaces-instances-gen-tests/WorkspacesInstancesIncludeTests.cpp b/generated/tests/workspaces-instances-gen-tests/WorkspacesInstancesIncludeTests.cpp
index beb5fe7eec82..90071d668815 100644
--- a/generated/tests/workspaces-instances-gen-tests/WorkspacesInstancesIncludeTests.cpp
+++ b/generated/tests/workspaces-instances-gen-tests/WorkspacesInstancesIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/workspaces-instances/WorkspacesInstancesClient.h>
+#include <aws/workspaces-instances/WorkspacesInstancesClientPagination.h>
 #include <aws/workspaces-instances/WorkspacesInstancesEndpointProvider.h>
 #include <aws/workspaces-instances/WorkspacesInstancesErrorMarshaller.h>
 #include <aws/workspaces-instances/WorkspacesInstancesErrors.h>
+#include <aws/workspaces-instances/WorkspacesInstancesPaginationBase.h>
 #include <aws/workspaces-instances/WorkspacesInstancesRequest.h>
 #include <aws/workspaces-instances/WorkspacesInstancesServiceClientModel.h>
+#include <aws/workspaces-instances/WorkspacesInstancesWaiter.h>
 #include <aws/workspaces-instances/WorkspacesInstances_EXPORTS.h>
+#include <aws/workspaces-instances/internal/WorkspacesInstancesEndpointRules.h>
 #include <aws/workspaces-instances/model/AmdSevSnpEnum.h>
 #include <aws/workspaces-instances/model/AssociateVolumeRequest.h>
 #include <aws/workspaces-instances/model/AssociateVolumeResult.h>
@@ -70,12 +74,15 @@
 #include <aws/workspaces-instances/model/Ipv4PrefixSpecificationRequest.h>
 #include <aws/workspaces-instances/model/Ipv6PrefixSpecificationRequest.h>
 #include <aws/workspaces-instances/model/LicenseConfigurationRequest.h>
+#include <aws/workspaces-instances/model/ListInstanceTypesPaginationTraits.h>
 #include <aws/workspaces-instances/model/ListInstanceTypesRequest.h>
 #include <aws/workspaces-instances/model/ListInstanceTypesResult.h>
+#include <aws/workspaces-instances/model/ListRegionsPaginationTraits.h>
 #include <aws/workspaces-instances/model/ListRegionsRequest.h>
 #include <aws/workspaces-instances/model/ListRegionsResult.h>
 #include <aws/workspaces-instances/model/ListTagsForResourceRequest.h>
 #include <aws/workspaces-instances/model/ListTagsForResourceResult.h>
+#include <aws/workspaces-instances/model/ListWorkspaceInstancesPaginationTraits.h>
 #include <aws/workspaces-instances/model/ListWorkspaceInstancesRequest.h>
 #include <aws/workspaces-instances/model/ListWorkspaceInstancesResult.h>
 #include <aws/workspaces-instances/model/ManagedInstanceRequest.h>
diff --git a/generated/tests/workspaces-thin-client-gen-tests/WorkSpacesThinIncludeTestIncludeTests.cpp b/generated/tests/workspaces-thin-client-gen-tests/WorkSpacesThinIncludeTestIncludeTests.cpp
index dfd69498a2db..c8881dbcddeb 100644
--- a/generated/tests/workspaces-thin-client-gen-tests/WorkSpacesThinIncludeTestIncludeTests.cpp
+++ b/generated/tests/workspaces-thin-client-gen-tests/WorkSpacesThinIncludeTestIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/workspaces-thin-client/WorkSpacesThinClientClient.h>
+#include <aws/workspaces-thin-client/WorkSpacesThinClientClientPagination.h>
 #include <aws/workspaces-thin-client/WorkSpacesThinClientEndpointProvider.h>
 #include <aws/workspaces-thin-client/WorkSpacesThinClientErrorMarshaller.h>
 #include <aws/workspaces-thin-client/WorkSpacesThinClientErrors.h>
+#include <aws/workspaces-thin-client/WorkSpacesThinClientPaginationBase.h>
 #include <aws/workspaces-thin-client/WorkSpacesThinClientRequest.h>
 #include <aws/workspaces-thin-client/WorkSpacesThinClientServiceClientModel.h>
+#include <aws/workspaces-thin-client/WorkSpacesThinClientWaiter.h>
 #include <aws/workspaces-thin-client/WorkSpacesThinClient_EXPORTS.h>
+#include <aws/workspaces-thin-client/internal/WorkSpacesThinClientEndpointRules.h>
 #include <aws/workspaces-thin-client/model/ApplyTimeOf.h>
 #include <aws/workspaces-thin-client/model/ConflictException.h>
 #include <aws/workspaces-thin-client/model/CreateEnvironmentRequest.h>
@@ -39,10 +43,13 @@
 #include <aws/workspaces-thin-client/model/GetSoftwareSetRequest.h>
 #include <aws/workspaces-thin-client/model/GetSoftwareSetResult.h>
 #include <aws/workspaces-thin-client/model/InternalServerException.h>
+#include <aws/workspaces-thin-client/model/ListDevicesPaginationTraits.h>
 #include <aws/workspaces-thin-client/model/ListDevicesRequest.h>
 #include <aws/workspaces-thin-client/model/ListDevicesResult.h>
+#include <aws/workspaces-thin-client/model/ListEnvironmentsPaginationTraits.h>
 #include <aws/workspaces-thin-client/model/ListEnvironmentsRequest.h>
 #include <aws/workspaces-thin-client/model/ListEnvironmentsResult.h>
+#include <aws/workspaces-thin-client/model/ListSoftwareSetsPaginationTraits.h>
 #include <aws/workspaces-thin-client/model/ListSoftwareSetsRequest.h>
 #include <aws/workspaces-thin-client/model/ListSoftwareSetsResult.h>
 #include <aws/workspaces-thin-client/model/ListTagsForResourceRequest.h>
diff --git a/generated/tests/workspaces-web-gen-tests/WorkSpacesWebIncludeTests.cpp b/generated/tests/workspaces-web-gen-tests/WorkSpacesWebIncludeTests.cpp
index ff90a8fb3d51..929371b76e3a 100644
--- a/generated/tests/workspaces-web-gen-tests/WorkSpacesWebIncludeTests.cpp
+++ b/generated/tests/workspaces-web-gen-tests/WorkSpacesWebIncludeTests.cpp
@@ -7,12 +7,16 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/workspaces-web/WorkSpacesWebClient.h>
+#include <aws/workspaces-web/WorkSpacesWebClientPagination.h>
 #include <aws/workspaces-web/WorkSpacesWebEndpointProvider.h>
 #include <aws/workspaces-web/WorkSpacesWebErrorMarshaller.h>
 #include <aws/workspaces-web/WorkSpacesWebErrors.h>
+#include <aws/workspaces-web/WorkSpacesWebPaginationBase.h>
 #include <aws/workspaces-web/WorkSpacesWebRequest.h>
 #include <aws/workspaces-web/WorkSpacesWebServiceClientModel.h>
+#include <aws/workspaces-web/WorkSpacesWebWaiter.h>
 #include <aws/workspaces-web/WorkSpacesWeb_EXPORTS.h>
+#include <aws/workspaces-web/internal/WorkSpacesWebEndpointRules.h>
 #include <aws/workspaces-web/model/AssociateBrowserSettingsRequest.h>
 #include <aws/workspaces-web/model/AssociateBrowserSettingsResult.h>
 #include <aws/workspaces-web/model/AssociateDataProtectionSettingsRequest.h>
@@ -146,30 +150,42 @@
 #include <aws/workspaces-web/model/IpAccessSettings.h>
 #include <aws/workspaces-web/model/IpAccessSettingsSummary.h>
 #include <aws/workspaces-web/model/IpRule.h>
+#include <aws/workspaces-web/model/ListBrowserSettingsPaginationTraits.h>
 #include <aws/workspaces-web/model/ListBrowserSettingsRequest.h>
 #include <aws/workspaces-web/model/ListBrowserSettingsResult.h>
+#include <aws/workspaces-web/model/ListDataProtectionSettingsPaginationTraits.h>
 #include <aws/workspaces-web/model/ListDataProtectionSettingsRequest.h>
 #include <aws/workspaces-web/model/ListDataProtectionSettingsResult.h>
+#include <aws/workspaces-web/model/ListIdentityProvidersPaginationTraits.h>
 #include <aws/workspaces-web/model/ListIdentityProvidersRequest.h>
 #include <aws/workspaces-web/model/ListIdentityProvidersResult.h>
+#include <aws/workspaces-web/model/ListIpAccessSettingsPaginationTraits.h>
 #include <aws/workspaces-web/model/ListIpAccessSettingsRequest.h>
 #include <aws/workspaces-web/model/ListIpAccessSettingsResult.h>
+#include <aws/workspaces-web/model/ListNetworkSettingsPaginationTraits.h>
 #include <aws/workspaces-web/model/ListNetworkSettingsRequest.h>
 #include <aws/workspaces-web/model/ListNetworkSettingsResult.h>
+#include <aws/workspaces-web/model/ListPortalsPaginationTraits.h>
 #include <aws/workspaces-web/model/ListPortalsRequest.h>
 #include <aws/workspaces-web/model/ListPortalsResult.h>
+#include <aws/workspaces-web/model/ListSessionLoggersPaginationTraits.h>
 #include <aws/workspaces-web/model/ListSessionLoggersRequest.h>
 #include <aws/workspaces-web/model/ListSessionLoggersResult.h>
+#include <aws/workspaces-web/model/ListSessionsPaginationTraits.h>
 #include <aws/workspaces-web/model/ListSessionsRequest.h>
 #include <aws/workspaces-web/model/ListSessionsResult.h>
 #include <aws/workspaces-web/model/ListTagsForResourceRequest.h>
 #include <aws/workspaces-web/model/ListTagsForResourceResult.h>
+#include <aws/workspaces-web/model/ListTrustStoreCertificatesPaginationTraits.h>
 #include <aws/workspaces-web/model/ListTrustStoreCertificatesRequest.h>
 #include <aws/workspaces-web/model/ListTrustStoreCertificatesResult.h>
+#include <aws/workspaces-web/model/ListTrustStoresPaginationTraits.h>
 #include <aws/workspaces-web/model/ListTrustStoresRequest.h>
 #include <aws/workspaces-web/model/ListTrustStoresResult.h>
+#include <aws/workspaces-web/model/ListUserAccessLoggingSettingsPaginationTraits.h>
 #include <aws/workspaces-web/model/ListUserAccessLoggingSettingsRequest.h>
 #include <aws/workspaces-web/model/ListUserAccessLoggingSettingsResult.h>
+#include <aws/workspaces-web/model/ListUserSettingsPaginationTraits.h>
 #include <aws/workspaces-web/model/ListUserSettingsRequest.h>
 #include <aws/workspaces-web/model/ListUserSettingsResult.h>
 #include <aws/workspaces-web/model/Locale.h>
diff --git a/generated/tests/xray-gen-tests/XRayIncludeTests.cpp b/generated/tests/xray-gen-tests/XRayIncludeTests.cpp
index e9d5570c1e92..b38ee62f4374 100644
--- a/generated/tests/xray-gen-tests/XRayIncludeTests.cpp
+++ b/generated/tests/xray-gen-tests/XRayIncludeTests.cpp
@@ -7,17 +7,22 @@
 #include <aws/testing/AwsTestHelpers.h>
 
 #include <aws/xray/XRayClient.h>
+#include <aws/xray/XRayClientPagination.h>
 #include <aws/xray/XRayEndpointProvider.h>
 #include <aws/xray/XRayErrorMarshaller.h>
 #include <aws/xray/XRayErrors.h>
+#include <aws/xray/XRayPaginationBase.h>
 #include <aws/xray/XRayRequest.h>
 #include <aws/xray/XRayServiceClientModel.h>
+#include <aws/xray/XRayWaiter.h>
 #include <aws/xray/XRay_EXPORTS.h>
+#include <aws/xray/internal/XRayEndpointRules.h>
 #include <aws/xray/model/Alias.h>
 #include <aws/xray/model/AnnotationValue.h>
 #include <aws/xray/model/AnomalousService.h>
 #include <aws/xray/model/AvailabilityZoneDetail.h>
 #include <aws/xray/model/BackendConnectionErrors.h>
+#include <aws/xray/model/BatchGetTracesPaginationTraits.h>
 #include <aws/xray/model/BatchGetTracesRequest.h>
 #include <aws/xray/model/BatchGetTracesResult.h>
 #include <aws/xray/model/CancelTraceRetrievalRequest.h>
@@ -50,34 +55,43 @@
 #include <aws/xray/model/GetEncryptionConfigResult.h>
 #include <aws/xray/model/GetGroupRequest.h>
 #include <aws/xray/model/GetGroupResult.h>
+#include <aws/xray/model/GetGroupsPaginationTraits.h>
 #include <aws/xray/model/GetGroupsRequest.h>
 #include <aws/xray/model/GetGroupsResult.h>
 #include <aws/xray/model/GetIndexingRulesRequest.h>
 #include <aws/xray/model/GetIndexingRulesResult.h>
+#include <aws/xray/model/GetInsightEventsPaginationTraits.h>
 #include <aws/xray/model/GetInsightEventsRequest.h>
 #include <aws/xray/model/GetInsightEventsResult.h>
 #include <aws/xray/model/GetInsightImpactGraphRequest.h>
 #include <aws/xray/model/GetInsightImpactGraphResult.h>
 #include <aws/xray/model/GetInsightRequest.h>
 #include <aws/xray/model/GetInsightResult.h>
+#include <aws/xray/model/GetInsightSummariesPaginationTraits.h>
 #include <aws/xray/model/GetInsightSummariesRequest.h>
 #include <aws/xray/model/GetInsightSummariesResult.h>
 #include <aws/xray/model/GetRetrievedTracesGraphRequest.h>
 #include <aws/xray/model/GetRetrievedTracesGraphResult.h>
+#include <aws/xray/model/GetSamplingRulesPaginationTraits.h>
 #include <aws/xray/model/GetSamplingRulesRequest.h>
 #include <aws/xray/model/GetSamplingRulesResult.h>
+#include <aws/xray/model/GetSamplingStatisticSummariesPaginationTraits.h>
 #include <aws/xray/model/GetSamplingStatisticSummariesRequest.h>
 #include <aws/xray/model/GetSamplingStatisticSummariesResult.h>
 #include <aws/xray/model/GetSamplingTargetsRequest.h>
 #include <aws/xray/model/GetSamplingTargetsResult.h>
+#include <aws/xray/model/GetServiceGraphPaginationTraits.h>
 #include <aws/xray/model/GetServiceGraphRequest.h>
 #include <aws/xray/model/GetServiceGraphResult.h>
+#include <aws/xray/model/GetTimeSeriesServiceStatisticsPaginationTraits.h>
 #include <aws/xray/model/GetTimeSeriesServiceStatisticsRequest.h>
 #include <aws/xray/model/GetTimeSeriesServiceStatisticsResult.h>
+#include <aws/xray/model/GetTraceGraphPaginationTraits.h>
 #include <aws/xray/model/GetTraceGraphRequest.h>
 #include <aws/xray/model/GetTraceGraphResult.h>
 #include <aws/xray/model/GetTraceSegmentDestinationRequest.h>
 #include <aws/xray/model/GetTraceSegmentDestinationResult.h>
+#include <aws/xray/model/GetTraceSummariesPaginationTraits.h>
 #include <aws/xray/model/GetTraceSummariesRequest.h>
 #include <aws/xray/model/GetTraceSummariesResult.h>
 #include <aws/xray/model/GraphLink.h>
@@ -97,10 +111,12 @@
 #include <aws/xray/model/InsightSummary.h>
 #include <aws/xray/model/InsightsConfiguration.h>
 #include <aws/xray/model/InstanceIdDetail.h>
+#include <aws/xray/model/ListResourcePoliciesPaginationTraits.h>
 #include <aws/xray/model/ListResourcePoliciesRequest.h>
 #include <aws/xray/model/ListResourcePoliciesResult.h>
 #include <aws/xray/model/ListRetrievedTracesRequest.h>
 #include <aws/xray/model/ListRetrievedTracesResult.h>
+#include <aws/xray/model/ListTagsForResourcePaginationTraits.h>
 #include <aws/xray/model/ListTagsForResourceRequest.h>
 #include <aws/xray/model/ListTagsForResourceResult.h>
 #include <aws/xray/model/ProbabilisticRuleValue.h>
diff --git a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/CppImportContainer.java b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/CppImportContainer.java
index 8c26688ae5f0..f9d763a19111 100644
--- a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/CppImportContainer.java
+++ b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/CppImportContainer.java
@@ -11,7 +11,9 @@
 
 /**
  * CppImportContainer tracks symbols used in code generation.
- * For C++, we handle includes manually via writeInclude method.
+ * <p>For C++, includes are managed manually (see IncludeSets / ProtocolTraits.serdeIncludes);
+ * this container is intentionally a no-op sink so Smithy's SymbolWriter contract is satisfied
+ * without duplicating the manual include logic.
  */
 public class CppImportContainer implements ImportContainer {
     private final Set<String> imports = new HashSet<>();
diff --git a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/CppWriter.java b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/CppWriter.java
index 6ddbed5c14b4..67d2fa892945 100644
--- a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/CppWriter.java
+++ b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/CppWriter.java
@@ -57,4 +57,16 @@ public CppWriter writeNamespaceClose(String namespace) {
         closeBlock("} // namespace $L", namespace);
         return this;
     }
+
+    /**
+     * Opens {@code namespace}, runs {@code body}, then closes it — so the open and
+     * close can never drift out of sync. Equivalent to
+     * {@code writeNamespaceOpen(namespace); body.run(); writeNamespaceClose(namespace);}
+     */
+    public CppWriter withNamespace(String namespace, Runnable body) {
+        writeNamespaceOpen(namespace);
+        body.run();
+        writeNamespaceClose(namespace);
+        return this;
+    }
 }
\ No newline at end of file
diff --git a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/CppNames.java b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/CppNames.java
new file mode 100644
index 000000000000..e41c59341a73
--- /dev/null
+++ b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/CppNames.java
@@ -0,0 +1,30 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+package com.amazonaws.util.awsclientsmithygenerator.generators.model;
+
+/**
+ * Pure C++ identifier helpers shared by the model renderers. Centralizes the
+ * capitalize / decapitalize / field-name convention so it lives in one place
+ * rather than being copied privately into each renderer.
+ */
+public final class CppNames {
+
+    private CppNames() {}
+
+    /** First character upper-cased (e.g. {@code audioStream} -> {@code AudioStream}). */
+    public static String capitalize(String s) {
+        return s.isEmpty() ? s : Character.toUpperCase(s.charAt(0)) + s.substring(1);
+    }
+
+    /** First character lower-cased (e.g. {@code AudioStream} -> {@code audioStream}). */
+    public static String decapitalize(String s) {
+        return s.isEmpty() ? s : Character.toLowerCase(s.charAt(0)) + s.substring(1);
+    }
+
+    /** The private field name for a member: {@code m_} + decapitalized name. */
+    public static String fieldName(String memberName) {
+        return "m_" + decapitalize(memberName);
+    }
+}
diff --git a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/CppTypeMapper.java b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/CppTypeMapper.java
index a8f29d1ca747..12d7e3ce8cd2 100644
--- a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/CppTypeMapper.java
+++ b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/CppTypeMapper.java
@@ -5,11 +5,16 @@
 package com.amazonaws.util.awsclientsmithygenerator.generators.model;
 
 import software.amazon.smithy.model.Model;
+import software.amazon.smithy.model.neighbor.Walker;
 import software.amazon.smithy.model.shapes.ListShape;
 import software.amazon.smithy.model.shapes.MapShape;
 import software.amazon.smithy.model.shapes.MemberShape;
 import software.amazon.smithy.model.shapes.Shape;
-import software.amazon.smithy.model.shapes.StructureShape;
+import software.amazon.smithy.model.shapes.ShapeId;
+import software.amazon.smithy.model.traits.EnumTrait;
+import software.amazon.smithy.model.traits.IdempotencyTokenTrait;
+import software.amazon.smithy.model.traits.SensitiveTrait;
+import software.amazon.smithy.model.traits.SparseTrait;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -28,6 +33,24 @@ public final class CppTypeMapper {
     private CppTypeMapper() {
     }
 
+    /**
+     * Returns the C++ type/file name for a shape, capitalizing the first character so that
+     * lowerCamel Smithy shape names (e.g. IAM's {@code statusType}) become UpperCamel C++
+     * identifiers ({@code StatusType}). This matches the legacy C2J normalization, which
+     * upper-camel-cases every shape name at model load
+     * ({@code C2jModelToGeneratorModelTransformer}).
+     *
+     * @param shape the shape whose C++ type/file name is needed
+     * @return the shape's name with its first character upper-cased
+     */
+    public static String cppShapeName(Shape shape) {
+        String name = shape.getId().getName();
+        if (name.isEmpty()) {
+            return name;
+        }
+        return Character.toUpperCase(name.charAt(0)) + name.substring(1);
+    }
+
     /**
      * Returns the C++ type string for the given Smithy shape.
      *
@@ -36,15 +59,33 @@ private CppTypeMapper() {
      * @return the C++ type name (e.g., {@code "Aws::String"}, {@code "Aws::Vector<int>"})
      */
     public static String getCppType(Shape shape, Model model) {
-        // Check enum BEFORE string — EnumShape extends StringShape in Smithy
-        if (shape.isEnumShape()) {
-            return shape.getId().getName();
+        return getCppType(shape, model, false);
+    }
+
+    /**
+     * Returns the C++ type string for the given Smithy shape.
+     *
+     * @param shape        the shape to map
+     * @param model        the model (needed to resolve list/map member targets)
+     * @param wideIntegers when {@code true}, {@code integer} maps to {@code int64_t} instead of
+     *        {@code int}. C2J applies this only under the CBOR protocol
+     *        ({@code CORAL_TYPE_TO_CBOR_CPP_TYPE_MAPPING}: {@code integer -> int64_t}), and only
+     *        in the file kinds whose templates set {@code $protocol == "smithy-rpc-v2-cbor"} —
+     *        the CBOR sub-object and result headers. Request headers use the shared
+     *        {@code RequestHeader.vm}, which does not, so they keep {@code int}. {@code long} is
+     *        {@code long long} in every mapping and is unaffected.
+     */
+    public static String getCppType(Shape shape, Model model, boolean wideIntegers) {
+        // Check enum BEFORE string — a Smithy 2.0 EnumShape extends StringShape, and a Smithy 1.0
+        // enum is a plain string carrying the @enum trait; both map to the enum C++ type.
+        if (isEnum(shape)) {
+            return cppShapeName(shape);
         }
         if (shape.isStringShape()) {
             return "Aws::String";
         }
         if (shape.isIntegerShape()) {
-            return "int";
+            return wideIntegers ? "int64_t" : "int";
         }
         if (shape.isLongShape()) {
             return "long long";
@@ -56,24 +97,31 @@ public static String getCppType(Shape shape, Model model) {
             return "double";
         }
         if (shape.isBlobShape()) {
-            return "Aws::Utils::ByteBuffer";
+            // C2J maps a @sensitive blob to CryptoBuffer (the "sensitive_blob" type-mapping key
+            // in CppViewHelper); a plain blob stays ByteBuffer. Both live in <aws/core/utils/Array.h>.
+            return shape.hasTrait(SensitiveTrait.class)
+                ? "Aws::Utils::CryptoBuffer" : "Aws::Utils::ByteBuffer";
         }
         if (shape.isTimestampShape()) {
             return "Aws::Utils::DateTime";
         }
         if (shape.isStructureShape() || shape.isUnionShape()) {
-            return shape.getId().getName();
+            return cppShapeName(shape);
         }
         if (shape.isListShape()) {
             ListShape list = shape.asListShape().get();
             Shape member = model.expectShape(list.getMember().getTarget());
-            return "Aws::Vector<" + getCppType(member, model) + ">";
+            // A @sparse list wraps its element type in Aws::Crt::Optional (matches C2J's
+            // CppViewHelper), giving Aws::Vector<Aws::Crt::Optional<T>>.
+            return "Aws::Vector<" + wrapSparse(shape, getCppType(member, model, wideIntegers)) + ">";
         }
         if (shape.isMapShape()) {
             MapShape map = shape.asMapShape().get();
             Shape key = model.expectShape(map.getKey().getTarget());
             Shape value = model.expectShape(map.getValue().getTarget());
-            return "Aws::Map<" + getCppType(key, model) + ", " + getCppType(value, model) + ">";
+            // A @sparse map wraps its value type (not its key) in Aws::Crt::Optional.
+            return "Aws::Map<" + getCppType(key, model, wideIntegers) + ", "
+                + wrapSparse(shape, getCppType(value, model, wideIntegers)) + ">";
         }
         if (shape.isDocumentShape()) {
             return "Aws::Utils::Document";
@@ -82,6 +130,20 @@ public static String getCppType(Shape shape, Model model) {
             "Unsupported shape type " + shape.getType() + " for shape " + shape.getId());
     }
 
+    /**
+     * Wraps {@code innerType} in {@code Aws::Crt::Optional<...>} when {@code collectionShape}
+     * (a list or map) carries the {@code @sparse} trait; otherwise returns {@code innerType}
+     * unchanged. For lists the inner type is the element; for maps it is the value.
+     *
+     * @param collectionShape the list or map shape that may be sparse
+     * @param innerType       the element / value C++ type
+     * @return the (possibly Optional-wrapped) type
+     */
+    public static String wrapSparse(Shape collectionShape, String innerType) {
+        return collectionShape.hasTrait(SparseTrait.class)
+            ? "Aws::Crt::Optional<" + innerType + ">" : innerType;
+    }
+
     /**
      * Returns the C++ default initializer for a shape that needs one, or empty
      * if the type is default-constructed (strings, vectors, maps, etc.).
@@ -90,8 +152,8 @@ public static String getCppType(Shape shape, Model model) {
      * @return the initializer string (e.g., {@code "0"}, {@code "false"}) or empty
      */
     public static Optional<String> getDefaultValue(Shape shape) {
-        if (shape.isEnumShape()) {
-            return Optional.of(shape.getId().getName() + "::NOT_SET");
+        if (isEnum(shape)) {
+            return Optional.of(cppShapeName(shape) + "::NOT_SET");
         }
         if (shape.isIntegerShape() || shape.isLongShape()) {
             return Optional.of("0");
@@ -119,6 +181,18 @@ public static boolean isPrimitive(Shape shape) {
             || shape.isBooleanShape() || shape.isDoubleShape() || shape.isFloatShape();
     }
 
+    /**
+     * Returns true if the shape is an enum — either a Smithy 2.0 {@code EnumShape} or a Smithy 1.0
+     * {@code string} shape carrying the {@code @enum} trait. Both generate a dedicated C++ enum
+     * type. Mirrors the detection in {@code ShapeClassifier} and {@code EnumResolver}.
+     *
+     * @param shape the shape to check
+     * @return true if the shape maps to a generated C++ enum type
+     */
+    public static boolean isEnum(Shape shape) {
+        return shape.isEnumShape() || (shape.isStringShape() && shape.hasTrait(EnumTrait.class));
+    }
+
     /**
      * Returns true if the shape type requires a "has been set" tracking flag.
      *
@@ -147,9 +221,9 @@ public static boolean needsHasBeenSetFlag(Shape shape) {
      * @return the include path string, or empty for primitives that need no include
      */
     public static Optional<String> getIncludeForMemberType(Shape shape, Model model, String projectName) {
-        // Check enum BEFORE string — EnumShape extends StringShape in Smithy
-        if (shape.isEnumShape()) {
-            return Optional.of("<aws/" + projectName + "/model/" + shape.getId().getName() + ".h>");
+        // Check enum BEFORE string — see getCppType: covers both 2.0 EnumShape and 1.0 @enum string.
+        if (isEnum(shape)) {
+            return Optional.of("<aws/" + projectName + "/model/" + cppShapeName(shape) + ".h>");
         }
         if (shape.isStringShape()) {
             return Optional.of("<aws/core/utils/memory/stl/AWSString.h>");
@@ -167,7 +241,7 @@ public static Optional<String> getIncludeForMemberType(Shape shape, Model model,
             return Optional.of("<aws/core/utils/memory/stl/AWSMap.h>");
         }
         if (shape.isStructureShape() || shape.isUnionShape()) {
-            return Optional.of("<aws/" + projectName + "/model/" + shape.getId().getName() + ".h>");
+            return Optional.of("<aws/" + projectName + "/model/" + cppShapeName(shape) + ".h>");
         }
         if (shape.isDocumentShape()) {
             return Optional.of("<aws/core/utils/Document.h>");
@@ -185,25 +259,150 @@ public static Optional<String> getIncludeForMemberType(Shape shape, Model model,
      * @param projectName    the service project name for model-relative includes
      * @return sorted list of include lines (e.g., {@code ["<aws/core/utils/DateTime.h>", ...]})
      */
-    public static List<String> getIncludesForShape(StructureShape structureShape, Model model, String projectName) {
+    public static List<String> getIncludesForShape(Shape structureShape, Model model, String projectName) {
         Set<String> includes = new TreeSet<>();
+        ShapeId selfId = structureShape.getId();
         for (MemberShape member : structureShape.getAllMembers().values()) {
             Shape target = model.expectShape(member.getTarget());
-            getIncludeForMemberType(target, model, projectName).ifPresent(includes::add);
-            // For list/map, also include the element/key/value types
-            if (target.isListShape()) {
-                ListShape list = target.asListShape().get();
-                Shape elem = model.expectShape(list.getMember().getTarget());
-                getIncludeForMemberType(elem, model, projectName).ifPresent(includes::add);
+            if (isRecursiveStructMember(structureShape, target, model)) {
+                // A recursive member is stored as std::shared_ptr<T>. A mutually-referenced T is
+                // forward-declared (see getForwardDeclarations), so the header needs the allocator
+                // header for the inline MakeShared setter rather than T's own header. A directly
+                // self-referential member (T == enclosing) needs neither: the class declares itself
+                // and MakeShared resolves transitively. Both match C2J.
+                if (!target.getId().equals(selfId)) {
+                    includes.add("<aws/core/utils/memory/stl/AWSAllocator.h>");
+                }
+            } else {
+                addMemberInclude(includes, target, selfId, model, projectName);
+                // For list/map, also include the element/key/value types
+                if (target.isListShape()) {
+                    ListShape list = target.asListShape().get();
+                    addMemberInclude(includes, model.expectShape(list.getMember().getTarget()),
+                        selfId, model, projectName);
+                }
+                if (target.isMapShape()) {
+                    MapShape map = target.asMapShape().get();
+                    addMemberInclude(includes, model.expectShape(map.getKey().getTarget()),
+                        selfId, model, projectName);
+                    addMemberInclude(includes, model.expectShape(map.getValue().getTarget()),
+                        selfId, model, projectName);
+                }
+                // A @sparse list/map wraps its element/value in Aws::Crt::Optional, declared in
+                // <aws/crt/Optional.h>. Matches C2J's generated SparseNullsOperationRequest.h.
+                if ((target.isListShape() || target.isMapShape()) && target.hasTrait(SparseTrait.class)) {
+                    includes.add("<aws/crt/Optional.h>");
+                }
             }
-            if (target.isMapShape()) {
-                MapShape map = target.asMapShape().get();
-                Shape key = model.expectShape(map.getKey().getTarget());
-                Shape value = model.expectShape(map.getValue().getTarget());
-                getIncludeForMemberType(key, model, projectName).ifPresent(includes::add);
-                getIncludeForMemberType(value, model, projectName).ifPresent(includes::add);
+            // @idempotencyToken members are brace-initialized with
+            // Aws::Utils::UUID::PseudoRandomUUID(), which requires UUID.h. Matches C2J
+            // (CppViewHelper.computeMemberIncludeName).
+            if (member.hasTrait(IdempotencyTokenTrait.class)) {
+                includes.add("<aws/core/utils/UUID.h>");
             }
         }
         return new ArrayList<>(includes);
     }
+
+    /**
+     * Adds the member-type include for {@code shape}, unless it is the enclosing shape itself.
+     * C2J never emits a self-include (the class is being defined in that header); a recursive
+     * self-referential member reaches its own type through the shared_ptr member instead.
+     */
+    private static void addMemberInclude(Set<String> includes, Shape shape, ShapeId selfId,
+                                         Model model, String projectName) {
+        if (!shape.getId().equals(selfId)) {
+            getIncludeForMemberType(shape, model, projectName).ifPresent(includes::add);
+        }
+    }
+
+    /**
+     * Returns the sorted C++ class names of every direct member whose target forms a reference
+     * cycle with {@code structureShape} (see {@link #isRecursiveStructMember}). These are stored
+     * as {@code std::shared_ptr<T>} and must be forward-declared (not included) in the header to
+     * break the otherwise-infinite by-value member. Matches C2J's {@code computeForwardDeclarations}.
+     *
+     * @param structureShape the enclosing structure/union
+     * @param model          the model
+     * @return sorted, deduplicated list of forward-declared C++ class names
+     */
+    public static List<String> getForwardDeclarations(Shape structureShape, Model model) {
+        Set<String> names = new TreeSet<>();
+        for (MemberShape member : structureShape.getAllMembers().values()) {
+            Shape target = model.expectShape(member.getTarget());
+            // A directly self-referential member needs no forward declaration (the class declares
+            // itself); only distinct mutually-referenced types do.
+            if (isRecursiveStructMember(structureShape, target, model)
+                    && !target.getId().equals(structureShape.getId())) {
+                names.add(cppShapeName(target));
+            }
+        }
+        return new ArrayList<>(names);
+    }
+
+    /**
+     * Returns the (bracket-less) model {@code #include} paths for every recursive member's target.
+     * The header forward-declares these types, so the {@code .cpp} must include them for the
+     * out-of-line MakeShared / serde bodies. Matches C2J's source-side include of the referenced type.
+     *
+     * @param structureShape the enclosing structure/union
+     * @param model          the model
+     * @param projectName    the service project name for model-relative includes
+     * @return sorted, deduplicated list of include paths without angle brackets
+     */
+    public static List<String> getRecursiveMemberSourceIncludes(Shape structureShape, Model model,
+                                                                String projectName) {
+        Set<String> inc = new TreeSet<>();
+        for (MemberShape member : structureShape.getAllMembers().values()) {
+            Shape target = model.expectShape(member.getTarget());
+            // The self header is already included by the source's base includes; only distinct
+            // mutually-referenced types need to be added here.
+            if (isRecursiveStructMember(structureShape, target, model)
+                    && !target.getId().equals(structureShape.getId())) {
+                inc.add("aws/" + projectName + "/model/" + cppShapeName(target) + ".h");
+            }
+        }
+        return new ArrayList<>(inc);
+    }
+
+    /**
+     * Returns true if a direct member of {@code enclosing} whose target is {@code memberTarget}
+     * forms a reference cycle that must be broken with {@code std::shared_ptr}. This holds when
+     * {@code memberTarget} is an aggregate (structure/union) mutually referenced with
+     * {@code enclosing}. Members that reach back only through a list/map container do not qualify
+     * (the container already breaks the by-value cycle).
+     *
+     * @param enclosing    the shape declaring the member
+     * @param memberTarget the member's direct target shape
+     * @param model        the model
+     * @return true if the member must be rendered as a shared_ptr to avoid an infinite-size type
+     */
+    public static boolean isRecursiveStructMember(Shape enclosing, Shape memberTarget, Model model) {
+        if (!isAggregate(memberTarget)) {
+            return false;
+        }
+        // C2J renders a member as shared_ptr when its target is either the enclosing shape itself
+        // (direct self-reference) or a distinct shape mutually referenced with it. Both otherwise
+        // form an infinite-size by-value member, illegal under C++11.
+        return memberTarget.getId().equals(enclosing.getId())
+            || isMutuallyReferenced(enclosing, memberTarget, model);
+    }
+
+    private static boolean isAggregate(Shape shape) {
+        return shape.isStructureShape() || shape.isUnionShape();
+    }
+
+    /**
+     * True when {@code a} and {@code b} are distinct aggregate shapes that each reach the other
+     * through the shape graph (a reference cycle).
+     */
+    private static boolean isMutuallyReferenced(Shape a, Shape b, Model model) {
+        if (a.getId().equals(b.getId()) || !isAggregate(a) || !isAggregate(b)) {
+            return false;
+        }
+        Walker walker = new Walker(model);
+        return walker.walkShapeIds(a).contains(b.getId())
+            && walker.walkShapeIds(b).contains(a.getId());
+    }
+
 }
diff --git a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/EnumRenderer.java b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/EnumRenderer.java
index c04466d3a7c5..4901d639a661 100644
--- a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/EnumRenderer.java
+++ b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/EnumRenderer.java
@@ -42,7 +42,7 @@ private EnumRenderer() {
      */
     public static void renderHeader(CppWriter writer, Shape enumShape, String serviceName,
                                     String exportMacro, String projectName) {
-        String enumName = enumShape.getId().getName();
+        String enumName = CppTypeMapper.cppShapeName(enumShape);
         List<String> values = getEnumValues(enumShape);
 
         writer.write("#pragma once");
@@ -98,7 +98,7 @@ public static void renderHeader(CppWriter writer, Shape enumShape, String servic
      */
     public static void renderSource(CppWriter writer, Shape enumShape, String serviceName,
                                     String exportMacro, String projectName) {
-        String enumName = enumShape.getId().getName();
+        String enumName = CppTypeMapper.cppShapeName(enumShape);
         List<String> values = getEnumValues(enumShape);
         List<String> wireValues = getEnumWireValues(enumShape);
 
diff --git a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/MemberRenderer.java b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/MemberRenderer.java
index e9554b96b1c9..03221bf1fc60 100644
--- a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/MemberRenderer.java
+++ b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/MemberRenderer.java
@@ -11,8 +11,9 @@
 import software.amazon.smithy.model.shapes.ListShape;
 import software.amazon.smithy.model.shapes.MemberShape;
 import software.amazon.smithy.model.shapes.Shape;
-import software.amazon.smithy.model.shapes.StructureShape;
 import software.amazon.smithy.model.traits.DocumentationTrait;
+import software.amazon.smithy.model.traits.IdempotencyTokenTrait;
+import software.amazon.smithy.model.traits.SparseTrait;
 
 import java.util.Map;
 
@@ -25,71 +26,62 @@
  */
 public final class MemberRenderer {
 
-    private MemberRenderer() {
+    private final Model model;
+    private final Shape shape;
+    private final String className;
+    private final boolean emitHasBeenSet;
+    private boolean wideIntegers;
+    private String exclude;
+
+    private MemberRenderer(Model model, Shape shape, String className, boolean emitHasBeenSet) {
+        this.model = model;
+        this.shape = shape;
+        this.className = className;
+        this.emitHasBeenSet = emitHasBeenSet;
+        this.wideIntegers = false;
+        this.exclude = null;
     }
 
-    /**
-     * Writes the public accessor methods for all members of a structure shape.
-     *
-     * <p>For each member, generates:
-     * <ul>
-     *   <li>Doxygen group markers ({@code ///@\{} and {@code ///@\}})</li>
-     *   <li>Documentation comment (if present)</li>
-     *   <li>Getter (const ref for non-primitives, value for primitives)</li>
-     *   <li>HasBeenSet check</li>
-     *   <li>Templated Set method</li>
-     *   <li>Templated With method (fluent)</li>
-     *   <li>Templated Add method (list/map members only)</li>
-     * </ul>
-     *
-     * @param writer      the CppWriter to write to
-     * @param shape       the structure shape whose members to render
-     * @param model       the model (for resolving member targets)
-     * @param exportMacro the export macro (e.g., "AWS_KINESIS_API")
-     * @param className   the C++ class name (e.g., "ChildShard")
-     */
-    public static void renderPublicSection(CppWriter writer, StructureShape shape,
-                                           Model model, String exportMacro, String className) {
-        renderMembers(writer, shape, model, exportMacro, className, true);
+    /** Renderer for a request / sub-object / event structure: emits {@code HasBeenSet} accessors. */
+    public static MemberRenderer forStructure(Model model, Shape shape, String className) {
+        return new MemberRenderer(model, shape, className, true);
     }
 
-    /**
-     * Writes public accessor methods for result shapes (no HasBeenSet methods).
-     *
-     * @param writer      the CppWriter to write to
-     * @param shape       the structure shape whose members to render
-     * @param model       the model (for resolving member targets)
-     * @param exportMacro the export macro (e.g., "AWS_KINESIS_API")
-     * @param className   the C++ class name (e.g., "GetItemResult")
-     */
-    public static void renderPublicSectionForResult(CppWriter writer, StructureShape shape,
-                                                    Model model, String exportMacro, String className) {
-        renderMembers(writer, shape, model, exportMacro, className, false);
+    /** Renderer for a result structure: never emits {@code HasBeenSet} accessors. */
+    public static MemberRenderer forResult(Model model, Shape shape, String className) {
+        return new MemberRenderer(model, shape, className, false);
+    }
+
+    /** Widen {@code integer} members to {@code int64_t} (CBOR sub-objects / events). */
+    public MemberRenderer wideIntegers(boolean value) {
+        this.wideIntegers = value;
+        return this;
     }
 
     /**
-     * Shared implementation for rendering public accessor methods.
-     *
-     * @param writer         the CppWriter to write to
-     * @param shape          the structure shape whose members to render
-     * @param model          the model (for resolving member targets)
-     * @param exportMacro    the export macro (e.g., "AWS_KINESIS_API")
-     * @param className      the C++ class name (e.g., "ChildShard")
-     * @param emitHasBeenSet whether to emit HasBeenSet() accessor methods
+     * Skip {@code memberName} across all fragments. Streaming results render their
+     * {@code @httpPayload} member separately as a {@code GetBody()} / {@code ReplaceBody} pair.
      */
-    private static void renderMembers(CppWriter writer, StructureShape shape,
-                                      Model model, String exportMacro, String className,
-                                      boolean emitHasBeenSet) {
+    public MemberRenderer excluding(String memberName) {
+        this.exclude = memberName;
+        return this;
+    }
+
+    /** Public Get/Set/With/Add accessor group for every (non-excluded) member. */
+    public void renderPublicAccessors(CppWriter writer) {
         java.util.List<Map.Entry<String, MemberShape>> members =
             new java.util.ArrayList<>(shape.getAllMembers().entrySet());
+        members.removeIf(e -> e.getKey().equals(exclude));
         for (int i = 0; i < members.size(); i++) {
             Map.Entry<String, MemberShape> entry = members.get(i);
             String memberName = entry.getKey();
             MemberShape member = entry.getValue();
             Shape targetShape = model.expectShape(member.getTarget());
-            String cppType = CppTypeMapper.getCppType(targetShape, model);
-            String fieldName = "m_" + decapitalize(memberName);
-            String templateParam = memberName + "T";
+            String cppType = CppTypeMapper.getCppType(targetShape, model, wideIntegers);
+            String fieldName = CppNames.fieldName(memberName);
+            String methodName = capitalize(memberName);
+            String templateParam = methodName + "T";
+            boolean recursive = isRecursiveMember(member);
 
             writer.write("///@{");
 
@@ -99,74 +91,117 @@ private static void renderMembers(CppWriter writer, StructureShape shape,
                 writer.write("");
             }
 
-            // Getter
-            if (isPrimitive(targetShape) || targetShape.isEnumShape()) {
-                writer.write("inline $L Get$L() const { return $L; }", cppType, memberName, fieldName);
+            if (targetShape.isDocumentShape()) {
+                writer.write("inline Aws::Utils::DocumentView Get$L() const { return $L; }", methodName, fieldName);
+            } else if (isPrimitive(targetShape) || CppTypeMapper.isEnum(targetShape)) {
+                writer.write("inline $L Get$L() const { return $L; }", cppType, methodName, fieldName);
+            } else if (recursive) {
+                // Stored as std::shared_ptr<T>; dereference for the const-ref getter. Matches C2J.
+                writer.write("inline const $L& Get$L() const { return *$L; }", cppType, methodName, fieldName);
             } else {
-                writer.write("inline const $L& Get$L() const { return $L; }", cppType, memberName, fieldName);
+                writer.write("inline const $L& Get$L() const { return $L; }", cppType, methodName, fieldName);
             }
 
-            // HasBeenSet (only for non-result shapes)
             if (emitHasBeenSet) {
-                writer.write("inline bool $LHasBeenSet() const { return $LHasBeenSet; }", memberName, fieldName);
+                writer.write("inline bool $LHasBeenSet() const { return $LHasBeenSet; }", methodName, fieldName);
             }
 
-            if (targetShape.isEnumShape() || isPrimitive(targetShape)) {
-                writer.openBlock("inline void Set$L($L value) {", "}", memberName, cppType, () -> {
+            if (CppTypeMapper.isEnum(targetShape) || isPrimitive(targetShape)) {
+                writer.openBlock("inline void Set$L($L value) {", "}", methodName, cppType, () -> {
                     writer.write("$LHasBeenSet = true;", fieldName);
                     writer.write("$L = value;", fieldName);
                 });
-                writer.openBlock("inline $L& With$L($L value) {", "}", className, memberName, cppType, () -> {
-                    writer.write("Set$L(value);", memberName);
+                writer.openBlock("inline $L& With$L($L value) {", "}", className, methodName, cppType, () -> {
+                    writer.write("Set$L(value);", methodName);
                     writer.write("return *this;");
                 });
             } else {
                 writer.write("template <typename $L = $L>", templateParam, cppType);
-                writer.openBlock("void Set$L($L&& value) {", "}", memberName, templateParam, () -> {
+                writer.openBlock("void Set$L($L&& value) {", "}", methodName, templateParam, () -> {
                     writer.write("$LHasBeenSet = true;", fieldName);
-                    writer.write("$L = std::forward<$L>(value);", fieldName, templateParam);
+                    if (recursive) {
+                        // Wrap the value in a shared_ptr, tagged with the enclosing class name for
+                        // the allocator. The template setter is only instantiated at call sites,
+                        // where T is complete, so the header can forward-declare T. Matches C2J.
+                        writer.write("$L = Aws::MakeShared<$L>(\"$L\", std::forward<$L>(value));",
+                            fieldName, cppType, className, templateParam);
+                    } else {
+                        writer.write("$L = std::forward<$L>(value);", fieldName, templateParam);
+                    }
                 });
                 writer.write("template <typename $L = $L>", templateParam, cppType);
-                writer.openBlock("$L& With$L($L&& value) {", "}", className, memberName, templateParam, () -> {
-                    writer.write("Set$L(std::forward<$L>(value));", memberName, templateParam);
+                writer.openBlock("$L& With$L($L&& value) {", "}", className, methodName, templateParam, () -> {
+                    writer.write("Set$L(std::forward<$L>(value));", methodName, templateParam);
                     writer.write("return *this;");
                 });
 
                 if (targetShape.isListShape()) {
+                    boolean sparse = targetShape.hasTrait(SparseTrait.class);
                     Shape elementShape = model.expectShape(
                         targetShape.asListShape().get().getMember().getTarget());
-                    String elementType = CppTypeMapper.getCppType(elementShape, model);
-                    if (elementShape.isEnumShape()) {
-                        writer.openBlock("inline $L& Add$L($L value) {", "}", className, memberName, elementType, () -> {
+                    String elementType = CppTypeMapper.getCppType(elementShape, model, wideIntegers);
+                    if (isByValueType(elementShape)) {
+                        writer.openBlock("inline $L& Add$L($L value) {", "}", className, methodName, elementType, () -> {
                             writer.write("$LHasBeenSet = true;", fieldName);
                             writer.write("$L.push_back(value);", fieldName);
                             writer.write("return *this;");
                         });
                     } else {
                         writer.write("template <typename $L = $L>", templateParam, elementType);
-                        writer.openBlock("$L& Add$L($L&& value) {", "}", className, memberName, templateParam, () -> {
+                        writer.openBlock("$L& Add$L($L&& value) {", "}", className, methodName, templateParam, () -> {
                             writer.write("$LHasBeenSet = true;", fieldName);
                             writer.write("$L.emplace_back(std::forward<$L>(value));", fieldName, templateParam);
                             writer.write("return *this;");
                         });
                     }
+                    // A @sparse list also accepts the Optional element directly (matches C2J).
+                    if (sparse) {
+                        writer.openBlock("inline $L& Add$L(Aws::Crt::Optional<$L> value) {", "}",
+                            className, methodName, elementType, () -> {
+                            writer.write("$LHasBeenSet = true;", fieldName);
+                            writer.write("$L.push_back(value);", fieldName);
+                            writer.write("return *this;");
+                        });
+                    }
                 }
 
                 if (targetShape.isMapShape()) {
+                    boolean sparse = targetShape.hasTrait(SparseTrait.class);
                     Shape keyShape = model.expectShape(
                         targetShape.asMapShape().get().getKey().getTarget());
                     Shape valueShape = model.expectShape(
                         targetShape.asMapShape().get().getValue().getTarget());
-                    String keyType = CppTypeMapper.getCppType(keyShape, model);
-                    String valueType = CppTypeMapper.getCppType(valueShape, model);
-                    String keyParam = memberName + "KeyT";
-                    String valueParam = memberName + "ValueT";
-                    writer.write("template <typename $L = $L, typename $L = $L>", keyParam, keyType, valueParam, valueType);
-                    writer.openBlock("$L& Add$L($L&& key, $L&& value) {", "}", className, memberName, keyParam, valueParam, () -> {
-                        writer.write("$LHasBeenSet = true;", fieldName);
-                        writer.write("$L.emplace(std::forward<$L>(key), std::forward<$L>(value));", fieldName, keyParam, valueParam);
-                        writer.write("return *this;");
-                    });
+                    String keyType = CppTypeMapper.getCppType(keyShape, model, wideIntegers);
+                    String valueType = CppTypeMapper.getCppType(valueShape, model, wideIntegers);
+                    boolean bothForwardable = !isByValueType(keyShape) && !isByValueType(valueShape);
+                    if (bothForwardable) {
+                        String keyParam = methodName + "KeyT";
+                        String valueParam = methodName + "ValueT";
+                        // A @sparse map's forwarding Add defaults its value template to the wrapped
+                        // Optional type (matches C2J); the key is untouched.
+                        String valueParamDefault = sparse ? "Aws::Crt::Optional<" + valueType + ">" : valueType;
+                        writer.write("template <typename $L = $L, typename $L = $L>", keyParam, keyType, valueParam, valueParamDefault);
+                        writer.openBlock("$L& Add$L($L&& key, $L&& value) {", "}", className, methodName, keyParam, valueParam, () -> {
+                            writer.write("$LHasBeenSet = true;", fieldName);
+                            writer.write("$L.emplace(std::forward<$L>(key), std::forward<$L>(value));", fieldName, keyParam, valueParam);
+                            writer.write("return *this;");
+                        });
+                    } else {
+                        writer.openBlock("inline $L& Add$L($L key, $L value) {", "}", className, methodName, keyType, valueType, () -> {
+                            writer.write("$LHasBeenSet = true;", fieldName);
+                            writer.write("$L.emplace(key, value);", fieldName);
+                            writer.write("return *this;");
+                        });
+                    }
+                    // A @sparse map also accepts the raw key and the Optional value directly.
+                    if (sparse) {
+                        writer.openBlock("inline $L& Add$L($L key, Aws::Crt::Optional<$L> value) {", "}",
+                            className, methodName, keyType, valueType, () -> {
+                            writer.write("$LHasBeenSet = true;", fieldName);
+                            writer.write("$L.emplace(key, value);", fieldName);
+                            writer.write("return *this;");
+                        });
+                    }
                 }
             }
 
@@ -177,62 +212,114 @@ private static void renderMembers(CppWriter writer, StructureShape shape,
         }
     }
 
-    /**
-     * Writes the private member fields and HasBeenSet flags for a structure.
-     *
-     * <p>Layout:
-     * <ol>
-     *   <li>Data members (with blank line between each), primitives get brace-initialized defaults</li>
-     *   <li>HasBeenSet boolean flags grouped together at the end</li>
-     * </ol>
-     *
-     * @param writer the CppWriter to write to
-     * @param shape  the structure shape whose members to render
-     * @param model  the model (for resolving member targets)
-     */
-    public static void renderPrivateSection(CppWriter writer, StructureShape shape, Model model) {
-        renderPrivateDataMembers(writer, shape, model);
-        renderPrivateHasBeenSetFlags(writer, shape, model);
-    }
-
-    /**
-     * Writes only the data member declarations (with blank lines between each).
-     */
-    public static void renderPrivateDataMembers(CppWriter writer, StructureShape shape, Model model) {
+    /** Private data member declarations (blank line between each), skipping the excluded member. */
+    public void renderDataMembers(CppWriter writer) {
         java.util.List<Map.Entry<String, MemberShape>> entries =
             new java.util.ArrayList<>(shape.getAllMembers().entrySet());
+        entries.removeIf(e -> e.getKey().equals(exclude));
         for (int i = 0; i < entries.size(); i++) {
             Map.Entry<String, MemberShape> entry = entries.get(i);
-            String memberName = entry.getKey();
-            MemberShape member = entry.getValue();
-            Shape targetShape = model.expectShape(member.getTarget());
-            String cppType = CppTypeMapper.getCppType(targetShape, model);
-            String fieldName = "m_" + decapitalize(memberName);
-
-            CppTypeMapper.getDefaultValue(targetShape).ifPresentOrElse(
-                defaultVal -> writer.write("$L $L{$L};", cppType, fieldName, defaultVal),
-                () -> writer.write("$L $L;", cppType, fieldName)
-            );
+            writeDataMember(writer, entry.getValue(), entry.getKey(), model, wideIntegers,
+                isRecursiveMember(entry.getValue()));
             if (i < entries.size() - 1) {
                 writer.write("");
             }
         }
     }
 
+    /** True if this member's direct target forms a reference cycle with the enclosing shape. */
+    private boolean isRecursiveMember(MemberShape member) {
+        Shape target = model.expectShape(member.getTarget());
+        return CppTypeMapper.isRecursiveStructMember(shape, target, model);
+    }
+
+    /** Private {@code HasBeenSet} flags (one per member, no blank lines), skipping the excluded member. */
+    public void renderHasBeenSetFlags(CppWriter writer) {
+        for (Map.Entry<String, MemberShape> entry : shape.getAllMembers().entrySet()) {
+            if (!entry.getKey().equals(exclude)) {
+                writeHasBeenSetFlag(writer, entry.getValue(), entry.getKey());
+            }
+        }
+    }
+
+    /** Data members immediately followed by the {@code HasBeenSet} flags (no separating blank line). */
+    public void renderPrivateSection(CppWriter writer) {
+        renderDataMembers(writer);
+        renderHasBeenSetFlags(writer);
+    }
+
     /**
-     * Writes only the HasBeenSet boolean flags (one per member, no blank lines between).
+     * Renders the top-level {@code RequestId} accessor group emitted by result headers:
+     * {@code GetRequestId} / templated {@code SetRequestId} / templated {@code WithRequestId}.
+     * Callers decide whether to emit it (Query/EC2 do not) and separately emit the
+     * {@code m_requestId} field and its {@code HasBeenSet} flag in the private section.
      */
-    public static void renderPrivateHasBeenSetFlags(CppWriter writer, StructureShape shape, Model model) {
-        for (Map.Entry<String, MemberShape> entry : shape.getAllMembers().entrySet()) {
-            String memberName = entry.getKey();
-            String fieldName = "m_" + decapitalize(memberName);
-            writer.write("bool $LHasBeenSet = false;", fieldName);
+    public static void renderRequestIdAccessors(CppWriter writer, String className) {
+        writer.write("");
+        writer.write("///@{");
+        writer.write("");
+        writer.write("inline const Aws::String& GetRequestId() const { return m_requestId; }");
+        writer.write("template <typename RequestIdT = Aws::String>");
+        writer.openBlock("void SetRequestId(RequestIdT&& value) {", "}", () -> {
+            writer.write("m_requestIdHasBeenSet = true;");
+            writer.write("m_requestId = std::forward<RequestIdT>(value);");
+        });
+        writer.write("template <typename RequestIdT = Aws::String>");
+        writer.openBlock("$L& WithRequestId(RequestIdT&& value) {", "}", className, () -> {
+            writer.write("SetRequestId(std::forward<RequestIdT>(value));");
+            writer.write("return *this;");
+        });
+        writer.write("///@}");
+    }
+
+    /**
+     * Writes a single private data member declaration. {@code @idempotencyToken} members are
+     * brace-initialized with {@code Aws::Utils::UUID::PseudoRandomUUID()} so a caller who omits
+     * the token still gets idempotent behavior; other members fall back to their type's default
+     * initializer (or none). Matches C2J's ServiceClientModelHeaderMemberDeclaration.vm.
+     */
+    private static void writeDataMember(CppWriter writer, MemberShape member, String memberName, Model model,
+                                        boolean wideIntegers, boolean recursive) {
+        Shape targetShape = model.expectShape(member.getTarget());
+        String cppType = CppTypeMapper.getCppType(targetShape, model, wideIntegers);
+        String fieldName = CppNames.fieldName(memberName);
+        if (recursive) {
+            // Recursive member: break the cycle with a shared_ptr (no default initializer). C2J parity.
+            writer.write("std::shared_ptr<$L> $L;", cppType, fieldName);
+            return;
+        }
+        if (member.hasTrait(IdempotencyTokenTrait.class)) {
+            writer.write("$L $L{Aws::Utils::UUID::PseudoRandomUUID()};", cppType, fieldName);
+            return;
         }
+        CppTypeMapper.getDefaultValue(targetShape).ifPresentOrElse(
+            defaultVal -> writer.write("$L $L{$L};", cppType, fieldName, defaultVal),
+            () -> writer.write("$L $L;", cppType, fieldName)
+        );
+    }
+
+    /**
+     * Writes a single HasBeenSet flag. {@code @idempotencyToken} members default to {@code true}
+     * because they are auto-populated at construction; all others default to {@code false}.
+     * Matches C2J's ModelClassMembersAndInlines.vm.
+     */
+    private static void writeHasBeenSetFlag(CppWriter writer, MemberShape member, String memberName) {
+        String fieldName = CppNames.fieldName(memberName);
+        boolean initialValue = member.hasTrait(IdempotencyTokenTrait.class);
+        writer.write("bool $LHasBeenSet = $L;", fieldName, initialValue);
+    }
+
+    /**
+     * True if a container element / map key or value is passed to {@code Add*} by value rather
+     * than by perfect-forwarding reference. Matches C2J: primitive and enum types are by-value
+     * (they are cheap and trivially copyable), everything else is forwarded.
+     */
+    private static boolean isByValueType(Shape shape) {
+        return CppTypeMapper.isPrimitive(shape) || CppTypeMapper.isEnum(shape);
     }
 
-    private static String decapitalize(String name) {
-        if (name.isEmpty()) return name;
-        return Character.toLowerCase(name.charAt(0)) + name.substring(1);
+    private static String capitalize(String name) {
+        return CppNames.capitalize(name);
     }
 
     private static final String[] UNSUPPORTED_HTML_TAGS = {
@@ -265,7 +352,7 @@ public static void renderClassDocComment(CppWriter writer, Shape shape,
             String docText = collapseWhitespace(shape.getTrait(DocumentationTrait.class).get().getValue());
             String seeAlso = String.format(
                 "<p><h3>See Also:</h3>   <a href=\"http://docs.aws.amazon.com/goto/WebAPI/%s-%s/%s\">AWS API Reference</a></p>",
-                smithyServiceName, version, shape.getId().getName());
+                smithyServiceName, version, CppTypeMapper.cppShapeName(shape));
             writeDocComment(writer, docText + seeAlso);
         } else {
             writer.write("/**");
diff --git a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/ModelCodegenPlugin.java b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/ModelCodegenPlugin.java
index 797e20b09756..d3eeee702761 100644
--- a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/ModelCodegenPlugin.java
+++ b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/ModelCodegenPlugin.java
@@ -64,7 +64,7 @@ public void execute(PluginContext context) {
 
             ModelGenerator generator = new ModelGenerator(
                 transformedModel, processedService, writerDelegator,
-                serviceName, smithyServiceName, exportMacro, namespace);
+                smithyServiceName, exportMacro, namespace);
             generator.generateAll();
         }
 
diff --git a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/ModelGenerator.java b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/ModelGenerator.java
index 2a70d3e52c94..f8e4eb7f84f2 100644
--- a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/ModelGenerator.java
+++ b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/ModelGenerator.java
@@ -9,6 +9,7 @@
 import com.amazonaws.util.awsclientsmithygenerator.generators.model.ShapeClassifier.ClassifiedShapes;
 import com.amazonaws.util.awsclientsmithygenerator.generators.model.renderers.EnumShapeRenderer;
 import com.amazonaws.util.awsclientsmithygenerator.generators.model.renderers.EventStreamRenderer;
+import com.amazonaws.util.awsclientsmithygenerator.generators.model.renderers.OutgoingEventStreamRenderer;
 import com.amazonaws.util.awsclientsmithygenerator.generators.model.renderers.RequestRenderer;
 import com.amazonaws.util.awsclientsmithygenerator.generators.model.renderers.ResultRenderer;
 import com.amazonaws.util.awsclientsmithygenerator.generators.model.renderers.SubObjectRenderer;
@@ -30,7 +31,6 @@ public class ModelGenerator {
     private final Model model;
     private final ServiceShape service;
     private final CppWriterDelegator writerDelegator;
-    private final String serviceName;
     private final String smithyServiceName;
     private final String exportMacro;
     private final String namespace;
@@ -38,12 +38,11 @@ public class ModelGenerator {
     private final ProtocolTraits protocolTraits;
 
     public ModelGenerator(Model model, ServiceShape service, CppWriterDelegator writerDelegator,
-                          String serviceName, String smithyServiceName,
+                          String smithyServiceName,
                           String exportMacro, String namespace) {
         this.model = model;
         this.service = service;
         this.writerDelegator = writerDelegator;
-        this.serviceName = serviceName;
         this.smithyServiceName = smithyServiceName;
         this.exportMacro = exportMacro;
         this.namespace = namespace;
@@ -53,35 +52,23 @@ public ModelGenerator(Model model, ServiceShape service, CppWriterDelegator writ
 
     public void generateAll() {
         ClassifiedShapes classified = ShapeClassifier.classify(model, service, protocol);
-        List<ShapeRenderer> renderers = buildRenderers(classified);
+        RenderContext ctx = new RenderContext(model, service, protocolTraits,
+            namespace, exportMacro, smithyServiceName);
+        List<ShapeRenderer> renderers = buildRenderers(classified, ctx);
 
         for (ShapeRenderer renderer : renderers) {
             renderer.render(writerDelegator);
         }
     }
 
-    private List<ShapeRenderer> buildRenderers(ClassifiedShapes classified) {
+    private List<ShapeRenderer> buildRenderers(ClassifiedShapes classified, RenderContext ctx) {
         List<ShapeRenderer> renderers = new ArrayList<>();
-
-        renderers.add(new EnumShapeRenderer(
-            classified.enums(), namespace, exportMacro, smithyServiceName));
-
-        renderers.add(new SubObjectRenderer(
-            classified.subObjects(), model, service, protocolTraits,
-            namespace, exportMacro, serviceName, smithyServiceName));
-
-        renderers.add(new RequestRenderer(
-            classified.requests(), model, service, protocolTraits,
-            namespace, exportMacro, smithyServiceName));
-
-        renderers.add(new ResultRenderer(
-            classified.results(), model, service, protocolTraits,
-            namespace, exportMacro, smithyServiceName));
-
-        renderers.add(new EventStreamRenderer(
-            classified.eventStreamHandlers(), model, service, protocolTraits,
-            namespace, exportMacro, smithyServiceName));
-
+        renderers.add(new EnumShapeRenderer(classified.enums(), ctx));
+        renderers.add(new SubObjectRenderer(classified.subObjects(), ctx));
+        renderers.add(new RequestRenderer(classified.requests(), ctx));
+        renderers.add(new ResultRenderer(classified.results(), ctx));
+        renderers.add(new EventStreamRenderer(classified.eventStreamHandlers(), ctx));
+        renderers.add(new OutgoingEventStreamRenderer(classified.outgoingEventStreams(), ctx));
         return renderers;
     }
 }
diff --git a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/ProtocolResolver.java b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/ProtocolResolver.java
index 0704643cd3a0..83b86a5c8541 100644
--- a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/ProtocolResolver.java
+++ b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/ProtocolResolver.java
@@ -13,6 +13,7 @@
 import software.amazon.smithy.aws.traits.protocols.RestJson1Trait;
 import software.amazon.smithy.aws.traits.protocols.RestXmlTrait;
 import software.amazon.smithy.protocol.traits.Rpcv2CborTrait;
+import com.amazonaws.util.awsclientsmithygenerator.generators.model.protocol.CborProtocolTraits;
 import com.amazonaws.util.awsclientsmithygenerator.generators.model.protocol.JsonProtocolTraits;
 import com.amazonaws.util.awsclientsmithygenerator.generators.model.protocol.ProtocolTraits;
 import com.amazonaws.util.awsclientsmithygenerator.generators.model.protocol.QueryXmlProtocolTraits;
@@ -37,9 +38,10 @@ public final class ProtocolResolver {
      */
     public enum Protocol {
         JSON("Aws::Utils::Json", "Aws::Utils::Json::JsonView", "Aws::Utils::Json::JsonValue", "Jsonize"),
+        REST_JSON("Aws::Utils::Json", "Aws::Utils::Json::JsonView", "Aws::Utils::Json::JsonValue", "Jsonize"),
         REST_XML("Aws::Utils::Xml", "const Aws::Utils::Xml::XmlNode&", "void", "AddToNode"),
         QUERY_XML("Aws::Utils::Xml", "const Aws::Utils::Xml::XmlNode&", "void", "OutputToStream"),
-        CBOR("Aws::Utils::Json", "Aws::Utils::Json::JsonView", "Aws::Utils::Json::JsonValue", "Jsonize"),
+        CBOR("Aws::Utils::Cbor", "Aws::Utils::Cbor::CborValue", "Aws::Utils::Cbor::CborValue", "Jsonize"),
         EC2("Aws::Utils::Xml", "const Aws::Utils::Xml::XmlNode&", "void", "OutputToStream");
 
         private final String serdeNamespace;
@@ -74,9 +76,9 @@ public String getSerializeMethodName() {
             return serializeMethodName;
         }
 
-        /** Returns true if the protocol uses JSON-style serde (JSON or CBOR). */
+        /** Returns true if the protocol uses JSON-style serde (JSON or REST_JSON). */
         public boolean isJsonLike() {
-            return this == JSON || this == CBOR;
+            return this == JSON || this == REST_JSON;
         }
 
         /** Returns true if the protocol uses XML-style serde (REST_XML, QUERY_XML, or EC2). */
@@ -97,7 +99,8 @@ private ProtocolResolver() {
      *   <li>{@code aws.protocols#ec2Query} &rarr; EC2</li>
      *   <li>{@code aws.protocols#awsQuery} &rarr; QUERY_XML</li>
      *   <li>{@code aws.protocols#restXml} &rarr; REST_XML</li>
-     *   <li>Default (restJson1, awsJson1_0, awsJson1_1, or unrecognized) &rarr; JSON</li>
+     *   <li>{@code aws.protocols#restJson1} &rarr; REST_JSON</li>
+     *   <li>Default (awsJson1_0, awsJson1_1, or unrecognized) &rarr; JSON</li>
      * </ol>
      *
      * @param service the service shape to resolve
@@ -117,7 +120,10 @@ public static Protocol resolve(ServiceShape service, Model model) {
         if (service.hasTrait(RestXmlTrait.class)) {
             return Protocol.REST_XML;
         }
-        // Default: JSON (covers RestJson1, AwsJson1_0, AwsJson1_1)
+        if (service.hasTrait(RestJson1Trait.class)) {
+            return Protocol.REST_JSON;
+        }
+        // Default: JSON (covers AwsJson1_0, AwsJson1_1)
         return Protocol.JSON;
     }
 
@@ -139,8 +145,10 @@ public static ProtocolTraits traitsFor(Protocol protocol) {
         }
         switch (protocol) {
             case JSON:
-            case CBOR:
+            case REST_JSON:
                 return new JsonProtocolTraits(protocol);
+            case CBOR:
+                return new CborProtocolTraits();
             case REST_XML:
                 return new RestXmlProtocolTraits();
             case QUERY_XML:
diff --git a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/RenderContext.java b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/RenderContext.java
new file mode 100644
index 000000000000..0486fdfd94a8
--- /dev/null
+++ b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/RenderContext.java
@@ -0,0 +1,29 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+package com.amazonaws.util.awsclientsmithygenerator.generators.model;
+
+import com.amazonaws.util.awsclientsmithygenerator.generators.model.protocol.ProtocolTraits;
+import software.amazon.smithy.model.Model;
+import software.amazon.smithy.model.shapes.ServiceShape;
+
+/**
+ * Immutable bundle of the per-service inputs every {@link ShapeRenderer} needs.
+ * Replaces the repeated 6-7 positional constructor arguments so adding a shared
+ * input is a single-field change rather than an edit to every renderer.
+ *
+ * @param model             the transformed Smithy model
+ * @param service           the service shape being generated
+ * @param protocolTraits    the resolved protocol rendering strategy
+ * @param namespace         the C++ model namespace (e.g. "IAM")
+ * @param exportMacro       the export macro (e.g. "AWS_IAM_API")
+ * @param smithyServiceName the on-disk service directory name (e.g. "iam")
+ */
+public record RenderContext(
+    Model model,
+    ServiceShape service,
+    ProtocolTraits protocolTraits,
+    String namespace,
+    String exportMacro,
+    String smithyServiceName) {}
diff --git a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/ShapeClassifier.java b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/ShapeClassifier.java
index 85c1c6da40af..5d57f27da337 100644
--- a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/ShapeClassifier.java
+++ b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/ShapeClassifier.java
@@ -18,11 +18,13 @@
 import software.amazon.smithy.model.shapes.UnionShape;
 import software.amazon.smithy.model.traits.EnumTrait;
 import software.amazon.smithy.model.traits.ErrorTrait;
+import software.amazon.smithy.model.traits.HttpPayloadTrait;
 import software.amazon.smithy.model.traits.StreamingTrait;
 
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -35,14 +37,6 @@
  */
 public final class ShapeClassifier {
 
-    /**
-     * Classification bucket for a shape.
-     */
-    public enum Classification {
-        REQUEST, RESULT, SUB_OBJECT, ENUM,
-        EVENT_STREAM_HANDLER, BLOB_PAYLOAD_EVENT, OUTGOING_EVENT_STREAM, SKIP
-    }
-
     /**
      * Associates an operation input shape with its parent operation.
      *
@@ -56,8 +50,9 @@ public record RequestInfo(StructureShape shape, OperationShape operation) {}
      *
      * @param shape     the result structure shape
      * @param operation the operation shape that uses this as output
+     * @param streaming true if the result binds a raw streaming httpPayload blob member
      */
-    public record ResultInfo(StructureShape shape, OperationShape operation) {}
+    public record ResultInfo(StructureShape shape, OperationShape operation, boolean streaming) {}
 
     /**
      * Metadata about an operation whose output contains an event stream.
@@ -76,7 +71,6 @@ public record EventStreamInfo(String operationName, StructureShape requestShape,
      * @param subObjects          remaining StructureShape/UnionShape reachable from operations
      * @param enums               EnumShape or StringShape with @enum trait
      * @param eventStreamHandlers operation + request/result shape tuples for event stream handlers
-     * @param blobPayloadEvents   event shapes with blob payloads (header only)
      * @param outgoingEventStreams outgoing event stream shapes (header only)
      */
     public record ClassifiedShapes(
@@ -85,7 +79,6 @@ public record ClassifiedShapes(
         List<Shape> subObjects,
         List<Shape> enums,
         List<EventStreamInfo> eventStreamHandlers,
-        List<StructureShape> blobPayloadEvents,
         List<Shape> outgoingEventStreams
     ) {}
 
@@ -106,31 +99,44 @@ public static ClassifiedShapes classify(Model model, ServiceShape service, Proto
 
         Set<ShapeId> inputShapeIds = new HashSet<>();
         Set<ShapeId> outputShapeIds = new HashSet<>();
+        // @streaming unions bound to a request input: rendered as EventEncoderStream subclasses
+        // (outgoing event streams), not as tagged-union data types.
+        Set<ShapeId> outgoingEventStreamIds = new HashSet<>();
 
         List<RequestInfo> requests = new ArrayList<>();
         List<ResultInfo> results = new ArrayList<>();
         List<Shape> subObjects = new ArrayList<>();
         List<Shape> enums = new ArrayList<>();
         List<EventStreamInfo> eventStreamHandlers = new ArrayList<>();
-        List<StructureShape> blobPayloadEvents = new ArrayList<>();
         List<Shape> outgoingEventStreams = new ArrayList<>();
 
         // Collect operation inputs/outputs and identify event stream handlers
         for (OperationShape op : index.getContainedOperations(service)) {
-            op.getInput().ifPresent(id -> {
-                inputShapeIds.add(id);
-                model.getShape(id).flatMap(Shape::asStructureShape).ifPresent(s -> {
-                    requests.add(new RequestInfo(s, op));
-
-                    // Check if operation has event-stream-bearing result
-                    boolean resultHasEventStream = op.getOutput()
-                        .flatMap(model::getShape)
-                        .flatMap(Shape::asStructureShape)
-                        .map(out -> hasEventStreamMembers(out, model))
-                        .orElse(false);
-                    if (resultHasEventStream) {
-                        StructureShape resultShape = model.expectShape(op.getOutputShape(), StructureShape.class);
-                        eventStreamHandlers.add(new EventStreamInfo(op.getId().getName(), s, resultShape));
+            // Use getInputShape() (not getInput()) so no-input operations, whose input
+            // target is smithy.api#Unit, still produce a RequestInfo. C2J emits a Request
+            // class for every operation; the generated client method references it.
+            ShapeId inputId = op.getInputShape();
+            inputShapeIds.add(inputId);
+            model.getShape(inputId).flatMap(Shape::asStructureShape).ifPresent(s -> {
+                requests.add(new RequestInfo(s, op));
+
+                // Check if operation has event-stream-bearing result
+                boolean resultHasEventStream = op.getOutput()
+                    .flatMap(model::getShape)
+                    .flatMap(Shape::asStructureShape)
+                    .map(out -> hasEventStreamMembers(out, model))
+                    .orElse(false);
+                if (resultHasEventStream) {
+                    StructureShape resultShape = model.expectShape(op.getOutputShape(), StructureShape.class);
+                    eventStreamHandlers.add(new EventStreamInfo(op.getId().getName(), s, resultShape));
+                }
+
+                // An input-bound @streaming union is an outgoing event stream (encoder). Collect
+                // it once and record its shape id so the reachable-walk below does not also add
+                // it to subObjects.
+                streamingUnionMember(s, model).ifPresent(union -> {
+                    if (outgoingEventStreamIds.add(union.getId())) {
+                        outgoingEventStreams.add(union);
                     }
                 });
             });
@@ -138,7 +144,7 @@ public static ClassifiedShapes classify(Model model, ServiceShape service, Proto
                 outputShapeIds.add(id);
                 model.getShape(id).flatMap(Shape::asStructureShape).ifPresent(s -> {
                     if (!hasEventStreamMembers(s, model)) {
-                        results.add(new ResultInfo(s, op));
+                        results.add(new ResultInfo(s, op, hasRawStreamingPayload(s, model)));
                     }
                     // If has event stream members, result is skipped (handler generated instead)
                 });
@@ -152,6 +158,8 @@ public static ClassifiedShapes classify(Model model, ServiceShape service, Proto
                 // Already classified as request/result above
             } else if (shape.isEnumShape() || (shape.isStringShape() && shape.hasTrait(EnumTrait.class))) {
                 enums.add(shape);
+            } else if (outgoingEventStreamIds.contains(id)) {
+                // Already collected as an outgoing event stream; do not also render as a data union.
             } else if (shape.hasTrait(ErrorTrait.class)) {
                 if (isModeledException(shape.asStructureShape().get(), protocol)) {
                     subObjects.add(shape);
@@ -162,7 +170,7 @@ public static ClassifiedShapes classify(Model model, ServiceShape service, Proto
         }
 
         return new ClassifiedShapes(requests, results, subObjects, enums,
-            eventStreamHandlers, blobPayloadEvents, outgoingEventStreams);
+            eventStreamHandlers, outgoingEventStreams);
     }
 
     /**
@@ -171,9 +179,11 @@ public static ClassifiedShapes classify(Model model, ServiceShape service, Proto
      * <p>For JSON/CBOR protocols, trivial members are: Message, message.
      * For XML protocols, trivial members are: Message, message, Code, code.
      * If the exception has any member not in the trivial set, it is "modeled"
-     * and should generate as a sub-object.
+     * and should generate as a sub-object. Also used by {@code EventStreamRenderer} to decide
+     * whether an event-stream union's exception member is typed as its concrete shape (modeled)
+     * or the generic {@code <namespace>Error} wrapper (non-modeled).
      */
-    private static boolean isModeledException(StructureShape shape, Protocol protocol) {
+    public static boolean isModeledException(StructureShape shape, Protocol protocol) {
         Set<String> members = shape.getAllMembers().keySet();
         Set<String> trivialJson = Set.of("Message", "message");
         Set<String> trivialXml = Set.of("Message", "message", "Code", "code");
@@ -183,15 +193,42 @@ private static boolean isModeledException(StructureShape shape, Protocol protoco
         return members.stream().anyMatch(m -> !trivial.contains(m));
     }
 
+    /**
+     * True if the structure has a raw streaming httpPayload member. Matching C2J's
+     * {@code isStreamingPayloadMember} (CppViewHelper), an {@code @httpPayload} member is a raw
+     * stream when its target is a blob or string (or is explicitly {@code @streaming}) and it is
+     * not an event stream — no {@code @streaming} trait is required for blob/string payloads.
+     */
+    private static boolean hasRawStreamingPayload(StructureShape shape, Model model) {
+        for (MemberShape member : shape.getAllMembers().values()) {
+            if (!member.hasTrait(HttpPayloadTrait.class) || StreamingTrait.isEventStream(model, member)) {
+                continue;
+            }
+            Shape target = model.expectShape(member.getTarget());
+            if (target.isBlobShape() || target.isStringShape() || target.hasTrait(StreamingTrait.class)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     /**
      * Returns true if the structure has a member targeting a union with the @streaming trait
      * (i.e., an event stream member).
      */
     private static boolean hasEventStreamMembers(StructureShape shape, Model model) {
-        return shape.getAllMembers().values().stream().anyMatch(member -> {
+        return streamingUnionMember(shape, model).isPresent();
+    }
+
+    /** Returns the {@code @streaming} union targeted by a member of {@code shape}, if any. */
+    private static Optional<UnionShape> streamingUnionMember(StructureShape shape, Model model) {
+        for (MemberShape member : shape.getAllMembers().values()) {
             Shape target = model.expectShape(member.getTarget());
-            return target.isUnionShape() && target.hasTrait(StreamingTrait.class);
-        });
+            if (target.isUnionShape() && target.hasTrait(StreamingTrait.class)) {
+                return target.asUnionShape();
+            }
+        }
+        return Optional.empty();
     }
 
     /**
@@ -227,4 +264,54 @@ public static boolean isEventStreamRequestOperation(OperationShape op, Model mod
             .map(in -> hasEventStreamMembers(in, model))
             .orElse(false);
     }
+
+    /**
+     * Returns true if the operation's input structure has a raw streaming httpPayload member
+     * (a blob/string {@code @httpPayload}, or an explicitly {@code @streaming} payload, that is
+     * not an event stream). Such requests derive from {@code Streaming<Prefix>Request} in C2J.
+     *
+     * @param op    the operation
+     * @param model the Smithy model
+     * @return true if the operation's input binds a raw streaming payload
+     */
+    public static boolean isRawStreamingPayloadRequest(OperationShape op, Model model) {
+        return op.getInput()
+            .flatMap(model::getShape)
+            .flatMap(Shape::asStructureShape)
+            .map(in -> hasRawStreamingPayload(in, model))
+            .orElse(false);
+    }
+
+    /**
+     * Returns the member name of the raw streaming {@code @httpPayload} member of {@code shape},
+     * or empty if there is none. Matches the {@link #hasRawStreamingPayload} predicate.
+     */
+    public static Optional<String> rawStreamingPayloadMemberName(StructureShape shape, Model model) {
+        for (MemberShape member : shape.getAllMembers().values()) {
+            if (!member.hasTrait(HttpPayloadTrait.class) || StreamingTrait.isEventStream(model, member)) {
+                continue;
+            }
+            Shape target = model.expectShape(member.getTarget());
+            if (target.isBlobShape() || target.isStringShape() || target.hasTrait(StreamingTrait.class)) {
+                return Optional.of(member.getMemberName());
+            }
+        }
+        return Optional.empty();
+    }
+
+    /**
+     * Returns the name of the member that targets a {@code @streaming} union (the event-stream
+     * input member), or empty if there is none. Such a member is sent as an encoded event stream
+     * via {@code GetBody()}, so it is rendered as a {@code std::shared_ptr<Union>} rather than a
+     * value member.
+     */
+    public static Optional<String> eventStreamMemberName(StructureShape shape, Model model) {
+        for (MemberShape member : shape.getAllMembers().values()) {
+            Shape target = model.expectShape(member.getTarget());
+            if (target.isUnionShape() && target.hasTrait(StreamingTrait.class)) {
+                return Optional.of(member.getMemberName());
+            }
+        }
+        return Optional.empty();
+    }
 }
diff --git a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/protocol/CborProtocolTraits.java b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/protocol/CborProtocolTraits.java
new file mode 100644
index 000000000000..8baef186b522
--- /dev/null
+++ b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/protocol/CborProtocolTraits.java
@@ -0,0 +1,223 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+package com.amazonaws.util.awsclientsmithygenerator.generators.model.protocol;
+
+import com.amazonaws.util.awsclientsmithygenerator.generators.CppWriter;
+import com.amazonaws.util.awsclientsmithygenerator.generators.model.ProtocolResolver.Protocol;
+import software.amazon.smithy.model.Model;
+import software.amazon.smithy.model.shapes.OperationShape;
+import software.amazon.smithy.model.shapes.ServiceShape;
+import software.amazon.smithy.model.shapes.StructureShape;
+import software.amazon.smithy.model.traits.UnitTypeTrait;
+
+import java.util.List;
+
+/**
+ * CBOR (Smithy {@code rpcv2Cbor}) serde rendering. Distinct from the JSON family: it
+ * uses {@code Aws::Utils::Cbor::CborValue} model/result types, includes the CRT and core
+ * CBOR headers, and carries its protocol identity through content-type headers rather
+ * than an {@code X-Amz-Target} header.
+ */
+public final class CborProtocolTraits implements ProtocolTraits {
+
+    @Override
+    public Protocol protocol() {
+        return Protocol.CBOR;
+    }
+
+    @Override
+    public String serdeNamespace() {
+        return Protocol.CBOR.getSerdeNamespace();
+    }
+
+    @Override
+    public boolean widensIntegers() {
+        return true;
+    }
+
+    @Override
+    public void writeShapeForwardDeclarations(CppWriter writer) {
+        writer.writeNamespaceOpen("Utils");
+        writer.writeNamespaceOpen("Cbor");
+        writer.write("class CborValue;");
+        writer.writeNamespaceClose("Cbor");
+        writer.writeNamespaceClose("Utils");
+    }
+
+    @Override
+    public void writeResultForwardDeclarations(CppWriter writer) {
+        writer.writeNamespaceOpen("Utils");
+        writer.writeNamespaceOpen("Cbor");
+        writer.write("class CborValue;");
+        writer.writeNamespaceClose("Cbor");
+        writer.writeNamespaceClose("Utils");
+    }
+
+    @Override
+    public void writeSerdeMethodDecls(CppWriter writer, String exportMacro, String className,
+                                      Runnable beforeSerializeMethod) {
+        // CBOR sub-objects deserialize from a streaming CborDecoder and serialize via CborEncode
+        // (CborSubObjectHeader.vm), NOT the JSON-family CborValue/Jsonize shape.
+        writer.write("$L $L() = default;", exportMacro, className);
+        writer.write("$L $L(const std::shared_ptr<Aws::Crt::Cbor::CborDecoder>& decoder);", exportMacro, className);
+        writer.write("$L $L& operator=(const std::shared_ptr<Aws::Crt::Cbor::CborDecoder>& decoder);",
+            exportMacro, className);
+        if (beforeSerializeMethod != null) {
+            beforeSerializeMethod.run();
+        }
+        writer.write("$L void CborEncode(Aws::Crt::Cbor::CborEncoder& encoder) const;", exportMacro);
+    }
+
+    @Override
+    public void writeResultSerdeDecls(CppWriter writer, String exportMacro, String className) {
+        writer.write("$L $L(const Aws::AmazonWebServiceResult<Aws::Utils::Cbor::CborValue>& result);",
+            exportMacro, className);
+        writer.write("$L $L& operator=(const Aws::AmazonWebServiceResult<Aws::Utils::Cbor::CborValue>& result);",
+            exportMacro, className);
+    }
+
+    @Override
+    public List<String> serdeIncludes(FileKind kind) {
+        switch (kind) {
+            // CborSubObjectHeader.vm / CborResultHeader.vm hard-include <aws/crt/cbor/Cbor.h>: the
+            // header signatures reference Aws::Crt::Cbor::CborDecoder / CborEncoder directly.
+            case SUBOBJECT_HEADER:
+            case RESULT_HEADER:
+                return List.of("aws/crt/cbor/Cbor.h");
+            // All source kinds share one union (supersets allowed). Usings are unchanged.
+            case SUBOBJECT_SOURCE:
+            case REQUEST_SOURCE:
+            case RESULT_SOURCE:
+            case STREAMING_RESULT_SOURCE:
+            case EVENT_HANDLER_SOURCE:
+            case INITIAL_RESPONSE_SOURCE:
+                return List.of(
+                    "aws/crt/cbor/Cbor.h",
+                    "aws/core/utils/cbor/CborValue.h",
+                    "aws/core/utils/UnreferencedParam.h",
+                    "aws/core/utils/memory/stl/AWSStringStream.h",
+                    "aws/core/utils/HashingUtils.h",
+                    "utility");
+            default:
+                throw new UnsupportedOperationException(
+                    "No serde includes defined for FileKind " + kind + " in CborProtocolTraits");
+        }
+    }
+
+    @Override
+    public List<String> serdeUsings(FileKind kind) {
+        switch (kind) {
+            case EVENT_HANDLER_SOURCE:
+                return List.of(serdeNamespace());
+            case RESULT_SOURCE:
+            case INITIAL_RESPONSE_SOURCE:
+                // CborResultSource.vm pulls the full set (result payloads use the CborValue DOM).
+                return List.of("Aws::Crt", "Aws::Crt::Cbor", "Aws::Utils", "Aws::Utils::Cbor");
+            case REQUEST_SOURCE:
+            case SUBOBJECT_SOURCE:
+                // CborRequestSource.vm / CborSubObjectSource.vm: streaming encode/decode only —
+                // just Aws::Crt::Cbor + Aws::Utils, no Aws::Crt / Aws::Utils::Cbor.
+                return List.of("Aws::Crt::Cbor", "Aws::Utils");
+            default:
+                throw new UnsupportedOperationException(
+                    "No serde usings defined for FileKind " + kind + " in CborProtocolTraits");
+        }
+    }
+
+    @Override
+    public void writeSerdeMethodImpls(CppWriter writer, String className) {
+        writer.write("$L::$L(const std::shared_ptr<Aws::Crt::Cbor::CborDecoder>& decoder) { *this = decoder; }",
+            className, className);
+        writer.write("");
+        writer.openBlock("$L& $L::operator=(const std::shared_ptr<Aws::Crt::Cbor::CborDecoder>& decoder) {", "}",
+            className, className, () -> {
+            writer.write("AWS_UNREFERENCED_PARAM(decoder);");
+            writer.write("return *this;");
+        });
+        writer.write("");
+        writer.openBlock("void $L::CborEncode(Aws::Crt::Cbor::CborEncoder& encoder) const {", "}", className, () -> {
+            writer.write("size_t mapSize = 0;");
+            writer.write("encoder.WriteMapStart(mapSize);");
+        });
+    }
+
+    @Override
+    public void writeResultSerdeImpls(CppWriter writer, String className, StructureShape shape, Model model,
+                                      String namespace) {
+        writer.openBlock("$L::$L(const Aws::AmazonWebServiceResult<Aws::Utils::Cbor::CborValue>& result) {", "}",
+            className, className, () -> writer.write("*this = result;"));
+        writer.write("");
+        writer.openBlock("$L& $L::operator=(const Aws::AmazonWebServiceResult<Aws::Utils::Cbor::CborValue>& result) {",
+            "}", className, className, () -> {
+            writeResultStatusCodeMembers(writer, shape, model);
+            writer.write("return *this;");
+        });
+    }
+
+    @Override
+    public void writeRequestMethodDecls(CppWriter writer, String exportMacro,
+                                        StructureShape shape, OperationShape operation, Model model) {
+        if (RequestBindings.emitsSerializePayload(operation, model)) {
+            writer.write("$L Aws::String SerializePayload() const override;", exportMacro);
+        }
+        // CBOR always emits GetRequestSpecificHeaders: it attaches protocol headers
+        // (content-type / smithy-protocol / accept) regardless of member bindings.
+        writer.write("");
+        writeGetRequestSpecificHeadersDecl(writer, exportMacro);
+        if (RequestBindings.hasQueryStringMembers(shape, model)) {
+            writer.write("");
+            writeAddQueryStringParametersDecl(writer, exportMacro);
+        }
+    }
+
+    @Override
+    public void writeRequestMethodImpls(CppWriter writer, String className,
+                                        StructureShape shape, OperationShape operation,
+                                        ServiceShape service, Model model) {
+        boolean hasRequest = !operation.getInputShape().equals(UnitTypeTrait.UNIT);
+        if (RequestBindings.emitsSerializePayload(operation, model)) {
+            if (hasRequest) {
+                writer.openBlock("Aws::String $L::SerializePayload() const {", "}", className, () -> {
+                    writer.write("Aws::Crt::Cbor::CborEncoder encoder;");
+                    writer.write("");
+                    writer.write("// Calculate map size");
+                    writer.write("size_t mapSize = 0;");
+                    writer.write("");
+                    writer.write("encoder.WriteMapStart(mapSize);");
+                    writer.write("");
+                    writer.write("const auto str = Aws::String(reinterpret_cast<char*>("
+                        + "encoder.GetEncodedData().ptr), encoder.GetEncodedData().len);");
+                    writer.write("return str;");
+                });
+            } else {
+                writer.write("Aws::String $L::SerializePayload() const { return {}; }", className);
+            }
+            writer.write("");
+        }
+        writer.openBlock("Aws::Http::HeaderValueCollection $L::GetRequestSpecificHeaders() const {", "}",
+            className, () -> {
+            writer.write("Aws::Http::HeaderValueCollection headers;");
+            if (hasRequest) {
+                writer.write("headers.emplace(Aws::Http::CONTENT_TYPE_HEADER, Aws::CBOR_CONTENT_TYPE);");
+            }
+            writer.write("headers.emplace(Aws::Http::SMITHY_PROTOCOL_HEADER, Aws::RPC_V2_CBOR);");
+            writer.write("headers.emplace(Aws::Http::ACCEPT_HEADER, Aws::CBOR_CONTENT_TYPE);");
+            writer.write("return headers;");
+        });
+        if (RequestBindings.hasQueryStringMembers(shape, model)) {
+            writer.write("");
+            writeAddQueryStringParametersImpl(writer, className);
+        }
+    }
+
+    @Override
+    public void writeStructureEventPayload(CppWriter writer, String msgVar, String valueExpr) {
+        // CBOR encodes structure/list event payloads via CborEncode, tagged application/cbor.
+        writer.write("$L.InsertEventHeader(\":content-type\", Aws::String(\"application/cbor\"));", msgVar);
+        writer.write("Aws::Crt::Cbor::CborEncoder encoder;");
+        writer.write("$L.CborEncode(encoder);", valueExpr);
+        writer.write("$L.WriteEventPayload(encoder.GetEncodedData().ptr, encoder.GetEncodedData().len);", msgVar);
+    }
+}
diff --git a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/protocol/FileKind.java b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/protocol/FileKind.java
new file mode 100644
index 000000000000..cf948248e777
--- /dev/null
+++ b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/protocol/FileKind.java
@@ -0,0 +1,28 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+package com.amazonaws.util.awsclientsmithygenerator.generators.model.protocol;
+
+/**
+ * The kind of generated C++ file whose serde includes / usings are being computed.
+ * Protocols return different include and using sets per kind (see {@link ProtocolTraits}).
+ */
+public enum FileKind {
+    /** Sub-object / structure header (.h). */
+    SUBOBJECT_HEADER,
+    /** Operation-output result header (.h). */
+    RESULT_HEADER,
+    /** Sub-object / structure source (.cpp). */
+    SUBOBJECT_SOURCE,
+    /** Operation-input request source (.cpp). */
+    REQUEST_SOURCE,
+    /** Operation-output result source (.cpp), non-streaming. */
+    RESULT_SOURCE,
+    /** Streaming (raw httpPayload) result source (.cpp) — takes ownership of a ResponseStream. */
+    STREAMING_RESULT_SOURCE,
+    /** Event-stream handler source (.cpp). */
+    EVENT_HANDLER_SOURCE,
+    /** Event-stream InitialResponse source (.cpp). */
+    INITIAL_RESPONSE_SOURCE
+}
diff --git a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/protocol/JsonProtocolTraits.java b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/protocol/JsonProtocolTraits.java
index 5d2bb4ad8289..9996841ba713 100644
--- a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/protocol/JsonProtocolTraits.java
+++ b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/protocol/JsonProtocolTraits.java
@@ -6,20 +6,27 @@
 
 import com.amazonaws.util.awsclientsmithygenerator.generators.CppWriter;
 import com.amazonaws.util.awsclientsmithygenerator.generators.model.ProtocolResolver.Protocol;
+import software.amazon.smithy.model.Model;
+import software.amazon.smithy.model.shapes.OperationShape;
+import software.amazon.smithy.model.shapes.ServiceShape;
+import software.amazon.smithy.model.shapes.StructureShape;
+
+import java.util.List;
 
 /**
- * JSON-flavored serde rendering. Serves both {@link Protocol#JSON} and
- * {@link Protocol#CBOR}, which share an identical C++ surface today (CBOR reuses the
- * JSON model types and differs only on the wire).
+ * JSON-flavored serde rendering. Serves {@link Protocol#JSON} (awsJson-RPC) and
+ * {@link Protocol#REST_JSON} (rest-json), which share an identical C++ serde surface and
+ * differ only on whether they attach an {@code X-Amz-Target} header. CBOR has its own
+ * {@link CborProtocolTraits}.
  */
 public final class JsonProtocolTraits implements ProtocolTraits {
 
     private final Protocol protocol;
 
     public JsonProtocolTraits(Protocol protocol) {
-        if (protocol != Protocol.JSON && protocol != Protocol.CBOR) {
+        if (protocol != Protocol.JSON && protocol != Protocol.REST_JSON) {
             throw new IllegalArgumentException(
-                "JsonProtocolTraits only serves JSON and CBOR, got: " + protocol);
+                "JsonProtocolTraits only serves JSON and REST_JSON, got: " + protocol);
         }
         this.protocol = protocol;
     }
@@ -75,14 +82,46 @@ public void writeResultSerdeDecls(CppWriter writer, String exportMacro, String c
     }
 
     @Override
-    public void writeSerdeInclude(CppWriter writer) {
-        writer.write("#include <aws/core/utils/json/JsonSerializer.h>");
+    public List<String> serdeIncludes(FileKind kind) {
+        switch (kind) {
+            // Headers forward-declare JsonValue/JsonView; no serializer include.
+            case SUBOBJECT_HEADER:
+            case RESULT_HEADER:
+                return List.of();
+            // All source kinds share one union (supersets allowed: a .cpp may carry an
+            // include it doesn't strictly use). Usings are unchanged; only #includes widen.
+            case SUBOBJECT_SOURCE:
+            case REQUEST_SOURCE:
+            case RESULT_SOURCE:
+            case STREAMING_RESULT_SOURCE:
+            case EVENT_HANDLER_SOURCE:
+            case INITIAL_RESPONSE_SOURCE:
+                return List.of(
+                    "aws/core/utils/json/JsonSerializer.h",
+                    "aws/core/utils/UnreferencedParam.h",
+                    "aws/core/utils/memory/stl/AWSStringStream.h",
+                    "aws/core/utils/HashingUtils.h",
+                    "utility");
+            default:
+                throw new UnsupportedOperationException(
+                    "No serde includes defined for FileKind " + kind + " in JsonProtocolTraits");
+        }
     }
 
     @Override
-    public void writeSerdeUsingDeclarations(CppWriter writer) {
-        writer.write("using namespace Aws::Utils::Json;");
-        writer.write("using namespace Aws::Utils;");
+    public List<String> serdeUsings(FileKind kind) {
+        switch (kind) {
+            case EVENT_HANDLER_SOURCE:
+                return List.of(serdeNamespace());
+            case RESULT_SOURCE:
+            case INITIAL_RESPONSE_SOURCE:
+            case REQUEST_SOURCE:
+            case SUBOBJECT_SOURCE:
+                return List.of("Aws::Utils::Json", "Aws::Utils");
+            default:
+                throw new UnsupportedOperationException(
+                    "No serde usings defined for FileKind " + kind + " in JsonProtocolTraits");
+        }
     }
 
     @Override
@@ -100,11 +139,57 @@ public void writeSerdeMethodImpls(CppWriter writer, String className) {
     }
 
     @Override
-    public void writeResultSerdeImpls(CppWriter writer, String className) {
+    public void writeResultSerdeImpls(CppWriter writer, String className, StructureShape shape, Model model,
+                                      String namespace) {
         writer.openBlock("$L::$L(const Aws::AmazonWebServiceResult<JsonValue>& result) {", "}",
             className, className, () -> writer.write("*this = result;"));
         writer.write("");
         writer.openBlock("$L& $L::operator=(const Aws::AmazonWebServiceResult<JsonValue>& result) {", "}",
-            className, className, () -> writer.write("return *this;"));
+            className, className, () -> {
+            writeResultStatusCodeMembers(writer, shape, model);
+            writer.write("return *this;");
+        });
+    }
+
+    @Override
+    public boolean hasTargetHeader() {
+        // awsJson1_0 / awsJson1_1 send X-Amz-Target; rest-json and CBOR do not.
+        return protocol == Protocol.JSON;
+    }
+
+    @Override
+    public void writeRequestMethodDecls(CppWriter writer, String exportMacro,
+                                        StructureShape shape, OperationShape operation, Model model) {
+        // A raw-streaming-payload request sends its body via the streaming base class, so no
+        // SerializePayload is emitted (matches C2J).
+        if (RequestBindings.emitsSerializePayload(operation, model)) {
+            writer.write("$L Aws::String SerializePayload() const override;", exportMacro);
+        }
+        if (hasTargetHeader() || RequestBindings.hasHeaderMembers(shape, model)) {
+            writer.write("");
+            writeGetRequestSpecificHeadersDecl(writer, exportMacro);
+        }
+        if (RequestBindings.hasQueryStringMembers(shape, model)) {
+            writer.write("");
+            writeAddQueryStringParametersDecl(writer, exportMacro);
+        }
+    }
+
+    @Override
+    public void writeRequestMethodImpls(CppWriter writer, String className,
+                                        StructureShape shape, OperationShape operation,
+                                        ServiceShape service, Model model) {
+        if (RequestBindings.emitsSerializePayload(operation, model)) {
+            String payloadBody = protocol == Protocol.JSON ? "\"{}\"" : "{}";
+            writer.write("Aws::String $L::SerializePayload() const { return $L; }", className, payloadBody);
+        }
+        if (hasTargetHeader() || RequestBindings.hasHeaderMembers(shape, model)) {
+            writer.write("");
+            writeGetRequestSpecificHeadersImpl(writer, className, shape, operation, service, model);
+        }
+        if (RequestBindings.hasQueryStringMembers(shape, model)) {
+            writer.write("");
+            writeAddQueryStringParametersImpl(writer, className);
+        }
     }
 }
diff --git a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/protocol/ProtocolTraits.java b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/protocol/ProtocolTraits.java
index bd9fda2bac43..d7002148dc06 100644
--- a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/protocol/ProtocolTraits.java
+++ b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/protocol/ProtocolTraits.java
@@ -5,7 +5,15 @@
 package com.amazonaws.util.awsclientsmithygenerator.generators.model.protocol;
 
 import com.amazonaws.util.awsclientsmithygenerator.generators.CppWriter;
+import com.amazonaws.util.awsclientsmithygenerator.generators.model.CppNames;
 import com.amazonaws.util.awsclientsmithygenerator.generators.model.ProtocolResolver.Protocol;
+import software.amazon.smithy.model.Model;
+import software.amazon.smithy.model.shapes.MemberShape;
+import software.amazon.smithy.model.shapes.OperationShape;
+import software.amazon.smithy.model.shapes.ServiceShape;
+import software.amazon.smithy.model.shapes.StructureShape;
+
+import java.util.List;
 
 /**
  * Owns every protocol-specific rendering decision for generated model code.
@@ -26,6 +34,16 @@ public interface ProtocolTraits {
     /** C++ namespace holding the serde utilities, e.g. {@code Aws::Utils::Json}. */
     String serdeNamespace();
 
+    // ------------------------------------------------------------------
+    // Include / using SETS (data-driven; preferred over the write-hooks below)
+    // ------------------------------------------------------------------
+
+    /** Protocol-specific serde {@code #include} paths (no angle brackets) for the given file kind. */
+    List<String> serdeIncludes(FileKind kind);
+
+    /** {@code using namespace} targets for the given file kind. */
+    List<String> serdeUsings(FileKind kind);
+
     // ------------------------------------------------------------------
     // Header side
     // ------------------------------------------------------------------
@@ -64,20 +82,121 @@ void writeSerdeMethodDecls(CppWriter writer, String exportMacro, String classNam
     // Source side
     // ------------------------------------------------------------------
 
-    /** Emits the {@code #include} for this protocol's serializer header. */
-    void writeSerdeInclude(CppWriter writer);
-
-    /** Emits the {@code using namespace} declarations this protocol's serde bodies need. */
-    void writeSerdeUsingDeclarations(CppWriter writer);
-
     /**
      * Emits the serde method bodies matching {@link #writeSerdeMethodDecls}.
      * Bodies are currently empty stubs pending schema-based serde.
      */
     void writeSerdeMethodImpls(CppWriter writer, String className);
 
-    /** Emits the result ctor / {@code operator=} bodies matching {@link #writeResultSerdeDecls}. */
-    void writeResultSerdeImpls(CppWriter writer, String className);
+    /**
+     * Emits the result ctor / {@code operator=} bodies matching {@link #writeResultSerdeDecls}.
+     *
+     * @param namespace the C++ model namespace (e.g. {@code "IAM"}), used for fully-qualified
+     *                  log tags in protocols that log during deserialization
+     */
+    void writeResultSerdeImpls(CppWriter writer, String className, StructureShape shape, Model model,
+                               String namespace);
+
+    /**
+     * Emits the trailing status-code assignment block for every result member carrying the
+     * {@code @httpResponseCode} trait: {@code m_x = static_cast<int>(result.GetResponseCode());}
+     * plus its has-been-set flag. Called from inside each protocol's result {@code operator=}
+     * body, immediately before {@code return *this;}, matching the legacy C2J ordering.
+     */
+    default void writeResultStatusCodeMembers(CppWriter writer, StructureShape shape, Model model) {
+        for (java.util.Map.Entry<String, MemberShape> entry : shape.getAllMembers().entrySet()) {
+            if (entry.getValue().hasTrait(software.amazon.smithy.model.traits.HttpResponseCodeTrait.class)) {
+                String name = entry.getKey();
+                String field = CppNames.fieldName(name);
+                writer.write("$L = static_cast<int>(result.GetResponseCode());", field);
+                writer.write("$LHasBeenSet = true;", field);
+            }
+        }
+    }
+
+    // ------------------------------------------------------------------
+    // Request (operation input) contract
+    // ------------------------------------------------------------------
+
+    /**
+     * Emits the request-specific serialization method <em>declarations</em> for an
+     * operation-input class, matching the legacy C2J contract for this protocol family:
+     * <ul>
+     *   <li>JSON / REST-JSON: {@code SerializePayload()} plus {@code GetRequestSpecificHeaders()}</li>
+     *   <li>REST-XML: {@code SerializePayload()} only</li>
+     *   <li>Query / EC2: {@code SerializePayload()} plus {@code DumpBodyToUrl(Aws::Http::URI&)}</li>
+     * </ul>
+     * The caller has already emitted {@code GetServiceRequestName} and any event-stream
+     * accessors; this fills in the wire-format contract.
+     */
+    void writeRequestMethodDecls(CppWriter writer, String exportMacro,
+                                 StructureShape shape, OperationShape operation, Model model);
+
+    /**
+     * Emits the request-specific serialization method <em>bodies</em> matching
+     * {@link #writeRequestMethodDecls}. Payload bodies are currently empty stubs pending
+     * schema-based serde; {@code DumpBodyToUrl} / {@code GetRequestSpecificHeaders} carry
+     * their fixed C2J implementations.
+     */
+    void writeRequestMethodImpls(CppWriter writer, String className,
+                                 StructureShape shape, OperationShape operation,
+                                 ServiceShape service, Model model);
+
+    /** True when this protocol always attaches an {@code X-Amz-Target} header (AWS JSON-RPC). */
+    default boolean hasTargetHeader() {
+        return false;
+    }
+
+    /**
+     * Whether {@code integer} members widen to {@code int64_t} (rather than {@code int}) in this
+     * protocol's sub-object and result headers. C2J does this only for CBOR
+     * ({@code CORAL_TYPE_TO_CBOR_CPP_TYPE_MAPPING}: {@code integer -> int64_t}, applied where the
+     * template sets {@code $protocol == "smithy-rpc-v2-cbor"}). Request headers use the shared
+     * {@code RequestHeader.vm}, which does not widen, so this never affects request members.
+     */
+    default boolean widensIntegers() {
+        return false;
+    }
+
+    /**
+     * Whether result classes for this protocol expose a top-level {@code GetRequestId()} /
+     * {@code m_requestId} accessor. C2J emits it for every protocol <em>except</em> Query/EC2,
+     * whose results instead carry the request id inside the injected {@code ResponseMetadata}
+     * member. Query/EC2 override this to {@code false}.
+     */
+    default boolean resultHasTopLevelRequestId() {
+        return true;
+    }
+
+    default void writeGetRequestSpecificHeadersDecl(CppWriter writer, String exportMacro) {
+        writer.write("$L Aws::Http::HeaderValueCollection GetRequestSpecificHeaders() const override;", exportMacro);
+    }
+
+    default void writeAddQueryStringParametersDecl(CppWriter writer, String exportMacro) {
+        writer.write("$L void AddQueryStringParameters(Aws::Http::URI& uri) const override;", exportMacro);
+    }
+
+    default void writeGetRequestSpecificHeadersImpl(CppWriter writer, String className,
+                                                    StructureShape shape, OperationShape operation,
+                                                    ServiceShape service, Model model) {
+        writer.openBlock("Aws::Http::HeaderValueCollection $L::GetRequestSpecificHeaders() const {", "}",
+            className, () -> {
+            writer.write("Aws::Http::HeaderValueCollection headers;");
+            if (hasTargetHeader()) {
+                writer.write("headers.insert(Aws::Http::HeaderValuePair(\"X-Amz-Target\", \"$L.$L\"));",
+                    service.getId().getName(), operation.getId().getName());
+            }
+            writer.write("return headers;");
+        });
+    }
+
+    default void writeAddQueryStringParametersImpl(CppWriter writer, String className) {
+        writer.openBlock("void $L::AddQueryStringParameters(Aws::Http::URI& uri) const {", "}",
+            className, () -> {
+            writer.write("AWS_UNREFERENCED_PARAM(uri);");
+            writer.write("// TODO: serialize httpQuery/httpQueryParams members");
+        });
+    }
 
     // ------------------------------------------------------------------
     // Protocol-agnostic today; kept here so callers have one place to look.
@@ -100,4 +219,17 @@ default void writeEventPayloadDecode(CppWriter writer, String eventShapeName,
     default void writeErrorPayloadParse(CppWriter writer) {
         writer.write("// TODO: protocol-specific error payload deserialization");
     }
+
+    /**
+     * Emits the {@code :content-type} header and {@code WriteEventPayload(...)} call for an
+     * outgoing event whose payload is a structure or list — the only protocol-specific arm of
+     * event-stream encoding (blob and string payloads write the same way for every protocol).
+     * Default is JSON ({@code application/json} + {@code Jsonize().View().WriteCompact()});
+     * CBOR overrides. {@code msgVar} is the {@code Aws::Utils::Event::Message} local and
+     * {@code valueExpr} is the C++ expression that yields the event value to serialize.
+     */
+    default void writeStructureEventPayload(CppWriter writer, String msgVar, String valueExpr) {
+        writer.write("$L.InsertEventHeader(\":content-type\", Aws::String(\"application/json\"));", msgVar);
+        writer.write("$L.WriteEventPayload($L.Jsonize().View().WriteCompact());", msgVar, valueExpr);
+    }
 }
diff --git a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/protocol/QueryXmlProtocolTraits.java b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/protocol/QueryXmlProtocolTraits.java
index 26de9170478b..b4409b578cac 100644
--- a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/protocol/QueryXmlProtocolTraits.java
+++ b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/protocol/QueryXmlProtocolTraits.java
@@ -6,6 +6,12 @@
 
 import com.amazonaws.util.awsclientsmithygenerator.generators.CppWriter;
 import com.amazonaws.util.awsclientsmithygenerator.generators.model.ProtocolResolver.Protocol;
+import software.amazon.smithy.model.Model;
+import software.amazon.smithy.model.shapes.OperationShape;
+import software.amazon.smithy.model.shapes.ServiceShape;
+import software.amazon.smithy.model.shapes.StructureShape;
+
+import java.util.List;
 
 /**
  * Query-XML serde rendering. Serves both {@link Protocol#QUERY_XML} and
@@ -34,6 +40,13 @@ public String serdeNamespace() {
         return protocol.getSerdeNamespace();
     }
 
+    @Override
+    public boolean resultHasTopLevelRequestId() {
+        // Query/EC2 results carry the request id inside the injected ResponseMetadata member,
+        // so there is no top-level GetRequestId / m_requestId.
+        return false;
+    }
+
     @Override
     public void writeShapeForwardDeclarations(CppWriter writer) {
         writer.writeNamespaceOpen("Utils");
@@ -75,14 +88,51 @@ public void writeResultSerdeDecls(CppWriter writer, String exportMacro, String c
     }
 
     @Override
-    public void writeSerdeInclude(CppWriter writer) {
-        writer.write("#include <aws/core/utils/xml/XmlSerializer.h>");
+    public List<String> serdeIncludes(FileKind kind) {
+        switch (kind) {
+            case SUBOBJECT_HEADER:
+                return List.of("aws/core/utils/memory/stl/AWSStreamFwd.h");
+            case RESULT_HEADER:
+                // Query/EC2 result headers forward-declare XmlDocument; no serde include.
+                return List.of();
+            case SUBOBJECT_SOURCE:
+            case REQUEST_SOURCE:
+            case RESULT_SOURCE:
+            case STREAMING_RESULT_SOURCE:
+            case EVENT_HANDLER_SOURCE:
+            case INITIAL_RESPONSE_SOURCE:
+                // All source kinds share one union (supersets allowed). Usings are unchanged.
+                // No Query source arm carried <utility>, so the union omits it.
+                return List.of(
+                    "aws/core/utils/xml/XmlSerializer.h",
+                    "aws/core/utils/logging/LogMacros.h",
+                    "aws/core/utils/UnreferencedParam.h",
+                    "aws/core/utils/StringUtils.h",
+                    "aws/core/utils/memory/stl/AWSStringStream.h",
+                    "aws/core/utils/HashingUtils.h");
+            default:
+                throw new UnsupportedOperationException(
+                    "No serde includes defined for FileKind " + kind + " in QueryXmlProtocolTraits");
+        }
     }
 
     @Override
-    public void writeSerdeUsingDeclarations(CppWriter writer) {
-        writer.write("using namespace Aws::Utils::Xml;");
-        writer.write("using namespace Aws::Utils;");
+    public List<String> serdeUsings(FileKind kind) {
+        switch (kind) {
+            case RESULT_SOURCE:
+                return List.of("Aws::Utils::Xml", "Aws::Utils::Logging", "Aws::Utils");
+            case INITIAL_RESPONSE_SOURCE:
+                return List.of("Aws::Utils::Xml", "Aws::Utils");
+            case REQUEST_SOURCE:
+                return List.of("Aws::Utils");
+            case EVENT_HANDLER_SOURCE:
+                return List.of(serdeNamespace());
+            case SUBOBJECT_SOURCE:
+                return List.of("Aws::Utils::Xml", "Aws::Utils");
+            default:
+                throw new UnsupportedOperationException(
+                    "No serde usings defined for FileKind " + kind + " in QueryXmlProtocolTraits");
+        }
     }
 
     @Override
@@ -103,11 +153,87 @@ public void writeSerdeMethodImpls(CppWriter writer, String className) {
     }
 
     @Override
-    public void writeResultSerdeImpls(CppWriter writer, String className) {
+    public void writeResultSerdeImpls(CppWriter writer, String className, StructureShape shape, Model model,
+                                      String namespace) {
         writer.openBlock("$L::$L(const Aws::AmazonWebServiceResult<XmlDocument>& result) {", "}",
             className, className, () -> writer.write("*this = result;"));
         writer.write("");
         writer.openBlock("$L& $L::operator=(const Aws::AmazonWebServiceResult<XmlDocument>& result) {", "}",
-            className, className, () -> writer.write("return *this;"));
+            className, className, () -> {
+            writer.write("m_HttpResponseCode = result.GetResponseCode();");
+            writer.write("const XmlDocument& xmlDocument = result.GetPayload();");
+            writer.write("XmlNode rootNode = xmlDocument.GetRootElement();");
+            writer.write("// TODO: protocol-specific body member deserialization");
+            // Query extracts <ResponseMetadata>; EC2 extracts a top-level <requestId>. Both
+            // populate m_responseMetadata; rest-xml/json/cbor do neither.
+            if (protocol == Protocol.EC2) {
+                writer.openBlock("if (!rootNode.IsNull()) {", "}", () -> {
+                    writer.write("XmlNode requestIdNode = rootNode.FirstChild(\"requestId\");");
+                    writer.openBlock("if (!requestIdNode.IsNull()) {", "}", () -> {
+                        writer.write("m_responseMetadata.SetRequestId(StringUtils::Trim(requestIdNode.GetText().c_str()));");
+                        writer.write("m_responseMetadataHasBeenSet = true;");
+                    });
+                });
+            } else {
+                writer.openBlock("if (!rootNode.IsNull()) {", "}", () -> {
+                    writer.write("XmlNode responseMetadataNode = rootNode.FirstChild(\"ResponseMetadata\");");
+                    writer.write("m_responseMetadata = responseMetadataNode;");
+                    writer.write("m_responseMetadataHasBeenSet = true;");
+                    writer.write("AWS_LOGSTREAM_DEBUG(\"Aws::$L::Model::$L\", "
+                        + "\"x-amzn-request-id: \" << m_responseMetadata.GetRequestId());",
+                        namespace, className);
+                });
+            }
+            writeResultStatusCodeMembers(writer, shape, model);
+            writer.write("return *this;");
+        });
+    }
+
+    @Override
+    public void writeRequestMethodDecls(CppWriter writer, String exportMacro,
+                                        StructureShape shape, OperationShape operation, Model model) {
+        if (RequestBindings.emitsSerializePayload(operation, model)) {
+            writer.write("$L Aws::String SerializePayload() const override;", exportMacro);
+        }
+        if (RequestBindings.hasHeaderMembers(shape, model)) {
+            writer.write("");
+            writeGetRequestSpecificHeadersDecl(writer, exportMacro);
+        }
+        if (RequestBindings.hasQueryStringMembers(shape, model)) {
+            writer.write("");
+            writeAddQueryStringParametersDecl(writer, exportMacro);
+        }
+        writer.write("");
+        // DumpBodyToUrl is a protected virtual in AmazonWebServiceRequest, so the override
+        // is bracketed under protected: and the section restored to public: afterwards,
+        // matching the legacy C2J layout.
+        writer.dedent();
+        writer.write("protected:");
+        writer.indent();
+        writer.write("$L void DumpBodyToUrl(Aws::Http::URI& uri) const override;", exportMacro);
+        writer.dedent();
+        writer.write("");
+        writer.write("public:");
+        writer.indent();
+    }
+
+    @Override
+    public void writeRequestMethodImpls(CppWriter writer, String className,
+                                        StructureShape shape, OperationShape operation,
+                                        ServiceShape service, Model model) {
+        if (RequestBindings.emitsSerializePayload(operation, model)) {
+            writer.write("Aws::String $L::SerializePayload() const { return {}; }", className);
+        }
+        if (RequestBindings.hasHeaderMembers(shape, model)) {
+            writer.write("");
+            writeGetRequestSpecificHeadersImpl(writer, className, shape, operation, service, model);
+        }
+        if (RequestBindings.hasQueryStringMembers(shape, model)) {
+            writer.write("");
+            writeAddQueryStringParametersImpl(writer, className);
+        }
+        writer.write("");
+        writer.write("void $L::DumpBodyToUrl(Aws::Http::URI& uri) const { uri.SetQueryString(SerializePayload()); }",
+            className);
     }
 }
diff --git a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/protocol/RequestBindings.java b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/protocol/RequestBindings.java
new file mode 100644
index 000000000000..fec62335a279
--- /dev/null
+++ b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/protocol/RequestBindings.java
@@ -0,0 +1,54 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+package com.amazonaws.util.awsclientsmithygenerator.generators.model.protocol;
+
+import com.amazonaws.util.awsclientsmithygenerator.generators.model.ShapeClassifier;
+import software.amazon.smithy.model.Model;
+import software.amazon.smithy.model.shapes.MemberShape;
+import software.amazon.smithy.model.shapes.OperationShape;
+import software.amazon.smithy.model.shapes.StructureShape;
+import software.amazon.smithy.model.traits.HttpHeaderTrait;
+import software.amazon.smithy.model.traits.HttpPrefixHeadersTrait;
+import software.amazon.smithy.model.traits.HttpQueryParamsTrait;
+import software.amazon.smithy.model.traits.HttpQueryTrait;
+
+/**
+ * Protocol-agnostic queries over a request (operation input) structure's HTTP bindings.
+ * These do not vary by wire protocol, so they live here rather than on {@link ProtocolTraits}.
+ */
+final class RequestBindings {
+
+    private RequestBindings() {}
+
+    /** True when any request member binds to an HTTP header (httpHeader / httpPrefixHeaders). */
+    static boolean hasHeaderMembers(StructureShape shape, Model model) {
+        for (MemberShape m : shape.getAllMembers().values()) {
+            if (m.hasTrait(HttpHeaderTrait.class) || m.hasTrait(HttpPrefixHeadersTrait.class)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /** True when any request member binds to the query string (httpQuery / httpQueryParams). */
+    static boolean hasQueryStringMembers(StructureShape shape, Model model) {
+        for (MemberShape m : shape.getAllMembers().values()) {
+            if (m.hasTrait(HttpQueryTrait.class) || m.hasTrait(HttpQueryParamsTrait.class)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * True when the request emits a declared {@code SerializePayload()} through the normal path.
+     * C2J omits it for a raw streaming {@code @httpPayload} member and for an event-stream input
+     * member. The gate is protocol-agnostic.
+     */
+    static boolean emitsSerializePayload(OperationShape operation, Model model) {
+        return !ShapeClassifier.isRawStreamingPayloadRequest(operation, model)
+            && !ShapeClassifier.isEventStreamRequestOperation(operation, model);
+    }
+}
diff --git a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/protocol/RestXmlProtocolTraits.java b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/protocol/RestXmlProtocolTraits.java
index 06fc3f7cec82..4eda33f32fde 100644
--- a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/protocol/RestXmlProtocolTraits.java
+++ b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/protocol/RestXmlProtocolTraits.java
@@ -6,6 +6,12 @@
 
 import com.amazonaws.util.awsclientsmithygenerator.generators.CppWriter;
 import com.amazonaws.util.awsclientsmithygenerator.generators.model.ProtocolResolver.Protocol;
+import software.amazon.smithy.model.Model;
+import software.amazon.smithy.model.shapes.OperationShape;
+import software.amazon.smithy.model.shapes.ServiceShape;
+import software.amazon.smithy.model.shapes.StructureShape;
+
+import java.util.List;
 
 /**
  * REST-XML serde rendering. Shapes serialize by attaching themselves to a parent
@@ -62,14 +68,45 @@ public void writeResultSerdeDecls(CppWriter writer, String exportMacro, String c
     }
 
     @Override
-    public void writeSerdeInclude(CppWriter writer) {
-        writer.write("#include <aws/core/utils/xml/XmlSerializer.h>");
+    public List<String> serdeIncludes(FileKind kind) {
+        switch (kind) {
+            // Sub-object and result headers forward-declare XmlNode/XmlDocument; no serializer include.
+            case SUBOBJECT_HEADER:
+            case RESULT_HEADER:
+                return List.of();
+            // All source kinds share one union (supersets allowed). Usings are unchanged.
+            case SUBOBJECT_SOURCE:
+            case REQUEST_SOURCE:
+            case RESULT_SOURCE:
+            case STREAMING_RESULT_SOURCE:
+            case EVENT_HANDLER_SOURCE:
+            case INITIAL_RESPONSE_SOURCE:
+                return List.of(
+                    "aws/core/utils/xml/XmlSerializer.h",
+                    "aws/core/utils/memory/stl/AWSStringStream.h",
+                    "aws/core/utils/UnreferencedParam.h",
+                    "aws/core/utils/HashingUtils.h",
+                    "utility");
+            default:
+                throw new UnsupportedOperationException(
+                    "No serde includes defined for FileKind " + kind + " in RestXmlProtocolTraits");
+        }
     }
 
     @Override
-    public void writeSerdeUsingDeclarations(CppWriter writer) {
-        writer.write("using namespace Aws::Utils::Xml;");
-        writer.write("using namespace Aws::Utils;");
+    public List<String> serdeUsings(FileKind kind) {
+        switch (kind) {
+            case EVENT_HANDLER_SOURCE:
+                return List.of(serdeNamespace());
+            case RESULT_SOURCE:
+            case INITIAL_RESPONSE_SOURCE:
+            case REQUEST_SOURCE:
+            case SUBOBJECT_SOURCE:
+                return List.of("Aws::Utils::Xml", "Aws::Utils");
+            default:
+                throw new UnsupportedOperationException(
+                    "No serde usings defined for FileKind " + kind + " in RestXmlProtocolTraits");
+        }
     }
 
     @Override
@@ -85,11 +122,48 @@ public void writeSerdeMethodImpls(CppWriter writer, String className) {
     }
 
     @Override
-    public void writeResultSerdeImpls(CppWriter writer, String className) {
+    public void writeResultSerdeImpls(CppWriter writer, String className, StructureShape shape, Model model,
+                                      String namespace) {
         writer.openBlock("$L::$L(const Aws::AmazonWebServiceResult<XmlDocument>& result) {", "}",
             className, className, () -> writer.write("*this = result;"));
         writer.write("");
         writer.openBlock("$L& $L::operator=(const Aws::AmazonWebServiceResult<XmlDocument>& result) {", "}",
-            className, className, () -> writer.write("return *this;"));
+            className, className, () -> {
+            writeResultStatusCodeMembers(writer, shape, model);
+            writer.write("return *this;");
+        });
+    }
+
+    @Override
+    public void writeRequestMethodDecls(CppWriter writer, String exportMacro,
+                                        StructureShape shape, OperationShape operation, Model model) {
+        if (RequestBindings.emitsSerializePayload(operation, model)) {
+            writer.write("$L Aws::String SerializePayload() const override;", exportMacro);
+        }
+        if (RequestBindings.hasHeaderMembers(shape, model)) {
+            writer.write("");
+            writeGetRequestSpecificHeadersDecl(writer, exportMacro);
+        }
+        if (RequestBindings.hasQueryStringMembers(shape, model)) {
+            writer.write("");
+            writeAddQueryStringParametersDecl(writer, exportMacro);
+        }
+    }
+
+    @Override
+    public void writeRequestMethodImpls(CppWriter writer, String className,
+                                        StructureShape shape, OperationShape operation,
+                                        ServiceShape service, Model model) {
+        if (RequestBindings.emitsSerializePayload(operation, model)) {
+            writer.write("Aws::String $L::SerializePayload() const { return {}; }", className);
+        }
+        if (RequestBindings.hasHeaderMembers(shape, model)) {
+            writer.write("");
+            writeGetRequestSpecificHeadersImpl(writer, className, shape, operation, service, model);
+        }
+        if (RequestBindings.hasQueryStringMembers(shape, model)) {
+            writer.write("");
+            writeAddQueryStringParametersImpl(writer, className);
+        }
     }
 }
diff --git a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/renderers/EnumShapeRenderer.java b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/renderers/EnumShapeRenderer.java
index 5e187dcce759..830a33d5ae29 100644
--- a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/renderers/EnumShapeRenderer.java
+++ b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/renderers/EnumShapeRenderer.java
@@ -5,7 +5,9 @@
 package com.amazonaws.util.awsclientsmithygenerator.generators.model.renderers;
 
 import com.amazonaws.util.awsclientsmithygenerator.generators.CppWriterDelegator;
+import com.amazonaws.util.awsclientsmithygenerator.generators.model.CppTypeMapper;
 import com.amazonaws.util.awsclientsmithygenerator.generators.model.EnumRenderer;
+import com.amazonaws.util.awsclientsmithygenerator.generators.model.RenderContext;
 import com.amazonaws.util.awsclientsmithygenerator.generators.model.ShapeRenderer;
 import software.amazon.smithy.model.shapes.Shape;
 
@@ -17,29 +19,24 @@
 public final class EnumShapeRenderer implements ShapeRenderer {
 
     private final List<Shape> enumShapes;
-    private final String namespace;
-    private final String exportMacro;
-    private final String smithyServiceName;
+    private final RenderContext ctx;
 
-    public EnumShapeRenderer(List<Shape> enumShapes, String namespace,
-                             String exportMacro, String smithyServiceName) {
+    public EnumShapeRenderer(List<Shape> enumShapes, RenderContext ctx) {
         this.enumShapes = enumShapes;
-        this.namespace = namespace;
-        this.exportMacro = exportMacro;
-        this.smithyServiceName = smithyServiceName;
+        this.ctx = ctx;
     }
 
     @Override
     public void render(CppWriterDelegator writerDelegator) {
         for (Shape enumShape : enumShapes) {
-            String name = enumShape.getId().getName();
-            String headerFile = "include/aws/" + smithyServiceName + "/model/" + name + ".h";
+            String name = CppTypeMapper.cppShapeName(enumShape);
+            String headerFile = "include/aws/" + ctx.smithyServiceName() + "/model/" + name + ".h";
             writerDelegator.useFileWriter(headerFile, writer ->
-                EnumRenderer.renderHeader(writer, enumShape, namespace, exportMacro, smithyServiceName));
+                EnumRenderer.renderHeader(writer, enumShape, ctx.namespace(), ctx.exportMacro(), ctx.smithyServiceName()));
 
             String sourceFile = "source/model/" + name + ".cpp";
             writerDelegator.useFileWriter(sourceFile, writer ->
-                EnumRenderer.renderSource(writer, enumShape, namespace, exportMacro, smithyServiceName));
+                EnumRenderer.renderSource(writer, enumShape, ctx.namespace(), ctx.exportMacro(), ctx.smithyServiceName()));
         }
     }
 }
diff --git a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/renderers/EventStreamRenderer.java b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/renderers/EventStreamRenderer.java
index da3836bd54b3..f256588f006c 100644
--- a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/renderers/EventStreamRenderer.java
+++ b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/renderers/EventStreamRenderer.java
@@ -6,14 +6,16 @@
 
 import com.amazonaws.util.awsclientsmithygenerator.generators.CppWriter;
 import com.amazonaws.util.awsclientsmithygenerator.generators.CppWriterDelegator;
+import com.amazonaws.util.awsclientsmithygenerator.generators.model.CppNames;
 import com.amazonaws.util.awsclientsmithygenerator.generators.model.CppTypeMapper;
 import com.amazonaws.util.awsclientsmithygenerator.generators.model.MemberRenderer;
+import com.amazonaws.util.awsclientsmithygenerator.generators.model.protocol.FileKind;
 import com.amazonaws.util.awsclientsmithygenerator.generators.model.protocol.ProtocolTraits;
+import com.amazonaws.util.awsclientsmithygenerator.generators.model.RenderContext;
+import com.amazonaws.util.awsclientsmithygenerator.generators.model.ShapeClassifier;
 import com.amazonaws.util.awsclientsmithygenerator.generators.model.ShapeClassifier.EventStreamInfo;
 import com.amazonaws.util.awsclientsmithygenerator.generators.model.ShapeRenderer;
-import software.amazon.smithy.model.Model;
 import software.amazon.smithy.model.shapes.MemberShape;
-import software.amazon.smithy.model.shapes.ServiceShape;
 import software.amazon.smithy.model.shapes.Shape;
 import software.amazon.smithy.model.shapes.StructureShape;
 import software.amazon.smithy.model.shapes.UnionShape;
@@ -37,23 +39,11 @@
 public final class EventStreamRenderer implements ShapeRenderer {
 
     private final List<EventStreamInfo> eventStreams;
-    private final Model model;
-    private final ServiceShape service;
-    private final ProtocolTraits protocolTraits;
-    private final String namespace;
-    private final String exportMacro;
-    private final String smithyServiceName;
-
-    public EventStreamRenderer(List<EventStreamInfo> eventStreams, Model model, ServiceShape service,
-                               ProtocolTraits protocolTraits, String namespace, String exportMacro,
-                               String smithyServiceName) {
+    private final RenderContext ctx;
+
+    public EventStreamRenderer(List<EventStreamInfo> eventStreams, RenderContext ctx) {
         this.eventStreams = eventStreams;
-        this.model = model;
-        this.service = service;
-        this.protocolTraits = protocolTraits;
-        this.namespace = namespace;
-        this.exportMacro = exportMacro;
-        this.smithyServiceName = smithyServiceName;
+        this.ctx = ctx;
     }
 
     @Override
@@ -70,7 +60,7 @@ public void render(CppWriterDelegator writerDelegator) {
 
             renderHandlerHeader(writerDelegator, info.operationName(), events);
             renderHandlerSource(writerDelegator, info.operationName(), events);
-            renderInitialResponse(writerDelegator, info.operationName());
+            renderInitialResponse(writerDelegator, info.operationName(), info.resultShape());
             renderEventStreamUnion(writerDelegator, info.operationName(), union, events, exceptions);
         }
     }
@@ -78,7 +68,7 @@ public void render(CppWriterDelegator writerDelegator) {
     /** Finds the @streaming union targeted by a member of the result structure, if any. */
     private Optional<UnionShape> findStreamingUnion(StructureShape resultShape) {
         for (MemberShape member : resultShape.getAllMembers().values()) {
-            Shape target = model.expectShape(member.getTarget());
+            Shape target = ctx.model().expectShape(member.getTarget());
             if (target.isUnionShape() && target.hasTrait(StreamingTrait.class)) {
                 return target.asUnionShape();
             }
@@ -89,7 +79,7 @@ private Optional<UnionShape> findStreamingUnion(StructureShape resultShape) {
     /** Splits union members into events (non-exception) and exceptions, preserving order. */
     private void partitionMembers(UnionShape union, List<MemberShape> events, List<MemberShape> exceptions) {
         for (MemberShape member : union.getAllMembers().values()) {
-            Shape target = model.expectShape(member.getTarget());
+            Shape target = ctx.model().expectShape(member.getTarget());
             if (target.hasTrait(ErrorTrait.class)) {
                 exceptions.add(member);
             } else {
@@ -103,6 +93,21 @@ private String eventShapeName(MemberShape member) {
         return member.getTarget().getName();
     }
 
+    /**
+     * True if an exception member targets a modeled exception (members beyond the trivial
+     * message/code). C2J types modeled exceptions as their concrete shape (with a model include)
+     * and non-modeled ones as the generic {@code <namespace>Error} wrapper.
+     */
+    private boolean isModeledException(MemberShape exc) {
+        StructureShape target = ctx.model().expectShape(exc.getTarget(), StructureShape.class);
+        return ShapeClassifier.isModeledException(target, ctx.protocolTraits().protocol());
+    }
+
+    /** The C++ type for an exception member: concrete shape name if modeled, else {@code errorType}. */
+    private String exceptionType(MemberShape exc, String errorType) {
+        return isModeledException(exc) ? exc.getTarget().getName() : errorType;
+    }
+
     /** The wire member key, e.g. "alpha". */
     private String wireKey(MemberShape member) {
         return member.getMemberName();
@@ -118,22 +123,20 @@ private String enumConstant(MemberShape member) {
     private void renderHandlerHeader(CppWriterDelegator writerDelegator, String opName,
                                      List<MemberShape> events) {
         String className = opName + "Handler";
-        String fileName = "include/aws/" + smithyServiceName + "/model/" + className + ".h";
+        String fileName = "include/aws/" + ctx.smithyServiceName() + "/model/" + className + ".h";
         writerDelegator.useFileWriter(fileName, writer -> {
             writer.write("#pragma once");
             writer.write("#include <aws/core/client/AWSError.h>");
             writer.write("#include <aws/core/utils/HashingUtils.h>");
             writer.write("#include <aws/core/utils/event/EventStreamHandler.h>");
-            writer.write("#include <aws/$1L/$2LErrors.h>", smithyServiceName, namespace);
-            writer.write("#include <aws/$1L/$2L_EXPORTS.h>", smithyServiceName, namespace);
-            writer.write("#include <aws/$1L/model/$2LInitialResponse.h>", smithyServiceName, opName);
+            writer.write("#include <aws/$1L/$2LErrors.h>", ctx.smithyServiceName(), ctx.namespace());
+            writer.write("#include <aws/$1L/$2L_EXPORTS.h>", ctx.smithyServiceName(), ctx.namespace());
+            writer.write("#include <aws/$1L/model/$2LInitialResponse.h>", ctx.smithyServiceName(), opName);
             for (MemberShape event : events) {
-                writer.write("#include <aws/$1L/model/$2L.h>", smithyServiceName, eventShapeName(event));
+                writer.write("#include <aws/$1L/model/$2L.h>", ctx.smithyServiceName(), eventShapeName(event));
             }
             writer.write("");
-            writer.writeNamespaceOpen("Aws");
-            writer.writeNamespaceOpen(namespace);
-            writer.writeNamespaceOpen("Model");
+            ModelFile.modelNamespace(writer, ctx.namespace(), () -> {
 
             // EventType enum
             StringBuilder enumBody = new StringBuilder("enum class ")
@@ -153,16 +156,16 @@ private void renderHandlerHeader(CppWriterDelegator writerDelegator, String opNa
                     String ev = eventShapeName(event);
                     writer.write("typedef std::function<void(const $1L&)> $1LCallback;", ev);
                 }
-                writer.write("typedef std::function<void(const Aws::Client::AWSError<$1LErrors>& error)> ErrorCallback;", namespace);
+                writer.write("typedef std::function<void(const Aws::Client::AWSError<$1LErrors>& error)> ErrorCallback;", ctx.namespace());
                 writer.write("");
                 writer.dedent();
                 writer.write("public:");
                 writer.indent();
-                writer.write("$1L $2L();", exportMacro, className);
-                writer.write("$1L $2L& operator=(const $2L&) = default;", exportMacro, className);
-                writer.write("$1L $2L(const $2L&) = default;", exportMacro, className);
+                writer.write("$1L $2L();", ctx.exportMacro(), className);
+                writer.write("$1L $2L& operator=(const $2L&) = default;", ctx.exportMacro(), className);
+                writer.write("$1L $2L(const $2L&) = default;", ctx.exportMacro(), className);
                 writer.write("");
-                writer.write("$1L virtual void OnEvent() override;", exportMacro);
+                writer.write("$1L virtual void OnEvent() override;", ctx.exportMacro());
                 writer.write("");
                 writer.write("///@{");
                 writer.write("/**");
@@ -192,9 +195,9 @@ private void renderHandlerHeader(CppWriterDelegator writerDelegator, String opNa
                 writer.dedent();
                 writer.write("private:");
                 writer.indent();
-                writer.write("$1L void HandleEventInMessage();", exportMacro);
-                writer.write("$1L void HandleErrorInMessage();", exportMacro);
-                writer.write("$1L void MarshallError(const Aws::String& errorCode, const Aws::String& errorMessage);", exportMacro);
+                writer.write("$1L void HandleEventInMessage();", ctx.exportMacro());
+                writer.write("$1L void HandleErrorInMessage();", ctx.exportMacro());
+                writer.write("$1L void MarshallError(const Aws::String& errorCode, const Aws::String& errorMessage);", ctx.exportMacro());
                 writer.write("");
                 writer.write("$1LInitialResponseCallbackEx m_onInitialResponse;", opName);
                 for (MemberShape event : events) {
@@ -206,14 +209,11 @@ private void renderHandlerHeader(CppWriterDelegator writerDelegator, String opNa
             writer.write("");
 
             writer.writeNamespaceOpen(opName + "EventMapper");
-            writer.write("$1L $2LEventType Get$2LEventTypeForName(const Aws::String& name);", exportMacro, opName);
+            writer.write("$1L $2LEventType Get$2LEventTypeForName(const Aws::String& name);", ctx.exportMacro(), opName);
             writer.write("");
-            writer.write("$1L Aws::String GetNameFor$2LEventType($2LEventType value);", exportMacro, opName);
+            writer.write("$1L Aws::String GetNameFor$2LEventType($2LEventType value);", ctx.exportMacro(), opName);
             writer.writeNamespaceClose(opName + "EventMapper");
-
-            writer.writeNamespaceClose("Model");
-            writer.writeNamespaceClose(namespace);
-            writer.writeNamespaceClose("Aws");
+            });
         });
     }
 
@@ -223,21 +223,24 @@ private void renderHandlerSource(CppWriterDelegator writerDelegator, String opNa
         String fileName = "source/model/" + className + ".cpp";
         String tag = opName.toUpperCase() + "_HANDLER_CLASS_TAG";
         writerDelegator.useFileWriter(fileName, writer -> {
-            writer.write("#include <aws/core/client/CoreErrors.h>");
-            writer.write("#include <aws/core/utils/event/EventStreamErrors.h>");
-            writer.write("#include <aws/core/utils/logging/LogMacros.h>");
-            writer.write("#include <aws/$1L/$2LErrorMarshaller.h>", smithyServiceName, namespace);
-            writer.write("#include <aws/$1L/model/$2LHandler.h>", smithyServiceName, opName);
+            // The handler parses event/exception payloads with the protocol's serializer.
+            List<String> includes = new java.util.ArrayList<>();
+            includes.add("aws/core/client/CoreErrors.h");
+            includes.add("aws/core/utils/event/EventStreamErrors.h");
+            includes.add("aws/core/utils/logging/LogMacros.h");
+            includes.add("aws/" + ctx.smithyServiceName() + "/" + ctx.namespace() + "ErrorMarshaller.h");
+            includes.add("aws/" + ctx.smithyServiceName() + "/model/" + opName + "Handler.h");
+            IncludeSets.emitSourceIncludes(writer, includes,
+                ctx.protocolTraits(), FileKind.EVENT_HANDLER_SOURCE);
             writer.write("");
-            writer.write("using namespace Aws::$1L::Model;", namespace);
+            writer.write("using namespace Aws::$1L::Model;", ctx.namespace());
             writer.write("using namespace Aws::Utils::Event;");
+            IncludeSets.emitUsings(writer, ctx.protocolTraits().serdeUsings(FileKind.EVENT_HANDLER_SOURCE));
             writer.write("");
             writer.write("AWS_CORE_API extern const char MESSAGE_LOWER_CASE[];");
             writer.write("AWS_CORE_API extern const char MESSAGE_CAMEL_CASE[];");
             writer.write("");
-            writer.writeNamespaceOpen("Aws");
-            writer.writeNamespaceOpen(namespace);
-            writer.writeNamespaceOpen("Model");
+            ModelFile.modelNamespace(writer, ctx.namespace(), () -> {
             writer.write("using namespace Aws::Client;");
             writer.write("");
             writer.write("static const char $1L[] = \"$2LHandler\";", tag, opName);
@@ -254,8 +257,8 @@ private void renderHandlerSource(CppWriterDelegator writerDelegator, String opNa
                         writer.write("AWS_LOGSTREAM_TRACE($1L, \"$2L received.\");", tag, ev);
                     });
                 }
-                writer.openBlock("m_onError = [&](const AWSError<$1LErrors>& error) {", "};", namespace, () -> {
-                    writer.write("AWS_LOGSTREAM_TRACE($1L, \"$2L Errors received, \" << error);", tag, namespace);
+                writer.openBlock("m_onError = [&](const AWSError<$1LErrors>& error) {", "};", ctx.namespace(), () -> {
+                    writer.write("AWS_LOGSTREAM_TRACE($1L, \"$2L Errors received, \" << error);", tag, ctx.namespace());
                 });
             });
             writer.write("");
@@ -265,7 +268,7 @@ private void renderHandlerSource(CppWriterDelegator writerDelegator, String opNa
                 writer.openBlock("if (!*this) {", "}", () -> {
                     writer.write("AWSError<CoreErrors> error = EventStreamErrorsMapper::GetAwsErrorForEventStreamError(GetInternalError());");
                     writer.write("error.SetMessage(GetEventPayloadAsString());");
-                    writer.write("m_onError(AWSError<$1LErrors>(error));", namespace);
+                    writer.write("m_onError(AWSError<$1LErrors>(error));", ctx.namespace());
                     writer.write("return;");
                 });
                 writer.write("const auto& headers = GetEventHeaders();");
@@ -306,7 +309,7 @@ private void renderHandlerSource(CppWriterDelegator writerDelegator, String opNa
                     });
                     for (MemberShape event : events) {
                         writer.openBlock("case $1LEventType::$2L: {", "}", opName, enumConstant(event), () -> {
-                            protocolTraits.writeEventPayloadDecode(writer, eventShapeName(event),
+                            ctx.protocolTraits().writeEventPayloadDecode(writer, eventShapeName(event),
                                 "m_on" + eventShapeName(event));
                             writer.write("break;");
                         });
@@ -335,7 +338,7 @@ private void renderHandlerSource(CppWriterDelegator writerDelegator, String opNa
                 writer.write("errorHeaderIter = headers.find(ERROR_MESSAGE_HEADER);");
                 writer.openBlock("if (errorHeaderIter == headers.end()) {", "}", () -> {
                     writer.write("// TODO: read error message from payload once protocol-specific serde lands");
-                    protocolTraits.writeErrorPayloadParse(writer);
+                    ctx.protocolTraits().writeErrorPayloadParse(writer);
                 });
                 writer.openBlock("else {", "}", () -> {
                     writer.write("errorMessage = errorHeaderIter->second.GetEventHeaderValueAsString();");
@@ -346,7 +349,7 @@ private void renderHandlerSource(CppWriterDelegator writerDelegator, String opNa
 
             // MarshallError (verbatim from C2J)
             writer.openBlock("void $1L::MarshallError(const Aws::String& errorCode, const Aws::String& errorMessage) {", "}", className, () -> {
-                writer.write("$1LErrorMarshaller errorMarshaller;", namespace);
+                writer.write("$1LErrorMarshaller errorMarshaller;", ctx.namespace());
                 writer.write("AWSError<CoreErrors> error;");
                 writer.openBlock("if (errorCode.empty()) {", "}", () -> {
                     writer.write("error = AWSError<CoreErrors>(CoreErrors::UNKNOWN, \"\", errorMessage, false);");
@@ -363,7 +366,7 @@ private void renderHandlerSource(CppWriterDelegator writerDelegator, String opNa
                         writer.write("error = AWSError<CoreErrors>(CoreErrors::UNKNOWN, errorCode, \"Unable to parse ExceptionName: \" + errorCode + \" Message: \" + errorMessage, false);");
                     });
                 });
-                writer.write("m_onError(AWSError<$1LErrors>(error));", namespace);
+                writer.write("m_onError(AWSError<$1LErrors>(error));", ctx.namespace());
             });
             writer.write("");
 
@@ -401,54 +404,98 @@ private void renderHandlerSource(CppWriterDelegator writerDelegator, String opNa
                 });
             });
             writer.writeNamespaceClose(opName + "EventMapper");
-
-            writer.writeNamespaceClose("Model");
-            writer.writeNamespaceClose(namespace);
-            writer.writeNamespaceClose("Aws");
+            });
         });
     }
 
     // ---- Initial response / event stream union ------------------------------
 
-    private void renderInitialResponse(CppWriterDelegator writerDelegator, String opName) {
+    /**
+     * Builds a synthetic {@code <op>InitialResponse} structure from the result's non-event-stream
+     * members, mirroring C2J's {@code addEventStreamInitialResponse} (CppClientGenerator). The
+     * {@code @streaming} union member (the event stream) is excluded.
+     */
+    private StructureShape initialResponseShape(String opName, StructureShape resultShape) {
+        StructureShape.Builder builder = StructureShape.builder()
+            .id("com.amazonaws.smithy.synthetic#" + opName + "InitialResponse");
+        for (MemberShape member : resultShape.getAllMembers().values()) {
+            Shape target = ctx.model().expectShape(member.getTarget());
+            boolean isEventStream = target.isUnionShape() && target.hasTrait(StreamingTrait.class);
+            if (!isEventStream) {
+                builder.addMember(member.getMemberName(), member.getTarget(),
+                    b -> member.getAllTraits().values().forEach(b::addTrait));
+            }
+        }
+        return builder.build();
+    }
+
+    private void renderInitialResponse(CppWriterDelegator writerDelegator, String opName,
+                                       StructureShape resultShape) {
         String className = opName + "InitialResponse";
+        StructureShape shape = initialResponseShape(opName, resultShape);
+        boolean hasMembers = !shape.getAllMembers().isEmpty();
 
-        String headerFile = "include/aws/" + smithyServiceName + "/model/" + className + ".h";
+        String headerFile = "include/aws/" + ctx.smithyServiceName() + "/model/" + className + ".h";
         writerDelegator.useFileWriter(headerFile, writer -> {
             writer.write("#pragma once");
-            writer.write("#include <aws/core/http/HttpTypes.h>");
-            writer.write("#include <aws/$1L/$2L_EXPORTS.h>", smithyServiceName, namespace);
+            List<String> includes = new java.util.ArrayList<>();
+            includes.add("<aws/core/http/HttpTypes.h>");
+            includes.add("<aws/" + ctx.smithyServiceName() + "/" + ctx.namespace() + "_EXPORTS.h>");
+            includes.addAll(CppTypeMapper.getIncludesForShape(shape, ctx.model(), ctx.smithyServiceName()));
+            IncludeSets.emitAngleIncludes(writer, includes);
+            if (hasMembers) {
+                writer.write("");
+                writer.write("#include <utility>");
+            }
             writer.write("");
-            writer.writeNamespaceOpen("Aws");
-            protocolTraits.writeShapeForwardDeclarations(writer);
-            writer.writeNamespaceOpen(namespace);
-            writer.writeNamespaceOpen("Model");
+            ModelFile.modelNamespace(writer, ctx.namespace(),
+                () -> ctx.protocolTraits().writeShapeForwardDeclarations(writer),
+                () -> {
             writer.write("");
             writer.openBlock("class $L {", "};", className, () -> {
                 writer.write("public:");
                 // The header-collection ctor sits before the serialize method (mainline ordering).
-                protocolTraits.writeSerdeMethodDecls(writer, exportMacro, className,
-                    () -> writer.write("$1L $2L(const Http::HeaderValueCollection& responseHeaders);", exportMacro, className));
+                ctx.protocolTraits().writeSerdeMethodDecls(writer, ctx.exportMacro(), className,
+                    () -> writer.write("$1L $2L(const Http::HeaderValueCollection& responseHeaders);", ctx.exportMacro(), className));
+                // Accessors + private section for the result's non-streaming members. A memberless
+                // InitialResponse ends right after its serde decls (no private:), matching C2J.
+                if (hasMembers) {
+                    MemberRenderer members = MemberRenderer.forStructure(ctx.model(), shape, className)
+                        .wideIntegers(ctx.protocolTraits().widensIntegers());
+                    writer.write("");
+                    members.renderPublicAccessors(writer);
+                    writer.dedent();
+                    writer.write("private:");
+                    writer.indent();
+                    members.renderPrivateSection(writer);
+                }
             });
             writer.write("");
-            writer.writeNamespaceClose("Model");
-            writer.writeNamespaceClose(namespace);
-            writer.writeNamespaceClose("Aws");
+                });
         });
 
         String sourceFile = "source/model/" + className + ".cpp";
         writerDelegator.useFileWriter(sourceFile, writer -> {
-            protocolTraits.writeSerdeInclude(writer);
-            writer.write("#include <aws/core/utils/UnreferencedParam.h>");
-            writer.write("#include <aws/$1L/model/$2L.h>", smithyServiceName, className);
+            List<String> includes = new java.util.ArrayList<>();
+            includes.add("aws/core/utils/StringUtils.h");
+            includes.add("aws/" + ctx.smithyServiceName() + "/model/" + className + ".h");
+            includes.add("utility");
+            IncludeSets.emitSourceIncludes(writer, includes,
+                ctx.protocolTraits(), FileKind.INITIAL_RESPONSE_SOURCE);
+            writer.write("");
+            IncludeSets.emitUsings(writer, ctx.protocolTraits().serdeUsings(FileKind.INITIAL_RESPONSE_SOURCE));
+            writer.write("");
+            // The serde impls are wrapped in an explicit namespace block (not a `using`),
+            // matching C2J, which renders InitialResponse via the sub-object source template.
+            ModelFile.modelNamespace(writer, ctx.namespace(), () -> {
             writer.write("");
-            writer.write("using namespace Aws::$1L::Model;", namespace);
-            protocolTraits.writeSerdeUsingDeclarations(writer);
+            ctx.protocolTraits().writeSerdeMethodImpls(writer, className);
             writer.write("");
-            protocolTraits.writeSerdeMethodImpls(writer, className);
+            // Delegate to the default ctor so all members are value-initialized before the
+            // header-derived ones are set (matches C2J).
+            writer.openBlock("$1L::$1L(const Http::HeaderValueCollection& responseHeaders) : $1L() {", "}",
+                className, () -> writer.write("AWS_UNREFERENCED_PARAM(responseHeaders);"));
             writer.write("");
-            writer.openBlock("$1L::$1L(const Http::HeaderValueCollection& responseHeaders) {", "}", className, () -> {
-                writer.write("AWS_UNREFERENCED_PARAM(responseHeaders);");
             });
         });
     }
@@ -457,61 +504,66 @@ private void renderEventStreamUnion(CppWriterDelegator writerDelegator, String o
                                         UnionShape union, List<MemberShape> events,
                                         List<MemberShape> exceptions) {
         String className = union.getId().getName();
-        String errorType = namespace + "Error";
+        String errorType = ctx.namespace() + "Error";
 
-        String headerFile = "include/aws/" + smithyServiceName + "/model/" + className + ".h";
+        String headerFile = "include/aws/" + ctx.smithyServiceName() + "/model/" + className + ".h";
         writerDelegator.useFileWriter(headerFile, writer -> {
             writer.write("#pragma once");
-            writer.write("#include <aws/$1L/$2L_EXPORTS.h>", smithyServiceName, namespace);
-            writer.write("#include <aws/$1L/$2LErrors.h>", smithyServiceName, namespace);
+            writer.write("#include <aws/$1L/$2L_EXPORTS.h>", ctx.smithyServiceName(), ctx.namespace());
+            // C2J omits the service Errors include: its header-include computation skips non-modeled
+            // exception members (CppViewHelper: `if (next.isException() && !next.isModeledException())
+            // continue;`), which are the generic <namespace>Error wrapper and resolve transitively.
+            // Concrete event shapes AND modeled exceptions get their own model include.
             for (MemberShape event : events) {
-                writer.write("#include <aws/$1L/model/$2L.h>", smithyServiceName, eventShapeName(event));
+                writer.write("#include <aws/$1L/model/$2L.h>", ctx.smithyServiceName(), eventShapeName(event));
+            }
+            for (MemberShape exc : exceptions) {
+                if (isModeledException(exc)) {
+                    writer.write("#include <aws/$1L/model/$2L.h>", ctx.smithyServiceName(), exc.getTarget().getName());
+                }
             }
             writer.write("");
             writer.write("#include <utility>");
             writer.write("");
-            writer.writeNamespaceOpen("Aws");
-            protocolTraits.writeShapeForwardDeclarations(writer);
-            writer.writeNamespaceOpen(namespace);
-            writer.writeNamespaceOpen("Model");
+            ModelFile.modelNamespace(writer, ctx.namespace(),
+                () -> ctx.protocolTraits().writeShapeForwardDeclarations(writer),
+                () -> {
             writer.write("");
-            MemberRenderer.renderClassDocComment(writer, union, smithyServiceName, service.getVersion());
+            MemberRenderer.renderClassDocComment(writer, union, ctx.smithyServiceName(), ctx.service().getVersion());
             writer.openBlock("class $L {", "};", className, () -> {
                 writer.write("public:");
-                protocolTraits.writeSerdeMethodDecls(writer, exportMacro, className, null);
+                ctx.protocolTraits().writeSerdeMethodDecls(writer, ctx.exportMacro(), className, null);
                 writer.write("");
                 // Event member accessors, typed as their concrete shape.
                 for (MemberShape event : events) {
-                    String cppType = CppTypeMapper.getCppType(model.expectShape(event.getTarget()), model);
+                    String cppType = CppTypeMapper.getCppType(ctx.model().expectShape(event.getTarget()), ctx.model());
                     renderShapeAccessor(writer, className, cppType, event.getMemberName(), event);
                 }
-                // Exception member accessors, typed as <namespace>Error.
+                // Exception member accessors: modeled -> concrete type; non-modeled -> <namespace>Error.
                 for (MemberShape exc : exceptions) {
-                    renderShapeAccessor(writer, className, errorType, exc.getMemberName(), exc);
+                    renderShapeAccessor(writer, className, exceptionType(exc, errorType), exc.getMemberName(), exc);
                 }
                 writer.dedent();
                 writer.write("private:");
                 writer.indent();
                 // Data members
                 for (MemberShape event : events) {
-                    String cppType = CppTypeMapper.getCppType(model.expectShape(event.getTarget()), model);
-                    writer.write("$1L $2L;", cppType, "m_" + decapitalize(event.getMemberName()));
+                    String cppType = CppTypeMapper.getCppType(ctx.model().expectShape(event.getTarget()), ctx.model());
+                    writer.write("$1L $2L;", cppType, CppNames.fieldName(event.getMemberName()));
                 }
                 for (MemberShape exc : exceptions) {
-                    writer.write("$1L $2L;", errorType, "m_" + decapitalize(exc.getMemberName()));
+                    writer.write("$1L $2L;", exceptionType(exc, errorType), CppNames.fieldName(exc.getMemberName()));
                 }
                 // HasBeenSet flags
                 for (MemberShape event : events) {
-                    writer.write("bool $1LHasBeenSet = false;", "m_" + decapitalize(event.getMemberName()));
+                    writer.write("bool $1LHasBeenSet = false;", CppNames.fieldName(event.getMemberName()));
                 }
                 for (MemberShape exc : exceptions) {
-                    writer.write("bool $1LHasBeenSet = false;", "m_" + decapitalize(exc.getMemberName()));
+                    writer.write("bool $1LHasBeenSet = false;", CppNames.fieldName(exc.getMemberName()));
                 }
             });
             writer.write("");
-            writer.writeNamespaceClose("Model");
-            writer.writeNamespaceClose(namespace);
-            writer.writeNamespaceClose("Aws");
+                });
         });
 
         // C2J generates the event stream union as a header-only type: the serde methods are
@@ -527,8 +579,8 @@ private void renderEventStreamUnion(CppWriterDelegator writerDelegator, String o
      */
     private void renderShapeAccessor(CppWriter writer, String className, String cppType, String memberName,
                                      MemberShape member) {
-        String getter = capitalize(memberName);
-        String field = "m_" + decapitalize(memberName);
+        String getter = CppNames.capitalize(memberName);
+        String field = CppNames.fieldName(memberName);
         String templateParam = getter + "T";
         writer.write("///@{");
         if (member.getTrait(DocumentationTrait.class).isPresent()) {
@@ -551,13 +603,4 @@ private void renderShapeAccessor(CppWriter writer, String className, String cppT
         });
         writer.write("///@}");
     }
-
-    private static String capitalize(String s) {
-        return s.substring(0, 1).toUpperCase() + s.substring(1);
-    }
-
-    private static String decapitalize(String s) {
-        return s.substring(0, 1).toLowerCase() + s.substring(1);
-    }
-
 }
diff --git a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/renderers/IncludeSets.java b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/renderers/IncludeSets.java
new file mode 100644
index 000000000000..4b9e8f410327
--- /dev/null
+++ b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/renderers/IncludeSets.java
@@ -0,0 +1,127 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+package com.amazonaws.util.awsclientsmithygenerator.generators.model.renderers;
+
+import com.amazonaws.util.awsclientsmithygenerator.generators.CppWriter;
+import com.amazonaws.util.awsclientsmithygenerator.generators.model.protocol.FileKind;
+import com.amazonaws.util.awsclientsmithygenerator.generators.model.protocol.ProtocolTraits;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Universal (non-serde, non-member) {@code #include} paths for each generated file kind.
+ * Paths are returned without angle brackets; callers add {@code #include <...>}.
+ *
+ * <p>These are the boilerplate includes that were previously hand-written as string literals
+ * in each renderer. Serde includes come from {@code ProtocolTraits.serdeIncludes}; member
+ * includes come from {@code CppTypeMapper.getIncludesForShape}.
+ */
+final class IncludeSets {
+
+    private IncludeSets() {}
+
+    static List<String> resultHeaderBase(String smithyServiceName, String namespace,
+                                         boolean includeAwsString) {
+        List<String> inc = new ArrayList<>();
+        inc.add("aws/core/http/HttpResponse.h");
+        inc.add("aws/" + smithyServiceName + "/" + namespace + "_EXPORTS.h");
+        if (includeAwsString) {
+            inc.add("aws/core/utils/memory/stl/AWSString.h");
+        }
+        return inc;
+    }
+
+    static List<String> streamingResultHeaderBase(String smithyServiceName, String namespace) {
+        List<String> inc = new ArrayList<>();
+        inc.add("aws/core/http/HttpResponse.h");
+        inc.add("aws/core/utils/memory/stl/AWSString.h");
+        inc.add("aws/core/utils/stream/ResponseStream.h");
+        inc.add("aws/" + smithyServiceName + "/" + namespace + "_EXPORTS.h");
+        return inc;
+    }
+
+    static List<String> resultSourceBase(String smithyServiceName, String className) {
+        List<String> inc = new ArrayList<>();
+        inc.add("aws/core/AmazonWebServiceResult.h");
+        inc.add("aws/core/utils/StringUtils.h");
+        inc.add("aws/" + smithyServiceName + "/model/" + className + ".h");
+        inc.add("utility");
+        return inc;
+    }
+
+    static List<String> streamingResultSourceBase(String smithyServiceName, String className) {
+        List<String> inc = new ArrayList<>();
+        inc.add("aws/core/AmazonWebServiceResult.h");
+        inc.add("aws/core/utils/StringUtils.h");
+        inc.add("aws/core/utils/memory/stl/AWSStringStream.h");
+        inc.add("aws/" + smithyServiceName + "/model/" + className + ".h");
+        inc.add("utility");
+        return inc;
+    }
+
+    static List<String> requestSourceBase(String smithyServiceName, String className) {
+        List<String> inc = new ArrayList<>();
+        inc.add("aws/" + smithyServiceName + "/model/" + className + ".h");
+        // NOTE: <utility> is NOT added here. Query/EC2 request sources must not include it,
+        // and the non-Query protocols' serdeIncludes(REQUEST_SOURCE) already carry <utility>.
+        // Adding it here would force it onto Query.
+        return inc;
+    }
+
+    static List<String> subObjectSourceBase(String smithyServiceName, String className) {
+        List<String> inc = new ArrayList<>();
+        inc.add("aws/" + smithyServiceName + "/model/" + className + ".h");
+        inc.add("utility");
+        return inc;
+    }
+
+    /**
+     * Assembles and emits a source file's {@code #include} block: the per-site {@code base}
+     * (self-header, {@code AmazonWebServiceResult.h}, etc.) plus the protocol's source-include
+     * union for {@code kind}. The two lists are concatenated then emitted via {@link #emit},
+     * which dedups, sorts (CaseSensitive) and brackets. Usings are emitted separately by the
+     * caller via {@link #emitUsings} — this method never touches usings.
+     */
+    static void emitSourceIncludes(CppWriter writer, List<String> base,
+                                   ProtocolTraits traits, FileKind kind) {
+        List<String> includes = new ArrayList<>(base);
+        includes.addAll(traits.serdeIncludes(kind));
+        emit(writer, includes);
+    }
+
+    /** Writes each path as {@code #include <path>}, deduped and sorted (CaseSensitive). */
+    static void emit(com.amazonaws.util.awsclientsmithygenerator.generators.CppWriter writer,
+                     List<String> includePaths) {
+        java.util.TreeSet<String> sorted = new java.util.TreeSet<>(includePaths);
+        for (String path : sorted) {
+            writer.write("#include <$L>", path);
+        }
+    }
+
+    /**
+     * Emits {@code #include <path>} for each path, normalizing brackets so a caller may
+     * pass either {@code <aws/x/X.h>} or {@code aws/x/X.h}. Deduped and sorted CaseSensitive,
+     * matching {@link #emit}. This is the single place bracket policy for header includes lives.
+     */
+    static void emitAngleIncludes(com.amazonaws.util.awsclientsmithygenerator.generators.CppWriter writer,
+                                  java.util.Collection<String> includePaths) {
+        java.util.TreeSet<String> sorted = new java.util.TreeSet<>();
+        for (String p : includePaths) {
+            sorted.add(p.replaceAll("^<|>$", ""));
+        }
+        for (String path : sorted) {
+            writer.write("#include <$L>", path);
+        }
+    }
+
+    /** Writes each namespace as {@code using namespace X;} in the given order (not sorted). */
+    static void emitUsings(com.amazonaws.util.awsclientsmithygenerator.generators.CppWriter writer,
+                           List<String> namespaces) {
+        for (String ns : namespaces) {
+            writer.write("using namespace $L;", ns);
+        }
+    }
+}
diff --git a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/renderers/ModelFile.java b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/renderers/ModelFile.java
new file mode 100644
index 000000000000..8e21fe78903d
--- /dev/null
+++ b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/renderers/ModelFile.java
@@ -0,0 +1,37 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+package com.amazonaws.util.awsclientsmithygenerator.generators.model.renderers;
+
+import com.amazonaws.util.awsclientsmithygenerator.generators.CppWriter;
+
+/**
+ * Emits the {@code Aws::<namespace>::Model} nesting shared by every generated model
+ * file. Callers supply the class body; the triple open/close is owned here so it can
+ * never drift out of sync. Files that must interleave forward declarations between
+ * {@code Aws} and {@code <namespace>} use {@link CppWriter#withNamespace} directly.
+ */
+final class ModelFile {
+
+    private ModelFile() {}
+
+    static void modelNamespace(CppWriter writer, String namespace, Runnable body) {
+        writer.withNamespace("Aws", () ->
+            writer.withNamespace(namespace, () ->
+                writer.withNamespace("Model", body)));
+    }
+
+    /**
+     * Like {@link #modelNamespace(CppWriter, String, Runnable)} but emits {@code awsProlog}
+     * directly inside {@code Aws} — before opening {@code namespace} — for headers that must
+     * place forward declarations (e.g. {@code AmazonWebServiceResult}, serde value types) at
+     * {@code Aws} scope. The body still renders inside {@code Aws::<namespace>::Model}.
+     */
+    static void modelNamespace(CppWriter writer, String namespace, Runnable awsProlog, Runnable body) {
+        writer.withNamespace("Aws", () -> {
+            awsProlog.run();
+            writer.withNamespace(namespace, () -> writer.withNamespace("Model", body));
+        });
+    }
+}
diff --git a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/renderers/OutgoingEventStreamRenderer.java b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/renderers/OutgoingEventStreamRenderer.java
new file mode 100644
index 000000000000..df03be05ff95
--- /dev/null
+++ b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/renderers/OutgoingEventStreamRenderer.java
@@ -0,0 +1,175 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+package com.amazonaws.util.awsclientsmithygenerator.generators.model.renderers;
+
+import com.amazonaws.util.awsclientsmithygenerator.generators.CppWriter;
+import com.amazonaws.util.awsclientsmithygenerator.generators.CppWriterDelegator;
+import com.amazonaws.util.awsclientsmithygenerator.generators.model.CppNames;
+import com.amazonaws.util.awsclientsmithygenerator.generators.model.CppTypeMapper;
+import com.amazonaws.util.awsclientsmithygenerator.generators.model.MemberRenderer;
+import com.amazonaws.util.awsclientsmithygenerator.generators.model.RenderContext;
+import com.amazonaws.util.awsclientsmithygenerator.generators.model.ShapeRenderer;
+import com.amazonaws.util.awsclientsmithygenerator.generators.model.protocol.ProtocolTraits;
+import software.amazon.smithy.model.shapes.MemberShape;
+import software.amazon.smithy.model.shapes.Shape;
+import software.amazon.smithy.model.shapes.StructureShape;
+import software.amazon.smithy.model.shapes.UnionShape;
+import software.amazon.smithy.model.traits.EventHeaderTrait;
+import software.amazon.smithy.model.traits.EventPayloadTrait;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Renders outgoing (request-side / bidirectional) event streams: a {@code @streaming} union
+ * bound to an operation input. C2J emits these header-only as an
+ * {@code Aws::Utils::Event::EventEncoderStream} subclass with one {@code Write<Event>(...)}
+ * method per union member (EventStreamHeader.vm), rather than as a tagged-union data type.
+ *
+ * <p>Only the structure/list payload serialization is protocol-specific; that arm is delegated
+ * to {@link ProtocolTraits#writeStructureEventPayload}. Blob and string payloads write the same
+ * way for every protocol.
+ */
+public final class OutgoingEventStreamRenderer implements ShapeRenderer {
+
+    /** How an event's payload is encoded, mirroring C2J's eventPayloadType. */
+    private enum PayloadKind { BLOB, STRING, STRUCTURE, NONE }
+
+    private final List<Shape> outgoingEventStreams;
+    private final RenderContext ctx;
+
+    public OutgoingEventStreamRenderer(List<Shape> outgoingEventStreams, RenderContext ctx) {
+        this.outgoingEventStreams = outgoingEventStreams;
+        this.ctx = ctx;
+    }
+
+    @Override
+    public void render(CppWriterDelegator writerDelegator) {
+        for (Shape shape : outgoingEventStreams) {
+            shape.asUnionShape().ifPresent(union -> renderHeader(writerDelegator, union));
+        }
+    }
+
+    private void renderHeader(CppWriterDelegator writerDelegator, UnionShape union) {
+        String className = CppTypeMapper.cppShapeName(union);
+        String fileName = "include/aws/" + ctx.smithyServiceName() + "/model/" + className + ".h";
+        writerDelegator.useFileWriter(fileName, writer -> {
+            writer.write("#pragma once");
+            java.util.Set<String> includes = new java.util.TreeSet<>();
+            includes.add("<aws/" + ctx.smithyServiceName() + "/" + ctx.namespace() + "_EXPORTS.h>");
+            includes.add("<aws/core/utils/event/EventStream.h>");
+            includes.add("<aws/core/utils/stream/HttpWriteDataStreamBuf.h>");
+            for (MemberShape event : union.getAllMembers().values()) {
+                includes.add("<aws/" + ctx.smithyServiceName() + "/model/" + event.getTarget().getName() + ".h>");
+            }
+            IncludeSets.emitAngleIncludes(writer, includes);
+            writer.write("");
+            writer.write("#include <utility>");
+            writer.write("");
+
+            ModelFile.modelNamespace(writer, ctx.namespace(), () -> {
+            writer.write("");
+            MemberRenderer.renderClassDocComment(writer, union, ctx.smithyServiceName(), ctx.service().getVersion());
+            writer.openBlock("class $L $L : public Aws::Utils::Event::EventEncoderStream {", "};",
+                ctx.exportMacro(), className, () -> {
+                writer.write("public:");
+                writer.write("$L() = default;", className);
+                writer.write("explicit $L(std::shared_ptr<Aws::Utils::Stream::HttpWriteDataStreamBuf> streambuf)",
+                    className);
+                writer.write("    : Aws::Utils::Event::EventEncoderStream(std::move(streambuf)) {}");
+                for (MemberShape event : union.getAllMembers().values()) {
+                    writeEventWriter(writer, className, event);
+                }
+            });
+            writer.write("");
+            });
+        });
+    }
+
+    /** Emits one {@code Write<Event>(const <Event>& value)} method for a union member. */
+    private void writeEventWriter(CppWriter writer, String className, MemberShape unionMember) {
+        String eventShapeName = unionMember.getTarget().getName();
+        String wireKey = unionMember.getMemberName();
+        StructureShape event = ctx.model().expectShape(unionMember.getTarget(), StructureShape.class);
+        writer.openBlock("$L& Write$L(const $L& value) {", "}", className, eventShapeName, eventShapeName, () -> {
+            writer.write("Aws::Utils::Event::Message msg;");
+            PayloadKind kind = payloadKind(event);
+            switch (kind) {
+                case BLOB: {
+                    String getter = "value.Get" + CppNames.capitalize(requirePayloadMember(event, kind)) + "()";
+                    writer.openBlock("if (!$L.empty()) {", "}", getter, () -> {
+                        writeEventHeaders(writer, wireKey);
+                        writer.write("msg.InsertEventHeader(\":content-type\", Aws::String(\"application/octet-stream\"));");
+                        writer.write("msg.WriteEventPayload($L);", getter);
+                    });
+                    break;
+                }
+                case STRING:
+                    writeEventHeaders(writer, wireKey);
+                    writer.write("msg.InsertEventHeader(\":content-type\", Aws::String(\"text/plain\"));");
+                    writer.write("msg.WriteEventPayload(value.Get$L());", CppNames.capitalize(requirePayloadMember(event, kind)));
+                    break;
+                case STRUCTURE:
+                    writeEventHeaders(writer, wireKey);
+                    ctx.protocolTraits().writeStructureEventPayload(writer, "msg", "value");
+                    break;
+                case NONE:
+                default:
+                    writeEventHeaders(writer, wireKey);
+                    writer.write("AWS_UNREFERENCED_PARAM(value);");
+                    break;
+            }
+            writer.write("WriteEvent(msg);");
+            writer.write("return *this;");
+        });
+    }
+
+    private void writeEventHeaders(CppWriter writer, String wireKey) {
+        writer.write("msg.InsertEventHeader(\":message-type\", Aws::String(\"event\"));");
+        writer.write("msg.InsertEventHeader(\":event-type\", Aws::String(\"$L\"));", wireKey);
+    }
+
+    /**
+     * Determines how an event shape's payload is encoded, mirroring C2J's eventPayloadType logic
+     * (C2jModelToGeneratorModelTransformer). A single blob/string non-header member serializes as
+     * that member; a member explicitly marked {@code @eventPayload} likewise; otherwise the event
+     * structure itself is the payload (structure encoding).
+     */
+    private PayloadKind payloadKind(StructureShape event) {
+        List<Map.Entry<String, MemberShape>> nonHeader = event.getAllMembers().entrySet().stream()
+            .filter(e -> !e.getValue().hasTrait(EventHeaderTrait.class))
+            .collect(java.util.stream.Collectors.toList());
+        if (nonHeader.isEmpty()) {
+            return PayloadKind.NONE;
+        }
+        if (nonHeader.size() == 1) {
+            MemberShape member = nonHeader.get(0).getValue();
+            Shape target = ctx.model().expectShape(member.getTarget());
+            if (target.isStringShape()) {
+                return PayloadKind.STRING;
+            }
+            // A blob member is written as a raw blob only when explicitly @eventPayload; an
+            // implicit single blob member makes the parent structure the payload (matches C2J).
+            if (target.isBlobShape() && member.hasTrait(EventPayloadTrait.class)) {
+                return PayloadKind.BLOB;
+            }
+        }
+        return PayloadKind.STRUCTURE;
+    }
+
+    /**
+     * The single non-header payload member name for the blob/string arms. These arms are only
+     * reached when {@link #payloadKind} found exactly one such member, so absence is a codegen
+     * bug rather than a modeled state — fail fast.
+     */
+    private String requirePayloadMember(StructureShape event, PayloadKind kind) {
+        return event.getAllMembers().entrySet().stream()
+            .filter(e -> !e.getValue().hasTrait(EventHeaderTrait.class))
+            .map(Map.Entry::getKey)
+            .findFirst()
+            .orElseThrow(() -> new IllegalStateException(
+                "Event " + event.getId() + " classified as " + kind + " but has no payload member"));
+    }
+}
diff --git a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/renderers/RequestRenderer.java b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/renderers/RequestRenderer.java
index 0aa76dd779df..3751644a1187 100644
--- a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/renderers/RequestRenderer.java
+++ b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/renderers/RequestRenderer.java
@@ -6,22 +6,33 @@
 
 import com.amazonaws.util.awsclientsmithygenerator.generators.CppWriter;
 import com.amazonaws.util.awsclientsmithygenerator.generators.CppWriterDelegator;
+import com.amazonaws.util.awsclientsmithygenerator.generators.model.CppNames;
 import com.amazonaws.util.awsclientsmithygenerator.generators.model.CppTypeMapper;
 import com.amazonaws.util.awsclientsmithygenerator.generators.model.MemberRenderer;
-import com.amazonaws.util.awsclientsmithygenerator.generators.model.protocol.ProtocolTraits;
+import com.amazonaws.util.awsclientsmithygenerator.generators.model.protocol.FileKind;
+import com.amazonaws.util.awsclientsmithygenerator.generators.model.RenderContext;
 import com.amazonaws.util.awsclientsmithygenerator.generators.model.ShapeClassifier;
 import com.amazonaws.util.awsclientsmithygenerator.generators.model.ShapeClassifier.RequestInfo;
 import com.amazonaws.util.awsclientsmithygenerator.generators.model.ShapeRenderer;
-import software.amazon.smithy.model.Model;
+import software.amazon.smithy.model.node.BooleanNode;
+import software.amazon.smithy.model.node.Node;
+import software.amazon.smithy.model.node.NodeVisitor;
+import software.amazon.smithy.model.node.StringNode;
+import software.amazon.smithy.aws.traits.HttpChecksumTrait;
 import software.amazon.smithy.model.shapes.MemberShape;
 import software.amazon.smithy.model.shapes.OperationShape;
-import software.amazon.smithy.model.shapes.ServiceShape;
 import software.amazon.smithy.model.shapes.StructureShape;
+import software.amazon.smithy.model.traits.DocumentationTrait;
+import software.amazon.smithy.model.traits.HttpChecksumRequiredTrait;
+import software.amazon.smithy.model.traits.RequestCompressionTrait;
 import software.amazon.smithy.rulesengine.traits.ContextParamTrait;
 import software.amazon.smithy.rulesengine.traits.StaticContextParamsTrait;
 
+import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.TreeSet;
 
@@ -31,23 +42,11 @@
 public final class RequestRenderer implements ShapeRenderer {
 
     private final List<RequestInfo> requests;
-    private final Model model;
-    private final ServiceShape service;
-    private final ProtocolTraits protocolTraits;
-    private final String namespace;
-    private final String exportMacro;
-    private final String smithyServiceName;
-
-    public RequestRenderer(List<RequestInfo> requests, Model model, ServiceShape service,
-                           ProtocolTraits protocolTraits, String namespace, String exportMacro,
-                           String smithyServiceName) {
+    private final RenderContext ctx;
+
+    public RequestRenderer(List<RequestInfo> requests, RenderContext ctx) {
         this.requests = requests;
-        this.model = model;
-        this.service = service;
-        this.protocolTraits = protocolTraits;
-        this.namespace = namespace;
-        this.exportMacro = exportMacro;
-        this.smithyServiceName = smithyServiceName;
+        this.ctx = ctx;
     }
 
     @Override
@@ -59,48 +58,68 @@ public void render(CppWriterDelegator writerDelegator) {
     }
 
     private void renderHeader(CppWriterDelegator writerDelegator,
-                              StructureShape shape, OperationShape operation) {
+                              StructureShape rawShape, OperationShape operation) {
         String className = operation.getId().getName() + "Request";
-        String fileName = "include/aws/" + smithyServiceName + "/model/" + className + ".h";
+        // A request with a raw streaming @httpPayload member derives from Streaming<Prefix>Request,
+        // whose base (AmazonStreamingWebServiceRequest) supplies GetBody/SetBody and
+        // GetContentType/SetContentType, and emits no SerializePayload. Matching C2J: contentType
+        // is stripped from the model entirely (affects includes AND rendering), while the payload
+        // member stays for include computation but is skipped in accessor/private rendering.
+        boolean rawStreamingPayload = ShapeClassifier.isRawStreamingPayloadRequest(operation, ctx.model());
+        // An event-stream (input) member targets a @streaming union: C2J renders it as a
+        // std::shared_ptr<Union> with a collision-renamed getter and an inline empty
+        // SerializePayload + GetBody() override, so it is excluded from the generic member path.
+        Optional<String> eventStreamMember = ShapeClassifier.eventStreamMemberName(rawShape, ctx.model());
+        StructureShape includeShape = rawStreamingPayload
+            ? shapeExcluding(rawShape, Set.of("contentType", "ContentType")) : rawShape;
+        StructureShape shape = renderedShape(rawShape, operation);
+        String fileName = "include/aws/" + ctx.smithyServiceName() + "/model/" + className + ".h";
         writerDelegator.useFileWriter(fileName, writer -> {
             writer.write("#pragma once");
 
             Set<String> includes = new TreeSet<>();
-            includes.add("<aws/" + smithyServiceName + "/" + namespace + "_EXPORTS.h>");
-            includes.add("<aws/" + smithyServiceName + "/" + namespace + "Request.h>");
-            List<String> memberIncludes = CppTypeMapper.getIncludesForShape(shape, model, smithyServiceName);
+            includes.add("<aws/" + ctx.smithyServiceName() + "/" + ctx.namespace() + "_EXPORTS.h>");
+            includes.add("<aws/" + ctx.smithyServiceName() + "/" + ctx.namespace() + "Request.h>");
+            // NOTE: request headers do NOT include <aws/core/http/URI.h> even when they
+            // declare URI-taking methods (DumpBodyToUrl / AddQueryStringParameters). The
+            // base AmazonWebServiceRequest.h forward-declares Aws::Http::URI, which is
+            // sufficient for a reference parameter, and C2J relies on that forward decl.
+            List<String> memberIncludes = CppTypeMapper.getIncludesForShape(includeShape, ctx.model(), ctx.smithyServiceName());
             includes.addAll(memberIncludes);
-            for (String include : includes) {
-                writer.write("#include $L", include);
-            }
+            IncludeSets.emitAngleIncludes(writer, includes);
 
             boolean allPrimitive = shape.getAllMembers().values().stream()
-                .map(m -> model.expectShape(m.getTarget()))
+                .map(m -> ctx.model().expectShape(m.getTarget()))
                 .allMatch(CppTypeMapper::isPrimitive);
-            if (!allPrimitive) {
+            if (eventStreamMember.isPresent()) {
+                // The event-stream member is stored as std::shared_ptr<Union>.
+                writer.write("");
+                writer.write("#include <memory>");
+                writer.write("#include <utility>");
+            } else if (!allPrimitive) {
                 writer.write("");
                 writer.write("#include <utility>");
             }
 
-            boolean streamingResponse = ShapeClassifier.isEventStreamResponseOperation(operation, model);
-            boolean streamingRequest = ShapeClassifier.isEventStreamRequestOperation(operation, model);
+            boolean streamingResponse = ShapeClassifier.isEventStreamResponseOperation(operation, ctx.model());
+            boolean streamingRequest = ShapeClassifier.isEventStreamRequestOperation(operation, ctx.model());
             if (streamingResponse) {
                 writer.write("#include <aws/core/utils/event/EventStreamDecoder.h>");
-                writer.write("#include <aws/$1L/model/$2LHandler.h>", smithyServiceName, operation.getId().getName());
+                writer.write("#include <aws/$1L/model/$2LHandler.h>", ctx.smithyServiceName(), operation.getId().getName());
             }
             writer.write("");
 
-            writer.writeNamespaceOpen("Aws");
-            writer.writeNamespaceOpen(namespace);
-            writer.writeNamespaceOpen("Model");
+            ModelFile.modelNamespace(writer, ctx.namespace(), () -> {
             writer.write("");
 
-            MemberRenderer.renderClassDocComment(writer, shape, smithyServiceName, service.getVersion());
+            MemberRenderer.renderClassDocComment(writer, shape, ctx.smithyServiceName(), ctx.service().getVersion());
 
-            String baseClass = namespace + "Request";
+            // Raw-streaming-payload requests derive from Streaming<Prefix>Request (a typedef for
+            // AmazonStreamingWebServiceRequest declared in <Prefix>Request.h), matching C2J.
+            String baseClass = (rawStreamingPayload ? "Streaming" + ctx.namespace() : ctx.namespace()) + "Request";
             writer.openBlock("class $L : public $L {", "};", className, baseClass, () -> {
                 writer.write("public:");
-                writer.write("$L $L() = default;", exportMacro, className);
+                writer.write("$L $L() = default;", ctx.exportMacro(), className);
                 writer.write("");
 
                 writer.write("// Service request name is the Operation name which will send this request out,");
@@ -116,9 +135,20 @@ private void renderHeader(CppWriterDelegator writerDelegator,
                 if (streamingResponse) {
                     writer.write("inline virtual bool HasEventStreamResponse() const override { return true; }");
                 }
-                writer.write("$L Aws::String SerializePayload() const override;", exportMacro);
-                writer.write("");
-                writer.write("$L Aws::Http::HeaderValueCollection GetRequestSpecificHeaders() const override;", exportMacro);
+                if (eventStreamMember.isPresent()) {
+                    // The request body is sent as an encoded event stream via GetBody(), so
+                    // SerializePayload is an inline no-op (matches C2J RequestHeader.vm).
+                    writer.write("// SerializePayload will not be invoked.");
+                    writer.write("// This request is sent by encoding its data in event-streams which is sent as IOStream via GetBody()");
+                    writer.write("$L Aws::String SerializePayload() const override { return {}; }", ctx.exportMacro());
+                    writer.write("$L std::shared_ptr<Aws::IOStream> GetBody() const override;", ctx.exportMacro());
+                }
+                ctx.protocolTraits().writeRequestMethodDecls(writer, ctx.exportMacro(), shape, operation, ctx.model());
+                // Request-feature methods driven by operation traits, in C2J RequestHeader.vm order:
+                // @httpChecksum, @httpChecksumRequired (legacy Content-MD5), then @requestCompression.
+                renderChecksumDecls(writer, shape, operation);
+                renderContentMd5Decl(writer, operation);
+                renderRequestCompressionDecl(writer, operation);
 
                 if (streamingResponse) {
                     String handlerType = operation.getId().getName() + "Handler";
@@ -156,57 +186,109 @@ private void renderHeader(CppWriterDelegator writerDelegator,
                     writer.write("/**");
                     writer.write(" * Helper function to collect parameters (configurable and static hardcoded) required for endpoint computation.");
                     writer.write(" */");
-                    writer.write("$L EndpointParameters GetEndpointContextParams() const override;", exportMacro);
+                    writer.write("$L EndpointParameters GetEndpointContextParams() const override;", ctx.exportMacro());
                 }
 
                 writer.write("");
-                MemberRenderer.renderPublicSection(writer, shape, model, exportMacro, className);
+                MemberRenderer members = MemberRenderer.forStructure(ctx.model(), shape, className);
+                members.renderPublicAccessors(writer);
+                eventStreamMember.ifPresent(m ->
+                    renderEventStreamMemberAccessor(writer, className, rawShape, m));
 
-                if (!shape.getAllMembers().isEmpty()) {
+                boolean hasAnyMember = !shape.getAllMembers().isEmpty() || eventStreamMember.isPresent();
+                if (hasAnyMember) {
                     writer.dedent();
                     writer.write("private:");
                     writer.indent();
                     if (streamingResponse) {
-                        // Mainline places the handler/decoder after the data members and
-                        // before the HasBeenSet flags.
-                        MemberRenderer.renderPrivateDataMembers(writer, shape, model);
+                        // Mainline places the event-stream member, then the handler/decoder, after
+                        // the data members and before the HasBeenSet flags.
+                        members.renderDataMembers(writer);
+                        eventStreamMember.ifPresent(m -> writer.write("std::shared_ptr<$1L> m_$2L;",
+                            eventStreamUnionType(rawShape, m), CppNames.decapitalize(m)));
                         String handlerType = operation.getId().getName() + "Handler";
                         writer.write("$1L m_handler;", handlerType);
                         writer.write("Aws::Utils::Event::EventStreamDecoder m_decoder{Utils::Event::EventStreamDecoder(&m_handler)};");
                         writer.write("");
-                        MemberRenderer.renderPrivateHasBeenSetFlags(writer, shape, model);
+                        members.renderHasBeenSetFlags(writer);
+                        eventStreamMember.ifPresent(m ->
+                            writer.write("bool m_$1LHasBeenSet = false;", CppNames.decapitalize(m)));
                     } else {
-                        MemberRenderer.renderPrivateSection(writer, shape, model);
+                        members.renderPrivateSection(writer);
                     }
                 }
             });
             writer.write("");
-
-            writer.writeNamespaceClose("Model");
-            writer.writeNamespaceClose(namespace);
-            writer.writeNamespaceClose("Aws");
+            });
         });
     }
 
     private void renderSource(CppWriterDelegator writerDelegator,
-                              StructureShape shape, OperationShape operation) {
+                              StructureShape rawShape, OperationShape operation) {
         String className = operation.getId().getName() + "Request";
+        Optional<String> eventStreamMember = ShapeClassifier.eventStreamMemberName(rawShape, ctx.model());
+        // Render request-method impls from the same member-stripped shape as the header (see
+        // renderedShape): the declaration and definition gate GetRequestSpecificHeaders /
+        // AddQueryStringParameters on this shape, so they must agree or the source emits an
+        // out-of-line definition of a method the class never declares.
+        StructureShape shape = renderedShape(rawShape, operation);
         String fileName = "source/model/" + className + ".cpp";
         writerDelegator.useFileWriter(fileName, writer -> {
 
-            protocolTraits.writeSerdeInclude(writer);
-            writer.write("#include <aws/$L/model/$L.h>", smithyServiceName, className);
-            writer.write("");
-            writer.write("#include <utility>");
-            writer.write("");
+            // A request with stream members (a raw @httpPayload blob/string body, or an event-stream
+            // input) is sent via the request body stream, not a serialized JSON payload. C2J routes
+            // it through StreamRequestSource.vm: AmazonWebServiceResult.h + the Stream/Utils/Aws
+            // usings (not the JSON serde header/usings). The event-stream sub-case also defines
+            // GetBody() returning its encoder member.
+            boolean streaming = ShapeClassifier.isRawStreamingPayloadRequest(operation, ctx.model())
+                || eventStreamMember.isPresent();
+            if (streaming) {
+                List<String> includes = new ArrayList<>(
+                    IncludeSets.requestSourceBase(ctx.smithyServiceName(), className));
+                includes.add("aws/core/AmazonWebServiceResult.h");
+                includes.add("utility");
+                // A raw-streaming-payload request sends its body via the streaming base class (no
+                // protocol serde), but its header/query members still serialize, so the source
+                // needs HashingUtils.h (blob Base64) and AWSStringStream.h unconditionally. It must
+                // NOT pull the protocol serde header (e.g. JsonSerializer.h), matching C2J.
+                includes.add("aws/core/utils/HashingUtils.h");
+                includes.add("aws/core/utils/memory/stl/AWSStringStream.h");
+                IncludeSets.emit(writer, includes);
+                writer.write("");
+                writer.write("using namespace Aws::$L::Model;", ctx.namespace());
+                writer.write("using namespace Aws::Utils::Stream;");
+                writer.write("using namespace Aws::Utils;");
+                writer.write("using namespace Aws;");
+                writer.write("");
+                eventStreamMember.ifPresent(m -> {
+                    writer.write("std::shared_ptr<Aws::IOStream> $L::GetBody() const { return m_$L; }",
+                        className, CppNames.decapitalize(m));
+                    writer.write("");
+                });
+                // Header/query method bodies (SerializePayload is gated off for streaming requests).
+                ctx.protocolTraits().writeRequestMethodImpls(writer, className, shape, operation, ctx.service(), ctx.model());
+                renderChecksumImpls(writer, className, shape, operation);
+                renderRequestCompressionImpl(writer, className, operation, true);
+                if (hasEndpointContextParams(operation, shape)) {
+                    writer.write("");
+                    renderEndpointContextParams(writer, className, operation, shape);
+                }
+                writer.write("");
+                return;
+            }
 
-            writer.write("using namespace Aws::$L::Model;", namespace);
-            protocolTraits.writeSerdeUsingDeclarations(writer);
+            IncludeSets.emitSourceIncludes(writer,
+                IncludeSets.requestSourceBase(ctx.smithyServiceName(), className),
+                ctx.protocolTraits(), FileKind.REQUEST_SOURCE);
             writer.write("");
 
-            writer.write("Aws::String $L::SerializePayload() const { return \"{}\"; }", className);
+            writer.write("using namespace Aws::$L::Model;", ctx.namespace());
+            IncludeSets.emitUsings(writer, ctx.protocolTraits().serdeUsings(FileKind.REQUEST_SOURCE));
             writer.write("");
-            writer.write("Aws::Http::HeaderValueCollection $L::GetRequestSpecificHeaders() const { return {}; }", className);
+
+            ctx.protocolTraits().writeRequestMethodImpls(writer, className, shape, operation, ctx.service(), ctx.model());
+            renderChecksumImpls(writer, className, shape, operation);
+            renderRequestCompressionImpl(writer, className, operation, false);
 
             if (hasEndpointContextParams(operation, shape)) {
                 writer.write("");
@@ -216,6 +298,253 @@ private void renderSource(CppWriterDelegator writerDelegator,
         });
     }
 
+    /**
+     * The shape whose members drive request-method rendering. Raw-streaming-payload requests strip
+     * {@code contentType} (supplied by the streaming base's GetContentType/SetContentType) and the
+     * {@code @httpPayload} member (sent via the body stream); an event-stream input member is
+     * rendered separately, not through the generic member path. Both the header (declarations) and
+     * the source (definitions) MUST render from this same shape so their emitted method sets stay
+     * in sync.
+     */
+    private StructureShape renderedShape(StructureShape rawShape, OperationShape operation) {
+        Set<String> excluded = new HashSet<>();
+        if (ShapeClassifier.isRawStreamingPayloadRequest(operation, ctx.model())) {
+            // isRawStreamingPayloadRequest guarantees a payload member; absence is a codegen bug.
+            String payloadMember = ShapeClassifier.rawStreamingPayloadMemberName(rawShape, ctx.model())
+                .orElseThrow(() -> new IllegalStateException(
+                    "Raw streaming payload request without a payload member: " + rawShape.getId()));
+            excluded.add("contentType");
+            excluded.add("ContentType");
+            excluded.add(payloadMember);
+        }
+        ShapeClassifier.eventStreamMemberName(rawShape, ctx.model()).ifPresent(excluded::add);
+        return excluded.isEmpty() ? rawShape : shapeExcluding(rawShape, excluded);
+    }
+
+    /** Builds a copy of {@code shape} with the named members removed (null names are ignored). */
+    private StructureShape shapeExcluding(StructureShape shape, Set<String> excluded) {
+        StructureShape.Builder builder = StructureShape.builder().id(shape.getId());
+        shape.getAllTraits().values().forEach(builder::addTrait);
+        for (MemberShape member : shape.getAllMembers().values()) {
+            if (excluded.contains(member.getMemberName())) {
+                continue;
+            }
+            builder.addMember(member.getMemberName(), member.getTarget(),
+                b -> member.getAllTraits().values().forEach(b::addTrait));
+        }
+        return builder.build();
+    }
+
+    /** The C++ type name of the {@code @streaming} union targeted by the event-stream member. */
+    private String eventStreamUnionType(StructureShape shape, String memberName) {
+        MemberShape member = shape.getAllMembers().get(memberName);
+        return member.getTarget().getName();
+    }
+
+    /**
+     * Renders the accessor block for an event-stream (input) member: a {@code std::shared_ptr<Union>}
+     * getter/setter/wither. The getter is renamed to {@code GetMember<Name>} because {@code GetBody}
+     * is reserved by the streaming request base (matches C2J's collision handling).
+     */
+    private void renderEventStreamMemberAccessor(CppWriter writer, String className,
+                                                 StructureShape shape, String memberName) {
+        String unionType = eventStreamUnionType(shape, memberName);
+        String cap = CppNames.capitalize(memberName);
+        String field = CppNames.fieldName(memberName);
+        String getter = cap.equals("Body") ? "GetMemberBody" : "Get" + cap;
+        writer.write("");
+        writer.write("///@{");
+        MemberShape member = shape.getAllMembers().get(memberName);
+        if (member.getTrait(DocumentationTrait.class).isPresent()) {
+            MemberRenderer.writeDocComment(writer, MemberRenderer.collapseWhitespace(
+                member.getTrait(DocumentationTrait.class).get().getValue()));
+        }
+        writer.write("$1L std::shared_ptr<$2L> $3L() const { return $4L; }", ctx.exportMacro(), unionType, getter, field);
+        writer.openBlock("$1L void Set$2L(const std::shared_ptr<$3L>& value) {", "}", ctx.exportMacro(), cap, unionType, () -> {
+            writer.write("$1LHasBeenSet = true;", field);
+            writer.write("$1L = value;", field);
+        });
+        writer.openBlock("$1L $2L& With$3L(const std::shared_ptr<$4L>& value) {", "}",
+            ctx.exportMacro(), className, cap, unionType, () -> {
+            writer.write("Set$1L(value);", cap);
+            writer.write("return *this;");
+        });
+        writer.write("///@}");
+    }
+
+    /**
+     * Declares the request methods for an operation carrying {@code @httpChecksum}, gated per
+     * sub-field, matching C2J's RequestHeader.vm:89-104:
+     * <ul>
+     *   <li>{@code requestAlgorithmMember} → {@code GetChecksumAlgorithmName} / {@code ChecksumAlgorithmIsSet}</li>
+     *   <li>{@code requestValidationModeMember} → {@code ShouldValidateResponseChecksum}</li>
+     *   <li>{@code requestChecksumRequired} → inline {@code RequestChecksumRequired}</li>
+     *   <li>{@code responseAlgorithms} → {@code GetResponseChecksumAlgorithmNames}</li>
+     * </ul>
+     * All override base {@code AmazonWebServiceRequest} virtuals; no extra includes are needed.
+     */
+    private void renderChecksumDecls(CppWriter writer, StructureShape shape, OperationShape operation) {
+        Optional<HttpChecksumTrait> maybeTrait = operation.getTrait(HttpChecksumTrait.class);
+        if (maybeTrait.isEmpty()) {
+            return;
+        }
+        HttpChecksumTrait trait = maybeTrait.get();
+        if (trait.getRequestAlgorithmMember().isPresent()) {
+            writer.write("$L Aws::String GetChecksumAlgorithmName() const override;", ctx.exportMacro());
+            writer.write("$L bool ChecksumAlgorithmIsSet() const override;", ctx.exportMacro());
+        }
+        if (trait.getRequestValidationModeMember().isPresent()) {
+            writer.write("$L bool ShouldValidateResponseChecksum() const override;", ctx.exportMacro());
+        }
+        if (trait.isRequestChecksumRequired()) {
+            writer.write("inline bool RequestChecksumRequired() const override { return true; };");
+        }
+        if (!trait.getResponseAlgorithms().isEmpty()) {
+            writer.write("$L Aws::Vector<Aws::String> GetResponseChecksumAlgorithmNames() const override;", ctx.exportMacro());
+        }
+    }
+
+    /**
+     * Defines the {@code @httpChecksum} request methods, matching C2J's ModelClassChecksumMembers.vm.
+     * {@code GetChecksumAlgorithmName} defaults to {@code "crc64nvme"} when the algorithm member is
+     * unset, else maps the enum via its generated Mapper. The bodies read only the request's own
+     * enum members, so they are independent of the (stubbed) payload serde.
+     */
+    private void renderChecksumImpls(CppWriter writer, String className, StructureShape shape,
+                                     OperationShape operation) {
+        Optional<HttpChecksumTrait> maybeTrait = operation.getTrait(HttpChecksumTrait.class);
+        if (maybeTrait.isEmpty()) {
+            return;
+        }
+        HttpChecksumTrait trait = maybeTrait.get();
+        trait.getRequestAlgorithmMember().ifPresent(memberName -> {
+            String enumType = checksumMemberEnumType(shape, operation, memberName);
+            String field = CppNames.fieldName(memberName);
+            writer.openBlock("Aws::String $L::GetChecksumAlgorithmName() const {", "}", className, () -> {
+                writer.openBlock("if ($L == $L::NOT_SET) {", "}", field, enumType, () ->
+                    writer.write("return \"crc64nvme\";"));
+                writer.openBlock("else {", "}", () ->
+                    writer.write("return $1LMapper::GetNameFor$1L($2L);", enumType, field));
+            });
+            writer.write("");
+            writer.openBlock("bool $L::ChecksumAlgorithmIsSet() const {", "}", className, () ->
+                writer.write("return $L != $L::NOT_SET;", field, enumType));
+            writer.write("");
+        });
+        trait.getRequestValidationModeMember().ifPresent(memberName -> {
+            String enumType = checksumMemberEnumType(shape, operation, memberName);
+            String field = CppNames.fieldName(memberName);
+            writer.openBlock("bool $L::ShouldValidateResponseChecksum() const {", "}", className, () ->
+                writer.write("return $L == $L::ENABLED;", field, enumType));
+            writer.write("");
+        });
+        if (!trait.getResponseAlgorithms().isEmpty()) {
+            writer.openBlock("Aws::Vector<Aws::String> $L::GetResponseChecksumAlgorithmNames() const {", "}",
+                className, () -> {
+                writer.write("Aws::Vector<Aws::String> responseChecksumAlgorithmNames;");
+                for (String algorithm : trait.getResponseAlgorithms()) {
+                    writer.write("responseChecksumAlgorithmNames.push_back(\"$L\");", algorithm);
+                }
+                writer.write("return responseChecksumAlgorithmNames;");
+            });
+            writer.write("");
+        }
+    }
+
+    /**
+     * Declares the inline {@code ShouldComputeContentMd5} override for an operation carrying the
+     * legacy {@code @httpChecksumRequired} trait ({@code smithy.api#httpChecksumRequired}), which
+     * requests a {@code Content-MD5} header. Distinct from the flexible {@code @httpChecksum} trait.
+     * C2J derives an internal {@code Shape.computeContentMd5} flag from it; here it reads the trait
+     * directly. Matches RequestHeader.vm:105-108 (no {@code .cpp} body).
+     */
+    private void renderContentMd5Decl(CppWriter writer, OperationShape operation) {
+        if (operation.hasTrait(HttpChecksumRequiredTrait.class)) {
+            writer.write("");
+            writer.write("$L inline bool ShouldComputeContentMd5() const override { return true; }", ctx.exportMacro());
+        }
+    }
+
+    /** The C++ enum type name of a checksum algorithm/validation-mode member named by @httpChecksum. */
+    private String checksumMemberEnumType(StructureShape shape, OperationShape operation, String memberName) {
+        MemberShape member = shape.getAllMembers().get(memberName);
+        if (member == null) {
+            throw new RuntimeException("@httpChecksum on " + operation.getId()
+                + " references member '" + memberName + "' not present on " + shape.getId());
+        }
+        return CppTypeMapper.cppShapeName(ctx.model().expectShape(member.getTarget()));
+    }
+
+    /**
+     * Declares {@code GetSelectedCompressionAlgorithm} for an operation carrying
+     * {@code @requestCompression}. The method overrides a base {@code AmazonWebServiceRequest}
+     * virtual, so no extra include is needed. Only gzip is supported (validated), so the
+     * declaration is always guarded by {@code ENABLED_ZLIB_REQUEST_COMPRESSION}. Matches C2J's
+     * {@code RequestHeader.vm}.
+     */
+    private void renderRequestCompressionDecl(CppWriter writer, OperationShape operation) {
+        if (!operation.hasTrait(RequestCompressionTrait.class)) {
+            return;
+        }
+        validateGzipEncoding(operation);
+        writer.write("");
+        writer.write("#ifdef ENABLED_ZLIB_REQUEST_COMPRESSION");
+        writer.write("virtual Aws::Client::CompressionAlgorithm GetSelectedCompressionAlgorithm(Aws::Client::RequestCompressionConfig config) const override;");
+        writer.write("#endif");
+    }
+
+    /**
+     * Defines {@code GetSelectedCompressionAlgorithm}. Streaming requests can't size their body up
+     * front, so they compress whenever enabled; non-streaming requests skip compression below the
+     * configured minimum body size. Matches C2J's ModelClassRequiredCompression[Stream].vm. This
+     * body only reads the already-serialized body via the base {@code GetBody()}, so it is
+     * independent of the (currently stubbed) payload serde.
+     */
+    private void renderRequestCompressionImpl(CppWriter writer, String className,
+                                              OperationShape operation, boolean streaming) {
+        if (!operation.hasTrait(RequestCompressionTrait.class)) {
+            return;
+        }
+        writer.write("#ifdef ENABLED_ZLIB_REQUEST_COMPRESSION");
+        writer.openBlock("Aws::Client::CompressionAlgorithm $L::GetSelectedCompressionAlgorithm(Aws::Client::RequestCompressionConfig config) const {", "}",
+            className, () -> {
+            writer.openBlock("if (config.useRequestCompression == Aws::Client::UseRequestCompression::DISABLE) {", "}", () ->
+                writer.write("return Aws::Client::CompressionAlgorithm::NONE;"));
+            if (streaming) {
+                writer.openBlock("else {", "}", () ->
+                    writer.write("return Aws::Client::CompressionAlgorithm::GZIP;"));
+            } else {
+                writer.write("");
+                writer.write("const auto& body = AmazonSerializableWebServiceRequest::GetBody();");
+                writer.write("body->seekg(0, body->end);");
+                writer.write("size_t bodySize = body->tellg();");
+                writer.write("body->seekg(0, body->beg);");
+                writer.openBlock("if (bodySize < config.requestMinCompressionSizeBytes) {", "}", () ->
+                    writer.write("return Aws::Client::CompressionAlgorithm::NONE;"));
+                writer.openBlock("else {", "}", () ->
+                    writer.write("return Aws::Client::CompressionAlgorithm::GZIP;"));
+            }
+        });
+        writer.write("#endif");
+    }
+
+    /**
+     * Enforces the C2J contract that {@code @requestCompression} declares exactly the gzip encoding
+     * (the only algorithm the SDK supports). Fails fast on an empty or unsupported encoding list,
+     * mirroring the legacy C2J transformer.
+     */
+    private static void validateGzipEncoding(OperationShape operation) {
+        List<String> encodings = operation.expectTrait(RequestCompressionTrait.class).getEncodings();
+        if (encodings.isEmpty()) {
+            throw new RuntimeException("@requestCompression on " + operation.getId()
+                + " must declare at least one encoding.");
+        }
+        if (encodings.size() != 1 || !"gzip".equals(encodings.get(0))) {
+            throw new RuntimeException("@requestCompression only supports the gzip algorithm, but "
+                + operation.getId() + " declares: " + encodings);
+        }
+    }
+
     private boolean hasEndpointContextParams(OperationShape operation, StructureShape shape) {
         if (operation.hasTrait(StaticContextParamsTrait.class)) {
             return true;
@@ -237,26 +566,8 @@ private void renderEndpointContextParams(CppWriter writer, String className,
             if (operation.hasTrait(StaticContextParamsTrait.class)) {
                 writer.write("// Static context parameters");
                 StaticContextParamsTrait staticParams = operation.expectTrait(StaticContextParamsTrait.class);
-                staticParams.getParameters().forEach((name, def) -> {
-                    def.getValue().accept(new software.amazon.smithy.model.node.NodeVisitor.Default<Void>() {
-                        @Override
-                        protected Void getDefault(software.amazon.smithy.model.node.Node node) {
-                            return null;
-                        }
-                        @Override
-                        public Void stringNode(software.amazon.smithy.model.node.StringNode node) {
-                            writer.write("parameters.emplace_back(Aws::String(\"$L\"), \"$L\", Aws::Endpoint::EndpointParameter::ParameterOrigin::STATIC_CONTEXT);",
-                                name, node.getValue());
-                            return null;
-                        }
-                        @Override
-                        public Void booleanNode(software.amazon.smithy.model.node.BooleanNode node) {
-                            writer.write("parameters.emplace_back(Aws::String(\"$L\"), $L, Aws::Endpoint::EndpointParameter::ParameterOrigin::STATIC_CONTEXT);",
-                                name, node.getValue());
-                            return null;
-                        }
-                    });
-                });
+                staticParams.getParameters().forEach((name, def) ->
+                    appendStaticContextParam(writer, name, def.getValue()));
             }
 
             boolean hasContextParams = shape.getAllMembers().values().stream()
@@ -269,7 +580,7 @@ public Void booleanNode(software.amazon.smithy.model.node.BooleanNode node) {
                         ContextParamTrait contextParam = member.expectTrait(ContextParamTrait.class);
                         String paramName = contextParam.getName();
                         String memberName = entry.getKey();
-                        String capitalizedMember = memberName.substring(0, 1).toUpperCase() + memberName.substring(1);
+                        String capitalizedMember = CppNames.capitalize(memberName);
                         writer.openBlock("if ($LHasBeenSet()) {", "}", capitalizedMember, () -> {
                             writer.write("parameters.emplace_back(Aws::String(\"$L\"), this->Get$L(), Aws::Endpoint::EndpointParameter::ParameterOrigin::OPERATION_CONTEXT);",
                                 paramName, capitalizedMember);
@@ -282,4 +593,25 @@ public Void booleanNode(software.amazon.smithy.model.node.BooleanNode node) {
         });
     }
 
+    private void appendStaticContextParam(CppWriter writer, String name, Node value) {
+        value.accept(new NodeVisitor.Default<Void>() {
+            @Override
+            protected Void getDefault(Node node) {
+                return null;
+            }
+            @Override
+            public Void stringNode(StringNode node) {
+                writer.write("parameters.emplace_back(Aws::String(\"$L\"), \"$L\", Aws::Endpoint::EndpointParameter::ParameterOrigin::STATIC_CONTEXT);",
+                    name, node.getValue());
+                return null;
+            }
+            @Override
+            public Void booleanNode(BooleanNode node) {
+                writer.write("parameters.emplace_back(Aws::String(\"$L\"), $L, Aws::Endpoint::EndpointParameter::ParameterOrigin::STATIC_CONTEXT);",
+                    name, node.getValue());
+                return null;
+            }
+        });
+    }
+
 }
diff --git a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/renderers/ResultRenderer.java b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/renderers/ResultRenderer.java
index 726f16d4f9f8..dbd565fe9b57 100644
--- a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/renderers/ResultRenderer.java
+++ b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/renderers/ResultRenderer.java
@@ -5,20 +5,21 @@
 package com.amazonaws.util.awsclientsmithygenerator.generators.model.renderers;
 
 import com.amazonaws.util.awsclientsmithygenerator.generators.CppWriterDelegator;
+import com.amazonaws.util.awsclientsmithygenerator.generators.model.CppNames;
 import com.amazonaws.util.awsclientsmithygenerator.generators.model.CppTypeMapper;
 import com.amazonaws.util.awsclientsmithygenerator.generators.model.MemberRenderer;
-import com.amazonaws.util.awsclientsmithygenerator.generators.model.protocol.ProtocolTraits;
+import com.amazonaws.util.awsclientsmithygenerator.generators.model.protocol.FileKind;
+import com.amazonaws.util.awsclientsmithygenerator.generators.model.RenderContext;
 import com.amazonaws.util.awsclientsmithygenerator.generators.model.ShapeClassifier.ResultInfo;
 import com.amazonaws.util.awsclientsmithygenerator.generators.model.ShapeRenderer;
-import software.amazon.smithy.model.Model;
+import software.amazon.smithy.model.shapes.MemberShape;
 import software.amazon.smithy.model.shapes.OperationShape;
-import software.amazon.smithy.model.shapes.ServiceShape;
 import software.amazon.smithy.model.shapes.StructureShape;
 import software.amazon.smithy.model.traits.DocumentationTrait;
+import software.amazon.smithy.model.traits.HttpPayloadTrait;
 
 import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
+import java.util.Map;
 
 /**
  * Renders C++ headers and sources for result (operation output) shapes.
@@ -26,133 +27,262 @@
 public final class ResultRenderer implements ShapeRenderer {
 
     private final List<ResultInfo> results;
-    private final Model model;
-    private final ServiceShape service;
-    private final ProtocolTraits protocolTraits;
-    private final String namespace;
-    private final String exportMacro;
-    private final String smithyServiceName;
-
-    public ResultRenderer(List<ResultInfo> results, Model model, ServiceShape service,
-                          ProtocolTraits protocolTraits, String namespace, String exportMacro,
-                          String smithyServiceName) {
+    private final RenderContext ctx;
+
+    public ResultRenderer(List<ResultInfo> results, RenderContext ctx) {
         this.results = results;
-        this.model = model;
-        this.service = service;
-        this.protocolTraits = protocolTraits;
-        this.namespace = namespace;
-        this.exportMacro = exportMacro;
-        this.smithyServiceName = smithyServiceName;
+        this.ctx = ctx;
     }
 
     @Override
     public void render(CppWriterDelegator writerDelegator) {
         for (ResultInfo resInfo : results) {
-            renderHeader(writerDelegator, resInfo.shape(), resInfo.operation());
-            renderSource(writerDelegator, resInfo.shape(), resInfo.operation());
+            if (resInfo.streaming()) {
+                renderStreamingHeader(writerDelegator, resInfo.shape(), resInfo.operation());
+                renderStreamingSource(writerDelegator, resInfo.shape(), resInfo.operation());
+            } else {
+                renderHeader(writerDelegator, resInfo.shape(), resInfo.operation());
+                renderSource(writerDelegator, resInfo.shape(), resInfo.operation());
+            }
         }
     }
 
+    /**
+     * The name of the {@code @httpPayload} streaming member. Only called for results the
+     * classifier already flagged as streaming, so a missing payload member is a codegen bug
+     * rather than a modeled state — fail fast instead of returning null.
+     */
+    private String streamingPayloadMemberName(StructureShape shape) {
+        for (Map.Entry<String, MemberShape> entry : shape.getAllMembers().entrySet()) {
+            if (entry.getValue().hasTrait(HttpPayloadTrait.class)) {
+                return entry.getKey();
+            }
+        }
+        throw new IllegalStateException(
+            "Streaming result " + shape.getId() + " has no @httpPayload member");
+    }
+
     private void renderHeader(CppWriterDelegator writerDelegator,
                               StructureShape shape, OperationShape operation) {
         String className = operation.getId().getName() + "Result";
-        String fileName = "include/aws/" + smithyServiceName + "/model/" + className + ".h";
+        String fileName = "include/aws/" + ctx.smithyServiceName() + "/model/" + className + ".h";
         writerDelegator.useFileWriter(fileName, writer -> {
             writer.write("#pragma once");
 
-            Set<String> includes = new TreeSet<>();
-            includes.add("<aws/core/http/HttpResponse.h>");
-            includes.add("<aws/core/utils/memory/stl/AWSString.h>");
-            includes.add("<aws/" + smithyServiceName + "/" + namespace + "_EXPORTS.h>");
-            List<String> memberIncludes = CppTypeMapper.getIncludesForShape(shape, model, smithyServiceName);
-            includes.addAll(memberIncludes);
-            for (String include : includes) {
-                writer.write("#include $L", include);
+            // AWSString.h is only needed for the top-level m_requestId; string-typed members
+            // bring their own include via getIncludesForShape. Matches C2J include hygiene.
+            List<String> includes = new java.util.ArrayList<>(IncludeSets.resultHeaderBase(
+                ctx.smithyServiceName(), ctx.namespace(), ctx.protocolTraits().resultHasTopLevelRequestId()));
+            for (String memberInc : CppTypeMapper.getIncludesForShape(shape, ctx.model(), ctx.smithyServiceName())) {
+                includes.add(memberInc);
             }
+            // Protocols whose result-header serde types are named in the class signature (CBOR:
+            // CborValue) add their own header here; JSON/XML forward-declare and add nothing.
+            includes.addAll(ctx.protocolTraits().serdeIncludes(FileKind.RESULT_HEADER));
+            IncludeSets.emitAngleIncludes(writer, includes);
 
             writer.write("");
             writer.write("#include <utility>");
             writer.write("");
 
-            writer.writeNamespaceOpen("Aws");
+            ModelFile.modelNamespace(writer, ctx.namespace(),
+                () -> {
             writer.write("template <typename RESULT_TYPE>");
             writer.write("class AmazonWebServiceResult;");
             writer.write("");
-            protocolTraits.writeResultForwardDeclarations(writer);
-
-            writer.writeNamespaceOpen(namespace);
-            writer.writeNamespaceOpen("Model");
+            ctx.protocolTraits().writeResultForwardDeclarations(writer);
+                },
+                () -> {
 
             if (shape.getTrait(DocumentationTrait.class).isPresent()) {
-                MemberRenderer.renderClassDocComment(writer, shape, smithyServiceName, service.getVersion());
+                MemberRenderer.renderClassDocComment(writer, shape, ctx.smithyServiceName(), ctx.service().getVersion());
             }
 
             writer.openBlock("class $L {", "};", className, () -> {
                 writer.write("public:");
-                writer.write("$L $L() = default;", exportMacro, className);
-                protocolTraits.writeResultSerdeDecls(writer, exportMacro, className);
+                writer.write("$L $L() = default;", ctx.exportMacro(), className);
+                ctx.protocolTraits().writeResultSerdeDecls(writer, ctx.exportMacro(), className);
                 writer.write("");
 
-                MemberRenderer.renderPublicSectionForResult(writer, shape, model, exportMacro, className);
+                MemberRenderer members = MemberRenderer.forResult(ctx.model(), shape, className)
+                    .wideIntegers(ctx.protocolTraits().widensIntegers());
+                members.renderPublicAccessors(writer);
 
+                boolean topLevelRequestId = ctx.protocolTraits().resultHasTopLevelRequestId();
+                if (topLevelRequestId) {
+                    MemberRenderer.renderRequestIdAccessors(writer, className);
+                }
+
+                writer.write("inline Aws::Http::HttpResponseCode GetHttpResponseCode() const { return m_HttpResponseCode; }");
                 writer.write("");
-                writer.write("///@{");
-                writer.write("");
-                writer.write("inline const Aws::String& GetRequestId() const { return m_requestId; }");
-                writer.write("template <typename RequestIdT = Aws::String>");
-                writer.openBlock("void SetRequestId(RequestIdT&& value) {", "}", () -> {
-                    writer.write("m_requestIdHasBeenSet = true;");
-                    writer.write("m_requestId = std::forward<RequestIdT>(value);");
-                });
-                writer.write("template <typename RequestIdT = Aws::String>");
-                writer.openBlock("$L& WithRequestId(RequestIdT&& value) {", "}", className, () -> {
-                    writer.write("SetRequestId(std::forward<RequestIdT>(value));");
-                    writer.write("return *this;");
+
+                writer.dedent();
+                writer.write("private:");
+                writer.indent();
+                members.renderDataMembers(writer);
+                if (topLevelRequestId) {
+                    // The blank line separates the modeled members from the m_requestId group;
+                    // C2J omits it (and m_requestId) for Query/EC2 results.
+                    writer.write("");
+                    writer.write("Aws::String m_requestId;");
+                }
+                writer.write("Aws::Http::HttpResponseCode m_HttpResponseCode;");
+                members.renderHasBeenSetFlags(writer);
+                if (topLevelRequestId) {
+                    writer.write("bool m_requestIdHasBeenSet = false;");
+                }
+            });
+            writer.write("");
                 });
+        });
+    }
+
+    private void renderSource(CppWriterDelegator writerDelegator,
+                              StructureShape shape, OperationShape operation) {
+        String className = operation.getId().getName() + "Result";
+        String fileName = "source/model/" + className + ".cpp";
+        writerDelegator.useFileWriter(fileName, writer -> {
+
+            IncludeSets.emitSourceIncludes(writer,
+                IncludeSets.resultSourceBase(ctx.smithyServiceName(), className),
+                ctx.protocolTraits(), FileKind.RESULT_SOURCE);
+            writer.write("");
+            writer.write("using namespace Aws::$L::Model;", ctx.namespace());
+            IncludeSets.emitUsings(writer, ctx.protocolTraits().serdeUsings(FileKind.RESULT_SOURCE));
+            writer.write("using namespace Aws;");
+            writer.write("");
+
+            ctx.protocolTraits().writeResultSerdeImpls(writer, className, shape, ctx.model(), ctx.namespace());
+            writer.write("");
+        });
+    }
+
+    /**
+     * Renders a streaming result header: a move-only class whose payload is an
+     * {@code Aws::Utils::Stream::ResponseStream} exposed via {@code GetBody()} /
+     * {@code ReplaceBody}, matching the legacy C2J {@code StreamResultHeader.vm} output.
+     */
+    private void renderStreamingHeader(CppWriterDelegator writerDelegator,
+                                       StructureShape shape, OperationShape operation) {
+        String className = operation.getId().getName() + "Result";
+        String streamMember = streamingPayloadMemberName(shape);
+        String fileName = "include/aws/" + ctx.smithyServiceName() + "/model/" + className + ".h";
+        writerDelegator.useFileWriter(fileName, writer -> {
+            writer.write("#pragma once");
+
+            List<String> includes = new java.util.ArrayList<>(
+                IncludeSets.streamingResultHeaderBase(ctx.smithyServiceName(), ctx.namespace()));
+            for (String memberInc : CppTypeMapper.getIncludesForShape(shape, ctx.model(), ctx.smithyServiceName())) {
+                includes.add(memberInc);
+            }
+            IncludeSets.emitAngleIncludes(writer, includes);
+
+            writer.write("");
+            writer.write("#include <utility>");
+            writer.write("");
+
+            ModelFile.modelNamespace(writer, ctx.namespace(),
+                () -> {
+            writer.write("template <typename RESULT_TYPE>");
+            writer.write("class AmazonWebServiceResult;");
+            writer.write("");
+                },
+                () -> {
+
+            if (shape.getTrait(DocumentationTrait.class).isPresent()) {
+                MemberRenderer.renderClassDocComment(writer, shape, ctx.smithyServiceName(), ctx.service().getVersion());
+            }
+
+            writer.openBlock("class $L {", "};", className, () -> {
+                writer.write("public:");
+                writer.write("$L $L() = default;", ctx.exportMacro(), className);
+                writer.write("$L $L($L&&) = default;", ctx.exportMacro(), className, className);
+                writer.write("$L $L& operator=($L&&) = default;", ctx.exportMacro(), className, className);
+                writer.write("// we delete these because Microsoft doesn't handle move generation correctly");
+                writer.write("// and we therefore don't trust them to get it right here either.");
+                writer.write("$L(const $L&) = delete;", className, className);
+                writer.write("$L& operator=(const $L&) = delete;", className, className);
+                writer.write("");
+                writer.write("$L $L(Aws::AmazonWebServiceResult<Aws::Utils::Stream::ResponseStream>&& result);",
+                    ctx.exportMacro(), className);
+                writer.write("$L $L& operator=(Aws::AmazonWebServiceResult<Aws::Utils::Stream::ResponseStream>&& result);",
+                    ctx.exportMacro(), className);
+                writer.write("");
+
+                // Streaming payload accessors (no Set/With/HasBeenSet for the stream member).
+                // The getter is named after the member (GetBody, GetAudioStream, GetResponse);
+                // ReplaceBody stays literal, matching C2J StreamResultHeader.vm.
+                String streamField = CppNames.fieldName(streamMember);
+                writer.write("///@{");
+                shape.getMember(streamMember)
+                    .flatMap(m -> m.getTrait(DocumentationTrait.class))
+                    .ifPresent(doc -> MemberRenderer.writeDocComment(writer,
+                        MemberRenderer.collapseWhitespace(doc.getValue())));
+                writer.write("inline Aws::IOStream& Get$L() const { return $L.GetUnderlyingStream(); }",
+                    CppNames.capitalize(streamMember), streamField);
+                writer.write("inline void ReplaceBody(Aws::IOStream* body) { "
+                    + "$L = Aws::Utils::Stream::ResponseStream(body); }", streamField);
                 writer.write("///@}");
 
+                MemberRenderer members = MemberRenderer.forResult(ctx.model(), shape, className)
+                    .wideIntegers(ctx.protocolTraits().widensIntegers())
+                    .excluding(streamMember);
+                members.renderPublicAccessors(writer);
+
+                MemberRenderer.renderRequestIdAccessors(writer, className);
+
                 writer.write("inline Aws::Http::HttpResponseCode GetHttpResponseCode() const { return m_HttpResponseCode; }");
                 writer.write("");
 
                 writer.dedent();
                 writer.write("private:");
                 writer.indent();
-                MemberRenderer.renderPrivateDataMembers(writer, shape, model);
+                writer.write("Aws::Utils::Stream::ResponseStream $L{};", streamField);
+                members.renderDataMembers(writer);
                 writer.write("");
                 writer.write("Aws::String m_requestId;");
                 writer.write("Aws::Http::HttpResponseCode m_HttpResponseCode;");
-                MemberRenderer.renderPrivateHasBeenSetFlags(writer, shape, model);
+                writer.write("bool $LHasBeenSet = false;", streamField);
+                members.renderHasBeenSetFlags(writer);
                 writer.write("bool m_requestIdHasBeenSet = false;");
             });
             writer.write("");
-
-            writer.writeNamespaceClose("Model");
-            writer.writeNamespaceClose(namespace);
-            writer.writeNamespaceClose("Aws");
+                });
         });
     }
 
-    private void renderSource(CppWriterDelegator writerDelegator,
-                              StructureShape shape, OperationShape operation) {
+    /**
+     * Renders a streaming result source: the move ctor/assign take ownership of the
+     * response payload stream ({@code TakeOwnershipOfPayload}) rather than parsing a body.
+     */
+    private void renderStreamingSource(CppWriterDelegator writerDelegator,
+                                       StructureShape shape, OperationShape operation) {
         String className = operation.getId().getName() + "Result";
+        String streamField = CppNames.fieldName(streamingPayloadMemberName(shape));
         String fileName = "source/model/" + className + ".cpp";
         writerDelegator.useFileWriter(fileName, writer -> {
-
-            writer.write("#include <aws/core/AmazonWebServiceResult.h>");
-            writer.write("#include <aws/core/utils/StringUtils.h>");
-            writer.write("#include <aws/core/utils/UnreferencedParam.h>");
-            protocolTraits.writeSerdeInclude(writer);
-            writer.write("#include <aws/core/utils/memory/stl/AWSStringStream.h>");
-            writer.write("#include <aws/$L/model/$L.h>", smithyServiceName, className);
+            IncludeSets.emitSourceIncludes(writer,
+                IncludeSets.streamingResultSourceBase(ctx.smithyServiceName(), className),
+                ctx.protocolTraits(), FileKind.STREAMING_RESULT_SOURCE);
             writer.write("");
-            writer.write("#include <utility>");
-            writer.write("");
-            writer.write("using namespace Aws::$L::Model;", namespace);
-            protocolTraits.writeSerdeUsingDeclarations(writer);
+            writer.write("using namespace Aws::$L::Model;", ctx.namespace());
+            writer.write("using namespace Aws::Utils::Stream;");
+            writer.write("using namespace Aws::Utils;");
             writer.write("using namespace Aws;");
             writer.write("");
 
-            protocolTraits.writeResultSerdeImpls(writer, className);
+            writer.write("$L::$L(Aws::AmazonWebServiceResult<ResponseStream>&& result) { *this = std::move(result); }",
+                className, className);
+            writer.write("");
+            writer.openBlock("$L& $L::operator=(Aws::AmazonWebServiceResult<ResponseStream>&& result) {", "}",
+                className, className, () -> {
+                writer.write("m_HttpResponseCode = result.GetResponseCode();");
+                writer.write("$L = result.TakeOwnershipOfPayload();", streamField);
+                writer.write("$LHasBeenSet = true;", streamField);
+                writer.write("// TODO: header-bound member deserialization");
+                ctx.protocolTraits().writeResultStatusCodeMembers(writer, shape, ctx.model());
+                writer.write("return *this;");
+            });
             writer.write("");
         });
     }
diff --git a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/renderers/SubObjectRenderer.java b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/renderers/SubObjectRenderer.java
index ab4917422869..837c62e72f29 100644
--- a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/renderers/SubObjectRenderer.java
+++ b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/renderers/SubObjectRenderer.java
@@ -8,16 +8,13 @@
 import com.amazonaws.util.awsclientsmithygenerator.generators.CppWriterDelegator;
 import com.amazonaws.util.awsclientsmithygenerator.generators.model.CppTypeMapper;
 import com.amazonaws.util.awsclientsmithygenerator.generators.model.MemberRenderer;
-import com.amazonaws.util.awsclientsmithygenerator.generators.model.protocol.ProtocolTraits;
+import com.amazonaws.util.awsclientsmithygenerator.generators.model.protocol.FileKind;
+import com.amazonaws.util.awsclientsmithygenerator.generators.model.RenderContext;
 import com.amazonaws.util.awsclientsmithygenerator.generators.model.ShapeRenderer;
-import software.amazon.smithy.model.Model;
-import software.amazon.smithy.model.shapes.ServiceShape;
 import software.amazon.smithy.model.shapes.Shape;
-import software.amazon.smithy.model.shapes.StructureShape;
+import software.amazon.smithy.model.traits.StreamingTrait;
 
 import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
 
 /**
  * Renders C++ headers and sources for sub-object (intermediate structure) shapes.
@@ -25,55 +22,46 @@
 public final class SubObjectRenderer implements ShapeRenderer {
 
     private final List<Shape> subObjects;
-    private final Model model;
-    private final ServiceShape service;
-    private final ProtocolTraits protocolTraits;
-    private final String namespace;
-    private final String exportMacro;
-    private final String serviceName;
-    private final String smithyServiceName;
-
-    public SubObjectRenderer(List<Shape> subObjects, Model model, ServiceShape service,
-                             ProtocolTraits protocolTraits, String namespace, String exportMacro,
-                             String serviceName, String smithyServiceName) {
+    private final RenderContext ctx;
+
+    public SubObjectRenderer(List<Shape> subObjects, RenderContext ctx) {
         this.subObjects = subObjects;
-        this.model = model;
-        this.service = service;
-        this.protocolTraits = protocolTraits;
-        this.namespace = namespace;
-        this.exportMacro = exportMacro;
-        this.serviceName = serviceName;
-        this.smithyServiceName = smithyServiceName;
+        this.ctx = ctx;
     }
 
     @Override
     public void render(CppWriterDelegator writerDelegator) {
         for (Shape shape : subObjects) {
-            if (shape.isStructureShape()) {
-                StructureShape struct = shape.asStructureShape().get();
-                renderHeader(writerDelegator, struct);
-                renderSource(writerDelegator, struct);
+            // C2J models a union as a structure with "union": true and emits it through the same
+            // ModelClass templates, so structures and (non-streaming) unions render identically.
+            // @streaming unions are the event-stream shapes rendered by EventStreamRenderer /
+            // the outgoing-event-stream path; skip them here to avoid a double-write.
+            boolean isStruct = shape.isStructureShape();
+            boolean isDataUnion = shape.isUnionShape() && !shape.hasTrait(StreamingTrait.class);
+            if (isStruct || isDataUnion) {
+                renderHeader(writerDelegator, shape);
+                renderSource(writerDelegator, shape);
             }
         }
     }
 
-    private void renderHeader(CppWriterDelegator writerDelegator, StructureShape shape) {
-        String className = shape.getId().getName();
-        String fileName = "include/aws/" + smithyServiceName + "/model/" + className + ".h";
+    private void renderHeader(CppWriterDelegator writerDelegator, Shape shape) {
+        String className = CppTypeMapper.cppShapeName(shape);
+        String fileName = "include/aws/" + ctx.smithyServiceName() + "/model/" + className + ".h";
         writerDelegator.useFileWriter(fileName, writer -> {
             writer.write("#pragma once");
 
             // Includes
-            Set<String> includes = new TreeSet<>();
-            includes.add("<aws/" + smithyServiceName + "/" + namespace + "_EXPORTS.h>");
-            List<String> memberIncludes = CppTypeMapper.getIncludesForShape(shape, model, smithyServiceName);
-            includes.addAll(memberIncludes);
-            for (String include : includes) {
-                writer.write("#include $L", include);
+            List<String> includes = new java.util.ArrayList<>();
+            includes.add("aws/" + ctx.smithyServiceName() + "/" + ctx.namespace() + "_EXPORTS.h");
+            for (String memberInc : CppTypeMapper.getIncludesForShape(shape, ctx.model(), ctx.smithyServiceName())) {
+                includes.add(memberInc);
             }
+            includes.addAll(ctx.protocolTraits().serdeIncludes(FileKind.SUBOBJECT_HEADER));
+            IncludeSets.emitAngleIncludes(writer, includes);
 
             boolean allPrimitive = shape.getAllMembers().values().stream()
-                .map(m -> model.expectShape(m.getTarget()))
+                .map(m -> ctx.model().expectShape(m.getTarget()))
                 .allMatch(CppTypeMapper::isPrimitive);
             if (!allPrimitive) {
                 writer.write("");
@@ -81,57 +69,62 @@ private void renderHeader(CppWriterDelegator writerDelegator, StructureShape sha
             }
             writer.write("");
 
-            writer.writeNamespaceOpen("Aws");
-            protocolTraits.writeShapeForwardDeclarations(writer);
-            writer.writeNamespaceOpen(namespace);
-            writer.writeNamespaceOpen("Model");
+            ModelFile.modelNamespace(writer, ctx.namespace(),
+                () -> ctx.protocolTraits().writeShapeForwardDeclarations(writer),
+                () -> {
+            // Recursive member targets are forward-declared here (at Model scope) instead of
+            // included, breaking the reference cycle. Matches C2J's computeForwardDeclarations.
+            for (String fwd : CppTypeMapper.getForwardDeclarations(shape, ctx.model())) {
+                writer.write("class $L;", fwd);
+            }
             writer.write("");
 
-            MemberRenderer.renderClassDocComment(writer, shape, smithyServiceName, service.getVersion());
+            MemberRenderer.renderClassDocComment(writer, shape, ctx.smithyServiceName(), ctx.service().getVersion());
 
             writer.openBlock("class $L {", "};", className, () -> {
                 writer.write("public:");
-                protocolTraits.writeSerdeMethodDecls(writer, exportMacro, className, null);
-                writer.write("");
-                MemberRenderer.renderPublicSection(writer, shape, model, exportMacro, className);
-                writer.dedent();
-                writer.write("private:");
-                writer.indent();
-                MemberRenderer.renderPrivateSection(writer, shape, model);
+                ctx.protocolTraits().writeSerdeMethodDecls(writer, ctx.exportMacro(), className, null);
+                // A memberless shape ends right after its serde decls: C2J emits no accessors
+                // and no private: section (ModelClassMembersAndInlines.vm gates both on
+                // $shape.members.size() > 0).
+                if (!shape.getAllMembers().isEmpty()) {
+                    MemberRenderer members = MemberRenderer.forStructure(ctx.model(), shape, className)
+                        .wideIntegers(ctx.protocolTraits().widensIntegers());
+                    writer.write("");
+                    members.renderPublicAccessors(writer);
+                    writer.dedent();
+                    writer.write("private:");
+                    writer.indent();
+                    members.renderPrivateSection(writer);
+                }
             });
             writer.write("");
-
-            writer.writeNamespaceClose("Model");
-            writer.writeNamespaceClose(namespace);
-            writer.writeNamespaceClose("Aws");
+                });
         });
     }
 
-    private void renderSource(CppWriterDelegator writerDelegator, StructureShape shape) {
-        String className = shape.getId().getName();
+    private void renderSource(CppWriterDelegator writerDelegator, Shape shape) {
+        String className = CppTypeMapper.cppShapeName(shape);
         String fileName = "source/model/" + className + ".cpp";
         writerDelegator.useFileWriter(fileName, writer -> {
 
-            protocolTraits.writeSerdeInclude(writer);
-            writer.write("#include <aws/$L/model/$L.h>", smithyServiceName, className);
-            writer.write("");
-            writer.write("#include <utility>");
+            List<String> sourceBase = IncludeSets.subObjectSourceBase(ctx.smithyServiceName(), className);
+            // Recursive member types are forward-declared in the header, so the source must include
+            // them for the out-of-line MakeShared / serde bodies. Matches C2J.
+            sourceBase.addAll(CppTypeMapper.getRecursiveMemberSourceIncludes(
+                shape, ctx.model(), ctx.smithyServiceName()));
+            IncludeSets.emitSourceIncludes(writer, sourceBase, ctx.protocolTraits(), FileKind.SUBOBJECT_SOURCE);
             writer.write("");
 
-            protocolTraits.writeSerdeUsingDeclarations(writer);
+            IncludeSets.emitUsings(writer, ctx.protocolTraits().serdeUsings(FileKind.SUBOBJECT_SOURCE));
             writer.write("");
 
-            writer.writeNamespaceOpen("Aws");
-            writer.writeNamespaceOpen(namespace);
-            writer.writeNamespaceOpen("Model");
+            ModelFile.modelNamespace(writer, ctx.namespace(), () -> {
             writer.write("");
 
-            protocolTraits.writeSerdeMethodImpls(writer, className);
+            ctx.protocolTraits().writeSerdeMethodImpls(writer, className);
             writer.write("");
-
-            writer.writeNamespaceClose("Model");
-            writer.writeNamespaceClose(namespace);
-            writer.writeNamespaceClose("Aws");
+            });
         });
     }
 
diff --git a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/transforms/GlobalTransforms.java b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/transforms/GlobalTransforms.java
index 122946d678ee..587e926d0474 100644
--- a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/transforms/GlobalTransforms.java
+++ b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/transforms/GlobalTransforms.java
@@ -5,8 +5,11 @@
 package com.amazonaws.util.awsclientsmithygenerator.generators.model.transforms;
 
 import com.amazonaws.util.awsclientsmithygenerator.generators.model.ModelTransform;
+import com.amazonaws.util.awsclientsmithygenerator.generators.model.ProtocolResolver;
+import com.amazonaws.util.awsclientsmithygenerator.generators.model.ProtocolResolver.Protocol;
 import software.amazon.smithy.model.Model;
 import software.amazon.smithy.model.knowledge.TopDownIndex;
+import software.amazon.smithy.model.neighbor.Walker;
 import software.amazon.smithy.model.shapes.ListShape;
 import software.amazon.smithy.model.shapes.MapShape;
 import software.amazon.smithy.model.shapes.MemberShape;
@@ -14,12 +17,17 @@
 import software.amazon.smithy.model.shapes.ServiceShape;
 import software.amazon.smithy.model.shapes.Shape;
 import software.amazon.smithy.model.shapes.ShapeId;
+import software.amazon.smithy.model.shapes.StructureShape;
+import software.amazon.smithy.model.traits.DeprecatedTrait;
+import software.amazon.smithy.model.traits.RequiredTrait;
+import software.amazon.smithy.model.transform.ModelTransformer;
 
-import java.util.ArrayDeque;
-import java.util.Deque;
+import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Optional;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * Global model transforms applied before code generation.
@@ -45,6 +53,11 @@ public final class GlobalTransforms {
 
     private GlobalTransforms() {}
 
+    // NOTE: This reserved-member rename is intentionally NOT wired into the transform
+    // pipeline yet. It encodes a known C2J-parity requirement (body -> requestBody,
+    // headers -> headerValues) that is validated by GlobalTransformsTest but not applied
+    // during generation. Do not delete it and do not hook it up as part of a cleanup pass —
+    // wiring it in changes generated output and must be its own reviewed change.
     /**
      * Returns the renamed C++ member name if this member is reserved.
      * Only applies to request shape members (caller must filter).
@@ -74,58 +87,125 @@ public static Optional<String> getReservedMemberRename(String memberName, String
     }
 
     /**
-     * Computes the set of shape IDs reachable from service operations.
-     * Only reachable shapes should generate model files.
-     *
-     * Traversal starts from operation inputs, outputs, and errors, then walks
-     * structure members, list members, and map keys/values transitively.
+     * Computes the set of shape IDs reachable from the service's operations; only these shapes
+     * generate model files. Roots are each operation's input (including {@code smithy.api#Unit}
+     * for input-less operations), output, and error shapes, from which {@link Walker} walks the
+     * shape graph transitively. Each root id is included even when its shape is absent from the model.
      *
      * @param model the Smithy model
      * @param service the service shape whose operations define the root set
      * @return set of ShapeIds reachable from the service's operations
      */
     public static Set<ShapeId> computeReachableShapes(Model model, ServiceShape service) {
+        Walker walker = new Walker(model);
         Set<ShapeId> reachable = new HashSet<>();
-        TopDownIndex index = TopDownIndex.of(model);
-        Deque<ShapeId> queue = new ArrayDeque<>();
-
-        // Seed queue with all operation input/output/error shapes
-        for (OperationShape op : index.getContainedOperations(service)) {
-            op.getInput().ifPresent(queue::add);
-            op.getOutput().ifPresent(queue::add);
-            op.getErrors().forEach(queue::add);
-        }
-
-        // BFS traversal
-        while (!queue.isEmpty()) {
-            ShapeId id = queue.poll();
-            if (!reachable.add(id)) continue;
-            model.getShape(id).ifPresent(shape -> {
-                if (shape.isStructureShape() || shape.isUnionShape()) {
-                    for (MemberShape member : shape.getAllMembers().values()) {
-                        queue.add(member.getTarget());
-                    }
-                } else if (shape.isListShape()) {
-                    shape.asListShape().ifPresent(l -> queue.add(l.getMember().getTarget()));
-                } else if (shape.isMapShape()) {
-                    shape.asMapShape().ifPresent(m -> {
-                        queue.add(m.getKey().getTarget());
-                        queue.add(m.getValue().getTarget());
-                    });
-                }
-            });
+        for (OperationShape op : TopDownIndex.of(model).getContainedOperations(service)) {
+            addReachableFrom(op.getInputShape(), walker, model, reachable);
+            op.getOutput().ifPresent(id -> addReachableFrom(id, walker, model, reachable));
+            op.getErrors().forEach(id -> addReachableFrom(id, walker, model, reachable));
         }
         return reachable;
     }
 
+    private static void addReachableFrom(ShapeId root, Walker walker, Model model, Set<ShapeId> out) {
+        out.add(root);
+        model.getShape(root).ifPresent(shape -> out.addAll(walker.walkShapeIds(shape)));
+    }
+
     /**
-     * Returns this class as a no-op ModelTransform.
+     * Returns this class as a ModelTransform.
      *
-     * <p>GlobalTransforms currently operates at classification time (via computeReachableShapes),
-     * not at model-transform time. This factory exists to reserve a slot in the pipeline
-     * for future pre-generation model mutations (shape renaming, injection, etc.).
+     * <p>Runs {@link #dropDeprecatedMembers} first (so reachability filtering sees the pruned
+     * model and orphaned targets drop out), then {@link #injectResponseMetadata}.
      */
     public static ModelTransform asTransform() {
-        return (model, service) -> model;
+        return (model, service) -> injectResponseMetadata(dropDeprecatedMembers(model, service), service);
+    }
+
+    /**
+     * Removes {@code @deprecated} members from the shapes this service actually generates. This
+     * mirrors the legacy C2J transformer, which drops {@code "deprecated": true} member references
+     * ({@code C2jModelToGeneratorModelTransformer}), so deprecated members never appear in
+     * generated model classes. A target shape referenced only through dropped members becomes
+     * unreachable and is likewise omitted, matching C2J.
+     *
+     * <p>Removal is scoped to members whose container is reachable from the service's operations.
+     * This is the "only touch what we emit" rule: it leaves framework trait definitions untouched
+     * (the {@code smithy.api} prelude, {@code smithy.rules}, {@code aws.*}, etc.), some of which
+     * declare their own {@code @deprecated} members that we must not mutate.
+     *
+     * @param model   the current model
+     * @param service the service being generated (defines the reachable, emitted shapes)
+     * @return the model with deprecated members removed, or the input model if there are none
+     */
+    public static Model dropDeprecatedMembers(Model model, ServiceShape service) {
+        Set<ShapeId> reachable = computeReachableShapes(model, service);
+        Set<Shape> deprecatedMembers = model.shapes(MemberShape.class)
+            .filter(member -> member.hasTrait(DeprecatedTrait.class))
+            .filter(member -> reachable.contains(member.getContainer()))
+            .collect(Collectors.toSet());
+        if (deprecatedMembers.isEmpty()) {
+            return model;
+        }
+        return ModelTransformer.create().removeShapes(model, deprecatedMembers);
+    }
+
+    /**
+     * For awsQuery / ec2Query services, injects a {@code ResponseMetadata} structure (carrying
+     * a {@code RequestId} string member) and adds it as a {@code @required} member on every
+     * result (operation output) shape. This mirrors the legacy C2J
+     * {@code QueryCppClientGenerator.addRequestIdToResults} injection, so that Query/EC2 result
+     * classes expose {@code GetResponseMetadata()} and back the {@code m_responseMetadata}
+     * deserialization emitted by {@code QueryXmlProtocolTraits}. Other protocols are unchanged.
+     *
+     * @param model   the current model
+     * @param service the service being generated
+     * @return the model with ResponseMetadata injected, or the input model for non-query protocols
+     */
+    public static Model injectResponseMetadata(Model model, ServiceShape service) {
+        Protocol protocol = ProtocolResolver.resolve(service, model);
+        if (protocol != Protocol.QUERY_XML && protocol != Protocol.EC2) {
+            return model;
+        }
+
+        String namespace = service.getId().getNamespace();
+        ShapeId responseMetadataId = ShapeId.fromParts(namespace, "ResponseMetadata");
+
+        // ResponseMetadata { RequestId: String }
+        StructureShape responseMetadata = StructureShape.builder()
+            .id(responseMetadataId)
+            .addMember(MemberShape.builder()
+                .id(responseMetadataId.withMember("RequestId"))
+                .target("smithy.api#String")
+                .build())
+            .build();
+
+        // The @required ResponseMetadata member added to each result shape.
+        List<Shape> replacements = new ArrayList<>();
+        replacements.add(responseMetadata);
+
+        TopDownIndex index = TopDownIndex.of(model);
+        Set<ShapeId> outputIds = new HashSet<>();
+        for (OperationShape op : index.getContainedOperations(service)) {
+            op.getOutput().ifPresent(outputIds::add);
+        }
+
+        for (ShapeId outputId : outputIds) {
+            model.getShape(outputId).flatMap(Shape::asStructureShape).ifPresent(result -> {
+                if (result.getMember("ResponseMetadata").isPresent()) {
+                    return;
+                }
+                StructureShape withMetadata = result.toBuilder()
+                    .addMember(MemberShape.builder()
+                        .id(result.getId().withMember("ResponseMetadata"))
+                        .target(responseMetadataId)
+                        .addTrait(new RequiredTrait())
+                        .build())
+                    .build();
+                replacements.add(withMetadata);
+            });
+        }
+
+        return model.toBuilder().addShapes(replacements).build();
     }
 }
diff --git a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/CppWriterTest.java b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/CppWriterTest.java
new file mode 100644
index 000000000000..d8c0956a697d
--- /dev/null
+++ b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/CppWriterTest.java
@@ -0,0 +1,24 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+package com.amazonaws.util.awsclientsmithygenerator.generators;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class CppWriterTest {
+    @Test
+    void withNamespace_wrapsBodyInMatchingOpenAndClose() {
+        CppWriter plain = new CppWriter();
+        plain.writeNamespaceOpen("Aws");
+        plain.write("int x = 1;");
+        plain.writeNamespaceClose("Aws");
+
+        CppWriter scoped = new CppWriter();
+        scoped.withNamespace("Aws", () -> scoped.write("int x = 1;"));
+
+        assertEquals(plain.toString(), scoped.toString());
+    }
+}
diff --git a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/CppNamesTest.java b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/CppNamesTest.java
new file mode 100644
index 000000000000..be9b2915caa9
--- /dev/null
+++ b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/CppNamesTest.java
@@ -0,0 +1,30 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+package com.amazonaws.util.awsclientsmithygenerator.generators.model;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class CppNamesTest {
+    @Test
+    void capitalize_upsFirstChar() {
+        assertEquals("AudioStream", CppNames.capitalize("audioStream"));
+        assertEquals("", CppNames.capitalize(""));
+        assertEquals("X", CppNames.capitalize("x"));
+    }
+
+    @Test
+    void decapitalize_downsFirstChar() {
+        assertEquals("audioStream", CppNames.decapitalize("AudioStream"));
+        assertEquals("", CppNames.decapitalize(""));
+    }
+
+    @Test
+    void fieldName_prefixesMUnderscoreAndDecapitalizes() {
+        assertEquals("m_audioStream", CppNames.fieldName("AudioStream"));
+        assertEquals("m_shardId", CppNames.fieldName("shardId"));
+    }
+}
diff --git a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/CppTypeMapperTest.java b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/CppTypeMapperTest.java
index ff8743208996..d5e1754668d7 100644
--- a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/CppTypeMapperTest.java
+++ b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/CppTypeMapperTest.java
@@ -16,6 +16,7 @@
 import software.amazon.smithy.model.shapes.LongShape;
 import software.amazon.smithy.model.shapes.MapShape;
 import software.amazon.smithy.model.shapes.MemberShape;
+import software.amazon.smithy.model.shapes.Shape;
 import software.amazon.smithy.model.shapes.StringShape;
 import software.amazon.smithy.model.shapes.StructureShape;
 import software.amazon.smithy.model.shapes.TimestampShape;
@@ -41,6 +42,23 @@ void integerShape_mapsToInt() {
         assertEquals("int", CppTypeMapper.getCppType(shape, model));
     }
 
+    @Test
+    void integerShape_wideIntegers_mapsToInt64() {
+        // C2J's CBOR type mapping widens integer -> int64_t (CORAL_TYPE_TO_CBOR_CPP_TYPE_MAPPING),
+        // used in CBOR sub-object and result headers ($protocol == smithy-rpc-v2-cbor).
+        IntegerShape shape = IntegerShape.builder().id("com.example#Foo").build();
+        Model model = Model.builder().addShape(shape).build();
+        assertEquals("int64_t", CppTypeMapper.getCppType(shape, model, true));
+    }
+
+    @Test
+    void longShape_wideIntegers_staysLongLong() {
+        // Only integer widens under CBOR; long is long long in every mapping.
+        LongShape shape = LongShape.builder().id("com.example#Foo").build();
+        Model model = Model.builder().addShape(shape).build();
+        assertEquals("long long", CppTypeMapper.getCppType(shape, model, true));
+    }
+
     @Test
     void longShape_mapsToLongLong() {
         LongShape shape = LongShape.builder().id("com.example#Foo").build();
@@ -76,6 +94,17 @@ void blobShape_mapsToAwsByteBuffer() {
         assertEquals("Aws::Utils::ByteBuffer", CppTypeMapper.getCppType(shape, model));
     }
 
+    @Test
+    void sensitiveBlobShape_mapsToCryptoBuffer() {
+        // C2J maps a @sensitive blob to CryptoBuffer (the "sensitive_blob" type-mapping key in
+        // CppViewHelper), while a plain blob stays ByteBuffer.
+        BlobShape shape = BlobShape.builder().id("com.example#Foo")
+            .addTrait(new software.amazon.smithy.model.traits.SensitiveTrait())
+            .build();
+        Model model = Model.builder().addShape(shape).build();
+        assertEquals("Aws::Utils::CryptoBuffer", CppTypeMapper.getCppType(shape, model));
+    }
+
     @Test
     void timestampShape_mapsToAwsDateTime() {
         TimestampShape shape = TimestampShape.builder().id("com.example#Foo").build();
@@ -106,6 +135,93 @@ void mapOfStringToString_mapsToAwsMap() {
         assertEquals("Aws::Map<Aws::String, Aws::String>", CppTypeMapper.getCppType(map, model));
     }
 
+    @Test
+    void sparseListOfStrings_wrapsElementInOptional() {
+        // C2J wraps a @sparse list's element type in Aws::Crt::Optional (CppViewHelper), so the
+        // member type becomes Aws::Vector<Aws::Crt::Optional<Aws::String>>.
+        StringShape str = StringShape.builder().id("com.example#Str").build();
+        ListShape list = ListShape.builder()
+            .id("com.example#SparseStringList")
+            .member(MemberShape.builder().id("com.example#SparseStringList$member").target("com.example#Str").build())
+            .addTrait(new software.amazon.smithy.model.traits.SparseTrait())
+            .build();
+        Model model = Model.builder().addShapes(str, list).build();
+        assertEquals("Aws::Vector<Aws::Crt::Optional<Aws::String>>", CppTypeMapper.getCppType(list, model));
+    }
+
+    @Test
+    void sparseMapOfStringToString_wrapsValueInOptional() {
+        // C2J wraps a @sparse map's value type in Aws::Crt::Optional; the key is untouched.
+        StringShape str = StringShape.builder().id("com.example#Str").build();
+        MapShape map = MapShape.builder()
+            .id("com.example#SparseStringMap")
+            .key(MemberShape.builder().id("com.example#SparseStringMap$key").target("com.example#Str").build())
+            .value(MemberShape.builder().id("com.example#SparseStringMap$value").target("com.example#Str").build())
+            .addTrait(new software.amazon.smithy.model.traits.SparseTrait())
+            .build();
+        Model model = Model.builder().addShapes(str, map).build();
+        assertEquals("Aws::Map<Aws::String, Aws::Crt::Optional<Aws::String>>", CppTypeMapper.getCppType(map, model));
+    }
+
+    @Test
+    void getIncludesForShape_withSparseListMember_includesOptionalHeader() {
+        // A @sparse list/map member wraps its element/value in Aws::Crt::Optional, which lives in
+        // <aws/crt/Optional.h>. Matches C2J's generated SparseNullsOperationRequest.h.
+        StringShape str = StringShape.builder().id("com.example#Str").build();
+        ListShape list = ListShape.builder()
+            .id("com.example#SparseStringList")
+            .member(MemberShape.builder().id("com.example#SparseStringList$member").target("com.example#Str").build())
+            .addTrait(new software.amazon.smithy.model.traits.SparseTrait())
+            .build();
+        StructureShape struct = StructureShape.builder()
+            .id("com.example#MyRequest")
+            .addMember("items", list.getId())
+            .build();
+        Model model = Model.builder().addShapes(str, list, struct).build();
+
+        List<String> includes = CppTypeMapper.getIncludesForShape(struct, model, "myservice");
+        assertTrue(includes.contains("<aws/crt/Optional.h>"),
+            "Shape with sparse list member should include Optional.h: " + includes);
+    }
+
+    @Test
+    void getIncludesForShape_withSparseMapMember_includesOptionalHeader() {
+        StringShape str = StringShape.builder().id("com.example#Str").build();
+        MapShape map = MapShape.builder()
+            .id("com.example#SparseStringMap")
+            .key(MemberShape.builder().id("com.example#SparseStringMap$key").target("com.example#Str").build())
+            .value(MemberShape.builder().id("com.example#SparseStringMap$value").target("com.example#Str").build())
+            .addTrait(new software.amazon.smithy.model.traits.SparseTrait())
+            .build();
+        StructureShape struct = StructureShape.builder()
+            .id("com.example#MyRequest")
+            .addMember("data", map.getId())
+            .build();
+        Model model = Model.builder().addShapes(str, map, struct).build();
+
+        List<String> includes = CppTypeMapper.getIncludesForShape(struct, model, "myservice");
+        assertTrue(includes.contains("<aws/crt/Optional.h>"),
+            "Shape with sparse map member should include Optional.h: " + includes);
+    }
+
+    @Test
+    void getIncludesForShape_withoutSparse_noOptionalHeader() {
+        StringShape str = StringShape.builder().id("com.example#Str").build();
+        ListShape list = ListShape.builder()
+            .id("com.example#StringList")
+            .member(MemberShape.builder().id("com.example#StringList$member").target("com.example#Str").build())
+            .build();
+        StructureShape struct = StructureShape.builder()
+            .id("com.example#MyRequest")
+            .addMember("items", list.getId())
+            .build();
+        Model model = Model.builder().addShapes(str, list, struct).build();
+
+        List<String> includes = CppTypeMapper.getIncludesForShape(struct, model, "myservice");
+        assertFalse(includes.contains("<aws/crt/Optional.h>"),
+            "Non-sparse list member should not include Optional.h: " + includes);
+    }
+
     @Test
     void structureShape_mapsToShapeName() {
         StructureShape struct = StructureShape.builder().id("com.example#MyStruct").build();
@@ -124,6 +240,46 @@ void unionShape_mapsToShapeName() {
         assertEquals("MyUnion", CppTypeMapper.getCppType(union, model));
     }
 
+    @Test
+    void enumShape_lowerCamelName_mapsToUpperCamelType() {
+        // IAM-style lowerCamel enum shape names must map to UpperCamel C++ types, matching C2J.
+        software.amazon.smithy.model.shapes.EnumShape en = software.amazon.smithy.model.shapes.EnumShape.builder()
+            .id("com.example#statusType").addMember("Active", "Active").build();
+        Model model = Model.builder().addShape(en).build();
+        assertEquals("StatusType", CppTypeMapper.getCppType(en, model));
+        assertEquals(java.util.Optional.of("StatusType::NOT_SET"), CppTypeMapper.getDefaultValue(en));
+        assertEquals(java.util.Optional.of("<aws/iam/model/StatusType.h>"),
+            CppTypeMapper.getIncludeForMemberType(en, model, "iam"));
+    }
+
+    @Test
+    void legacyEnumStringShape_mapsToEnumType() {
+        // Smithy 1.0 models a closed set as a `string` shape carrying the @enum trait (not a 2.0
+        // EnumShape). C2J treats these as enums, so a member targeting one must resolve to the
+        // enum C++ type, NOT Aws::String. Mirrors ShapeClassifier / EnumResolver detection.
+        software.amazon.smithy.model.traits.EnumTrait enumTrait =
+            software.amazon.smithy.model.traits.EnumTrait.builder()
+                .addEnum(software.amazon.smithy.model.traits.EnumDefinition.builder()
+                    .value("Case.Created").name("Case_Created").build())
+                .build();
+        StringShape shape = StringShape.builder().id("com.example#AuditEventType")
+            .addTrait(enumTrait).build();
+        Model model = Model.builder().addShape(shape).build();
+        assertEquals("AuditEventType", CppTypeMapper.getCppType(shape, model));
+        assertEquals(java.util.Optional.of("AuditEventType::NOT_SET"), CppTypeMapper.getDefaultValue(shape));
+        assertEquals(java.util.Optional.of("<aws/connectcases/model/AuditEventType.h>"),
+            CppTypeMapper.getIncludeForMemberType(shape, model, "connectcases"));
+    }
+
+    @Test
+    void structureShape_lowerCamelName_mapsToUpperCamelType() {
+        StructureShape struct = StructureShape.builder().id("com.example#nestedThing").build();
+        Model model = Model.builder().addShape(struct).build();
+        assertEquals("NestedThing", CppTypeMapper.getCppType(struct, model));
+        assertEquals(java.util.Optional.of("<aws/iam/model/NestedThing.h>"),
+            CppTypeMapper.getIncludeForMemberType(struct, model, "iam"));
+    }
+
     @Test
     void documentShape_mapsToAwsDocument() {
         DocumentShape shape = DocumentShape.builder().id("com.example#Foo").build();
@@ -159,6 +315,114 @@ void mapOfStringToStruct_mapsToAwsMap() {
         assertEquals("Aws::Map<Aws::String, MyData>", CppTypeMapper.getCppType(map, model));
     }
 
+    // --- recursive (mutually-referenced) shape tests ---
+
+    /**
+     * Builds the connectcases-style mutual cycle: a union {@code BooleanCondition} with a direct
+     * member targeting struct {@code CompoundCondition}, which holds a list of
+     * {@code BooleanCondition}. The two aggregates are mutually referenced through the list.
+     */
+    private static Model mutualCycleModel() {
+        StructureShape operands = StructureShape.builder().id("com.example#BooleanOperands").build();
+        // Forward references are fine; Model.builder resolves them at build().
+        UnionShape booleanCondition = UnionShape.builder()
+            .id("com.example#BooleanCondition")
+            .addMember("equalTo", operands.getId())
+            .addMember("andAll", software.amazon.smithy.model.shapes.ShapeId.from("com.example#CompoundCondition"))
+            .build();
+        ListShape conditionList = ListShape.builder()
+            .id("com.example#BooleanConditionList")
+            .member(MemberShape.builder().id("com.example#BooleanConditionList$member")
+                .target(booleanCondition.getId()).build())
+            .build();
+        StructureShape compound = StructureShape.builder()
+            .id("com.example#CompoundCondition")
+            .addMember("conditions", conditionList.getId())
+            .build();
+        return Model.builder().addShapes(operands, booleanCondition, conditionList, compound).build();
+    }
+
+    @Test
+    void mutuallyReferencedDirectMember_isRecursiveStructMember() {
+        Model model = mutualCycleModel();
+        Shape booleanCondition = model.expectShape(
+            software.amazon.smithy.model.shapes.ShapeId.from("com.example#BooleanCondition"));
+        Shape compound = model.expectShape(
+            software.amazon.smithy.model.shapes.ShapeId.from("com.example#CompoundCondition"));
+        Shape operands = model.expectShape(
+            software.amazon.smithy.model.shapes.ShapeId.from("com.example#BooleanOperands"));
+        // andAll -> CompoundCondition is a direct member forming a cycle -> recursive
+        assertTrue(CppTypeMapper.isRecursiveStructMember(booleanCondition, compound, model));
+        // equalTo -> BooleanOperands does not cycle back -> not recursive
+        assertFalse(CppTypeMapper.isRecursiveStructMember(booleanCondition, operands, model));
+    }
+
+    @Test
+    void recursiveMember_headerSwapsStructIncludeForAllocator_andForwardDeclares() {
+        Model model = mutualCycleModel();
+        Shape booleanCondition = model.expectShape(
+            software.amazon.smithy.model.shapes.ShapeId.from("com.example#BooleanCondition"));
+
+        List<String> includes = CppTypeMapper.getIncludesForShape(booleanCondition, model, "connectcases");
+        // The recursive CompoundCondition is forward-declared, not included; allocator comes in instead.
+        assertTrue(includes.contains("<aws/core/utils/memory/stl/AWSAllocator.h>"), includes.toString());
+        assertFalse(includes.contains("<aws/connectcases/model/CompoundCondition.h>"), includes.toString());
+        // Non-recursive struct member keeps its normal include.
+        assertTrue(includes.contains("<aws/connectcases/model/BooleanOperands.h>"), includes.toString());
+
+        assertEquals(List.of("CompoundCondition"),
+            CppTypeMapper.getForwardDeclarations(booleanCondition, model));
+        assertEquals(List.of("aws/connectcases/model/CompoundCondition.h"),
+            CppTypeMapper.getRecursiveMemberSourceIncludes(booleanCondition, model, "connectcases"));
+    }
+
+    @Test
+    void directSelfReference_isRecursive_butNotForwardDeclaredOrSelfIncluded() {
+        // connectcases CaseFilter has a `not` member targeting CaseFilter itself. C2J renders it as
+        // std::shared_ptr<CaseFilter> but adds neither a self forward-declaration nor a self-include
+        // (the class declares itself) — and, unlike the mutual case, no AWSAllocator.h either.
+        StructureShape filter = StructureShape.builder()
+            .id("com.example#CaseFilter")
+            .addMember("not", software.amazon.smithy.model.shapes.ShapeId.from("com.example#CaseFilter"))
+            .build();
+        Model model = Model.builder().addShape(filter).build();
+        Shape caseFilter = model.expectShape(
+            software.amazon.smithy.model.shapes.ShapeId.from("com.example#CaseFilter"));
+
+        assertTrue(CppTypeMapper.isRecursiveStructMember(caseFilter, caseFilter, model));
+        assertEquals(List.of(), CppTypeMapper.getForwardDeclarations(caseFilter, model));
+        assertEquals(List.of(),
+            CppTypeMapper.getRecursiveMemberSourceIncludes(caseFilter, model, "connectcases"));
+        List<String> includes = CppTypeMapper.getIncludesForShape(caseFilter, model, "connectcases");
+        assertFalse(includes.contains("<aws/connectcases/model/CaseFilter.h>"),
+            "must not self-include: " + includes);
+        assertFalse(includes.contains("<aws/core/utils/memory/stl/AWSAllocator.h>"),
+            "self-reference needs no AWSAllocator.h: " + includes);
+    }
+
+    @Test
+    void selfReferenceThroughListElement_isNotSelfIncluded() {
+        // CaseFilter also has andAll -> list<CaseFilter>. The list stays by-value, but its element
+        // include must not become a self-include.
+        StructureShape filter = StructureShape.builder()
+            .id("com.example#CaseFilter")
+            .addMember("andAll", software.amazon.smithy.model.shapes.ShapeId.from("com.example#CaseFilterList"))
+            .build();
+        ListShape list = ListShape.builder()
+            .id("com.example#CaseFilterList")
+            .member(MemberShape.builder().id("com.example#CaseFilterList$member")
+                .target("com.example#CaseFilter").build())
+            .build();
+        Model model = Model.builder().addShapes(filter, list).build();
+        Shape caseFilter = model.expectShape(
+            software.amazon.smithy.model.shapes.ShapeId.from("com.example#CaseFilter"));
+
+        List<String> includes = CppTypeMapper.getIncludesForShape(caseFilter, model, "connectcases");
+        assertTrue(includes.contains("<aws/core/utils/memory/stl/AWSVector.h>"), includes.toString());
+        assertFalse(includes.contains("<aws/connectcases/model/CaseFilter.h>"),
+            "list-of-self must not self-include: " + includes);
+    }
+
     // --- getDefaultValue tests ---
 
     @Test
@@ -323,6 +587,40 @@ void getIncludesForShape_withListMember_includesVectorAndElement() {
         assertTrue(includes.contains("<aws/core/utils/memory/stl/AWSString.h>"));
     }
 
+    @Test
+    void getIncludesForShape_withIdempotencyTokenMember_includesUuidHeader() {
+        // C2J adds <aws/core/utils/UUID.h> to any shape carrying an @idempotencyToken member,
+        // because such members are brace-initialized with Aws::Utils::UUID::PseudoRandomUUID()
+        // (CppViewHelper.java). The include must be present for the initializer to compile.
+        StringShape str = StringShape.builder().id("com.example#Str").build();
+        StructureShape struct = StructureShape.builder()
+            .id("com.example#MyRequest")
+            .addMember(MemberShape.builder()
+                .id("com.example#MyRequest$clientToken").target("com.example#Str")
+                .addTrait(new software.amazon.smithy.model.traits.IdempotencyTokenTrait())
+                .build())
+            .build();
+        Model model = Model.builder().addShapes(str, struct).build();
+
+        List<String> includes = CppTypeMapper.getIncludesForShape(struct, model, "myservice");
+        assertTrue(includes.contains("<aws/core/utils/UUID.h>"),
+            "Shape with idempotency-token member should include UUID.h: " + includes);
+    }
+
+    @Test
+    void getIncludesForShape_withoutIdempotencyToken_noUuidHeader() {
+        StringShape str = StringShape.builder().id("com.example#Str").build();
+        StructureShape struct = StructureShape.builder()
+            .id("com.example#MyRequest")
+            .addMember("name", str.getId())
+            .build();
+        Model model = Model.builder().addShapes(str, struct).build();
+
+        List<String> includes = CppTypeMapper.getIncludesForShape(struct, model, "myservice");
+        assertFalse(includes.contains("<aws/core/utils/UUID.h>"),
+            "Shape without idempotency-token member should not include UUID.h: " + includes);
+    }
+
     @Test
     void getIncludesForShape_withMapMember_includesMapKeyAndValue() {
         StringShape str = StringShape.builder().id("com.example#Str").build();
diff --git a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/EnumRendererTest.java b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/EnumRendererTest.java
index 806c523a5d13..35dd58fd79a5 100644
--- a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/EnumRendererTest.java
+++ b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/EnumRendererTest.java
@@ -41,6 +41,41 @@ void renderHeader_producesEnumClass() {
             "Missing GetNameFor declaration: " + output);
     }
 
+    @Test
+    void renderHeader_capitalizesLowerCamelEnumName() {
+        // Some Smithy models (e.g. IAM) name enum shapes in lowerCamel. C2J normalizes every
+        // shape name to UpperCamel, so the C++ enum type, mapper namespace, and mapper
+        // functions must be capitalized regardless of the model's casing.
+        EnumShape enumShape = EnumShape.builder()
+            .id("com.example#statusType")
+            .addMember("Active", "Active")
+            .addMember("Inactive", "Inactive")
+            .build();
+        CppWriter writer = new CppWriter();
+        EnumRenderer.renderHeader(writer, enumShape, "IAM", "AWS_IAM_API", "iam");
+        String output = writer.toString();
+        assertTrue(output.contains("enum class StatusType {"), "Enum type must be UpperCamel: " + output);
+        assertTrue(output.contains("namespace StatusTypeMapper {"), "Mapper namespace must be UpperCamel: " + output);
+        assertTrue(output.contains("GetStatusTypeForName"), "Mapper fn must be UpperCamel: " + output);
+        assertTrue(output.contains("GetNameForStatusType"), "Mapper fn must be UpperCamel: " + output);
+        assertFalse(output.contains("statusType"), "Must not emit lowerCamel enum name: " + output);
+    }
+
+    @Test
+    void renderSource_capitalizesLowerCamelEnumName() {
+        EnumShape enumShape = EnumShape.builder()
+            .id("com.example#statusType")
+            .addMember("Active", "Active")
+            .build();
+        CppWriter writer = new CppWriter();
+        EnumRenderer.renderSource(writer, enumShape, "IAM", "AWS_IAM_API", "iam");
+        String output = writer.toString();
+        assertTrue(output.contains("#include <aws/iam/model/StatusType.h>"), "Include must be UpperCamel: " + output);
+        assertTrue(output.contains("namespace StatusTypeMapper {"), "Mapper namespace must be UpperCamel: " + output);
+        assertTrue(output.contains("StatusType GetStatusTypeForName"), "Mapper fn must be UpperCamel: " + output);
+        assertFalse(output.contains("statusType"), "Must not emit lowerCamel enum name: " + output);
+    }
+
     @Test
     void renderHeader_includesExportsHeader() {
         EnumShape enumShape = EnumShape.builder()
diff --git a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/EventStreamRendererTest.java b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/EventStreamRendererTest.java
index 07423bc434ae..f3638429c042 100644
--- a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/EventStreamRendererTest.java
+++ b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/EventStreamRendererTest.java
@@ -6,6 +6,7 @@
 
 import com.amazonaws.util.awsclientsmithygenerator.generators.CppWriterDelegator;
 import com.amazonaws.util.awsclientsmithygenerator.generators.model.ProtocolResolver.Protocol;
+import com.amazonaws.util.awsclientsmithygenerator.generators.model.RenderContext;
 import com.amazonaws.util.awsclientsmithygenerator.generators.model.renderers.EventStreamRenderer;
 import org.junit.jupiter.api.Test;
 import software.amazon.smithy.build.MockManifest;
@@ -34,11 +35,19 @@ private static Model twoEventModel() {
             .id("com.example#BetaEvent")
             .addMember("data", str.getId())
             .build();
+        // Non-modeled exception: only a trivial "message" member -> generic ExampleError.
         StructureShape exc = StructureShape.builder()
             .id("com.example#BadException")
             .addTrait(new ErrorTrait("client"))
             .addMember("message", str.getId())
             .build();
+        // Modeled exception: has a non-trivial member -> concrete type + model include.
+        StructureShape modeledExc = StructureShape.builder()
+            .id("com.example#DetailedException")
+            .addTrait(new ErrorTrait("client"))
+            .addMember("message", str.getId())
+            .addMember("detail", str.getId())
+            .build();
         UnionShape stream = UnionShape.builder()
             .id("com.example#MyStreamEventStream")
             .addTrait(new StreamingTrait())
@@ -47,14 +56,22 @@ private static Model twoEventModel() {
                 b -> b.addTrait(new DocumentationTrait("<p>Alpha event doc.</p>")))
             .addMember("beta", eventB.getId())
             .addMember("badException", exc.getId())
+            .addMember("detailedException", modeledExc.getId())
             .build();
         StructureShape input = StructureShape.builder()
             .id("com.example#DoStreamInput")
             .addMember("name", str.getId())
             .build();
+        // Output carries the streaming union member AND a non-streaming member: C2J synthesizes
+        // the InitialResponse from the result's non-event-stream members.
         StructureShape output = StructureShape.builder()
             .id("com.example#DoStreamOutput")
-            .addMember("stream", stream.getId())
+            .addMember(software.amazon.smithy.model.shapes.MemberShape.builder()
+                .id("com.example#DoStreamOutput$stream").target(stream.getId())
+                .addTrait(new software.amazon.smithy.model.traits.HttpPayloadTrait()).build())
+            .addMember(software.amazon.smithy.model.shapes.MemberShape.builder()
+                .id("com.example#DoStreamOutput$contentType").target(str.getId())
+                .addTrait(new software.amazon.smithy.model.traits.HttpHeaderTrait("X-Content-Type")).build())
             .build();
         software.amazon.smithy.model.shapes.OperationShape op =
             software.amazon.smithy.model.shapes.OperationShape.builder()
@@ -67,7 +84,7 @@ private static Model twoEventModel() {
             .version("2024-01-01")
             .addOperation(op.getId())
             .build();
-        return Model.builder().addShapes(str, stream, eventA, eventB, exc, input, output, op, service).build();
+        return Model.builder().addShapes(str, stream, eventA, eventB, exc, modeledExc, input, output, op, service).build();
     }
 
     private static String render(String fileSuffix) {
@@ -78,8 +95,8 @@ private static String render(String fileSuffix) {
         Protocol protocol = ProtocolResolver.resolve(service, model);
         EventStreamRenderer renderer = new EventStreamRenderer(
             ShapeClassifier.classify(model, service, protocol).eventStreamHandlers(),
-            model, service, ProtocolResolver.traitsFor(protocol),
-            "Example", "AWS_EXAMPLE_API", "example");
+            new RenderContext(model, service, ProtocolResolver.traitsFor(protocol),
+                "Example", "AWS_EXAMPLE_API", "example"));
         renderer.render(delegator);
         delegator.flushWriters();
         return manifest.getFileString(
@@ -132,6 +149,34 @@ void eventStreamUnionHeader_typesEventAndExceptionMembers() {
         assertTrue(h.contains("ExampleError"), "Exception members must be typed as ExampleError: " + h);
     }
 
+    @Test
+    void eventStreamUnionHeader_modeledExceptionUsesConcreteTypeAndInclude() {
+        // C2J types a modeled exception member (extra members beyond message/code) as its concrete
+        // shape and includes its model header, while a non-modeled exception stays the generic
+        // <namespace>Error (no include). Matches CppViewHelper's isException/isModeledException gate.
+        String h = render("MyStreamEventStream.h");
+        // Modeled exception -> concrete type + include.
+        assertTrue(h.contains("const DetailedException& GetDetailedException()"),
+            "Modeled exception must use its concrete type: " + h);
+        assertTrue(h.contains("#include <aws/example/model/DetailedException.h>"),
+            "Modeled exception must bring its model include: " + h);
+        // Non-modeled exception -> generic ExampleError.
+        assertTrue(h.contains("const ExampleError& GetBadException()"),
+            "Non-modeled exception must use the generic error type: " + h);
+    }
+
+    @Test
+    void eventStreamUnionHeader_omitsServiceErrorsInclude() {
+        // C2J's computeHeaderIncludes skips the model include for non-modeled exception members
+        // (CppViewHelper: `if (next.isException() && !next.isModeledException()) continue;`).
+        // The union's exception members are the generic ExampleError wrapper, so the union header
+        // must NOT include the service Errors header — it resolves transitively. The handler
+        // header (a separate file) still includes it.
+        String h = render("MyStreamEventStream.h");
+        assertFalse(h.contains("#include <aws/example/ExampleErrors.h>"),
+            "Union header must not include the service Errors header: " + h);
+    }
+
     @Test
     void eventStreamUnionHeader_rendersClassAndMemberDocs() {
         String h = render("MyStreamEventStream.h");
@@ -158,11 +203,69 @@ void initialResponseHeader_hasHeaderCollectionCtorAndSerdeDecls() {
             "HeaderValueCollection ctor must come before Jsonize: " + h);
     }
 
+    @Test
+    void initialResponseHeader_rendersNonStreamingResultMembers() {
+        // C2J synthesizes <op>InitialResponse from the result's non-event-stream members, so the
+        // header must carry accessors for those members (here: contentType) plus a private section.
+        // The @httpPayload streaming union member (stream) must NOT appear.
+        String h = render("DoStreamInitialResponse.h");
+        assertTrue(h.contains("GetContentType") && h.contains("SetContentType") && h.contains("WithContentType"),
+            "InitialResponse must render accessors for non-streaming result members: " + h);
+        assertTrue(h.contains("bool m_contentTypeHasBeenSet = false;"),
+            "InitialResponse must render private members: " + h);
+        assertFalse(h.contains("GetStream"),
+            "InitialResponse must not render the streaming union member: " + h);
+    }
+
     @Test
     void initialResponseSource_hasHeaderCtorDefinition() {
         String c = render("DoStreamInitialResponse.cpp");
         assertTrue(c.contains("DoStreamInitialResponse::DoStreamInitialResponse(const Http::HeaderValueCollection&"),
             "Missing header ctor definition: " + c);
+        // The header ctor must delegate to the default ctor so members are value-initialized
+        // before the header-derived ones are set (matches C2J).
+        assertTrue(c.contains(
+            "DoStreamInitialResponse::DoStreamInitialResponse(const Http::HeaderValueCollection& "
+            + "responseHeaders) : DoStreamInitialResponse() {"),
+            "Header ctor must delegate to the default ctor: " + c);
+    }
+
+    @Test
+    void initialResponseSource_hasJsonSerdeIncludesAndUsings() {
+        // The JSON InitialResponse source matches C2J: StringUtils + UnreferencedParam + the JSON
+        // serializer, the Json/Utils usings, and <utility>.
+        String c = render("DoStreamInitialResponse.cpp");
+        assertTrue(c.contains("#include <aws/core/utils/StringUtils.h>"), c);
+        assertTrue(c.contains("#include <aws/core/utils/UnreferencedParam.h>"), c);
+        assertTrue(c.contains("#include <aws/core/utils/json/JsonSerializer.h>"), c);
+        assertTrue(c.contains("#include <utility>"), c);
+        assertTrue(c.contains("using namespace Aws::Utils::Json;"), c);
+        assertTrue(c.contains("using namespace Aws::Utils;"), c);
+        // The header-bound member (contentType) pulls AWSStringStream.h into the source, matching
+        // C2J's computeSourceIncludes.
+        assertTrue(c.contains("#include <aws/core/utils/memory/stl/AWSStringStream.h>"), c);
+    }
+
+    @Test
+    void initialResponseSource_wrapsBodyInNamespaceBlockNotUsingModel() {
+        // C2J renders InitialResponse via the sub-object source template, which wraps the body in
+        // an explicit namespace block rather than a `using namespace ...Model;`.
+        String c = render("DoStreamInitialResponse.cpp");
+        assertTrue(c.contains("namespace Aws"), c);
+        assertTrue(c.contains("namespace Example"), c);
+        assertTrue(c.contains("namespace Model"), c);
+        assertTrue(c.contains("// namespace Model"), c);
+        assertFalse(c.contains("using namespace Aws::Example::Model;"),
+            "InitialResponse must use a namespace block, not using-Model: " + c);
+    }
+
+    @Test
+    void handlerSource_hasProtocolSerdeIncludeAndUsing() {
+        // The JSON handler parses event/exception payloads as JSON, so its source includes the
+        // JSON serializer and uses the Json namespace, matching C2J JsonEventStreamHandlerSource.vm.
+        String c = render("DoStreamHandler.cpp");
+        assertTrue(c.contains("#include <aws/core/utils/json/JsonSerializer.h>"), c);
+        assertTrue(c.contains("using namespace Aws::Utils::Json;"), c);
     }
 
     @Test
diff --git a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/GlobalTransformsTest.java b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/GlobalTransformsTest.java
index 9f584a26dbb1..d4be7bdda094 100644
--- a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/GlobalTransformsTest.java
+++ b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/GlobalTransformsTest.java
@@ -373,4 +373,160 @@ void computeReachableShapes_errorShapes_areReachable() {
 
         assertTrue(reachable.contains(ShapeId.from("com.example#MyError")));
     }
+
+    // --- dropDeprecatedMembers tests ---
+
+    @Test
+    void dropDeprecatedMembers_removesDeprecatedMember_keepsOthers() {
+        // Mirrors C2J: a member with @deprecated is dropped from the generated shape; siblings stay.
+        // The shape must be reachable from the service (used as an operation input here) so that the
+        // reachability-scoped transform considers it.
+        StructureShape config = StructureShape.builder()
+            .id("com.example#LocationConfiguration")
+            .addMember(MemberShape.builder()
+                .id("com.example#LocationConfiguration$location").target("smithy.api#String").build())
+            .addMember(MemberShape.builder()
+                .id("com.example#LocationConfiguration$onDemandCapacity").target("smithy.api#Integer")
+                .addTrait(software.amazon.smithy.model.traits.DeprecatedTrait.builder().build())
+                .build())
+            .build();
+        StructureShape output = StructureShape.builder().id("com.example#MyOutput").build();
+        OperationShape op = OperationShape.builder()
+            .id("com.example#MyOperation").input(config.getId()).output(output.getId()).build();
+        ServiceShape service = ServiceShape.builder()
+            .id("com.example#MyService").version("2024-01-01").addOperation(op.getId()).build();
+        Model model = Model.assembler().addShapes(config, output, op, service).assemble().unwrap();
+
+        Model out = GlobalTransforms.dropDeprecatedMembers(model, service);
+        StructureShape transformed = out.expectShape(
+            ShapeId.from("com.example#LocationConfiguration"), StructureShape.class);
+        assertFalse(transformed.getMember("onDemandCapacity").isPresent(),
+            "deprecated member must be dropped");
+        assertTrue(transformed.getMember("location").isPresent(),
+            "non-deprecated sibling must remain");
+    }
+
+    @Test
+    void dropDeprecatedMembers_noDeprecated_returnsSameModel() {
+        StructureShape input = StructureShape.builder()
+            .id("com.example#MyInput")
+            .addMember(MemberShape.builder().id("com.example#MyInput$a").target("smithy.api#String").build())
+            .build();
+        StructureShape output = StructureShape.builder().id("com.example#MyOutput").build();
+        OperationShape op = OperationShape.builder()
+            .id("com.example#MyOperation").input(input.getId()).output(output.getId()).build();
+        ServiceShape service = ServiceShape.builder()
+            .id("com.example#MyService").version("2024-01-01").addOperation(op.getId()).build();
+        Model model = Model.assembler().addShapes(input, output, op, service).assemble().unwrap();
+        // The prelude declares its own @deprecated member (protocolDefinition$noInlineDocumentSupport),
+        // but it is not reachable from the service, so the transform is a true no-op here.
+        assertSame(model, GlobalTransforms.dropDeprecatedMembers(model, service),
+            "models without service-reachable deprecated members should be returned unchanged");
+    }
+
+    @Test
+    void dropDeprecatedMembers_orphanedTargetBecomesUnreachable() {
+        // A struct referenced ONLY through a deprecated member drops out of the reachable set,
+        // matching C2J's omission of the orphaned shape file.
+        StructureShape orphan = StructureShape.builder()
+            .id("com.example#OrphanDetail")
+            .addMember(MemberShape.builder()
+                .id("com.example#OrphanDetail$x").target("smithy.api#String").build())
+            .build();
+        StructureShape input = StructureShape.builder()
+            .id("com.example#MyInput")
+            .addMember(MemberShape.builder()
+                .id("com.example#MyInput$detail").target(orphan.getId())
+                .addTrait(software.amazon.smithy.model.traits.DeprecatedTrait.builder().build())
+                .build())
+            .build();
+        StructureShape output = StructureShape.builder().id("com.example#MyOutput").build();
+        OperationShape op = OperationShape.builder()
+            .id("com.example#MyOperation").input(input.getId()).output(output.getId()).build();
+        ServiceShape service = ServiceShape.builder()
+            .id("com.example#MyService").version("2024-01-01").addOperation(op.getId()).build();
+        Model model = Model.assembler()
+            .addShapes(orphan, input, output, op, service).assemble().unwrap();
+
+        Model out = GlobalTransforms.dropDeprecatedMembers(model, service);
+        Set<ShapeId> reachable = GlobalTransforms.computeReachableShapes(out, serviceOf(out, "MyService"));
+        assertFalse(reachable.contains(ShapeId.from("com.example#OrphanDetail")),
+            "shape referenced only via a deprecated member must become unreachable");
+    }
+
+    private static ServiceShape serviceOf(Model model, String name) {
+        return model.expectShape(ShapeId.from("com.example#" + name), ServiceShape.class);
+    }
+
+    // --- injectResponseMetadata tests ---
+
+    /** A single-operation service under the given protocol trait, output has one plain member. */
+    private static Model oneOutputModel(software.amazon.smithy.model.traits.Trait protocolTrait) {
+        StructureShape input = StructureShape.builder().id("com.example#DoThingInput").build();
+        StructureShape output = StructureShape.builder()
+            .id("com.example#DoThingOutput")
+            .addMember(MemberShape.builder()
+                .id("com.example#DoThingOutput$name").target("smithy.api#String").build())
+            .build();
+        OperationShape op = OperationShape.builder()
+            .id("com.example#DoThing").input(input.getId()).output(output.getId()).build();
+        ServiceShape service = ServiceShape.builder()
+            .id("com.example#Example").version("2024-01-01")
+            .addTrait(protocolTrait).addOperation(op.getId()).build();
+        return Model.assembler().addShapes(input, output, op, service).assemble().unwrap();
+    }
+
+    private static ServiceShape serviceOf(Model model) {
+        return model.expectShape(ShapeId.from("com.example#Example"), ServiceShape.class);
+    }
+
+    @Test
+    void injectResponseMetadata_awsQuery_addsResponseMetadataMemberToResult() {
+        Model model = oneOutputModel(new software.amazon.smithy.aws.traits.protocols.AwsQueryTrait());
+        Model out = GlobalTransforms.asTransform().apply(model, serviceOf(model));
+
+        StructureShape result = out.expectShape(
+            ShapeId.from("com.example#DoThingOutput"), StructureShape.class);
+        assertTrue(result.getMember("ResponseMetadata").isPresent(),
+            "Query result should carry an injected ResponseMetadata member");
+        MemberShape rm = result.getMember("ResponseMetadata").get();
+        assertTrue(rm.hasTrait(software.amazon.smithy.model.traits.RequiredTrait.class),
+            "ResponseMetadata member should be @required, matching C2J");
+    }
+
+    @Test
+    void injectResponseMetadata_awsQuery_addsResponseMetadataStructureWithRequestId() {
+        Model model = oneOutputModel(new software.amazon.smithy.aws.traits.protocols.AwsQueryTrait());
+        Model out = GlobalTransforms.asTransform().apply(model, serviceOf(model));
+
+        ShapeId rmId = out.expectShape(ShapeId.from("com.example#DoThingOutput"), StructureShape.class)
+            .getMember("ResponseMetadata").get().getTarget();
+        StructureShape rm = out.expectShape(rmId, StructureShape.class);
+        assertEquals("ResponseMetadata", rmId.getName());
+        assertTrue(rm.getMember("RequestId").isPresent(),
+            "ResponseMetadata should have a RequestId member");
+    }
+
+    @Test
+    void injectResponseMetadata_ec2_addsResponseMetadataMemberToResult() {
+        Model model = oneOutputModel(new software.amazon.smithy.aws.traits.protocols.Ec2QueryTrait());
+        Model out = GlobalTransforms.asTransform().apply(model, serviceOf(model));
+
+        StructureShape result = out.expectShape(
+            ShapeId.from("com.example#DoThingOutput"), StructureShape.class);
+        assertTrue(result.getMember("ResponseMetadata").isPresent(),
+            "EC2 result should carry an injected ResponseMetadata member");
+    }
+
+    @Test
+    void injectResponseMetadata_restJson_leavesResultUnchanged() {
+        Model model = oneOutputModel(
+            software.amazon.smithy.aws.traits.protocols.RestJson1Trait.builder().build());
+        Model out = GlobalTransforms.asTransform().apply(model, serviceOf(model));
+
+        StructureShape result = out.expectShape(
+            ShapeId.from("com.example#DoThingOutput"), StructureShape.class);
+        assertFalse(result.getMember("ResponseMetadata").isPresent(),
+            "Non-query protocols must not get ResponseMetadata injected");
+    }
 }
diff --git a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/MemberRendererInstanceTest.java b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/MemberRendererInstanceTest.java
new file mode 100644
index 000000000000..cd0b74f630ed
--- /dev/null
+++ b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/MemberRendererInstanceTest.java
@@ -0,0 +1,94 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+package com.amazonaws.util.awsclientsmithygenerator.generators.model;
+
+import com.amazonaws.util.awsclientsmithygenerator.generators.CppWriter;
+import org.junit.jupiter.api.Test;
+import software.amazon.smithy.model.Model;
+import software.amazon.smithy.model.shapes.IntegerShape;
+import software.amazon.smithy.model.shapes.StringShape;
+import software.amazon.smithy.model.shapes.StructureShape;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class MemberRendererInstanceTest {
+
+    private static Model model(StructureShape shape, software.amazon.smithy.model.shapes.Shape... rest) {
+        Model.Builder b = Model.builder().addShape(shape);
+        for (software.amazon.smithy.model.shapes.Shape s : rest) {
+            b.addShape(s);
+        }
+        return b.build();
+    }
+
+    @Test
+    void forStructure_publicAccessors_emitsHasBeenSet() {
+        StringShape str = StringShape.builder().id("com.example#String").build();
+        StructureShape shape = StructureShape.builder()
+            .id("com.example#MyShape").addMember("Name", str.getId()).build();
+        CppWriter w = new CppWriter();
+        MemberRenderer.forStructure(model(shape, str), shape, "MyShape").renderPublicAccessors(w);
+        String out = w.toString();
+        assertTrue(out.contains("inline const Aws::String& GetName() const"), out);
+        assertTrue(out.contains("inline bool NameHasBeenSet() const"), out);
+        assertTrue(out.contains("MyShape& WithName(NameT&& value)"), out);
+    }
+
+    @Test
+    void forResult_publicAccessors_omitsHasBeenSet() {
+        StringShape str = StringShape.builder().id("com.example#String").build();
+        StructureShape shape = StructureShape.builder()
+            .id("com.example#MyResult").addMember("Name", str.getId()).build();
+        CppWriter w = new CppWriter();
+        MemberRenderer.forResult(model(shape, str), shape, "MyResult").renderPublicAccessors(w);
+        String out = w.toString();
+        assertTrue(out.contains("inline const Aws::String& GetName() const"), out);
+        assertFalse(out.contains("NameHasBeenSet() const"), "results must not emit HasBeenSet: " + out);
+    }
+
+    @Test
+    void excluding_dropsMemberFromAllFragments() {
+        StringShape str = StringShape.builder().id("com.example#String").build();
+        StructureShape shape = StructureShape.builder()
+            .id("com.example#MyShape")
+            .addMember("Keep", str.getId())
+            .addMember("Drop", str.getId())
+            .build();
+        MemberRenderer r = MemberRenderer.forResult(model(shape, str), shape, "MyShape").excluding("Drop");
+        CppWriter pub = new CppWriter();  r.renderPublicAccessors(pub);
+        CppWriter data = new CppWriter(); r.renderDataMembers(data);
+        CppWriter flags = new CppWriter(); r.renderHasBeenSetFlags(flags);
+        assertFalse(pub.toString().contains("GetDrop"), pub.toString());
+        assertFalse(data.toString().contains("m_drop"), data.toString());
+        assertFalse(flags.toString().contains("m_dropHasBeenSet"), flags.toString());
+        assertTrue(pub.toString().contains("GetKeep"), pub.toString());
+    }
+
+    @Test
+    void wideIntegers_widensIntegerDataMemberToInt64() {
+        IntegerShape intShape = IntegerShape.builder().id("com.example#Integer").build();
+        StructureShape shape = StructureShape.builder()
+            .id("com.example#MyShape").addMember("Count", intShape.getId()).build();
+        CppWriter narrow = new CppWriter();
+        MemberRenderer.forStructure(model(shape, intShape), shape, "MyShape").renderDataMembers(narrow);
+        CppWriter wide = new CppWriter();
+        MemberRenderer.forStructure(model(shape, intShape), shape, "MyShape")
+            .wideIntegers(true).renderDataMembers(wide);
+        assertTrue(narrow.toString().contains("int m_count{0};"), narrow.toString());
+        assertTrue(wide.toString().contains("long long m_count{0};") || wide.toString().contains("int64_t m_count{0};"),
+            "wideIntegers must widen the integer field: " + wide.toString());
+    }
+
+    @Test
+    void renderPrivateSection_dataMembersPrecedeHasBeenSetFlags() {
+        StringShape str = StringShape.builder().id("com.example#String").build();
+        StructureShape shape = StructureShape.builder()
+            .id("com.example#MyShape").addMember("Name", str.getId()).build();
+        CppWriter w = new CppWriter();
+        MemberRenderer.forStructure(model(shape, str), shape, "MyShape").renderPrivateSection(w);
+        String out = w.toString();
+        assertTrue(out.indexOf("Aws::String m_name;") < out.indexOf("bool m_nameHasBeenSet = false;"), out);
+    }
+}
diff --git a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/MemberRendererOutputTest.java b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/MemberRendererOutputTest.java
index 794e7da4be25..8eafddf2c4d5 100644
--- a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/MemberRendererOutputTest.java
+++ b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/MemberRendererOutputTest.java
@@ -34,7 +34,7 @@ void fullOutput_matchesExpectedPattern() {
         Model model = Model.builder().addShapes(str, list, nested, shape).build();
 
         CppWriter pubWriter = new CppWriter();
-        MemberRenderer.renderPublicSection(pubWriter, shape, model, "AWS_KINESIS_API", "ChildShard");
+        MemberRenderer.forStructure(model, shape, "ChildShard").renderPublicAccessors(pubWriter);
         String pubOutput = pubWriter.toString();
         System.out.println("=== PUBLIC ===");
         System.out.println(pubOutput);
@@ -60,7 +60,7 @@ void fullOutput_matchesExpectedPattern() {
 
         // Private section
         CppWriter privWriter = new CppWriter();
-        MemberRenderer.renderPrivateSection(privWriter, shape, model);
+        MemberRenderer.forStructure(model, shape, null).renderPrivateSection(privWriter);
         String privOutput = privWriter.toString();
         System.out.println("=== PRIVATE ===");
         System.out.println(privOutput);
@@ -72,4 +72,107 @@ void fullOutput_matchesExpectedPattern() {
         assertTrue(privOutput.contains("bool m_parentShardsHasBeenSet = false;"));
         assertTrue(privOutput.contains("bool m_hashKeyRangeHasBeenSet = false;"));
     }
+
+    @Test
+    void sparseListAndMap_emitOptionalTypesAndAddOverloads() {
+        // Mirrors C2J's generated SparseNullsOperationRequest.h: a @sparse list/map wraps its
+        // element/value in Aws::Crt::Optional, and gets an extra Add overload accepting the
+        // Optional element/value directly.
+        StringShape str = StringShape.builder().id("com.example#String").build();
+        ListShape sparseList = ListShape.builder()
+            .id("com.example#SparseStringList")
+            .member(MemberShape.builder().id("com.example#SparseStringList$member").target("com.example#String").build())
+            .addTrait(new software.amazon.smithy.model.traits.SparseTrait())
+            .build();
+        MapShape sparseMap = MapShape.builder()
+            .id("com.example#SparseStringMap")
+            .key(MemberShape.builder().id("com.example#SparseStringMap$key").target("com.example#String").build())
+            .value(MemberShape.builder().id("com.example#SparseStringMap$value").target("com.example#String").build())
+            .addTrait(new software.amazon.smithy.model.traits.SparseTrait())
+            .build();
+        StructureShape shape = StructureShape.builder()
+            .id("com.example#SparseNullsOperationRequest")
+            .addMember("SparseStringList", sparseList.getId())
+            .addMember("SparseStringMap", sparseMap.getId())
+            .build();
+        Model model = Model.builder().addShapes(str, sparseList, sparseMap, shape).build();
+
+        CppWriter writer = new CppWriter();
+        MemberRenderer.forStructure(model, shape, "SparseNullsOperationRequest").renderPublicAccessors(writer);
+        String out = writer.toString();
+        System.out.println(out);
+
+        // --- sparse list ---
+        assertTrue(out.contains(
+            "inline const Aws::Vector<Aws::Crt::Optional<Aws::String>>& GetSparseStringList() const { return m_sparseStringList; }"),
+            out);
+        // main forwarding Add keeps the UNWRAPPED element type as its template default (matches C2J)
+        assertTrue(out.contains("template <typename SparseStringListT = Aws::String>"), out);
+        assertTrue(out.contains("m_sparseStringList.emplace_back(std::forward<SparseStringListT>(value));"), out);
+        // extra overload takes the Optional element by value and push_backs it
+        assertTrue(out.contains(
+            "inline SparseNullsOperationRequest& AddSparseStringList(Aws::Crt::Optional<Aws::String> value) {"),
+            out);
+        assertTrue(out.contains("m_sparseStringList.push_back(value);"), out);
+
+        // --- sparse map ---
+        assertTrue(out.contains(
+            "inline const Aws::Map<Aws::String, Aws::Crt::Optional<Aws::String>>& GetSparseStringMap() const { return m_sparseStringMap; }"),
+            out);
+        // templated Add value default IS the wrapped Optional type for maps (matches C2J)
+        assertTrue(out.contains(
+            "template <typename SparseStringMapKeyT = Aws::String, typename SparseStringMapValueT = Aws::Crt::Optional<Aws::String>>"),
+            out);
+        // extra overload takes the raw key and the Optional value
+        assertTrue(out.contains(
+            "inline SparseNullsOperationRequest& AddSparseStringMap(Aws::String key, Aws::Crt::Optional<Aws::String> value) {"),
+            out);
+        assertTrue(out.contains("m_sparseStringMap.emplace(key, value);"), out);
+    }
+
+    @Test
+    void recursiveMember_rendersSharedPtrFieldGetterAndMakeSharedSetter() {
+        // Mirrors connectcases BooleanCondition.h: the andAll member targets CompoundCondition,
+        // which lists BooleanCondition back — a cycle C2J breaks with std::shared_ptr, a *m_x
+        // getter, and a MakeShared setter tagged with the enclosing class name.
+        StructureShape operands = StructureShape.builder().id("com.example#BooleanOperands").build();
+        UnionShape booleanCondition = UnionShape.builder()
+            .id("com.example#BooleanCondition")
+            .addMember("equalTo", operands.getId())
+            .addMember("andAll", software.amazon.smithy.model.shapes.ShapeId.from("com.example#CompoundCondition"))
+            .build();
+        ListShape conditionList = ListShape.builder()
+            .id("com.example#BooleanConditionList")
+            .member(MemberShape.builder().id("com.example#BooleanConditionList$member")
+                .target(booleanCondition.getId()).build())
+            .build();
+        StructureShape compound = StructureShape.builder()
+            .id("com.example#CompoundCondition")
+            .addMember("conditions", conditionList.getId())
+            .build();
+        Model model = Model.builder().addShapes(operands, booleanCondition, conditionList, compound).build();
+
+        CppWriter pub = new CppWriter();
+        MemberRenderer.forStructure(model, booleanCondition, "BooleanCondition").renderPublicAccessors(pub);
+        String pubOut = pub.toString();
+        System.out.println(pubOut);
+
+        // Recursive andAll: deref getter + MakeShared setter tagged with enclosing class name.
+        assertTrue(pubOut.contains("inline const CompoundCondition& GetAndAll() const { return *m_andAll; }"), pubOut);
+        assertTrue(pubOut.contains("template <typename AndAllT = CompoundCondition>"), pubOut);
+        assertTrue(pubOut.contains(
+            "m_andAll = Aws::MakeShared<CompoundCondition>(\"BooleanCondition\", std::forward<AndAllT>(value));"),
+            pubOut);
+        // Non-recursive equalTo stays a plain by-value struct member.
+        assertTrue(pubOut.contains("inline const BooleanOperands& GetEqualTo() const { return m_equalTo; }"), pubOut);
+
+        CppWriter priv = new CppWriter();
+        MemberRenderer.forStructure(model, booleanCondition, "BooleanCondition").renderPrivateSection(priv);
+        String privOut = priv.toString();
+        System.out.println(privOut);
+
+        assertTrue(privOut.contains("std::shared_ptr<CompoundCondition> m_andAll;"), privOut);
+        assertTrue(privOut.contains("BooleanOperands m_equalTo;"), privOut);
+        assertTrue(privOut.contains("bool m_andAllHasBeenSet = false;"), privOut);
+    }
 }
diff --git a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/MemberRendererTest.java b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/MemberRendererTest.java
index 1b5b2fc992cb..7bd57f1e0ccb 100644
--- a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/MemberRendererTest.java
+++ b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/MemberRendererTest.java
@@ -10,6 +10,7 @@
 import software.amazon.smithy.model.shapes.BooleanShape;
 import software.amazon.smithy.model.shapes.IntegerShape;
 import software.amazon.smithy.model.shapes.ListShape;
+import software.amazon.smithy.model.shapes.MapShape;
 import software.amazon.smithy.model.shapes.MemberShape;
 import software.amazon.smithy.model.shapes.StringShape;
 import software.amazon.smithy.model.shapes.StructureShape;
@@ -27,7 +28,7 @@ void renderPublicSection_stringMember_producesGetSetWith() {
             .build();
         Model model = Model.builder().addShapes(str, shape).build();
         CppWriter writer = new CppWriter();
-        MemberRenderer.renderPublicSection(writer, shape, model, "AWS_TEST_API", "MyShape");
+        MemberRenderer.forStructure(model, shape, "MyShape").renderPublicAccessors(writer);
         String output = writer.toString();
         assertTrue(output.contains("inline const Aws::String& GetName() const"), "Missing getter: " + output);
         assertTrue(output.contains("inline bool NameHasBeenSet() const"), "Missing HasBeenSet: " + output);
@@ -35,6 +36,30 @@ void renderPublicSection_stringMember_producesGetSetWith() {
         assertTrue(output.contains("MyShape& WithName(NameT&& value)"), "Missing With: " + output);
     }
 
+    @Test
+    void renderPublicSection_lowercaseMember_capitalizesMethodNames() {
+        // Smithy member names frequently start lowercase (e.g. "extendedKeyUsage").
+        // The legacy C2J convention capitalizes the accessor method names and template
+        // params while keeping the decapitalized field name (m_extendedKeyUsage).
+        StringShape str = StringShape.builder().id("com.example#String").build();
+        StructureShape shape = StructureShape.builder()
+            .id("com.example#MyShape")
+            .addMember("extendedKeyUsage", str.getId())
+            .build();
+        Model model = Model.builder().addShapes(str, shape).build();
+        CppWriter writer = new CppWriter();
+        MemberRenderer.forStructure(model, shape, "MyShape").renderPublicAccessors(writer);
+        String output = writer.toString();
+        assertTrue(output.contains("GetExtendedKeyUsage() const"), "Getter should be capitalized: " + output);
+        assertTrue(output.contains("ExtendedKeyUsageHasBeenSet() const"), "HasBeenSet should be capitalized: " + output);
+        assertTrue(output.contains("SetExtendedKeyUsage(ExtendedKeyUsageT&& value)"), "Setter should be capitalized: " + output);
+        assertTrue(output.contains("WithExtendedKeyUsage(ExtendedKeyUsageT&& value)"), "With should be capitalized: " + output);
+        assertTrue(output.contains("m_extendedKeyUsage = std::forward"), "Field should stay decapitalized: " + output);
+        // Must not emit the raw lowercase-first method names.
+        assertFalse(output.contains("GetextendedKeyUsage"), "Must not emit lowercase getter: " + output);
+        assertFalse(output.contains("WithextendedKeyUsage"), "Must not emit lowercase With: " + output);
+    }
+
     @Test
     void renderPublicSection_listMember_producesAddMethod() {
         StringShape str = StringShape.builder().id("com.example#String").build();
@@ -48,7 +73,7 @@ void renderPublicSection_listMember_producesAddMethod() {
             .build();
         Model model = Model.builder().addShapes(str, list, shape).build();
         CppWriter writer = new CppWriter();
-        MemberRenderer.renderPublicSection(writer, shape, model, "AWS_TEST_API", "MyShape");
+        MemberRenderer.forStructure(model, shape, "MyShape").renderPublicAccessors(writer);
         String output = writer.toString();
         assertTrue(output.contains("MyShape& AddItems(ItemsT&& value)"), "Missing Add: " + output);
         assertTrue(output.contains("m_items.emplace_back(std::forward<ItemsT>(value))"), "Missing emplace_back: " + output);
@@ -67,13 +92,154 @@ void renderPublicSection_listMember_addTemplateDefaultIsElementType() {
             .build();
         Model model = Model.builder().addShapes(str, list, shape).build();
         CppWriter writer = new CppWriter();
-        MemberRenderer.renderPublicSection(writer, shape, model, "AWS_TEST_API", "MyShape");
+        MemberRenderer.forStructure(model, shape, "MyShape").renderPublicAccessors(writer);
         String output = writer.toString();
         // The Add method's template default should be the element type, not the list type
         assertTrue(output.contains("template <typename ItemsT = Aws::String>\nMyShape& AddItems"),
             "Add template default should be element type: " + output);
     }
 
+    @Test
+    void renderPublicSection_listOfPrimitive_addIsByValue() {
+        // C2J emits by-value Add for lists of primitive OR enum elements; only non-primitive,
+        // non-enum elements get the templated forwarding Add.
+        IntegerShape intShape = IntegerShape.builder().id("com.example#Integer").build();
+        ListShape list = ListShape.builder()
+            .id("com.example#IntList")
+            .member(MemberShape.builder().id("com.example#IntList$member").target("com.example#Integer").build())
+            .build();
+        StructureShape shape = StructureShape.builder()
+            .id("com.example#MyShape")
+            .addMember("Counts", list.getId())
+            .build();
+        Model model = Model.builder().addShapes(intShape, list, shape).build();
+        CppWriter writer = new CppWriter();
+        MemberRenderer.forStructure(model, shape, "MyShape").renderPublicAccessors(writer);
+        String output = writer.toString();
+        assertTrue(output.contains("inline MyShape& AddCounts(int value)"),
+            "List of primitive should get by-value Add: " + output);
+        assertTrue(output.contains("m_counts.push_back(value)"),
+            "By-value list Add should push_back directly: " + output);
+        assertFalse(output.contains("AddCounts(CountsT&&"),
+            "Must not emit templated Add for primitive element: " + output);
+    }
+
+    @Test
+    void renderPublicSection_mapWithPrimitiveValue_addIsByValue() {
+        // C2J emits a by-value Add for maps unless BOTH key and value are non-primitive
+        // AND non-enum. Here value is int (primitive), so Add must be a plain by-value overload.
+        StringShape str = StringShape.builder().id("com.example#String").build();
+        IntegerShape intShape = IntegerShape.builder().id("com.example#Integer").build();
+        MapShape map = MapShape.builder()
+            .id("com.example#SummaryMap")
+            .key(MemberShape.builder().id("com.example#SummaryMap$key").target("com.example#String").build())
+            .value(MemberShape.builder().id("com.example#SummaryMap$value").target("com.example#Integer").build())
+            .build();
+        StructureShape shape = StructureShape.builder()
+            .id("com.example#MyShape")
+            .addMember("SummaryMap", map.getId())
+            .build();
+        Model model = Model.builder().addShapes(str, intShape, map, shape).build();
+        CppWriter writer = new CppWriter();
+        MemberRenderer.forStructure(model, shape, "MyShape").renderPublicAccessors(writer);
+        String output = writer.toString();
+        assertTrue(output.contains("MyShape& AddSummaryMap(Aws::String key, int value)"),
+            "Map with primitive value should get by-value Add: " + output);
+        assertTrue(output.contains("m_summaryMap.emplace(key, value)"),
+            "By-value Add should emplace directly: " + output);
+        assertFalse(output.contains("AddSummaryMap(SummaryMapKeyT&&"),
+            "Must not emit templated forwarding Add when value is primitive: " + output);
+    }
+
+    @Test
+    void renderPublicSection_mapWithNonPrimitiveKeyAndValue_addIsTemplated() {
+        // Both key (String) and value (struct) are non-primitive/non-enum -> templated Add.
+        StringShape str = StringShape.builder().id("com.example#String").build();
+        StructureShape valueStruct = StructureShape.builder().id("com.example#ValueStruct").build();
+        MapShape map = MapShape.builder()
+            .id("com.example#ThingMap")
+            .key(MemberShape.builder().id("com.example#ThingMap$key").target("com.example#String").build())
+            .value(MemberShape.builder().id("com.example#ThingMap$value").target("com.example#ValueStruct").build())
+            .build();
+        StructureShape shape = StructureShape.builder()
+            .id("com.example#MyShape")
+            .addMember("ThingMap", map.getId())
+            .build();
+        Model model = Model.builder().addShapes(str, valueStruct, map, shape).build();
+        CppWriter writer = new CppWriter();
+        MemberRenderer.forStructure(model, shape, "MyShape").renderPublicAccessors(writer);
+        String output = writer.toString();
+        assertTrue(output.contains("MyShape& AddThingMap(ThingMapKeyT&& key, ThingMapValueT&& value)"),
+            "Map with non-primitive key/value should get templated Add: " + output);
+        assertTrue(output.contains("m_thingMap.emplace(std::forward<ThingMapKeyT>(key), std::forward<ThingMapValueT>(value))"),
+            "Templated Add should perfect-forward: " + output);
+    }
+
+    @Test
+    void renderPublicSection_documentMember_getterReturnsDocumentViewByValue() {
+        // C2J special-cases the document getter to return Aws::Utils::DocumentView by value
+        // (ModelClassMembersAndInlines.vm: $returnType = "Aws::Utils::DocumentView"), while the
+        // field and setter stay Aws::Utils::Document.
+        software.amazon.smithy.model.shapes.DocumentShape doc =
+            software.amazon.smithy.model.shapes.DocumentShape.builder().id("com.example#Doc").build();
+        StructureShape shape = StructureShape.builder()
+            .id("com.example#MyShape")
+            .addMember("json", doc.getId())
+            .build();
+        Model model = Model.builder().addShapes(doc, shape).build();
+        CppWriter writer = new CppWriter();
+        MemberRenderer.forStructure(model, shape, "MyShape").renderPublicAccessors(writer);
+        String output = writer.toString();
+        assertTrue(output.contains("inline Aws::Utils::DocumentView GetJson() const { return m_json; }"),
+            "Document getter must return DocumentView by value: " + output);
+        assertFalse(output.contains("const Aws::Utils::Document& GetJson"),
+            "Document getter must not return const Document&: " + output);
+        // Setter still forwards an Aws::Utils::Document.
+        assertTrue(output.contains("template <typename JsonT = Aws::Utils::Document>"),
+            "Document setter template default must be Aws::Utils::Document: " + output);
+    }
+
+    @Test
+    void renderPublicSection_documentMember_privateFieldIsDocument() {
+        software.amazon.smithy.model.shapes.DocumentShape doc =
+            software.amazon.smithy.model.shapes.DocumentShape.builder().id("com.example#Doc").build();
+        StructureShape shape = StructureShape.builder()
+            .id("com.example#MyShape")
+            .addMember("json", doc.getId())
+            .build();
+        Model model = Model.builder().addShapes(doc, shape).build();
+        CppWriter writer = new CppWriter();
+        MemberRenderer.forStructure(model, shape, null).renderPrivateSection(writer);
+        String output = writer.toString();
+        assertTrue(output.contains("Aws::Utils::Document m_json;"),
+            "Document field must be Aws::Utils::Document: " + output);
+    }
+
+    @Test
+    void renderPublicSection_sensitiveBlobMember_usesCryptoBuffer() {
+        // A @sensitive blob member renders CryptoBuffer in the getter, setter template default,
+        // and (via renderPrivateSection) the field — matching C2J.
+        software.amazon.smithy.model.shapes.BlobShape sensitive =
+            software.amazon.smithy.model.shapes.BlobShape.builder().id("com.example#PartBody")
+                .addTrait(new software.amazon.smithy.model.traits.SensitiveTrait()).build();
+        StructureShape shape = StructureShape.builder()
+            .id("com.example#MyShape")
+            .addMember("bytes", sensitive.getId())
+            .build();
+        Model model = Model.builder().addShapes(sensitive, shape).build();
+        CppWriter pub = new CppWriter();
+        MemberRenderer.forStructure(model, shape, "MyShape").renderPublicAccessors(pub);
+        String pubOut = pub.toString();
+        assertTrue(pubOut.contains("inline const Aws::Utils::CryptoBuffer& GetBytes() const"),
+            "Sensitive blob getter must be CryptoBuffer: " + pubOut);
+        assertTrue(pubOut.contains("template <typename BytesT = Aws::Utils::CryptoBuffer>"),
+            "Sensitive blob setter template default must be CryptoBuffer: " + pubOut);
+        CppWriter priv = new CppWriter();
+        MemberRenderer.forStructure(model, shape, null).renderPrivateSection(priv);
+        assertTrue(priv.toString().contains("Aws::Utils::CryptoBuffer m_bytes{};"),
+            "Sensitive blob field must be CryptoBuffer: " + priv);
+    }
+
     @Test
     void renderPublicSection_primitiveGetter_returnsByValue() {
         IntegerShape intShape = IntegerShape.builder().id("com.example#Integer").build();
@@ -83,7 +249,7 @@ void renderPublicSection_primitiveGetter_returnsByValue() {
             .build();
         Model model = Model.builder().addShapes(intShape, shape).build();
         CppWriter writer = new CppWriter();
-        MemberRenderer.renderPublicSection(writer, shape, model, "AWS_TEST_API", "MyShape");
+        MemberRenderer.forStructure(model, shape, "MyShape").renderPublicAccessors(writer);
         String output = writer.toString();
         // Primitive getter should return by value, not const ref
         assertTrue(output.contains("inline int GetCount() const"), "Primitive should return by value: " + output);
@@ -99,7 +265,7 @@ void renderPublicSection_doxygenGroupMarkers() {
             .build();
         Model model = Model.builder().addShapes(str, shape).build();
         CppWriter writer = new CppWriter();
-        MemberRenderer.renderPublicSection(writer, shape, model, "AWS_TEST_API", "MyShape");
+        MemberRenderer.forStructure(model, shape, "MyShape").renderPublicAccessors(writer);
         String output = writer.toString();
         assertTrue(output.contains("///@{"), "Missing doxygen open: " + output);
         assertTrue(output.contains("///@}"), "Missing doxygen close: " + output);
@@ -116,7 +282,7 @@ void renderPrivateSection_primitiveMembers_haveDefaultValues() {
             .build();
         Model model = Model.builder().addShapes(intShape, boolShape, shape).build();
         CppWriter writer = new CppWriter();
-        MemberRenderer.renderPrivateSection(writer, shape, model);
+        MemberRenderer.forStructure(model, shape, null).renderPrivateSection(writer);
         String output = writer.toString();
         assertTrue(output.contains("int m_count{0}"), "Missing int default: " + output);
         assertTrue(output.contains("bool m_enabled{false}"), "Missing bool default: " + output);
@@ -133,13 +299,63 @@ void renderPrivateSection_nonPrimitiveMembers_noDefaultValue() {
             .build();
         Model model = Model.builder().addShapes(str, shape).build();
         CppWriter writer = new CppWriter();
-        MemberRenderer.renderPrivateSection(writer, shape, model);
+        MemberRenderer.forStructure(model, shape, null).renderPrivateSection(writer);
         String output = writer.toString();
         assertTrue(output.contains("Aws::String m_name;"), "Missing string field: " + output);
         assertFalse(output.contains("m_name{"), "String should NOT have brace init: " + output);
         assertTrue(output.contains("bool m_nameHasBeenSet = false"), "Missing HasBeenSet flag: " + output);
     }
 
+    @Test
+    void renderPrivateSection_idempotencyTokenMember_initializesWithPseudoRandomUuidAndHasBeenSetTrue() {
+        // C2J auto-populates @idempotencyToken members with a random UUID at construction
+        // (ServiceClientModelHeaderMemberDeclaration.vm) and flags them as already-set
+        // (ModelClassMembersAndInlines.vm), so a caller who omits the token still gets
+        // idempotent behavior. The initializer and the =true flag must both be emitted.
+        StringShape str = StringShape.builder().id("com.example#String").build();
+        StructureShape shape = StructureShape.builder()
+            .id("com.example#MyShape")
+            .addMember(MemberShape.builder()
+                .id("com.example#MyShape$clientToken").target("com.example#String")
+                .addTrait(new software.amazon.smithy.model.traits.IdempotencyTokenTrait())
+                .build())
+            .build();
+        Model model = Model.builder().addShapes(str, shape).build();
+        CppWriter writer = new CppWriter();
+        MemberRenderer.forStructure(model, shape, null).renderPrivateSection(writer);
+        String output = writer.toString();
+        assertTrue(output.contains("Aws::String m_clientToken{Aws::Utils::UUID::PseudoRandomUUID()};"),
+            "Idempotency token should be initialized with PseudoRandomUUID: " + output);
+        assertTrue(output.contains("bool m_clientTokenHasBeenSet = true;"),
+            "Idempotency token HasBeenSet flag should default to true: " + output);
+    }
+
+    @Test
+    void renderPrivateDataMembersExcluding_idempotencyTokenMember_initializesWithPseudoRandomUuid() {
+        // The streaming-result / event-stream path routes through the *Excluding overloads;
+        // they must apply the same idempotency-token initializer as the primary path.
+        StringShape str = StringShape.builder().id("com.example#String").build();
+        StructureShape shape = StructureShape.builder()
+            .id("com.example#MyShape")
+            .addMember(MemberShape.builder()
+                .id("com.example#MyShape$clientToken").target("com.example#String")
+                .addTrait(new software.amazon.smithy.model.traits.IdempotencyTokenTrait())
+                .build())
+            .addMember("other", str.getId())
+            .build();
+        Model model = Model.builder().addShapes(str, shape).build();
+        CppWriter writer = new CppWriter();
+        MemberRenderer.forStructure(model, shape, null).excluding("other").renderDataMembers(writer);
+        String dataOut = writer.toString();
+        assertTrue(dataOut.contains("Aws::String m_clientToken{Aws::Utils::UUID::PseudoRandomUUID()};"),
+            "Excluding overload should also emit the idempotency-token initializer: " + dataOut);
+        CppWriter flagWriter = new CppWriter();
+        MemberRenderer.forStructure(model, shape, null).excluding("other").renderHasBeenSetFlags(flagWriter);
+        String flagOut = flagWriter.toString();
+        assertTrue(flagOut.contains("bool m_clientTokenHasBeenSet = true;"),
+            "Excluding overload should also emit HasBeenSet = true: " + flagOut);
+    }
+
     @Test
     void renderPrivateSection_hasBeenSetFlagsGroupedAtEnd() {
         StringShape str = StringShape.builder().id("com.example#String").build();
@@ -151,7 +367,7 @@ void renderPrivateSection_hasBeenSetFlagsGroupedAtEnd() {
             .build();
         Model model = Model.builder().addShapes(str, intShape, shape).build();
         CppWriter writer = new CppWriter();
-        MemberRenderer.renderPrivateSection(writer, shape, model);
+        MemberRenderer.forStructure(model, shape, null).renderPrivateSection(writer);
         String output = writer.toString();
         // HasBeenSet flags should come after data members
         int nameFieldPos = output.indexOf("Aws::String m_name;");
@@ -161,4 +377,21 @@ void renderPrivateSection_hasBeenSetFlagsGroupedAtEnd() {
         assertTrue(nameFieldPos < nameHasBeenSetPos, "Data members should precede HasBeenSet flags");
         assertTrue(countFieldPos < countHasBeenSetPos, "Data members should precede HasBeenSet flags");
     }
+
+    @Test
+    void renderRequestIdAccessors_emitsTemplatedGetSetWith() {
+        com.amazonaws.util.awsclientsmithygenerator.generators.CppWriter writer =
+            new com.amazonaws.util.awsclientsmithygenerator.generators.CppWriter();
+        MemberRenderer.renderRequestIdAccessors(writer, "GetFooResult");
+        String out = writer.toString();
+        assertTrue(out.contains("inline const Aws::String& GetRequestId() const { return m_requestId; }"));
+        assertTrue(out.contains("template <typename RequestIdT = Aws::String>"));
+        assertTrue(out.contains("void SetRequestId(RequestIdT&& value)"));
+        assertTrue(out.contains("m_requestIdHasBeenSet = true;"));
+        assertTrue(out.contains("m_requestId = std::forward<RequestIdT>(value);"));
+        assertTrue(out.contains("GetFooResult& WithRequestId(RequestIdT&& value)"));
+        assertTrue(out.contains("SetRequestId(std::forward<RequestIdT>(value));"));
+        assertTrue(out.contains("///@{"));
+        assertTrue(out.contains("///@}"));
+    }
 }
diff --git a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/OutgoingEventStreamRendererTest.java b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/OutgoingEventStreamRendererTest.java
new file mode 100644
index 000000000000..483d2f652a20
--- /dev/null
+++ b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/OutgoingEventStreamRendererTest.java
@@ -0,0 +1,146 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+package com.amazonaws.util.awsclientsmithygenerator.generators.model;
+
+import com.amazonaws.util.awsclientsmithygenerator.generators.CppWriterDelegator;
+import com.amazonaws.util.awsclientsmithygenerator.generators.model.ProtocolResolver.Protocol;
+import com.amazonaws.util.awsclientsmithygenerator.generators.model.RenderContext;
+import com.amazonaws.util.awsclientsmithygenerator.generators.model.renderers.OutgoingEventStreamRenderer;
+import org.junit.jupiter.api.Test;
+import software.amazon.smithy.build.MockManifest;
+import software.amazon.smithy.model.Model;
+import software.amazon.smithy.model.shapes.BlobShape;
+import software.amazon.smithy.model.shapes.MemberShape;
+import software.amazon.smithy.model.shapes.OperationShape;
+import software.amazon.smithy.model.shapes.ServiceShape;
+import software.amazon.smithy.model.shapes.ShapeId;
+import software.amazon.smithy.model.shapes.StringShape;
+import software.amazon.smithy.model.shapes.StructureShape;
+import software.amazon.smithy.model.shapes.UnionShape;
+import software.amazon.smithy.model.traits.EventPayloadTrait;
+import software.amazon.smithy.model.traits.StreamingTrait;
+
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class OutgoingEventStreamRendererTest {
+
+    /**
+     * A bidirectional operation whose input binds a @streaming union with one event member whose
+     * payload is a nested structure (the implicit-structure case, like bedrock's
+     * BidirectionalInputPayloadPart).
+     */
+    private static Model structurePayloadModel() {
+        StringShape str = StringShape.builder().id("com.example#String").build();
+        BlobShape blob = BlobShape.builder().id("com.example#PartBody").build();
+        // Event shape: single implicit blob member -> parent is the payload (structure encoding).
+        StructureShape event = StructureShape.builder()
+            .id("com.example#ChunkEvent")
+            .addMember("bytes", blob.getId())
+            .build();
+        UnionShape stream = UnionShape.builder()
+            .id("com.example#BidirectionalInput")
+            .addTrait(new StreamingTrait())
+            .addMember("chunk", event.getId())
+            .build();
+        StructureShape input = StructureShape.builder()
+            .id("com.example#DoStreamInput")
+            .addMember(MemberShape.builder()
+                .id("com.example#DoStreamInput$body").target(stream.getId())
+                .addTrait(new software.amazon.smithy.model.traits.HttpPayloadTrait()).build())
+            .build();
+        StructureShape output = StructureShape.builder()
+            .id("com.example#DoStreamOutput").addMember("r", str.getId()).build();
+        OperationShape op = OperationShape.builder()
+            .id("com.example#DoStream").input(input.getId()).output(output.getId()).build();
+        ServiceShape service = ServiceShape.builder()
+            .id("com.example#Example").version("2024-01-01").addOperation(op.getId()).build();
+        return Model.builder().addShapes(str, blob, event, stream, input, output, op, service).build();
+    }
+
+    /** Same shape but the single blob member is explicitly @eventPayload -> raw blob encoding. */
+    private static Model blobPayloadModel() {
+        StringShape str = StringShape.builder().id("com.example#String").build();
+        BlobShape blob = BlobShape.builder().id("com.example#PartBody").build();
+        StructureShape event = StructureShape.builder()
+            .id("com.example#ChunkEvent")
+            .addMember(MemberShape.builder()
+                .id("com.example#ChunkEvent$bytes").target(blob.getId())
+                .addTrait(new EventPayloadTrait()).build())
+            .build();
+        UnionShape stream = UnionShape.builder()
+            .id("com.example#BidirectionalInput")
+            .addTrait(new StreamingTrait())
+            .addMember("chunk", event.getId())
+            .build();
+        StructureShape input = StructureShape.builder()
+            .id("com.example#DoStreamInput")
+            .addMember(MemberShape.builder()
+                .id("com.example#DoStreamInput$body").target(stream.getId())
+                .addTrait(new software.amazon.smithy.model.traits.HttpPayloadTrait()).build())
+            .build();
+        StructureShape output = StructureShape.builder()
+            .id("com.example#DoStreamOutput").addMember("r", str.getId()).build();
+        OperationShape op = OperationShape.builder()
+            .id("com.example#DoStream").input(input.getId()).output(output.getId()).build();
+        ServiceShape service = ServiceShape.builder()
+            .id("com.example#Example").version("2024-01-01").addOperation(op.getId()).build();
+        return Model.builder().addShapes(str, blob, event, stream, input, output, op, service).build();
+    }
+
+    private static String render(Model model, Protocol protocol) {
+        ServiceShape service = model.expectShape(ShapeId.from("com.example#Example"), ServiceShape.class);
+        MockManifest manifest = new MockManifest();
+        CppWriterDelegator delegator = new CppWriterDelegator(manifest);
+        List<software.amazon.smithy.model.shapes.Shape> outgoing =
+            List.of(model.expectShape(ShapeId.from("com.example#BidirectionalInput")));
+        new OutgoingEventStreamRenderer(outgoing,
+            new RenderContext(model, service, ProtocolResolver.traitsFor(protocol),
+                "Example", "AWS_EXAMPLE_API", "example")).render(delegator);
+        delegator.flushWriters();
+        return manifest.getFileString(manifest.getFiles().stream()
+            .filter(p -> p.toString().endsWith("BidirectionalInput.h")).findFirst().orElseThrow()).orElseThrow();
+    }
+
+    @Test
+    void rendersEventEncoderStreamSubclassWithWriteMethod() {
+        String h = render(structurePayloadModel(), Protocol.JSON);
+        assertTrue(h.contains("class AWS_EXAMPLE_API BidirectionalInput : public Aws::Utils::Event::EventEncoderStream {"), h);
+        assertTrue(h.contains("BidirectionalInput() = default;"), h);
+        assertTrue(h.contains("explicit BidirectionalInput(std::shared_ptr<Aws::Utils::Stream::HttpWriteDataStreamBuf> streambuf)"), h);
+        assertTrue(h.contains("BidirectionalInput& WriteChunkEvent(const ChunkEvent& value) {"), h);
+        assertTrue(h.contains("msg.InsertEventHeader(\":event-type\", Aws::String(\"chunk\"));"), h);
+        assertTrue(h.contains("WriteEvent(msg);"), h);
+        assertTrue(h.contains("#include <aws/example/model/ChunkEvent.h>"), h);
+        assertTrue(h.contains("#include <aws/core/utils/event/EventStream.h>"), h);
+    }
+
+    @Test
+    void jsonStructurePayload_usesJsonizeAndApplicationJson() {
+        String h = render(structurePayloadModel(), Protocol.JSON);
+        assertTrue(h.contains("msg.InsertEventHeader(\":content-type\", Aws::String(\"application/json\"));"), h);
+        assertTrue(h.contains("msg.WriteEventPayload(value.Jsonize().View().WriteCompact());"), h);
+    }
+
+    @Test
+    void cborStructurePayload_usesCborEncodeAndApplicationCbor() {
+        String h = render(structurePayloadModel(), Protocol.CBOR);
+        assertTrue(h.contains("msg.InsertEventHeader(\":content-type\", Aws::String(\"application/cbor\"));"), h);
+        assertTrue(h.contains("value.CborEncode(encoder);"), h);
+        assertTrue(h.contains("msg.WriteEventPayload(encoder.GetEncodedData().ptr, encoder.GetEncodedData().len);"), h);
+        assertFalse(h.contains("Jsonize"), "CBOR must not use Jsonize: " + h);
+    }
+
+    @Test
+    void explicitEventPayloadBlob_usesOctetStreamAndEmptyGuard() {
+        String h = render(blobPayloadModel(), Protocol.JSON);
+        assertTrue(h.contains("msg.InsertEventHeader(\":content-type\", Aws::String(\"application/octet-stream\"));"), h);
+        assertTrue(h.contains("if (!value.GetBytes().empty()) {"), h);
+        assertTrue(h.contains("msg.WriteEventPayload(value.GetBytes());"), h);
+        assertFalse(h.contains("Jsonize"), "Blob payload must not use Jsonize: " + h);
+    }
+}
diff --git a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/ProtocolResolverTest.java b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/ProtocolResolverTest.java
index 354df389edeb..82c384335470 100644
--- a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/ProtocolResolverTest.java
+++ b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/ProtocolResolverTest.java
@@ -14,14 +14,21 @@
 class ProtocolResolverTest {
 
     @Test
-    void resolve_restJson1() {
+    void resolve_restJson1_mapsToRestJson() {
         ServiceShape service = ServiceShape.builder()
             .id("com.example#TestService")
             .version("2023-01-01")
             .addTrait(software.amazon.smithy.aws.traits.protocols.RestJson1Trait.builder().build())
             .build();
         Model model = Model.builder().addShape(service).build();
-        assertEquals(Protocol.JSON, ProtocolResolver.resolve(service, model));
+        assertEquals(Protocol.REST_JSON, ProtocolResolver.resolve(service, model));
+    }
+
+    @Test
+    void restJson_isJsonLike_andUsesJsonTraits() {
+        assertTrue(Protocol.REST_JSON.isJsonLike());
+        assertTrue(ProtocolResolver.traitsFor(Protocol.REST_JSON)
+            instanceof com.amazonaws.util.awsclientsmithygenerator.generators.model.protocol.JsonProtocolTraits);
     }
 
     @Test
@@ -112,12 +119,12 @@ void protocol_json_serializeMethodName() {
 
     @Test
     void protocol_cbor_serdeNamespace() {
-        assertEquals("Aws::Utils::Json", Protocol.CBOR.getSerdeNamespace());
+        assertEquals("Aws::Utils::Cbor", Protocol.CBOR.getSerdeNamespace());
     }
 
     @Test
     void protocol_cbor_viewType() {
-        assertEquals("Aws::Utils::Json::JsonView", Protocol.CBOR.getViewType());
+        assertEquals("Aws::Utils::Cbor::CborValue", Protocol.CBOR.getViewType());
     }
 
     @Test
@@ -152,8 +159,8 @@ void protocol_json_isJsonLike() {
     }
 
     @Test
-    void protocol_cbor_isJsonLike() {
-        assertTrue(Protocol.CBOR.isJsonLike());
+    void protocol_cbor_isNeitherJsonNorXmlLike() {
+        assertFalse(Protocol.CBOR.isJsonLike());
         assertFalse(Protocol.CBOR.isXmlLike());
     }
 
@@ -178,11 +185,15 @@ void protocol_ec2_isXmlLike() {
     // ---------- traitsFor: the single protocol -> strategy selection point ----------
 
     @Test
-    void traitsFor_jsonAndCbor_returnJsonTraits() {
+    void traitsFor_json_returnsJsonTraits() {
         assertInstanceOf(com.amazonaws.util.awsclientsmithygenerator.generators.model.protocol
             .JsonProtocolTraits.class, ProtocolResolver.traitsFor(Protocol.JSON));
-        assertInstanceOf(com.amazonaws.util.awsclientsmithygenerator.generators.model.protocol
-            .JsonProtocolTraits.class, ProtocolResolver.traitsFor(Protocol.CBOR));
+    }
+
+    @Test
+    void cbor_usesCborTraits() {
+        assertTrue(ProtocolResolver.traitsFor(Protocol.CBOR)
+            instanceof com.amazonaws.util.awsclientsmithygenerator.generators.model.protocol.CborProtocolTraits);
     }
 
     @Test
diff --git a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/ProtocolTraitsCharacterizationTest.java b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/ProtocolTraitsCharacterizationTest.java
index 82e38cd32212..01834ac14ae4 100644
--- a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/ProtocolTraitsCharacterizationTest.java
+++ b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/ProtocolTraitsCharacterizationTest.java
@@ -10,6 +10,7 @@
 import com.amazonaws.util.awsclientsmithygenerator.generators.model.renderers.ResultRenderer;
 import com.amazonaws.util.awsclientsmithygenerator.generators.model.renderers.SubObjectRenderer;
 import com.amazonaws.util.awsclientsmithygenerator.generators.model.protocol.ProtocolTraits;
+import com.amazonaws.util.awsclientsmithygenerator.generators.model.RenderContext;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.EnumSource;
@@ -43,6 +44,8 @@ class ProtocolTraitsCharacterizationTest {
     private static Trait traitFor(Protocol p) {
         switch (p) {
             case JSON:
+                return software.amazon.smithy.aws.traits.protocols.AwsJson1_0Trait.builder().build();
+            case REST_JSON:
                 return software.amazon.smithy.aws.traits.protocols.RestJson1Trait.builder().build();
             case CBOR:
                 return software.amazon.smithy.protocol.traits.Rpcv2CborTrait.builder().build();
@@ -63,18 +66,32 @@ private static Trait traitFor(Protocol p) {
      */
     private static Model modelFor(Protocol p) {
         StringShape str = StringShape.builder().id("com.example#Str").build();
+        software.amazon.smithy.model.shapes.IntegerShape intShape =
+            software.amazon.smithy.model.shapes.IntegerShape.builder().id("com.example#Int").build();
         StructureShape nested = StructureShape.builder()
             .id("com.example#Nested")
             .addMember("value", str.getId())
             .build();
+        // Input carries a plain member, an httpHeader member, and an httpQuery member so
+        // both request Axis-1 predicates (header + query) fire.
         StructureShape input = StructureShape.builder()
             .id("com.example#DoThingInput")
             .addMember("name", str.getId())
             .addMember("nested", nested.getId())
+            .addMember(software.amazon.smithy.model.shapes.MemberShape.builder()
+                .id("com.example#DoThingInput$hdr").target(str.getId())
+                .addTrait(new software.amazon.smithy.model.traits.HttpHeaderTrait("X-Thing")).build())
+            .addMember(software.amazon.smithy.model.shapes.MemberShape.builder()
+                .id("com.example#DoThingInput$q").target(str.getId())
+                .addTrait(new software.amazon.smithy.model.traits.HttpQueryTrait("q")).build())
             .build();
+        // Output carries a plain member and an httpResponseCode member.
         StructureShape output = StructureShape.builder()
             .id("com.example#DoThingOutput")
             .addMember("nested", nested.getId())
+            .addMember(software.amazon.smithy.model.shapes.MemberShape.builder()
+                .id("com.example#DoThingOutput$status").target(intShape.getId())
+                .addTrait(new software.amazon.smithy.model.traits.HttpResponseCodeTrait()).build())
             .build();
         OperationShape op = OperationShape.builder()
             .id("com.example#DoThing")
@@ -87,7 +104,7 @@ private static Model modelFor(Protocol p) {
             .addTrait(traitFor(p))
             .addOperation(op.getId())
             .build();
-        return Model.builder().addShapes(str, nested, input, output, op, service).build();
+        return Model.builder().addShapes(str, intShape, nested, input, output, op, service).build();
     }
 
     private static ServiceShape serviceOf(Model model) {
@@ -106,12 +123,11 @@ private static java.util.Map<String, String> renderAll(Protocol p) {
         CppWriterDelegator delegator = new CppWriterDelegator(manifest);
 
         ProtocolTraits traits = ProtocolResolver.traitsFor(resolved);
-        new SubObjectRenderer(classified.subObjects(), model, service, traits,
-            "Example", "AWS_EXAMPLE_API", "Example", "example").render(delegator);
-        new RequestRenderer(classified.requests(), model, service, traits,
-            "Example", "AWS_EXAMPLE_API", "example").render(delegator);
-        new ResultRenderer(classified.results(), model, service, traits,
-            "Example", "AWS_EXAMPLE_API", "example").render(delegator);
+        RenderContext ctx = new RenderContext(model, service, traits,
+            "Example", "AWS_EXAMPLE_API", "example");
+        new SubObjectRenderer(classified.subObjects(), ctx).render(delegator);
+        new RequestRenderer(classified.requests(), ctx).render(delegator);
+        new ResultRenderer(classified.results(), ctx).render(delegator);
 
         delegator.flushWriters();
 
@@ -147,7 +163,7 @@ void everyProtocol_generatesTheSameFileSet(Protocol p) {
     // ---------- sub-object: serde decls, includes, usings, fwd decls ----------
 
     @ParameterizedTest
-    @EnumSource(value = Protocol.class, names = {"JSON", "CBOR"})
+    @EnumSource(value = Protocol.class, names = {"JSON", "REST_JSON"})
     void jsonLike_subObjectHeader_hasJsonSerdeDeclsAndFwdDecls(Protocol p) {
         String h = file(p, "Nested.h");
         assertTrue(h.contains("AWS_EXAMPLE_API Nested() = default;"), h);
@@ -159,6 +175,21 @@ void jsonLike_subObjectHeader_hasJsonSerdeDeclsAndFwdDecls(Protocol p) {
         assertFalse(h.contains("XmlNode"), "JSON-like header must not mention XML: " + h);
     }
 
+    @Test
+    void cbor_subObjectHeader_hasCborDecoderSerdeDeclsAndCborInclude() {
+        // CborSubObjectHeader.vm: streaming CborDecoder ctor/operator= + CborEncode, a hard
+        // <aws/crt/cbor/Cbor.h> include, and a CborValue forward declaration. NOT Jsonize/CborValue-arg.
+        String h = file(Protocol.CBOR, "Nested.h");
+        assertTrue(h.contains("#include <aws/crt/cbor/Cbor.h>"), h);
+        assertTrue(h.contains(
+            "AWS_EXAMPLE_API Nested(const std::shared_ptr<Aws::Crt::Cbor::CborDecoder>& decoder);"), h);
+        assertTrue(h.contains(
+            "AWS_EXAMPLE_API Nested& operator=(const std::shared_ptr<Aws::Crt::Cbor::CborDecoder>& decoder);"), h);
+        assertTrue(h.contains("AWS_EXAMPLE_API void CborEncode(Aws::Crt::Cbor::CborEncoder& encoder) const;"), h);
+        assertTrue(h.contains("class CborValue;"), h);
+        assertFalse(h.contains("Jsonize"), "CBOR header must not mention Jsonize: " + h);
+    }
+
     @Test
     void restXml_subObjectHeader_hasAddToNodeAndXmlNodeFwdDecl() {
         String h = file(Protocol.REST_XML, "Nested.h");
@@ -169,6 +200,24 @@ void restXml_subObjectHeader_hasAddToNodeAndXmlNodeFwdDecl() {
         assertFalse(h.contains("Jsonize"), "REST_XML header must not mention Jsonize: " + h);
     }
 
+    @ParameterizedTest
+    @EnumSource(value = Protocol.class, names = {"QUERY_XML", "EC2"})
+    void queryLike_subObjectHeader_forwardDeclaresOStreamViaAWSStreamFwd(Protocol p) {
+        // Query/EC2 sub-objects declare OutputToStream(Aws::OStream&, ...), so the header must
+        // include AWSStreamFwd.h to forward-declare Aws::OStream, matching C2J.
+        String h = file(p, "Nested.h");
+        assertTrue(h.contains("#include <aws/core/utils/memory/stl/AWSStreamFwd.h>"), h);
+    }
+
+    @ParameterizedTest
+    @EnumSource(value = Protocol.class, names = {"JSON", "REST_JSON", "REST_XML", "CBOR"})
+    void nonQuery_subObjectHeader_omitsAWSStreamFwd(Protocol p) {
+        // Only Query/EC2 sub-objects emit OutputToStream; other protocols must not pull in
+        // AWSStreamFwd.h.
+        String h = file(p, "Nested.h");
+        assertFalse(h.contains("AWSStreamFwd.h"), h);
+    }
+
     @ParameterizedTest
     @EnumSource(value = Protocol.class, names = {"QUERY_XML", "EC2"})
     void queryLike_subObjectHeader_hasBothOutputToStreamOverloads(Protocol p) {
@@ -183,7 +232,7 @@ void queryLike_subObjectHeader_hasBothOutputToStreamOverloads(Protocol p) {
     }
 
     @ParameterizedTest
-    @EnumSource(value = Protocol.class, names = {"JSON", "CBOR"})
+    @EnumSource(value = Protocol.class, names = {"JSON", "REST_JSON"})
     void jsonLike_subObjectSource_hasJsonIncludeUsingAndStubs(Protocol p) {
         String c = file(p, "Nested.cpp");
         assertTrue(c.contains("#include <aws/core/utils/json/JsonSerializer.h>"), c);
@@ -193,7 +242,6 @@ void jsonLike_subObjectSource_hasJsonIncludeUsingAndStubs(Protocol p) {
         assertTrue(c.contains("Nested& Nested::operator=(JsonView jsonValue) {"), c);
         assertTrue(c.contains("JsonValue Nested::Jsonize() const {"), c);
         assertTrue(c.contains("JsonValue payload;"), c);
-        assertFalse(c.contains("XmlSerializer.h"), c);
     }
 
     @Test
@@ -204,7 +252,6 @@ void restXml_subObjectSource_hasXmlIncludeUsingAndStubs() {
         assertTrue(c.contains("Nested::Nested(const XmlNode& xmlNode) { *this = xmlNode; }"), c);
         assertTrue(c.contains("Nested& Nested::operator=(const XmlNode& xmlNode) {"), c);
         assertTrue(c.contains("void Nested::AddToNode(XmlNode& parentNode) const {"), c);
-        assertFalse(c.contains("JsonSerializer.h"), c);
     }
 
     @ParameterizedTest
@@ -221,7 +268,7 @@ void queryLike_subObjectSource_hasBothOutputToStreamBodies(Protocol p) {
     // ---------- result: AmazonWebServiceResult<> payload type ----------
 
     @ParameterizedTest
-    @EnumSource(value = Protocol.class, names = {"JSON", "CBOR"})
+    @EnumSource(value = Protocol.class, names = {"JSON", "REST_JSON"})
     void jsonLike_resultHeader_usesJsonValuePayloadAndForwardDeclaresJsonValue(Protocol p) {
         String h = file(p, "DoThingResult.h");
         assertTrue(h.contains("AWS_EXAMPLE_API DoThingResult(const "
@@ -248,7 +295,23 @@ void xmlLike_resultHeader_usesXmlDocumentPayloadAndForwardDeclaresXmlDocument(Pr
     }
 
     @ParameterizedTest
-    @EnumSource(value = Protocol.class, names = {"JSON", "CBOR"})
+    @EnumSource(value = Protocol.class, names = {"JSON", "REST_JSON", "CBOR"})
+    void jsonAndCbor_resultSource_includesUnreferencedParam(Protocol p) {
+        // C2J JSON/REST-JSON/CBOR result templates include UnreferencedParam.h; XML-family does not.
+        String c = file(p, "DoThingResult.cpp");
+        assertTrue(c.contains("#include <aws/core/utils/UnreferencedParam.h>"), c);
+    }
+
+    @ParameterizedTest
+    @EnumSource(value = Protocol.class, names = {"JSON", "REST_JSON", "REST_XML", "CBOR"})
+    void nonQuery_resultSource_includesAWSStringStream(Protocol p) {
+        // C2J emits AWSStringStream.h in JSON/REST-JSON/REST-XML/CBOR result sources.
+        String c = file(p, "DoThingResult.cpp");
+        assertTrue(c.contains("#include <aws/core/utils/memory/stl/AWSStringStream.h>"), c);
+    }
+
+    @ParameterizedTest
+    @EnumSource(value = Protocol.class, names = {"JSON", "REST_JSON"})
     void jsonLike_resultSource_hasJsonUsingsAndCtorImpls(Protocol p) {
         String c = file(p, "DoThingResult.cpp");
         assertTrue(c.contains("#include <aws/core/utils/json/JsonSerializer.h>"), c);
@@ -277,32 +340,186 @@ void xmlLike_resultSource_hasXmlUsingsAndCtorImpls(Protocol p) {
     // ---------- request: only the serde include + usings are protocol-specific ----------
 
     @ParameterizedTest
-    @EnumSource(value = Protocol.class, names = {"JSON", "CBOR"})
+    @EnumSource(value = Protocol.class, names = {"JSON", "REST_JSON"})
     void jsonLike_requestSource_hasJsonIncludeAndUsings(Protocol p) {
         String c = file(p, "DoThingRequest.cpp");
         assertTrue(c.contains("#include <aws/core/utils/json/JsonSerializer.h>"), c);
         assertTrue(c.contains("using namespace Aws::Example::Model;"), c);
         assertTrue(c.contains("using namespace Aws::Utils::Json;"), c);
         assertTrue(c.contains("using namespace Aws::Utils;"), c);
-        assertFalse(c.contains("XmlSerializer.h"), c);
     }
 
-    @ParameterizedTest
-    @EnumSource(value = Protocol.class, names = {"REST_XML", "QUERY_XML", "EC2"})
-    void xmlLike_requestSource_hasXmlIncludeAndUsings(Protocol p) {
-        String c = file(p, "DoThingRequest.cpp");
+    @Test
+    void restXml_requestSource_hasXmlIncludeAndUsings() {
+        String c = file(Protocol.REST_XML, "DoThingRequest.cpp");
         assertTrue(c.contains("#include <aws/core/utils/xml/XmlSerializer.h>"), c);
         assertTrue(c.contains("using namespace Aws::Utils::Xml;"), c);
+    }
+
+    @ParameterizedTest
+    @EnumSource(value = Protocol.class, names = {"QUERY_XML", "EC2"})
+    void queryLike_requestSource_usesStringStreamNotXmlSerializer(Protocol p) {
+        // Query/EC2 request bodies serialize to a query string (Action=...&Version=...), so the
+        // source uses StringUtils + AWSStringStream, matching C2J (QueryRequestSource.vm).
+        String c = file(p, "DoThingRequest.cpp");
+        assertTrue(c.contains("#include <aws/core/utils/StringUtils.h>"), c);
+        assertTrue(c.contains("#include <aws/core/utils/memory/stl/AWSStringStream.h>"), c);
+        // Usings are held exact: Query/EC2 request sources must not open the XML namespace.
+        assertFalse(c.contains("using namespace Aws::Utils::Xml;"), c);
         assertFalse(c.contains("JsonSerializer.h"), c);
     }
 
-    /** The request header is protocol-agnostic today; pin that so a regression is loud. */
+    @ParameterizedTest
+    @EnumSource(value = Protocol.class, names = {"JSON", "REST_JSON", "REST_XML", "CBOR"})
+    void nonQuery_requestSource_includesUtility(Protocol p) {
+        // JSON/REST-JSON/REST-XML/CBOR request sources include <utility> for std::forward/move.
+        String c = file(p, "DoThingRequest.cpp");
+        assertTrue(c.contains("#include <utility>"), c);
+    }
+
+    /** Every protocol's request emits SerializePayload and never leaks serde headers. */
     @ParameterizedTest
     @EnumSource(Protocol.class)
-    void requestHeader_isProtocolAgnostic(Protocol p) {
+    void requestHeader_alwaysHasSerializePayload_neverSerdeIncludes(Protocol p) {
         String h = file(p, "DoThingRequest.h");
         assertTrue(h.contains("Aws::String SerializePayload() const override;"), h);
         assertFalse(h.contains("JsonSerializer.h"), "Request header must not include serde headers: " + h);
         assertFalse(h.contains("XmlSerializer.h"), "Request header must not include serde headers: " + h);
     }
+
+    // ---------- per-protocol request surface (fixture has header + query + status members) ----------
+
+    @ParameterizedTest
+    @EnumSource(value = Protocol.class, names = {"JSON"})
+    void awsJson_request_hasTargetHeaderAndQueryAndSerialize(Protocol p) {
+        String h = file(p, "DoThingRequest.h");
+        assertTrue(h.contains("SerializePayload() const override;"), h);
+        assertTrue(h.contains("GetRequestSpecificHeaders() const override;"), h);   // header member OR target
+        assertTrue(h.contains("AddQueryStringParameters(Aws::Http::URI& uri) const override;"), h);
+        assertFalse(h.contains("DumpBodyToUrl"), h);
+    }
+
+    @ParameterizedTest
+    @EnumSource(value = Protocol.class, names = {"REST_JSON", "REST_XML"})
+    void restProtocols_request_headerFromMemberOnly_noTarget_noDump(Protocol p) {
+        String c = file(p, "DoThingRequest.cpp");
+        assertFalse(c.contains("X-Amz-Target"), c);            // rest protocols never target
+        String h = file(p, "DoThingRequest.h");
+        assertTrue(h.contains("GetRequestSpecificHeaders() const override;"), h);   // fixture has header member
+        assertTrue(h.contains("AddQueryStringParameters(Aws::Http::URI& uri) const override;"), h);
+        assertFalse(h.contains("DumpBodyToUrl"), h);
+    }
+
+    @ParameterizedTest
+    @EnumSource(value = Protocol.class, names = {"QUERY_XML", "EC2"})
+    void queryProtocols_request_haveProtectedDumpBodyToUrl(Protocol p) {
+        String h = file(p, "DoThingRequest.h");
+        assertTrue(h.contains("void DumpBodyToUrl(Aws::Http::URI& uri) const override;"), h);
+        assertTrue(h.contains("protected:"), h);
+        String c = file(p, "DoThingRequest.cpp");
+        assertTrue(c.contains("uri.SetQueryString(SerializePayload());"), c);
+    }
+
+    @ParameterizedTest
+    @EnumSource(value = Protocol.class, names = {"CBOR"})
+    void cbor_request_noTargetHeader(Protocol p) {
+        String c = file(p, "DoThingRequest.cpp");
+        assertFalse(c.contains("X-Amz-Target"), c);
+    }
+
+    // ---------- per-protocol result surface ----------
+
+    @ParameterizedTest
+    @EnumSource(value = Protocol.class, names = {"JSON", "REST_JSON"})
+    void jsonResults_useJsonValue(Protocol p) {
+        String h = file(p, "DoThingResult.h");
+        assertTrue(h.contains("AmazonWebServiceResult<Aws::Utils::Json::JsonValue>"), h);
+        assertFalse(h.contains("HasBeenSet() const"), h);   // JSON results hide HasBeenSet
+    }
+
+    @ParameterizedTest
+    @EnumSource(value = Protocol.class, names = {"CBOR"})
+    void cborResults_useCborValueAndHideHasBeenSet(Protocol p) {
+        String h = file(p, "DoThingResult.h");
+        assertTrue(h.contains("AmazonWebServiceResult<Aws::Utils::Cbor::CborValue>"), h);
+        // CborResultHeader.vm sets useRequiredField=false, so CBOR results hide HasBeenSet too.
+        assertFalse(h.contains("HasBeenSet() const"), h);
+    }
+
+    @ParameterizedTest
+    @EnumSource(value = Protocol.class, names = {"REST_XML", "QUERY_XML", "EC2"})
+    void xmlResults_useXmlDocument(Protocol p) {
+        String h = file(p, "DoThingResult.h");
+        assertTrue(h.contains("AmazonWebServiceResult<Aws::Utils::Xml::XmlDocument>"), h);
+    }
+
+    @ParameterizedTest
+    @EnumSource(Protocol.class)
+    void allResults_setStatusCodeMemberFromResponseCode(Protocol p) {
+        String c = file(p, "DoThingResult.cpp");
+        assertTrue(c.contains("m_status = static_cast<int>(result.GetResponseCode());"), c);
+    }
+
+    @ParameterizedTest
+    @EnumSource(value = Protocol.class, names = {"JSON", "REST_JSON", "REST_XML", "CBOR"})
+    void nonQueryResultHeader_hasTopLevelRequestId(Protocol p) {
+        // JSON/REST-XML/CBOR results expose a top-level GetRequestId, matching C2J.
+        String h = file(p, "DoThingResult.h");
+        assertTrue(h.contains("inline const Aws::String& GetRequestId() const"), h);
+        assertTrue(h.contains("Aws::String m_requestId;"), h);
+    }
+
+    @ParameterizedTest
+    @EnumSource(value = Protocol.class, names = {"QUERY_XML", "EC2"})
+    void queryLikeResultHeader_omitsTopLevelRequestId(Protocol p) {
+        // Query/EC2 results carry RequestId inside ResponseMetadata, so they must NOT expose a
+        // top-level GetRequestId / m_requestId, matching C2J.
+        String h = file(p, "DoThingResult.h");
+        assertFalse(h.contains("GetRequestId"), h);
+        assertFalse(h.contains("m_requestId"), h);
+    }
+
+    /** Collapses each line to its trailing content, ignoring leading indentation. */
+    private static String stripIndent(String s) {
+        return s.replaceAll("(?m)^[ \\t]+", "");
+    }
+
+    @ParameterizedTest
+    @EnumSource(value = Protocol.class, names = {"QUERY_XML", "EC2"})
+    void queryLikeResultHeader_noBlankBeforeHttpResponseCodeWhenNoRequestId(Protocol p) {
+        // Without a top-level m_requestId, the last data member is followed directly by
+        // m_HttpResponseCode (no intervening blank line), matching C2J. The fixture's last
+        // result member is the @httpResponseCode int "status".
+        String h = stripIndent(file(p, "DoThingResult.h"));
+        assertTrue(h.contains("int m_status{0};\nAws::Http::HttpResponseCode m_HttpResponseCode;"), h);
+    }
+
+    @ParameterizedTest
+    @EnumSource(value = Protocol.class, names = {"JSON", "REST_JSON", "REST_XML", "CBOR"})
+    void nonQueryResultHeader_blankLinePrecedesRequestId(Protocol p) {
+        // With a top-level m_requestId, a blank line separates the data members from the
+        // m_requestId / m_HttpResponseCode group, matching C2J.
+        String h = stripIndent(file(p, "DoThingResult.h"));
+        assertTrue(h.contains("\n\nAws::String m_requestId;\nAws::Http::HttpResponseCode m_HttpResponseCode;"), h);
+    }
+
+    @ParameterizedTest
+    @EnumSource(value = Protocol.class, names = {"QUERY_XML", "EC2"})
+    void queryLikeResultHeader_omitsAWSStringWhenNoStringMemberOrRequestId(Protocol p) {
+        // With no top-level m_requestId and no string-typed member, the Query/EC2 result header
+        // has no Aws::String use and must not include AWSString.h, matching C2J include hygiene.
+        // (The fixture DoThingOutput has only a nested struct + httpResponseCode int member.)
+        String h = file(p, "DoThingResult.h");
+        assertFalse(h.contains("AWSString.h"), h);
+    }
+
+    @ParameterizedTest
+    @EnumSource(value = Protocol.class, names = {"QUERY_XML", "EC2"})
+    void queryLikeResultSource_includesLogMacrosForResponseMetadataDebug(Protocol p) {
+        // Query/EC2 result operator= emits AWS_LOGSTREAM_DEBUG / ResponseMetadata handling,
+        // so the source must include LogMacros.h and use the Logging namespace, matching C2J.
+        String c = file(p, "DoThingResult.cpp");
+        assertTrue(c.contains("#include <aws/core/utils/logging/LogMacros.h>"), c);
+        assertTrue(c.contains("using namespace Aws::Utils::Logging;"), c);
+    }
 }
diff --git a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/RequestRendererTest.java b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/RequestRendererTest.java
index d0aefbb6bb61..fa3614153182 100644
--- a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/RequestRendererTest.java
+++ b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/RequestRendererTest.java
@@ -6,10 +6,12 @@
 
 import com.amazonaws.util.awsclientsmithygenerator.generators.CppWriterDelegator;
 import com.amazonaws.util.awsclientsmithygenerator.generators.model.ProtocolResolver.Protocol;
+import com.amazonaws.util.awsclientsmithygenerator.generators.model.RenderContext;
 import com.amazonaws.util.awsclientsmithygenerator.generators.model.renderers.RequestRenderer;
 import org.junit.jupiter.api.Test;
 import software.amazon.smithy.build.MockManifest;
 import software.amazon.smithy.model.Model;
+import software.amazon.smithy.model.shapes.MemberShape;
 import software.amazon.smithy.model.shapes.OperationShape;
 import software.amazon.smithy.model.shapes.ServiceShape;
 import software.amazon.smithy.model.shapes.ShapeId;
@@ -64,6 +66,10 @@ private static Model streamingModel(boolean inputStreams, boolean outputStreams)
     }
 
     private static String renderRequestHeaderForStreamingOp(boolean inputStreams, boolean outputStreams) {
+        return renderStreamingOp(inputStreams, outputStreams, "DoStreamRequest.h");
+    }
+
+    private static String renderStreamingOp(boolean inputStreams, boolean outputStreams, String fileSuffix) {
         Model model = streamingModel(inputStreams, outputStreams);
         ServiceShape service = model.expectShape(ShapeId.from("com.example#Example"), ServiceShape.class);
         MockManifest manifest = new MockManifest();
@@ -71,13 +77,13 @@ private static String renderRequestHeaderForStreamingOp(boolean inputStreams, bo
         Protocol protocol = ProtocolResolver.resolve(service, model);
         RequestRenderer renderer = new RequestRenderer(
             ShapeClassifier.classify(model, service, protocol).requests(),
-            model, service, ProtocolResolver.traitsFor(protocol),
-            "Example", "AWS_EXAMPLE_API", "example");
+            new RenderContext(model, service, ProtocolResolver.traitsFor(protocol),
+                "Example", "AWS_EXAMPLE_API", "example"));
         renderer.render(delegator);
         delegator.flushWriters();
         return manifest.getFileString(
             manifest.getFiles().stream()
-                .filter(p -> p.toString().endsWith("DoStreamRequest.h"))
+                .filter(p -> p.toString().endsWith(fileSuffix))
                 .findFirst().orElseThrow())
             .orElseThrow();
     }
@@ -120,6 +126,50 @@ void bidirectionalRequest_alsoHasIsEventStreamRequest() {
             "Bidirectional op must also declare HasEventStreamResponse: " + h);
     }
 
+    @Test
+    void bidirectionalRequest_rendersEventStreamInputMemberAsSharedPtr() {
+        // C2J renders a request with an event-stream (input) member specially: an inline empty
+        // SerializePayload, a GetBody() override returning the encoded IOStream, and the member
+        // itself as a std::shared_ptr<Input> with a collision-renamed getter (GetMemberBody,
+        // because GetBody is reserved). The member has no templated setter and stores a shared_ptr.
+        String h = renderRequestHeaderForStreamingOp(true, true);
+        assertTrue(h.contains("#include <memory>"), "Missing <memory> include: " + h);
+        assertTrue(h.contains("Aws::String SerializePayload() const override { return {}; }"),
+            "Event-stream-input request must emit an inline empty SerializePayload: " + h);
+        assertTrue(h.contains("std::shared_ptr<Aws::IOStream> GetBody() const override;"),
+            "Missing GetBody() override: " + h);
+        assertTrue(h.contains("std::shared_ptr<MyStreamEventStream> GetMemberBody() const { return m_body; }"),
+            "Event-stream member getter must be GetMemberBody returning shared_ptr: " + h);
+        assertTrue(h.contains("void SetBody(const std::shared_ptr<MyStreamEventStream>& value) {"),
+            "Event-stream member setter must take a shared_ptr: " + h);
+        assertTrue(h.contains("WithBody(const std::shared_ptr<MyStreamEventStream>& value)"),
+            "Event-stream member wither must take a shared_ptr: " + h);
+        assertTrue(h.contains("std::shared_ptr<MyStreamEventStream> m_body;"),
+            "Event-stream member must be stored as shared_ptr: " + h);
+        assertTrue(h.contains("bool m_bodyHasBeenSet = false;"),
+            "Event-stream member must still have a HasBeenSet flag: " + h);
+        // Must NOT render the streaming member through the generic templated-setter path.
+        assertFalse(h.contains("template <typename BodyT"),
+            "Event-stream member must not use the generic templated setter: " + h);
+        assertFalse(h.contains("Aws::String SerializePayload() const override;"),
+            "Event-stream-input request must not also declare a plain SerializePayload: " + h);
+    }
+
+    @Test
+    void bidirectionalRequestSource_definesGetBody() {
+        // The header declares `std::shared_ptr<Aws::IOStream> GetBody() const override;`, so the
+        // source MUST define it (returning the event-stream member) or linking fails. Matches C2J
+        // StreamRequestSource.vm.
+        String c = renderStreamingOp(true, true, "DoStreamRequest.cpp");
+        assertTrue(c.contains(
+            "std::shared_ptr<Aws::IOStream> DoStreamRequest::GetBody() const { return m_body; }"),
+            "Bidirectional request source must define GetBody() returning the event-stream member: " + c);
+        // C2J's event-stream request source pulls AmazonWebServiceResult.h and the Stream/Aws
+        // usings rather than the JSON serde header.
+        assertTrue(c.contains("#include <aws/core/AmazonWebServiceResult.h>"), c);
+        assertTrue(c.contains("using namespace Aws::Utils::Stream;"), c);
+    }
+
     @Test
     void nonStreamingRequest_hasNoEventStreamAugmentation() {
         String h = renderRequestHeaderForStreamingOp(false, false);
@@ -127,4 +177,488 @@ void nonStreamingRequest_hasNoEventStreamAugmentation() {
         assertFalse(h.contains("GetEventStreamDecoder"), "Non-streaming request must be clean: " + h);
         assertFalse(h.contains("IsEventStreamRequest"), "Non-streaming request must be clean: " + h);
     }
+
+    private static Model queryMemberModel() {
+        StringShape str = StringShape.builder().id("com.example#String").build();
+        StructureShape input = StructureShape.builder()
+            .id("com.example#DoThingInput")
+            .addMember(MemberShape.builder()
+                .id("com.example#DoThingInput$filter").target(str.getId())
+                .addTrait(new software.amazon.smithy.model.traits.HttpQueryTrait("filter")).build())
+            .build();
+        StructureShape output = StructureShape.builder()
+            .id("com.example#DoThingOutput").addMember("r", str.getId()).build();
+        OperationShape op = OperationShape.builder()
+            .id("com.example#DoThing").input(input.getId()).output(output.getId())
+            .addTrait(software.amazon.smithy.aws.traits.protocols.RestJson1Trait.builder().build())
+            .build();
+        ServiceShape service = ServiceShape.builder()
+            .id("com.example#Example").version("2024-01-01")
+            .addTrait(software.amazon.smithy.aws.traits.protocols.RestJson1Trait.builder().build())
+            .addOperation(op.getId()).build();
+        return Model.builder().addShapes(str, input, output, op, service).build();
+    }
+
+    /**
+     * Request headers must NOT include {@code <aws/core/http/URI.h>} even when they declare
+     * URI-taking methods: the base {@code AmazonWebServiceRequest.h} forward-declares
+     * {@code Aws::Http::URI}, which suffices for a reference parameter, and C2J omits the
+     * include. Emitting it would break byte-parity with the C2J output.
+     */
+    @Test
+    void requestWithQueryMember_doesNotIncludeUriHeader() {
+        Model model = queryMemberModel();
+        ServiceShape service = model.expectShape(ShapeId.from("com.example#Example"), ServiceShape.class);
+        MockManifest manifest = new MockManifest();
+        CppWriterDelegator delegator = new CppWriterDelegator(manifest);
+        Protocol protocol = ProtocolResolver.resolve(service, model);
+        new RequestRenderer(
+            ShapeClassifier.classify(model, service, protocol).requests(),
+            new RenderContext(model, service, ProtocolResolver.traitsFor(protocol),
+                "Example", "AWS_EXAMPLE_API", "example")).render(delegator);
+        delegator.flushWriters();
+        String h = manifest.getFileString(manifest.getFiles().stream()
+            .filter(p -> p.toString().endsWith("DoThingRequest.h")).findFirst().orElseThrow()).orElseThrow();
+        assertFalse(h.contains("#include <aws/core/http/URI.h>"), h);
+    }
+
+    /** Operation whose input has an @httpPayload blob body + a contentType header + a plain member. */
+    private static Model rawStreamingPayloadRequestModel() {
+        StringShape str = StringShape.builder().id("com.example#String").build();
+        software.amazon.smithy.model.shapes.BlobShape blob =
+            software.amazon.smithy.model.shapes.BlobShape.builder().id("com.example#Body").build();
+        StructureShape input = StructureShape.builder()
+            .id("com.example#DoStreamInput")
+            .addMember(MemberShape.builder()
+                .id("com.example#DoStreamInput$body").target(blob.getId())
+                .addTrait(new software.amazon.smithy.model.traits.HttpPayloadTrait()).build())
+            .addMember(MemberShape.builder()
+                .id("com.example#DoStreamInput$contentType").target(str.getId())
+                .addTrait(new software.amazon.smithy.model.traits.HttpHeaderTrait("Content-Type")).build())
+            .addMember("modelId", str.getId())
+            .build();
+        StructureShape output = StructureShape.builder()
+            .id("com.example#DoStreamOutput").addMember("r", str.getId()).build();
+        OperationShape op = OperationShape.builder()
+            .id("com.example#DoStream").input(input.getId()).output(output.getId()).build();
+        ServiceShape service = ServiceShape.builder()
+            .id("com.example#Example").version("2024-01-01").addOperation(op.getId()).build();
+        return Model.builder().addShapes(str, blob, input, output, op, service).build();
+    }
+
+    private static String renderRawStreamingPayloadRequest(String fileSuffix) {
+        Model model = rawStreamingPayloadRequestModel();
+        ServiceShape service = model.expectShape(ShapeId.from("com.example#Example"), ServiceShape.class);
+        MockManifest manifest = new MockManifest();
+        CppWriterDelegator delegator = new CppWriterDelegator(manifest);
+        Protocol protocol = ProtocolResolver.resolve(service, model);
+        new RequestRenderer(
+            ShapeClassifier.classify(model, service, protocol).requests(),
+            new RenderContext(model, service, ProtocolResolver.traitsFor(protocol),
+                "Example", "AWS_EXAMPLE_API", "example")).render(delegator);
+        delegator.flushWriters();
+        return manifest.getFileString(manifest.getFiles().stream()
+            .filter(p -> p.toString().endsWith(fileSuffix)).findFirst().orElseThrow()).orElseThrow();
+    }
+
+    @Test
+    void rawStreamingPayloadRequest_usesStreamingBaseClassAndDropsPayloadMembers() {
+        // C2J: a request with a raw streaming @httpPayload member derives from
+        // Streaming<Prefix>Request, which supplies GetBody/SetBody and GetContentType/SetContentType.
+        // The payload member (body) and the contentType member are stripped, and SerializePayload
+        // is not emitted (the base handles the body). Other members (modelId) remain.
+        String h = renderRawStreamingPayloadRequest("DoStreamRequest.h");
+        assertTrue(h.contains("class DoStreamRequest : public StreamingExampleRequest {"),
+            "Must derive from StreamingExampleRequest: " + h);
+        assertFalse(h.contains("GetBody") || h.contains("SetBody") || h.contains("m_body"),
+            "Payload member must be dropped (base provides GetBody/SetBody): " + h);
+        assertFalse(h.contains("GetContentType") || h.contains("m_contentType"),
+            "contentType member must be dropped (base provides GetContentType): " + h);
+        assertFalse(h.contains("SerializePayload"),
+            "SerializePayload must not be emitted for a streaming-payload request: " + h);
+        assertTrue(h.contains("GetModelId"),
+            "Non-payload members must still be rendered: " + h);
+    }
+
+    @Test
+    void rawStreamingPayloadRequestSource_includesBlobAndHeaderSerdeIncludes() {
+        // The source scans ALL members (payload not filtered out there), so a blob payload pulls
+        // HashingUtils.h and a header member pulls AWSStringStream.h — matching C2J.
+        String c = renderRawStreamingPayloadRequest("DoStreamRequest.cpp");
+        assertTrue(c.contains("#include <aws/core/utils/HashingUtils.h>"),
+            "Blob payload member must pull HashingUtils.h into the source: " + c);
+        assertTrue(c.contains("#include <aws/core/utils/memory/stl/AWSStringStream.h>"),
+            "Header member must pull AWSStringStream.h into the source: " + c);
+    }
+
+    @Test
+    void rawStreamingPayloadRequestSource_usesStreamIncludesNotJsonSerde() {
+        // C2J routes a streaming (httpPayload blob body) request through StreamRequestSource.vm:
+        // AmazonWebServiceResult.h + the Stream/Utils/Aws usings, and NOT the JSON serde header/using.
+        String c = renderRawStreamingPayloadRequest("DoStreamRequest.cpp");
+        assertTrue(c.contains("#include <aws/core/AmazonWebServiceResult.h>"), c);
+        assertTrue(c.contains("using namespace Aws::Utils::Stream;"), c);
+        assertFalse(c.contains("#include <aws/core/utils/json/JsonSerializer.h>"),
+            "Streaming-payload request source must not include the JSON serializer: " + c);
+        assertFalse(c.contains("using namespace Aws::Utils::Json;"),
+            "Streaming-payload request source must not use the Json namespace: " + c);
+    }
+
+    /**
+     * Same as {@link #rawStreamingPayloadRequestModel()} but under REST-JSON, where {@code contentType}
+     * (stripped, supplied by the streaming base) is the ONLY header-bound member and
+     * {@code hasTargetHeader()} is false. This is the combination that exposes header/source drift.
+     */
+    private static Model rawStreamingPayloadRestJsonRequestModel() {
+        StringShape str = StringShape.builder().id("com.example#String").build();
+        software.amazon.smithy.model.shapes.BlobShape blob =
+            software.amazon.smithy.model.shapes.BlobShape.builder().id("com.example#Body").build();
+        StructureShape input = StructureShape.builder()
+            .id("com.example#DoStreamInput")
+            .addMember(MemberShape.builder()
+                .id("com.example#DoStreamInput$body").target(blob.getId())
+                .addTrait(new software.amazon.smithy.model.traits.HttpPayloadTrait()).build())
+            .addMember(MemberShape.builder()
+                .id("com.example#DoStreamInput$contentType").target(str.getId())
+                .addTrait(new software.amazon.smithy.model.traits.HttpHeaderTrait("Content-Type")).build())
+            .addMember("modelId", str.getId())
+            .build();
+        StructureShape output = StructureShape.builder()
+            .id("com.example#DoStreamOutput").addMember("r", str.getId()).build();
+        OperationShape op = OperationShape.builder()
+            .id("com.example#DoStream").input(input.getId()).output(output.getId())
+            .addTrait(software.amazon.smithy.aws.traits.protocols.RestJson1Trait.builder().build())
+            .build();
+        ServiceShape service = ServiceShape.builder()
+            .id("com.example#Example").version("2024-01-01")
+            .addTrait(software.amazon.smithy.aws.traits.protocols.RestJson1Trait.builder().build())
+            .addOperation(op.getId()).build();
+        return Model.builder().addShapes(str, blob, input, output, op, service).build();
+    }
+
+    private static String renderRawStreamingPayloadRestJsonRequest(String fileSuffix) {
+        Model model = rawStreamingPayloadRestJsonRequestModel();
+        ServiceShape service = model.expectShape(ShapeId.from("com.example#Example"), ServiceShape.class);
+        MockManifest manifest = new MockManifest();
+        CppWriterDelegator delegator = new CppWriterDelegator(manifest);
+        Protocol protocol = ProtocolResolver.resolve(service, model);
+        new RequestRenderer(
+            ShapeClassifier.classify(model, service, protocol).requests(),
+            new RenderContext(model, service, ProtocolResolver.traitsFor(protocol),
+                "Example", "AWS_EXAMPLE_API", "example")).render(delegator);
+        delegator.flushWriters();
+        return manifest.getFileString(manifest.getFiles().stream()
+            .filter(p -> p.toString().endsWith(fileSuffix)).findFirst().orElseThrow()).orElseThrow();
+    }
+
+    // --- @httpChecksum ---
+
+    /**
+     * A JSON operation with @httpChecksum. The input carries a {@code checksumAlgorithm} enum member
+     * (for requestAlgorithmMember) and a {@code checksumMode} enum member (for
+     * requestValidationModeMember); the trait is configured from the given values.
+     */
+    private static Model httpChecksumModel(software.amazon.smithy.aws.traits.HttpChecksumTrait trait) {
+        StringShape str = StringShape.builder().id("com.example#String").build();
+        software.amazon.smithy.model.shapes.EnumShape algo =
+            software.amazon.smithy.model.shapes.EnumShape.builder()
+                .id("com.example#ChecksumAlgorithm").addMember("CRC32", "CRC32").build();
+        software.amazon.smithy.model.shapes.EnumShape mode =
+            software.amazon.smithy.model.shapes.EnumShape.builder()
+                .id("com.example#ChecksumMode").addMember("ENABLED", "ENABLED").build();
+        StructureShape input = StructureShape.builder()
+            .id("com.example#PutThingInput")
+            .addMember("checksumAlgorithm", algo.getId())
+            .addMember("checksumMode", mode.getId())
+            .addMember("name", str.getId())
+            .build();
+        StructureShape output = StructureShape.builder().id("com.example#PutThingOutput")
+            .addMember("r", str.getId()).build();
+        OperationShape op = OperationShape.builder()
+            .id("com.example#PutThing").input(input.getId()).output(output.getId())
+            .addTrait(trait).build();
+        ServiceShape service = ServiceShape.builder()
+            .id("com.example#Example").version("2024-01-01").addOperation(op.getId()).build();
+        return Model.builder().addShapes(str, algo, mode, input, output, op, service).build();
+    }
+
+    private static String renderChecksumRequest(software.amazon.smithy.aws.traits.HttpChecksumTrait trait,
+                                                 String fileSuffix) {
+        Model model = httpChecksumModel(trait);
+        ServiceShape service = model.expectShape(ShapeId.from("com.example#Example"), ServiceShape.class);
+        MockManifest manifest = new MockManifest();
+        CppWriterDelegator delegator = new CppWriterDelegator(manifest);
+        Protocol protocol = ProtocolResolver.resolve(service, model);
+        new RequestRenderer(
+            ShapeClassifier.classify(model, service, protocol).requests(),
+            new RenderContext(model, service, ProtocolResolver.traitsFor(protocol),
+                "Example", "AWS_EXAMPLE_API", "example")).render(delegator);
+        delegator.flushWriters();
+        return manifest.getFileString(manifest.getFiles().stream()
+            .filter(p -> p.toString().endsWith(fileSuffix)).findFirst().orElseThrow()).orElseThrow();
+    }
+
+    @Test
+    void httpChecksumRequestAlgorithm_rendersAlgorithmNameAndIsSet() {
+        // requestAlgorithmMember → GetChecksumAlgorithmName (crc64nvme default, else Mapper) +
+        // ChecksumAlgorithmIsSet. Matches C2J ModelClassChecksumMembers.vm / PutObjectRequest.
+        software.amazon.smithy.aws.traits.HttpChecksumTrait trait =
+            software.amazon.smithy.aws.traits.HttpChecksumTrait.builder()
+                .requestAlgorithmMember("checksumAlgorithm").build();
+        String h = renderChecksumRequest(trait, "PutThingRequest.h");
+        String c = renderChecksumRequest(trait, "PutThingRequest.cpp");
+
+        assertTrue(h.contains("AWS_EXAMPLE_API Aws::String GetChecksumAlgorithmName() const override;"), h);
+        assertTrue(h.contains("AWS_EXAMPLE_API bool ChecksumAlgorithmIsSet() const override;"), h);
+
+        assertTrue(c.contains("Aws::String PutThingRequest::GetChecksumAlgorithmName() const {"), c);
+        assertTrue(c.contains("if (m_checksumAlgorithm == ChecksumAlgorithm::NOT_SET) {"), c);
+        assertTrue(c.contains("return \"crc64nvme\";"), c);
+        assertTrue(c.contains("return ChecksumAlgorithmMapper::GetNameForChecksumAlgorithm(m_checksumAlgorithm);"), c);
+        assertTrue(c.contains("return m_checksumAlgorithm != ChecksumAlgorithm::NOT_SET;"), c);
+    }
+
+    @Test
+    void httpChecksumValidationAndResponseAlgorithms_render() {
+        // requestValidationModeMember → ShouldValidateResponseChecksum; responseAlgorithms →
+        // GetResponseChecksumAlgorithmNames (one push_back per algorithm, in order).
+        software.amazon.smithy.aws.traits.HttpChecksumTrait trait =
+            software.amazon.smithy.aws.traits.HttpChecksumTrait.builder()
+                .requestValidationModeMember("checksumMode")
+                .responseAlgorithms(java.util.List.of("CRC64NVME", "CRC32")).build();
+        String h = renderChecksumRequest(trait, "PutThingRequest.h");
+        String c = renderChecksumRequest(trait, "PutThingRequest.cpp");
+
+        assertTrue(h.contains("AWS_EXAMPLE_API bool ShouldValidateResponseChecksum() const override;"), h);
+        assertTrue(h.contains("AWS_EXAMPLE_API Aws::Vector<Aws::String> GetResponseChecksumAlgorithmNames() const override;"), h);
+
+        assertTrue(c.contains("return m_checksumMode == ChecksumMode::ENABLED;"), c);
+        assertTrue(c.contains("responseChecksumAlgorithmNames.push_back(\"CRC64NVME\");"), c);
+        assertTrue(c.contains("responseChecksumAlgorithmNames.push_back(\"CRC32\");"), c);
+        assertTrue(c.contains("return responseChecksumAlgorithmNames;"), c);
+    }
+
+    @Test
+    void httpChecksumRequestChecksumRequired_rendersInlineOverride() {
+        // requestChecksumRequired → inline RequestChecksumRequired() in the header (no .cpp body),
+        // matching C2J's PutBucketPolicyRequest.h (note the trailing semicolon after the brace).
+        software.amazon.smithy.aws.traits.HttpChecksumTrait trait =
+            software.amazon.smithy.aws.traits.HttpChecksumTrait.builder()
+                .requestAlgorithmMember("checksumAlgorithm").requestChecksumRequired(true).build();
+        String h = renderChecksumRequest(trait, "PutThingRequest.h");
+        assertTrue(h.contains("inline bool RequestChecksumRequired() const override { return true; };"), h);
+    }
+
+    @Test
+    void httpChecksumRequired_rendersInlineShouldComputeContentMd5() {
+        // The legacy smithy.api#httpChecksumRequired trait (s3control uses it) requests a
+        // Content-MD5 header. C2J derives Shape.computeContentMd5 from it and emits an inline
+        // ShouldComputeContentMd5() override (RequestHeader.vm:105-108, no .cpp body). Distinct
+        // from the flexible @httpChecksum trait.
+        StringShape str = StringShape.builder().id("com.example#String").build();
+        StructureShape input = StructureShape.builder().id("com.example#PutThingInput")
+            .addMember("name", str.getId()).build();
+        StructureShape output = StructureShape.builder().id("com.example#PutThingOutput")
+            .addMember("r", str.getId()).build();
+        OperationShape op = OperationShape.builder()
+            .id("com.example#PutThing").input(input.getId()).output(output.getId())
+            .addTrait(new software.amazon.smithy.model.traits.HttpChecksumRequiredTrait()).build();
+        ServiceShape service = ServiceShape.builder()
+            .id("com.example#Example").version("2024-01-01").addOperation(op.getId()).build();
+        Model model = Model.builder().addShapes(str, input, output, op, service).build();
+
+        ServiceShape svc = model.expectShape(ShapeId.from("com.example#Example"), ServiceShape.class);
+        MockManifest manifest = new MockManifest();
+        CppWriterDelegator delegator = new CppWriterDelegator(manifest);
+        Protocol protocol = ProtocolResolver.resolve(svc, model);
+        new RequestRenderer(
+            ShapeClassifier.classify(model, svc, protocol).requests(),
+            new RenderContext(model, svc, ProtocolResolver.traitsFor(protocol),
+                "Example", "AWS_EXAMPLE_API", "example")).render(delegator);
+        delegator.flushWriters();
+        String h = manifest.getFileString(manifest.getFiles().stream()
+            .filter(p -> p.toString().endsWith("PutThingRequest.h")).findFirst().orElseThrow()).orElseThrow();
+        String c = manifest.getFileString(manifest.getFiles().stream()
+            .filter(p -> p.toString().endsWith("PutThingRequest.cpp")).findFirst().orElseThrow()).orElseThrow();
+        assertTrue(h.contains("AWS_EXAMPLE_API inline bool ShouldComputeContentMd5() const override { return true; }"), h);
+        assertFalse(c.contains("ShouldComputeContentMd5"), "inline method must have no out-of-line body: " + c);
+    }
+
+    @Test
+    void requestWithoutHttpChecksum_emitsNoChecksumMethods() {
+        Model model = queryMemberModel();
+        ServiceShape service = model.expectShape(ShapeId.from("com.example#Example"), ServiceShape.class);
+        MockManifest manifest = new MockManifest();
+        CppWriterDelegator delegator = new CppWriterDelegator(manifest);
+        Protocol protocol = ProtocolResolver.resolve(service, model);
+        new RequestRenderer(
+            ShapeClassifier.classify(model, service, protocol).requests(),
+            new RenderContext(model, service, ProtocolResolver.traitsFor(protocol),
+                "Example", "AWS_EXAMPLE_API", "example")).render(delegator);
+        delegator.flushWriters();
+        String h = manifest.getFileString(manifest.getFiles().stream()
+            .filter(p -> p.toString().endsWith("DoThingRequest.h")).findFirst().orElseThrow()).orElseThrow();
+        assertFalse(h.contains("GetChecksumAlgorithmName"), h);
+        assertFalse(h.contains("RequestChecksumRequired"), h);
+    }
+
+    // --- @requestCompression ---
+
+    /**
+     * Model for a JSON operation carrying {@code @requestCompression(encodings: ["gzip"])} on
+     * either a plain input (streaming = false) or a raw {@code @httpPayload} blob body input
+     * (streaming = true).
+     */
+    private static Model requestCompressionModel(boolean streaming, java.util.List<String> encodings) {
+        StringShape str = StringShape.builder().id("com.example#String").build();
+        StructureShape.Builder input = StructureShape.builder().id("com.example#PutThingInput");
+        if (streaming) {
+            software.amazon.smithy.model.shapes.BlobShape blob =
+                software.amazon.smithy.model.shapes.BlobShape.builder().id("com.example#Body").build();
+            input.addMember(MemberShape.builder()
+                .id("com.example#PutThingInput$body").target(blob.getId())
+                .addTrait(new software.amazon.smithy.model.traits.HttpPayloadTrait()).build());
+            input.addMember(MemberShape.builder()
+                .id("com.example#PutThingInput$contentType").target(str.getId())
+                .addTrait(new software.amazon.smithy.model.traits.HttpHeaderTrait("Content-Type")).build());
+            Model.Builder mb = Model.builder().addShape(blob);
+            return finishCompressionModel(mb, str, input.build(), encodings);
+        }
+        input.addMember("name", str.getId());
+        return finishCompressionModel(Model.builder(), str, input.build(), encodings);
+    }
+
+    private static Model finishCompressionModel(Model.Builder mb, StringShape str,
+                                                StructureShape input, java.util.List<String> encodings) {
+        StructureShape output = StructureShape.builder().id("com.example#PutThingOutput")
+            .addMember("r", str.getId()).build();
+        OperationShape op = OperationShape.builder()
+            .id("com.example#PutThing").input(input.getId()).output(output.getId())
+            .addTrait(software.amazon.smithy.model.traits.RequestCompressionTrait.builder()
+                .encodings(encodings).build())
+            .build();
+        ServiceShape service = ServiceShape.builder()
+            .id("com.example#Example").version("2024-01-01").addOperation(op.getId()).build();
+        return mb.addShapes(str, input, output, op, service).build();
+    }
+
+    private static String renderCompressionRequest(boolean streaming, String fileSuffix) {
+        Model model = requestCompressionModel(streaming, java.util.List.of("gzip"));
+        ServiceShape service = model.expectShape(ShapeId.from("com.example#Example"), ServiceShape.class);
+        MockManifest manifest = new MockManifest();
+        CppWriterDelegator delegator = new CppWriterDelegator(manifest);
+        Protocol protocol = ProtocolResolver.resolve(service, model);
+        new RequestRenderer(
+            ShapeClassifier.classify(model, service, protocol).requests(),
+            new RenderContext(model, service, ProtocolResolver.traitsFor(protocol),
+                "Example", "AWS_EXAMPLE_API", "example")).render(delegator);
+        delegator.flushWriters();
+        return manifest.getFileString(manifest.getFiles().stream()
+            .filter(p -> p.toString().endsWith(fileSuffix)).findFirst().orElseThrow()).orElseThrow();
+    }
+
+    @Test
+    void requestCompressionGzip_headerDeclaresGuardedVirtualOverride() {
+        // C2J's RequestHeader.vm:148-156 emits GetSelectedCompressionAlgorithm as a virtual override
+        // gated by ENABLED_ZLIB_REQUEST_COMPRESSION. The types (CompressionAlgorithm,
+        // RequestCompressionConfig) come from the base AmazonWebServiceRequest.h transitively —
+        // NO extra include in the request header.
+        String h = renderCompressionRequest(false, "PutThingRequest.h");
+        assertTrue(h.contains("#ifdef ENABLED_ZLIB_REQUEST_COMPRESSION"),
+            "Missing ENABLED_ZLIB_REQUEST_COMPRESSION guard: " + h);
+        assertTrue(h.contains(
+            "virtual Aws::Client::CompressionAlgorithm GetSelectedCompressionAlgorithm(Aws::Client::RequestCompressionConfig config) const override;"),
+            "Missing GetSelectedCompressionAlgorithm decl: " + h);
+        assertFalse(h.contains("#include <aws/core/client/RequestCompression"),
+            "Header must not include RequestCompression header (transitively provided): " + h);
+    }
+
+    @Test
+    void requestCompressionGzip_nonStreamingSourceUsesBodySizeCheck() {
+        // Non-streaming variant (ModelClassRequiredCompression.vm): DISABLE -> NONE, then read the
+        // already-serialized body via AmazonSerializableWebServiceRequest::GetBody(), compare its
+        // size to config.requestMinCompressionSizeBytes, and either NONE or GZIP. Matches cloudwatch
+        // PutMetricDataRequest.cpp exactly. Body only touches base state; NOT serde-blocked.
+        String c = renderCompressionRequest(false, "PutThingRequest.cpp");
+        assertTrue(c.contains("#ifdef ENABLED_ZLIB_REQUEST_COMPRESSION"), c);
+        assertTrue(c.contains(
+            "Aws::Client::CompressionAlgorithm PutThingRequest::GetSelectedCompressionAlgorithm(Aws::Client::RequestCompressionConfig config) const {"),
+            c);
+        assertTrue(c.contains("config.useRequestCompression == Aws::Client::UseRequestCompression::DISABLE"), c);
+        assertTrue(c.contains("const auto& body = AmazonSerializableWebServiceRequest::GetBody();"), c);
+        assertTrue(c.contains("bodySize < config.requestMinCompressionSizeBytes"), c);
+        assertTrue(c.contains("return Aws::Client::CompressionAlgorithm::NONE;"), c);
+        assertTrue(c.contains("return Aws::Client::CompressionAlgorithm::GZIP;"), c);
+    }
+
+    @Test
+    void requestCompressionGzip_streamingSourceCompressesWheneverEnabled() {
+        // Streaming variant (ModelClassRequiredCompressionStream.vm): the body isn't sized up front,
+        // so DISABLE -> NONE, else GZIP unconditionally. No body-size check.
+        String c = renderCompressionRequest(true, "PutThingRequest.cpp");
+        assertTrue(c.contains("#ifdef ENABLED_ZLIB_REQUEST_COMPRESSION"), c);
+        assertTrue(c.contains("PutThingRequest::GetSelectedCompressionAlgorithm"), c);
+        assertTrue(c.contains("return Aws::Client::CompressionAlgorithm::GZIP;"), c);
+        assertFalse(c.contains("requestMinCompressionSizeBytes"),
+            "Streaming variant must not do a body-size check: " + c);
+        assertFalse(c.contains("AmazonSerializableWebServiceRequest::GetBody"),
+            "Streaming variant must not query the body: " + c);
+    }
+
+    @Test
+    void requestCompression_nonGzipEncoding_throws() {
+        // C2J transformer:795-800 rejects non-gzip encodings; the plugin must match. Rendering
+        // aborts at request time (the renderer walks operations and encounters the trait).
+        Model model = requestCompressionModel(false, java.util.List.of("deflate"));
+        ServiceShape service = model.expectShape(ShapeId.from("com.example#Example"), ServiceShape.class);
+        MockManifest manifest = new MockManifest();
+        CppWriterDelegator delegator = new CppWriterDelegator(manifest);
+        Protocol protocol = ProtocolResolver.resolve(service, model);
+        RequestRenderer renderer = new RequestRenderer(
+            ShapeClassifier.classify(model, service, protocol).requests(),
+            new RenderContext(model, service, ProtocolResolver.traitsFor(protocol),
+                "Example", "AWS_EXAMPLE_API", "example"));
+        RuntimeException ex = org.junit.jupiter.api.Assertions.assertThrows(
+            RuntimeException.class, () -> renderer.render(delegator));
+        assertTrue(ex.getMessage().contains("gzip"), "Should mention gzip: " + ex.getMessage());
+    }
+
+    @Test
+    void requestWithoutCompressionTrait_emitsNothingCompressionRelated() {
+        // Regression guard: operations without @requestCompression must not gain the override or
+        // its #ifdef. Reuses the query-member model which has no compression trait.
+        Model model = queryMemberModel();
+        ServiceShape service = model.expectShape(ShapeId.from("com.example#Example"), ServiceShape.class);
+        MockManifest manifest = new MockManifest();
+        CppWriterDelegator delegator = new CppWriterDelegator(manifest);
+        Protocol protocol = ProtocolResolver.resolve(service, model);
+        new RequestRenderer(
+            ShapeClassifier.classify(model, service, protocol).requests(),
+            new RenderContext(model, service, ProtocolResolver.traitsFor(protocol),
+                "Example", "AWS_EXAMPLE_API", "example")).render(delegator);
+        delegator.flushWriters();
+        String h = manifest.getFileString(manifest.getFiles().stream()
+            .filter(p -> p.toString().endsWith("DoThingRequest.h")).findFirst().orElseThrow()).orElseThrow();
+        String c = manifest.getFileString(manifest.getFiles().stream()
+            .filter(p -> p.toString().endsWith("DoThingRequest.cpp")).findFirst().orElseThrow()).orElseThrow();
+        assertFalse(h.contains("GetSelectedCompressionAlgorithm"), h);
+        assertFalse(c.contains("GetSelectedCompressionAlgorithm"), c);
+        assertFalse(h.contains("ENABLED_ZLIB_REQUEST_COMPRESSION"), h);
+    }
+
+    @Test
+    void rawStreamingPayloadRequestRestJson_headerAndSourceAgreeOnRequestSpecificHeaders() {
+        // Under a REST protocol (hasTargetHeader() == false), a raw-streaming-payload request whose
+        // ONLY header-bound member is the stripped contentType must emit GetRequestSpecificHeaders in
+        // NEITHER the header nor the source. The header renders from the contentType-excluded shape;
+        // the source MUST render from the same shape. Otherwise the source defines
+        // GetRequestSpecificHeaders() out-of-line for a method the header never declares (a C++
+        // compile error).
+        String h = renderRawStreamingPayloadRestJsonRequest("DoStreamRequest.h");
+        String c = renderRawStreamingPayloadRestJsonRequest("DoStreamRequest.cpp");
+        assertFalse(h.contains("GetRequestSpecificHeaders"),
+            "Header must not declare GetRequestSpecificHeaders (contentType is stripped): " + h);
+        assertFalse(c.contains("GetRequestSpecificHeaders"),
+            "Source must not define GetRequestSpecificHeaders (contentType is stripped): " + c);
+    }
 }
diff --git a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/ResultRendererTest.java b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/ResultRendererTest.java
new file mode 100644
index 000000000000..eeea14d4920b
--- /dev/null
+++ b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/ResultRendererTest.java
@@ -0,0 +1,275 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+package com.amazonaws.util.awsclientsmithygenerator.generators.model;
+
+import com.amazonaws.util.awsclientsmithygenerator.generators.CppWriterDelegator;
+import com.amazonaws.util.awsclientsmithygenerator.generators.model.ProtocolResolver.Protocol;
+import com.amazonaws.util.awsclientsmithygenerator.generators.model.RenderContext;
+import com.amazonaws.util.awsclientsmithygenerator.generators.model.renderers.ResultRenderer;
+import org.junit.jupiter.api.Test;
+import software.amazon.smithy.build.MockManifest;
+import software.amazon.smithy.model.Model;
+import software.amazon.smithy.model.shapes.BlobShape;
+import software.amazon.smithy.model.shapes.MemberShape;
+import software.amazon.smithy.model.shapes.OperationShape;
+import software.amazon.smithy.model.shapes.ServiceShape;
+import software.amazon.smithy.model.shapes.ShapeId;
+import software.amazon.smithy.model.shapes.StringShape;
+import software.amazon.smithy.model.shapes.StructureShape;
+import software.amazon.smithy.model.traits.HttpPayloadTrait;
+import software.amazon.smithy.model.traits.StreamingTrait;
+import software.amazon.smithy.model.traits.Trait;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class ResultRendererTest {
+
+    /** A one-member output operation under a service carrying the given protocol trait. */
+    private static Model oneMemberOutputModel(Trait protocolTrait) {
+        StringShape str = StringShape.builder().id("com.example#Str").build();
+        StructureShape input = StructureShape.builder()
+            .id("com.example#DoThingInput").addMember("name", str.getId()).build();
+        StructureShape output = StructureShape.builder()
+            .id("com.example#DoThingOutput").addMember("field", str.getId()).build();
+        OperationShape op = OperationShape.builder()
+            .id("com.example#DoThing").input(input.getId()).output(output.getId()).build();
+        ServiceShape service = ServiceShape.builder()
+            .id("com.example#Example").version("2024-01-01")
+            .addTrait(protocolTrait).addOperation(op.getId()).build();
+        return Model.builder().addShapes(str, input, output, op, service).build();
+    }
+
+    private static String renderResultHeader(Trait protocolTrait) {
+        Model model = oneMemberOutputModel(protocolTrait);
+        ServiceShape service = model.expectShape(ShapeId.from("com.example#Example"), ServiceShape.class);
+        MockManifest manifest = new MockManifest();
+        CppWriterDelegator delegator = new CppWriterDelegator(manifest);
+        Protocol protocol = ProtocolResolver.resolve(service, model);
+        new ResultRenderer(
+            ShapeClassifier.classify(model, service, protocol).results(),
+            new RenderContext(model, service, ProtocolResolver.traitsFor(protocol),
+                "Example", "AWS_EXAMPLE_API", "example")).render(delegator);
+        delegator.flushWriters();
+        return manifest.getFileString(manifest.getFiles().stream()
+            .filter(p -> p.toString().endsWith("DoThingResult.h")).findFirst().orElseThrow()).orElseThrow();
+    }
+
+    @Test
+    void cborResult_omitsHasBeenSetAccessors() {
+        // C2J's CborResultHeader.vm sets useRequiredField=false, so result classes never emit
+        // HasBeenSet() accessors — same as every other protocol. (Only sub-object and request
+        // headers set useRequiredField=true.)
+        String h = renderResultHeader(software.amazon.smithy.protocol.traits.Rpcv2CborTrait.builder().build());
+        assertFalse(h.contains("HasBeenSet() const"), h);
+    }
+
+    @Test
+    void jsonResult_omitsHasBeenSetAccessors() {
+        String h = renderResultHeader(software.amazon.smithy.aws.traits.protocols.RestJson1Trait.builder().build());
+        assertFalse(h.contains("HasBeenSet() const"), h);
+    }
+
+    /** A GetBlob operation whose output binds a @httpPayload @streaming blob member "body". */
+    private static Model streamingResultModel() {
+        StringShape str = StringShape.builder().id("com.example#Str").build();
+        BlobShape blob = BlobShape.builder()
+            .id("com.example#StreamBlob").addTrait(new StreamingTrait()).build();
+        StructureShape input = StructureShape.builder()
+            .id("com.example#GetBlobInput").addMember("name", str.getId()).build();
+        StructureShape output = StructureShape.builder()
+            .id("com.example#GetBlobOutput")
+            .addMember(MemberShape.builder()
+                .id("com.example#GetBlobOutput$body").target(blob.getId())
+                .addTrait(new HttpPayloadTrait()).build())
+            .build();
+        OperationShape op = OperationShape.builder()
+            .id("com.example#GetBlob").input(input.getId()).output(output.getId()).build();
+        ServiceShape service = ServiceShape.builder()
+            .id("com.example#Example").version("2024-01-01")
+            .addTrait(software.amazon.smithy.aws.traits.protocols.RestXmlTrait.builder().build())
+            .addOperation(op.getId()).build();
+        return Model.builder().addShapes(str, blob, input, output, op, service).build();
+    }
+
+    private static String renderStreaming(String fileSuffix) {
+        Model model = streamingResultModel();
+        ServiceShape service = model.expectShape(ShapeId.from("com.example#Example"), ServiceShape.class);
+        MockManifest manifest = new MockManifest();
+        CppWriterDelegator delegator = new CppWriterDelegator(manifest);
+        Protocol protocol = ProtocolResolver.resolve(service, model);
+        new ResultRenderer(
+            ShapeClassifier.classify(model, service, protocol).results(),
+            new RenderContext(model, service, ProtocolResolver.traitsFor(protocol),
+                "Example", "AWS_EXAMPLE_API", "example")).render(delegator);
+        delegator.flushWriters();
+        return manifest.getFileString(manifest.getFiles().stream()
+            .filter(p -> p.toString().endsWith(fileSuffix)).findFirst().orElseThrow()).orElseThrow();
+    }
+
+    @Test
+    void streamingResult_isMoveOnlyWithResponseStream() {
+        String h = renderStreaming("GetBlobResult.h");
+        assertTrue(h.contains("GetBlobResult(GetBlobResult&&) = default;"), h);
+        assertTrue(h.contains("GetBlobResult& operator=(GetBlobResult&&) = default;"), h);
+        assertTrue(h.contains("GetBlobResult(const GetBlobResult&) = delete;"), h);
+        assertTrue(h.contains("Aws::AmazonWebServiceResult<Aws::Utils::Stream::ResponseStream>&& result"), h);
+        assertTrue(h.contains("#include <aws/core/utils/stream/ResponseStream.h>"), h);
+        assertTrue(h.contains("Aws::IOStream& GetBody() const"), h);
+        assertTrue(h.contains("void ReplaceBody(Aws::IOStream* body)"), h);
+        assertFalse(h.contains("SetBody"), h);
+    }
+
+    @Test
+    void streamingResultSource_takesOwnershipOfPayload() {
+        String cpp = renderStreaming("GetBlobResult.cpp");
+        assertTrue(cpp.contains("m_body = result.TakeOwnershipOfPayload();"), cpp);
+    }
+
+    @Test
+    void streamingResultSource_blobPayloadIncludesHashingUtils() {
+        // The blob payload member pulls HashingUtils.h into the source (C2J computeSourceIncludes).
+        String cpp = renderStreaming("GetBlobResult.cpp");
+        assertTrue(cpp.contains("#include <aws/core/utils/HashingUtils.h>"), cpp);
+    }
+
+    /**
+     * A GetStream operation whose output binds a @httpPayload @streaming blob member with the
+     * given name, optionally alongside an @httpResponseCode integer member "statusCode".
+     */
+    private static Model streamingResultModel(String payloadMemberName, boolean withStatusCode) {
+        StringShape str = StringShape.builder().id("com.example#Str").build();
+        BlobShape blob = BlobShape.builder()
+            .id("com.example#StreamBlob").addTrait(new StreamingTrait()).build();
+        software.amazon.smithy.model.shapes.IntegerShape intShape =
+            software.amazon.smithy.model.shapes.IntegerShape.builder().id("com.example#Int").build();
+        StructureShape input = StructureShape.builder()
+            .id("com.example#GetStreamInput").addMember("name", str.getId()).build();
+        StructureShape.Builder outputBuilder = StructureShape.builder()
+            .id("com.example#GetStreamOutput")
+            .addMember(MemberShape.builder()
+                .id("com.example#GetStreamOutput$" + payloadMemberName).target(blob.getId())
+                .addTrait(new HttpPayloadTrait())
+                .addTrait(new software.amazon.smithy.model.traits.RequiredTrait()).build());
+        if (withStatusCode) {
+            outputBuilder.addMember(MemberShape.builder()
+                .id("com.example#GetStreamOutput$statusCode").target(intShape.getId())
+                .addTrait(new software.amazon.smithy.model.traits.HttpResponseCodeTrait()).build());
+        }
+        StructureShape output = outputBuilder.build();
+        OperationShape op = OperationShape.builder()
+            .id("com.example#GetStream").input(input.getId()).output(output.getId()).build();
+        ServiceShape service = ServiceShape.builder()
+            .id("com.example#Example").version("2024-01-01")
+            .addTrait(software.amazon.smithy.aws.traits.protocols.RestJson1Trait.builder().build())
+            .addOperation(op.getId()).build();
+        return Model.assembler().addShapes(str, blob, intShape, input, output, op, service).assemble().unwrap();
+    }
+
+    /** Same as the named-member model, but the payload member carries documentation. */
+    private static Model documentedStreamingResultModel() {
+        StringShape str = StringShape.builder().id("com.example#Str").build();
+        BlobShape blob = BlobShape.builder()
+            .id("com.example#StreamBlob").addTrait(new StreamingTrait()).build();
+        StructureShape input = StructureShape.builder()
+            .id("com.example#GetStreamInput").addMember("name", str.getId()).build();
+        StructureShape output = StructureShape.builder()
+            .id("com.example#GetStreamOutput")
+            .addMember(MemberShape.builder()
+                .id("com.example#GetStreamOutput$body").target(blob.getId())
+                .addTrait(new HttpPayloadTrait())
+                .addTrait(new software.amazon.smithy.model.traits.DocumentationTrait(
+                    "<p>Inference response from the model.</p>")).build())
+            .build();
+        OperationShape op = OperationShape.builder()
+            .id("com.example#GetStream").input(input.getId()).output(output.getId()).build();
+        ServiceShape service = ServiceShape.builder()
+            .id("com.example#Example").version("2024-01-01")
+            .addTrait(software.amazon.smithy.aws.traits.protocols.RestJson1Trait.builder().build())
+            .addOperation(op.getId()).build();
+        return Model.builder().addShapes(str, blob, input, output, op, service).build();
+    }
+
+    @Test
+    void streamingResult_payloadAccessorRendersMemberDoc() {
+        // C2J emits the streaming payload member's @documentation above GetBody(); the smithy
+        // streaming-header path must too (it was previously dropped for the hand-written accessor).
+        String h = renderResultSource(documentedStreamingResultModel(), "GetStreamResult.h");
+        assertTrue(h.contains("Inference response from the model."),
+            "Streaming payload accessor must render the member doc comment: " + h);
+        // The doc must precede the getter, inside the ///@{ group.
+        int doc = h.indexOf("Inference response from the model.");
+        int getter = h.indexOf("Aws::IOStream& GetBody() const");
+        assertTrue(doc >= 0 && getter >= 0 && doc < getter,
+            "Doc comment must come before GetBody(): " + h);
+    }
+
+    @Test
+    void streamingResult_payloadAccessorNamedAfterMember() {
+        String h = renderResultSource(streamingResultModel("audioStream", false), "GetStreamResult.h");
+        assertTrue(h.contains("Aws::IOStream& GetAudioStream() const { return m_audioStream.GetUnderlyingStream(); }"), h);
+        // ReplaceBody stays literal regardless of member name, matching C2J StreamResultHeader.vm.
+        assertTrue(h.contains("void ReplaceBody(Aws::IOStream* body) { m_audioStream = "), h);
+        assertTrue(h.contains("Aws::Utils::Stream::ResponseStream m_audioStream{};"), h);
+        assertTrue(h.contains("bool m_audioStreamHasBeenSet = false;"), h);
+        assertFalse(h.contains("m_body"), h);
+    }
+
+    @Test
+    void streamingResultSource_payloadFieldNamedAfterMember() {
+        String cpp = renderResultSource(streamingResultModel("audioStream", false), "GetStreamResult.cpp");
+        assertTrue(cpp.contains("m_audioStream = result.TakeOwnershipOfPayload();"), cpp);
+        assertTrue(cpp.contains("m_audioStreamHasBeenSet = true;"), cpp);
+        assertFalse(cpp.contains("m_body"), cpp);
+    }
+
+    @Test
+    void streamingResultSource_setsStatusCodeMember() {
+        String cpp = renderResultSource(streamingResultModel("body", true), "GetStreamResult.cpp");
+        assertTrue(cpp.contains("m_statusCode = static_cast<int>(result.GetResponseCode());"), cpp);
+        assertTrue(cpp.contains("m_statusCodeHasBeenSet = true;"), cpp);
+    }
+
+    /** A rest-json operation whose output has an @httpResponseCode integer member "status". */
+    private static Model statusCodeResultModel() {
+        software.amazon.smithy.model.shapes.IntegerShape intShape =
+            software.amazon.smithy.model.shapes.IntegerShape.builder().id("com.example#Int").build();
+        StructureShape input = StructureShape.builder()
+            .id("com.example#StatInput").build();
+        StructureShape output = StructureShape.builder()
+            .id("com.example#StatOutput")
+            .addMember(MemberShape.builder()
+                .id("com.example#StatOutput$status").target(intShape.getId())
+                .addTrait(new software.amazon.smithy.model.traits.HttpResponseCodeTrait()).build())
+            .build();
+        OperationShape op = OperationShape.builder()
+            .id("com.example#Stat").input(input.getId()).output(output.getId()).build();
+        ServiceShape service = ServiceShape.builder()
+            .id("com.example#Example").version("2024-01-01")
+            .addTrait(software.amazon.smithy.aws.traits.protocols.RestJson1Trait.builder().build())
+            .addOperation(op.getId()).build();
+        return Model.assembler().addShapes(intShape, input, output, op, service).assemble().unwrap();
+    }
+
+    private static String renderResultSource(Model model, String fileSuffix) {
+        ServiceShape service = model.expectShape(ShapeId.from("com.example#Example"), ServiceShape.class);
+        MockManifest manifest = new MockManifest();
+        CppWriterDelegator delegator = new CppWriterDelegator(manifest);
+        Protocol protocol = ProtocolResolver.resolve(service, model);
+        new ResultRenderer(
+            ShapeClassifier.classify(model, service, protocol).results(),
+            new RenderContext(model, service, ProtocolResolver.traitsFor(protocol),
+                "Example", "AWS_EXAMPLE_API", "example")).render(delegator);
+        delegator.flushWriters();
+        return manifest.getFileString(manifest.getFiles().stream()
+            .filter(p -> p.toString().endsWith(fileSuffix)).findFirst().orElseThrow()).orElseThrow();
+    }
+
+    @Test
+    void statusCodeMember_setFromResponseCode() {
+        String cpp = renderResultSource(statusCodeResultModel(), "StatResult.cpp");
+        assertTrue(cpp.contains("m_status = static_cast<int>(result.GetResponseCode());"), cpp);
+    }
+}
diff --git a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/ShapeClassifierTest.java b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/ShapeClassifierTest.java
index d74f17b29a7e..7c709a1e0621 100644
--- a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/ShapeClassifierTest.java
+++ b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/ShapeClassifierTest.java
@@ -4,7 +4,6 @@
  */
 package com.amazonaws.util.awsclientsmithygenerator.generators.model;
 
-import com.amazonaws.util.awsclientsmithygenerator.generators.model.ShapeClassifier.Classification;
 import org.junit.jupiter.api.Test;
 import software.amazon.smithy.model.Model;
 import software.amazon.smithy.model.shapes.*;
@@ -279,6 +278,26 @@ private static Model modelWithStreaming(boolean inputStreams, boolean outputStre
         return Model.builder().addShapes(str, eventStream, input, output, op).build();
     }
 
+    @Test
+    void outgoingEventStreams_collectsInputBoundStreamingUnions() {
+        // A @streaming union bound to a request INPUT is an outgoing event stream (encoder),
+        // classified separately from output-bound streaming unions (which become handlers).
+        Model model = modelWithStreaming(true, false);
+        ServiceShape service = ServiceShape.builder().id("com.example#Svc").version("2024-01-01")
+            .addOperation(ShapeId.from("com.example#Op")).build();
+        // Re-assemble with a service so classify() has a root.
+        Model withSvc = model.toBuilder().addShape(service).build();
+        var classified = ShapeClassifier.classify(withSvc, service, ProtocolResolver.resolve(service, withSvc));
+        assertTrue(classified.outgoingEventStreams().stream()
+                .anyMatch(s -> s.getId().getName().equals("EventStream")),
+            "Input-bound @streaming union must be collected as an outgoing event stream: "
+                + classified.outgoingEventStreams());
+        // And it must NOT also land in subObjects (which would double-render it as a data union).
+        assertTrue(classified.subObjects().stream()
+                .noneMatch(s -> s.getId().getName().equals("EventStream")),
+            "Outgoing event stream must not also be a sub-object: " + classified.subObjects());
+    }
+
     @Test
     void isEventStreamResponseOperation_trueWhenOutputStreams() {
         Model model = modelWithStreaming(false, true);
@@ -303,6 +322,107 @@ void isEventStreamResponseOperation_falseWhenNeitherStreams() {
         assertFalse(ShapeClassifier.isEventStreamRequestOperation(op, model));
     }
 
+    private static Model streamingBlobOutputModel(boolean streaming) {
+        StringShape str = StringShape.builder().id("com.example#String").build();
+        BlobShape.Builder blobBuilder = BlobShape.builder().id("com.example#StreamBlob");
+        if (streaming) {
+            blobBuilder.addTrait(new StreamingTrait());
+        }
+        BlobShape blob = blobBuilder.build();
+        StructureShape input = StructureShape.builder()
+            .id("com.example#GetBlobInput").addMember("name", str.getId()).build();
+        StructureShape.Builder outputBuilder = StructureShape.builder().id("com.example#GetBlobOutput");
+        if (streaming) {
+            outputBuilder.addMember(MemberShape.builder()
+                .id("com.example#GetBlobOutput$body").target(blob.getId())
+                .addTrait(new HttpPayloadTrait()).build());
+        } else {
+            outputBuilder.addMember("result", str.getId());
+        }
+        StructureShape output = outputBuilder.build();
+        OperationShape op = OperationShape.builder()
+            .id("com.example#GetBlob").input(input.getId()).output(output.getId()).build();
+        ServiceShape service = ServiceShape.builder()
+            .id("com.example#Svc").version("2024-01-01").addOperation(op.getId()).build();
+        return Model.builder().addShapes(str, blob, input, output, op, service).build();
+    }
+
+    @Test
+    void streamingBlobPayloadOutput_isClassifiedStreaming() {
+        Model model = streamingBlobOutputModel(true);
+        ServiceShape svc = model.expectShape(ShapeId.from("com.example#Svc"), ServiceShape.class);
+        var results = ShapeClassifier.classify(model, svc, ProtocolResolver.resolve(svc, model)).results();
+        assertTrue(results.stream().anyMatch(r -> r.operation().getId().getName().equals("GetBlob") && r.streaming()));
+    }
+
+    @Test
+    void plainOutput_isNotStreaming() {
+        Model model = streamingBlobOutputModel(false);
+        ServiceShape svc = model.expectShape(ShapeId.from("com.example#Svc"), ServiceShape.class);
+        var results = ShapeClassifier.classify(model, svc, ProtocolResolver.resolve(svc, model)).results();
+        assertTrue(results.stream().allMatch(r -> !r.streaming()));
+    }
+
+    /** An @httpPayload blob or string member (with or without @streaming) that is NOT an event stream. */
+    private static Model httpPayloadOutputModel(software.amazon.smithy.model.shapes.Shape payloadTarget) {
+        StringShape str = StringShape.builder().id("com.example#String").build();
+        StructureShape input = StructureShape.builder()
+            .id("com.example#GetBlobInput").addMember("name", str.getId()).build();
+        StructureShape output = StructureShape.builder().id("com.example#GetBlobOutput")
+            .addMember(MemberShape.builder()
+                .id("com.example#GetBlobOutput$body").target(payloadTarget.getId())
+                .addTrait(new HttpPayloadTrait()).build())
+            .build();
+        OperationShape op = OperationShape.builder()
+            .id("com.example#GetBlob").input(input.getId()).output(output.getId()).build();
+        ServiceShape service = ServiceShape.builder()
+            .id("com.example#Svc").version("2024-01-01").addOperation(op.getId()).build();
+        return Model.builder().addShapes(str, payloadTarget, input, output, op, service).build();
+    }
+
+    @Test
+    void httpPayloadBlobOutput_withoutStreamingTrait_isClassifiedStreaming() {
+        // C2J treats an @httpPayload blob as a streaming ResponseStream even without @streaming
+        // (CppViewHelper.isStreamingPayloadMember: isStreaming() OR blob OR string).
+        BlobShape blob = BlobShape.builder().id("com.example#Body").build();
+        Model model = httpPayloadOutputModel(blob);
+        ServiceShape svc = model.expectShape(ShapeId.from("com.example#Svc"), ServiceShape.class);
+        var results = ShapeClassifier.classify(model, svc, ProtocolResolver.resolve(svc, model)).results();
+        assertTrue(results.stream().anyMatch(r -> r.operation().getId().getName().equals("GetBlob") && r.streaming()),
+            "An @httpPayload blob without @streaming must classify streaming");
+    }
+
+    @Test
+    void httpPayloadStringOutput_isClassifiedStreaming() {
+        StringShape body = StringShape.builder().id("com.example#Body").build();
+        Model model = httpPayloadOutputModel(body);
+        ServiceShape svc = model.expectShape(ShapeId.from("com.example#Svc"), ServiceShape.class);
+        var results = ShapeClassifier.classify(model, svc, ProtocolResolver.resolve(svc, model)).results();
+        assertTrue(results.stream().anyMatch(r -> r.operation().getId().getName().equals("GetBlob") && r.streaming()),
+            "An @httpPayload string must classify streaming");
+    }
+
+    @Test
+    void noInputOperation_stillProducesRequest() {
+        StringShape str = StringShape.builder().id("com.example#Str").build();
+        StructureShape output = StructureShape.builder()
+            .id("com.example#PingOutput").addMember("r", str.getId()).build();
+        // No .input(...) -> Smithy defaults the input target to smithy.api#Unit
+        OperationShape op = OperationShape.builder()
+            .id("com.example#Ping").output(output.getId()).build();
+        ServiceShape service = ServiceShape.builder()
+            .id("com.example#Svc").version("2024-01-01").addOperation(op.getId()).build();
+        // Assemble with the prelude so smithy.api#Unit (the default no-input target) resolves.
+        Model model = Model.assembler()
+            .addShapes(str, output, op, service)
+            .assemble().unwrap();
+
+        var requests = ShapeClassifier.classify(model, service,
+            ProtocolResolver.resolve(service, model)).requests();
+        assertTrue(requests.stream().anyMatch(r -> r.operation().getId().getName().equals("Ping")),
+            "Expected a RequestInfo for the no-input operation Ping");
+    }
+
     @Test
     void classifiesEnumShape() {
         // StringShape with @enum trait -> classified as enum
diff --git a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/SubObjectRendererTest.java b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/SubObjectRendererTest.java
new file mode 100644
index 000000000000..9052f7abd91f
--- /dev/null
+++ b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/SubObjectRendererTest.java
@@ -0,0 +1,171 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+package com.amazonaws.util.awsclientsmithygenerator.generators.model;
+
+import com.amazonaws.util.awsclientsmithygenerator.generators.CppWriterDelegator;
+import com.amazonaws.util.awsclientsmithygenerator.generators.model.ProtocolResolver.Protocol;
+import com.amazonaws.util.awsclientsmithygenerator.generators.model.protocol.ProtocolTraits;
+import com.amazonaws.util.awsclientsmithygenerator.generators.model.RenderContext;
+import com.amazonaws.util.awsclientsmithygenerator.generators.model.renderers.SubObjectRenderer;
+import org.junit.jupiter.api.Test;
+import software.amazon.smithy.build.MockManifest;
+import software.amazon.smithy.model.Model;
+import software.amazon.smithy.model.shapes.ServiceShape;
+import software.amazon.smithy.model.shapes.ShapeId;
+import software.amazon.smithy.model.shapes.StringShape;
+import software.amazon.smithy.model.shapes.StructureShape;
+import software.amazon.smithy.model.shapes.UnionShape;
+import software.amazon.smithy.model.traits.DocumentationTrait;
+import software.amazon.smithy.model.traits.StreamingTrait;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * Verifies that {@link SubObjectRenderer} renders C2J-style union shapes. In C2J a union is a
+ * {@code structure} with {@code "union": true} and is emitted by the same ModelClass templates
+ * as a plain structure (serde decls + per-member Get/Set/With/HasBeenSet accessors + private
+ * data members and flags). Non-streaming unions must produce header + source files; {@code
+ * @streaming} unions belong to the event-stream renderers and must be skipped here.
+ */
+class SubObjectRendererTest {
+
+    /**
+     * A model with a plain structure sub-object, a non-streaming union, and a {@code @streaming}
+     * union — mirroring bedrock-runtime (ContentBlock / ToolChoice are data unions;
+     * InvokeModelWithBidirectionalStreamInput is a streaming union).
+     */
+    private static Model model() {
+        StringShape str = StringShape.builder().id("com.example#Str").build();
+        StructureShape leaf = StructureShape.builder()
+            .id("com.example#Leaf")
+            .addMember("value", str.getId())
+            .build();
+        // Non-streaming data union: one string variant, one struct variant, one with member doc.
+        UnionShape dataUnion = UnionShape.builder()
+            .id("com.example#ContentBlock")
+            .addTrait(new DocumentationTrait("<p>A block of content.</p>"))
+            .addMember("text", str.getId(),
+                b -> b.addTrait(new DocumentationTrait("<p>Text variant.</p>")))
+            .addMember("leaf", leaf.getId())
+            .build();
+        // Streaming union — handled by the event-stream renderers, not here.
+        UnionShape streamingUnion = UnionShape.builder()
+            .id("com.example#BidirectionalInput")
+            .addTrait(new StreamingTrait())
+            .addMember("chunk", leaf.getId())
+            .build();
+        // Memberless structure (e.g. bedrock-runtime AnyToolChoice / AutoToolChoice): C2J emits
+        // no private: section when the shape has no members.
+        StructureShape empty = StructureShape.builder()
+            .id("com.example#AnyToolChoice")
+            .build();
+        // Union with a blob member (e.g. bedrock-runtime AudioSource): its source needs
+        // HashingUtils.h for Base64 blob serde.
+        software.amazon.smithy.model.shapes.BlobShape blob =
+            software.amazon.smithy.model.shapes.BlobShape.builder().id("com.example#PartBody").build();
+        UnionShape blobUnion = UnionShape.builder()
+            .id("com.example#AudioSource")
+            .addMember("bytes", blob.getId())
+            .addMember("leaf", leaf.getId())
+            .build();
+        ServiceShape service = ServiceShape.builder()
+            .id("com.example#Example")
+            .version("2024-01-01")
+            .build();
+        return Model.builder()
+            .addShapes(str, leaf, dataUnion, streamingUnion, empty, blob, blobUnion, service).build();
+    }
+
+    private static java.util.Map<String, String> renderAll() {
+        Model model = model();
+        ServiceShape service = model.expectShape(ShapeId.from("com.example#Example"), ServiceShape.class);
+        MockManifest manifest = new MockManifest();
+        CppWriterDelegator delegator = new CppWriterDelegator(manifest);
+        ProtocolTraits traits = ProtocolResolver.traitsFor(Protocol.JSON);
+        java.util.List<software.amazon.smithy.model.shapes.Shape> subObjects = java.util.List.of(
+            model.expectShape(ShapeId.from("com.example#Leaf")),
+            model.expectShape(ShapeId.from("com.example#ContentBlock")),
+            model.expectShape(ShapeId.from("com.example#BidirectionalInput")),
+            model.expectShape(ShapeId.from("com.example#AnyToolChoice")),
+            model.expectShape(ShapeId.from("com.example#AudioSource")));
+        new SubObjectRenderer(subObjects,
+            new RenderContext(model, service, traits,
+                "Example", "AWS_EXAMPLE_API", "example")).render(delegator);
+        delegator.flushWriters();
+        java.util.Map<String, String> out = new java.util.TreeMap<>();
+        for (java.nio.file.Path path : manifest.getFiles()) {
+            out.put(path.getFileName().toString(), manifest.getFileString(path).orElseThrow());
+        }
+        return out;
+    }
+
+    @Test
+    void nonStreamingUnion_generatesHeaderAndSource() {
+        java.util.Map<String, String> files = renderAll();
+        assertTrue(files.containsKey("ContentBlock.h"),
+            "Non-streaming union must generate a header: " + files.keySet());
+        assertTrue(files.containsKey("ContentBlock.cpp"),
+            "Non-streaming union must generate a source: " + files.keySet());
+    }
+
+    @Test
+    void nonStreamingUnion_headerHasSerdeDeclsAndPerMemberAccessors() {
+        String h = renderAll().get("ContentBlock.h");
+        // Same serde surface as a structure sub-object.
+        assertTrue(h.contains("AWS_EXAMPLE_API ContentBlock() = default;"), h);
+        assertTrue(h.contains("AWS_EXAMPLE_API ContentBlock(Aws::Utils::Json::JsonView jsonValue);"), h);
+        assertTrue(h.contains("AWS_EXAMPLE_API Aws::Utils::Json::JsonValue Jsonize() const;"), h);
+        // Per-member accessors for each variant.
+        assertTrue(h.contains("GetText") && h.contains("SetText") && h.contains("WithText"), h);
+        assertTrue(h.contains("GetLeaf") && h.contains("SetLeaf") && h.contains("WithLeaf"), h);
+        assertTrue(h.contains("bool m_textHasBeenSet = false;"), h);
+        assertTrue(h.contains("bool m_leafHasBeenSet = false;"), h);
+        // Class-level and member-level documentation flow through.
+        assertTrue(h.contains("A block of content."), h);
+        assertTrue(h.contains("Text variant."), h);
+    }
+
+    @Test
+    void nonStreamingUnion_sourceHasSerdeImpls() {
+        String c = renderAll().get("ContentBlock.cpp");
+        assertTrue(c.contains("ContentBlock::ContentBlock(JsonView jsonValue)"), c);
+        assertTrue(c.contains("ContentBlock& ContentBlock::operator=(JsonView jsonValue)"), c);
+        assertTrue(c.contains("JsonValue ContentBlock::Jsonize() const"), c);
+    }
+
+    @Test
+    void blobMemberSource_includesHashingUtils() {
+        // A sub-object with a blob member needs HashingUtils.h in its source (Base64 blob serde),
+        // matching C2J's computeSourceIncludes. The header must NOT carry it (source-only include).
+        java.util.Map<String, String> files = renderAll();
+        String c = files.get("AudioSource.cpp");
+        assertTrue(c.contains("#include <aws/core/utils/HashingUtils.h>"),
+            "Blob-bearing sub-object source must include HashingUtils.h: " + c);
+        String h = files.get("AudioSource.h");
+        assertFalse(h.contains("HashingUtils.h"),
+            "HashingUtils.h is a source-only include, not a header include: " + h);
+    }
+
+    @Test
+    void memberlessShape_omitsPrivateSection() {
+        // C2J emits the private: section only when the shape has members
+        // (ModelClassMembersAndInlines.vm: `#if($shape.members.size() > 0 ...`). A memberless
+        // sub-object ends right after its serde decls — no trailing blank line and no private:.
+        String h = renderAll().get("AnyToolChoice.h");
+        assertTrue(h.contains("AWS_EXAMPLE_API Aws::Utils::Json::JsonValue Jsonize() const;"), h);
+        assertFalse(h.contains("private:"),
+            "Memberless shape must not emit a private: section: " + h);
+    }
+
+    @Test
+    void streamingUnion_isNotRenderedBySubObjectRenderer() {
+        java.util.Map<String, String> files = renderAll();
+        assertFalse(files.containsKey("BidirectionalInput.h"),
+            "Streaming union must NOT be rendered by SubObjectRenderer: " + files.keySet());
+        assertFalse(files.containsKey("BidirectionalInput.cpp"),
+            "Streaming union must NOT be rendered by SubObjectRenderer: " + files.keySet());
+    }
+}
diff --git a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/protocol/CborProtocolTraitsTest.java b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/protocol/CborProtocolTraitsTest.java
new file mode 100644
index 000000000000..258c1d41361d
--- /dev/null
+++ b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/protocol/CborProtocolTraitsTest.java
@@ -0,0 +1,190 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+package com.amazonaws.util.awsclientsmithygenerator.generators.model.protocol;
+
+import com.amazonaws.util.awsclientsmithygenerator.generators.CppWriter;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class CborProtocolTraitsTest {
+
+    private static String render(java.util.function.Consumer<CppWriter> body) {
+        CppWriter writer = new CppWriter();
+        body.accept(writer);
+        return writer.toString();
+    }
+
+    private final ProtocolTraits cbor = new CborProtocolTraits();
+
+    private static software.amazon.smithy.model.shapes.StructureShape reqWith(boolean header, boolean query) {
+        software.amazon.smithy.model.shapes.StructureShape.Builder b =
+            software.amazon.smithy.model.shapes.StructureShape.builder().id("com.example#DoThingRequest");
+        if (header) {
+            b.addMember(software.amazon.smithy.model.shapes.MemberShape.builder()
+                .id("com.example#DoThingRequest$h").target("com.example#Str")
+                .addTrait(new software.amazon.smithy.model.traits.HttpHeaderTrait("X-H")).build());
+        }
+        if (query) {
+            b.addMember(software.amazon.smithy.model.shapes.MemberShape.builder()
+                .id("com.example#DoThingRequest$q").target("com.example#Str")
+                .addTrait(new software.amazon.smithy.model.traits.HttpQueryTrait("q")).build());
+        }
+        return b.build();
+    }
+    private static software.amazon.smithy.model.shapes.OperationShape opWithInput(
+            software.amazon.smithy.model.shapes.StructureShape req) {
+        return software.amazon.smithy.model.shapes.OperationShape.builder()
+            .id("com.example#DoThing").input(req.getId()).build();
+    }
+    private static software.amazon.smithy.model.shapes.OperationShape opNoInput() {
+        return software.amazon.smithy.model.shapes.OperationShape.builder().id("com.example#Ping").build();
+    }
+    private static software.amazon.smithy.model.shapes.StructureShape unitStructure() {
+        return software.amazon.smithy.model.shapes.StructureShape.builder()
+            .id("com.example#PingRequest").build();
+    }
+    private static software.amazon.smithy.model.shapes.ServiceShape svcAthena() {
+        return software.amazon.smithy.model.shapes.ServiceShape.builder()
+            .id("com.example#AmazonAthena").version("2017-05-18").build();
+    }
+    private static software.amazon.smithy.model.Model modelWith(
+            software.amazon.smithy.model.shapes.StructureShape req) {
+        return software.amazon.smithy.model.Model.builder()
+            .addShapes(software.amazon.smithy.model.shapes.StringShape.builder().id("com.example#Str").build(), req)
+            .build();
+    }
+
+    @Test
+    void serdeNamespace_isCbor() {
+        assertEquals("Aws::Utils::Cbor", cbor.serdeNamespace());
+    }
+
+    @Test
+    void resultForwardDecls_declareCborValue() {
+        String out = render(cbor::writeResultForwardDeclarations);
+        assertTrue(out.contains("class CborValue;"), out);
+        assertFalse(out.contains("JsonValue"), out);
+    }
+
+    @Test
+    void serdeInclude_isCborHeaders() {
+        var out = cbor.serdeIncludes(FileKind.SUBOBJECT_SOURCE);
+        assertTrue(out.contains("aws/crt/cbor/Cbor.h"), out.toString());
+        assertTrue(out.contains("aws/core/utils/cbor/CborValue.h"), out.toString());
+    }
+
+    // --- Sub-object serde contract: C2J CBOR uses a streaming CborDecoder/CborEncode, NOT the
+    // JSON-family CborValue/Jsonize shape. (CborSubObjectHeader.vm / CborSubObjectSource.vm)
+
+    @Test
+    void subObjectHeader_includesCborHeader() {
+        // CborSubObjectHeader.vm hard-includes <aws/crt/cbor/Cbor.h> (the signatures reference
+        // Aws::Crt::Cbor::CborDecoder / CborEncoder directly).
+        assertTrue(cbor.serdeIncludes(FileKind.SUBOBJECT_HEADER).contains("aws/crt/cbor/Cbor.h"),
+            cbor.serdeIncludes(FileKind.SUBOBJECT_HEADER).toString());
+    }
+
+    @Test
+    void serdeMethodDecls_useCborDecoderAndCborEncode() {
+        String out = render(w -> cbor.writeSerdeMethodDecls(w, "AWS_EXAMPLE_API", "ArchiveRetention", null));
+        assertTrue(out.contains(
+            "ArchiveRetention(const std::shared_ptr<Aws::Crt::Cbor::CborDecoder>& decoder);"), out);
+        assertTrue(out.contains(
+            "ArchiveRetention& operator=(const std::shared_ptr<Aws::Crt::Cbor::CborDecoder>& decoder);"), out);
+        assertTrue(out.contains("void CborEncode(Aws::Crt::Cbor::CborEncoder& encoder) const;"), out);
+        assertFalse(out.contains("Jsonize"), out);
+        assertFalse(out.contains("CborValue"), out);
+    }
+
+    @Test
+    void serdeMethodImpls_useCborDecoderAndCborEncode() {
+        String out = render(w -> cbor.writeSerdeMethodImpls(w, "ArchiveRetention"));
+        assertTrue(out.contains(
+            "ArchiveRetention::ArchiveRetention(const std::shared_ptr<Aws::Crt::Cbor::CborDecoder>& decoder)"), out);
+        assertTrue(out.contains(
+            "ArchiveRetention& ArchiveRetention::operator=(const std::shared_ptr<Aws::Crt::Cbor::CborDecoder>& decoder)"),
+            out);
+        assertTrue(out.contains("void ArchiveRetention::CborEncode(Aws::Crt::Cbor::CborEncoder& encoder) const"), out);
+        assertFalse(out.contains("Jsonize"), out);
+    }
+
+    @Test
+    void subObjectHeader_forwardDeclaresCborValueOnly() {
+        // The forward declaration still names CborValue (the result payload type), matching C2J.
+        String out = render(cbor::writeShapeForwardDeclarations);
+        assertTrue(out.contains("class CborValue;"), out);
+    }
+
+    // --- Source include/using sets must match C2J templates exactly.
+
+    @Test
+    void requestSource_hasCborStreamingInclude() {
+        // Source includes are a per-protocol superset union; the request source carries at least
+        // the streaming <aws/crt/cbor/Cbor.h>. (Extra union members are inert; usings stay exact.)
+        var inc = cbor.serdeIncludes(FileKind.REQUEST_SOURCE);
+        assertTrue(inc.contains("aws/crt/cbor/Cbor.h"), inc.toString());
+    }
+
+    @Test
+    void requestSource_usingsAreCborCryptoAndUtilsOnly() {
+        // CborRequestSource.vm usings: Aws::Crt::Cbor + Aws::Utils. NOT Aws::Crt / Aws::Utils::Cbor.
+        var usings = cbor.serdeUsings(FileKind.REQUEST_SOURCE);
+        assertTrue(usings.contains("Aws::Crt::Cbor"), usings.toString());
+        assertTrue(usings.contains("Aws::Utils"), usings.toString());
+        assertFalse(usings.contains("Aws::Crt"), usings.toString());
+        assertFalse(usings.contains("Aws::Utils::Cbor"), usings.toString());
+    }
+
+    @Test
+    void subObjectSource_usingsAreCborCryptoAndUtilsOnly() {
+        // CborSubObjectSource.vm usings: Aws::Crt::Cbor + Aws::Utils only.
+        var usings = cbor.serdeUsings(FileKind.SUBOBJECT_SOURCE);
+        assertTrue(usings.contains("Aws::Crt::Cbor"), usings.toString());
+        assertTrue(usings.contains("Aws::Utils"), usings.toString());
+        assertFalse(usings.contains("Aws::Crt"), usings.toString());
+        assertFalse(usings.contains("Aws::Utils::Cbor"), usings.toString());
+    }
+
+    @Test
+    void resultSerdeDecls_useCborValuePayload() {
+        String out = render(w -> cbor.writeResultSerdeDecls(w, "AWS_EXAMPLE_API", "DoThingResult"));
+        assertTrue(out.contains("Aws::AmazonWebServiceResult<Aws::Utils::Cbor::CborValue>"), out);
+    }
+
+    @Test
+    void requestImpls_noTargetHeaderAndEmptyBracesPayload() {
+        var req = reqWith(false, false); var model = modelWith(req);
+        String i = render(w -> cbor.writeRequestMethodImpls(w, "PingRequest", unitStructure(), opNoInput(), svcAthena(), model));
+        assertFalse(i.contains("X-Amz-Target"), i);
+    }
+
+    // hasRequest()==true (input structure present): CONTENT_TYPE emitted, real encoder (not "{}").
+    @Test
+    void requestWithInput_emitsContentTypeAndEncoderPayload() {
+        var req = reqWith(false, false); var model = modelWith(req);
+        var op = opWithInput(req);
+        String i = render(w -> cbor.writeRequestMethodImpls(w, "DoThingRequest", req, op, svcAthena(), model));
+        assertTrue(i.contains("Aws::Crt::Cbor::CborEncoder encoder;"), i);
+        assertTrue(i.contains("headers.emplace(Aws::Http::CONTENT_TYPE_HEADER, Aws::CBOR_CONTENT_TYPE);"), i);
+        assertTrue(i.contains("headers.emplace(Aws::Http::SMITHY_PROTOCOL_HEADER, Aws::RPC_V2_CBOR);"), i);
+        assertTrue(i.contains("headers.emplace(Aws::Http::ACCEPT_HEADER, Aws::CBOR_CONTENT_TYPE);"), i);
+    }
+
+    // hasRequest()==false (input targets smithy.api#Unit): SerializePayload returns {}, NO CONTENT_TYPE.
+    @Test
+    void noInputRequest_returnsEmptyBracesAndOmitsContentType() {
+        var op = opNoInput();
+        var unit = unitStructure();
+        var model = modelWith(unit);
+        String i = render(w -> cbor.writeRequestMethodImpls(w, "PingRequest", unit, op, svcAthena(), model));
+        assertTrue(i.contains("Aws::String PingRequest::SerializePayload() const { return {}; }"), i);
+        assertFalse(i.contains("CONTENT_TYPE_HEADER"), i);
+        assertTrue(i.contains("headers.emplace(Aws::Http::SMITHY_PROTOCOL_HEADER, Aws::RPC_V2_CBOR);"), i);
+        assertTrue(i.contains("headers.emplace(Aws::Http::ACCEPT_HEADER, Aws::CBOR_CONTENT_TYPE);"), i);
+    }
+}
diff --git a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/protocol/FileKindTest.java b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/protocol/FileKindTest.java
new file mode 100644
index 000000000000..71c4d153a9c4
--- /dev/null
+++ b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/protocol/FileKindTest.java
@@ -0,0 +1,23 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+package com.amazonaws.util.awsclientsmithygenerator.generators.model.protocol;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class FileKindTest {
+    @Test
+    void hasAllEightFileKinds() {
+        assertEquals(8, FileKind.values().length);
+        // Referencing each constant compiles only if it exists.
+        FileKind[] all = {
+            FileKind.SUBOBJECT_HEADER, FileKind.RESULT_HEADER, FileKind.SUBOBJECT_SOURCE,
+            FileKind.REQUEST_SOURCE, FileKind.RESULT_SOURCE, FileKind.STREAMING_RESULT_SOURCE,
+            FileKind.EVENT_HANDLER_SOURCE, FileKind.INITIAL_RESPONSE_SOURCE
+        };
+        assertEquals(8, all.length);
+    }
+}
diff --git a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/protocol/JsonProtocolTraitsTest.java b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/protocol/JsonProtocolTraitsTest.java
index 89b527be037e..7f4281bf8f2a 100644
--- a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/protocol/JsonProtocolTraitsTest.java
+++ b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/protocol/JsonProtocolTraitsTest.java
@@ -21,18 +21,47 @@ private static String render(java.util.function.Consumer<CppWriter> body) {
     }
 
     private final ProtocolTraits json = new JsonProtocolTraits(Protocol.JSON);
-    private final ProtocolTraits cbor = new JsonProtocolTraits(Protocol.CBOR);
+    private final ProtocolTraits restJson = new JsonProtocolTraits(Protocol.REST_JSON);
+
+    private static software.amazon.smithy.model.shapes.StructureShape reqWith(boolean header, boolean query) {
+        software.amazon.smithy.model.shapes.StructureShape.Builder b =
+            software.amazon.smithy.model.shapes.StructureShape.builder().id("com.example#DoThingRequest");
+        if (header) {
+            b.addMember(software.amazon.smithy.model.shapes.MemberShape.builder()
+                .id("com.example#DoThingRequest$h").target("com.example#Str")
+                .addTrait(new software.amazon.smithy.model.traits.HttpHeaderTrait("X-H")).build());
+        }
+        if (query) {
+            b.addMember(software.amazon.smithy.model.shapes.MemberShape.builder()
+                .id("com.example#DoThingRequest$q").target("com.example#Str")
+                .addTrait(new software.amazon.smithy.model.traits.HttpQueryTrait("q")).build());
+        }
+        return b.build();
+    }
+    private static software.amazon.smithy.model.shapes.OperationShape opDoThing() {
+        return software.amazon.smithy.model.shapes.OperationShape.builder().id("com.example#DoThing").build();
+    }
+    private static software.amazon.smithy.model.shapes.ServiceShape svcAthena() {
+        return software.amazon.smithy.model.shapes.ServiceShape.builder()
+            .id("com.example#AmazonAthena").version("2017-05-18").build();
+    }
+    private static software.amazon.smithy.model.Model modelWith(
+            software.amazon.smithy.model.shapes.StructureShape req) {
+        return software.amazon.smithy.model.Model.builder()
+            .addShapes(software.amazon.smithy.model.shapes.StringShape.builder().id("com.example#Str").build(), req)
+            .build();
+    }
 
     @Test
     void reportsItsOwnProtocolIdentity() {
         assertEquals(Protocol.JSON, json.protocol());
-        assertEquals(Protocol.CBOR, cbor.protocol());
+        assertEquals(Protocol.REST_JSON, restJson.protocol());
     }
 
     @Test
     void serdeNamespace_isJsonUtils() {
         assertEquals("Aws::Utils::Json", json.serdeNamespace());
-        assertEquals("Aws::Utils::Json", cbor.serdeNamespace());
+        assertEquals("Aws::Utils::Json", restJson.serdeNamespace());
     }
 
     @Test
@@ -94,7 +123,8 @@ void resultSerdeDecls_useJsonValuePayload() {
 
     @Test
     void resultSerdeImpls_useJsonValuePayload() {
-        String out = render(w -> json.writeResultSerdeImpls(w, "DoThingResult"));
+        var req = reqWith(false, false); var model = modelWith(req);
+        String out = render(w -> json.writeResultSerdeImpls(w, "DoThingResult", req, model, "Example"));
         assertTrue(out.contains("DoThingResult::DoThingResult(const "
             + "Aws::AmazonWebServiceResult<JsonValue>& result) {"), out);
         assertTrue(out.contains("*this = result;"), out);
@@ -105,11 +135,50 @@ void resultSerdeImpls_useJsonValuePayload() {
 
     @Test
     void serdeIncludeAndUsings_areJsonFlavored() {
-        assertTrue(render(json::writeSerdeInclude)
-            .contains("#include <aws/core/utils/json/JsonSerializer.h>"));
-        String usings = render(json::writeSerdeUsingDeclarations);
-        assertTrue(usings.contains("using namespace Aws::Utils::Json;"), usings);
-        assertTrue(usings.contains("using namespace Aws::Utils;"), usings);
+        assertTrue(json.serdeIncludes(FileKind.SUBOBJECT_SOURCE)
+            .contains("aws/core/utils/json/JsonSerializer.h"));
+        var usings = json.serdeUsings(FileKind.SUBOBJECT_SOURCE);
+        assertTrue(usings.contains("Aws::Utils::Json"), usings.toString());
+        assertTrue(usings.contains("Aws::Utils"), usings.toString());
+    }
+
+    @Test
+    void awsJson_alwaysDeclaresTargetHeaderAndSerializePayload() {
+        var req = reqWith(false, false); var model = modelWith(req);
+        String d = render(w -> json.writeRequestMethodDecls(w, "AWS_EX_API", req, opDoThing(), model));
+        assertTrue(d.contains("AWS_EX_API Aws::String SerializePayload() const override;"), d);
+        assertTrue(d.contains("Aws::Http::HeaderValueCollection GetRequestSpecificHeaders() const override;"), d);
+        assertFalse(d.contains("DumpBodyToUrl"), d);
+        String i = render(w -> json.writeRequestMethodImpls(w, "DoThingRequest", req, opDoThing(), svcAthena(), model));
+        assertTrue(i.contains("Aws::String DoThingRequest::SerializePayload() const { return \"{}\"; }"), i);
+        assertTrue(i.contains("headers.insert(Aws::Http::HeaderValuePair(\"X-Amz-Target\", \"AmazonAthena.DoThing\"));"), i);
+    }
+
+    @Test
+    void restJson_noBindings_hasNoHeadersMethodAndReturnsEmptyBraces() {
+        var req = reqWith(false, false); var model = modelWith(req);
+        String d = render(w -> restJson.writeRequestMethodDecls(w, "AWS_EX_API", req, opDoThing(), model));
+        assertTrue(d.contains("SerializePayload() const override;"), d);
+        assertFalse(d.contains("GetRequestSpecificHeaders"), d);
+        String i = render(w -> restJson.writeRequestMethodImpls(w, "DoThingRequest", req, opDoThing(), svcAthena(), model));
+        assertTrue(i.contains("Aws::String DoThingRequest::SerializePayload() const { return {}; }"), i);
+        assertFalse(i.contains("X-Amz-Target"), i);
+    }
+
+    @Test
+    void restJson_withHeaderMember_emitsHeadersMethodWithoutTarget() {
+        var req = reqWith(true, false); var model = modelWith(req);
+        String d = render(w -> restJson.writeRequestMethodDecls(w, "AWS_EX_API", req, opDoThing(), model));
+        assertTrue(d.contains("GetRequestSpecificHeaders() const override;"), d);
+        String i = render(w -> restJson.writeRequestMethodImpls(w, "DoThingRequest", req, opDoThing(), svcAthena(), model));
+        assertFalse(i.contains("X-Amz-Target"), i);
+    }
+
+    @Test
+    void json_withQueryMember_emitsAddQueryStringParameters() {
+        var req = reqWith(false, true); var model = modelWith(req);
+        String d = render(w -> json.writeRequestMethodDecls(w, "AWS_EX_API", req, opDoThing(), model));
+        assertTrue(d.contains("void AddQueryStringParameters(Aws::Http::URI& uri) const override;"), d);
     }
 
     @Test
diff --git a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/protocol/ProtocolTraitsIncludeSetTest.java b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/protocol/ProtocolTraitsIncludeSetTest.java
new file mode 100644
index 000000000000..d0b31058ebad
--- /dev/null
+++ b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/protocol/ProtocolTraitsIncludeSetTest.java
@@ -0,0 +1,160 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+package com.amazonaws.util.awsclientsmithygenerator.generators.model.protocol;
+
+import com.amazonaws.util.awsclientsmithygenerator.generators.model.ProtocolResolver.Protocol;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class ProtocolTraitsIncludeSetTest {
+
+    @Test
+    void json_resultSource_includesMatchOldResultHook() {
+        ProtocolTraits json = new JsonProtocolTraits(Protocol.JSON);
+        List<String> inc = json.serdeIncludes(FileKind.RESULT_SOURCE);
+        assertTrue(inc.contains("aws/core/utils/json/JsonSerializer.h"), inc.toString());
+        assertTrue(inc.contains("aws/core/utils/UnreferencedParam.h"), inc.toString());
+        assertTrue(inc.contains("aws/core/utils/memory/stl/AWSStringStream.h"), inc.toString());
+    }
+
+    @Test
+    void queryXml_requestSource_usesStringStreamNotXmlSerializer() {
+        ProtocolTraits q = new QueryXmlProtocolTraits(Protocol.QUERY_XML);
+        List<String> inc = q.serdeIncludes(FileKind.REQUEST_SOURCE);
+        assertTrue(inc.contains("aws/core/utils/StringUtils.h"), inc.toString());
+        assertTrue(inc.contains("aws/core/utils/memory/stl/AWSStringStream.h"), inc.toString());
+    }
+
+    @Test
+    void queryXml_resultSource_usingsIncludeLogging() {
+        ProtocolTraits q = new QueryXmlProtocolTraits(Protocol.QUERY_XML);
+        List<String> usings = q.serdeUsings(FileKind.RESULT_SOURCE);
+        assertEquals(List.of("Aws::Utils::Xml", "Aws::Utils::Logging", "Aws::Utils"), usings);
+    }
+
+    @Test
+    void queryXml_subobjectHeader_hasStreamFwd() {
+        ProtocolTraits q = new QueryXmlProtocolTraits(Protocol.QUERY_XML);
+        assertTrue(q.serdeIncludes(FileKind.SUBOBJECT_HEADER)
+            .contains("aws/core/utils/memory/stl/AWSStreamFwd.h"),
+            q.serdeIncludes(FileKind.SUBOBJECT_HEADER).toString());
+    }
+
+    @Test
+    void restXml_requestSource_hasUtilityAndXmlSerializer() {
+        ProtocolTraits x = new RestXmlProtocolTraits();
+        List<String> inc = x.serdeIncludes(FileKind.REQUEST_SOURCE);
+        assertTrue(inc.contains("aws/core/utils/xml/XmlSerializer.h"), inc.toString());
+        assertTrue(inc.contains("utility"), inc.toString());
+    }
+
+    @Test
+    void cbor_resultSource_hasCborAndUnreferencedAndStringStream() {
+        ProtocolTraits c = new CborProtocolTraits();
+        List<String> inc = c.serdeIncludes(FileKind.RESULT_SOURCE);
+        assertTrue(inc.contains("aws/crt/cbor/Cbor.h"), inc.toString());
+        assertTrue(inc.contains("aws/core/utils/cbor/CborValue.h"), inc.toString());
+        assertTrue(inc.contains("aws/core/utils/UnreferencedParam.h"), inc.toString());
+        assertTrue(inc.contains("aws/core/utils/memory/stl/AWSStringStream.h"), inc.toString());
+    }
+
+    @Test
+    void eventHandler_usings_isSerdeNamespaceOnly() {
+        assertEquals(List.of("Aws::Utils::Json"),
+            new JsonProtocolTraits(Protocol.JSON).serdeUsings(FileKind.EVENT_HANDLER_SOURCE));
+        assertEquals(List.of("Aws::Utils::Cbor"),
+            new CborProtocolTraits().serdeUsings(FileKind.EVENT_HANDLER_SOURCE));
+    }
+
+    @Test
+    void initialResponseSource_hasExpectedSerdeIncludes() {
+        List<String> json = new JsonProtocolTraits(Protocol.JSON).serdeIncludes(FileKind.INITIAL_RESPONSE_SOURCE);
+        assertTrue(json.contains("aws/core/utils/json/JsonSerializer.h"), json.toString());
+        assertTrue(json.contains("aws/core/utils/UnreferencedParam.h"), json.toString());
+
+        List<String> cbor = new CborProtocolTraits().serdeIncludes(FileKind.INITIAL_RESPONSE_SOURCE);
+        assertTrue(cbor.contains("aws/crt/cbor/Cbor.h"), cbor.toString());
+        assertTrue(cbor.contains("aws/core/utils/cbor/CborValue.h"), cbor.toString());
+        assertTrue(cbor.contains("aws/core/utils/UnreferencedParam.h"), cbor.toString());
+    }
+
+    @Test
+    void xmlInitialResponseSource_hasExpectedIncludesAndUsingsExcludeLogging() {
+        List<String> restXml = new RestXmlProtocolTraits().serdeIncludes(FileKind.INITIAL_RESPONSE_SOURCE);
+        assertTrue(restXml.contains("aws/core/utils/xml/XmlSerializer.h"), restXml.toString());
+        assertTrue(restXml.contains("aws/core/utils/UnreferencedParam.h"), restXml.toString());
+
+        List<String> queryXml =
+            new QueryXmlProtocolTraits(Protocol.QUERY_XML).serdeIncludes(FileKind.INITIAL_RESPONSE_SOURCE);
+        assertTrue(queryXml.contains("aws/core/utils/UnreferencedParam.h"), queryXml.toString());
+
+        // Usings are held exact: the initial-response source must not open the Logging namespace.
+        List<String> restXmlUsings = new RestXmlProtocolTraits().serdeUsings(FileKind.INITIAL_RESPONSE_SOURCE);
+        assertTrue(restXmlUsings.stream().noneMatch(s -> s.equals("Aws::Utils::Logging")), restXmlUsings.toString());
+
+        List<String> queryXmlUsings =
+            new QueryXmlProtocolTraits(Protocol.QUERY_XML).serdeUsings(FileKind.INITIAL_RESPONSE_SOURCE);
+        assertTrue(queryXmlUsings.stream().noneMatch(s -> s.equals("Aws::Utils::Logging")), queryXmlUsings.toString());
+    }
+
+    @Test
+    void streamingResult_serdeIncludes_returnsSourceUnion() {
+        // STREAMING_RESULT_SOURCE is a source kind, so it now returns the per-protocol source union.
+        List<String> inc = new RestXmlProtocolTraits().serdeIncludes(FileKind.STREAMING_RESULT_SOURCE);
+        assertTrue(inc.contains("aws/core/utils/xml/XmlSerializer.h"), inc.toString());
+    }
+
+    @Test
+    void subObjectHeader_hasNoSerializerInclude() {
+        List<String> json = new JsonProtocolTraits(Protocol.JSON).serdeIncludes(FileKind.SUBOBJECT_HEADER);
+        assertTrue(json.isEmpty(), json.toString());
+        assertTrue(json.stream().noneMatch(s -> s.equals("aws/core/utils/json/JsonSerializer.h")), json.toString());
+
+        List<String> restXml = new RestXmlProtocolTraits().serdeIncludes(FileKind.SUBOBJECT_HEADER);
+        assertTrue(restXml.stream().noneMatch(s -> s.equals("aws/core/utils/xml/XmlSerializer.h")), restXml.toString());
+
+        // CBOR is the exception: its sub-object header signatures reference Aws::Crt::Cbor::CborDecoder
+        // / CborEncoder directly, so CborSubObjectHeader.vm hard-includes <aws/crt/cbor/Cbor.h>.
+        List<String> cbor = new CborProtocolTraits().serdeIncludes(FileKind.SUBOBJECT_HEADER);
+        assertTrue(cbor.contains("aws/crt/cbor/Cbor.h"), cbor.toString());
+
+        List<String> queryXml =
+            new QueryXmlProtocolTraits(Protocol.QUERY_XML).serdeIncludes(FileKind.SUBOBJECT_HEADER);
+        assertTrue(queryXml.contains("aws/core/utils/memory/stl/AWSStreamFwd.h"), queryXml.toString());
+    }
+
+    @Test
+    void resultHeader_onlyCborHardIncludesCborHeader() {
+        // CborResultHeader.vm hard-includes <aws/crt/cbor/Cbor.h>; JSON/XML/Query result headers
+        // forward-declare their payload type and add no serde include.
+        assertTrue(new CborProtocolTraits().serdeIncludes(FileKind.RESULT_HEADER)
+            .contains("aws/crt/cbor/Cbor.h"),
+            new CborProtocolTraits().serdeIncludes(FileKind.RESULT_HEADER).toString());
+        assertTrue(new JsonProtocolTraits(Protocol.JSON).serdeIncludes(FileKind.RESULT_HEADER).isEmpty());
+        assertTrue(new RestXmlProtocolTraits().serdeIncludes(FileKind.RESULT_HEADER).isEmpty());
+        assertTrue(new QueryXmlProtocolTraits(Protocol.QUERY_XML)
+            .serdeIncludes(FileKind.RESULT_HEADER).isEmpty());
+    }
+
+    @Test
+    void serdeSwitches_throwOnUnhandledFileKind() {
+        // FileKinds never passed to serdeUsings must fail fast rather than default silently.
+        assertThrows(UnsupportedOperationException.class,
+            () -> new JsonProtocolTraits(Protocol.JSON).serdeUsings(FileKind.SUBOBJECT_HEADER));
+        assertThrows(UnsupportedOperationException.class,
+            () -> new JsonProtocolTraits(Protocol.JSON).serdeUsings(FileKind.STREAMING_RESULT_SOURCE));
+        assertThrows(UnsupportedOperationException.class,
+            () -> new RestXmlProtocolTraits().serdeUsings(FileKind.SUBOBJECT_HEADER));
+        assertThrows(UnsupportedOperationException.class,
+            () -> new CborProtocolTraits().serdeUsings(FileKind.STREAMING_RESULT_SOURCE));
+        assertThrows(UnsupportedOperationException.class,
+            () -> new QueryXmlProtocolTraits(Protocol.QUERY_XML).serdeUsings(FileKind.SUBOBJECT_HEADER));
+    }
+}
diff --git a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/protocol/ProtocolTraitsSerdeTest.java b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/protocol/ProtocolTraitsSerdeTest.java
index b6100b4ca776..39a7858d7bdd 100644
--- a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/protocol/ProtocolTraitsSerdeTest.java
+++ b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/protocol/ProtocolTraitsSerdeTest.java
@@ -54,6 +54,46 @@ void errorPayloadParse_isProtocolAgnostic(Protocol p) {
         assertFalse(out.contains("XmlNode"), "Should not emit XML tokens for " + p + ": " + out);
     }
 
+    @Test
+    void defaultPredicates_detectHeaderAndQueryMembers() {
+        software.amazon.smithy.model.shapes.StringShape str =
+            software.amazon.smithy.model.shapes.StringShape.builder().id("com.example#Str").build();
+        software.amazon.smithy.model.shapes.MemberShape headerMember =
+            software.amazon.smithy.model.shapes.MemberShape.builder()
+                .id("com.example#Req$h").target("com.example#Str")
+                .addTrait(new software.amazon.smithy.model.traits.HttpHeaderTrait("X-Thing")).build();
+        software.amazon.smithy.model.shapes.MemberShape queryMember =
+            software.amazon.smithy.model.shapes.MemberShape.builder()
+                .id("com.example#Req$q").target("com.example#Str")
+                .addTrait(new software.amazon.smithy.model.traits.HttpQueryTrait("thing")).build();
+        software.amazon.smithy.model.shapes.StructureShape req =
+            software.amazon.smithy.model.shapes.StructureShape.builder()
+                .id("com.example#Req").addMember(headerMember).addMember(queryMember).build();
+        software.amazon.smithy.model.Model model =
+            software.amazon.smithy.model.Model.builder().addShapes(str, req).build();
+
+        ProtocolTraits t = ProtocolResolver.traitsFor(ProtocolResolver.Protocol.JSON);
+        assertTrue(RequestBindings.hasHeaderMembers(req, model));
+        assertTrue(RequestBindings.hasQueryStringMembers(req, model));
+    }
+
+    @Test
+    void defaultPredicates_falseWhenNoBindings() {
+        software.amazon.smithy.model.shapes.StringShape str =
+            software.amazon.smithy.model.shapes.StringShape.builder().id("com.example#S").build();
+        software.amazon.smithy.model.shapes.StructureShape req =
+            software.amazon.smithy.model.shapes.StructureShape.builder()
+                .id("com.example#R")
+                .addMember(software.amazon.smithy.model.shapes.MemberShape.builder()
+                    .id("com.example#R$plain").target("com.example#S").build())
+                .build();
+        software.amazon.smithy.model.Model model =
+            software.amazon.smithy.model.Model.builder().addShapes(str, req).build();
+        ProtocolTraits t = ProtocolResolver.traitsFor(ProtocolResolver.Protocol.REST_XML);
+        assertFalse(RequestBindings.hasHeaderMembers(req, model));
+        assertFalse(RequestBindings.hasQueryStringMembers(req, model));
+    }
+
     /** The JSON serde method bodies are empty stubs pending schema-based serde. */
     @Test
     void jsonSerdeMethodImpls_emitEmptyBodies() {
diff --git a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/protocol/ProtocolTraitsStreamingPayloadTest.java b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/protocol/ProtocolTraitsStreamingPayloadTest.java
new file mode 100644
index 000000000000..76be69124d09
--- /dev/null
+++ b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/protocol/ProtocolTraitsStreamingPayloadTest.java
@@ -0,0 +1,112 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+package com.amazonaws.util.awsclientsmithygenerator.generators.model.protocol;
+
+import com.amazonaws.util.awsclientsmithygenerator.generators.CppWriter;
+import com.amazonaws.util.awsclientsmithygenerator.generators.model.ProtocolResolver.Protocol;
+import org.junit.jupiter.api.Test;
+import software.amazon.smithy.model.Model;
+import software.amazon.smithy.model.shapes.BlobShape;
+import software.amazon.smithy.model.shapes.OperationShape;
+import software.amazon.smithy.model.shapes.ServiceShape;
+import software.amazon.smithy.model.shapes.StringShape;
+import software.amazon.smithy.model.shapes.StructureShape;
+import software.amazon.smithy.model.traits.HttpPayloadTrait;
+
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * C2J gates {@code SerializePayload()} on {@code !hasStreamMembers()} in the single shared
+ * {@code RequestHeader.vm}, so the rule is protocol-agnostic: no protocol emits SerializePayload
+ * for a request with a raw streaming {@code @httpPayload} member. These tests pin that every
+ * {@link ProtocolTraits} implementation honours it (and still emits SerializePayload for a plain
+ * request).
+ */
+class ProtocolTraitsStreamingPayloadTest {
+
+    private static List<ProtocolTraits> allTraits() {
+        return List.of(
+            new JsonProtocolTraits(Protocol.JSON),
+            new JsonProtocolTraits(Protocol.REST_JSON),
+            new RestXmlProtocolTraits(),
+            new QueryXmlProtocolTraits(Protocol.QUERY_XML),
+            new QueryXmlProtocolTraits(Protocol.EC2),
+            new CborProtocolTraits());
+    }
+
+    /** An operation whose input binds an @httpPayload blob (raw streaming payload). */
+    private static Model streamingPayloadModel() {
+        BlobShape body = BlobShape.builder().id("com.example#Body").build();
+        StructureShape input = StructureShape.builder()
+            .id("com.example#DoThingRequest")
+            .addMember(software.amazon.smithy.model.shapes.MemberShape.builder()
+                .id("com.example#DoThingRequest$body").target(body.getId())
+                .addTrait(new HttpPayloadTrait()).build())
+            .build();
+        return modelWith(body, input);
+    }
+
+    /** An operation whose input is a plain structure (no streaming payload). */
+    private static Model plainModel() {
+        StringShape str = StringShape.builder().id("com.example#Str").build();
+        StructureShape input = StructureShape.builder()
+            .id("com.example#DoThingRequest").addMember("name", str.getId()).build();
+        return modelWith(str, input);
+    }
+
+    private static Model modelWith(software.amazon.smithy.model.shapes.Shape extra, StructureShape input) {
+        OperationShape op = OperationShape.builder()
+            .id("com.example#DoThing").input(input.getId()).build();
+        ServiceShape service = ServiceShape.builder()
+            .id("com.example#Example").version("2024-01-01").addOperation(op.getId()).build();
+        return Model.builder().addShapes(extra, input, op, service).build();
+    }
+
+    private static OperationShape op(Model model) {
+        return model.expectShape(software.amazon.smithy.model.shapes.ShapeId.from("com.example#DoThing"),
+            OperationShape.class);
+    }
+
+    private static StructureShape req(Model model) {
+        return model.expectShape(software.amazon.smithy.model.shapes.ShapeId.from("com.example#DoThingRequest"),
+            StructureShape.class);
+    }
+
+    private static String renderDecls(ProtocolTraits traits, Model model) {
+        CppWriter writer = new CppWriter();
+        writer.indent();  // Query/EC2 decls open with a dedent for the protected: sandwich
+        traits.writeRequestMethodDecls(writer, "AWS_EX_API", req(model), op(model), model);
+        return writer.toString();
+    }
+
+    @Test
+    void allProtocols_omitSerializePayload_forRawStreamingPayloadRequest() {
+        Model model = streamingPayloadModel();
+        for (ProtocolTraits traits : allTraits()) {
+            assertFalse(RequestBindings.emitsSerializePayload(op(model), model),
+                traits.getClass().getSimpleName() + "/" + traits.protocol()
+                    + " must report emitsSerializePayload=false for a streaming-payload request");
+            assertFalse(renderDecls(traits, model).contains("SerializePayload"),
+                traits.getClass().getSimpleName() + "/" + traits.protocol()
+                    + " must not emit a SerializePayload decl for a streaming-payload request");
+        }
+    }
+
+    @Test
+    void allProtocols_emitSerializePayload_forPlainRequest() {
+        Model model = plainModel();
+        for (ProtocolTraits traits : allTraits()) {
+            assertTrue(RequestBindings.emitsSerializePayload(op(model), model),
+                traits.getClass().getSimpleName() + "/" + traits.protocol()
+                    + " must report emitsSerializePayload=true for a plain request");
+            assertTrue(renderDecls(traits, model).contains("SerializePayload"),
+                traits.getClass().getSimpleName() + "/" + traits.protocol()
+                    + " must emit a SerializePayload decl for a plain request");
+        }
+    }
+}
diff --git a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/protocol/RequestBindingsTest.java b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/protocol/RequestBindingsTest.java
new file mode 100644
index 000000000000..53b2437b397c
--- /dev/null
+++ b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/protocol/RequestBindingsTest.java
@@ -0,0 +1,45 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+package com.amazonaws.util.awsclientsmithygenerator.generators.model.protocol;
+
+import org.junit.jupiter.api.Test;
+import software.amazon.smithy.model.Model;
+import software.amazon.smithy.model.shapes.MemberShape;
+import software.amazon.smithy.model.shapes.StringShape;
+import software.amazon.smithy.model.shapes.StructureShape;
+import software.amazon.smithy.model.traits.HttpHeaderTrait;
+import software.amazon.smithy.model.traits.HttpQueryTrait;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class RequestBindingsTest {
+    @Test
+    void detectsHeaderAndQueryMembers() {
+        StringShape str = StringShape.builder().id("com.example#S").build();
+        StructureShape req = StructureShape.builder()
+            .id("com.example#Req")
+            .addMember(MemberShape.builder().id("com.example#Req$h").target(str.getId())
+                .addTrait(new HttpHeaderTrait("X-H")).build())
+            .addMember(MemberShape.builder().id("com.example#Req$q").target(str.getId())
+                .addTrait(new HttpQueryTrait("q")).build())
+            .build();
+        Model model = Model.builder().addShapes(str, req).build();
+        assertTrue(RequestBindings.hasHeaderMembers(req, model));
+        assertTrue(RequestBindings.hasQueryStringMembers(req, model));
+    }
+
+    @Test
+    void plainStructHasNeither() {
+        StringShape str = StringShape.builder().id("com.example#S2").build();
+        StructureShape req = StructureShape.builder()
+            .id("com.example#Plain")
+            .addMember(MemberShape.builder().id("com.example#Plain$a").target(str.getId()).build())
+            .build();
+        Model model = Model.builder().addShapes(str, req).build();
+        assertFalse(RequestBindings.hasHeaderMembers(req, model));
+        assertFalse(RequestBindings.hasQueryStringMembers(req, model));
+    }
+}
diff --git a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/protocol/XmlProtocolTraitsTest.java b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/protocol/XmlProtocolTraitsTest.java
index be397d8dad81..dc04e36ef508 100644
--- a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/protocol/XmlProtocolTraitsTest.java
+++ b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/protocol/XmlProtocolTraitsTest.java
@@ -23,10 +23,52 @@ private static String render(java.util.function.Consumer<CppWriter> body) {
         return writer.toString();
     }
 
+    /**
+     * Renders inside a simulated class body (indent level 1), matching how request-method
+     * declarations are emitted by {@code RequestRenderer}. Query/EC2 decls open with a
+     * {@code dedent()} for the {@code protected:} sandwich, which requires a non-zero
+     * starting indent.
+     */
+    private static String renderInClassBody(java.util.function.Consumer<CppWriter> body) {
+        CppWriter writer = new CppWriter();
+        writer.indent();
+        body.accept(writer);
+        return writer.toString();
+    }
+
     private final ProtocolTraits restXml = new RestXmlProtocolTraits();
     private final ProtocolTraits queryXml = new QueryXmlProtocolTraits(Protocol.QUERY_XML);
     private final ProtocolTraits ec2 = new QueryXmlProtocolTraits(Protocol.EC2);
 
+    private static software.amazon.smithy.model.shapes.StructureShape reqWith(boolean header, boolean query) {
+        software.amazon.smithy.model.shapes.StructureShape.Builder b =
+            software.amazon.smithy.model.shapes.StructureShape.builder().id("com.example#DoThingRequest");
+        if (header) {
+            b.addMember(software.amazon.smithy.model.shapes.MemberShape.builder()
+                .id("com.example#DoThingRequest$h").target("com.example#Str")
+                .addTrait(new software.amazon.smithy.model.traits.HttpHeaderTrait("X-H")).build());
+        }
+        if (query) {
+            b.addMember(software.amazon.smithy.model.shapes.MemberShape.builder()
+                .id("com.example#DoThingRequest$q").target("com.example#Str")
+                .addTrait(new software.amazon.smithy.model.traits.HttpQueryTrait("q")).build());
+        }
+        return b.build();
+    }
+    private static software.amazon.smithy.model.shapes.OperationShape opDoThing() {
+        return software.amazon.smithy.model.shapes.OperationShape.builder().id("com.example#DoThing").build();
+    }
+    private static software.amazon.smithy.model.shapes.ServiceShape svcAthena() {
+        return software.amazon.smithy.model.shapes.ServiceShape.builder()
+            .id("com.example#AmazonAthena").version("2017-05-18").build();
+    }
+    private static software.amazon.smithy.model.Model modelWith(
+            software.amazon.smithy.model.shapes.StructureShape req) {
+        return software.amazon.smithy.model.Model.builder()
+            .addShapes(software.amazon.smithy.model.shapes.StringShape.builder().id("com.example#Str").build(), req)
+            .build();
+    }
+
     // ---------- identity ----------
 
     @Test
@@ -133,12 +175,12 @@ void allXmlTraits_shareForwardDeclarationsIncludeAndUsings() {
             assertFalse(resultFwd.contains("class XmlNode;"),
                 "Result headers declare the document type, not the node type: " + resultFwd);
 
-            assertTrue(render(traits::writeSerdeInclude)
-                .contains("#include <aws/core/utils/xml/XmlSerializer.h>"));
+            assertTrue(traits.serdeIncludes(FileKind.SUBOBJECT_SOURCE)
+                .contains("aws/core/utils/xml/XmlSerializer.h"));
 
-            String usings = render(traits::writeSerdeUsingDeclarations);
-            assertTrue(usings.contains("using namespace Aws::Utils::Xml;"), usings);
-            assertTrue(usings.contains("using namespace Aws::Utils;"), usings);
+            var usings = traits.serdeUsings(FileKind.SUBOBJECT_SOURCE);
+            assertTrue(usings.contains("Aws::Utils::Xml"), usings.toString());
+            assertTrue(usings.contains("Aws::Utils"), usings.toString());
         }
     }
 
@@ -151,11 +193,100 @@ void allXmlTraits_useXmlDocumentForResults() {
             assertTrue(decls.contains("AWS_EXAMPLE_API DoThingResult& operator=(const "
                 + "Aws::AmazonWebServiceResult<Aws::Utils::Xml::XmlDocument>& result);"), decls);
 
-            String impls = render(w -> traits.writeResultSerdeImpls(w, "DoThingResult"));
+            var req = reqWith(false, false); var model = modelWith(req);
+            String impls = render(w -> traits.writeResultSerdeImpls(w, "DoThingResult", req, model, "Example"));
             assertTrue(impls.contains("DoThingResult::DoThingResult(const "
                 + "Aws::AmazonWebServiceResult<XmlDocument>& result) {"), impls);
             assertTrue(impls.contains("DoThingResult& DoThingResult::operator=(const "
                 + "Aws::AmazonWebServiceResult<XmlDocument>& result) {"), impls);
         }
     }
+
+    // ---------- REST_XML request contract (Axis-1 gating) ----------
+
+    @Test
+    void restXml_noBindings_onlySerializePayload() {
+        var req = reqWith(false, false); var model = modelWith(req);
+        ProtocolTraits xml = new RestXmlProtocolTraits();
+        String d = render(w -> xml.writeRequestMethodDecls(w, "AWS_EX_API", req, opDoThing(), model));
+        assertTrue(d.contains("Aws::String SerializePayload() const override;"), d);
+        assertFalse(d.contains("GetRequestSpecificHeaders"), d);
+        assertFalse(d.contains("DumpBodyToUrl"), d);
+        assertFalse(d.contains("AddQueryStringParameters"), d);
+        String i = render(w -> xml.writeRequestMethodImpls(w, "DoThingRequest", req, opDoThing(), svcAthena(), model));
+        assertTrue(i.contains("Aws::String DoThingRequest::SerializePayload() const { return {}; }"), i);
+    }
+
+    @Test
+    void restXml_withHeaderMember_emitsHeadersWithoutTarget() {
+        var req = reqWith(true, false); var model = modelWith(req);
+        ProtocolTraits xml = new RestXmlProtocolTraits();
+        String d = render(w -> xml.writeRequestMethodDecls(w, "AWS_EX_API", req, opDoThing(), model));
+        assertTrue(d.contains("GetRequestSpecificHeaders() const override;"), d);
+        String i = render(w -> xml.writeRequestMethodImpls(w, "DoThingRequest", req, opDoThing(), svcAthena(), model));
+        assertFalse(i.contains("X-Amz-Target"), i);
+    }
+
+    @Test
+    void restXml_withQueryMember_emitsAddQueryStringParameters() {
+        var req = reqWith(false, true); var model = modelWith(req);
+        ProtocolTraits xml = new RestXmlProtocolTraits();
+        String d = render(w -> xml.writeRequestMethodDecls(w, "AWS_EX_API", req, opDoThing(), model));
+        assertTrue(d.contains("void AddQueryStringParameters(Aws::Http::URI& uri) const override;"), d);
+    }
+
+    // ---------- Query/EC2 request contract (Axis-1 gating + protected DumpBodyToUrl) ----------
+
+    @Test
+    void queryXml_serializePayloadAndProtectedDumpBodyToUrl() {
+        var req = reqWith(false, false); var model = modelWith(req);
+        ProtocolTraits q = new QueryXmlProtocolTraits(Protocol.QUERY_XML);
+        String d = renderInClassBody(w -> q.writeRequestMethodDecls(w, "AWS_EX_API", req, opDoThing(), model));
+        assertTrue(d.contains("Aws::String SerializePayload() const override;"), d);
+        assertTrue(d.contains("void DumpBodyToUrl(Aws::Http::URI& uri) const override;"), d);
+        assertTrue(d.contains("protected:"), d);
+        assertTrue(d.contains("public:"), d);
+        assertFalse(d.contains("GetRequestSpecificHeaders"), d);
+        String i = render(w -> q.writeRequestMethodImpls(w, "DoThingRequest", req, opDoThing(), svcAthena(), model));
+        assertTrue(i.contains("Aws::String DoThingRequest::SerializePayload() const { return {}; }"), i);
+        assertTrue(i.contains("void DoThingRequest::DumpBodyToUrl(Aws::Http::URI& uri) const { uri.SetQueryString(SerializePayload()); }"), i);
+    }
+
+    @Test
+    void queryXml_withHeaderMember_alsoEmitsHeaders_andStillDumpBodyToUrl() {
+        var req = reqWith(true, false); var model = modelWith(req);
+        ProtocolTraits q = new QueryXmlProtocolTraits(Protocol.QUERY_XML);
+        String d = renderInClassBody(w -> q.writeRequestMethodDecls(w, "AWS_EX_API", req, opDoThing(), model));
+        assertTrue(d.contains("GetRequestSpecificHeaders() const override;"), d);
+        assertTrue(d.contains("DumpBodyToUrl"), d);
+    }
+
+    // ---------- Query/EC2 result ResponseMetadata / requestId extraction ----------
+
+    @Test
+    void queryResult_extractsResponseMetadata() {
+        var req = reqWith(false, false); var model = modelWith(req);
+        String out = render(w -> new QueryXmlProtocolTraits(Protocol.QUERY_XML)
+            .writeResultSerdeImpls(w, "GetThingResult", req, model, "IAM"));
+        assertTrue(out.contains("FirstChild(\"ResponseMetadata\")"), out);
+        assertTrue(out.contains("m_responseMetadata"), out);
+    }
+
+    @Test
+    void queryResult_logTagIsFullyQualified() {
+        // C2J logs with the fully-qualified class name (Aws::<namespace>::Model::<class>).
+        var req = reqWith(false, false); var model = modelWith(req);
+        String out = render(w -> new QueryXmlProtocolTraits(Protocol.QUERY_XML)
+            .writeResultSerdeImpls(w, "GetThingResult", req, model, "IAM"));
+        assertTrue(out.contains("AWS_LOGSTREAM_DEBUG(\"Aws::IAM::Model::GetThingResult\""), out);
+    }
+
+    @Test
+    void ec2Result_extractsRequestIdChild() {
+        var req = reqWith(false, false); var model = modelWith(req);
+        String out = render(w -> new QueryXmlProtocolTraits(Protocol.EC2)
+            .writeResultSerdeImpls(w, "GetThingResult", req, model, "IAM"));
+        assertTrue(out.contains("FirstChild(\"requestId\")"), out);
+        assertTrue(out.contains("SetRequestId"), out);
+    }
 }
diff --git a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/renderers/IncludeSetsTest.java b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/renderers/IncludeSetsTest.java
new file mode 100644
index 000000000000..ae712da77367
--- /dev/null
+++ b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/renderers/IncludeSetsTest.java
@@ -0,0 +1,122 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+package com.amazonaws.util.awsclientsmithygenerator.generators.model.renderers;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
+class IncludeSetsTest {
+
+    @Test
+    void resultHeaderBase_withRequestId_hasAwsString() {
+        List<String> inc = IncludeSets.resultHeaderBase("iam", "IAM", true);
+        assertTrue(inc.contains("aws/core/http/HttpResponse.h"), inc.toString());
+        assertTrue(inc.contains("aws/iam/IAM_EXPORTS.h"), inc.toString());
+        assertTrue(inc.contains("aws/core/utils/memory/stl/AWSString.h"), inc.toString());
+    }
+
+    @Test
+    void resultHeaderBase_withoutRequestId_omitsAwsString() {
+        List<String> inc = IncludeSets.resultHeaderBase("iam", "IAM", false);
+        assertFalse(inc.contains("aws/core/utils/memory/stl/AWSString.h"), inc.toString());
+    }
+
+    @Test
+    void resultSourceBase_hasAwsResultAndStringUtilsAndSelfHeaderAndUtility() {
+        List<String> inc = IncludeSets.resultSourceBase("iam", "GetRoleResult");
+        assertEquals(List.of(
+            "aws/core/AmazonWebServiceResult.h",
+            "aws/core/utils/StringUtils.h",
+            "aws/iam/model/GetRoleResult.h",
+            "utility"), inc);
+    }
+
+    @Test
+    void streamingResultSourceBase_hasStringStreamButNoSerdeHeader() {
+        List<String> inc = IncludeSets.streamingResultSourceBase("s3", "GetObjectResult");
+        assertTrue(inc.contains("aws/core/AmazonWebServiceResult.h"), inc.toString());
+        assertTrue(inc.contains("aws/core/utils/memory/stl/AWSStringStream.h"), inc.toString());
+        assertTrue(inc.contains("aws/s3/model/GetObjectResult.h"), inc.toString());
+        assertTrue(inc.contains("utility"), inc.toString());
+    }
+
+    @Test
+    void requestSourceBase_hasSelfHeaderAndNoUtility() {
+        // <utility> is carried by the per-protocol serdeIncludes(REQUEST_SOURCE), not the base,
+        // so Query/EC2 (which must not emit <utility>) are not forced to include it.
+        List<String> inc = IncludeSets.requestSourceBase("iam", "CreateRoleRequest");
+        assertTrue(inc.contains("aws/iam/model/CreateRoleRequest.h"), inc.toString());
+        assertFalse(inc.contains("utility"), inc.toString());
+    }
+
+    @Test
+    void emit_dedupsAndSortsAndWrapsInAngleBrackets() {
+        com.amazonaws.util.awsclientsmithygenerator.generators.CppWriter w =
+            new com.amazonaws.util.awsclientsmithygenerator.generators.CppWriter();
+        IncludeSets.emit(w, java.util.List.of("b/z.h", "a/a.h", "b/z.h"));
+        String out = w.toString();
+        assertTrue(out.contains("#include <a/a.h>"), out);
+        assertTrue(out.contains("#include <b/z.h>"), out);
+        // dedup: only one occurrence of b/z.h
+        assertEquals(out.indexOf("b/z.h"), out.lastIndexOf("b/z.h"), out);
+        // sorted: a/a.h before b/z.h
+        assertTrue(out.indexOf("a/a.h") < out.indexOf("b/z.h"), out);
+    }
+
+    @Test
+    void emitAngleIncludes_normalizesBracketsDedupesAndSorts() {
+        com.amazonaws.util.awsclientsmithygenerator.generators.CppWriter writer =
+            new com.amazonaws.util.awsclientsmithygenerator.generators.CppWriter();
+        IncludeSets.emitAngleIncludes(writer, java.util.List.of(
+            "<aws/b/B.h>", "aws/a/A.h", "<aws/b/B.h>"));
+        String out = writer.toString();
+        // deduped to two, each bracketed exactly once, sorted A before B
+        assertEquals(
+            "#include <aws/a/A.h>\n#include <aws/b/B.h>\n",
+            out);
+    }
+
+    @Test
+    void emitUsings_preservesOrder() {
+        com.amazonaws.util.awsclientsmithygenerator.generators.CppWriter w =
+            new com.amazonaws.util.awsclientsmithygenerator.generators.CppWriter();
+        IncludeSets.emitUsings(w, java.util.List.of("Aws::Utils::Xml", "Aws::Utils"));
+        String out = w.toString();
+        assertTrue(out.indexOf("using namespace Aws::Utils::Xml;")
+            < out.indexOf("using namespace Aws::Utils;"), out);
+    }
+
+    @Test
+    void emitSourceIncludes_composesBaseAndSerdeUnionSortedDedupedBracketed() {
+        com.amazonaws.util.awsclientsmithygenerator.generators.CppWriter w =
+            new com.amazonaws.util.awsclientsmithygenerator.generators.CppWriter();
+        // A representative source base plus the real JSON serde union for a source kind. The base
+        // repeats "utility" (also in the JSON union) to prove dedup across the two sources.
+        java.util.List<String> base = java.util.List.of(
+            "aws/iam/model/GetRoleRequest.h", "utility");
+        com.amazonaws.util.awsclientsmithygenerator.generators.model.protocol.ProtocolTraits json =
+            new com.amazonaws.util.awsclientsmithygenerator.generators.model.protocol.JsonProtocolTraits(
+                com.amazonaws.util.awsclientsmithygenerator.generators.model.ProtocolResolver.Protocol.JSON);
+        IncludeSets.emitSourceIncludes(w, base, json,
+            com.amazonaws.util.awsclientsmithygenerator.generators.model.protocol.FileKind.REQUEST_SOURCE);
+        String out = w.toString();
+        // Base member + every JSON source-union member appears, each exactly once, bracketed.
+        assertTrue(out.contains("#include <aws/iam/model/GetRoleRequest.h>"), out);
+        assertTrue(out.contains("#include <aws/core/utils/json/JsonSerializer.h>"), out);
+        assertTrue(out.contains("#include <aws/core/utils/UnreferencedParam.h>"), out);
+        assertTrue(out.contains("#include <aws/core/utils/memory/stl/AWSStringStream.h>"), out);
+        assertTrue(out.contains("#include <aws/core/utils/HashingUtils.h>"), out);
+        assertTrue(out.contains("#include <utility>"), out);
+        // dedup: <utility> emitted once despite appearing in both base and the union
+        assertEquals(out.indexOf("<utility>"), out.lastIndexOf("<utility>"), out);
+        // sorted CaseSensitive: the "aws/..." paths precede "utility"
+        assertTrue(out.indexOf("aws/core/utils/json/JsonSerializer.h") < out.indexOf("<utility>"), out);
+    }
+}
diff --git a/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/renderers/ModelFileTest.java b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/renderers/ModelFileTest.java
new file mode 100644
index 000000000000..9df4243a81bb
--- /dev/null
+++ b/tools/code-generation/smithy/cpp-codegen/smithy-cpp-codegen/src/test/java/com/amazonaws/util/awsclientsmithygenerator/generators/model/renderers/ModelFileTest.java
@@ -0,0 +1,49 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+package com.amazonaws.util.awsclientsmithygenerator.generators.model.renderers;
+
+import com.amazonaws.util.awsclientsmithygenerator.generators.CppWriter;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class ModelFileTest {
+    @Test
+    void modelNamespace_matchesHandWrittenTripleNest() {
+        CppWriter manual = new CppWriter();
+        manual.writeNamespaceOpen("Aws");
+        manual.writeNamespaceOpen("S3");
+        manual.writeNamespaceOpen("Model");
+        manual.write("int x = 1;");
+        manual.writeNamespaceClose("Model");
+        manual.writeNamespaceClose("S3");
+        manual.writeNamespaceClose("Aws");
+
+        CppWriter viaHelper = new CppWriter();
+        ModelFile.modelNamespace(viaHelper, "S3", () -> viaHelper.write("int x = 1;"));
+
+        assertEquals(manual.toString(), viaHelper.toString());
+    }
+
+    @Test
+    void modelNamespace_withProlog_emitsPrologInsideAwsBeforeNamespace() {
+        CppWriter manual = new CppWriter();
+        manual.writeNamespaceOpen("Aws");
+        manual.write("class Fwd;");
+        manual.writeNamespaceOpen("S3");
+        manual.writeNamespaceOpen("Model");
+        manual.write("int x = 1;");
+        manual.writeNamespaceClose("Model");
+        manual.writeNamespaceClose("S3");
+        manual.writeNamespaceClose("Aws");
+
+        CppWriter helper = new CppWriter();
+        ModelFile.modelNamespace(helper, "S3",
+            () -> helper.write("class Fwd;"),
+            () -> helper.write("int x = 1;"));
+
+        assertEquals(manual.toString(), helper.toString());
+    }
+}
diff --git a/tools/scripts/codegen/legacy_c2j_cpp_gen.py b/tools/scripts/codegen/legacy_c2j_cpp_gen.py
index 0a9d765329d1..bb5bccf518b5 100644
--- a/tools/scripts/codegen/legacy_c2j_cpp_gen.py
+++ b/tools/scripts/codegen/legacy_c2j_cpp_gen.py
@@ -17,7 +17,6 @@
 from concurrent.futures import ProcessPoolExecutor, wait, FIRST_COMPLETED, ALL_COMPLETED
 from pathlib import Path
 
-from codegen.include_tests_util import IncludeTestsUtil
 from codegen.model_utils import ServiceModel
 from codegen.smithy_cpp_gen import bdd_endpoint_services
 
@@ -272,9 +271,9 @@ def _generate_single_service(self,
 
         if model_files.endpoint_rule_set and model_files.endpoint_tests:
             self._generate_client_endpoint_tests(service_name, model_files, f"{output_dir}/tests", tmp_dir)
-            IncludeTestsUtil.generate(service_name,
-                                      f"{output_dir}/src/aws-cpp-sdk-{service_name}",
-                                      f"{output_dir}/tests/{service_name}-gen-tests")
+            # NOTE: the include test is generated later (in run_code_generation.main), after the
+            # Smithy pass writes model/*.h. Generating it here would miss those headers for
+            # --use-smithy-models services, whose model generation C2J skips.
 
         return service_name, status
 
diff --git a/tools/scripts/run_code_generation.py b/tools/scripts/run_code_generation.py
index f3fffe6fa95c..aed9db20ffa3 100644
--- a/tools/scripts/run_code_generation.py
+++ b/tools/scripts/run_code_generation.py
@@ -10,6 +10,7 @@
 from pathlib import Path
 
 from codegen.legacy_c2j_cpp_gen import LegacyC2jCppGen, CLIENT_MODEL_FILE_LOCATION, ENDPOINT_RULES_LOCATION
+from codegen.include_tests_util import IncludeTestsUtil
 from codegen.model_utils import ModelUtils
 from codegen.protocol_tests_gen import ProtocolTestsGen
 from codegen.smoke_tests_gen import SmokeTestsGen
@@ -221,6 +222,19 @@ def main():
             print("ERROR: Failed to generate Smithy code!")
             return -1
     
+    # Generate include tests AFTER both the C2J and Smithy passes, so the client's include/ tree
+    # is complete. IncludeTestsUtil scans that tree on disk; C2J skips model generation for
+    # --use-smithy-models services (their model/*.h are written by the Smithy pass above), so
+    # generating include tests during the C2J pass would omit every model header.
+    if clients_to_build:
+        for client in clients_to_build:
+            service_client_dir = f"{args['output_location']}/src/aws-cpp-sdk-{client}"
+            test_output_dir = f"{args['output_location']}/tests/{client}-gen-tests"
+            # The gen-tests dir exists only for services that got endpoint tests generated, which
+            # is the same condition under which the include test was previously produced.
+            if os.path.isdir(service_client_dir) and os.path.isdir(test_output_dir):
+                IncludeTestsUtil.generate(client, service_client_dir, test_output_dir)
+
     if args["generate_smoke_tests"] and clients_to_build:
         smoke_tests_gen = SmokeTestsGen(args["debug"])
         if smoke_tests_gen.generate(clients_to_build) != 0: