diff --git a/config/src/main/kotlin/org/springframework/security/config/annotation/web/configurers/HeadersDsl.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/configurers/HeadersDsl.kt
index f615770be6a..10a98afd29f 100644
--- a/config/src/main/kotlin/org/springframework/security/config/annotation/web/configurers/HeadersDsl.kt
+++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/configurers/HeadersDsl.kt
@@ -17,7 +17,7 @@
 package org.springframework.security.config.annotation.web.configurers
 
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
-import org.springframework.security.config.web.servlet.headers.*
+import org.springframework.security.config.annotation.web.configurers.headers.*
 import org.springframework.security.web.header.HeaderWriter
 import org.springframework.security.web.header.writers.*
 import org.springframework.security.web.header.writers.frameoptions.XFrameOptionsHeaderWriter
diff --git a/config/src/main/kotlin/org/springframework/security/config/annotation/web/configurers/OAuth2ClientDsl.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/configurers/OAuth2ClientDsl.kt
index dc649d32758..b4f9661bee4 100644
--- a/config/src/main/kotlin/org/springframework/security/config/annotation/web/configurers/OAuth2ClientDsl.kt
+++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/configurers/OAuth2ClientDsl.kt
@@ -34,8 +34,8 @@ package org.springframework.security.config.annotation.web.configurers
 
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.configurers.oauth2.client.OAuth2ClientConfigurer
-import org.springframework.security.config.web.servlet.oauth2.client.AuthorizationCodeGrantDsl
-import org.springframework.security.config.web.servlet.oauth2.login.AuthorizationEndpointDsl
+import org.springframework.security.config.annotation.web.configurers.oauth2.client.AuthorizationCodeGrantDsl
+import org.springframework.security.config.annotation.web.configurers.oauth2.login.AuthorizationEndpointDsl
 import org.springframework.security.oauth2.client.OAuth2AuthorizedClientService
 import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository
 import org.springframework.security.oauth2.client.web.OAuth2AuthorizedClientRepository
diff --git a/config/src/main/kotlin/org/springframework/security/config/annotation/web/configurers/OAuth2LoginDsl.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/configurers/OAuth2LoginDsl.kt
index c11a463d273..23562ee7712 100644
--- a/config/src/main/kotlin/org/springframework/security/config/annotation/web/configurers/OAuth2LoginDsl.kt
+++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/configurers/OAuth2LoginDsl.kt
@@ -22,9 +22,9 @@ import org.springframework.security.config.annotation.web.HttpSecurityBuilder
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.configurers.oauth2.client.OAuth2LoginConfigurer
 import org.springframework.security.config.annotation.web.configurers.oauth2.login.TokenEndpointDsl
-import org.springframework.security.config.web.servlet.oauth2.login.AuthorizationEndpointDsl
-import org.springframework.security.config.web.servlet.oauth2.login.RedirectionEndpointDsl
-import org.springframework.security.config.web.servlet.oauth2.login.UserInfoEndpointDsl
+import org.springframework.security.config.annotation.web.configurers.oauth2.login.AuthorizationEndpointDsl
+import org.springframework.security.config.annotation.web.configurers.oauth2.login.RedirectionEndpointDsl
+import org.springframework.security.config.annotation.web.configurers.oauth2.login.UserInfoEndpointDsl
 import org.springframework.security.oauth2.client.OAuth2AuthorizedClientService
 import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository
 import org.springframework.security.oauth2.client.web.OAuth2AuthorizedClientRepository
diff --git a/config/src/main/kotlin/org/springframework/security/config/annotation/web/configurers/OAuth2ResourceServerDsl.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/configurers/OAuth2ResourceServerDsl.kt
index 29b8bbae369..e90156319a4 100644
--- a/config/src/main/kotlin/org/springframework/security/config/annotation/web/configurers/OAuth2ResourceServerDsl.kt
+++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/configurers/OAuth2ResourceServerDsl.kt
@@ -20,8 +20,8 @@ import jakarta.servlet.http.HttpServletRequest
 import org.springframework.security.authentication.AuthenticationManagerResolver
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.configurers.oauth2.server.resource.OAuth2ResourceServerConfigurer
-import org.springframework.security.config.web.servlet.oauth2.resourceserver.JwtDsl
-import org.springframework.security.config.web.servlet.oauth2.resourceserver.OpaqueTokenDsl
+import org.springframework.security.config.annotation.web.configurers.oauth2.resourceserver.JwtDsl
+import org.springframework.security.config.annotation.web.configurers.oauth2.resourceserver.OpaqueTokenDsl
 import org.springframework.security.oauth2.server.resource.web.BearerTokenResolver
 import org.springframework.security.web.AuthenticationEntryPoint
 import org.springframework.security.web.access.AccessDeniedHandler
diff --git a/config/src/main/kotlin/org/springframework/security/config/annotation/web/configurers/SessionManagementDsl.kt b/config/src/main/kotlin/org/springframework/security/config/annotation/web/configurers/SessionManagementDsl.kt
index f9bc507ec56..2a2e50fcd4a 100644
--- a/config/src/main/kotlin/org/springframework/security/config/annotation/web/configurers/SessionManagementDsl.kt
+++ b/config/src/main/kotlin/org/springframework/security/config/annotation/web/configurers/SessionManagementDsl.kt
@@ -18,8 +18,8 @@ package org.springframework.security.config.annotation.web.configurers
 
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.http.SessionCreationPolicy
-import org.springframework.security.config.web.servlet.session.SessionConcurrencyDsl
-import org.springframework.security.config.web.servlet.session.SessionFixationDsl
+import org.springframework.security.config.annotation.web.configurers.session.SessionConcurrencyDsl
+import org.springframework.security.config.annotation.web.configurers.session.SessionFixationDsl
 import org.springframework.security.web.authentication.AuthenticationFailureHandler
 import org.springframework.security.web.authentication.session.SessionAuthenticationStrategy
 import org.springframework.security.web.session.InvalidSessionStrategy