diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index 8e43465f5b9..cf86ca3313a 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-15 Mikhail Khodjaiants
+	Removed dependencies to 'org.eclipse.debug.core' and 'org.eclipse.debug.ui'.
+	* plugin.xml
+	* src/org/eclipse/cdt/internal/ui/editor/CMarkerAnnotation.java
+
 2004-04-15 John Camelon
 	Partial fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=57928
 
diff --git a/core/org.eclipse.cdt.ui/plugin.xml b/core/org.eclipse.cdt.ui/plugin.xml
index 77560129de7..4b339f72f39 100644
--- a/core/org.eclipse.cdt.ui/plugin.xml
+++ b/core/org.eclipse.cdt.ui/plugin.xml
@@ -22,8 +22,6 @@
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.search"/>
       <import plugin="org.eclipse.compare"/>
-      <import plugin="org.eclipse.debug.ui"/>
-      <import plugin="org.eclipse.debug.core"/>
       <import plugin="org.eclipse.cdt.core"/>
       <import plugin="org.eclipse.core.runtime.compatibility"/>
       <import plugin="org.eclipse.ui.console"/>
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java
index afa7ba15a58..f77fb9b67dd 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java
@@ -725,7 +725,7 @@ public class CEditor extends TextEditor implements ISelectionChangedListener, IS
 
 	interface ITextConverter {
 		void customizeDocumentCommand(IDocument document, DocumentCommand command);
-	};
+	}
 
 	static class TabConverter implements ITextConverter {
 
@@ -776,7 +776,7 @@ public class CEditor extends TextEditor implements ISelectionChangedListener, IS
 			}
 			command.text = buffer.toString();
 		}
-	};
+	}
 
 	/* Source code language to display */
 	public final static String LANGUAGE_CPP = "CEditor.language.cpp"; //$NON-NLS-1$
@@ -860,7 +860,7 @@ public class CEditor extends TextEditor implements ISelectionChangedListener, IS
 		public String getDisplayLanguage() {
 			return fDisplayLanguage;
 		}
-	};
+	}
 
 	/*
 	 * @see AbstractTextEditor#createSourceViewer(Composite, IVerticalRuler, int)
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CMarkerAnnotation.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CMarkerAnnotation.java
index 3ca07f395ad..c80e810b359 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CMarkerAnnotation.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CMarkerAnnotation.java
@@ -8,19 +8,15 @@ package org.eclipse.cdt.internal.ui.editor;
 import java.util.Map;
 import java.util.StringTokenizer;
 
+import org.eclipse.cdt.core.model.ICModelMarker;
 import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.model.IBreakpoint;
-import org.eclipse.debug.ui.DebugUITools;
-import org.eclipse.debug.ui.IDebugModelPresentation;
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.search.ui.SearchUI;
 import org.eclipse.ui.texteditor.MarkerAnnotation;
 import org.eclipse.ui.texteditor.MarkerUtilities;
 
-import org.eclipse.cdt.core.model.ICModelMarker;
-
 
 public class CMarkerAnnotation extends MarkerAnnotation implements IProblemAnnotation {		
 	
@@ -28,7 +24,6 @@ public class CMarkerAnnotation extends MarkerAnnotation implements IProblemAnnot
 	private IDocument fDocument;
 	private int error_start = -1;
 	private int error_length = 0;
-	private IDebugModelPresentation fPresentation;
 
 	public CMarkerAnnotation(IMarker marker, IDocument document) {
 		super(marker);
@@ -148,16 +143,6 @@ public class CMarkerAnnotation extends MarkerAnnotation implements IProblemAnnot
 			if (MarkerUtilities.isMarkerType(marker, SearchUI.SEARCH_MARKER)) {
 				setLayer(2);
 				setImage(SearchUI.getSearchMarkerImage());
-				fIsProblemMarker= false;
-				return;
-			}
-			else if (MarkerUtilities.isMarkerType(marker, IBreakpoint.LINE_BREAKPOINT_MARKER)) {
-				if (fPresentation == null) 
-					fPresentation= DebugUITools.newDebugModelPresentation();
-				
-				setLayer(4);
-				setImage(fPresentation.getImage(marker));
-			
 				fIsProblemMarker= false;
 				return;
 			} else if (MarkerUtilities.isMarkerType(getMarker(), ICModelMarker.C_MODEL_PROBLEM_MARKER)) {