diff --git a/access/spring-security-access.gradle b/access/spring-security-access.gradle
index ff53b8d766..355bac90b2 100644
--- a/access/spring-security-access.gradle
+++ b/access/spring-security-access.gradle
@@ -11,6 +11,8 @@ dependencies {
 	api 'org.springframework:spring-expression'
 	api 'io.micrometer:micrometer-observation'
 
+	optional project(':spring-security-messaging')
+	optional 'org.springframework:spring-websocket'
 	optional 'com.fasterxml.jackson.core:jackson-databind'
 	optional 'io.micrometer:context-propagation'
 	optional 'io.projectreactor:reactor-core'
diff --git a/messaging/src/main/java/org/springframework/security/messaging/access/expression/EvaluationContextPostProcessor.java b/access/src/main/java/org/springframework/security/messaging/access/expression/EvaluationContextPostProcessor.java
similarity index 100%
rename from messaging/src/main/java/org/springframework/security/messaging/access/expression/EvaluationContextPostProcessor.java
rename to access/src/main/java/org/springframework/security/messaging/access/expression/EvaluationContextPostProcessor.java
diff --git a/messaging/src/main/java/org/springframework/security/messaging/access/expression/ExpressionBasedMessageSecurityMetadataSourceFactory.java b/access/src/main/java/org/springframework/security/messaging/access/expression/ExpressionBasedMessageSecurityMetadataSourceFactory.java
similarity index 100%
rename from messaging/src/main/java/org/springframework/security/messaging/access/expression/ExpressionBasedMessageSecurityMetadataSourceFactory.java
rename to access/src/main/java/org/springframework/security/messaging/access/expression/ExpressionBasedMessageSecurityMetadataSourceFactory.java
diff --git a/messaging/src/main/java/org/springframework/security/messaging/access/expression/MessageExpressionConfigAttribute.java b/access/src/main/java/org/springframework/security/messaging/access/expression/MessageExpressionConfigAttribute.java
similarity index 100%
rename from messaging/src/main/java/org/springframework/security/messaging/access/expression/MessageExpressionConfigAttribute.java
rename to access/src/main/java/org/springframework/security/messaging/access/expression/MessageExpressionConfigAttribute.java
diff --git a/messaging/src/main/java/org/springframework/security/messaging/access/expression/MessageExpressionVoter.java b/access/src/main/java/org/springframework/security/messaging/access/expression/MessageExpressionVoter.java
similarity index 100%
rename from messaging/src/main/java/org/springframework/security/messaging/access/expression/MessageExpressionVoter.java
rename to access/src/main/java/org/springframework/security/messaging/access/expression/MessageExpressionVoter.java
diff --git a/messaging/src/main/java/org/springframework/security/messaging/access/intercept/ChannelSecurityInterceptor.java b/access/src/main/java/org/springframework/security/messaging/access/intercept/ChannelSecurityInterceptor.java
similarity index 98%
rename from messaging/src/main/java/org/springframework/security/messaging/access/intercept/ChannelSecurityInterceptor.java
rename to access/src/main/java/org/springframework/security/messaging/access/intercept/ChannelSecurityInterceptor.java
index d4863b6919..9e6fc2aae6 100644
--- a/messaging/src/main/java/org/springframework/security/messaging/access/intercept/ChannelSecurityInterceptor.java
+++ b/access/src/main/java/org/springframework/security/messaging/access/intercept/ChannelSecurityInterceptor.java
@@ -38,7 +38,7 @@ import org.springframework.util.Assert;
  *
  * @author Rob Winch
  * @since 4.0
- * @deprecated Use {@link AuthorizationChannelInterceptor} instead
+ * @deprecated Use {@code AuthorizationChannelInterceptor} instead
  */
 @Deprecated
 public final class ChannelSecurityInterceptor extends AbstractSecurityInterceptor implements ChannelInterceptor {
diff --git a/messaging/src/main/java/org/springframework/security/messaging/access/intercept/DefaultMessageSecurityMetadataSource.java b/access/src/main/java/org/springframework/security/messaging/access/intercept/DefaultMessageSecurityMetadataSource.java
similarity index 100%
rename from messaging/src/main/java/org/springframework/security/messaging/access/intercept/DefaultMessageSecurityMetadataSource.java
rename to access/src/main/java/org/springframework/security/messaging/access/intercept/DefaultMessageSecurityMetadataSource.java
diff --git a/messaging/src/main/java/org/springframework/security/messaging/access/intercept/MessageSecurityMetadataSource.java b/access/src/main/java/org/springframework/security/messaging/access/intercept/MessageSecurityMetadataSource.java
similarity index 100%
rename from messaging/src/main/java/org/springframework/security/messaging/access/intercept/MessageSecurityMetadataSource.java
rename to access/src/main/java/org/springframework/security/messaging/access/intercept/MessageSecurityMetadataSource.java
diff --git a/messaging/src/test/java/org/springframework/security/messaging/access/expression/ExpressionBasedMessageSecurityMetadataSourceFactoryTests.java b/access/src/test/java/org/springframework/security/messaging/access/expression/ExpressionBasedMessageSecurityMetadataSourceFactoryTests.java
similarity index 100%
rename from messaging/src/test/java/org/springframework/security/messaging/access/expression/ExpressionBasedMessageSecurityMetadataSourceFactoryTests.java
rename to access/src/test/java/org/springframework/security/messaging/access/expression/ExpressionBasedMessageSecurityMetadataSourceFactoryTests.java
diff --git a/messaging/src/test/java/org/springframework/security/messaging/access/expression/MessageExpressionConfigAttributeTests.java b/access/src/test/java/org/springframework/security/messaging/access/expression/MessageExpressionConfigAttributeTests.java
similarity index 100%
rename from messaging/src/test/java/org/springframework/security/messaging/access/expression/MessageExpressionConfigAttributeTests.java
rename to access/src/test/java/org/springframework/security/messaging/access/expression/MessageExpressionConfigAttributeTests.java
diff --git a/messaging/src/test/java/org/springframework/security/messaging/access/expression/MessageExpressionVoterTests.java b/access/src/test/java/org/springframework/security/messaging/access/expression/MessageExpressionVoterTests.java
similarity index 100%
rename from messaging/src/test/java/org/springframework/security/messaging/access/expression/MessageExpressionVoterTests.java
rename to access/src/test/java/org/springframework/security/messaging/access/expression/MessageExpressionVoterTests.java
diff --git a/messaging/src/test/java/org/springframework/security/messaging/access/intercept/ChannelSecurityInterceptorTests.java b/access/src/test/java/org/springframework/security/messaging/access/intercept/ChannelSecurityInterceptorTests.java
similarity index 100%
rename from messaging/src/test/java/org/springframework/security/messaging/access/intercept/ChannelSecurityInterceptorTests.java
rename to access/src/test/java/org/springframework/security/messaging/access/intercept/ChannelSecurityInterceptorTests.java
diff --git a/messaging/src/test/java/org/springframework/security/messaging/access/intercept/DefaultMessageSecurityMetadataSourceTests.java b/access/src/test/java/org/springframework/security/messaging/access/intercept/DefaultMessageSecurityMetadataSourceTests.java
similarity index 100%
rename from messaging/src/test/java/org/springframework/security/messaging/access/intercept/DefaultMessageSecurityMetadataSourceTests.java
rename to access/src/test/java/org/springframework/security/messaging/access/intercept/DefaultMessageSecurityMetadataSourceTests.java
diff --git a/messaging/spring-security-messaging.gradle b/messaging/spring-security-messaging.gradle
index 044afa0ba0..c231057267 100644
--- a/messaging/spring-security-messaging.gradle
+++ b/messaging/spring-security-messaging.gradle
@@ -13,7 +13,6 @@ dependencies {
 	api 'org.springframework:spring-expression'
 	api 'org.springframework:spring-messaging'
 
-	optional project(':spring-security-access')
 	optional project(':spring-security-web')
 	optional 'org.springframework:spring-websocket'
 	optional 'io.projectreactor:reactor-core'