diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java b/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
index 2bfefbec4c0a..2724b1f55c2c 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
@@ -86,8 +86,8 @@ public AuthenticationInfo getAuthenticationInfo( String id )
                         if ( id.equalsIgnoreCase( server.getId() ) )
                         {
                             SettingsDecryptionResult result = settingsDecrypter.decrypt(
-                                    new DefaultSettingsDecryptionRequest( server.getDelegate() ) );
-                            server = new Server( result.getServer() );
+                                    new DefaultSettingsDecryptionRequest( server ) );
+                            server = result.getServer();
 
                             AuthenticationInfo authInfo = new AuthenticationInfo();
                             authInfo.setUserName( server.getUsername() );
@@ -125,8 +125,8 @@ public ProxyInfo getProxy( String protocol )
                         if ( proxy.isActive() && protocol.equalsIgnoreCase( proxy.getProtocol() ) )
                         {
                             SettingsDecryptionResult result = settingsDecrypter.decrypt(
-                                    new DefaultSettingsDecryptionRequest( proxy.getDelegate() ) );
-                            proxy = new Proxy( result.getProxy() );
+                                    new DefaultSettingsDecryptionRequest( proxy ) );
+                            proxy = result.getProxy();
 
                             ProxyInfo proxyInfo = new ProxyInfo();
                             proxyInfo.setHost( proxy.getHost() );
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
index bd97b399284d..0ace040c2372 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
@@ -563,9 +563,9 @@ public void injectAuthentication( List<ArtifactRepository> repositories, List<Se
 
                 if ( server != null )
                 {
-                    SettingsDecryptionRequest request = new DefaultSettingsDecryptionRequest( server.getDelegate() );
+                    SettingsDecryptionRequest request = new DefaultSettingsDecryptionRequest( server );
                     SettingsDecryptionResult result = settingsDecrypter.decrypt( request );
-                    server = new Server( result.getServer() );
+                    server = result.getServer();
 
                     if ( logger.isDebugEnabled() )
                     {
@@ -670,9 +670,9 @@ public void injectProxy( List<ArtifactRepository> repositories, List<org.apache.
 
                 if ( proxy != null )
                 {
-                    SettingsDecryptionRequest request = new DefaultSettingsDecryptionRequest( proxy.getDelegate() );
+                    SettingsDecryptionRequest request = new DefaultSettingsDecryptionRequest( proxy );
                     SettingsDecryptionResult result = settingsDecrypter.decrypt( request );
-                    proxy = new org.apache.maven.settings.Proxy( result.getProxy() );
+                    proxy = result.getProxy();
 
                     if ( logger.isDebugEnabled() )
                     {
diff --git a/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java b/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
index d8e187646b49..38ba573aa577 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
@@ -194,8 +194,8 @@ public DefaultRepositorySystemSession newRepositorySession( MavenExecutionReques
                 request.getWorkspaceReader() != null ? request.getWorkspaceReader() : workspaceRepository );
 
         DefaultSettingsDecryptionRequest decrypt = new DefaultSettingsDecryptionRequest();
-        decrypt.setProxies( Proxy.proxyToApiV4( request.getProxies() ) );
-        decrypt.setServers( Server.serverToApiV4( request.getServers() ) );
+        decrypt.setProxies( request.getProxies() );
+        decrypt.setServers( request.getServers() );
         SettingsDecryptionResult decrypted = settingsDecrypter.decrypt( decrypt );
 
         if ( logger.isDebugEnabled() )
@@ -215,7 +215,7 @@ public DefaultRepositorySystemSession newRepositorySession( MavenExecutionReques
         session.setMirrorSelector( mirrorSelector );
 
         DefaultProxySelector proxySelector = new DefaultProxySelector();
-        for ( org.apache.maven.api.settings.Proxy proxy : decrypted.getProxies() )
+        for ( Proxy proxy : decrypted.getProxies() )
         {
             AuthenticationBuilder authBuilder = new AuthenticationBuilder();
             authBuilder.addUsername( proxy.getUsername() ).addPassword( proxy.getPassword() );
@@ -226,7 +226,7 @@ public DefaultRepositorySystemSession newRepositorySession( MavenExecutionReques
         session.setProxySelector( proxySelector );
 
         DefaultAuthenticationSelector authSelector = new DefaultAuthenticationSelector();
-        for ( org.apache.maven.api.settings.Server server : decrypted.getServers() )
+        for ( Server server : decrypted.getServers() )
         {
             AuthenticationBuilder authBuilder = new AuthenticationBuilder();
             authBuilder.addUsername( server.getUsername() ).addPassword( server.getPassword() );
@@ -235,7 +235,7 @@ public DefaultRepositorySystemSession newRepositorySession( MavenExecutionReques
 
             if ( server.getConfiguration() != null )
             {
-                Dom dom = server.getConfiguration();
+                Dom dom = ( ( org.codehaus.plexus.util.xml.Xpp3Dom ) server.getConfiguration() ).getDom();
                 List<Dom> children = dom.getChildren().stream()
                         .filter( c -> !"wagonProvider".equals( c.getName() ) )
                         .collect( Collectors.toList() );
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java
index 68491936347d..cb560462e4b0 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java
@@ -371,9 +371,9 @@ private void finalizeMojoConfiguration( MojoExecution mojoExecution )
         mojoExecution.setConfiguration( finalConfiguration );
     }
 
-    private Xpp3Dom getMojoConfiguration( MojoDescriptor mojoDescriptor )
+    private Dom getMojoConfiguration( MojoDescriptor mojoDescriptor )
     {
-        return MojoDescriptorCreator.convert( mojoDescriptor );
+        return MojoDescriptorCreator.convert( mojoDescriptor ).getDom();
     }
 
     @Override
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java
index 04a247ae03fc..65b1cb8b6fcd 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java
@@ -102,7 +102,7 @@ private Plugin findPlugin( String groupId, String artifactId, Collection<Plugin>
         return null;
     }
 
-    public static Xpp3Dom convert( MojoDescriptor mojoDescriptor )
+    public static org.codehaus.plexus.util.xml.Xpp3Dom convert( MojoDescriptor mojoDescriptor )
     {
         PlexusConfiguration c = mojoDescriptor.getMojoConfiguration();
 
@@ -125,7 +125,7 @@ public static Xpp3Dom convert( MojoDescriptor mojoDescriptor )
         }
 
         Xpp3Dom dom = new Xpp3Dom( "configuration", null, null, children, null );
-        return dom;
+        return new org.codehaus.plexus.util.xml.Xpp3Dom( dom );
     }
 
     // org.apache.maven.plugins:maven-remote-resources-plugin:1.0:process@executionId
diff --git a/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java b/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
index 151b2e5fd6bf..2f2c4075e70c 100644
--- a/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
@@ -26,7 +26,6 @@
 import javax.inject.Named;
 import javax.inject.Singleton;
 
-import org.apache.maven.api.settings.Settings;
 import org.apache.maven.execution.MavenExecutionRequest;
 import org.apache.maven.properties.internal.SystemProperties;
 import org.apache.maven.settings.building.DefaultSettingsBuildingRequest;
diff --git a/maven-core/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java b/maven-core/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java
index 45bcbc368261..c79a843d91a6 100644
--- a/maven-core/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java
@@ -22,7 +22,6 @@
 import java.io.File;
 import java.io.IOException;
 
-import org.apache.maven.api.settings.Settings;
 import org.apache.maven.execution.MavenExecutionRequest;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
diff --git a/maven-core/src/test/java/org/apache/maven/internal/impl/TestApi.java b/maven-core/src/test/java/org/apache/maven/internal/impl/TestApi.java
index b39cc21a8436..3809ac3b1862 100644
--- a/maven-core/src/test/java/org/apache/maven/internal/impl/TestApi.java
+++ b/maven-core/src/test/java/org/apache/maven/internal/impl/TestApi.java
@@ -41,6 +41,7 @@
 import org.apache.maven.rtinfo.RuntimeInformation;
 import org.apache.maven.session.scope.internal.SessionScope;
 import org.apache.maven.toolchain.DefaultToolchainManagerPrivate;
+import org.apache.maven.toolchain.building.ToolchainsBuilder;
 import org.codehaus.plexus.PlexusContainer;
 import org.codehaus.plexus.testing.PlexusTest;
 import org.eclipse.aether.RepositorySystem;
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java
index 2841887f90f5..b9720370ca4a 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java
@@ -291,7 +291,7 @@ public void testPluginConfigurationCreation()
         MojoDescriptor mojoDescriptor =
             mojoDescriptorCreator.getMojoDescriptor( "org.apache.maven.its.plugins:maven-it-plugin:0.1:java", session,
                                                      session.getCurrentProject() );
-        Dom dom = MojoDescriptorCreator.convert( mojoDescriptor );
+        Dom dom = MojoDescriptorCreator.convert( mojoDescriptor ).getDom();
         System.out.println( dom );
     }
 
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
index 10cca57da712..6c17028be6a6 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -73,7 +73,6 @@
 import org.apache.maven.toolchain.building.DefaultToolchainsBuildingRequest;
 import org.apache.maven.toolchain.building.ToolchainsBuilder;
 import org.apache.maven.toolchain.building.ToolchainsBuildingResult;
-import org.apache.maven.toolchain.model.PersistedToolchains;
 import org.codehaus.plexus.ContainerConfiguration;
 import org.codehaus.plexus.DefaultContainerConfiguration;
 import org.codehaus.plexus.DefaultPlexusContainer;
@@ -1335,7 +1334,7 @@ void toolchains( CliRequest cliRequest )
         eventSpyDispatcher.onEvent( toolchainsResult );
 
         executionRequestPopulator.populateFromToolchains( cliRequest.request,
-                                      new PersistedToolchains( toolchainsResult.getEffectiveToolchains() ) );
+                                      toolchainsResult.getEffectiveToolchains() );
 
         if ( !toolchainsResult.getProblems().isEmpty() && slf4jLogger.isWarnEnabled() )
         {
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/configuration/SettingsXmlConfigurationProcessor.java b/maven-embedder/src/main/java/org/apache/maven/cli/configuration/SettingsXmlConfigurationProcessor.java
index 5bdc8895b41a..eeb152751c63 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/configuration/SettingsXmlConfigurationProcessor.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/configuration/SettingsXmlConfigurationProcessor.java
@@ -35,11 +35,12 @@
 import org.apache.maven.cli.CliRequest;
 import org.apache.maven.execution.MavenExecutionRequest;
 import org.apache.maven.execution.MavenExecutionRequestPopulationException;
-import org.apache.maven.api.settings.Mirror;
-import org.apache.maven.api.settings.Proxy;
-import org.apache.maven.api.settings.Repository;
-import org.apache.maven.api.settings.Server;
-import org.apache.maven.api.settings.Settings;
+import org.apache.maven.settings.Mirror;
+import org.apache.maven.settings.Profile;
+import org.apache.maven.settings.Proxy;
+import org.apache.maven.settings.Repository;
+import org.apache.maven.settings.Server;
+import org.apache.maven.settings.Settings;
 import org.apache.maven.settings.SettingsUtils;
 import org.apache.maven.settings.building.DefaultSettingsBuildingRequest;
 import org.apache.maven.settings.building.SettingsBuilder;
@@ -188,7 +189,7 @@ private MavenExecutionRequest populateFromSettings( MavenExecutionRequest reques
 
         for ( Server server : settings.getServers() )
         {
-            request.addServer( new org.apache.maven.settings.Server( server ) );
+            request.addServer( server );
         }
 
         //  <proxies>
@@ -210,7 +211,7 @@ private MavenExecutionRequest populateFromSettings( MavenExecutionRequest reques
                 continue;
             }
 
-            request.addProxy( new org.apache.maven.settings.Proxy( proxy ) );
+            request.addProxy( proxy );
         }
 
         // <mirrors>
@@ -223,14 +224,14 @@ private MavenExecutionRequest populateFromSettings( MavenExecutionRequest reques
 
         for ( Mirror mirror : settings.getMirrors() )
         {
-            request.addMirror( new org.apache.maven.settings.Mirror( mirror ) );
+            request.addMirror( mirror );
         }
 
         request.setActiveProfiles( settings.getActiveProfiles() );
 
-        for ( org.apache.maven.api.settings.Profile rawProfile : settings.getProfiles() )
+        for ( Profile rawProfile : settings.getProfiles() )
         {
-            request.addProfile( SettingsUtils.convertFromSettingsProfile( rawProfile ) );
+            request.addProfile( SettingsUtils.convertFromSettingsProfile( rawProfile.getDelegate() ) );
 
             if ( settings.getActiveProfiles().contains( rawProfile.getId() ) )
             {
@@ -239,8 +240,8 @@ private MavenExecutionRequest populateFromSettings( MavenExecutionRequest reques
                 {
                     try
                     {
-                        request.addRemoteRepository( MavenRepositorySystem.buildArtifactRepository(
-                                new org.apache.maven.settings.Repository( remoteRepository ) ) );
+                        request.addRemoteRepository(
+                                    MavenRepositorySystem.buildArtifactRepository( remoteRepository ) );
                     }
                     catch ( InvalidRepositoryException e )
                     {
@@ -254,7 +255,7 @@ private MavenExecutionRequest populateFromSettings( MavenExecutionRequest reques
                     try
                     {
                         request.addPluginArtifactRepository( MavenRepositorySystem.buildArtifactRepository(
-                                new org.apache.maven.settings.Repository( pluginRepository ) ) );
+                                pluginRepository ) );
                     }
                     catch ( InvalidRepositoryException e )
                     {
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java
index 183d4f77b878..6a45b3c4e4bc 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java
@@ -34,7 +34,7 @@
 import org.apache.maven.building.FileSource;
 import org.apache.maven.building.Source;
 import org.apache.maven.api.settings.Settings;
-import org.apache.maven.api.settings.TrackableBase;
+import org.apache.maven.settings.TrackableBase;
 import org.apache.maven.settings.io.SettingsParseException;
 import org.apache.maven.settings.io.SettingsReader;
 import org.apache.maven.settings.io.SettingsWriter;
@@ -128,7 +128,8 @@ public SettingsBuildingResult build( SettingsBuildingRequest request )
             throw new SettingsBuildingException( problems.getProblems() );
         }
 
-        return new DefaultSettingsBuildingResult( userSettings, problems.getProblems() );
+        return new DefaultSettingsBuildingResult( new org.apache.maven.settings.Settings( userSettings ),
+                                                  problems.getProblems() );
     }
 
     private boolean hasErrors( List<SettingsProblem> problems )
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingResult.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingResult.java
index 4dc59d7e275f..48456e5d6527 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingResult.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingResult.java
@@ -22,7 +22,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.maven.api.settings.Settings;
+import org.apache.maven.settings.Settings;
 
 /**
  * Collects the output of the settings builder.
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingResult.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingResult.java
index d2c2c11ebcb2..43b2359fac08 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingResult.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingResult.java
@@ -21,7 +21,7 @@
 
 import java.util.List;
 
-import org.apache.maven.api.settings.Settings;
+import org.apache.maven.settings.Settings;
 
 /**
  * Collects the output of the settings builder.
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecrypter.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecrypter.java
index bd0e21b80f7b..bd4c5fa1536c 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecrypter.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecrypter.java
@@ -26,8 +26,8 @@
 import javax.inject.Named;
 import javax.inject.Singleton;
 
-import org.apache.maven.api.settings.Proxy;
-import org.apache.maven.api.settings.Server;
+import org.apache.maven.settings.Proxy;
+import org.apache.maven.settings.Server;
 import org.apache.maven.settings.building.DefaultSettingsProblem;
 import org.apache.maven.settings.building.SettingsProblem;
 import org.apache.maven.settings.building.SettingsProblem.Severity;
@@ -61,9 +61,11 @@ public SettingsDecryptionResult decrypt( SettingsDecryptionRequest request )
 
         for ( Server server : request.getServers() )
         {
+            server = server.clone();
+
             try
             {
-                server = server.withPassword( decrypt( server.getPassword() ) );
+                server.setPassword( decrypt( server.getPassword() ) );
             }
             catch ( SecDispatcherException e )
             {
@@ -73,7 +75,7 @@ public SettingsDecryptionResult decrypt( SettingsDecryptionRequest request )
 
             try
             {
-                server = server.withPassphrase( decrypt( server.getPassphrase() ) );
+                server.setPassphrase( decrypt( server.getPassphrase() ) );
             }
             catch ( SecDispatcherException e )
             {
@@ -90,7 +92,7 @@ public SettingsDecryptionResult decrypt( SettingsDecryptionRequest request )
         {
             try
             {
-                proxy = proxy.withPassword( decrypt( proxy.getPassword() ) );
+                proxy.setPassword( decrypt( proxy.getPassword() ) );
             }
             catch ( SecDispatcherException e )
             {
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecryptionRequest.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecryptionRequest.java
index 4281a6c8c8e4..9cb49ac40da2 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecryptionRequest.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecryptionRequest.java
@@ -23,9 +23,9 @@
 import java.util.Arrays;
 import java.util.List;
 
-import org.apache.maven.api.settings.Proxy;
-import org.apache.maven.api.settings.Server;
-import org.apache.maven.api.settings.Settings;
+import org.apache.maven.settings.Proxy;
+import org.apache.maven.settings.Server;
+import org.apache.maven.settings.Settings;
 
 /**
  * Collects parameters that control the decryption of settings.
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecryptionResult.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecryptionResult.java
index d52f126960cc..ccdad196db25 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecryptionResult.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecryptionResult.java
@@ -22,8 +22,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.maven.api.settings.Proxy;
-import org.apache.maven.api.settings.Server;
+import org.apache.maven.settings.Proxy;
+import org.apache.maven.settings.Server;
 import org.apache.maven.settings.building.SettingsProblem;
 
 /**
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/SettingsDecryptionRequest.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/SettingsDecryptionRequest.java
index 33c61a6aef87..b344a99ed928 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/SettingsDecryptionRequest.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/SettingsDecryptionRequest.java
@@ -21,8 +21,8 @@
 
 import java.util.List;
 
-import org.apache.maven.api.settings.Proxy;
-import org.apache.maven.api.settings.Server;
+import org.apache.maven.settings.Proxy;
+import org.apache.maven.settings.Server;
 
 /**
  * Collects parameters that control the decryption of settings.
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/SettingsDecryptionResult.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/SettingsDecryptionResult.java
index a8d88b65b980..5b7b1f4b5a31 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/SettingsDecryptionResult.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/SettingsDecryptionResult.java
@@ -21,8 +21,8 @@
 
 import java.util.List;
 
-import org.apache.maven.api.settings.Proxy;
-import org.apache.maven.api.settings.Server;
+import org.apache.maven.settings.Proxy;
+import org.apache.maven.settings.Server;
 import org.apache.maven.settings.building.SettingsProblem;
 
 /**
diff --git a/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilder.java b/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilder.java
index 78d76f6afe83..ad82e753db1d 100644
--- a/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilder.java
+++ b/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilder.java
@@ -88,8 +88,8 @@ public ToolchainsBuildingResult build( ToolchainsBuildingRequest request )
             throw new ToolchainsBuildingException( problems.getProblems() );
         }
 
-
-        return new DefaultToolchainsBuildingResult( merged, problems.getProblems() );
+        return new DefaultToolchainsBuildingResult(
+                new org.apache.maven.toolchain.model.PersistedToolchains( merged ), problems.getProblems() );
     }
 
     private PersistedToolchains interpolate( PersistedToolchains toolchains, ProblemCollector problems )
diff --git a/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingResult.java b/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingResult.java
index c13ee8b65779..2d07a4a03c29 100644
--- a/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingResult.java
+++ b/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingResult.java
@@ -23,7 +23,7 @@
 import java.util.List;
 
 import org.apache.maven.building.Problem;
-import org.apache.maven.api.toolchain.PersistedToolchains;
+import org.apache.maven.toolchain.model.PersistedToolchains;
 
 /**
  * Holds the result of the merged toolchains and holds the problems during this build, if any.
diff --git a/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingResult.java b/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingResult.java
index 0d91812148db..f7c5f71554a8 100644
--- a/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingResult.java
+++ b/maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingResult.java
@@ -22,7 +22,7 @@
 import java.util.List;
 
 import org.apache.maven.building.Problem;
-import org.apache.maven.api.toolchain.PersistedToolchains;
+import org.apache.maven.toolchain.model.PersistedToolchains;
 
 /**
  * Collects the output of the toolchains builder.
diff --git a/maven-toolchain-builder/src/test/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilderTest.java b/maven-toolchain-builder/src/test/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilderTest.java
index 48a1bb579948..ef70b3420eca 100644
--- a/maven-toolchain-builder/src/test/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilderTest.java
+++ b/maven-toolchain-builder/src/test/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilderTest.java
@@ -39,7 +39,6 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Properties;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -240,7 +239,8 @@ public void testEnvironmentVariablesAreInterpolated()
         ToolchainsBuildingResult result = toolchainBuilder.build( request );
         String interpolatedValue = "testValue";
         assertEquals(interpolatedValue, result.getEffectiveToolchains().getToolchains().get(0).getProvides().get( "key" ) );
-        Xpp3Dom toolchainConfiguration = (Xpp3Dom) result.getEffectiveToolchains().getToolchains().get(0).getConfiguration();
+        org.codehaus.plexus.util.xml.Xpp3Dom toolchainConfiguration =
+                (org.codehaus.plexus.util.xml.Xpp3Dom) result.getEffectiveToolchains().getToolchains().get(0).getConfiguration();
         assertEquals(interpolatedValue, toolchainConfiguration.getChild("jdkHome").getValue());
         assertNotNull( result.getProblems() );
         assertEquals( 0, result.getProblems().size() );