diff --git a/build/org.eclipse.cdt.gnu.build-feature/feature.xml b/build/org.eclipse.cdt.gnu.build-feature/feature.xml
index 817dd56d94a..164916a5890 100644
--- a/build/org.eclipse.cdt.gnu.build-feature/feature.xml
+++ b/build/org.eclipse.cdt.gnu.build-feature/feature.xml
@@ -18,7 +18,7 @@
-
+
diff --git a/build/org.eclipse.cdt.gnu.build-feature/sourceTemplateFeature/feature.xml b/build/org.eclipse.cdt.gnu.build-feature/sourceTemplateFeature/feature.xml
index a2a1be99001..410bf9062e1 100644
--- a/build/org.eclipse.cdt.gnu.build-feature/sourceTemplateFeature/feature.xml
+++ b/build/org.eclipse.cdt.gnu.build-feature/sourceTemplateFeature/feature.xml
@@ -18,7 +18,7 @@
-
+
-
+
diff --git a/debug/org.eclipse.cdt.gnu.debug-feature/sourceTemplateFeature/feature.xml b/debug/org.eclipse.cdt.gnu.debug-feature/sourceTemplateFeature/feature.xml
index a2a1be99001..410bf9062e1 100644
--- a/debug/org.eclipse.cdt.gnu.debug-feature/sourceTemplateFeature/feature.xml
+++ b/debug/org.eclipse.cdt.gnu.debug-feature/sourceTemplateFeature/feature.xml
@@ -18,7 +18,7 @@
-
+
-
+
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.feature/feature.xml b/lrparser/org.eclipse.cdt.core.lrparser.feature/feature.xml
index 3e19160886b..dac8547a6b5 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser.feature/feature.xml
+++ b/lrparser/org.eclipse.cdt.core.lrparser.feature/feature.xml
@@ -18,7 +18,7 @@
-
+
diff --git a/releng/org.eclipse.cdt-feature/feature.xml b/releng/org.eclipse.cdt-feature/feature.xml
index 59b9741b79d..b1f8dc485b0 100644
--- a/releng/org.eclipse.cdt-feature/feature.xml
+++ b/releng/org.eclipse.cdt-feature/feature.xml
@@ -19,7 +19,7 @@
-
+
-
+
@@ -69,7 +69,8 @@
id="org.eclipse.cdt"
download-size="0"
install-size="0"
- version="0.0.0"/>
+ version="0.0.0"
+ unpack="false"/>
+ version="0.0.0"
+ unpack="false"/>
diff --git a/releng/org.eclipse.cdt.sdk-feature/feature.xml b/releng/org.eclipse.cdt.sdk-feature/feature.xml
index ea5dc45b8e8..73b3f96f615 100644
--- a/releng/org.eclipse.cdt.sdk-feature/feature.xml
+++ b/releng/org.eclipse.cdt.sdk-feature/feature.xml
@@ -18,7 +18,7 @@
-
+
-
+
diff --git a/upc/org.eclipse.cdt.core.parser.upc.feature/feature.xml b/upc/org.eclipse.cdt.core.parser.upc.feature/feature.xml
index f0fcaa874c4..e9d93368610 100644
--- a/upc/org.eclipse.cdt.core.parser.upc.feature/feature.xml
+++ b/upc/org.eclipse.cdt.core.parser.upc.feature/feature.xml
@@ -18,7 +18,7 @@
-
+
-
+
diff --git a/xlc/org.eclipse.cdt.xlc.feature/feature.xml b/xlc/org.eclipse.cdt.xlc.feature/feature.xml
index fdc58c14b62..115f303fa52 100644
--- a/xlc/org.eclipse.cdt.xlc.feature/feature.xml
+++ b/xlc/org.eclipse.cdt.xlc.feature/feature.xml
@@ -19,7 +19,7 @@
-
+
diff --git a/xlc/org.eclipse.cdt.xlc.sdk-feature/feature.xml b/xlc/org.eclipse.cdt.xlc.sdk-feature/feature.xml
index 7fd90b73b4d..61857773e29 100644
--- a/xlc/org.eclipse.cdt.xlc.sdk-feature/feature.xml
+++ b/xlc/org.eclipse.cdt.xlc.sdk-feature/feature.xml
@@ -19,7 +19,7 @@
-
+