diff --git a/core/org.eclipse.cdt.core/plugin.xml b/core/org.eclipse.cdt.core/plugin.xml
index 8823a7d6e8d..2736e14b230 100644
--- a/core/org.eclipse.cdt.core/plugin.xml
+++ b/core/org.eclipse.cdt.core/plugin.xml
@@ -55,8 +55,8 @@
 <!-- Extension Point: CFileType and CFileTypeAssociation for translation unit ident      -->
 <!-- =================================================================================== -->
    <extension-point id="CLanguage" name="CLanguage" schema="schema/CLanguage.exsd"/>
-   <extension-point id="CFileType" name="CFileType" schema="schema/CFileType.exsd"/>
-   <extension-point id="CFileTypeAssociation" name="CFileTypeAssociation" schema="schema/CFileTypeAssociation.exsd"/>
+   <extension-point id="CFileType" name="CFileType" />
+   <extension-point id="CFileTypeAssociation" name="CFileTypeAssociation" />
 <!-- =================================================================================== -->
 <!-- PathEntryContainer initialization, this is part of the IPathEntry framework         -->
 <!-- =================================================================================== -->
diff --git a/doc/org.eclipse.cdt.doc.isv/buildDoc.xml b/doc/org.eclipse.cdt.doc.isv/buildDoc.xml
index 12737aaf56f..194272ef8ff 100644
--- a/doc/org.eclipse.cdt.doc.isv/buildDoc.xml
+++ b/doc/org.eclipse.cdt.doc.isv/buildDoc.xml
@@ -12,7 +12,12 @@
 		<property name="dest" value="reference/extension-points" />
 	    <record name="${basedir}/cdtconvert.txt" action="start"/>
 	    <pde.convertSchemaToHTML manifest="../org.eclipse.cdt.core/plugin.xml" destination="${dest}" />
+	    <pde.convertSchemaToHTML manifest="../org.eclipse.cdt.ui/plugin.xml" destination="${dest}" />
 	    <pde.convertSchemaToHTML manifest="../org.eclipse.cdt.debug.core/plugin.xml" destination="${dest}" />
+	    <pde.convertSchemaToHTML manifest="../org.eclipse.cdt.make.core/plugin.xml" destination="${dest}" />
+	    <pde.convertSchemaToHTML manifest="../org.eclipse.cdt.make.ui/plugin.xml" destination="${dest}" />
+	    <pde.convertSchemaToHTML manifest="../org.eclipse.cdt.managedbuilder.core/plugin.xml" destination="${dest}" />
+	    <pde.convertSchemaToHTML manifest="../org.eclipse.cdt.managedbuilder.ui/plugin.xml" destination="${dest}" />
 	    <record name="${basedir}/cdtconvert.txt" action="stop"/>
 	</target>