diff --git a/doc/org.eclipse.cdt.doc.isv/cdtOptions b/doc/org.eclipse.cdt.doc.isv/cdtOptions
index 56c723d9fac..29097a0a54f 100644
--- a/doc/org.eclipse.cdt.doc.isv/cdtOptions
+++ b/doc/org.eclipse.cdt.doc.isv/cdtOptions
@@ -1,5 +1,5 @@
 -charset "iso-8859-1"
--sourcepath "../../core/org.eclipse.cdt.core.native/src:../../core/org.eclipse.cdt.core/model:../../core/org.eclipse.cdt.core/parser:../../debug/org.eclipse.cdt.debug.core/cdi"
+-sourcepath "../../core/org.eclipse.cdt.core.native/src:../../core/org.eclipse.cdt.core/model:../../core/org.eclipse.cdt.core/parser"
 -d reference/api
 -classpath  ${bootclasspath}:../org.apache.ant/lib/ant.jar:../org.eclipse.debug.core/dtcore.jar:../org.eclipse.compare/compare.jar:../org.eclipse.help/help.jar:../org.eclipse.help.ui/helpworkbench.jar:../org.eclipse.core.resources/resources.jar:../org.eclipse.core.runtime/runtime.jar:../org.eclipse.core.filebuffers/filebuffers.jar:../org.eclipse.core.expressions/expressions.jar:../org.eclipse.swt.win32/ws/win32/swt.jar:../org.eclipse.swt.motif/ws/motif/swt.jar:../org.eclipse.ui/ui.jar:../org.eclipse.jdt.debug/jdi.jar:../org.eclipse.debug.ui/dtui.jar:../org.eclipse.search/search.jar:../org.eclipse.jface/jface.jar:../org.eclipse.jface.text/jfacetext.jar:../org.eclipse.text/text.jar:../org.eclipse.ui.editors/editors.jar:../org.eclipse.ui.views/views.jar:../org.eclipse.ui.workbench/workbench.jar:../org.eclipse.ui.workbench.texteditor/texteditor.jar:../org.eclipse.core.variables/variables.jar:../org.eclipse.ui.ide/ide.jar:../org.eclipse.jdt.junit/junitsupport.jar:../org.eclipse.osgi/osgi.jar:../org.eclipse.osgi/core.jar:../org.eclipse.osgi/eclipseAdaptor.jar:../org.eclipse.osgi.services/services.jar:../org.eclipse.osgi.util/util.jar
 -breakiterator
@@ -22,9 +22,5 @@ org.eclipse.cdt.core.dom.ast.cpp
 org.eclipse.cdt.core.dom.ast.gnu
 org.eclipse.cdt.core.dom.ast.gnu.c
 org.eclipse.cdt.core.dom.ast.gnu.cpp
-org.eclipse.cdt.debug.core.cdi
-org.eclipse.cdt.debug.core.cdi.event
-org.eclipse.cdt.debug.core.cdi.model
-org.eclipse.cdt.debug.core.cdi.model.type
 org.eclipse.cdt.utils.pty
 org.eclipse.cdt.utils.spawner
diff --git a/doc/org.eclipse.cdt.doc.isv/cdtOptions.txt b/doc/org.eclipse.cdt.doc.isv/cdtOptions.txt
index 49a3bb091e9..11b4a24e686 100644
--- a/doc/org.eclipse.cdt.doc.isv/cdtOptions.txt
+++ b/doc/org.eclipse.cdt.doc.isv/cdtOptions.txt
@@ -1,5 +1,5 @@
 -charset "iso-8859-1"
--sourcepath "../../core/org.eclipse.cdt.core.native/src;../../core/org.eclipse.cdt.core/model;../../core/org.eclipse.cdt.core/parser;../../debug/org.eclipse.cdt.debug.core/cdi"
+-sourcepath "../../core/org.eclipse.cdt.core.native/src;../../core/org.eclipse.cdt.core/model;../../core/org.eclipse.cdt.core/parser"
 -d reference/api
 -classpath  ${bootclasspath};../org.apache.ant/lib/ant.jar;../org.eclipse.debug.core/dtcore.jar;../org.eclipse.compare/compare.jar;../org.eclipse.help/help.jar;../org.eclipse.help.ui/helpworkbench.jar;../org.eclipse.core.resources/resources.jar;../org.eclipse.core.runtime/runtime.jar;../org.eclipse.core.filebuffers/filebuffers.jar;../org.eclipse.core.expressions/expressions.jar;../org.eclipse.swt.win32/ws/win32/swt.jar;../org.eclipse.swt.motif/ws/motif/swt.jar;../org.eclipse.ui/ui.jar;../org.eclipse.jdt.debug/jdi.jar;../org.eclipse.debug.ui/dtui.jar;../org.eclipse.search/search.jar;../org.eclipse.jface/jface.jar;../org.eclipse.jface.text/jfacetext.jar;../org.eclipse.text/text.jar;../org.eclipse.ui.editors/editors.jar;../org.eclipse.ui.views/views.jar;../org.eclipse.ui.workbench/workbench.jar;../org.eclipse.ui.workbench.texteditor/texteditor.jar;../org.eclipse.core.variables/variables.jar;../org.eclipse.ui.ide/ide.jar;../org.eclipse.jdt.junit/junitsupport.jar;../org.eclipse.osgi/osgi.jar;../org.eclipse.osgi/core.jar;../org.eclipse.osgi/eclipseAdaptor.jar;../org.eclipse.osgi.services/services.jar;../org.eclipse.osgi.util/util.jar
 -breakiterator
