diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index b7893efa6f9..219edea467c 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -1,3 +1,9 @@
+2004-09-14 Alain Magloire
+
+	Define contentTypes for some of the
+	extension points.
+	* plugin.xml
+
 2004-09-11 Alain Magloire
 
 	Allow grouping of namespace in the outliner.
diff --git a/core/org.eclipse.cdt.ui/plugin.xml b/core/org.eclipse.cdt.ui/plugin.xml
index 591c410567c..cb657fa2e6c 100644
--- a/core/org.eclipse.cdt.ui/plugin.xml
+++ b/core/org.eclipse.cdt.ui/plugin.xml
@@ -532,15 +532,49 @@
          point="org.eclipse.compare.structureCreators">
       <structureCreator
             extensions="c,cc,cpp,cxx,h,hpp"
-            class="org.eclipse.cdt.internal.ui.compare.CStructureCreator">
+            class="org.eclipse.cdt.internal.ui.compare.CStructureCreator"
+            id="org.eclipse.cdt.ui.compare.CStructureCreator">
       </structureCreator>
+      <contentTypeBinding
+			contentTypeId="org.eclipse.cdt.core.cSource"
+            structureCreatorId="org.eclipse.cdt.ui.compare.CStructureCreator">
+	  </contentTypeBinding>
+      <contentTypeBinding
+			contentTypeId="org.eclipse.cdt.core.cHeader"
+            structureCreatorId="org.eclipse.cdt.ui.compare.CStructureCreator">
+	  </contentTypeBinding>
+      <contentTypeBinding
+			contentTypeId="org.eclipse.cdt.core.cxxSource"
+            structureCreatorId="org.eclipse.cdt.ui.compare.CStructureCreator">
+	  </contentTypeBinding>
+      <contentTypeBinding
+			contentTypeId="org.eclipse.cdt.core.cxxHeader"
+            structureCreatorId="org.eclipse.cdt.ui.compare.CStructureCreator">
+	  </contentTypeBinding>
    </extension>
    <extension
          point="org.eclipse.compare.contentMergeViewers">
       <viewer
             extensions="c,cc,cpp,cxx,h,c2,hpp"
-            class="org.eclipse.cdt.internal.ui.compare.CContentViewerCreator">
+            class="org.eclipse.cdt.internal.ui.compare.CContentViewerCreator"
+            id="org.eclipse.cdt.ui.compare.CContentViewerCreator">
       </viewer>
+      <contentTypeBinding
+			contentTypeId="org.eclipse.cdt.core.cSource"
+            contentMergeViewerId="org.eclipse.cdt.ui.compare.CContentViewerCreator">
+	  </contentTypeBinding>
+      <contentTypeBinding
+			contentTypeId="org.eclipse.cdt.core.cHeader"
+            contentMergeViewerId="org.eclipse.cdt.ui.compare.CContentViewerCreator">
+	  </contentTypeBinding>
+      <contentTypeBinding
+			contentTypeId="org.eclipse.cdt.core.cxxSource"
+            contentMergeViewerId="org.eclipse.cdt.ui.compare.CContentViewerCreator">
+	  </contentTypeBinding>
+      <contentTypeBinding
+			contentTypeId="org.eclipse.cdt.core.cxxHeader"
+            contentMergeViewerId="org.eclipse.cdt.ui.compare.CContentViewerCreator">
+	  </contentTypeBinding>
    </extension>
    <extension
          point="org.eclipse.ui.actionSets">