diff --git a/src/NServiceBus.SqlServer.UnitTests/ApprovalFiles/APIApprovals.Approve.approved.txt b/src/NServiceBus.SqlServer.UnitTests/ApprovalFiles/APIApprovals.Approve.approved.txt
index c2577738a..c2380bc0d 100644
--- a/src/NServiceBus.SqlServer.UnitTests/ApprovalFiles/APIApprovals.Approve.approved.txt
+++ b/src/NServiceBus.SqlServer.UnitTests/ApprovalFiles/APIApprovals.Approve.approved.txt
@@ -5,26 +5,6 @@
 [assembly: System.Runtime.InteropServices.ComVisibleAttribute(false)]
 namespace NServiceBus
 {
-    public class SqlServerTransport : NServiceBus.Transport.TransportDefinition
-    {
-        public SqlServerTransport() { }
-        public override string ExampleConnectionStringForErrorMessage { get; }
-        public override bool RequiresConnectionString { get; }
-        public override NServiceBus.Transport.TransportInfrastructure Initialize(NServiceBus.Settings.SettingsHolder settings, string connectionString) { }
-    }
-}
-namespace NServiceBus.Transport.SqlServer
-{
-    public class DelayedDeliverySettings : NServiceBus.Configuration.AdvancedExtensibility.ExposeSettings
-    {
-        public void BatchSize(int batchSize) { }
-        [System.ObsoleteAttribute("Compatibility with the timeout manager is now disabled by default. The member cur" +
-            "rently throws a NotImplementedException. Will be removed in version 7.0.0.", true)]
-        public void DisableTimeoutManagerCompatibility() { }
-        public void EnableTimeoutManagerCompatibility() { }
-        public void ProcessingInterval(System.TimeSpan interval) { }
-        public void TableSuffix(string suffix) { }
-    }
     public class static MessageDrivenPubSubCompatibilityModeConfiguration
     {
         public static NServiceBus.SubscriptionMigrationModeSettings EnableMessageDrivenPubSubCompatibilityMode(this NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> transportExtensions) { }
@@ -33,6 +13,13 @@ namespace NServiceBus.Transport.SqlServer
     {
         public static void UseCustomSqlTransaction(this NServiceBus.SendOptions options, System.Data.SqlClient.SqlTransaction transaction) { }
     }
+    public class SqlServerTransport : NServiceBus.Transport.TransportDefinition
+    {
+        public SqlServerTransport() { }
+        public override string ExampleConnectionStringForErrorMessage { get; }
+        public override bool RequiresConnectionString { get; }
+        public override NServiceBus.Transport.TransportInfrastructure Initialize(NServiceBus.Settings.SettingsHolder settings, string connectionString) { }
+    }
     public class static SqlServerTransportSettingsExtensions
     {
         public static NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> CreateMessageBodyComputedColumn(this NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> transportExtensions) { }
@@ -49,6 +36,19 @@ namespace NServiceBus.Transport.SqlServer
         public static NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> UseSchemaForQueue(this NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> transportExtensions, string queueName, string schema) { }
         public static NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> WithPeekDelay(this NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> transportExtensions, System.Nullable<System.TimeSpan> delay = null) { }
     }
+}
+namespace NServiceBus.Transport.SqlServer
+{
+    public class DelayedDeliverySettings : NServiceBus.Configuration.AdvancedExtensibility.ExposeSettings
+    {
+        public void BatchSize(int batchSize) { }
+        [System.ObsoleteAttribute("Compatibility with the timeout manager is now disabled by default. The member cur" +
+            "rently throws a NotImplementedException. Will be removed in version 7.0.0.", true)]
+        public void DisableTimeoutManagerCompatibility() { }
+        public void EnableTimeoutManagerCompatibility() { }
+        public void ProcessingInterval(System.TimeSpan interval) { }
+        public void TableSuffix(string suffix) { }
+    }
     public class SubscriptionSettings
     {
         public SubscriptionSettings() { }
diff --git a/src/NServiceBus.Transport.SqlServer.AcceptanceTests/MultiCatalog/When_custom_catalog_configured_for_endpoint.cs b/src/NServiceBus.Transport.SqlServer.AcceptanceTests/MultiCatalog/When_custom_catalog_configured_for_endpoint.cs
index 260cb9d0f..1c5ab3dd0 100644
--- a/src/NServiceBus.Transport.SqlServer.AcceptanceTests/MultiCatalog/When_custom_catalog_configured_for_endpoint.cs
+++ b/src/NServiceBus.Transport.SqlServer.AcceptanceTests/MultiCatalog/When_custom_catalog_configured_for_endpoint.cs
@@ -5,7 +5,6 @@
     using AcceptanceTesting.Customization;
     using NServiceBus.AcceptanceTests.EndpointTemplates;
     using NUnit.Framework;
-    using SqlServer;
 
     public class When_custom_catalog_configured_for_endpoint : MultiCatalogAcceptanceTest
     {
diff --git a/src/NServiceBus.Transport.SqlServer.AcceptanceTests/MultiCatalog/When_custom_catalog_configured_for_error_queue.cs b/src/NServiceBus.Transport.SqlServer.AcceptanceTests/MultiCatalog/When_custom_catalog_configured_for_error_queue.cs
index 6534f3a14..976d4bde8 100644
--- a/src/NServiceBus.Transport.SqlServer.AcceptanceTests/MultiCatalog/When_custom_catalog_configured_for_error_queue.cs
+++ b/src/NServiceBus.Transport.SqlServer.AcceptanceTests/MultiCatalog/When_custom_catalog_configured_for_error_queue.cs
@@ -5,7 +5,6 @@
     using AcceptanceTesting;
     using NServiceBus.AcceptanceTests.EndpointTemplates;
     using NUnit.Framework;
-    using SqlServer;
 
     public class When_custom_catalog_configured_for_error_queue : MultiCatalogAcceptanceTest
     {
diff --git a/src/NServiceBus.Transport.SqlServer.AcceptanceTests/MultiCatalog/When_custom_catalog_configured_for_legacy_publisher.cs b/src/NServiceBus.Transport.SqlServer.AcceptanceTests/MultiCatalog/When_custom_catalog_configured_for_legacy_publisher.cs
index b40626e94..ec4dd9d5d 100644
--- a/src/NServiceBus.Transport.SqlServer.AcceptanceTests/MultiCatalog/When_custom_catalog_configured_for_legacy_publisher.cs
+++ b/src/NServiceBus.Transport.SqlServer.AcceptanceTests/MultiCatalog/When_custom_catalog_configured_for_legacy_publisher.cs
@@ -6,7 +6,6 @@
     using Configuration.AdvancedExtensibility;
     using NServiceBus.AcceptanceTests.EndpointTemplates;
     using NUnit.Framework;
-    using SqlServer;
 
     public class When_custom_catalog_configured_for_legacy_publisher : MultiCatalogAcceptanceTest
     {
diff --git a/src/NServiceBus.Transport.SqlServer.AcceptanceTests/MultiCatalog/When_custom_catalog_configured_for_publisher_and_subscriber.cs b/src/NServiceBus.Transport.SqlServer.AcceptanceTests/MultiCatalog/When_custom_catalog_configured_for_publisher_and_subscriber.cs
index 9949a11c9..a24336d5a 100644
--- a/src/NServiceBus.Transport.SqlServer.AcceptanceTests/MultiCatalog/When_custom_catalog_configured_for_publisher_and_subscriber.cs
+++ b/src/NServiceBus.Transport.SqlServer.AcceptanceTests/MultiCatalog/When_custom_catalog_configured_for_publisher_and_subscriber.cs
@@ -5,7 +5,6 @@
     using Features;
     using NServiceBus.AcceptanceTests.EndpointTemplates;
     using NUnit.Framework;
-    using SqlServer;
 
     public class When_custom_catalog_configured_for_publisher_and_subscriber : MultiCatalogAcceptanceTest
     {
diff --git a/src/NServiceBus.Transport.SqlServer.AcceptanceTests/MultiSchema/When_custom_schema_configured_for_endpoint.cs b/src/NServiceBus.Transport.SqlServer.AcceptanceTests/MultiSchema/When_custom_schema_configured_for_endpoint.cs
index 5554d4143..6a960e836 100644
--- a/src/NServiceBus.Transport.SqlServer.AcceptanceTests/MultiSchema/When_custom_schema_configured_for_endpoint.cs
+++ b/src/NServiceBus.Transport.SqlServer.AcceptanceTests/MultiSchema/When_custom_schema_configured_for_endpoint.cs
@@ -4,7 +4,6 @@
     using AcceptanceTesting;
     using NServiceBus.AcceptanceTests;
     using NServiceBus.AcceptanceTests.EndpointTemplates;
-    using SqlServer;
 
     public abstract class When_custom_schema_configured_for_endpoint : NServiceBusAcceptanceTest
     {
diff --git a/src/NServiceBus.Transport.SqlServer.AcceptanceTests/MultiSchema/When_custom_schema_configured_for_endpoint_with_brackets_syntax.cs b/src/NServiceBus.Transport.SqlServer.AcceptanceTests/MultiSchema/When_custom_schema_configured_for_endpoint_with_brackets_syntax.cs
index b69d2e3bc..4cf97ebfa 100644
--- a/src/NServiceBus.Transport.SqlServer.AcceptanceTests/MultiSchema/When_custom_schema_configured_for_endpoint_with_brackets_syntax.cs
+++ b/src/NServiceBus.Transport.SqlServer.AcceptanceTests/MultiSchema/When_custom_schema_configured_for_endpoint_with_brackets_syntax.cs
@@ -4,7 +4,7 @@
     using AcceptanceTesting;
     using NServiceBus.AcceptanceTests.EndpointTemplates;
     using NUnit.Framework;
-    using SqlServer;
+
     using static AcceptanceTesting.Customization.Conventions;
 
     public class When_custom_schema_configured_for_endpoint_with_brackets_syntax : When_custom_schema_configured_for_endpoint
diff --git a/src/NServiceBus.Transport.SqlServer.AcceptanceTests/MultiSchema/When_custom_schema_configured_for_endpoint_with_default_override.cs b/src/NServiceBus.Transport.SqlServer.AcceptanceTests/MultiSchema/When_custom_schema_configured_for_endpoint_with_default_override.cs
index 9c5b45e63..699f2863a 100644
--- a/src/NServiceBus.Transport.SqlServer.AcceptanceTests/MultiSchema/When_custom_schema_configured_for_endpoint_with_default_override.cs
+++ b/src/NServiceBus.Transport.SqlServer.AcceptanceTests/MultiSchema/When_custom_schema_configured_for_endpoint_with_default_override.cs
@@ -5,7 +5,6 @@
     using AcceptanceTesting.Customization;
     using NServiceBus.AcceptanceTests.EndpointTemplates;
     using NUnit.Framework;
-    using SqlServer;
 
     public class When_custom_schema_configured_for_endpoint_with_default_override : When_custom_schema_configured_for_endpoint
     {
diff --git a/src/NServiceBus.Transport.SqlServer.AcceptanceTests/MultiSchema/When_custom_schema_configured_for_endpoint_with_queue_specific_override.cs b/src/NServiceBus.Transport.SqlServer.AcceptanceTests/MultiSchema/When_custom_schema_configured_for_endpoint_with_queue_specific_override.cs
index 4de91f193..2e392df11 100644
--- a/src/NServiceBus.Transport.SqlServer.AcceptanceTests/MultiSchema/When_custom_schema_configured_for_endpoint_with_queue_specific_override.cs
+++ b/src/NServiceBus.Transport.SqlServer.AcceptanceTests/MultiSchema/When_custom_schema_configured_for_endpoint_with_queue_specific_override.cs
@@ -4,7 +4,7 @@
     using AcceptanceTesting;
     using NServiceBus.AcceptanceTests.EndpointTemplates;
     using NUnit.Framework;
-    using SqlServer;
+
     using static AcceptanceTesting.Customization.Conventions;
 
     public class When_custom_schema_configured_for_endpoint_with_queue_specific_override : When_custom_schema_configured_for_endpoint
diff --git a/src/NServiceBus.Transport.SqlServer.AcceptanceTests/MultiSchema/When_custom_schema_configured_for_error_queue.cs b/src/NServiceBus.Transport.SqlServer.AcceptanceTests/MultiSchema/When_custom_schema_configured_for_error_queue.cs
index bf7b89f2d..4aa835cf1 100644
--- a/src/NServiceBus.Transport.SqlServer.AcceptanceTests/MultiSchema/When_custom_schema_configured_for_error_queue.cs
+++ b/src/NServiceBus.Transport.SqlServer.AcceptanceTests/MultiSchema/When_custom_schema_configured_for_error_queue.cs
@@ -6,7 +6,6 @@
     using NServiceBus.AcceptanceTests;
     using NServiceBus.AcceptanceTests.EndpointTemplates;
     using NUnit.Framework;
-    using SqlServer;
 
     public class When_custom_schema_configured_for_error_queue : NServiceBusAcceptanceTest
     {
diff --git a/src/NServiceBus.Transport.SqlServer.AcceptanceTests/MultiSchema/When_custom_schema_configured_for_legacy_publisher.cs b/src/NServiceBus.Transport.SqlServer.AcceptanceTests/MultiSchema/When_custom_schema_configured_for_legacy_publisher.cs
index 000b2135d..8d4be1900 100644
--- a/src/NServiceBus.Transport.SqlServer.AcceptanceTests/MultiSchema/When_custom_schema_configured_for_legacy_publisher.cs
+++ b/src/NServiceBus.Transport.SqlServer.AcceptanceTests/MultiSchema/When_custom_schema_configured_for_legacy_publisher.cs
@@ -7,7 +7,6 @@
     using NServiceBus.AcceptanceTests;
     using NServiceBus.AcceptanceTests.EndpointTemplates;
     using NUnit.Framework;
-    using SqlServer;
 
     public class When_custom_schema_configured_for_legacy_publisher : NServiceBusAcceptanceTest
     {
diff --git a/src/NServiceBus.Transport.SqlServer.AcceptanceTests/MultiSchema/When_custom_schema_configured_for_publisher_and_subscriber.cs b/src/NServiceBus.Transport.SqlServer.AcceptanceTests/MultiSchema/When_custom_schema_configured_for_publisher_and_subscriber.cs
index 1c4674daf..e69a5e288 100644
--- a/src/NServiceBus.Transport.SqlServer.AcceptanceTests/MultiSchema/When_custom_schema_configured_for_publisher_and_subscriber.cs
+++ b/src/NServiceBus.Transport.SqlServer.AcceptanceTests/MultiSchema/When_custom_schema_configured_for_publisher_and_subscriber.cs
@@ -6,7 +6,6 @@
     using NServiceBus.AcceptanceTests;
     using NServiceBus.AcceptanceTests.EndpointTemplates;
     using NUnit.Framework;
-    using SqlServer;
 
     public class When_custom_schema_configured_for_publisher_and_subscriber : NServiceBusAcceptanceTest
     {
diff --git a/src/NServiceBus.Transport.SqlServer.AcceptanceTests/MultiSchema/When_custom_schema_contains_at.cs b/src/NServiceBus.Transport.SqlServer.AcceptanceTests/MultiSchema/When_custom_schema_contains_at.cs
index cfdf1bc93..1a69a6fbc 100644
--- a/src/NServiceBus.Transport.SqlServer.AcceptanceTests/MultiSchema/When_custom_schema_contains_at.cs
+++ b/src/NServiceBus.Transport.SqlServer.AcceptanceTests/MultiSchema/When_custom_schema_contains_at.cs
@@ -5,7 +5,6 @@
     using NServiceBus.AcceptanceTests;
     using NServiceBus.AcceptanceTests.EndpointTemplates;
     using NUnit.Framework;
-    using SqlServer;
 
     public class When_custom_schema_contains_at : NServiceBusAcceptanceTest
     {
diff --git a/src/NServiceBus.Transport.SqlServer.AcceptanceTests/NativePubSub/When_publisher_runs_in_compat_mode.cs b/src/NServiceBus.Transport.SqlServer.AcceptanceTests/NativePubSub/When_publisher_runs_in_compat_mode.cs
index d98208de9..5f245ca38 100644
--- a/src/NServiceBus.Transport.SqlServer.AcceptanceTests/NativePubSub/When_publisher_runs_in_compat_mode.cs
+++ b/src/NServiceBus.Transport.SqlServer.AcceptanceTests/NativePubSub/When_publisher_runs_in_compat_mode.cs
@@ -11,7 +11,6 @@
     using NServiceBus.AcceptanceTests.EndpointTemplates;
     using NUnit.Framework;
     using Routing.MessageDrivenSubscriptions;
-    using SqlServer;
 
     public class When_publisher_runs_in_compat_mode : NServiceBusAcceptanceTest
     {
diff --git a/src/NServiceBus.Transport.SqlServer.AcceptanceTests/NativePubSub/When_subscriber_runs_in_compat_mode.cs b/src/NServiceBus.Transport.SqlServer.AcceptanceTests/NativePubSub/When_subscriber_runs_in_compat_mode.cs
index 7ebb7de43..6f7ac0a04 100644
--- a/src/NServiceBus.Transport.SqlServer.AcceptanceTests/NativePubSub/When_subscriber_runs_in_compat_mode.cs
+++ b/src/NServiceBus.Transport.SqlServer.AcceptanceTests/NativePubSub/When_subscriber_runs_in_compat_mode.cs
@@ -9,7 +9,6 @@
     using NServiceBus.AcceptanceTests;
     using NServiceBus.AcceptanceTests.EndpointTemplates;
     using NUnit.Framework;
-    using SqlServer;
 
     public class When_subscriber_runs_in_compat_mode : NServiceBusAcceptanceTest
     {
diff --git a/src/NServiceBus.Transport.SqlServer.AcceptanceTests/NativeTimeouts/When_deferring_a_message_in_timeout_manager_compatibility_mode.cs b/src/NServiceBus.Transport.SqlServer.AcceptanceTests/NativeTimeouts/When_deferring_a_message_in_timeout_manager_compatibility_mode.cs
index d6efdeebd..839e49fb9 100644
--- a/src/NServiceBus.Transport.SqlServer.AcceptanceTests/NativeTimeouts/When_deferring_a_message_in_timeout_manager_compatibility_mode.cs
+++ b/src/NServiceBus.Transport.SqlServer.AcceptanceTests/NativeTimeouts/When_deferring_a_message_in_timeout_manager_compatibility_mode.cs
@@ -8,7 +8,6 @@
     using NServiceBus.AcceptanceTests;
     using NServiceBus.AcceptanceTests.EndpointTemplates;
     using NUnit.Framework;
-    using SqlServer;
 
     public class When_deferring_a_message_in_timeout_manager_compatibility_mode : NServiceBusAcceptanceTest
     {
diff --git a/src/NServiceBus.Transport.SqlServer.AcceptanceTests/TransactionScope/When_customizing_scope_isolation_level.cs b/src/NServiceBus.Transport.SqlServer.AcceptanceTests/TransactionScope/When_customizing_scope_isolation_level.cs
index 55a751815..19cd54314 100644
--- a/src/NServiceBus.Transport.SqlServer.AcceptanceTests/TransactionScope/When_customizing_scope_isolation_level.cs
+++ b/src/NServiceBus.Transport.SqlServer.AcceptanceTests/TransactionScope/When_customizing_scope_isolation_level.cs
@@ -6,7 +6,6 @@
     using NServiceBus.AcceptanceTests;
     using NServiceBus.AcceptanceTests.EndpointTemplates;
     using NUnit.Framework;
-    using SqlServer;
 
     public class When_customizing_scope_isolation_level : NServiceBusAcceptanceTest
     {
diff --git a/src/NServiceBus.Transport.SqlServer.AcceptanceTests/TransactionScope/When_using_scope_timeout_greater_than_machine_max.cs b/src/NServiceBus.Transport.SqlServer.AcceptanceTests/TransactionScope/When_using_scope_timeout_greater_than_machine_max.cs
index 573880262..0101cee24 100644
--- a/src/NServiceBus.Transport.SqlServer.AcceptanceTests/TransactionScope/When_using_scope_timeout_greater_than_machine_max.cs
+++ b/src/NServiceBus.Transport.SqlServer.AcceptanceTests/TransactionScope/When_using_scope_timeout_greater_than_machine_max.cs
@@ -5,7 +5,6 @@
     using NServiceBus.AcceptanceTests;
     using NServiceBus.AcceptanceTests.EndpointTemplates;
     using NUnit.Framework;
-    using SqlServer;
 
     public class When_using_scope_timeout_greater_than_machine_max : NServiceBusAcceptanceTest
     {
diff --git a/src/NServiceBus.Transport.SqlServer.AcceptanceTests/When_passing_custom_transaction_via_sendoptions.cs b/src/NServiceBus.Transport.SqlServer.AcceptanceTests/When_passing_custom_transaction_via_sendoptions.cs
index 1d15e59b9..553d93d4e 100644
--- a/src/NServiceBus.Transport.SqlServer.AcceptanceTests/When_passing_custom_transaction_via_sendoptions.cs
+++ b/src/NServiceBus.Transport.SqlServer.AcceptanceTests/When_passing_custom_transaction_via_sendoptions.cs
@@ -11,7 +11,6 @@
     using NServiceBus.AcceptanceTests;
     using NServiceBus.AcceptanceTests.EndpointTemplates;
     using NUnit.Framework;
-    using SqlServer;
 
     public class When_passing_custom_transaction_via_sendoptions : NServiceBusAcceptanceTest
     {
diff --git a/src/NServiceBus.Transport.SqlServer.AcceptanceTests/When_using_computed_message_body_column.cs b/src/NServiceBus.Transport.SqlServer.AcceptanceTests/When_using_computed_message_body_column.cs
index aaadf6fd6..e11f5b69e 100644
--- a/src/NServiceBus.Transport.SqlServer.AcceptanceTests/When_using_computed_message_body_column.cs
+++ b/src/NServiceBus.Transport.SqlServer.AcceptanceTests/When_using_computed_message_body_column.cs
@@ -5,7 +5,6 @@
     using NServiceBus.AcceptanceTests;
     using NServiceBus.AcceptanceTests.EndpointTemplates;
     using NUnit.Framework;
-    using SqlServer;
 
     public class When_using_computed_message_body_column : NServiceBusAcceptanceTest
     {
diff --git a/src/NServiceBus.Transport.SqlServer.AcceptanceTests/When_using_custom_connection_factory.cs b/src/NServiceBus.Transport.SqlServer.AcceptanceTests/When_using_custom_connection_factory.cs
index 0e9e03b11..21d5ee612 100644
--- a/src/NServiceBus.Transport.SqlServer.AcceptanceTests/When_using_custom_connection_factory.cs
+++ b/src/NServiceBus.Transport.SqlServer.AcceptanceTests/When_using_custom_connection_factory.cs
@@ -12,7 +12,6 @@
     using NServiceBus.AcceptanceTests;
     using NServiceBus.AcceptanceTests.EndpointTemplates;
     using NUnit.Framework;
-    using SqlServer;
 
     public class When_using_custom_connection_factory : NServiceBusAcceptanceTest
     {
diff --git a/src/NServiceBus.Transport.SqlServer.UnitTests/ApprovalFiles/APIApprovals.Approve.approved.txt b/src/NServiceBus.Transport.SqlServer.UnitTests/ApprovalFiles/APIApprovals.Approve.approved.txt
index 2ff1fdc4c..84c56b21c 100644
--- a/src/NServiceBus.Transport.SqlServer.UnitTests/ApprovalFiles/APIApprovals.Approve.approved.txt
+++ b/src/NServiceBus.Transport.SqlServer.UnitTests/ApprovalFiles/APIApprovals.Approve.approved.txt
@@ -5,26 +5,6 @@
 [assembly: System.Runtime.InteropServices.ComVisibleAttribute(false)]
 namespace NServiceBus
 {
-    public class SqlServerTransport : NServiceBus.Transport.TransportDefinition
-    {
-        public SqlServerTransport() { }
-        public override string ExampleConnectionStringForErrorMessage { get; }
-        public override bool RequiresConnectionString { get; }
-        public override NServiceBus.Transport.TransportInfrastructure Initialize(NServiceBus.Settings.SettingsHolder settings, string connectionString) { }
-    }
-}
-namespace NServiceBus.Transport.SqlServer
-{
-    public class DelayedDeliverySettings : NServiceBus.Configuration.AdvancedExtensibility.ExposeSettings
-    {
-        public void BatchSize(int batchSize) { }
-        [System.ObsoleteAttribute("Compatibility with the timeout manager is now disabled by default. The member cur" +
-            "rently throws a NotImplementedException. Will be removed in version 7.0.0.", true)]
-        public void DisableTimeoutManagerCompatibility() { }
-        public void EnableTimeoutManagerCompatibility() { }
-        public void ProcessingInterval(System.TimeSpan interval) { }
-        public void TableSuffix(string suffix) { }
-    }
     public class static MessageDrivenPubSubCompatibilityModeConfiguration
     {
         public static NServiceBus.SubscriptionMigrationModeSettings EnableMessageDrivenPubSubCompatibilityMode(this NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> transportExtensions) { }
@@ -33,6 +13,13 @@ namespace NServiceBus.Transport.SqlServer
     {
         public static void UseCustomSqlTransaction(this NServiceBus.SendOptions options, Microsoft.Data.SqlClient.SqlTransaction transaction) { }
     }
+    public class SqlServerTransport : NServiceBus.Transport.TransportDefinition
+    {
+        public SqlServerTransport() { }
+        public override string ExampleConnectionStringForErrorMessage { get; }
+        public override bool RequiresConnectionString { get; }
+        public override NServiceBus.Transport.TransportInfrastructure Initialize(NServiceBus.Settings.SettingsHolder settings, string connectionString) { }
+    }
     public class static SqlServerTransportSettingsExtensions
     {
         public static NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> CreateMessageBodyComputedColumn(this NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> transportExtensions) { }
@@ -49,6 +36,19 @@ namespace NServiceBus.Transport.SqlServer
         public static NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> UseSchemaForQueue(this NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> transportExtensions, string queueName, string schema) { }
         public static NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> WithPeekDelay(this NServiceBus.TransportExtensions<NServiceBus.SqlServerTransport> transportExtensions, System.Nullable<System.TimeSpan> delay = null) { }
     }
+}
+namespace NServiceBus.Transport.SqlServer
+{
+    public class DelayedDeliverySettings : NServiceBus.Configuration.AdvancedExtensibility.ExposeSettings
+    {
+        public void BatchSize(int batchSize) { }
+        [System.ObsoleteAttribute("Compatibility with the timeout manager is now disabled by default. The member cur" +
+            "rently throws a NotImplementedException. Will be removed in version 7.0.0.", true)]
+        public void DisableTimeoutManagerCompatibility() { }
+        public void EnableTimeoutManagerCompatibility() { }
+        public void ProcessingInterval(System.TimeSpan interval) { }
+        public void TableSuffix(string suffix) { }
+    }
     public class SubscriptionSettings
     {
         public SubscriptionSettings() { }
diff --git a/src/NServiceBus.Transport.SqlServer/PubSub/MessageDrivenPubSubCompatibilityModeConfiguration.cs b/src/NServiceBus.Transport.SqlServer/PubSub/MessageDrivenPubSubCompatibilityModeConfiguration.cs
index 81906fd91..7ccff3993 100644
--- a/src/NServiceBus.Transport.SqlServer/PubSub/MessageDrivenPubSubCompatibilityModeConfiguration.cs
+++ b/src/NServiceBus.Transport.SqlServer/PubSub/MessageDrivenPubSubCompatibilityModeConfiguration.cs
@@ -1,4 +1,4 @@
-namespace NServiceBus.Transport.SqlServer
+namespace NServiceBus
 {
     using Configuration.AdvancedExtensibility;
 
diff --git a/src/NServiceBus.Transport.SqlServer/SendOptionsExtensions.cs b/src/NServiceBus.Transport.SqlServer/SendOptionsExtensions.cs
index efcda9526..ba1b2efd1 100644
--- a/src/NServiceBus.Transport.SqlServer/SendOptionsExtensions.cs
+++ b/src/NServiceBus.Transport.SqlServer/SendOptionsExtensions.cs
@@ -1,4 +1,4 @@
-namespace NServiceBus.Transport.SqlServer
+namespace NServiceBus
 {
 #if SYSTEMDATASQLCLIENT
     using System.Data.SqlClient;
@@ -6,6 +6,8 @@
     using Microsoft.Data.SqlClient;
 #endif
     using Extensibility;
+    using Transport;
+    using Transport.SqlServer;
 
     /// <summary>
     /// Adds transport specific settings to SendOptions
diff --git a/src/NServiceBus.Transport.SqlServer/SqlServerTransportSettingsExtensions.cs b/src/NServiceBus.Transport.SqlServer/SqlServerTransportSettingsExtensions.cs
index 9e2725351..795ab0615 100644
--- a/src/NServiceBus.Transport.SqlServer/SqlServerTransportSettingsExtensions.cs
+++ b/src/NServiceBus.Transport.SqlServer/SqlServerTransportSettingsExtensions.cs
@@ -1,4 +1,4 @@
-namespace NServiceBus.Transport.SqlServer
+namespace NServiceBus
 {
     using System;
 #if SYSTEMDATASQLCLIENT
@@ -10,6 +10,7 @@
     using System.Transactions;
     using Configuration.AdvancedExtensibility;
     using Logging;
+    using Transport.SqlServer;
 
     /// <summary>
     /// Adds extra configuration for the Sql Server transport.