diff --git a/java/debugger/impl/resources/META-INF/java-debugger.xml b/java/debugger/impl/resources/META-INF/java-debugger.xml
index 2193a6a2e27c..3eda792cab4e 100644
--- a/java/debugger/impl/resources/META-INF/java-debugger.xml
+++ b/java/debugger/impl/resources/META-INF/java-debugger.xml
@@ -11,23 +11,15 @@
   </projectListeners>
 
   <extensionPoints>
-    <extensionPoint qualifiedName="com.intellij.debugger.codeFragmentFactory"
-                    interface="com.intellij.debugger.engine.evaluation.CodeFragmentFactory" dynamic="true"/>
-
     <extensionPoint qualifiedName="com.intellij.debugger.nodeRenderer"
                     interface="com.intellij.debugger.ui.tree.render.NodeRenderer" dynamic="true"/>
 
     <extensionPoint qualifiedName="com.intellij.debugger.compoundRendererProvider"
                     interface="com.intellij.debugger.ui.tree.render.CompoundRendererProvider" dynamic="true"/>
 
-    <extensionPoint qualifiedName="com.intellij.debugger.javaDebugAware"
-                    interface="com.intellij.debugger.engine.JavaDebugAware" dynamic="true"/>
-
     <extensionPoint qualifiedName="com.intellij.debugger.javaBreakpointHandlerFactory"
                     interface="com.intellij.debugger.engine.JavaBreakpointHandlerFactory" dynamic="true"/>
 
-    <extensionPoint qualifiedName="com.intellij.debugger.positionManagerFactory"
-                    interface="com.intellij.debugger.PositionManagerFactory" dynamic="true"/>
     <extensionPoint qualifiedName="com.intellij.debugger.jvmSmartStepIntoHandler"
                     interface="com.intellij.debugger.actions.JvmSmartStepIntoHandler" dynamic="true"/>
     <extensionPoint qualifiedName="com.intellij.debugger.jvmSteppingCommandProvider"
@@ -47,23 +39,12 @@
     <extensionPoint qualifiedName="com.intellij.debugger.sourcePositionProvider"
                     interface="com.intellij.debugger.engine.SourcePositionProvider" dynamic="true"/>
 
-    <extensionPoint qualifiedName="com.intellij.debugger.simplePropertyGetterProvider"
-                    interface="com.intellij.debugger.engine.SimplePropertyGetterProvider" dynamic="true"/>
-
-    <extensionPoint qualifiedName="com.intellij.debugger.syntheticProvider"
-                    interface="com.intellij.debugger.engine.SyntheticTypeComponentProvider" dynamic="true"/>
-
     <extensionPoint qualifiedName="com.intellij.debugger.fieldVisibilityProvider"
                     interface="com.intellij.debugger.engine.FieldVisibilityProvider" dynamic="true"/>
 
     <extensionPoint qualifiedName="com.intellij.debugger.extraSteppingFilter"
                     interface="com.intellij.debugger.engine.ExtraSteppingFilter" dynamic="true"/>
 
-    <extensionPoint qualifiedName="com.intellij.debugger.sourcePositionHighlighter"
-                    interface="com.intellij.debugger.engine.SourcePositionHighlighter" dynamic="true"/>
-
-    <extensionPoint qualifiedName="com.intellij.debugger.nodeNameAdjuster"
-                    interface="com.intellij.debugger.ui.tree.NodeDescriptorNameAdjuster" dynamic="true"/>
     <extensionPoint qualifiedName="com.intellij.debugger.additionalContextProvider"
                     interface="com.intellij.debugger.engine.evaluation.AdditionalContextProvider" dynamic="true"/>
 
diff --git a/java/debugger/openapi/resources/intellij.java.debugger.content.xml b/java/debugger/openapi/resources/intellij.java.debugger.content.xml
new file mode 100644
index 000000000000..5149503f5759
--- /dev/null
+++ b/java/debugger/openapi/resources/intellij.java.debugger.content.xml
@@ -0,0 +1,30 @@
+<!--
+  This file contains extensions, actions, services, etc. without v2 dependencies,
+  so it can be included in Analyzer dependencies where V2 is not yet supported.
+
+  All new extensions, actions, services, extension points, etc. should be added to this file.
+-->
+<idea-plugin>
+  <extensionPoints>
+    <extensionPoint qualifiedName="com.intellij.debugger.codeFragmentFactory"
+                    interface="com.intellij.debugger.engine.evaluation.CodeFragmentFactory" dynamic="true"/>
+
+    <extensionPoint qualifiedName="com.intellij.debugger.javaDebugAware"
+                    interface="com.intellij.debugger.engine.JavaDebugAware" dynamic="true"/>
+
+    <extensionPoint qualifiedName="com.intellij.debugger.positionManagerFactory"
+                    interface="com.intellij.debugger.PositionManagerFactory" dynamic="true"/>
+
+    <extensionPoint qualifiedName="com.intellij.debugger.simplePropertyGetterProvider"
+                    interface="com.intellij.debugger.engine.SimplePropertyGetterProvider" dynamic="true"/>
+
+    <extensionPoint qualifiedName="com.intellij.debugger.syntheticProvider"
+                    interface="com.intellij.debugger.engine.SyntheticTypeComponentProvider" dynamic="true"/>
+
+    <extensionPoint qualifiedName="com.intellij.debugger.sourcePositionHighlighter"
+                    interface="com.intellij.debugger.engine.SourcePositionHighlighter" dynamic="true"/>
+
+    <extensionPoint qualifiedName="com.intellij.debugger.nodeNameAdjuster"
+                    interface="com.intellij.debugger.ui.tree.NodeDescriptorNameAdjuster" dynamic="true"/>
+  </extensionPoints>
+</idea-plugin>
diff --git a/java/debugger/openapi/resources/intellij.java.debugger.xml b/java/debugger/openapi/resources/intellij.java.debugger.xml
index 95dc0b69f739..3722e8d5038c 100644
--- a/java/debugger/openapi/resources/intellij.java.debugger.xml
+++ b/java/debugger/openapi/resources/intellij.java.debugger.xml
@@ -1,4 +1,8 @@
-<idea-plugin visibility="public">
+<!--
+  This file contains only v2 dependencies.
+  All new extensions, actions, services, extension points, etc. should go to intellij.java.debugger.content.xml
+-->
+<idea-plugin visibility="public" xmlns:xi="http://www.w3.org/2001/XInclude">
   <dependencies>
     <module name="intellij.java.execution"/>
     <module name="intellij.jsp"/>
@@ -16,4 +20,6 @@
     <plugin id="com.intellij.modules.java-capable"/>
 
   </dependencies>
+
+  <xi:include href="intellij.java.debugger.content.xml"/>
 </idea-plugin>