diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index d77c6785c52..b3228ec2cca 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -1,3 +1,7 @@
+2005-02-15 Alain Magloire
+	Fix PR 82322, PR 78330
+	* plugin.xml
+
 2005-02-15 Alain Magloire
 	Fix PR 82856
 	* src/org/eclipse/cdt/internal/ui/editor/ExternalSearchAnnotationModel.java
diff --git a/core/org.eclipse.cdt.ui/plugin.xml b/core/org.eclipse.cdt.ui/plugin.xml
index b3d59c8510f..575f800d708 100644
--- a/core/org.eclipse.cdt.ui/plugin.xml
+++ b/core/org.eclipse.cdt.ui/plugin.xml
@@ -466,8 +466,24 @@
          name="%cDocumentSetupParticipant"
          point="org.eclipse.core.filebuffers.documentSetup">
       <participant
-            extensions="*"
-            class="org.eclipse.cdt.internal.ui.editor.CDocumentSetupParticipant">
+            class="org.eclipse.cdt.internal.ui.editor.CDocumentSetupParticipant"
+            contentTypeId="org.eclipse.cdt.core.cSource">
+      </participant>
+      <participant
+            class="org.eclipse.cdt.internal.ui.editor.CDocumentSetupParticipant"
+            contentTypeId="org.eclipse.cdt.core.cHeader">
+      </participant>
+      <participant
+            class="org.eclipse.cdt.internal.ui.editor.CDocumentSetupParticipant"
+            contentTypeId="org.eclipse.cdt.core.cxxSource">
+      </participant>
+      <participant
+            class="org.eclipse.cdt.internal.ui.editor.CDocumentSetupParticipant"
+            contentTypeId="org.eclipse.cdt.core.cxxHeader">
+      </participant>
+      <participant
+            class="org.eclipse.cdt.internal.ui.editor.CDocumentSetupParticipant"
+            contentTypeId="org.eclipse.cdt.core.asmSource">
       </participant>
    </extension>
    <extension
@@ -475,8 +491,24 @@
          name="%cDocumentFactory"
          point="org.eclipse.core.filebuffers.documentCreation">
       <factory
-            extensions="*"
-            class="org.eclipse.cdt.internal.ui.editor.CDocumentFactory">
+            class="org.eclipse.cdt.internal.ui.editor.CDocumentFactory"
+            contentTypeId="org.eclipse.cdt.core.cSource">
+      </factory>
+      <factory
+            class="org.eclipse.cdt.internal.ui.editor.CDocumentFactory"
+            contentTypeId="org.eclipse.cdt.core.cHeader">
+      </factory>
+      <factory
+            class="org.eclipse.cdt.internal.ui.editor.CDocumentFactory"
+            contentTypeId="org.eclipse.cdt.core.cxxSource">
+      </factory>
+      <factory
+            class="org.eclipse.cdt.internal.ui.editor.CDocumentFactory"
+            contentTypeId="org.eclipse.cdt.core.cxxHeader">
+      </factory>
+      <factory
+            class="org.eclipse.cdt.internal.ui.editor.CDocumentFactory"
+            contentTypeId="org.eclipse.cdt.core.asmSource">
       </factory>
    </extension>
    <extension