diff --git a/java/compiler/impl/resources/intellij.java.compiler.impl.xml b/java/compiler/impl/resources/intellij.java.compiler.impl.xml
index 71a266d6a85c..9f9bbfd17bf4 100644
--- a/java/compiler/impl/resources/intellij.java.compiler.impl.xml
+++ b/java/compiler/impl/resources/intellij.java.compiler.impl.xml
@@ -28,4 +28,34 @@
     <plugin id="com.intellij.modules.java-capable"/>
 
   </dependencies>
+
+  <extensionPoints>
+    <extensionPoint qualifiedName="com.intellij.languageCompilerRefAdapter"
+                    interface="com.intellij.compiler.backwardRefs.LanguageCompilerRefAdapter" dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.compiler.isUpToDateCheckConsumer"
+                    interface="com.intellij.compiler.backwardRefs.IsUpToDateCheckConsumer" dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.languageCompilerRefAdapter.directInheritorProvider" area="IDEA_PROJECT"
+                    interface="com.intellij.compiler.backwardRefs.DirectInheritorProvider" dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.compiler.buildTargetScopeProvider"
+                    interface="com.intellij.compiler.impl.BuildTargetScopeProvider" dynamic="true"/>
+
+    <extensionPoint qualifiedName="com.intellij.compiler.optionsManager"
+                    interface="com.intellij.compiler.options.CompilerOptionsFilter" dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.compiler.task" area="IDEA_PROJECT" beanClass="com.intellij.compiler.CompileTaskBean"
+                    dynamic="true">
+      <with attribute="implementation" implements="com.intellij.openapi.compiler.CompileTask"/>
+    </extensionPoint>
+    <extensionPoint qualifiedName="com.intellij.compileServer.plugin" beanClass="com.intellij.compiler.server.CompileServerPlugin"
+                    dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.buildProcess.parametersProvider" area="IDEA_PROJECT"
+                    interface="com.intellij.compiler.server.BuildProcessParametersProvider" dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.compiler.buildIssueContributor" dynamic="true"
+                    interface="com.intellij.compiler.progress.BuildIssueContributor"/>
+    <extensionPoint qualifiedName="com.intellij.java.compiler" area="IDEA_PROJECT"
+                    interface="com.intellij.compiler.impl.javaCompiler.BackendCompiler" dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.compiler.updateResourcesBuildContributor"
+                    interface="com.intellij.compiler.impl.UpdateResourcesBuildContributor" dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.jpsServerAuthExtension"
+                    interface="com.intellij.compiler.cache.client.JpsServerAuthExtension" dynamic="true"/>
+  </extensionPoints>
 </idea-plugin>
diff --git a/java/compiler/openapi/resources/intellij.java.compiler.xml b/java/compiler/openapi/resources/intellij.java.compiler.xml
index cb203fef1e9f..8843c3080112 100644
--- a/java/compiler/openapi/resources/intellij.java.compiler.xml
+++ b/java/compiler/openapi/resources/intellij.java.compiler.xml
@@ -15,4 +15,26 @@
     <plugin id="com.intellij.modules.java-capable"/>
 
   </dependencies>
+
+  <extensionPoints>
+    <extensionPoint qualifiedName="com.intellij.packaging.elementType" interface="com.intellij.packaging.elements.PackagingElementType"
+                    dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.packaging.artifactPropertiesProvider"
+                    interface="com.intellij.packaging.artifacts.ArtifactPropertiesProvider" dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.packaging.sourceItemProvider"
+                    interface="com.intellij.packaging.ui.PackagingSourceItemsProvider" dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.packaging.sourceItemFilter" interface="com.intellij.packaging.ui.PackagingSourceItemFilter"
+                    dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.packaging.artifactType" interface="com.intellij.packaging.artifacts.ArtifactType"
+                    dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.compiler" area="IDEA_PROJECT" interface="com.intellij.openapi.compiler.Compiler"
+                    dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.compilerFactory" area="IDEA_PROJECT"
+                    interface="com.intellij.openapi.compiler.CompilerFactory" dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.compilableFileTypesProvider" area="IDEA_PROJECT"
+                    interface="com.intellij.openapi.compiler.CompilableFileTypesProvider" dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.compiler.inspectionValidator"
+                    interface="com.intellij.openapi.compiler.util.InspectionValidator"
+                    area="IDEA_PROJECT" dynamic="true"/>
+  </extensionPoints>
 </idea-plugin>
diff --git a/java/execution/impl/resources/intellij.java.execution.impl.xml b/java/execution/impl/resources/intellij.java.execution.impl.xml
index 711e58687535..b6fc5f56586d 100644
--- a/java/execution/impl/resources/intellij.java.execution.impl.xml
+++ b/java/execution/impl/resources/intellij.java.execution.impl.xml
@@ -32,4 +32,13 @@
     <module name="intellij.platform.backend"/>
 
   </dependencies>
+
+  <extensionPoints>
+    <extensionPoint qualifiedName="com.intellij.runConfigurationExtension" interface="com.intellij.execution.RunConfigurationExtension"
+                    dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.jreProvider" interface="com.intellij.execution.ui.JreProvider" dynamic="true"/>
+
+    <extensionPoint qualifiedName="com.intellij.threadDumpProvider"
+                    interface="com.intellij.execution.impl.ThreadDumpProvider" dynamic="true"/>
+  </extensionPoints>
 </idea-plugin>
diff --git a/java/execution/openapi/resources/intellij.java.execution.xml b/java/execution/openapi/resources/intellij.java.execution.xml
index cec8c947bf8c..9279497c11bf 100644
--- a/java/execution/openapi/resources/intellij.java.execution.xml
+++ b/java/execution/openapi/resources/intellij.java.execution.xml
@@ -16,4 +16,24 @@
     <plugin id="com.intellij.modules.java-capable"/>
 
   </dependencies>
