diff --git a/java/java-psi-impl/src/com/intellij/psi/util/JavaPsiReferenceUtil.java b/java/codeserver/core/src/com/intellij/java/codeserver/core/JavaPsiReferenceUtil.java
similarity index 93%
rename from java/java-psi-impl/src/com/intellij/psi/util/JavaPsiReferenceUtil.java
rename to java/codeserver/core/src/com/intellij/java/codeserver/core/JavaPsiReferenceUtil.java
index 84bbb5c82582..1bd0b1e059fa 100644
--- a/java/java-psi-impl/src/com/intellij/psi/util/JavaPsiReferenceUtil.java
+++ b/java/codeserver/core/src/com/intellij/java/codeserver/core/JavaPsiReferenceUtil.java
@@ -1,11 +1,16 @@
 // 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.psi.util;
+package com.intellij.java.codeserver.core;
 
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.*;
+import com.intellij.psi.util.PsiTreeUtil;
+import com.intellij.psi.util.PsiUtil;
 import com.intellij.util.ThreeState;
 import org.jetbrains.annotations.NotNull;
 
+/**
+ * Utility methods related to references in Java sources
+ */
 public final class JavaPsiReferenceUtil {
   private JavaPsiReferenceUtil() { }
 
@@ -67,7 +72,7 @@ public final class JavaPsiReferenceUtil {
   /**
    * @return field that has initializer with this element as subexpression or null if not found
    */
-  static PsiField findEnclosingFieldInitializer(@NotNull PsiElement entry) {
+  private static PsiField findEnclosingFieldInitializer(@NotNull PsiElement entry) {
     PsiElement element = entry;
     while (element != null) {
       PsiElement parent = element.getParent();
@@ -84,7 +89,7 @@ public final class JavaPsiReferenceUtil {
   private static PsiClassInitializer findParentClassInitializer(@NotNull PsiElement root) {
     PsiElement element = root;
     while (element != null) {
-      if (element instanceof PsiClassInitializer) return (PsiClassInitializer)element;
+      if (element instanceof PsiClassInitializer initializer) return initializer;
       if (element instanceof PsiClass || element instanceof PsiMethod) return null;
       element = element.getParent();
     }
diff --git a/java/codeserver/highlighting/src/com/intellij/java/codeserver/highlighting/ExpressionChecker.java b/java/codeserver/highlighting/src/com/intellij/java/codeserver/highlighting/ExpressionChecker.java
index d62e9dea87ac..c91737ca94ec 100644
--- a/java/codeserver/highlighting/src/com/intellij/java/codeserver/highlighting/ExpressionChecker.java
+++ b/java/codeserver/highlighting/src/com/intellij/java/codeserver/highlighting/ExpressionChecker.java
@@ -3,6 +3,7 @@ package com.intellij.java.codeserver.highlighting;
 
 import com.intellij.codeInsight.ExceptionUtil;
 import com.intellij.core.JavaPsiBundle;
+import com.intellij.java.codeserver.core.JavaPsiReferenceUtil;
 import com.intellij.java.codeserver.highlighting.errors.*;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleUtilCore;
diff --git a/java/java-analysis-impl/src/com/siyeh/ig/psiutils/ExpressionUtils.java b/java/java-analysis-impl/src/com/siyeh/ig/psiutils/ExpressionUtils.java
index 9c3cdd862bc1..1ae93212eab6 100644
--- a/java/java-analysis-impl/src/com/siyeh/ig/psiutils/ExpressionUtils.java
+++ b/java/java-analysis-impl/src/com/siyeh/ig/psiutils/ExpressionUtils.java
@@ -6,6 +6,8 @@ import com.intellij.codeInsight.CodeInsightUtilCore;
 import com.intellij.codeInspection.dataFlow.ContractReturnValue;
 import com.intellij.codeInspection.dataFlow.JavaMethodContractUtil;
 import com.intellij.codeInspection.dataFlow.MutationSignature;
+import com.intellij.java.codeserver.core.JavaPsiReferenceUtil;
+import com.intellij.java.codeserver.core.JavaPsiReferenceUtil.ForwardReferenceProblem;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.util.TextRange;
@@ -18,7 +20,6 @@ import com.intellij.psi.impl.source.tree.TreeElement;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.util.*;
 import com.intellij.psi.util.InheritanceUtil;
-import com.intellij.psi.util.JavaPsiReferenceUtil.ForwardReferenceProblem;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.containers.ContainerUtil;
 import com.siyeh.HardcodedMethodConstants;
diff --git a/java/java-analysis-impl/src/com/siyeh/ig/style/UnnecessaryThisInspection.java b/java/java-analysis-impl/src/com/siyeh/ig/style/UnnecessaryThisInspection.java
index 01c50a05aef9..fcb53c8a4433 100644
--- a/java/java-analysis-impl/src/com/siyeh/ig/style/UnnecessaryThisInspection.java
+++ b/java/java-analysis-impl/src/com/siyeh/ig/style/UnnecessaryThisInspection.java
@@ -18,12 +18,12 @@ package com.siyeh.ig.style;
 import com.intellij.codeInspection.CleanupLocalInspectionTool;
 import com.intellij.codeInspection.LocalQuickFix;
 import com.intellij.codeInspection.options.OptPane;
+import com.intellij.java.codeserver.core.JavaPsiReferenceUtil;
+import com.intellij.java.codeserver.core.JavaPsiReferenceUtil.ForwardReferenceProblem;
 import com.intellij.modcommand.ModPsiUpdater;
 import com.intellij.modcommand.PsiUpdateModCommandQuickFix;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.*;
-import com.intellij.psi.util.JavaPsiReferenceUtil;
-import com.intellij.psi.util.JavaPsiReferenceUtil.ForwardReferenceProblem;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.util.PsiUtil;
 import com.siyeh.InspectionGadgetsBundle;