diff --git a/debug/org.eclipse.cdt.debug.mi.core/ChangeLog b/debug/org.eclipse.cdt.debug.mi.core/ChangeLog
index 96a6c0ac53a..463af2842e1 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.mi.core/ChangeLog
@@ -1,3 +1,10 @@
+2004-10-26 Alain Magloire
+	Remove of ICDISignalManager in CDI
+	* cdi/org/eclipse/cdt/debug/mi/core/cdi/Session.java
+	* cdi/org/eclipse/cdt/debug/mi/core/cdi/SignalManager.java
+	* cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java
+	* cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Signal.java
+
 2004-10-25 Alain Magloire
 	Remove of ICDExpressionManager in CDI
 	ICDIExpression changes in the interface.
diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/Session.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/Session.java
index 9d502618f64..28f0ff2a88a 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/Session.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/Session.java
@@ -21,7 +21,6 @@ import org.eclipse.cdt.debug.core.cdi.ICDIRegisterManager;
 import org.eclipse.cdt.debug.core.cdi.ICDISession;
 import org.eclipse.cdt.debug.core.cdi.ICDISessionObject;
 import org.eclipse.cdt.debug.core.cdi.ICDISharedLibraryManager;
-import org.eclipse.cdt.debug.core.cdi.ICDISignalManager;
 import org.eclipse.cdt.debug.core.cdi.ICDISourceManager;
 import org.eclipse.cdt.debug.core.cdi.ICDIVariableManager;
 import org.eclipse.cdt.debug.core.cdi.event.ICDIEvent;
@@ -172,10 +171,7 @@ public class Session implements ICDISession, ICDISessionObject {
 		return memoryManager;
 	}
 
-	/**
-	 * @see org.eclipse.cdt.debug.core.cdi.ICDISession#getSignalManager()
-	 */
-	public ICDISignalManager getSignalManager() {
+	public SignalManager getSignalManager() {
 		return signalManager;
 	}
 
diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SignalManager.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SignalManager.java
index 3a99cf167f3..198fc4766e2 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SignalManager.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/SignalManager.java
@@ -17,7 +17,6 @@ import java.util.List;
 import java.util.Map;
 
 import org.eclipse.cdt.debug.core.cdi.CDIException;
-import org.eclipse.cdt.debug.core.cdi.ICDISignalManager;
 import org.eclipse.cdt.debug.core.cdi.model.ICDISignal;
 import org.eclipse.cdt.debug.mi.core.MIException;
 import org.eclipse.cdt.debug.mi.core.MISession;
@@ -33,7 +32,7 @@ import org.eclipse.cdt.debug.mi.core.output.MISigHandle;
 
 /**
  */
-public class SignalManager extends Manager implements ICDISignalManager {
+public class SignalManager extends Manager  {
 
 	ICDISignal[] EMPTY_SIGNALS = {};
 	MISigHandle[] noSigs =  new MISigHandle[0];
@@ -168,15 +167,6 @@ public class SignalManager extends Manager implements ICDISignalManager {
 		miSession.fireEvent(new MISignalChangedEvent(miSession, sig.getName()));
 	}
 
-	/**
-	 * @deprecated
-	 * @see org.eclipse.cdt.debug.core.cdi.ICDISignalManager#getSignals()
-	 */
-	public ICDISignal[] getSignals() throws CDIException {
-		Target target = ((Session)getSession()).getCurrentTarget();
-		return getSignals(target);
-	}
-
 	public ICDISignal[] getSignals(Target target) throws CDIException {
 		List signalsList = (List)signalsMap.get(target);
 		if (signalsList == null) {
diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Signal.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Signal.java
index e51c0d18d27..3ca93464ed4 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Signal.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Signal.java
@@ -12,6 +12,7 @@ package org.eclipse.cdt.debug.mi.core.cdi.model;
 
 import org.eclipse.cdt.debug.core.cdi.CDIException;
 import org.eclipse.cdt.debug.core.cdi.model.ICDISignal;
+import org.eclipse.cdt.debug.mi.core.cdi.Session;
 import org.eclipse.cdt.debug.mi.core.cdi.SignalManager;
 import org.eclipse.cdt.debug.mi.core.output.MISigHandle;
 
@@ -52,7 +53,7 @@ public class Signal extends CObject implements ICDISignal {
 	 * @see org.eclipse.cdt.debug.core.cdi.ICDISignal#handle()
 	 */
 	public void handle(boolean ignore, boolean stop) throws CDIException {
-		SignalManager mgr = (SignalManager)getTarget().getSession().getSignalManager();
+		SignalManager mgr = ((Session)getTarget().getSession()).getSignalManager();
 		mgr.handle(this, ignore, stop);
 	}
 
diff --git a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java
index 9a33a85ed3b..6ff637f557c 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java
@@ -36,6 +36,7 @@ import org.eclipse.cdt.debug.mi.core.cdi.ExpressionManager;
 import org.eclipse.cdt.debug.mi.core.cdi.MI2CDIException;
 import org.eclipse.cdt.debug.mi.core.cdi.RegisterManager;
 import org.eclipse.cdt.debug.mi.core.cdi.Session;
+import org.eclipse.cdt.debug.mi.core.cdi.SignalManager;
 import org.eclipse.cdt.debug.mi.core.cdi.VariableManager;
 import org.eclipse.cdt.debug.mi.core.command.CommandFactory;
 import org.eclipse.cdt.debug.mi.core.command.MIDataEvaluateExpression;
@@ -801,4 +802,16 @@ public class Target  implements ICDITarget {
 		ExpressionManager expMgr = ((Session)getSession()).getExpressionManager();
 		expMgr.destroyAllExpressions(this);
 	}
+
+	/**
+	 * Returns the array of signals defined for this target.
+	 * 
+	 * @return the array of signals
+	 * @throws CDIException on failure. Reasons include:
+	 */
+	public ICDISignal[] getSignals() throws CDIException {
+		SignalManager sigMgr = ((Session)getSession()).getSignalManager();
+		return sigMgr.getSignals(this);
+	}
+
 }