+
+  <extensionPoints>
+    <extensionPoint qualifiedName="com.intellij.exceptionFilter" interface="com.intellij.execution.filters.ExceptionFilterFactory"
+                    dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.java.programPatcher"
+                    interface="com.intellij.execution.runners.JavaProgramPatcher" dynamic="true"/>
+
+    <extensionPoint qualifiedName="com.intellij.java.consoleDecorator"
+                    interface="com.intellij.execution.application.JavaConsoleDecorator" dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.junitPatcher"
+                    interface="com.intellij.execution.JUnitPatcher" dynamic="true"/>
+
+    <extensionPoint qualifiedName="com.intellij.junitRecognizer"
+                    interface="com.intellij.execution.JUnitRecognizer" dynamic="true"/>
+    <!-- See com.intellij.execution.filters.ExceptionFilter -->
+    <extensionPoint qualifiedName="com.intellij.jvm.exceptionFilter" interface="com.intellij.execution.filters.JvmExceptionOccurrenceFilter"
+                    dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.execution.applicationRunLineMarkerHider"
+                    interface="com.intellij.execution.ApplicationRunLineMarkerHider" dynamic="true"/>
+  </extensionPoints>
 </idea-plugin>
diff --git a/java/idea-ui/resources/intellij.java.ui.xml b/java/idea-ui/resources/intellij.java.ui.xml
index 34b0a324d5cc..887f5e4d62c3 100644
--- a/java/idea-ui/resources/intellij.java.ui.xml
+++ b/java/idea-ui/resources/intellij.java.ui.xml
@@ -34,4 +34,47 @@
     <!--<module name="intellij.platform.backend"/>-->
 
   </dependencies>
+
+  <extensionPoints>
+    <extensionPoint qualifiedName="com.intellij.disableCompilationDependenciesResolutionTask"
+                    interface="com.intellij.jarRepository.DisableCompilationDependenciesResolutionTask"
+                    dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.framework.type" interface="com.intellij.framework.FrameworkTypeEx" dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.sdkEditorAdditionalOptionsProvider"
+                    interface="com.intellij.openapi.SdkEditorAdditionalOptionsProvider" dynamic="true"/>
+
+    <extensionPoint qualifiedName="com.intellij.frameworkSupportCommunicator"
+                    interface="com.intellij.ide.util.newProjectWizard.impl.FrameworkSupportCommunicator" dynamic="true"/>
+
+    <!--new project wizard-->
+    <extensionPoint qualifiedName="com.intellij.projectWizard.projectCategory" interface="com.intellij.ide.projectWizard.ProjectCategory"
+                    dynamic="true"/>
+
+    <!-- both EP implementation classes requires constructor injection (our plugins fixed, but 3rd-party not) -->
+    <extensionPoint qualifiedName="com.intellij.projectImportProvider" interface="com.intellij.projectImport.ProjectImportProvider"
+                    dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.projectImportBuilder" interface="com.intellij.projectImport.ProjectImportBuilder"
+                    dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.projectStructureDetector"
+                    interface="com.intellij.ide.util.projectWizard.importSources.ProjectStructureDetector" dynamic="true"/>
+
+    <extensionPoint qualifiedName="com.intellij.projectStructureConfigurableFilter"
+                    interface="com.intellij.openapi.roots.ui.configuration.ProjectStructureConfigurableFilter" dynamic="true"/>
+
+    <!--suppress PluginXmlValidity -->
+    <extensionPoint qualifiedName="com.intellij.configuration.ModuleStructureExtension" dynamic="true"
+                    interface="com.intellij.openapi.roots.ui.configuration.projectRoot.ModuleStructureExtension"/>
+
+    <extensionPoint qualifiedName="com.intellij.projectStructureValidator"
+                    interface="com.intellij.openapi.roots.ui.configuration.projectRoot.daemon.ProjectStructureValidator" dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.library.javaSourceRootDetector"
+                    interface="com.intellij.openapi.roots.libraries.ui.RootDetector" dynamic="true"/>
+
+    <extensionPoint qualifiedName="com.intellij.starter.moduleImporter" interface="com.intellij.ide.starters.StarterModuleImporter"
+                    dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.newProjectWizard.java.buildSystem"
+                    interface="com.intellij.ide.projectWizard.generators.BuildSystemJavaNewProjectWizard" dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.jarRepositoryAuthenticationDataProvider"
+                    interface="com.intellij.jarRepository.JarRepositoryAuthenticationDataProvider" dynamic="true"/>
+  </extensionPoints>
 </idea-plugin>
diff --git a/java/java-analysis-api/resources/intellij.java.analysis.xml b/java/java-analysis-api/resources/intellij.java.analysis.xml
index 0e84264e2627..567238de4b1b 100644
--- a/java/java-analysis-api/resources/intellij.java.analysis.xml
+++ b/java/java-analysis-api/resources/intellij.java.analysis.xml
@@ -13,4 +13,11 @@
     <module name="intellij.platform.backend"/>
     <plugin id="com.intellij.modules.java-capable"/>
   </dependencies>
+
+  <extensionPoints>
+    <extensionPoint qualifiedName="com.intellij.unusedDeclarationFixProvider"
+                    interface="com.intellij.codeInspection.reference.UnusedDeclarationFixProvider" dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.lang.jvm.actions.jvmElementActionsFactory" interface="com.intellij.lang.jvm.actions.JvmElementActionsFactory" dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.codeInsight.changeVariableTypeQuickFixProvider" interface="com.intellij.codeInsight.quickfix.ChangeVariableTypeQuickFixProvider" dynamic="true"/>
+  </extensionPoints>
 </idea-plugin>
diff --git a/java/java-analysis-impl/resources/intellij.java.analysis.impl.xml b/java/java-analysis-impl/resources/intellij.java.analysis.impl.xml
index 68293275bcf1..9585fc0a6b1d 100644
--- a/java/java-analysis-impl/resources/intellij.java.analysis.impl.xml
+++ b/java/java-analysis-impl/resources/intellij.java.analysis.impl.xml
@@ -26,4 +26,28 @@
     <module name="intellij.platform.backend"/>
     <plugin id="com.intellij.modules.java-capable"/>
   </dependencies>
