diff --git a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereMlContributorReplacement.kt b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereMlContributorReplacement.kt
index affb13989c0a..d20d3a9fd41f 100644
--- a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereMlContributorReplacement.kt
+++ b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereMlContributorReplacement.kt
@@ -13,7 +13,7 @@ interface SearchEverywhereMlContributorReplacement {
     val EP_NAME: ExtensionPointName<SearchEverywhereMlContributorReplacement> = ExtensionPointName.create(
       "com.intellij.searchEverywhereMlContributorReplacement")
 
-    var initEvent = WeakReference<AnActionEvent>(null)
+    var initEvent: WeakReference<AnActionEvent> = WeakReference<AnActionEvent>(null)
       private set
 
     @JvmStatic
diff --git a/plugins/kotlin/maven/BUILD.bazel b/plugins/kotlin/maven/BUILD.bazel
index e48c9a0b4f42..0f24802dae1a 100644
--- a/plugins/kotlin/maven/BUILD.bazel
+++ b/plugins/kotlin/maven/BUILD.bazel
@@ -37,6 +37,7 @@ jvm_library(
     "//plugins/kotlin/base/analysis",
     "//plugins/kotlin/base/code-insight",
     "//plugins/kotlin/base/statistics",
+    "//xml/xml-analysis-api:analysis",
     "//plugins/kotlin/code-insight/descriptions",
     "//plugins/kotlin/project-configuration",
     "//plugins/kotlin/formatter",
diff --git a/plugins/kotlin/maven/intellij.kotlin.maven.iml b/plugins/kotlin/maven/intellij.kotlin.maven.iml
index e47e039f2611..ca3e1d1666dc 100644
--- a/plugins/kotlin/maven/intellij.kotlin.maven.iml
+++ b/plugins/kotlin/maven/intellij.kotlin.maven.iml
@@ -31,6 +31,7 @@
     <orderEntry type="module" module-name="intellij.kotlin.base.analysis" />
     <orderEntry type="module" module-name="intellij.kotlin.base.codeInsight" />
     <orderEntry type="module" module-name="intellij.kotlin.base.statistics" />
+    <orderEntry type="module" module-name="intellij.xml.analysis" />
     <orderEntry type="module" module-name="intellij.kotlin.codeInsight.descriptions" />
     <orderEntry type="module" module-name="intellij.kotlin.projectConfiguration" />
     <orderEntry type="module" module-name="intellij.kotlin.formatter" />
diff --git a/plugins/maven/BUILD.bazel b/plugins/maven/BUILD.bazel
index 460a69f5c63a..a99df9e645dc 100644
--- a/plugins/maven/BUILD.bazel
+++ b/plugins/maven/BUILD.bazel
@@ -117,7 +117,6 @@ jvm_library(
   exports = [
     "//java/openapi:java",
     "//plugins/maven-server-api:maven-server",
-    "//xml/impl",
     "//xml/dom-openapi:dom",
     "//xml/dom-impl",
     "//java/compiler/openapi:java-compiler",
diff --git a/plugins/maven/intellij.maven.iml b/plugins/maven/intellij.maven.iml
index aae951e66d9f..50a2171569b3 100644
--- a/plugins/maven/intellij.maven.iml
+++ b/plugins/maven/intellij.maven.iml
@@ -28,7 +28,7 @@
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.ide.concurrency" />
     <orderEntry type="module" module-name="intellij.platform.refactoring" />
-    <orderEntry type="module" module-name="intellij.xml.impl" exported="" />
+    <orderEntry type="module" module-name="intellij.xml.impl" />
     <orderEntry type="module" module-name="intellij.platform.util.progress" />
     <orderEntry type="module" module-name="intellij.platform.usageView" />
     <orderEntry type="module" module-name="intellij.xml.dom" exported="" />
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/inspections/MavenNoRootDefinedInspection.kt b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/inspections/MavenNoRootDefinedInspection.kt
index 9d8b747c99af..058e17937f31 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/inspections/MavenNoRootDefinedInspection.kt
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/inspections/MavenNoRootDefinedInspection.kt
@@ -45,7 +45,7 @@ class MavenNoRootDefinedInspection : BasicDomElementsInspection<MavenDomProjectM
       val rootElement = model.rootElement ?: return null
       val psiToShowError = model.rootTag?.children?.takeWhile { it !is XmlTag && it !is XmlText } ?: return null
 
-      if (rootMavenProject.file.parent.toNioPath().resolve(".mvn").isDirectory()) return null;
+      if (rootMavenProject.file.parent.toNioPath().resolve(".mvn").isDirectory()) return null
       if (rootElement.modelVersion.stringValue == MODEL_VERSION_4_0_0) return null
       if (model.rootTag?.getAttributeValue("root")?.toBoolean() == true) {
         return null
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/inspections/MavenRedundantVersionInspection.kt b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/inspections/MavenRedundantVersionInspection.kt
index 64642fc21647..cfd86b625410 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/inspections/MavenRedundantVersionInspection.kt
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/inspections/MavenRedundantVersionInspection.kt
@@ -5,11 +5,10 @@ import com.intellij.openapi.project.Project
 import com.intellij.psi.xml.XmlFile
 import com.intellij.psi.xml.XmlTag
 import org.jetbrains.idea.maven.dom.model.MavenDomProjectModel
-import org.jetbrains.idea.maven.server.MavenDistribution
-
 
 class MavenRedundantVersionInspection : AbstractMavenRedundantParentInspection() {
-  override val elementName: String = "version"
+  override val elementName: String
+    get() = "version"
 
   override fun getShortName(): String = "MavenRedundantVersion"
 
diff --git a/plugins/maven/src/test/BUILD.bazel b/plugins/maven/src/test/BUILD.bazel
index fb0eefd477e0..dc930c9cd666 100644
--- a/plugins/maven/src/test/BUILD.bazel
+++ b/plugins/maven/src/test/BUILD.bazel
@@ -27,6 +27,7 @@ jvm_library(
     "//platform/core-api:core",
     "//platform/core-ui",
     "//platform/editor-ui-api:editor-ui",
+    "//xml/xml-analysis-api:analysis",
     "//platform/execution-impl",
     "//platform/external-system-impl:externalSystem-impl",
     "//jps/model-api:model",
@@ -79,6 +80,8 @@ jvm_library(
     "//libraries/hamcrest",
     "//platform/testFramework/eelJava",
     "//platform/eel-provider",
+    "//xml/xml-psi-impl:psi-impl",
+    "//xml/xml-ui-common:ui-common",
   ]
 )
 ### auto-generated section `build intellij.maven.tests` end
diff --git a/plugins/maven/src/test/intellij.maven.tests.iml b/plugins/maven/src/test/intellij.maven.tests.iml
index 2e343defadb2..2c22a16c74e3 100644
--- a/plugins/maven/src/test/intellij.maven.tests.iml
+++ b/plugins/maven/src/test/intellij.maven.tests.iml
@@ -15,6 +15,7 @@
     <orderEntry type="module" module-name="intellij.platform.core" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.xml.analysis" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.execution.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.externalSystem.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.jps.model" scope="TEST" />
@@ -61,5 +62,7 @@
     <orderEntry type="module" module-name="intellij.libraries.hamcrest" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.testFramework.eelJava" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.eel.provider" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.xml.psi.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.xml.ui.common" scope="TEST" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/maven/testFramework/BUILD.bazel b/plugins/maven/testFramework/BUILD.bazel
index f6d6aef314b9..7586cc66752d 100644
--- a/plugins/maven/testFramework/BUILD.bazel
+++ b/plugins/maven/testFramework/BUILD.bazel
@@ -36,6 +36,7 @@ jvm_library(
     "//platform/testFramework/eelJava",
     "//platform/eel-provider",
     "//platform/util/progress",
+    "//xml/xml-analysis-impl:analysis-impl",
   ]
 )
 ### auto-generated section `build intellij.maven.testFramework` end
\ No newline at end of file
diff --git a/plugins/maven/testFramework/intellij.maven.testFramework.iml b/plugins/maven/testFramework/intellij.maven.testFramework.iml
index 99fa53b54137..dcf8f288b360 100644
--- a/plugins/maven/testFramework/intellij.maven.testFramework.iml
+++ b/plugins/maven/testFramework/intellij.maven.testFramework.iml
@@ -53,5 +53,6 @@
     <orderEntry type="module" module-name="intellij.platform.testFramework.eelJava" />
     <orderEntry type="module" module-name="intellij.platform.eel.provider" />
     <orderEntry type="module" module-name="intellij.platform.util.progress" />
+    <orderEntry type="module" module-name="intellij.xml.analysis.impl" />
   </component>
 </module>
\ No newline at end of file
diff --git a/xml/impl/src/com/intellij/codeInsight/hint/api/impls/XmlParameterInfoHandler.java b/xml/impl/src/com/intellij/codeInsight/hint/api/impls/XmlParameterInfoHandler.java
index 8c9936de95b8..5df68ab71511 100644
--- a/xml/impl/src/com/intellij/codeInsight/hint/api/impls/XmlParameterInfoHandler.java
+++ b/xml/impl/src/com/intellij/codeInsight/hint/api/impls/XmlParameterInfoHandler.java
@@ -24,10 +24,7 @@ import org.jetbrains.annotations.Nullable;
 import java.util.Arrays;
 import java.util.Comparator;
 
-/**
- * @author Maxim.Mossienko
- */
-public class XmlParameterInfoHandler implements ParameterInfoHandler<XmlTag,XmlElementDescriptor> {
+public final class XmlParameterInfoHandler implements ParameterInfoHandler<XmlTag,XmlElementDescriptor> {
   private static final Comparator<XmlAttributeDescriptor> COMPARATOR = Comparator.comparing(PsiMetaData::getName);
 
   public static XmlAttributeDescriptor[] getSortedDescriptors(final XmlElementDescriptor p) {
diff --git a/xml/impl/src/com/intellij/lang/xml/XmlWordCompletionFilter.java b/xml/impl/src/com/intellij/lang/xml/XmlWordCompletionFilter.java
index 1921d634d736..86ac3541fe44 100644
--- a/xml/impl/src/com/intellij/lang/xml/XmlWordCompletionFilter.java
+++ b/xml/impl/src/com/intellij/lang/xml/XmlWordCompletionFilter.java
@@ -11,9 +11,8 @@ import com.intellij.psi.tree.TokenSet;
 import com.intellij.psi.xml.XmlElementType;
 import com.intellij.psi.xml.XmlTokenType;
 
-public class XmlWordCompletionFilter extends DefaultWordCompletionFilter {
-  private static final TokenSet ENABLED_TOKENS = TokenSet.create(XmlElementType.XML_CDATA,
-                                                                 XmlTokenType.XML_DATA_CHARACTERS);
+final class XmlWordCompletionFilter extends DefaultWordCompletionFilter {
+  private static final TokenSet ENABLED_TOKENS = TokenSet.create(XmlElementType.XML_CDATA, XmlTokenType.XML_DATA_CHARACTERS);
   @Override
   public boolean isWordCompletionEnabledIn(final IElementType element) {
     return super.isWordCompletionEnabledIn(element) || ENABLED_TOKENS.contains(element);
diff --git a/xml/xml-analysis-api/src/com/intellij/codeInspection/XmlSuppressableInspectionTool.java b/xml/xml-analysis-api/src/com/intellij/codeInspection/XmlSuppressableInspectionTool.java
index e46da3b7c3c1..1d604f2a426c 100644
--- a/xml/xml-analysis-api/src/com/intellij/codeInspection/XmlSuppressableInspectionTool.java
+++ b/xml/xml-analysis-api/src/com/intellij/codeInspection/XmlSuppressableInspectionTool.java
@@ -1,5 +1,4 @@
 // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-
 package com.intellij.codeInspection;
 
 import com.intellij.openapi.project.Project;
@@ -135,7 +134,7 @@ public abstract class XmlSuppressableInspectionTool extends LocalInspectionTool
     }
   }
 
-  public static class SuppressAllForFile extends SuppressForFile {
+  public static final class SuppressAllForFile extends SuppressForFile {
     public SuppressAllForFile(XmlSuppressionProvider provider) {
       super(ALL, provider);
     }
diff --git a/xml/xml-ui-common/src/com/intellij/psi/formatter/MarkupLineWrapPositionStrategy.java b/xml/xml-ui-common/src/com/intellij/psi/formatter/MarkupLineWrapPositionStrategy.java
index bf603f6ab31c..745887b50c19 100644
--- a/xml/xml-ui-common/src/com/intellij/psi/formatter/MarkupLineWrapPositionStrategy.java
+++ b/xml/xml-ui-common/src/com/intellij/psi/formatter/MarkupLineWrapPositionStrategy.java
@@ -28,8 +28,7 @@ import org.jetbrains.annotations.Nullable;
 /**
  * {@link LineWrapPositionStrategy} for markup languages like XML, HTML etc.
  */
-public class MarkupLineWrapPositionStrategy extends PsiAwareDefaultLineWrapPositionStrategy {
-
+public final class MarkupLineWrapPositionStrategy extends PsiAwareDefaultLineWrapPositionStrategy {
   private static final IElementType[] TEXT_TOKENS = IElementType.enumerate(
     t -> t == XmlElementType.XML_TEXT ||
          t == XmlTokenType.XML_COMMENT_CHARACTERS ||