diff --git a/debug/org.eclipse.cdt.debug.ui/plugin.xml b/debug/org.eclipse.cdt.debug.ui/plugin.xml
index 7bad516555f..c98bddb3fbd 100644
--- a/debug/org.eclipse.cdt.debug.ui/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.ui/plugin.xml
@@ -1205,7 +1205,81 @@
             class="org.eclipse.cdt.debug.internal.ui.sourcelookup.SourceContainerAdapterFactory">
          <adapter type="org.eclipse.ui.model.IWorkbenchAdapter"/>
       </factory>
-
+      <factory
+            adaptableType="org.eclipse.cdt.debug.core.model.IModuleRetrieval"
+            class="org.eclipse.cdt.debug.internal.ui.elements.adapters.CDebugElementAdapterFactory">
+         <adapter
+               type="org.eclipse.debug.internal.ui.viewers.model.provisional.IElementContentProvider">
+         </adapter>
+         <adapter
+               type="org.eclipse.debug.internal.ui.viewers.model.provisional.IModelProxyFactory">
+         </adapter>
+         <adapter
+               type="org.eclipse.debug.internal.ui.viewers.model.provisional.IElementMementoProvider">
+         </adapter>
+      </factory>
+      <factory
+            adaptableType="org.eclipse.cdt.debug.core.model.ICModule"
+            class="org.eclipse.cdt.debug.internal.ui.elements.adapters.CDebugElementAdapterFactory">
+         <adapter
+               type="org.eclipse.debug.internal.ui.viewers.model.provisional.IElementContentProvider">
+         </adapter>
+      </factory>
+      <factory
+            adaptableType="org.eclipse.cdt.debug.core.model.ICModule"
+            class="org.eclipse.cdt.debug.internal.ui.elements.adapters.CDebugElementLabelProviderFactory">
+         <adapter
+               type="org.eclipse.debug.internal.ui.viewers.model.provisional.IElementLabelProvider">
+         </adapter>
+      </factory>
+      <factory
+            adaptableType="org.eclipse.cdt.core.model.ICElement"
+            class="org.eclipse.cdt.debug.internal.ui.elements.adapters.CDebugElementAdapterFactory">
+         <adapter
+               type="org.eclipse.debug.internal.ui.viewers.model.provisional.IElementContentProvider">
+         </adapter>
+      </factory>
+      <factory
+            adaptableType="org.eclipse.cdt.core.model.ICElement"
+            class="org.eclipse.cdt.debug.internal.ui.elements.adapters.CDebugElementLabelProviderFactory">
+         <adapter
+               type="org.eclipse.debug.internal.ui.viewers.model.provisional.IElementLabelProvider">
+         </adapter>
+      </factory>
+      <factory
+            adaptableType="org.eclipse.cdt.debug.core.model.ICVariable"
+            class="org.eclipse.cdt.debug.internal.ui.elements.adapters.CDebugElementLabelProviderFactory">
+         <adapter
+               type="org.eclipse.debug.internal.ui.viewers.model.provisional.IElementLabelProvider">
+         </adapter>
+      </factory>
+      <factory
+            adaptableType="org.eclipse.cdt.debug.core.model.ICVariable"
+            class="org.eclipse.cdt.debug.internal.ui.elements.adapters.CWatchExpressionFactoryAdapterFactory">
+         <adapter
+               type="org.eclipse.debug.ui.actions.IWatchExpressionFactoryAdapter">
+         </adapter>
+      </factory>
+      <factory
+            adaptableType="org.eclipse.debug.core.model.IMemoryBlockRetrievalExtension"
+            class="org.eclipse.cdt.debug.internal.ui.elements.adapters.CMemoryAdapterFactory">
+         <adapter
+               type="org.eclipse.debug.ui.actions.IAddMemoryBlocksTarget">
+         </adapter>
+         <adapter
+               type="org.eclipse.jface.viewers.ILabelDecorator">
+         </adapter>
+      </factory>
+      <factory
+            adaptableType="org.eclipse.debug.core.model.IMemoryBlockExtension"
+            class="org.eclipse.cdt.debug.internal.ui.elements.adapters.CMemoryAdapterFactory">
+         <adapter
+               type="org.eclipse.debug.ui.actions.IAddMemoryBlocksTarget">
+         </adapter>
+         <adapter
+               type="org.eclipse.jface.viewers.ILabelDecorator">
+         </adapter>
+      </factory>
    </extension>
    <extension
          point="org.eclipse.ui.themes">
@@ -1374,11 +1448,5 @@
             id="org.eclipse.cdt.debug.ui.breakpointactions.ExternalToolActionPage"
             actionType="org.eclipse.cdt.debug.ui.breakpointactions.ExternalToolAction"/>
    </extension>