+
+  <extensionPoints>
+    <extensionPoint qualifiedName="com.intellij.deadCode"
+                    interface="com.intellij.codeInspection.reference.EntryPoint" dynamic="true"/>
+
+    <!-- See com.intellij.codeInspection.visibility.VisibilityInspection -->
+    <extensionPoint qualifiedName="com.intellij.visibility" interface="com.intellij.codeInspection.visibility.VisibilityExtension" dynamic="true"/>
+
+    <extensionPoint qualifiedName="com.intellij.java.errorFixProvider" dynamic="true"
+                    interface="com.intellij.codeInsight.daemon.impl.analysis.JavaErrorFixProvider"/>
+
+    <extensionPoint qualifiedName="com.intellij.allowedApiFilter" interface="com.intellij.psi.impl.AllowedApiFilterExtension" dynamic="true"/>
+
+    <extensionPoint qualifiedName="com.intellij.canBeFinal" interface="com.intellij.codeInspection.canBeFinal.CanBeFinalHandler" dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.codeInsight.implicitSubclassProvider" interface="com.intellij.codeInspection.inheritance.ImplicitSubclassProvider" dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.lang.jvm.ignoreVariableCanBeFinalSupport" interface="com.intellij.codeInspection.localCanBeFinal.IgnoreVariableCanBeFinalSupport" dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.javaLanguageLevelPusherCustomizer" interface="com.intellij.openapi.roots.impl.JavaLanguageLevelPusherCustomizer" dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.propertyAccessorDetector" interface="com.intellij.psi.util.PropertyAccessorDetector" dynamic="true"/>
+
+    <extensionPoint qualifiedName="com.intellij.injectedLanguageJavaReferenceSupplier"
+                    beanClass="com.intellij.codeInsight.daemon.impl.analysis.InjectedLanguageJavaReferenceSupplier" dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.lang.jvm.bytecodeAnalysisSuppressor"
+                    interface="com.intellij.codeInspection.bytecodeAnalysis.BytecodeAnalysisSuppressor" dynamic="true"/>
+  </extensionPoints>
 </idea-plugin>
diff --git a/java/java-backend/resources/META-INF/JavaAnalysisPlugin.xml b/java/java-backend/resources/META-INF/JavaAnalysisPlugin.xml
index d05648e9d02d..589debe78443 100644
--- a/java/java-backend/resources/META-INF/JavaAnalysisPlugin.xml
+++ b/java/java-backend/resources/META-INF/JavaAnalysisPlugin.xml
@@ -16,36 +16,6 @@
 <idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
   <xi:include href="/META-INF/GlobalInspections.xml"/>
 
-  <extensionPoints>
-    <extensionPoint qualifiedName="com.intellij.deadCode"
-                    interface="com.intellij.codeInspection.reference.EntryPoint" dynamic="true"/>
-
-    <!-- See com.intellij.codeInspection.visibility.VisibilityInspection -->
-    <extensionPoint qualifiedName="com.intellij.visibility" interface="com.intellij.codeInspection.visibility.VisibilityExtension" dynamic="true"/>
-
-    <extensionPoint qualifiedName="com.intellij.java.errorFixProvider" dynamic="true" 
-                    interface="com.intellij.codeInsight.daemon.impl.analysis.JavaErrorFixProvider"/>
-
-    <extensionPoint qualifiedName="com.intellij.lang.jvm.actions.jvmElementActionsFactory" interface="com.intellij.lang.jvm.actions.JvmElementActionsFactory" dynamic="true"/>
-
-    <extensionPoint qualifiedName="com.intellij.allowedApiFilter" interface="com.intellij.psi.impl.AllowedApiFilterExtension" dynamic="true"/>
-
-    <extensionPoint qualifiedName="com.intellij.canBeFinal" interface="com.intellij.codeInspection.canBeFinal.CanBeFinalHandler" dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.codeInsight.implicitSubclassProvider" interface="com.intellij.codeInspection.inheritance.ImplicitSubclassProvider" dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.codeInsight.changeVariableTypeQuickFixProvider" interface="com.intellij.codeInsight.quickfix.ChangeVariableTypeQuickFixProvider" dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.lang.jvm.annotationPackageSupport" interface="com.intellij.codeInsight.annoPackages.AnnotationPackageSupport" dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.lang.jvm.ignoreAnnotationParamSupport" interface="com.intellij.codeInspection.DefaultAnnotationParamInspection$IgnoreAnnotationParamSupport" dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.lang.jvm.ignoreVariableCanBeFinalSupport" interface="com.intellij.codeInspection.localCanBeFinal.IgnoreVariableCanBeFinalSupport" dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.javaLanguageLevelPusherCustomizer" interface="com.intellij.openapi.roots.impl.JavaLanguageLevelPusherCustomizer" dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.propertyAccessorDetector" interface="com.intellij.psi.util.PropertyAccessorDetector" dynamic="true"/>
-
-    <extensionPoint qualifiedName="com.intellij.injectedLanguageJavaReferenceSupplier"
-                    beanClass="com.intellij.codeInsight.daemon.impl.analysis.InjectedLanguageJavaReferenceSupplier" dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.lang.jvm.annotations.marker.suppressor"
-                    interface="com.intellij.codeInsight.NonCodeAnnotationsMarkerSuppressor" dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.lang.jvm.bytecodeAnalysisSuppressor"
-                    interface="com.intellij.codeInspection.bytecodeAnalysis.BytecodeAnalysisSuppressor" dynamic="true"/>
-  </extensionPoints>
 
   <extensions defaultExtensionNs="com.intellij">
     <resolveScopeProvider implementation="com.intellij.psi.impl.file.impl.JavaResolveScopeProvider"/>
diff --git a/java/java-backend/resources/META-INF/JavaPlugin.xml b/java/java-backend/resources/META-INF/JavaPlugin.xml
index 9a097601a0aa..53f37b8c2bfd 100644
--- a/java/java-backend/resources/META-INF/JavaPlugin.xml
+++ b/java/java-backend/resources/META-INF/JavaPlugin.xml
@@ -24,128 +24,6 @@
   </projectListeners>
 
   <extensionPoints>
