diff --git a/core/org.eclipse.cdt.core/plugin.xml b/core/org.eclipse.cdt.core/plugin.xml
index 4b9f94d08ce..38464aef3ed 100644
--- a/core/org.eclipse.cdt.core/plugin.xml
+++ b/core/org.eclipse.cdt.core/plugin.xml
@@ -92,9 +92,8 @@
          name="%makeproject.name"
          point="org.eclipse.cdt.core.CProject">
       <cproject
-            platform="local"
             class="org.eclipse.cdt.internal.core.make.MakeProject">
-       </cproject>
+      </cproject>
    </extension>
    <extension
          id="makeBuilder"
@@ -104,21 +103,57 @@
             class="org.eclipse.cdt.internal.core.make.MakeBuilder">
       </run>
    </extension>
-
-   <!-- Some well known C file extensions -->
-   <extension point="org.eclipse.team.core.fileTypes">
-     <fileTypes extension="c" type="text"/>
-     <fileTypes extension="cc" type="text"/>
-     <fileTypes extension="cpp" type="text"/>
-     <fileTypes extension="cxx" type="text"/>
-     <fileTypes extension="h" type="text"/>
-     <fileTypes extension="hh" type="text"/>
-     <fileTypes extension="o" type="binary"/>
-     <fileTypes extension="a" type="binary"/>
-     <fileTypes extension="so" type="binary"/>
-     <fileTypes extension="dll" type="binary"/>
-     <fileTypes extension="exe" type="binary"/>
-     <fileTypes extension="com" type="binary"/>
+<!-- Some well known C file extensions -->
+   <extension
+         point="org.eclipse.team.core.fileTypes">
+      <fileTypes
+            type="text"
+            extension="c">
+      </fileTypes>
+      <fileTypes
+            type="text"
+            extension="cc">
+      </fileTypes>
+      <fileTypes
+            type="text"
+            extension="cpp">
+      </fileTypes>
+      <fileTypes
+            type="text"
+            extension="cxx">
+      </fileTypes>
+      <fileTypes
+            type="text"
+            extension="h">
+      </fileTypes>
+      <fileTypes
+            type="text"
+            extension="hh">
+      </fileTypes>
+      <fileTypes
+            type="binary"
+            extension="o">
+      </fileTypes>
+      <fileTypes
+            type="binary"
+            extension="a">
+      </fileTypes>
+      <fileTypes
+            type="binary"
+            extension="so">
+      </fileTypes>
+      <fileTypes
+            type="binary"
+            extension="dll">
+      </fileTypes>
+      <fileTypes
+            type="binary"
+            extension="exe">
+      </fileTypes>
+      <fileTypes
+            type="binary"
+            extension="com">
+      </fileTypes>
    </extension>
 
 </plugin>
diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/COwner.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/COwner.java
index 7b488ef4dd0..c9a14481246 100644
--- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/COwner.java
+++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/COwner.java
@@ -50,7 +50,7 @@ public class COwner implements ICOwnerInfo {
 				}
 			}
 		}
-		return fPlatform;
+		return fPlatform == null ? "*" : fPlatform;
 	}
 	
 	void configure(IProject project, ICDescriptor cproject) throws CoreException {