diff --git a/java/debugger/impl/debugger-impl.iml b/java/debugger/impl/debugger-impl.iml
index e08b4d09baea..a18ddacc54f0 100644
--- a/java/debugger/impl/debugger-impl.iml
+++ b/java/debugger/impl/debugger-impl.iml
@@ -20,11 +20,11 @@
     <orderEntry type="module" module-name="java-impl" />
     <orderEntry type="module" module-name="platform-impl" />
     <orderEntry type="module" module-name="util" />
+    <orderEntry type="module" module-name="diff-api" />
   </component>
   <component name="copyright">
     <Base>
       <setting name="state" value="1" />
     </Base>
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/CompareValueWithClipboardAction.java b/java/debugger/impl/src/com/intellij/debugger/actions/CompareValueWithClipboardAction.java
index 0a4f2a366ad2..511dac57eace 100644
--- a/java/debugger/impl/src/com/intellij/debugger/actions/CompareValueWithClipboardAction.java
+++ b/java/debugger/impl/src/com/intellij/debugger/actions/CompareValueWithClipboardAction.java
@@ -17,15 +17,18 @@ package com.intellij.debugger.actions;
 
 import com.intellij.debugger.impl.DebuggerContextImpl;
 import com.intellij.debugger.ui.impl.watch.DebuggerTreeNodeImpl;
-import com.intellij.openapi.diff.DiffManager;
-import com.intellij.openapi.diff.actions.ClipboardVsValueContents;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.diff.DiffDialogHints;
+import com.intellij.openapi.util.diff.DiffManager;
+import com.intellij.openapi.util.diff.impl.DiffRequestFactory;
+import com.intellij.openapi.util.diff.requests.DiffRequest;
 
 /**
  * @author Jeka
  */
 public class CompareValueWithClipboardAction extends BaseValueAction {
   protected void processText(final Project project, final String text, DebuggerTreeNodeImpl node, DebuggerContextImpl debuggerContext) {
-    DiffManager.getInstance().getDiffTool().show(new ClipboardVsValueContents(text, project));
+    DiffRequest request = DiffRequestFactory.createClipboardVsValue(text);
+    DiffManager.getInstance().showDiff(project, request, DiffDialogHints.DEFAULT);
   }
 }
\ No newline at end of file
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/actions/XCompareWithClipboardAction.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/actions/XCompareWithClipboardAction.java
index bd8aba422f57..002a0659c884 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/actions/XCompareWithClipboardAction.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/actions/XCompareWithClipboardAction.java
@@ -15,9 +15,11 @@
  */
 package com.intellij.xdebugger.impl.ui.tree.actions;
 
-import com.intellij.openapi.diff.DiffManager;
-import com.intellij.openapi.diff.actions.ClipboardVsValueContents;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.diff.DiffDialogHints;
+import com.intellij.openapi.util.diff.DiffManager;
+import com.intellij.openapi.util.diff.impl.DiffRequestFactory;
+import com.intellij.openapi.util.diff.requests.DiffRequest;
 import com.intellij.util.ui.UIUtil;
 import com.intellij.xdebugger.impl.ui.tree.XDebuggerTree;
 
@@ -31,9 +33,9 @@ public class XCompareWithClipboardAction extends XFetchValueActionBase {
     UIUtil.invokeLaterIfNeeded(new Runnable() {
       @Override
       public void run() {
-        DiffManager.getInstance().getDiffTool().show(new ClipboardVsValueContents(value, project));
+        DiffRequest request = DiffRequestFactory.createClipboardVsValue(value);
+        DiffManager.getInstance().showDiff(project, request, DiffDialogHints.DEFAULT);
       }
     });
   }
-
 }
diff --git a/platform/xdebugger-impl/xdebugger-impl.iml b/platform/xdebugger-impl/xdebugger-impl.iml
index fe1b0ae2c4be..2043009ae8c9 100644
--- a/platform/xdebugger-impl/xdebugger-impl.iml
+++ b/platform/xdebugger-impl/xdebugger-impl.iml
@@ -14,6 +14,6 @@
     <orderEntry type="module" module-name="platform-resources" />
     <orderEntry type="module" module-name="dom-impl" scope="TEST" />
     <orderEntry type="module" module-name="xml" scope="TEST" />
+    <orderEntry type="module" module-name="diff-api" />
   </component>
-</module>
-
+</module>
\ No newline at end of file