-    <extensionPoint qualifiedName="com.intellij.methodImplementor" interface="com.intellij.codeInsight.MethodImplementor" dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.javaExpressionSurrounder"
-                    interface="com.intellij.codeInsight.generation.surroundWith.JavaExpressionSurrounder" dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.unscrambleSupport" interface="com.intellij.unscramble.UnscrambleSupport" dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.java.refactoring.chainCallExtractor"
-                    interface="com.intellij.refactoring.chainCall.ChainCallExtractor" dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.java.inspection.bulkMethodInfo"
-                    interface="com.intellij.codeInspection.bulkOperation.BulkMethodInfoProvider" dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.java.externalAnnotation"
-                    interface="com.intellij.codeInsight.externalAnnotation.AnnotationProvider" dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.documentationDelegateProvider"
-                    interface="com.intellij.codeInsight.javadoc.DocumentationDelegateProvider" dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.codeInsight.externalLibraryResolver"
-                    interface="com.intellij.codeInsight.daemon.quickFix.ExternalLibraryResolver" dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.refactoring.moveClassHandler"
-                    interface="com.intellij.refactoring.move.moveClassesOrPackages.MoveClassHandler" dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.refactoring.moveAllClassesInFileHandler"
-                    interface="com.intellij.refactoring.move.moveClassesOrPackages.MoveAllClassesInFileHandler" dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.refactoring.moveClassToInnerHandler"
-                    interface="com.intellij.refactoring.move.moveClassesOrPackages.MoveClassToInnerHandler" dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.projectModelModifier" interface="com.intellij.openapi.roots.JavaProjectModelModifier"
-                    area="IDEA_PROJECT" dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.library.dependencyScopeSuggester"
-                    interface="com.intellij.openapi.roots.LibraryDependencyScopeSuggester" dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.getterSetterProvider"
-                    interface="com.intellij.codeInsight.generation.GetterSetterPrototypeProvider" dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.generation.toStringClassFilter"
-                    interface="org.jetbrains.generate.tostring.GenerateToStringClassFilter" dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.refactoring.introduceParameterMethodUsagesProcessor"
-                    interface="com.intellij.refactoring.introduceParameter.IntroduceParameterMethodUsagesProcessor" dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.safeDelete.importSearcher" interface="com.intellij.refactoring.safeDelete.ImportSearcher"
-                    dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.predefinedMigrationMapProvider"
-                    interface="com.intellij.refactoring.migration.PredefinedMigrationProvider" dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.generateAccessorProvider" interface="com.intellij.util.NotNullFunction" dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.overrideImplementsAnnotationsHandler"
-                    interface="com.intellij.codeInsight.generation.OverrideImplementsAnnotationsHandler" dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.conversion.rule" interface="com.intellij.refactoring.typeMigration.rules.TypeConversionRule"
-                    dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.repositoryLibrary" beanClass="com.intellij.jarRepository.RepositoryLibraryDefinition"
-                    dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.disableCompilationDependenciesResolutionTask"
-                    interface="com.intellij.jarRepository.DisableCompilationDependenciesResolutionTask"
-                    dynamic="true"/>
-    <!--suppress PluginXmlValidity -->
-    <extensionPoint qualifiedName="com.intellij.encapsulateFields.Helper" beanClass="com.intellij.lang.LanguageExtensionPoint"
-                    dynamic="true">
-      <with attribute="implementationClass" implements="com.intellij.refactoring.encapsulateFields.EncapsulateFieldHelper"/>
-    </extensionPoint>
-    <extensionPoint qualifiedName="com.intellij.refactoring.moveInnerClassUsagesHandler"
-                    beanClass="com.intellij.lang.LanguageExtensionPoint" dynamic="true">
-      <with attribute="implementationClass" implements="com.intellij.refactoring.move.moveInner.MoveInnerClassUsagesHandler"/>
-    </extensionPoint>
-    <extensionPoint qualifiedName="com.intellij.testGenerator" beanClass="com.intellij.lang.LanguageExtensionPoint" dynamic="true">
-      <with attribute="implementationClass" implements="com.intellij.testIntegration.createTest.TestGenerator"/>
-    </extensionPoint>
-    <extensionPoint qualifiedName="com.intellij.refactoring.moveMemberHandler" beanClass="com.intellij.lang.LanguageExtensionPoint"
-                    dynamic="true">
-      <with attribute="implementationClass" implements="com.intellij.refactoring.move.moveMembers.MoveMemberHandler"/>
-    </extensionPoint>
-    <extensionPoint qualifiedName="com.intellij.refactoring.moveInnerHandler" beanClass="com.intellij.lang.LanguageExtensionPoint"
-                    dynamic="true">
-      <with attribute="implementationClass" implements="com.intellij.refactoring.move.moveInner.MoveInnerHandler"/>
-    </extensionPoint>
-    <extensionPoint qualifiedName="com.intellij.constructorBodyGenerator" beanClass="com.intellij.lang.LanguageExtensionPoint"
-                    dynamic="true">
-      <with attribute="implementationClass" implements="com.intellij.codeInsight.generation.ConstructorBodyGenerator"/>
-    </extensionPoint>
-    <extensionPoint qualifiedName="com.intellij.codeInsight.createFieldFromUsageHelper" beanClass="com.intellij.lang.LanguageExtensionPoint"
-                    dynamic="true">
-      <with attribute="implementationClass" implements="com.intellij.codeInsight.daemon.impl.quickfix.CreateFieldFromUsageHelper"/>
-    </extensionPoint>
-    <extensionPoint qualifiedName="com.intellij.hierarchy.referenceProcessor"
-                    interface="com.intellij.ide.hierarchy.call.CallReferenceProcessor" dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.hierarchy.elementProvider"
-                    interface="com.intellij.ide.hierarchy.call.CallHierarchyElementProvider" dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.refactoring.pullUpHelperFactory" beanClass="com.intellij.lang.LanguageExtensionPoint"
-                    dynamic="true">
-      <with attribute="implementationClass" implements="com.intellij.refactoring.memberPullUp.PullUpHelperFactory"/>
-    </extensionPoint>
-    <!--suppress PluginXmlValidity -->
-    <extensionPoint qualifiedName="com.intellij.refactoring.safeDelete.JavaSafeDeleteDelegate"
-                    beanClass="com.intellij.lang.LanguageExtensionPoint" dynamic="true">
-      <with attribute="implementationClass" implements="com.intellij.refactoring.safeDelete.JavaSafeDeleteDelegate"/>
-    </extensionPoint>
-    <extensionPoint qualifiedName="com.intellij.externalAnnotationsArtifactsResolver"
-                    interface="com.intellij.codeInsight.ExternalAnnotationsArtifactsResolver" dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.java.externalAnnotation.locationProvider"
-                    interface="com.intellij.codeInsight.externalAnnotation.location.AnnotationsLocationProvider" dynamic="true"/>
-
-    <extensionPoint qualifiedName="com.intellij.languageCompilerRefAdapter"
-                    interface="com.intellij.compiler.backwardRefs.LanguageCompilerRefAdapter" dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.compiler.isUpToDateCheckConsumer"
-                    interface="com.intellij.compiler.backwardRefs.IsUpToDateCheckConsumer" dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.languageCompilerRefAdapter.directInheritorProvider" area="IDEA_PROJECT"
-                    interface="com.intellij.compiler.backwardRefs.DirectInheritorProvider" dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.framework.type" interface="com.intellij.framework.FrameworkTypeEx" dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.runConfigurationExtension" interface="com.intellij.execution.RunConfigurationExtension"
-                    dynamic="true"/>
-
-    <extensionPoint qualifiedName="com.intellij.variableTypeCalculator"
-                    interface="com.intellij.codeInsight.template.macro.VariableTypeCalculator" dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.jreProvider" interface="com.intellij.execution.ui.JreProvider" dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.sdkEditorAdditionalOptionsProvider"
-                    interface="com.intellij.openapi.SdkEditorAdditionalOptionsProvider" dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.exceptionFilter" interface="com.intellij.execution.filters.ExceptionFilterFactory"
-                    dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.java.effectively.final.fixer"
-                    interface="com.intellij.codeInsight.daemon.impl.quickfix.makefinal.EffectivelyFinalFixer" dynamic="true"/>
-
-    <extensionPoint qualifiedName="com.intellij.compiler.buildTargetScopeProvider"
-                    interface="com.intellij.compiler.impl.BuildTargetScopeProvider" dynamic="true"/>
-
-    <extensionPoint qualifiedName="com.intellij.compiler.optionsManager"
-                    interface="com.intellij.compiler.options.CompilerOptionsFilter" dynamic="true"/>
-
-    <extensionPoint qualifiedName="com.intellij.java.programPatcher"
-                    interface="com.intellij.execution.runners.JavaProgramPatcher" dynamic="true"/>
-
-    <extensionPoint qualifiedName="com.intellij.java.consoleDecorator"
-                    interface="com.intellij.execution.application.JavaConsoleDecorator" dynamic="true"/>
-
     <!--suppress PluginXmlValidity -->
     <extensionPoint qualifiedName="com.intellij.OrderRootTypeUI"
                     beanClass="com.intellij.openapi.extensions.KeyedFactoryEPBean"
