diff --git a/core/org.eclipse.cdt.ui/plugin.xml b/core/org.eclipse.cdt.ui/plugin.xml
index f7f2210e1ea..d37eb87e2cc 100644
--- a/core/org.eclipse.cdt.ui/plugin.xml
+++ b/core/org.eclipse.cdt.ui/plugin.xml
@@ -36,6 +36,12 @@
          <adapter type="org.eclipse.ui.IActionFilter"/>
          <adapter type="org.eclipse.ui.IPersistableElement"/>
       </factory>
+
+      <factory
+            class="org.eclipse.cdt.internal.ui.CProjectAdapterFactory"
+            adaptableType="org.eclipse.cdt.core.model.ICProject">
+         <adapter type="org.eclipse.core.resources.IProject"/>
+      </factory>
    </extension>
 
    <extension
@@ -469,7 +475,7 @@
          </description>
       </wizard>
    </extension>
-<!-- Define the document provider and partitionner for the CEditor -->
+<!-- Define the document setup participant for the C/C++ and Assembly Editors -->
    <extension
          id="org.eclipse.cdt.ui.CDocumentSetupParticipant"
          name="%cDocumentSetupParticipant"
@@ -478,23 +484,44 @@
             class="org.eclipse.cdt.internal.ui.editor.CDocumentSetupParticipant"
             contentTypeId="org.eclipse.cdt.core.cSource">
       </participant>
+   </extension>
+   <extension
+         id="org.eclipse.cdt.ui.CDocumentSetupParticipant"
+         name="%cDocumentSetupParticipant"
+         point="org.eclipse.core.filebuffers.documentSetup">
       <participant
             class="org.eclipse.cdt.internal.ui.editor.CDocumentSetupParticipant"
             contentTypeId="org.eclipse.cdt.core.cHeader">
       </participant>
+   </extension>
+   <extension
+         id="org.eclipse.cdt.ui.CDocumentSetupParticipant"
+         name="%cDocumentSetupParticipant"
+         point="org.eclipse.core.filebuffers.documentSetup">
       <participant
             class="org.eclipse.cdt.internal.ui.editor.CDocumentSetupParticipant"
             contentTypeId="org.eclipse.cdt.core.cxxSource">
       </participant>
+   </extension>
+   <extension
+         id="org.eclipse.cdt.ui.CDocumentSetupParticipant"
+         name="%cDocumentSetupParticipant"
+         point="org.eclipse.core.filebuffers.documentSetup">
       <participant
             class="org.eclipse.cdt.internal.ui.editor.CDocumentSetupParticipant"
             contentTypeId="org.eclipse.cdt.core.cxxHeader">
       </participant>
+   </extension>
+   <extension
+         id="org.eclipse.cdt.ui.CDocumentSetupParticipant"
+         name="%cDocumentSetupParticipant"
+         point="org.eclipse.core.filebuffers.documentSetup">
       <participant
             class="org.eclipse.cdt.internal.ui.editor.CDocumentSetupParticipant"
             contentTypeId="org.eclipse.cdt.core.asmSource">
       </participant>
    </extension>
+<!-- Define the C/C++ and Assembly Editors -->
    <extension
          id="org.eclipse.cdt.ui.ceditor"
          point="org.eclipse.ui.editors">
@@ -521,6 +548,7 @@
             id="org.eclipse.cdt.ui.editor.asm.AsmEditor">
             <contentTypeBinding contentTypeId="org.eclipse.cdt.core.asmSource"/>
       </editor>
+      <!-- deprecated -->
       <editor
             symbolicFontName="org.eclipse.cdt.ui.editors.textfont"
             class="org.eclipse.cdt.internal.ui.editor.ExternalSearchEditor"
@@ -1280,37 +1308,34 @@
    <extension
          point="org.eclipse.ui.propertyPages">
       <page
-            adaptable="true"
-            objectClass="org.eclipse.core.resources.IProject"
             name="%CDTIndexerProperty.name"
             class="org.eclipse.cdt.ui.dialogs.IndexerOptionPropertyPage"
             id="org.eclipse.cdt.ui.indexer">
-			<filter
-               	name="nature"
-        		value="org.eclipse.cdt.core.cnature">
-    	     </filter>            
+         <enabledWhen>
+		     <adapt type="org.eclipse.core.resources.IProject">
+		          <test property="org.eclipse.core.resources.projectNature" value="org.eclipse.cdt.core.cnature"/>
+		     </adapt>         
+         </enabledWhen>
       </page>
       <page
-            adaptable="true"
-            objectClass="org.eclipse.core.resources.IProject"
             name="%CDTFileTypesProperty.name"
             class="org.eclipse.cdt.internal.ui.preferences.CFileTypesPropertyPage"
             id="org.eclipse.cdt.ui.fileTypes">
-         <filter
-               name="nature"
-               value="org.eclipse.cdt.core.cnature">
-         </filter>
+         <enabledWhen>
+		     <adapt type="org.eclipse.core.resources.IProject">
+		          <test property="org.eclipse.core.resources.projectNature" value="org.eclipse.cdt.core.cnature"/>
+		     </adapt>         
+         </enabledWhen>
        </page>
       <page
-            adaptable="true"
-            objectClass="org.eclipse.core.resources.IProject"
             name="%CDTHelpProperty.name"
             class="org.eclipse.cdt.ui.dialogs.CHelpConfigurationPropertyPage"
             id="org.eclipse.cdt.ui.cHelp">
-             <filter
-               	name="nature"
-        		value="org.eclipse.cdt.core.cnature">
-    	     </filter>            
+         <enabledWhen>
+		     <adapt type="org.eclipse.core.resources.IProject">
+		          <test property="org.eclipse.core.resources.projectNature" value="org.eclipse.cdt.core.cnature"/>
+		     </adapt>         
+         </enabledWhen>
       </page>
    </extension>
    <extension
diff --git a/core/org.eclipse.cdt.ui/schema/completionContributors.exsd b/core/org.eclipse.cdt.ui/schema/completionContributors.exsd
index 4bcd3b9035e..5276ae997d7 100644
--- a/core/org.eclipse.cdt.ui/schema/completionContributors.exsd
+++ b/core/org.eclipse.cdt.ui/schema/completionContributors.exsd
@@ -13,7 +13,7 @@
    <element name="extension">
       <complexType>
          <sequence>
-            <element ref="contributor"/>
+            <element ref="contributor" minOccurs="1" maxOccurs="unbounded"/>
          </sequence>
          <attribute name="point" type="string" use="required">
             <annotation>
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CProjectAdapterFactory.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CProjectAdapterFactory.java
new file mode 100644
index 00000000000..80e5af9478f
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CProjectAdapterFactory.java
@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Wind River Systems, Inc. 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:
+ *     Anton Leherbauer (Wind River Systems) - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.cdt.internal.ui;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IAdapterFactory;
+
+import org.eclipse.cdt.core.model.ICProject;
+
+/**
+ * Adapter factory to adapt <code>ICProject</code> to <code>IProject</code>.
+ *
+ * @since 4.0
+ */
+public class CProjectAdapterFactory implements IAdapterFactory {
+
+	private static final Class[] ADAPTERS = { IProject.class };
+
+	/*
+	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
+	 */
+	public Object getAdapter(Object adaptableObject, Class adapterType) {
+		if (IProject.class.equals(adapterType)) {
+			return ((ICProject)adaptableObject).getProject();
+		}
+		return null;
+	}
+
+	/*
+	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
+	 */
+	public Class[] getAdapterList() {
+		return ADAPTERS;
+	}
+
+}