-   <extension
-         point="org.eclipse.ui.startup">
-      <startup
-            class="org.eclipse.cdt.debug.internal.ui.Startup">
-      </startup>
-   </extension>
 
 </plugin>
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/Startup.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/Startup.java
deleted file mode 100644
index 8d29be7af56..00000000000
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/Startup.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 ARM and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * ARM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.debug.internal.ui;
-
-import org.eclipse.cdt.ui.CUIPlugin;
-import org.eclipse.ui.IStartup;
-
-/**
- * Forces the org.eclipse.cdt.debug.ui plugin to be loaded. The Modules view requires 
- * CElementAdapterFactory to be registered to display the labels and images of ICElement's. 
- */
-public class Startup implements IStartup {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IStartup#earlyStartup()
-	 */
-	public void earlyStartup() {
-		CUIPlugin.getDefault();
-	}
-}
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/CDebugUIPlugin.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/CDebugUIPlugin.java
index 5bf889bd57e..4398765025b 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/CDebugUIPlugin.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/CDebugUIPlugin.java
@@ -14,12 +14,7 @@ package org.eclipse.cdt.debug.ui;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.eclipse.cdt.core.model.ICElement;
 import org.eclipse.cdt.debug.core.CDebugCorePlugin;
-import org.eclipse.cdt.debug.core.model.ICModule;
-import org.eclipse.cdt.debug.core.model.ICRegister;
-import org.eclipse.cdt.debug.core.model.ICVariable;
-import org.eclipse.cdt.debug.core.model.IModuleRetrieval;
 import org.eclipse.cdt.debug.internal.ui.CBreakpointUpdater;
 import org.eclipse.cdt.debug.internal.ui.CDebugImageDescriptorRegistry;
 import org.eclipse.cdt.debug.internal.ui.CDebugModelPresentation;
@@ -27,24 +22,17 @@ import org.eclipse.cdt.debug.internal.ui.CDebuggerPageAdapter;
 import org.eclipse.cdt.debug.internal.ui.ColorManager;
 import org.eclipse.cdt.debug.internal.ui.EvaluationContextManager;
 import org.eclipse.cdt.debug.internal.ui.IInternalCDebugUIConstants;
-import org.eclipse.cdt.debug.internal.ui.elements.adapters.CDebugElementAdapterFactory;
-import org.eclipse.cdt.debug.internal.ui.elements.adapters.CDebugElementLabelProviderFactory;
-import org.eclipse.cdt.debug.internal.ui.elements.adapters.CMemoryAdapterFactory;
-import org.eclipse.cdt.debug.internal.ui.elements.adapters.CWatchExpressionFactoryAdapterFactory;
 import org.eclipse.cdt.debug.ui.sourcelookup.DefaultSourceLocator;
 import org.eclipse.cdt.debug.ui.sourcelookup.OldDefaultSourceLocator;
 import org.eclipse.cdt.ui.CUIPlugin;
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdapterManager;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtensionPoint;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.model.IMemoryBlockExtension;
-import org.eclipse.debug.core.model.IMemoryBlockRetrievalExtension;
 import org.eclipse.debug.core.model.IPersistableSourceLocator;
 import org.eclipse.debug.ui.ILaunchConfigurationTab;
 import org.eclipse.jface.dialogs.ErrorDialog;
@@ -279,25 +267,6 @@ public class CDebugUIPlugin extends AbstractUIPlugin {
 		super.start( context );
 		EvaluationContextManager.startup();
 		CDebugCorePlugin.getDefault().addCBreakpointListener( CBreakpointUpdater.getInstance() );
-
-		IAdapterManager manager= Platform.getAdapterManager();
-		CDebugElementAdapterFactory elementAdapterFactory = new CDebugElementAdapterFactory();
-		manager.registerAdapters( elementAdapterFactory, IModuleRetrieval.class );
-		manager.registerAdapters( elementAdapterFactory, ICModule.class );
-		manager.registerAdapters( elementAdapterFactory, ICElement.class );
-		
-		CDebugElementLabelProviderFactory labelProviderFactory = new CDebugElementLabelProviderFactory();
-		manager.registerAdapters( labelProviderFactory, ICVariable.class );
-		manager.registerAdapters( labelProviderFactory, ICRegister.class );
-		manager.registerAdapters( labelProviderFactory, ICModule.class );
-		manager.registerAdapters( labelProviderFactory, ICElement.class );
-		
-		CWatchExpressionFactoryAdapterFactory watchExpressionAdapterFactory = new CWatchExpressionFactoryAdapterFactory();
-		manager.registerAdapters( watchExpressionAdapterFactory, ICVariable.class );
-		
-		CMemoryAdapterFactory memoryAdapterFactory = new CMemoryAdapterFactory();
-		manager.registerAdapters( memoryAdapterFactory, IMemoryBlockRetrievalExtension.class );
-		manager.registerAdapters( memoryAdapterFactory, IMemoryBlockExtension.class );
 	}
 
 	/*