@@ -153,132 +31,7 @@
       <with attribute="implementationClass" implements="com.intellij.openapi.roots.ui.OrderRootTypeUIFactory"/>
     </extensionPoint>
 
-    <extensionPoint qualifiedName="com.intellij.java.changeSignature.converter" beanClass="com.intellij.lang.LanguageExtensionPoint"
-                    dynamic="true">
-      <with attribute="implementationClass" implements="com.intellij.refactoring.changeSignature.JavaChangeInfoConverter"/>
-    </extensionPoint>
-
-    <extensionPoint qualifiedName="com.intellij.packaging.elementType" interface="com.intellij.packaging.elements.PackagingElementType"
-                    dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.packaging.artifactPropertiesProvider"
-                    interface="com.intellij.packaging.artifacts.ArtifactPropertiesProvider" dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.packaging.sourceItemProvider"
-                    interface="com.intellij.packaging.ui.PackagingSourceItemsProvider" dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.packaging.sourceItemFilter" interface="com.intellij.packaging.ui.PackagingSourceItemFilter"
-                    dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.packaging.artifactType" interface="com.intellij.packaging.artifacts.ArtifactType"
-                    dynamic="true"/>
-
-    <extensionPoint qualifiedName="com.intellij.frameworkSupportCommunicator"
-                    interface="com.intellij.ide.util.newProjectWizard.impl.FrameworkSupportCommunicator" dynamic="true"/>
-
-    <!--new project wizard-->
-    <extensionPoint qualifiedName="com.intellij.projectWizard.projectCategory" interface="com.intellij.ide.projectWizard.ProjectCategory"
-                    dynamic="true"/>
-
-    <!-- both EP implementation classes requires constructor injection (our plugins fixed, but 3rd-party not) -->
-    <extensionPoint qualifiedName="com.intellij.projectImportProvider" interface="com.intellij.projectImport.ProjectImportProvider"
-                    dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.projectImportBuilder" interface="com.intellij.projectImport.ProjectImportBuilder"
-                    dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.projectStructureDetector"
-                    interface="com.intellij.ide.util.projectWizard.importSources.ProjectStructureDetector" dynamic="true"/>
-
-    <extensionPoint qualifiedName="com.intellij.projectStructureConfigurableFilter"
-                    interface="com.intellij.openapi.roots.ui.configuration.ProjectStructureConfigurableFilter" dynamic="true"/>
-
-    <extensionPoint qualifiedName="com.intellij.compiler" area="IDEA_PROJECT" interface="com.intellij.openapi.compiler.Compiler"
-                    dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.compilerFactory" area="IDEA_PROJECT"
-                    interface="com.intellij.openapi.compiler.CompilerFactory" dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.compilableFileTypesProvider" area="IDEA_PROJECT"
-                    interface="com.intellij.openapi.compiler.CompilableFileTypesProvider" dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.compiler.task" area="IDEA_PROJECT" beanClass="com.intellij.compiler.CompileTaskBean"
-                    dynamic="true">
-      <with attribute="implementation" implements="com.intellij.openapi.compiler.CompileTask"/>
-    </extensionPoint>
-    <extensionPoint qualifiedName="com.intellij.compileServer.plugin" beanClass="com.intellij.compiler.server.CompileServerPlugin"
-                    dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.buildProcess.parametersProvider" area="IDEA_PROJECT"
-                    interface="com.intellij.compiler.server.BuildProcessParametersProvider" dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.compiler.buildIssueContributor" dynamic="true"
-                    interface="com.intellij.compiler.progress.BuildIssueContributor"/>
-
-    <extensionPoint qualifiedName="com.intellij.attachSourcesProvider" interface="com.intellij.codeInsight.AttachSourcesProvider"
-                    dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.attachSourcesProviderFilter" interface="com.intellij.codeInsight.AttachSourcesProviderFilter"
-                    dynamic="true"/>
-
-    <extensionPoint qualifiedName="com.intellij.java.compiler" area="IDEA_PROJECT"
-                    interface="com.intellij.compiler.impl.javaCompiler.BackendCompiler" dynamic="true"/>
-
-    <!--suppress PluginXmlValidity -->
-    <extensionPoint qualifiedName="com.intellij.configuration.ModuleStructureExtension" dynamic="true"
-                    interface="com.intellij.openapi.roots.ui.configuration.projectRoot.ModuleStructureExtension"/>
-
-    <extensionPoint qualifiedName="com.intellij.projectStructureValidator"
-                    interface="com.intellij.openapi.roots.ui.configuration.projectRoot.daemon.ProjectStructureValidator" dynamic="true"/>
-
-    <extensionPoint qualifiedName="com.intellij.compiler.updateResourcesBuildContributor"
-                    interface="com.intellij.compiler.impl.UpdateResourcesBuildContributor" dynamic="true"/>
-
-    <extensionPoint qualifiedName="com.intellij.junitPatcher"
-                    interface="com.intellij.execution.JUnitPatcher" dynamic="true"/>
-
-    <extensionPoint qualifiedName="com.intellij.junitRecognizer"
-                    interface="com.intellij.execution.JUnitRecognizer" dynamic="true"/>
-
-    <extensionPoint qualifiedName="com.intellij.unusedDeclarationFixProvider"
-                    interface="com.intellij.codeInspection.reference.UnusedDeclarationFixProvider" dynamic="true"/>
-
-    <!-- RefMethod -->
-    <extensionPoint qualifiedName="com.intellij.canBeEmpty"
-                    interface="com.intellij.openapi.util.Condition" dynamic="true"/>
-
-    <extensionPoint qualifiedName="com.intellij.debuggerClassFilterProvider"
-                    interface="com.intellij.ui.classFilter.DebuggerClassFilterProvider" dynamic="true"/>
-
-    <extensionPoint qualifiedName="com.intellij.compiler.inspectionValidator"
-                    interface="com.intellij.openapi.compiler.util.InspectionValidator"
-                    area="IDEA_PROJECT" dynamic="true"/>
-
     <!--<extensionPoint qualifiedName="com.intellij.expectedTypesProvider" interface="com.intellij.codeInsight.ExpectedTypesProviderExtension"/>-->
