diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog
index 335576d3e4e..70d93ed4396 100644
--- a/debug/org.eclipse.cdt.debug.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.core/ChangeLog
@@ -1,3 +1,9 @@
+2003-02-12 Mikhail Khodjaiants
+	Use ICDIRegisterManager instead of ICDITarget.
+	* ICDITarget.java
+	* CDebugTarget.java
+	* CRegisterGroup.java
+
 2003-02-11 Mikhail Khodjaiants
 	The 'auto load symbols' action support in ICSharedLibraryManager.
 	* ICSharedLibraryManager.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDITarget.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDITarget.java
index 9b23a091da1..e4c15ec3829 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDITarget.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/model/ICDITarget.java
@@ -59,21 +59,6 @@ public interface ICDITarget extends ICDIObject {
 	 */
 	void setCurrentThread(ICDIThread current) throws CDIException;
 
-	/**
-	 * Returns the register Object associated with this target.
-	 * 
-	 * @return a collection of register object.
-	 * @throws CDIException if this method fails.  Reasons include:
-	 */
-	ICDIRegisterObject[] getRegisterObjects() throws CDIException;
-
-	/**
-	 * Returns the register associated with this target.
-	 * @return a collection of register.
-	 * @throws CDIException if this method fails.
-	 */
-	ICDIRegister[] getRegisters(ICDIRegisterObject[] regObjects) throws CDIException;
-
 	/**
 	 * Evaluates the expression specified by the given string.
 	 * Returns the evaluation result as a String.
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java
index 3b67ffb7557..aa079d508e7 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java
@@ -2037,7 +2037,7 @@ public class CDebugTarget extends CDebugElement
 		ICDIRegisterObject[] regObjects = null;
 		try
 		{
-			regObjects = getCDITarget().getRegisterObjects();
+			regObjects = getCDISession().getRegisterManager().getRegisterObjects();
 		}
 		catch( CDIException e )
 		{
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CRegisterGroup.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CRegisterGroup.java
index 1054f662040..987313e728b 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CRegisterGroup.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CRegisterGroup.java
@@ -92,16 +92,19 @@ public class CRegisterGroup extends CDebugElement implements IRegisterGroup
 
 	private ICDIRegister[] getCDIRegisters() throws DebugException
 	{
-		ICDIRegister[] result = new ICDIRegister[0];
+		ICDIRegister[] results = new ICDIRegister[fRegisterObjects.length];
 		try
 		{
-			result = ((CDebugTarget)getDebugTarget()).getCDITarget().getRegisters( fRegisterObjects );
+			for ( int i = 0; i < fRegisterObjects.length; ++i )
+			{
+				results[i] = ((CDebugTarget)getDebugTarget()).getCDISession().getRegisterManager().createRegister( fRegisterObjects[i] );
+			}
 		}
 		catch( CDIException e )
 		{
 			targetRequestFailed( e.getMessage(), null );
 		}
-		return result;
+		return results;
 	}
 	
 	private void updateRegisters() throws DebugException