@@ -22,9 +22,5 @@ org.eclipse.cdt.core.dom.ast.cpp
 org.eclipse.cdt.core.dom.ast.gnu
 org.eclipse.cdt.core.dom.ast.gnu.c
 org.eclipse.cdt.core.dom.ast.gnu.cpp
-org.eclipse.cdt.debug.core.cdi
-org.eclipse.cdt.debug.core.cdi.event
-org.eclipse.cdt.debug.core.cdi.model
-org.eclipse.cdt.debug.core.cdi.model.type
 org.eclipse.cdt.utils.pty
 org.eclipse.cdt.utils.spawner
diff --git a/doc/org.eclipse.cdt.doc.isv/reference/extension-points/index.html b/doc/org.eclipse.cdt.doc.isv/reference/extension-points/index.html
index 921baacbb5d..a08978ba5a0 100644
--- a/doc/org.eclipse.cdt.doc.isv/reference/extension-points/index.html
+++ b/doc/org.eclipse.cdt.doc.isv/reference/extension-points/index.html
@@ -27,7 +27,6 @@
    	<li><a href="org_eclipse_cdt_core_templates.html">org.eclipse.cdt.core.templates</a></li>
    	<li><a href="org_eclipse_cdt_debug_core_BreakpointActionType.html">org.eclipse.cdt.debug.core.BreakpointActionType</a></li>
    	<li><a href="org_eclipse_cdt_debug_core_BreakpointExtension.html">org.eclipse.cdt.debug.core.BreakpointExtension</a></li>
-   	<li><a href="org_eclipse_cdt_debug_core_CDebugger.html">org.eclipse.cdt.debug.core.CDebugger</a></li>
 	<li><a href="org_eclipse_cdt_make_core_MakeTargetBuilder.html">org.eclipse.cdt.make.core.MakeTargetBuilder</a></li>
 	<li><a href="org_eclipse_cdt_make_core_ScannerConfigurationDiscoveryProfile.html">org.eclipse.cdt.make.core.ScannerConfigurationDiscoveryProfile</a></li>
 	<li><a href="org_eclipse_cdt_make_ui_DiscoveryProfilePage.html">org.eclipse.cdt.make.ui.DiscoveryProfilePage</a></li>
diff --git a/doc/org.eclipse.cdt.doc.isv/topics_Reference.xml b/doc/org.eclipse.cdt.doc.isv/topics_Reference.xml
index 1baeb6550b3..8a74ae1adc6 100644
--- a/doc/org.eclipse.cdt.doc.isv/topics_Reference.xml
+++ b/doc/org.eclipse.cdt.doc.isv/topics_Reference.xml
@@ -12,10 +12,6 @@
        	<topic label="org.eclipse.cdt.core.dom.ast.gnu" href="reference/api/org/eclipse/cdt/core/dom/ast/gnu/package-summary.html"/>
        	<topic label="org.eclipse.cdt.core.dom.ast.gnu.c" href="reference/api/org/eclipse/cdt/core/dom/ast/gnu/c/package-summary.html"/>
        	<topic label="org.eclipse.cdt.core.dom.ast.gnu.cpp" href="reference/api/org/eclipse/cdt/core/dom/ast/gnu/cpp/package-summary.html"/>
-       	<topic label="org.eclipse.cdt.debug.core.cdi" href="reference/api/org/eclipse/cdt/debug/core/cdi/package-summary.html"/>
-       	<topic label="org.eclipse.cdt.debug.core.cdi.event" href="reference/api/org/eclipse/cdt/debug/core/cdi/event/package-summary.html"/>
-       	<topic label="org.eclipse.cdt.debug.core.cdi.model" href="reference/api/org/eclipse/cdt/debug/core/cdi/model/package-summary.html"/>
-       	<topic label="org.eclipse.cdt.debug.core.cdi.model.type" href="reference/api/org/eclipse/cdt/debug/core/cdi/model/type/package-summary.html"/>
        	<topic label="org.eclipse.cdt.utils.pty" href="reference/api/org/eclipse/cdt/utils/pty/package-summary.html"/>
        	<topic label="org.eclipse.cdt.utils.spawner" href="reference/api/org/eclipse/cdt/utils/spawner/package-summary.html"/>
 	</topic>
@@ -36,7 +32,6 @@
        	<topic label="org.eclipse.cdt.core.templates" href="reference/extension-points/org_eclipse_cdt_core_templates.html"/>
        	<topic href="reference/extension-points/org_eclipse_cdt_debug_core_BreakpointActionType.html" label="org.eclipse.cdt.debug.core.BreakpointActionType"/>
        	<topic href="reference/extension-points/org_eclipse_cdt_debug_core_BreakpointExtension.html" label="org.eclipse.cdt.debug.core.BreakpointExtension"/>
-       	<topic label="org.eclipse.cdt.debug.core.CDebugger" href="reference/extension-points/org_eclipse_cdt_debug_core_CDebugger.html"/>
 		<topic label="org.eclipse.cdt.make.core.MakeTargetBuilder" href="reference/extension-points/org_eclipse_cdt_make_core_MakeTargetBuilder.html"/>
 		<topic label="org.eclipse.cdt.make.core.ScannerConfigurationDiscoveryProfile" href="reference/extension-points/org_eclipse_cdt_make_core_ScannerConfigurationDiscoveryProfile.html"/>
 		<topic label="org.eclipse.cdt.make.ui.DiscoveryProfilePage" href="reference/extension-points/org_eclipse_cdt_make_ui_DiscoveryProfilePage.html"/>