-
-    <extensionPoint qualifiedName="com.intellij.refactoring.overrideMethodProcessor"
-                    interface="com.intellij.refactoring.OverrideMethodsProcessor" dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.library.javaSourceRootDetector"
-                    interface="com.intellij.openapi.roots.libraries.ui.RootDetector" dynamic="true"/>
-
-    <!-- See com.intellij.execution.filters.ExceptionFilter -->
-    <extensionPoint qualifiedName="com.intellij.jvm.exceptionFilter" interface="com.intellij.execution.filters.JvmExceptionOccurrenceFilter"
-                    dynamic="true"/>
-
-    <!-- com.intellij.codeInspection.javaDoc.JavadocDeclarationInspection -->
-    <extensionPoint qualifiedName="com.intellij.javaDocNotNecessary" interface="com.intellij.openapi.util.Condition" dynamic="true"/>
-
-    <extensionPoint qualifiedName="com.intellij.starter.moduleImporter" interface="com.intellij.ide.starters.StarterModuleImporter"
-                    dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.newProjectWizard.java.buildSystem"
-                    interface="com.intellij.ide.projectWizard.generators.BuildSystemJavaNewProjectWizard" dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.jarRepositoryAuthenticationDataProvider"
-                    interface="com.intellij.jarRepository.JarRepositoryAuthenticationDataProvider" dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.jpsServerAuthExtension"
-                    interface="com.intellij.compiler.cache.client.JpsServerAuthExtension" dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.execution.applicationRunLineMarkerHider"
-                    interface="com.intellij.execution.ApplicationRunLineMarkerHider" dynamic="true"/>
-    <extensionPoint qualifiedName="com.intellij.jvm.logging" interface="com.intellij.lang.logging.JvmLogger" dynamic="true"/>
-
-    <extensionPoint qualifiedName="com.intellij.openapi.projectRoots.externalJavaConfigurationProvider"
-                    interface="com.intellij.openapi.projectRoots.impl.ExternalJavaConfigurationProvider" dynamic="true"/>
-
-    <extensionPoint qualifiedName="com.intellij.openapi.projectRoots.externalJavaConfigurationMissingAction"
-                    interface="com.intellij.openapi.projectRoots.impl.ExternalJavaConfigurationMissingAction" dynamic="true"/>
-
-    <extensionPoint qualifiedName="com.intellij.gotoByName.defaultProvider.ignoreLanguage" dynamic="true"
-                    beanClass="com.intellij.ide.util.gotoByName.IgnoreLanguageInDefaultProvider"/>
-
-    <extensionPoint qualifiedName="com.intellij.threadDumpProvider"
-                    interface="com.intellij.execution.impl.ThreadDumpProvider" dynamic="true"/>
   </extensionPoints>
 
   <extensions defaultExtensionNs="com.intellij">
diff --git a/java/java-impl-inspections/resources/intellij.java.impl.inspections.xml b/java/java-impl-inspections/resources/intellij.java.impl.inspections.xml
index db63b8ab0b84..28bb607a31b1 100644
--- a/java/java-impl-inspections/resources/intellij.java.impl.inspections.xml
+++ b/java/java-impl-inspections/resources/intellij.java.impl.inspections.xml
@@ -22,4 +22,8 @@
     <plugin id="com.intellij.modules.java-capable"/>
 
   </dependencies>
+
+  <extensionPoints>
+    <extensionPoint qualifiedName="com.intellij.lang.jvm.ignoreAnnotationParamSupport" interface="com.intellij.codeInspection.DefaultAnnotationParamInspection$IgnoreAnnotationParamSupport" dynamic="true"/>
+  </extensionPoints>
 </idea-plugin>
