2 files changed, 14 insertions, 14 deletions
diff --git a/releng/org.eclipse.cdt.sdk-feature/build.properties b/releng/org.eclipse.cdt.sdk-feature/build.properties
index 8fb4210f17..8b09e58d4e 100644
--- a/releng/org.eclipse.cdt.sdk-feature/build.properties
+++ b/releng/org.eclipse.cdt.sdk-feature/build.properties
@@ -14,6 +14,6 @@ bin.includes = feature.xml,\
                license.html,\
                epl-v10.html
                
-generate.plugin@org.eclipse.cdt.platform.source=org.eclipse.cdt.platform
-generate.plugin@org.eclipse.cdt.gnu.build.source=org.eclipse.cdt.gnu.build
-generate.plugin@org.eclipse.cdt.gnu.debug.source=org.eclipse.cdt.gnu.debug
+generate.feature@org.eclipse.cdt.platform.source=org.eclipse.cdt.platform
+generate.feature@org.eclipse.cdt.gnu.build.source=org.eclipse.cdt.gnu.build
+generate.feature@org.eclipse.cdt.gnu.debug.source=org.eclipse.cdt.gnu.debug
diff --git a/releng/org.eclipse.cdt.sdk-feature/feature.xml b/releng/org.eclipse.cdt.sdk-feature/feature.xml
index 8555d5f83d..54affb0938 100644
--- a/releng/org.eclipse.cdt.sdk-feature/feature.xml
+++ b/releng/org.eclipse.cdt.sdk-feature/feature.xml
@@ -20,23 +20,23 @@
    <url>
       <update label="%updateSiteName" url="http://download.eclipse.org/tools/cdt/releases/ganymede"/>
    </url>
-
-   <requires>
-      <import plugin="org.eclipse.help" version="3.2.0" match="compatible"/>
-      <import feature="org.eclipse.cdt" version="5.0.0" match="compatible"/>
-   </requires>
-
-   <plugin
+   
+   <includes
          id="org.eclipse.cdt.platform.source"
          version="0.0.0"/>
-
-   <plugin
+         
+   <includes
          id="org.eclipse.cdt.gnu.build.source"
          version="0.0.0"/>
-
-   <plugin
+   
+   <includes
          id="org.eclipse.cdt.gnu.debug.source"
          version="0.0.0"/>
+         
+   <requires>
+      <import plugin="org.eclipse.help" version="3.2.0" match="compatible"/>
+      <import feature="org.eclipse.cdt" version="5.0.0" match="compatible"/>
+   </requires>
 
    <plugin
          id="org.eclipse.cdt.sdk"