diff --git a/java/java-impl-refactorings/resources/intellij.java.impl.refactorings.xml b/java/java-impl-refactorings/resources/intellij.java.impl.refactorings.xml
index cb6392082c2a..b649191fa2dd 100644
--- a/java/java-impl-refactorings/resources/intellij.java.impl.refactorings.xml
+++ b/java/java-impl-refactorings/resources/intellij.java.impl.refactorings.xml
@@ -26,4 +26,35 @@
     <plugin id="com.intellij.modules.java-capable"/>
 
   </dependencies>
+
+  <extensionPoints>
+    <extensionPoint qualifiedName="com.intellij.refactoring.moveClassHandler"
+                    interface="com.intellij.refactoring.move.moveClassesOrPackages.MoveClassHandler" dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.refactoring.moveAllClassesInFileHandler"
+                    interface="com.intellij.refactoring.move.moveClassesOrPackages.MoveAllClassesInFileHandler" dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.refactoring.moveClassToInnerHandler"
+                    interface="com.intellij.refactoring.move.moveClassesOrPackages.MoveClassToInnerHandler" dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.refactoring.introduceParameterMethodUsagesProcessor"
+                    interface="com.intellij.refactoring.introduceParameter.IntroduceParameterMethodUsagesProcessor" dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.safeDelete.importSearcher" interface="com.intellij.refactoring.safeDelete.ImportSearcher"
+                    dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.predefinedMigrationMapProvider"
+                    interface="com.intellij.refactoring.migration.PredefinedMigrationProvider" dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.conversion.rule" interface="com.intellij.refactoring.typeMigration.rules.TypeConversionRule"
+                    dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.refactoring.moveInnerClassUsagesHandler"
+                    beanClass="com.intellij.lang.LanguageExtensionPoint" dynamic="true">
+      <with attribute="implementationClass" implements="com.intellij.refactoring.move.moveInner.MoveInnerClassUsagesHandler"/>
+    </extensionPoint>
+    <extensionPoint qualifiedName="com.intellij.refactoring.moveMemberHandler" beanClass="com.intellij.lang.LanguageExtensionPoint"
+                    dynamic="true">
+      <with attribute="implementationClass" implements="com.intellij.refactoring.move.moveMembers.MoveMemberHandler"/>
+    </extensionPoint>
+    <extensionPoint qualifiedName="com.intellij.refactoring.moveInnerHandler" beanClass="com.intellij.lang.LanguageExtensionPoint"
+                    dynamic="true">
+      <with attribute="implementationClass" implements="com.intellij.refactoring.move.moveInner.MoveInnerHandler"/>
+    </extensionPoint>
+    <extensionPoint qualifiedName="com.intellij.refactoring.overrideMethodProcessor"
+                    interface="com.intellij.refactoring.OverrideMethodsProcessor" dynamic="true"/>
+  </extensionPoints>
 </idea-plugin>
diff --git a/java/java-impl/resources/intellij.java.impl.xml b/java/java-impl/resources/intellij.java.impl.xml
index d28b2a3c6e0b..8e8c9641699b 100644
--- a/java/java-impl/resources/intellij.java.impl.xml
+++ b/java/java-impl/resources/intellij.java.impl.xml
@@ -48,5 +48,68 @@
 
   <xi:include href="/META-INF/UsageData.xml"/>
 
+  <extensionPoints>
+    <extensionPoint qualifiedName="com.intellij.lang.jvm.annotationPackageSupport" interface="com.intellij.codeInsight.annoPackages.AnnotationPackageSupport" dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.lang.jvm.annotations.marker.suppressor"
+                    interface="com.intellij.codeInsight.NonCodeAnnotationsMarkerSuppressor" dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.java.refactoring.chainCallExtractor"
+                    interface="com.intellij.refactoring.chainCall.ChainCallExtractor" dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.java.inspection.bulkMethodInfo"
+                    interface="com.intellij.codeInspection.bulkOperation.BulkMethodInfoProvider" dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.java.externalAnnotation"
+                    interface="com.intellij.codeInsight.externalAnnotation.AnnotationProvider" dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.documentationDelegateProvider"
+                    interface="com.intellij.codeInsight.javadoc.DocumentationDelegateProvider" dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.codeInsight.externalLibraryResolver"
+                    interface="com.intellij.codeInsight.daemon.quickFix.ExternalLibraryResolver" dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.projectModelModifier" interface="com.intellij.openapi.roots.JavaProjectModelModifier"
+                    area="IDEA_PROJECT" dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.library.dependencyScopeSuggester"
+                    interface="com.intellij.openapi.roots.LibraryDependencyScopeSuggester" dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.getterSetterProvider"
+                    interface="com.intellij.codeInsight.generation.GetterSetterPrototypeProvider" dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.generation.toStringClassFilter"
+                    interface="org.jetbrains.generate.tostring.GenerateToStringClassFilter" dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.generateAccessorProvider" interface="com.intellij.util.NotNullFunction" dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.overrideImplementsAnnotationsHandler"
+                    interface="com.intellij.codeInsight.generation.OverrideImplementsAnnotationsHandler" dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.testGenerator" beanClass="com.intellij.lang.LanguageExtensionPoint" dynamic="true">
+      <with attribute="implementationClass" implements="com.intellij.testIntegration.createTest.TestGenerator"/>
+    </extensionPoint>
+
+    <extensionPoint qualifiedName="com.intellij.constructorBodyGenerator" beanClass="com.intellij.lang.LanguageExtensionPoint"
+                    dynamic="true">
+      <with attribute="implementationClass" implements="com.intellij.codeInsight.generation.ConstructorBodyGenerator"/>
+    </extensionPoint>
+    <extensionPoint qualifiedName="com.intellij.codeInsight.createFieldFromUsageHelper" beanClass="com.intellij.lang.LanguageExtensionPoint"
+                    dynamic="true">
+      <with attribute="implementationClass" implements="com.intellij.codeInsight.daemon.impl.quickfix.CreateFieldFromUsageHelper"/>
+    </extensionPoint>
+    <extensionPoint qualifiedName="com.intellij.externalAnnotationsArtifactsResolver"
+                    interface="com.intellij.codeInsight.ExternalAnnotationsArtifactsResolver" dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.java.externalAnnotation.locationProvider"
+                    interface="com.intellij.codeInsight.externalAnnotation.location.AnnotationsLocationProvider" dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.variableTypeCalculator"
+                    interface="com.intellij.codeInsight.template.macro.VariableTypeCalculator" dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.java.effectively.final.fixer"
+                    interface="com.intellij.codeInsight.daemon.impl.quickfix.makefinal.EffectivelyFinalFixer" dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.java.changeSignature.converter" beanClass="com.intellij.lang.LanguageExtensionPoint"
+                    dynamic="true">
+      <with attribute="implementationClass" implements="com.intellij.refactoring.changeSignature.JavaChangeInfoConverter"/>
+    </extensionPoint>
+
+    <!-- com.intellij.codeInspection.javaDoc.JavadocDeclarationInspection -->
+    <extensionPoint qualifiedName="com.intellij.javaDocNotNecessary" interface="com.intellij.openapi.util.Condition" dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.jvm.logging" interface="com.intellij.lang.logging.JvmLogger" dynamic="true"/>
+
+    <extensionPoint qualifiedName="com.intellij.openapi.projectRoots.externalJavaConfigurationProvider"
+                    interface="com.intellij.openapi.projectRoots.impl.ExternalJavaConfigurationProvider" dynamic="true"/>
+
+    <extensionPoint qualifiedName="com.intellij.openapi.projectRoots.externalJavaConfigurationMissingAction"
+                    interface="com.intellij.openapi.projectRoots.impl.ExternalJavaConfigurationMissingAction" dynamic="true"/>
+
+    <extensionPoint qualifiedName="com.intellij.gotoByName.defaultProvider.ignoreLanguage" dynamic="true"
+                    beanClass="com.intellij.ide.util.gotoByName.IgnoreLanguageInDefaultProvider"/>
+  </extensionPoints>
 
 </idea-plugin>
diff --git a/java/openapi/resources/intellij.java.xml b/java/openapi/resources/intellij.java.xml
index d0de6d02f702..abcf3ae34629 100644
--- a/java/openapi/resources/intellij.java.xml
+++ b/java/openapi/resources/intellij.java.xml
@@ -21,4 +21,37 @@
     <module name="intellij.platform.backend"/>
     <plugin id="com.intellij.modules.java-capable"/>
   </dependencies>
+
+  <extensionPoints>
+    <extensionPoint qualifiedName="com.intellij.methodImplementor" interface="com.intellij.codeInsight.MethodImplementor" dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.javaExpressionSurrounder"
+                    interface="com.intellij.codeInsight.generation.surroundWith.JavaExpressionSurrounder" dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.unscrambleSupport" interface="com.intellij.unscramble.UnscrambleSupport" dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.repositoryLibrary" beanClass="com.intellij.jarRepository.RepositoryLibraryDefinition"
+                    dynamic="true"/>
+    <!--suppress PluginXmlValidity -->
+    <extensionPoint qualifiedName="com.intellij.encapsulateFields.Helper" beanClass="com.intellij.lang.LanguageExtensionPoint"
+                    dynamic="true">
+      <with attribute="implementationClass" implements="com.intellij.refactoring.encapsulateFields.EncapsulateFieldHelper"/>
+    </extensionPoint>
+    <extensionPoint qualifiedName="com.intellij.hierarchy.referenceProcessor"
+                    interface="com.intellij.ide.hierarchy.call.CallReferenceProcessor" dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.hierarchy.elementProvider"
+                    interface="com.intellij.ide.hierarchy.call.CallHierarchyElementProvider" dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.refactoring.pullUpHelperFactory" beanClass="com.intellij.lang.LanguageExtensionPoint"
+                    dynamic="true">
+      <with attribute="implementationClass" implements="com.intellij.refactoring.memberPullUp.PullUpHelperFactory"/>
+    </extensionPoint>
+    <!--suppress PluginXmlValidity -->
+    <extensionPoint qualifiedName="com.intellij.refactoring.safeDelete.JavaSafeDeleteDelegate"
+                    beanClass="com.intellij.lang.LanguageExtensionPoint" dynamic="true">
+      <with attribute="implementationClass" implements="com.intellij.refactoring.safeDelete.JavaSafeDeleteDelegate"/>
+    </extensionPoint>
+    <extensionPoint qualifiedName="com.intellij.attachSourcesProvider" interface="com.intellij.codeInsight.AttachSourcesProvider"
+                    dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.attachSourcesProviderFilter" interface="com.intellij.codeInsight.AttachSourcesProviderFilter"
+                    dynamic="true"/>
+    <extensionPoint qualifiedName="com.intellij.debuggerClassFilterProvider"
+                    interface="com.intellij.ui.classFilter.DebuggerClassFilterProvider" dynamic="true"/>
+  </extensionPoints>
 </idea-plugin>
diff --git a/jvm/jvm-analysis-impl/resources/intellij.jvm.analysis.impl.xml b/jvm/jvm-analysis-impl/resources/intellij.jvm.analysis.impl.xml
index a609c27f1885..8da83c43d767 100644
--- a/jvm/jvm-analysis-impl/resources/intellij.jvm.analysis.impl.xml
+++ b/jvm/jvm-analysis-impl/resources/intellij.jvm.analysis.impl.xml
@@ -27,6 +27,9 @@
                     beanClass="com.intellij.lang.LanguageExtensionPoint">
       <with attribute="implementationClass" implements="com.intellij.codeInspection.sourceToSink.SourceToSinkProvider"/>
     </extensionPoint>
+    <!-- RefMethod -->
+    <extensionPoint qualifiedName="com.intellij.canBeEmpty"
+                    interface="com.intellij.openapi.util.Condition" dynamic="true"/>
   </extensionPoints>
   <extensions defaultExtensionNs="com.intellij">
     <!--Test frameworks-->
diff --git a/plugins/groovy/resources/META-INF/plugin.xml b/plugins/groovy/resources/META-INF/plugin.xml
index 8791f043c010..3afc2b06c3fe 100644
--- a/plugins/groovy/resources/META-INF/plugin.xml
+++ b/plugins/groovy/resources/META-INF/plugin.xml
@@ -24,6 +24,7 @@
   <dependencies>
     <plugin id="com.intellij.properties"/>
     <plugin id="com.intellij.java"/>
+    <module name="intellij.java.backend"/>
     <module name="intellij.spellchecker"/>
     <module name="intellij.java.unscramble"/>
     <module name="intellij.properties.backend"/>