Made all of the plugins OSGi components.

96 files changed, 822 insertions, 599 deletions

diff --git a/build/org.eclipse.cdt.make.core.tests/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.make.core.tests/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..b869220b942
--- /dev/null
+++ b/build/org.eclipse.cdt.make.core.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,16 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Make Core Tests Plug-in
+Bundle-SymbolicName: org.eclipse.cdt.make.core.tests
+Bundle-Version: 3.1.0
+Bundle-ClassPath: makecoretests.jar
+Bundle-Activator: org.eclipse.cdt.make.core.tests.MakeTestsPlugin
+Bundle-Localization: plugin
+Export-Package: org.eclipse.cdt.make.builder.tests,
+ org.eclipse.cdt.make.core.tests
+Require-Bundle: org.eclipse.core.runtime,
+ org.junit,
+ org.eclipse.cdt.make.core,
+ org.eclipse.cdt.core,
+ org.eclipse.core.resources
+Eclipse-AutoStart: true
diff --git a/build/org.eclipse.cdt.make.core.tests/build.properties b/build/org.eclipse.cdt.make.core.tests/build.properties
index b7df4e3a5bf..7739a554cc6 100644
--- a/build/org.eclipse.cdt.make.core.tests/build.properties
+++ b/build/org.eclipse.cdt.make.core.tests/build.properties
@@ -11,4 +11,5 @@
 source.makecoretests.jar = src/
 output.makecoretests.jar = bin/
 bin.includes = plugin.xml,\
-               makecoretests.jar
+               makecoretests.jar,\
+               META-INF/
diff --git a/build/org.eclipse.cdt.make.core.tests/plugin.xml b/build/org.eclipse.cdt.make.core.tests/plugin.xml
index 1b9ecb17ea1..7bf65fb5f42 100644
--- a/build/org.eclipse.cdt.make.core.tests/plugin.xml
+++ b/build/org.eclipse.cdt.make.core.tests/plugin.xml
@@ -1,24 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.cdt.make.core.tests"
-   name="Make Core Tests Plug-in"
-   version="3.1.0"
-   provider-name=""
-   class="org.eclipse.cdt.make.core.tests.MakeTestsPlugin">
-
-   <runtime>
-      <library name="makecoretests.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.junit"/>
-      <import plugin="org.eclipse.cdt.make.core"/>
-      <import plugin="org.eclipse.cdt.core"/>
-      <import plugin="org.eclipse.core.resources"/>
-   </requires>
+<plugin>
 
+    
 </plugin>
diff --git a/build/org.eclipse.cdt.make.core/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.make.core/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..f9914d97b52
--- /dev/null
+++ b/build/org.eclipse.cdt.make.core/META-INF/MANIFEST.MF
@@ -0,0 +1,27 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.cdt.make.core; singleton:=true
+Bundle-Version: 3.1.0
+Bundle-ClassPath: cdtmakecore.jar
+Bundle-Activator: org.eclipse.cdt.make.core.MakeCorePlugin
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Export-Package: org.eclipse.cdt.make.core,
+ org.eclipse.cdt.make.core.makefile,
+ org.eclipse.cdt.make.core.makefile.gnu,
+ org.eclipse.cdt.make.core.scannerconfig,
+ org.eclipse.cdt.make.internal.core,
+ org.eclipse.cdt.make.internal.core.makefile,
+ org.eclipse.cdt.make.internal.core.makefile.gnu,
+ org.eclipse.cdt.make.internal.core.makefile.posix,
+ org.eclipse.cdt.make.internal.core.scannerconfig,
+ org.eclipse.cdt.make.internal.core.scannerconfig.gnu,
+ org.eclipse.cdt.make.internal.core.scannerconfig.jobs,
+ org.eclipse.cdt.make.internal.core.scannerconfig.util,
+ org.eclipse.cdt.make.internal.core.scannerconfig2
+Require-Bundle: org.eclipse.core.resources,
+ org.eclipse.core.variables,
+ org.eclipse.core.runtime,
+ org.eclipse.cdt.core
+Eclipse-AutoStart: true
diff --git a/build/org.eclipse.cdt.make.core/build.properties b/build/org.eclipse.cdt.make.core/build.properties
index c435b1730d3..e5f1e059950 100644
--- a/build/org.eclipse.cdt.make.core/build.properties
+++ b/build/org.eclipse.cdt.make.core/build.properties
@@ -14,7 +14,8 @@ bin.includes = plugin.xml,\
                cdtmakecore.jar,\
                *.html,\
                plugin.properties,\
-               builtin/
+               builtin/,\
+               META-INF/
 src.includes = schema/,\
                .options
 source.cdtmakecore.jar = src/
diff --git a/build/org.eclipse.cdt.make.core/plugin.xml b/build/org.eclipse.cdt.make.core/plugin.xml
index aada2b3848f..5f58f276f4d 100644
--- a/build/org.eclipse.cdt.make.core/plugin.xml
+++ b/build/org.eclipse.cdt.make.core/plugin.xml
@@ -1,26 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.cdt.make.core"
-   name="%pluginName"
-   version="3.1.0"
-   provider-name="%providerName"
-   class="org.eclipse.cdt.make.core.MakeCorePlugin">
+<plugin>
 
-   <runtime>
-      <library name="cdtmakecore.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.core.variables"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.cdt.core"/>
-   </requires>
-
-
-   <extension-point id="MakeTargetBuilder" name="%extensionTargetBuilder.name" schema="schema/MakeTargetBuilder.exsd"/>
+     <extension-point id="MakeTargetBuilder" name="%extensionTargetBuilder.name" schema="schema/MakeTargetBuilder.exsd"/>
    <extension-point id="ScannerConfigurationDiscoveryProfile" name="%extensionScannerConfigurationDiscoveryProfile.name" schema="schema/ScannerConfigurationDiscoveryProfile.exsd"/>
 
    <extension
diff --git a/build/org.eclipse.cdt.make.ui/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.make.ui/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..bce809bf534
--- /dev/null
+++ b/build/org.eclipse.cdt.make.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,36 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.cdt.make.ui; singleton:=true
+Bundle-Version: 3.1.0
+Bundle-ClassPath: cdtmakeui.jar
+Bundle-Activator: org.eclipse.cdt.make.internal.ui.MakeUIPlugin
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Export-Package: org.eclipse.cdt.make.internal.ui,
+ org.eclipse.cdt.make.internal.ui.editor,
+ org.eclipse.cdt.make.internal.ui.part,
+ org.eclipse.cdt.make.internal.ui.preferences,
+ org.eclipse.cdt.make.internal.ui.properties,
+ org.eclipse.cdt.make.internal.ui.scannerconfig,
+ org.eclipse.cdt.make.internal.ui.text,
+ org.eclipse.cdt.make.internal.ui.text.makefile,
+ org.eclipse.cdt.make.internal.ui.wizards,
+ org.eclipse.cdt.make.ui,
+ org.eclipse.cdt.make.ui.actions,
+ org.eclipse.cdt.make.ui.dialogs,
+ org.eclipse.cdt.make.ui.views,
+ org.eclipse.cdt.make.ui.wizards
+Require-Bundle: org.eclipse.ui.ide,
+ org.eclipse.ui.views,
+ org.eclipse.jface.text,
+ org.eclipse.ui.workbench.texteditor,
+ org.eclipse.ui.editors,
+ org.eclipse.core.resources,
+ org.eclipse.ui,
+ org.eclipse.cdt.core,
+ org.eclipse.cdt.ui,
+ org.eclipse.cdt.make.core,
+ org.eclipse.core.runtime,
+ org.eclipse.debug.ui
+Eclipse-AutoStart: true
diff --git a/build/org.eclipse.cdt.make.ui/build.properties b/build/org.eclipse.cdt.make.ui/build.properties
index 9d96d01f83c..e004a1d2eb9 100644
--- a/build/org.eclipse.cdt.make.ui/build.properties
+++ b/build/org.eclipse.cdt.make.ui/build.properties
@@ -13,5 +13,6 @@ bin.includes = plugin.xml,\
                cdtmakeui.jar,\
                icons/,\
                *.html,\
-               plugin.properties
+               plugin.properties,\
+               META-INF/
 source.cdtmakeui.jar = src/
diff --git a/build/org.eclipse.cdt.make.ui/plugin.xml b/build/org.eclipse.cdt.make.ui/plugin.xml
index e8447fbbaa2..7ee36209505 100644
--- a/build/org.eclipse.cdt.make.ui/plugin.xml
+++ b/build/org.eclipse.cdt.make.ui/plugin.xml
@@ -1,32 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.cdt.make.ui"
-   name="%pluginName"
-   version="3.1.0"
-   provider-name="%providerName"
-   class="org.eclipse.cdt.make.internal.ui.MakeUIPlugin">
+<plugin>
 
-   <runtime>
-      <library name="cdtmakeui.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.ui.views"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-      <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.cdt.core"/>
-      <import plugin="org.eclipse.cdt.ui"/>
-      <import plugin="org.eclipse.cdt.make.core"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.debug.ui"/>
-   </requires>
-   <extension-point id="DiscoveryProfilePage" name="%discoveryProfilePage.name" schema="schema/DiscoveryProfilePage.exsd"/>
+     <extension-point id="DiscoveryProfilePage" name="%discoveryProfilePage.name" schema="schema/DiscoveryProfilePage.exsd"/>
 
 
    <extension
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.managedbuilder.core.tests/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..107dfd490fd
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,23 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Tests
+Bundle-SymbolicName: org.eclipse.cdt.managedbuilder.core.tests; singleton:=true
+Bundle-Version: 3.1.0
+Bundle-ClassPath: mbscoretests.jar
+Bundle-Activator: org.eclipse.cdt.managedbuilder.testplugin.CTestPlugin
+Bundle-Vendor: Eclipse.org
+Bundle-Localization: plugin
+Export-Package: org.eclipse.cdt.managedbuilder.core.tests,
+ org.eclipse.cdt.managedbuilder.testplugin,
+ org.eclipse.cdt.managedbuilder.tests.suite,
+ org.eclipse.cdt.standardbuilder.core.tests
+Require-Bundle: org.eclipse.core.runtime,
+ org.junit,
+ org.eclipse.cdt.managedbuilder.core,
+ org.eclipse.cdt.core,
+ org.eclipse.cdt.make.core,
+ org.eclipse.core.resources,
+ org.eclipse.ui,
+ org.eclipse.ui.ide,
+ org.eclipse.compare
+Eclipse-AutoStart: true
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/build.properties b/build/org.eclipse.cdt.managedbuilder.core.tests/build.properties
index 360d81411b3..97eb6665a71 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/build.properties
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/build.properties
@@ -12,7 +12,9 @@ bin.includes = plugin.xml,\
                mbscoretests.jar,\
                resources/,\
                about.html,\
-               icons/
+               icons/,\
+               META-INF/,\
+               META-INF/
 jars.compile.order = mbscoretests.jar
 output.mbscoretests.jar = bin/
 source.mbscoretests.jar = suite/,\
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.xml b/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.xml
index e336be0002a..a47c161d1b8 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.xml
@@ -1,29 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.cdt.managedbuilder.core.tests"
-   name="Tests"
-   version="3.1.0"
-   provider-name="Eclipse.org"
-   class="org.eclipse.cdt.managedbuilder.testplugin.CTestPlugin">
-   <runtime>
-      <library name="mbscoretests.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.junit"/>
-      <import plugin="org.eclipse.cdt.managedbuilder.core"/>
-      <import plugin="org.eclipse.cdt.core"/>
-      <import plugin="org.eclipse.cdt.make.core"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.compare"/>
-   </requires>
-
+<plugin>
+    
 <!-- Managed Make Builder Tool Specifications - CDT 2.0 format -->
 
    <extension
diff --git a/build/org.eclipse.cdt.managedbuilder.core/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.managedbuilder.core/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..fbce45bbda5
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core/META-INF/MANIFEST.MF
@@ -0,0 +1,29 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.cdt.managedbuilder.core; singleton:=true
+Bundle-Version: 3.1.0
+Bundle-ClassPath: mngbuildcore.jar
+Bundle-Activator: org.eclipse.cdt.managedbuilder.core.ManagedBuilderCorePlugin
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Export-Package: org.eclipse.cdt.managedbuilder.core,
+ org.eclipse.cdt.managedbuilder.envvar,
+ org.eclipse.cdt.managedbuilder.internal.core,
+ org.eclipse.cdt.managedbuilder.internal.envvar,
+ org.eclipse.cdt.managedbuilder.internal.macros,
+ org.eclipse.cdt.managedbuilder.internal.scannerconfig,
+ org.eclipse.cdt.managedbuilder.macros,
+ org.eclipse.cdt.managedbuilder.makegen,
+ org.eclipse.cdt.managedbuilder.makegen.gnu,
+ org.eclipse.cdt.managedbuilder.makegen.internal,
+ org.eclipse.cdt.managedbuilder.projectconverter,
+ org.eclipse.cdt.managedbuilder.scannerconfig
+Require-Bundle: org.eclipse.cdt.core,
+ org.eclipse.core.resources,
+ org.eclipse.core.runtime,
+ org.eclipse.cdt.make.core,
+ org.eclipse.ui,
+ org.eclipse.team.core,
+ org.eclipse.core.variables
+Eclipse-AutoStart: true
diff --git a/build/org.eclipse.cdt.managedbuilder.core/build.properties b/build/org.eclipse.cdt.managedbuilder.core/build.properties
index e3ae84d8b41..301ddc41c92 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/build.properties
+++ b/build/org.eclipse.cdt.managedbuilder.core/build.properties
@@ -11,6 +11,7 @@
 bin.includes = plugin.xml,\
                plugin.properties,\
                about.html,\
-               mngbuildcore.jar
+               mngbuildcore.jar,\
+               META-INF/
 source.mngbuildcore.jar = src/
 src.includes = schema/
diff --git a/build/org.eclipse.cdt.managedbuilder.core/plugin.xml b/build/org.eclipse.cdt.managedbuilder.core/plugin.xml
index a77e1f30e11..a95ed7e010b 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.core/plugin.xml
@@ -1,29 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.cdt.managedbuilder.core"
-   name="%pluginName"
-   version="3.1.0"
-   provider-name="%providerName"
-   class="org.eclipse.cdt.managedbuilder.core.ManagedBuilderCorePlugin">
+<plugin>
 
-   <runtime>
-      <library name="mngbuildcore.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.cdt.core"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.cdt.make.core"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.team.core"/>
-      <import plugin="org.eclipse.core.variables"/>
-   </requires>
-
-
-   <extension-point id="ManagedBuildInfo" name="Managed Build Tools 2.0 (Deprecated)" schema="schema/ManagedBuildTools.exsd"/>
+     <extension-point id="ManagedBuildInfo" name="Managed Build Tools 2.0 (Deprecated)" schema="schema/ManagedBuildTools.exsd"/>
    <extension-point id="buildDefinitions" name="Managed Build Definitions" schema="schema/buildDefinitions.exsd"/>
    <extension-point id="projectConverter" name="Managed Build Project Converter" schema="schema/Converter.exsd"/>
 
diff --git a/build/org.eclipse.cdt.managedbuilder.gnu.ui/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.managedbuilder.gnu.ui/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..33a004a34a2
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.gnu.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,15 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.cdt.managedbuilder.gnu.ui; singleton:=true
+Bundle-Version: 3.1.0
+Bundle-ClassPath: gnuui.jar
+Bundle-Activator: org.eclipse.cdt.managedbuilder.gnu.ui.GnuUIPlugin
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Export-Package: org.eclipse.cdt.managedbuilder.gnu.cygwin,
+ org.eclipse.cdt.managedbuilder.gnu.ui
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.cdt.managedbuilder.core,
+ org.eclipse.cdt.core
+Eclipse-AutoStart: true
diff --git a/build/org.eclipse.cdt.managedbuilder.gnu.ui/build.properties b/build/org.eclipse.cdt.managedbuilder.gnu.ui/build.properties
index 66f263ea29d..1411b1abc20 100644
--- a/build/org.eclipse.cdt.managedbuilder.gnu.ui/build.properties
+++ b/build/org.eclipse.cdt.managedbuilder.gnu.ui/build.properties
@@ -11,7 +11,8 @@
 bin.includes = plugin.xml,\
                plugin.properties,\
                gnuui.jar,\
-               about.html
+               about.html,\
+               META-INF/
 jars.compile.order = gnuui.jar
 source.gnuui.jar = src/
 output.gnuui.jar = bin/
diff --git a/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml b/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml
index 9581e1c4b8e..79b6157563e 100644
--- a/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml
@@ -1,24 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.cdt.managedbuilder.gnu.ui"
-   name="%pluginName"
-   version="3.1.0"
-   provider-name="%providerName"
-   class="org.eclipse.cdt.managedbuilder.gnu.ui.GnuUIPlugin">
-
-   <runtime>
-      <library name="gnuui.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.cdt.managedbuilder.core"/>
-      <import plugin="org.eclipse.cdt.core"/>
-   </requires>
+<plugin>
 
+    
 <!-- Managed Make Builder Tool Specifications -->
    <extension
          id="cdt.managed.build.info"
diff --git a/build/org.eclipse.cdt.managedbuilder.ui.tests/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.managedbuilder.ui.tests/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..44c3b793b3b
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.ui.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,17 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Managed Build UI Tests Plug-in
+Bundle-SymbolicName: org.eclipse.cdt.managedbuilder.ui.tests; singleton:=true
+Bundle-Version: 3.1.0
+Bundle-ClassPath: tests.jar
+Bundle-Activator: org.eclipse.cdt.managedbuilder.ui.tests.testplugin.TestsPlugin
+Bundle-Vendor: eclipse.org
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.cdt.managedbuilder.ui,
+ org.eclipse.cdt.ui,
+ org.junit,
+ org.eclipse.cdt.managedbuilder.core,
+ org.eclipse.cdt.core
+Eclipse-AutoStart: true
diff --git a/build/org.eclipse.cdt.managedbuilder.ui.tests/build.properties b/build/org.eclipse.cdt.managedbuilder.ui.tests/build.properties
index 752540924df..22d243f8bee 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui.tests/build.properties
+++ b/build/org.eclipse.cdt.managedbuilder.ui.tests/build.properties
@@ -12,4 +12,5 @@ source.tests.jar = src/
 output.tests.jar = bin/
 bin.includes = plugin.xml,\
                tests.jar,\
-               about.html
+               about.html,\
+               META-INF/
diff --git a/build/org.eclipse.cdt.managedbuilder.ui.tests/plugin.xml b/build/org.eclipse.cdt.managedbuilder.ui.tests/plugin.xml
index 30ae22d0fc7..a249980c464 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui.tests/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.ui.tests/plugin.xml
@@ -1,26 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.cdt.managedbuilder.ui.tests"
-   name="Managed Build UI Tests Plug-in"
-   version="3.1.0"
-   provider-name="eclipse.org"
-   class="org.eclipse.cdt.managedbuilder.ui.tests.testplugin.TestsPlugin">
+<plugin>
 
-   <runtime>
-      <library name="tests.jar"/>
-   </runtime>
-
-   <requires>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.cdt.managedbuilder.ui"/>
-      <import plugin="org.eclipse.cdt.ui"/>
-      <import plugin="org.junit"/>
-      <import plugin="org.eclipse.cdt.managedbuilder.core"/>
-      <import plugin="org.eclipse.cdt.core"/>
-   </requires>
-   <extension
+     <extension
          point="org.eclipse.cdt.managedbuilder.ui.newWizardPages">
       <wizardPage
             ID="org.eclipse.cdt.managedbuilder.ui.tests.wizardPages.AlwaysPresentWizardPage"
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.managedbuilder.ui/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..161924ef6ce
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,22 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.cdt.managedbuilder.ui; singleton:=true
+Bundle-Version: 3.1.0
+Bundle-ClassPath: mgdbuildui.jar
+Bundle-Activator: org.eclipse.cdt.managedbuilder.internal.ui.ManagedBuilderUIPlugin
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Export-Package: org.eclipse.cdt.managedbuilder.internal.ui,
+ org.eclipse.cdt.managedbuilder.ui.actions,
+ org.eclipse.cdt.managedbuilder.ui.properties,
+ org.eclipse.cdt.managedbuilder.ui.wizards
+Require-Bundle: org.eclipse.ui.ide,
+ org.eclipse.core.resources,
+ org.eclipse.ui,
+ org.eclipse.cdt.core,
+ org.eclipse.cdt.ui,
+ org.eclipse.cdt.managedbuilder.core,
+ org.eclipse.core.runtime,
+ org.eclipse.core.variables
+Eclipse-AutoStart: true
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/build.properties b/build/org.eclipse.cdt.managedbuilder.ui/build.properties
index 9768c4297c9..9f8056f7697 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/build.properties
+++ b/build/org.eclipse.cdt.managedbuilder.ui/build.properties
@@ -12,6 +12,7 @@ bin.includes = plugin.xml,\
                plugin.properties,\
                about.html,\
                icons/,\
-               mgdbuildui.jar
+               mgdbuildui.jar,\
+               META-INF/
 source.mgdbuildui.jar = src/
 src.includes = schema/
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
index a08692d99d4..d4099e1bb50 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
@@ -1,29 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.cdt.managedbuilder.ui"
-   name="%pluginName"
-   version="3.1.0"
-   provider-name="%providerName"
-   class="org.eclipse.cdt.managedbuilder.internal.ui.ManagedBuilderUIPlugin">
+<plugin>
 
-   <runtime>
-      <library name="mgdbuildui.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.cdt.core"/>
-      <import plugin="org.eclipse.cdt.ui"/>
-      <import plugin="org.eclipse.cdt.managedbuilder.core"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.variables"/>
-   </requires>
-
-   <extension-point id="newWizardPages" name="Custom MBS New Wizard Pages" schema="schema/newWizardPages.exsd"/>
+     <extension-point id="newWizardPages" name="Custom MBS New Wizard Pages" schema="schema/newWizardPages.exsd"/>
 
    <extension
          point="org.eclipse.ui.newWizards">
diff --git a/core/org.eclipse.cdt.core.aix/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.aix/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..ed75da55265
--- /dev/null
+++ b/core/org.eclipse.cdt.core.aix/META-INF/MANIFEST.MF
@@ -0,0 +1,9 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %fragmentName.aix
+Bundle-SymbolicName: org.eclipse.cdt.core.aix; singleton:=true
+Bundle-Version: 3.1.0
+Bundle-ClassPath: cdtaix.jar
+Bundle-Vendor: %providerName
+Fragment-Host: org.eclipse.cdt.core;bundle-version="[3.1.0,4.0.0)"
+Bundle-Localization: plugin
diff --git a/core/org.eclipse.cdt.core.aix/build.properties b/core/org.eclipse.cdt.core.aix/build.properties
index 5ba91ed1070..003cce1ab7a 100644
--- a/core/org.eclipse.cdt.core.aix/build.properties
+++ b/core/org.eclipse.cdt.core.aix/build.properties
@@ -13,5 +13,6 @@ bin.includes = fragment.xml,\
                *.jar,\
                cdtaix.jar,\
                fragment.properties,\
-               about.html
+               about.html,\
+               META-INF/
 src.includes = library/
diff --git a/core/org.eclipse.cdt.core.aix/fragment.xml b/core/org.eclipse.cdt.core.aix/fragment.xml
index bb3b489072d..f0194a4080a 100644
--- a/core/org.eclipse.cdt.core.aix/fragment.xml
+++ b/core/org.eclipse.cdt.core.aix/fragment.xml
@@ -1,19 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<fragment
-   id="org.eclipse.cdt.core.aix"
-   name="%fragmentName.aix"
-   version="3.1.0"
-   provider-name="%providerName"
-   plugin-id="org.eclipse.cdt.core"
-   plugin-version="3.1.0">
+<fragment>
 
-   <runtime>
-      <library name="cdtaix.jar"/>
-   </runtime>
-
-
-   <extension
+    <extension
          point="org.eclipse.cdt.core.ProcessList">
       <processList
       		platform="aix"
diff --git a/core/org.eclipse.cdt.core.linux.ia64/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.linux.ia64/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..7004c6b2d02
--- /dev/null
+++ b/core/org.eclipse.cdt.core.linux.ia64/META-INF/MANIFEST.MF
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: CDT Core ia64 Fragment
+Bundle-SymbolicName: org.eclipse.cdt.core.linux.ia64
+Bundle-Version: 3.1.0
+Bundle-Vendor: Eclipse.org
+Fragment-Host: org.eclipse.cdt.core;bundle-version="[3.1.0,4.0.0)"
+Bundle-Localization: plugin
diff --git a/core/org.eclipse.cdt.core.linux.ia64/build.properties b/core/org.eclipse.cdt.core.linux.ia64/build.properties
index dcda1532598..1057840c33a 100644
--- a/core/org.eclipse.cdt.core.linux.ia64/build.properties
+++ b/core/org.eclipse.cdt.core.linux.ia64/build.properties
@@ -10,4 +10,5 @@
 ###############################################################################
 bin.includes = fragment.xml,\
                os/,\
-               about.html
+               about.html,\
+               META-INF/
diff --git a/core/org.eclipse.cdt.core.linux.ia64/fragment.xml b/core/org.eclipse.cdt.core.linux.ia64/fragment.xml
index 9ec61ca98b1..aedc72a1e00 100644
--- a/core/org.eclipse.cdt.core.linux.ia64/fragment.xml
+++ b/core/org.eclipse.cdt.core.linux.ia64/fragment.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<fragment
-   id="org.eclipse.cdt.core.linux.ia64"
-   name="CDT Core ia64 Fragment"
-   version="3.1.0"
-   provider-name="Eclipse.org"
-   plugin-id="org.eclipse.cdt.core"
-   plugin-version="3.1.0">
+<fragment>
 
 </fragment>
diff --git a/core/org.eclipse.cdt.core.linux.ppc/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.linux.ppc/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..93cc21fd1e7
--- /dev/null
+++ b/core/org.eclipse.cdt.core.linux.ppc/META-INF/MANIFEST.MF
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: CDT Core ppc Fragment
+Bundle-SymbolicName: org.eclipse.cdt.core.linux.ppc
+Bundle-Version: 3.1.0
+Bundle-Vendor: Eclipse.org
+Fragment-Host: org.eclipse.cdt.core;bundle-version="[3.1.0,4.0.0)"
+Bundle-Localization: plugin
diff --git a/core/org.eclipse.cdt.core.linux.ppc/build.properties b/core/org.eclipse.cdt.core.linux.ppc/build.properties
index dcda1532598..1057840c33a 100644
--- a/core/org.eclipse.cdt.core.linux.ppc/build.properties
+++ b/core/org.eclipse.cdt.core.linux.ppc/build.properties
@@ -10,4 +10,5 @@
 ###############################################################################
 bin.includes = fragment.xml,\
                os/,\
-               about.html
+               about.html,\
+               META-INF/
diff --git a/core/org.eclipse.cdt.core.linux.ppc/fragment.xml b/core/org.eclipse.cdt.core.linux.ppc/fragment.xml
index 1f2bb8e05c2..aedc72a1e00 100644
--- a/core/org.eclipse.cdt.core.linux.ppc/fragment.xml
+++ b/core/org.eclipse.cdt.core.linux.ppc/fragment.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<fragment
-   id="org.eclipse.cdt.core.linux.ppc"
-   name="CDT Core ppc Fragment"
-   version="3.1.0"
-   provider-name="Eclipse.org"
-   plugin-id="org.eclipse.cdt.core"
-   plugin-version="3.1.0">
+<fragment>
 
 </fragment>
diff --git a/core/org.eclipse.cdt.core.linux.x86/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.linux.x86/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..52c8864e387
--- /dev/null
+++ b/core/org.eclipse.cdt.core.linux.x86/META-INF/MANIFEST.MF
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: X86 Fragment
+Bundle-SymbolicName: org.eclipse.cdt.core.linux.x86
+Bundle-Version: 3.1.0
+Bundle-Vendor: Eclipse.org
+Fragment-Host: org.eclipse.cdt.core;bundle-version="[3.1.0,4.0.0)"
+Bundle-Localization: plugin
diff --git a/core/org.eclipse.cdt.core.linux.x86/build.properties b/core/org.eclipse.cdt.core.linux.x86/build.properties
index dcda1532598..1057840c33a 100644
--- a/core/org.eclipse.cdt.core.linux.x86/build.properties
+++ b/core/org.eclipse.cdt.core.linux.x86/build.properties
@@ -10,4 +10,5 @@
 ###############################################################################
 bin.includes = fragment.xml,\
                os/,\
-               about.html
+               about.html,\
+               META-INF/
diff --git a/core/org.eclipse.cdt.core.linux.x86/fragment.xml b/core/org.eclipse.cdt.core.linux.x86/fragment.xml
index e36e571d602..aedc72a1e00 100644
--- a/core/org.eclipse.cdt.core.linux.x86/fragment.xml
+++ b/core/org.eclipse.cdt.core.linux.x86/fragment.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<fragment
-   id="org.eclipse.cdt.core.linux.x86"
-   name="X86 Fragment"
-   version="3.1.0"
-   provider-name="Eclipse.org"
-   plugin-id="org.eclipse.cdt.core"
-   plugin-version="3.1.0">
+<fragment>
 
 </fragment>
diff --git a/core/org.eclipse.cdt.core.linux.x86_64/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.linux.x86_64/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..e40c91c2560
--- /dev/null
+++ b/core/org.eclipse.cdt.core.linux.x86_64/META-INF/MANIFEST.MF
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: CDT Core x86_64 Fragment
+Bundle-SymbolicName: org.eclipse.cdt.core.linux.x86_64
+Bundle-Version: 3.1.0
+Bundle-Vendor: Eclipse.org
+Fragment-Host: org.eclipse.cdt.core;bundle-version="[3.1.0,4.0.0)"
+Bundle-Localization: plugin
diff --git a/core/org.eclipse.cdt.core.linux.x86_64/build.properties b/core/org.eclipse.cdt.core.linux.x86_64/build.properties
index dcda1532598..1057840c33a 100644
--- a/core/org.eclipse.cdt.core.linux.x86_64/build.properties
+++ b/core/org.eclipse.cdt.core.linux.x86_64/build.properties
@@ -10,4 +10,5 @@
 ###############################################################################
 bin.includes = fragment.xml,\
                os/,\
-               about.html
+               about.html,\
+               META-INF/
diff --git a/core/org.eclipse.cdt.core.linux.x86_64/fragment.xml b/core/org.eclipse.cdt.core.linux.x86_64/fragment.xml
index 5c1fe838d7b..aedc72a1e00 100644
--- a/core/org.eclipse.cdt.core.linux.x86_64/fragment.xml
+++ b/core/org.eclipse.cdt.core.linux.x86_64/fragment.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<fragment
-   id="org.eclipse.cdt.core.linux.x86_64"
-   name="CDT Core x86_64 Fragment"
-   version="3.1.0"
-   provider-name="Eclipse.org"
-   plugin-id="org.eclipse.cdt.core"
-   plugin-version="3.1.0">
+<fragment>
 
 </fragment>
diff --git a/core/org.eclipse.cdt.core.linux/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.linux/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..9843ee0ec5d
--- /dev/null
+++ b/core/org.eclipse.cdt.core.linux/META-INF/MANIFEST.MF
@@ -0,0 +1,9 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %fragmentName.linux
+Bundle-SymbolicName: org.eclipse.cdt.core.linux; singleton:=true
+Bundle-Version: 3.1.0
+Bundle-ClassPath: cdt_linux.jar
+Bundle-Vendor: %providerName
+Fragment-Host: org.eclipse.cdt.core;bundle-version="[3.1.0,4.0.0)"
+Bundle-Localization: plugin
diff --git a/core/org.eclipse.cdt.core.linux/build.properties b/core/org.eclipse.cdt.core.linux/build.properties
index d7c3f2a894a..6108ff2b1a9 100644
--- a/core/org.eclipse.cdt.core.linux/build.properties
+++ b/core/org.eclipse.cdt.core.linux/build.properties
@@ -12,7 +12,8 @@ bin.includes = fragment.xml,\
                fragment.properties,\
                about.html,\
                os/,\
-               cdt_linux.jar
+               cdt_linux.jar,\
+               META-INF/
 src.includes = about.html,\
                library/
 source.cdt_linux.jar = src/
diff --git a/core/org.eclipse.cdt.core.linux/fragment.xml b/core/org.eclipse.cdt.core.linux/fragment.xml
index 08c01e983bd..aa79cdc7d89 100644
--- a/core/org.eclipse.cdt.core.linux/fragment.xml
+++ b/core/org.eclipse.cdt.core.linux/fragment.xml
@@ -1,19 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<fragment
-   id="org.eclipse.cdt.core.linux"
-   name="%fragmentName.linux"
-   version="3.1.0"
-   provider-name="%providerName"
-   plugin-id="org.eclipse.cdt.core"
-   plugin-version="3.1.0">
+<fragment>
 
-   <runtime>
-      <library name="cdt_linux.jar"/>
-   </runtime>
-
-
-   <extension
+    <extension
          point="org.eclipse.cdt.core.ProcessList">
       <processList
       		platform="linux"
diff --git a/core/org.eclipse.cdt.core.macosx/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.macosx/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..84dbb9c6674
--- /dev/null
+++ b/core/org.eclipse.cdt.core.macosx/META-INF/MANIFEST.MF
@@ -0,0 +1,9 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %fragmentName.macosx
+Bundle-SymbolicName: org.eclipse.cdt.core.macosx; singleton:=true
+Bundle-Version: 3.1.0
+Bundle-ClassPath: cdt_macosx.jar
+Bundle-Vendor: %providerName
+Fragment-Host: org.eclipse.cdt.core;bundle-version="[3.1.0,4.0.0)"
+Bundle-Localization: plugin
diff --git a/core/org.eclipse.cdt.core.macosx/build.properties b/core/org.eclipse.cdt.core.macosx/build.properties
index 5376c09ea15..91d0b8e245a 100644
--- a/core/org.eclipse.cdt.core.macosx/build.properties
+++ b/core/org.eclipse.cdt.core.macosx/build.properties
@@ -12,7 +12,8 @@ bin.includes = fragment.xml,\
                fragment.properties,\
                about.html,\
                cdt_macosx.jar,\
-               os/
+               os/,\
+               META-INF/
 src.includes = about.html,\
                library/
 source.cdt_macosx.jar = src/
diff --git a/core/org.eclipse.cdt.core.macosx/fragment.xml b/core/org.eclipse.cdt.core.macosx/fragment.xml
index 7cb9a76b5c1..7e30c35e41e 100644
--- a/core/org.eclipse.cdt.core.macosx/fragment.xml
+++ b/core/org.eclipse.cdt.core.macosx/fragment.xml
@@ -1,19 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<fragment
-   id="org.eclipse.cdt.core.macosx"
-   name="%fragmentName.macosx"
-   version="3.1.0"
-   provider-name="%providerName"
-   plugin-id="org.eclipse.cdt.core"
-   plugin-version="3.1.0">
+<fragment>
 
-   <runtime>
-      <library name="cdt_macosx.jar"/>
-   </runtime>
-
-
-   <extension
+    <extension
          point="org.eclipse.cdt.core.ProcessList">
       <processList
       		platform="macosx"
diff --git a/core/org.eclipse.cdt.core.qnx/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.qnx/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..d8144fb73aa
--- /dev/null
+++ b/core/org.eclipse.cdt.core.qnx/META-INF/MANIFEST.MF
@@ -0,0 +1,9 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %fragmentName.qnx
+Bundle-SymbolicName: org.eclipse.cdt.core.qnx; singleton:=true
+Bundle-Version: 3.1.0
+Bundle-ClassPath: cdt_qnx.jar
+Bundle-Vendor: %providerName
+Fragment-Host: org.eclipse.cdt.core;bundle-version="[3.1.0,4.0.0)"
+Bundle-Localization: plugin
diff --git a/core/org.eclipse.cdt.core.qnx/build.properties b/core/org.eclipse.cdt.core.qnx/build.properties
index 64558b1f43a..10e27fa23ce 100644
--- a/core/org.eclipse.cdt.core.qnx/build.properties
+++ b/core/org.eclipse.cdt.core.qnx/build.properties
@@ -12,7 +12,8 @@ bin.includes = fragment.xml,\
                fragment.properties,\
                about.html,\
                os/,\
-               cdt_qnx.jar
+               cdt_qnx.jar,\
+               META-INF/
 source.cdt_qnx.jar = src/
 src.includes = about.html,\
                library/,\
diff --git a/core/org.eclipse.cdt.core.qnx/fragment.xml b/core/org.eclipse.cdt.core.qnx/fragment.xml
index 8be9b095e58..b6944e98064 100644
--- a/core/org.eclipse.cdt.core.qnx/fragment.xml
+++ b/core/org.eclipse.cdt.core.qnx/fragment.xml
@@ -1,19 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<fragment
-   id="org.eclipse.cdt.core.qnx"
-   name="%fragmentName.qnx"
-   version="3.1.0"
-   provider-name="%providerName"
-   plugin-id="org.eclipse.cdt.core"
-   plugin-version="3.1.0">
+<fragment>
 
-   <runtime>
-      <library name="cdt_qnx.jar"/>
-   </runtime>
-
-
-   <extension
+    <extension
          point="org.eclipse.cdt.core.ProcessList">
       <processList
       		platform="qnx"
diff --git a/core/org.eclipse.cdt.core.solaris/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.solaris/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..c0f4da56f98
--- /dev/null
+++ b/core/org.eclipse.cdt.core.solaris/META-INF/MANIFEST.MF
@@ -0,0 +1,9 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %fragmentName.solaris
+Bundle-SymbolicName: org.eclipse.cdt.core.solaris; singleton:=true
+Bundle-Version: 3.1.0
+Bundle-ClassPath: cdt_solaris.jar
+Bundle-Vendor: %providerName
+Fragment-Host: org.eclipse.cdt.core;bundle-version="[3.1.0,4.0.0)"
+Bundle-Localization: plugin
diff --git a/core/org.eclipse.cdt.core.solaris/build.properties b/core/org.eclipse.cdt.core.solaris/build.properties
index b1a0615dcb6..be2f5f9301c 100644
--- a/core/org.eclipse.cdt.core.solaris/build.properties
+++ b/core/org.eclipse.cdt.core.solaris/build.properties
@@ -12,7 +12,8 @@ bin.includes = fragment.xml,\
                fragment.properties,\
                about.html,\
                os/,\
-               cdt_solaris.jar
+               cdt_solaris.jar,\
+               META-INF/
 src.includes = about.html,\
                library/
 source.cdt_solaris.jar = src/
diff --git a/core/org.eclipse.cdt.core.solaris/fragment.xml b/core/org.eclipse.cdt.core.solaris/fragment.xml
index 87f05634e47..bdce3f28594 100644
--- a/core/org.eclipse.cdt.core.solaris/fragment.xml
+++ b/core/org.eclipse.cdt.core.solaris/fragment.xml
@@ -1,19 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<fragment
-   id="org.eclipse.cdt.core.solaris"
-   name="%fragmentName.solaris"
-   version="3.1.0"
-   provider-name="%providerName"
-   plugin-id="org.eclipse.cdt.core"
-   plugin-version="3.1.0">
+<fragment>
 
-   <runtime>
-      <library name="cdt_solaris.jar"/>
-   </runtime>
-
-
-   <extension
+    <extension
          point="org.eclipse.cdt.core.ProcessList">
       <processList
       		platform="solaris"
diff --git a/core/org.eclipse.cdt.core.tests/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.tests/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..ad95904de10
--- /dev/null
+++ b/core/org.eclipse.cdt.core.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,31 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: org.eclipse.cdt.core.tests
+Bundle-SymbolicName: org.eclipse.cdt.core.tests; singleton:=true
+Bundle-Version: 3.1.0
+Bundle-ClassPath: cdtcoretests.jar
+Bundle-Activator: org.eclipse.cdt.core.testplugin.CTestPlugin
+Bundle-Localization: plugin
+Export-Package: org.eclipse.cdt.core.cdescriptor.tests,
+ org.eclipse.cdt.core.indexer.tests,
+ org.eclipse.cdt.core.internal.errorparsers.tests,
+ org.eclipse.cdt.core.model.failedTests,
+ org.eclipse.cdt.core.model.tests,
+ org.eclipse.cdt.core.parser.failedTests,
+ org.eclipse.cdt.core.parser.tests,
+ org.eclipse.cdt.core.parser.tests.ast2,
+ org.eclipse.cdt.core.parser.tests.prefix,
+ org.eclipse.cdt.core.parser.tests.scanner2,
+ org.eclipse.cdt.core.search.tests,
+ org.eclipse.cdt.core.suite,
+ org.eclipse.cdt.core.testplugin,
+ org.eclipse.cdt.core.testplugin.util,
+ org.eclipse.cdt.core.tests
+Require-Bundle: org.eclipse.core.resources,
+ org.eclipse.cdt.core,
+ org.junit,
+ org.eclipse.core.runtime,
+ org.eclipse.ui.ide,
+ org.eclipse.jface,
+ org.eclipse.ui
+Eclipse-AutoStart: true
diff --git a/core/org.eclipse.cdt.core.tests/build.properties b/core/org.eclipse.cdt.core.tests/build.properties
index 3769306eda4..5b372ccc3b2 100644
--- a/core/org.eclipse.cdt.core.tests/build.properties
+++ b/core/org.eclipse.cdt.core.tests/build.properties
@@ -13,7 +13,8 @@ bin.includes = plugin.xml,\
                plugin.properties,\
                cdtcoretests.jar,\
                test.xml,\
-               resources/
+               resources/,\
+               META-INF/
 src.includes = plugin.properties
 output.cdtcoretests.jar = bin/
 about.html = 
diff --git a/core/org.eclipse.cdt.core.tests/plugin.xml b/core/org.eclipse.cdt.core.tests/plugin.xml
index 8f67e0edce6..3a632d3e204 100644
--- a/core/org.eclipse.cdt.core.tests/plugin.xml
+++ b/core/org.eclipse.cdt.core.tests/plugin.xml
@@ -1,27 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.cdt.core.tests"
-   name="org.eclipse.cdt.core.tests"
-   version="3.1.0"
-   class="org.eclipse.cdt.core.testplugin.CTestPlugin">
+<plugin>
 
-   <runtime>
-      <library name="cdtcoretests.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.cdt.core"/>
-      <import plugin="org.junit"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.jface"/>
-      <import plugin="org.eclipse.ui"/>
-   </requires>
-
-   <extension
+     <extension
          id="runTests"
          point="org.eclipse.core.runtime.applications">
       <application>
diff --git a/core/org.eclipse.cdt.core.win32/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.win32/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..1f4c606c97f
--- /dev/null
+++ b/core/org.eclipse.cdt.core.win32/META-INF/MANIFEST.MF
@@ -0,0 +1,9 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %fragmentName.win32
+Bundle-SymbolicName: org.eclipse.cdt.core.win32; singleton:=true
+Bundle-Version: 3.1.0
+Bundle-ClassPath: cdt_win32.jar
+Bundle-Vendor: %providerName
+Fragment-Host: org.eclipse.cdt.core;bundle-version="[3.1.0,4.0.0)"
+Bundle-Localization: plugin
diff --git a/core/org.eclipse.cdt.core.win32/build.properties b/core/org.eclipse.cdt.core.win32/build.properties
index 5aa21e4ab97..cc3a2378d10 100644
--- a/core/org.eclipse.cdt.core.win32/build.properties
+++ b/core/org.eclipse.cdt.core.win32/build.properties
@@ -12,7 +12,8 @@ bin.includes = fragment.xml,\
                fragment.properties,\
                about.html,\
                os/,\
-               cdt_win32.jar
+               cdt_win32.jar,\
+               META-INF/
 src.includes = about.html,\
                library/
 source.cdt_win32.jar = src/
diff --git a/core/org.eclipse.cdt.core.win32/fragment.xml b/core/org.eclipse.cdt.core.win32/fragment.xml
index b1b22264d04..f06998bc1fd 100644
--- a/core/org.eclipse.cdt.core.win32/fragment.xml
+++ b/core/org.eclipse.cdt.core.win32/fragment.xml
@@ -1,22 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<fragment
-   id="org.eclipse.cdt.core.win32"
-   name="%fragmentName.win32"
-   version="3.1.0"
-   provider-name="%providerName"
-   plugin-id="org.eclipse.cdt.core"
-   plugin-version="3.1.0">
+<fragment>
 
-   <runtime>
-      <library name="cdt_win32.jar"/>
-   </runtime>
-
-   <requires>
-   </requires>
-
-
-   <extension
+     <extension
          point="org.eclipse.cdt.core.ProcessList">
       <processList
 	      	platform="win32"
diff --git a/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..ff36120482c
--- /dev/null
+++ b/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF
@@ -0,0 +1,88 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.cdt.core; singleton:=true
+Bundle-Version: 3.1.0
+Bundle-ClassPath: cdtcore.jar,
+ cdtparser.jar
+Bundle-Activator: org.eclipse.cdt.core.CCorePlugin
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Export-Package: .,
+ org.eclipse.cdt.core,
+ org.eclipse.cdt.core.browser,
+ org.eclipse.cdt.core.browser.typehierarchy,
+ org.eclipse.cdt.core.dom,
+ org.eclipse.cdt.core.dom.ast,
+ org.eclipse.cdt.core.dom.ast.c,
+ org.eclipse.cdt.core.dom.ast.cpp,
+ org.eclipse.cdt.core.dom.ast.gnu,
+ org.eclipse.cdt.core.dom.ast.gnu.c,
+ org.eclipse.cdt.core.dom.ast.gnu.cpp,
+ org.eclipse.cdt.core.formatter,
+ org.eclipse.cdt.core.index,
+ org.eclipse.cdt.core.model,
+ org.eclipse.cdt.core.parser,
+ org.eclipse.cdt.core.parser.ast,
+ org.eclipse.cdt.core.parser.ast.gcc,
+ org.eclipse.cdt.core.parser.extension,
+ org.eclipse.cdt.core.parser.util,
+ org.eclipse.cdt.core.resources,
+ org.eclipse.cdt.core.search,
+ org.eclipse.cdt.internal.core,
+ org.eclipse.cdt.internal.core.browser.cache,
+ org.eclipse.cdt.internal.core.browser.util,
+ org.eclipse.cdt.internal.core.dom,
+ org.eclipse.cdt.internal.core.dom.parser,
+ org.eclipse.cdt.internal.core.dom.parser.c,
+ org.eclipse.cdt.internal.core.dom.parser.cpp,
+ org.eclipse.cdt.internal.core.index,
+ org.eclipse.cdt.internal.core.index.cindexstorage,
+ org.eclipse.cdt.internal.core.index.cindexstorage.io,
+ org.eclipse.cdt.internal.core.index.ctagsindexer,
+ org.eclipse.cdt.internal.core.index.domsourceindexer,
+ org.eclipse.cdt.internal.core.index.impl,
+ org.eclipse.cdt.internal.core.index.nullindexer,
+ org.eclipse.cdt.internal.core.model,
+ org.eclipse.cdt.internal.core.parser,
+ org.eclipse.cdt.internal.core.parser.ast,
+ org.eclipse.cdt.internal.core.parser.ast.complete,
+ org.eclipse.cdt.internal.core.parser.ast.complete.gcc,
+ org.eclipse.cdt.internal.core.parser.ast.gcc,
+ org.eclipse.cdt.internal.core.parser.ast.quick,
+ org.eclipse.cdt.internal.core.parser.problem,
+ org.eclipse.cdt.internal.core.parser.pst,
+ org.eclipse.cdt.internal.core.parser.scanner2,
+ org.eclipse.cdt.internal.core.parser.token,
+ org.eclipse.cdt.internal.core.parser.util,
+ org.eclipse.cdt.internal.core.search,
+ org.eclipse.cdt.internal.core.search.indexing,
+ org.eclipse.cdt.internal.core.search.matching,
+ org.eclipse.cdt.internal.core.search.processing,
+ org.eclipse.cdt.internal.core.sourcedependency,
+ org.eclipse.cdt.internal.core.util,
+ org.eclipse.cdt.internal.errorparsers,
+ org.eclipse.cdt.internal.formatter,
+ org.eclipse.cdt.utils,
+ org.eclipse.cdt.utils.coff,
+ org.eclipse.cdt.utils.coff.parser,
+ org.eclipse.cdt.utils.debug,
+ org.eclipse.cdt.utils.debug.dwarf,
+ org.eclipse.cdt.utils.debug.stabs,
+ org.eclipse.cdt.utils.debug.tools,
+ org.eclipse.cdt.utils.elf,
+ org.eclipse.cdt.utils.elf.parser,
+ org.eclipse.cdt.utils.macho,
+ org.eclipse.cdt.utils.macho.parser,
+ org.eclipse.cdt.utils.pty,
+ org.eclipse.cdt.utils.som,
+ org.eclipse.cdt.utils.som.parser,
+ org.eclipse.cdt.utils.spawner,
+ org.eclipse.cdt.utils.xcoff,
+ org.eclipse.cdt.utils.xcoff.parser
+Require-Bundle: org.eclipse.core.resources,
+ org.eclipse.team.core,
+ org.eclipse.core.runtime,
+ org.eclipse.text,
+ org.eclipse.core.variables
+Eclipse-AutoStart: true
diff --git a/core/org.eclipse.cdt.core/build.properties b/core/org.eclipse.cdt.core/build.properties
index de152a1fc25..0b308de5d3a 100644
--- a/core/org.eclipse.cdt.core/build.properties
+++ b/core/org.eclipse.cdt.core/build.properties
@@ -12,7 +12,8 @@ bin.includes = plugin.xml,\
                plugin.properties,\
                about.html,\
                cdtcore.jar,\
-               template/
+               template/,\
+               META-INF/
 jars.compile.order = cdtcore.jar
 src.includes = schema/,\
                doc/,\
diff --git a/core/org.eclipse.cdt.core/plugin.xml b/core/org.eclipse.cdt.core/plugin.xml
index 0f1420b8960..4d2f7f5bbc3 100644
--- a/core/org.eclipse.cdt.core/plugin.xml
+++ b/core/org.eclipse.cdt.core/plugin.xml
@@ -1,28 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.cdt.core"
-   name="%pluginName"
-   version="3.1.0"
-   provider-name="%providerName"
-   class="org.eclipse.cdt.core.CCorePlugin">
-
-   <runtime>
-      <library name="cdtcore.jar">
-         <export name="*"/>
-      </library>
-      <library name="cdtparser.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.team.core"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.text"/>
-      <import plugin="org.eclipse.core.variables"/>
-   </requires>
+<plugin>
 
+    
 <!-- =================================================================================== -->
 <!-- Obsolete extension point no longer in use, will be remove.                          -->
 <!-- =================================================================================== -->
diff --git a/core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..c244ebc959c
--- /dev/null
+++ b/core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,38 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: org.eclipse.cdt.ui.tests
+Bundle-SymbolicName: org.eclipse.cdt.ui.tests; singleton:=true
+Bundle-Version: 3.1.0
+Bundle-ClassPath: cdtuitests.jar
+Bundle-Activator: org.eclipse.cdt.ui.testplugin.CTestPlugin
+Bundle-Localization: plugin
+Export-Package: org.eclipse.cdt.ui.testplugin,
+ org.eclipse.cdt.ui.testplugin.util,
+ org.eclipse.cdt.ui.tests,
+ org.eclipse.cdt.ui.tests.DOMAST,
+ org.eclipse.cdt.ui.tests.IndexerView,
+ org.eclipse.cdt.ui.tests.chelp,
+ org.eclipse.cdt.ui.tests.regression,
+ org.eclipse.cdt.ui.tests.text,
+ org.eclipse.cdt.ui.tests.text.contentassist,
+ org.eclipse.cdt.ui.tests.text.selectiontests
+Require-Bundle: org.eclipse.jface.text,
+ org.eclipse.core.resources,
+ org.eclipse.cdt.ui,
+ org.eclipse.swt,
+ org.eclipse.ui,
+ org.eclipse.ui.editors,
+ org.eclipse.ui.ide,
+ org.eclipse.ui.views,
+ org.eclipse.ui.workbench.texteditor,
+ org.junit,
+ org.eclipse.cdt.core,
+ org.eclipse.cdt.core.tests,
+ org.eclipse.help,
+ org.eclipse.core.runtime,
+ org.eclipse.search,
+ org.eclipse.compare,
+ org.eclipse.ui.console,
+ org.eclipse.core.expressions,
+ org.eclipse.cdt.make.core
+Eclipse-AutoStart: true
diff --git a/core/org.eclipse.cdt.ui.tests/build.properties b/core/org.eclipse.cdt.ui.tests/build.properties
index 053baa940f2..95476aa51b2 100644
--- a/core/org.eclipse.cdt.ui.tests/build.properties
+++ b/core/org.eclipse.cdt.ui.tests/build.properties
@@ -18,6 +18,7 @@ bin.includes = plugin.xml,\
                resources/,\
                icons/,\
                src/,\
-               ui/
+               ui/,\
+               META-INF/
 src.includes = plugin.properties
 about.html = 
diff --git a/core/org.eclipse.cdt.ui.tests/plugin.xml b/core/org.eclipse.cdt.ui.tests/plugin.xml
index 8918201efc7..5d346cd499e 100644
--- a/core/org.eclipse.cdt.ui.tests/plugin.xml
+++ b/core/org.eclipse.cdt.ui.tests/plugin.xml
@@ -1,39 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.cdt.ui.tests"
-   name="org.eclipse.cdt.ui.tests"
-   version="3.1.0"
-   class="org.eclipse.cdt.ui.testplugin.CTestPlugin">
+<plugin>
 
-   <runtime>
-      <library name="cdtuitests.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.cdt.ui"/>
-      <import plugin="org.eclipse.swt"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.ui.views"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-      <import plugin="org.junit"/>
-      <import plugin="org.eclipse.cdt.core"/>
-      <import plugin="org.eclipse.cdt.core.tests"/>
-      <import plugin="org.eclipse.help"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.search"/>
-      <import plugin="org.eclipse.compare"/>
-      <import plugin="org.eclipse.ui.console"/>
-      <import plugin="org.eclipse.core.expressions"/>
-      <import plugin="org.eclipse.cdt.make.core"/>
-   </requires>
-
-   <extension
+     <extension
          point="org.eclipse.cdt.ui.CHelpProvider">
       <provider
          class="org.eclipse.cdt.ui.tests.chelp.CHelpTestInfoProvider"
diff --git a/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..c4d12e26afc
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,80 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.cdt.ui; singleton:=true
+Bundle-Version: 3.1.0
+Bundle-ClassPath: cdtui.jar
+Bundle-Activator: org.eclipse.cdt.ui.CUIPlugin
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Export-Package: .,
+ org.eclipse.cdt.internal.corext,
+ org.eclipse.cdt.internal.corext.refactoring,
+ org.eclipse.cdt.internal.corext.refactoring.base,
+ org.eclipse.cdt.internal.corext.refactoring.changes,
+ org.eclipse.cdt.internal.corext.refactoring.rename,
+ org.eclipse.cdt.internal.corext.template.c,
+ org.eclipse.cdt.internal.corext.textmanipulation,
+ org.eclipse.cdt.internal.corext.util,
+ org.eclipse.cdt.internal.ui,
+ org.eclipse.cdt.internal.ui.actions,
+ org.eclipse.cdt.internal.ui.browser.cbrowsing,
+ org.eclipse.cdt.internal.ui.browser.opentype,
+ org.eclipse.cdt.internal.ui.browser.typehierarchy,
+ org.eclipse.cdt.internal.ui.buildconsole,
+ org.eclipse.cdt.internal.ui.codemanipulation,
+ org.eclipse.cdt.internal.ui.compare,
+ org.eclipse.cdt.internal.ui.cview,
+ org.eclipse.cdt.internal.ui.dialogs,
+ org.eclipse.cdt.internal.ui.dialogs.cpaths,
+ org.eclipse.cdt.internal.ui.dnd,
+ org.eclipse.cdt.internal.ui.editor,
+ org.eclipse.cdt.internal.ui.editor.asm,
+ org.eclipse.cdt.internal.ui.filters,
+ org.eclipse.cdt.internal.ui.preferences,
+ org.eclipse.cdt.internal.ui.refactoring,
+ org.eclipse.cdt.internal.ui.refactoring.actions,
+ org.eclipse.cdt.internal.ui.search,
+ org.eclipse.cdt.internal.ui.search.actions,
+ org.eclipse.cdt.internal.ui.text,
+ org.eclipse.cdt.internal.ui.text.c.hover,
+ org.eclipse.cdt.internal.ui.text.contentassist,
+ org.eclipse.cdt.internal.ui.text.folding,
+ org.eclipse.cdt.internal.ui.text.template,
+ org.eclipse.cdt.internal.ui.text.util,
+ org.eclipse.cdt.internal.ui.util,
+ org.eclipse.cdt.internal.ui.viewsupport,
+ org.eclipse.cdt.internal.ui.wizards,
+ org.eclipse.cdt.internal.ui.wizards.classwizard,
+ org.eclipse.cdt.internal.ui.wizards.dialogfields,
+ org.eclipse.cdt.internal.ui.wizards.filewizard,
+ org.eclipse.cdt.internal.ui.wizards.folderwizard,
+ org.eclipse.cdt.internal.ui.workingsets,
+ org.eclipse.cdt.ui,
+ org.eclipse.cdt.ui.actions,
+ org.eclipse.cdt.ui.browser.typeinfo,
+ org.eclipse.cdt.ui.dialogs,
+ org.eclipse.cdt.ui.index,
+ org.eclipse.cdt.ui.text,
+ org.eclipse.cdt.ui.text.c.hover,
+ org.eclipse.cdt.ui.text.contentassist,
+ org.eclipse.cdt.ui.text.folding,
+ org.eclipse.cdt.ui.wizards,
+ org.eclipse.cdt.ui.wizards.conversion,
+ org.eclipse.cdt.utils.ui.controls
+Require-Bundle: org.eclipse.ui.ide,
+ org.eclipse.ui.views,
+ org.eclipse.jface.text,
+ org.eclipse.ui.workbench.texteditor,
+ org.eclipse.ui.editors,
+ org.eclipse.ui,
+ org.eclipse.core.resources,
+ org.eclipse.search,
+ org.eclipse.compare,
+ org.eclipse.cdt.core,
+ org.eclipse.ui.console,
+ org.eclipse.core.filebuffers,
+ org.eclipse.core.runtime,
+ org.eclipse.core.expressions,
+ org.eclipse.help
+Eclipse-AutoStart: true
diff --git a/core/org.eclipse.cdt.ui/build.properties b/core/org.eclipse.cdt.ui/build.properties
index ba7ca921a8b..215c4a6c004 100644
--- a/core/org.eclipse.cdt.ui/build.properties
+++ b/core/org.eclipse.cdt.ui/build.properties
@@ -13,8 +13,9 @@ bin.includes = about.html,\
                about.html,\
                icons/,\
                plugin.properties,\
-               templates/, \
-               cdtui.jar
+               templates/,\
+               cdtui.jar,\
+               META-INF/
 source.cdtui.jar = src/,\
                    utils.ui/,\
                    browser/,\
diff --git a/core/org.eclipse.cdt.ui/plugin.xml b/core/org.eclipse.cdt.ui/plugin.xml
index 52954de3bb5..8c20f5355d5 100644
--- a/core/org.eclipse.cdt.ui/plugin.xml
+++ b/core/org.eclipse.cdt.ui/plugin.xml
@@ -1,37 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.cdt.ui"
-   name="%pluginName"
-   version="3.1.0"
-   provider-name="%providerName"
-   class="org.eclipse.cdt.ui.CUIPlugin">
+<plugin>
 
-   <runtime>
-      <library name="cdtui.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.ui.views"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-      <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.search"/>
-      <import plugin="org.eclipse.compare"/>
-      <import plugin="org.eclipse.cdt.core"/>
-      <import plugin="org.eclipse.ui.console"/>
-      <import plugin="org.eclipse.core.filebuffers"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.expressions"/>
-      <import plugin="org.eclipse.help"/>
-   </requires>
-
-
-   <extension-point id="CHelpProvider" name="%cHelpProviderName" schema="schema/CHelpProvider.exsd"/>
+     <extension-point id="CHelpProvider" name="%cHelpProviderName" schema="schema/CHelpProvider.exsd"/>
    <extension-point id="CElementFilters" name="%elementFiltersName"/>
    <extension-point id="BinaryParserPage" name="%binaryParserPage"/>
    <extension-point id="PathContainerPage" name="%pathContainerPage" schema="schema/PathContainerPage.exsd"/>
diff --git a/debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF b/debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..d032350da10
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF
@@ -0,0 +1,25 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.cdt.debug.core; singleton:=true
+Bundle-Version: 3.1.0
+Bundle-ClassPath: cdtdebugcore.jar
+Bundle-Activator: org.eclipse.cdt.debug.core.CDebugCorePlugin
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Export-Package: org.eclipse.cdt.debug.core,
+ org.eclipse.cdt.debug.core.cdi,
+ org.eclipse.cdt.debug.core.cdi.event,
+ org.eclipse.cdt.debug.core.cdi.model,
+ org.eclipse.cdt.debug.core.cdi.model.type,
+ org.eclipse.cdt.debug.core.model,
+ org.eclipse.cdt.debug.core.sourcelookup,
+ org.eclipse.cdt.debug.internal.core,
+ org.eclipse.cdt.debug.internal.core.breakpoints,
+ org.eclipse.cdt.debug.internal.core.model,
+ org.eclipse.cdt.debug.internal.core.sourcelookup
+Require-Bundle: org.eclipse.core.resources,
+ org.eclipse.debug.core,
+ org.eclipse.cdt.core,
+ org.eclipse.core.runtime
+Eclipse-AutoStart: true
diff --git a/debug/org.eclipse.cdt.debug.core/build.properties b/debug/org.eclipse.cdt.debug.core/build.properties
index 4170fd20c13..87daf0fcb5e 100644
--- a/debug/org.eclipse.cdt.debug.core/build.properties
+++ b/debug/org.eclipse.cdt.debug.core/build.properties
@@ -12,7 +12,8 @@
 bin.includes = plugin.xml,\
                plugin.properties,\
                about.html,\
-               cdtdebugcore.jar
+               cdtdebugcore.jar,\
+               META-INF/
 source.cdtdebugcore.jar = src/,\
                           cdi/
 javadoc.packages = org.eclipse.cdt.debug.core.*,\
diff --git a/debug/org.eclipse.cdt.debug.core/plugin.xml b/debug/org.eclipse.cdt.debug.core/plugin.xml
index 2c8f7eeac08..90f7a063841 100644
--- a/debug/org.eclipse.cdt.debug.core/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.core/plugin.xml
@@ -1,26 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.cdt.debug.core"
-   name="%pluginName"
-   version="3.1.0"
-   provider-name="%providerName"
-   class="org.eclipse.cdt.debug.core.CDebugCorePlugin">
+<plugin>
 
-   <runtime>
-      <library name="cdtdebugcore.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.cdt.core"/>
-      <import plugin="org.eclipse.core.runtime"/>
-   </requires>
-
-
-   <extension-point id="CDebugger" name="%CDebugger.name" schema="schema/CDebugger.exsd"/>
+     <extension-point id="CDebugger" name="%CDebugger.name" schema="schema/CDebugger.exsd"/>
 
    <extension
          id="cBreakpointMarker"
diff --git a/debug/org.eclipse.cdt.debug.mi.core/META-INF/MANIFEST.MF b/debug/org.eclipse.cdt.debug.mi.core/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..171f29a40f5
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.mi.core/META-INF/MANIFEST.MF
@@ -0,0 +1,23 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.cdt.debug.mi.core; singleton:=true
+Bundle-Version: 3.1.0
+Bundle-ClassPath: cdtmicore.jar
+Bundle-Activator: org.eclipse.cdt.debug.mi.core.MIPlugin
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Export-Package: org.eclipse.cdt.debug.mi.core,
+ org.eclipse.cdt.debug.mi.core.cdi,
+ org.eclipse.cdt.debug.mi.core.cdi.event,
+ org.eclipse.cdt.debug.mi.core.cdi.model,
+ org.eclipse.cdt.debug.mi.core.cdi.model.type,
+ org.eclipse.cdt.debug.mi.core.command,
+ org.eclipse.cdt.debug.mi.core.event,
+ org.eclipse.cdt.debug.mi.core.output
+Require-Bundle: org.eclipse.cdt.debug.core,
+ org.eclipse.core.resources,
+ org.eclipse.debug.core,
+ org.eclipse.cdt.core,
+ org.eclipse.core.runtime
+Eclipse-AutoStart: true
diff --git a/debug/org.eclipse.cdt.debug.mi.core/build.properties b/debug/org.eclipse.cdt.debug.mi.core/build.properties
index 920930ecc82..7f0f028ed94 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/build.properties
+++ b/debug/org.eclipse.cdt.debug.mi.core/build.properties
@@ -12,7 +12,8 @@
 bin.includes = plugin.xml,\
                plugin.properties,\
                about.html,\
-               cdtmicore.jar
+               cdtmicore.jar,\
+               META-INF/
 src.includes = .options
 source.cdtmicore.jar = src/,\
                        cdi/,\
diff --git a/debug/org.eclipse.cdt.debug.mi.core/plugin.xml b/debug/org.eclipse.cdt.debug.mi.core/plugin.xml
index cc2aeb2a479..ef7e709ff56 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.mi.core/plugin.xml
@@ -1,27 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.cdt.debug.mi.core"
-   name="%pluginName"
-   version="3.1.0"
-   provider-name="%providerName"
-   class="org.eclipse.cdt.debug.mi.core.MIPlugin">
+<plugin>
 
-   <runtime>
-      <library name="cdtmicore.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.cdt.debug.core"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.cdt.core"/>
-      <import plugin="org.eclipse.core.runtime"/>
-   </requires>
-
-
-   <extension
+     <extension
          point="org.eclipse.cdt.debug.core.CDebugger">
       <debugger
             platform="*"
diff --git a/debug/org.eclipse.cdt.debug.mi.ui/META-INF/MANIFEST.MF b/debug/org.eclipse.cdt.debug.mi.ui/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..fd15f766171
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.mi.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,25 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.cdt.debug.mi.ui; singleton:=true
+Bundle-Version: 3.1.0
+Bundle-ClassPath: cdtmiui.jar
+Bundle-Activator: org.eclipse.cdt.debug.mi.internal.ui.MIUIPlugin
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Export-Package: org.eclipse.cdt.debug.mi.internal.ui,
+ org.eclipse.cdt.debug.mi.internal.ui.actions,
+ org.eclipse.cdt.debug.mi.internal.ui.dialogfields,
+ org.eclipse.cdt.debug.mi.internal.ui.preferences,
+ org.eclipse.cdt.debug.mi.internal.ui.propertypages,
+ org.eclipse.cdt.debug.mi.ui
+Require-Bundle: org.eclipse.core.resources,
+ org.eclipse.ui,
+ org.eclipse.cdt.debug.mi.core,
+ org.eclipse.cdt.debug.ui,
+ org.eclipse.cdt.debug.core,
+ org.eclipse.cdt.ui,
+ org.eclipse.debug.core,
+ org.eclipse.debug.ui,
+ org.eclipse.core.runtime
+Eclipse-AutoStart: true
diff --git a/debug/org.eclipse.cdt.debug.mi.ui/build.properties b/debug/org.eclipse.cdt.debug.mi.ui/build.properties
index 79b4c32306e..a72bbdf666d 100644
--- a/debug/org.eclipse.cdt.debug.mi.ui/build.properties
+++ b/debug/org.eclipse.cdt.debug.mi.ui/build.properties
@@ -13,5 +13,6 @@ bin.includes = plugin.xml,\
                plugin.properties,\
                about.html,\
                icons/,\
-               cdtmiui.jar
+               cdtmiui.jar,\
+               META-INF/
 source.cdtmiui.jar = src/
diff --git a/debug/org.eclipse.cdt.debug.mi.ui/plugin.xml b/debug/org.eclipse.cdt.debug.mi.ui/plugin.xml
index 14c678055ed..8527d122dd1 100644
--- a/debug/org.eclipse.cdt.debug.mi.ui/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.mi.ui/plugin.xml
@@ -1,31 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.cdt.debug.mi.ui"
-   name="%pluginName"
-   version="3.1.0"
-   provider-name="%providerName"
-   class="org.eclipse.cdt.debug.mi.internal.ui.MIUIPlugin">
+<plugin>
 
-   <runtime>
-      <library name="cdtmiui.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.cdt.debug.mi.core"/>
-      <import plugin="org.eclipse.cdt.debug.ui"/>
-      <import plugin="org.eclipse.cdt.debug.core"/>
-      <import plugin="org.eclipse.cdt.ui"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.debug.ui"/>
-      <import plugin="org.eclipse.core.runtime"/>
-   </requires>
-
-
-   <extension
+     <extension
          point="org.eclipse.cdt.debug.ui.CDebuggerPage">
       <debugPage
             class="org.eclipse.cdt.debug.mi.internal.ui.GDBDebuggerPage"
diff --git a/debug/org.eclipse.cdt.debug.ui.tests/META-INF/MANIFEST.MF b/debug/org.eclipse.cdt.debug.ui.tests/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..300e3581434
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.ui.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,21 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: org.eclipse.cdt.debug.ui.tests
+Bundle-SymbolicName: org.eclipse.cdt.debug.ui.tests
+Bundle-Version: 3.1.0
+Bundle-ClassPath: cdtdebuguitests.jar
+Bundle-Activator: org.eclipse.core.internal.compatibility.PluginActivator
+Bundle-Localization: plugin
+Export-Package: org.eclipse.cdt.debug.core.tests,
+ org.eclipse.cdt.debug.testplugin,
+ org.eclipse.cdt.debug.testplugin.util
+Require-Bundle: org.eclipse.ui.ide,
+ org.eclipse.core.resources,
+ org.junit,
+ org.eclipse.cdt.debug.core,
+ org.eclipse.cdt.debug.mi.core,
+ org.eclipse.cdt.core,
+ org.eclipse.ui,
+ org.eclipse.core.runtime.compatibility
+Eclipse-AutoStart: true
+Plugin-Class: org.eclipse.cdt.debug.testplugin.CTestPlugin
diff --git a/debug/org.eclipse.cdt.debug.ui.tests/build.properties b/debug/org.eclipse.cdt.debug.ui.tests/build.properties
index d58d0ff2f5f..7197056cb11 100644
--- a/debug/org.eclipse.cdt.debug.ui.tests/build.properties
+++ b/debug/org.eclipse.cdt.debug.ui.tests/build.properties
@@ -11,7 +11,8 @@
 source.cdtdebuguitests.jar = src/,\
                        	   core/
 bin.includes = about.html,\
-			   plugin.xml,\
-			   resources/,\
-			   cdtdebuguitests.jar,\
-			   test.xml
+               plugin.xml,\
+               resources/,\
+               cdtdebuguitests.jar,\
+               test.xml,\
+               META-INF/
diff --git a/debug/org.eclipse.cdt.debug.ui.tests/plugin.xml b/debug/org.eclipse.cdt.debug.ui.tests/plugin.xml
index 6022894072d..7bf65fb5f42 100644
--- a/debug/org.eclipse.cdt.debug.ui.tests/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.ui.tests/plugin.xml
@@ -1,26 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.cdt.debug.ui.tests"
-   name="org.eclipse.cdt.debug.ui.tests"
-   version="3.1.0"
-   class="org.eclipse.cdt.debug.testplugin.CTestPlugin">
-
-   <runtime>
-      <library name="cdtdebuguitests.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.junit"/>
-      <import plugin="org.eclipse.cdt.debug.core"/>
-      <import plugin="org.eclipse.cdt.debug.mi.core"/>
-      <import plugin="org.eclipse.cdt.core"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.runtime.compatibility"/>
-   </requires>
-
+<plugin>
 
+    
 </plugin>
diff --git a/debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF b/debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..2d0d1c69346
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,37 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.cdt.debug.ui; singleton:=true
+Bundle-Version: 3.1.0
+Bundle-ClassPath: cdtdebugui.jar
+Bundle-Activator: org.eclipse.cdt.debug.ui.CDebugUIPlugin
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Export-Package: 
+ org.eclipse.cdt.debug.internal.ui,
+ org.eclipse.cdt.debug.internal.ui.actions,
+ org.eclipse.cdt.debug.internal.ui.dialogfields,
+ org.eclipse.cdt.debug.internal.ui.editors,
+ org.eclipse.cdt.debug.internal.ui.preferences,
+ org.eclipse.cdt.debug.internal.ui.propertypages,
+ org.eclipse.cdt.debug.internal.ui.sourcelookup,
+ org.eclipse.cdt.debug.internal.ui.views,
+ org.eclipse.cdt.debug.internal.ui.views.disassembly,
+ org.eclipse.cdt.debug.internal.ui.views.modules,
+ org.eclipse.cdt.debug.internal.ui.views.signals,
+ org.eclipse.cdt.debug.ui,
+ org.eclipse.cdt.debug.ui.sourcelookup
+Require-Bundle: org.eclipse.ui.ide,
+ org.eclipse.jface.text,
+ org.eclipse.ui.workbench.texteditor,
+ org.eclipse.ui.editors,
+ org.eclipse.core.resources,
+ org.eclipse.ui,
+ org.eclipse.debug.ui,
+ org.eclipse.debug.core,
+ org.eclipse.cdt.debug.core,
+ org.eclipse.cdt.ui,
+ org.eclipse.cdt.core,
+ org.eclipse.core.runtime,
+ org.eclipse.ui.console
+Eclipse-AutoStart: true
diff --git a/debug/org.eclipse.cdt.debug.ui/build.properties b/debug/org.eclipse.cdt.debug.ui/build.properties
index 9cc3fd38dc6..1802e80faff 100644
--- a/debug/org.eclipse.cdt.debug.ui/build.properties
+++ b/debug/org.eclipse.cdt.debug.ui/build.properties
@@ -13,7 +13,8 @@ bin.includes = plugin.xml,\
                plugin.properties,\
                about.html,\
                icons/,\
-               cdtdebugui.jar
+               cdtdebugui.jar,\
+               META-INF/
 javadoc.packages = org.eclipse.cdt.debug.ui.*,\
                    org.eclipse.cdt.debug.ui.sourcelookup.*
 source.cdtdebugui.jar = src/
diff --git a/debug/org.eclipse.cdt.debug.ui/plugin.xml b/debug/org.eclipse.cdt.debug.ui/plugin.xml
index 552da2acf5f..12ae133ac08 100644
--- a/debug/org.eclipse.cdt.debug.ui/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.ui/plugin.xml
@@ -1,35 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.cdt.debug.ui"
-   name="%pluginName"
-   version="3.1.0"
-   provider-name="%providerName"
-   class="org.eclipse.cdt.debug.ui.CDebugUIPlugin">
+<plugin>
 
-   <runtime>
-      <library name="cdtdebugui.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-      <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.debug.ui"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.cdt.debug.core"/>
-      <import plugin="org.eclipse.cdt.ui"/>
-      <import plugin="org.eclipse.cdt.core"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.ui.console"/>
-   </requires>
-
-
-   <extension-point id="CDebuggerPage" name="%CDebuggerPage"/>
+     <extension-point id="CDebuggerPage" name="%CDebuggerPage"/>
 
 <!-- Extensions -->
    <extension
diff --git a/doc/org.eclipse.cdt.doc.isv/META-INF/MANIFEST.MF b/doc/org.eclipse.cdt.doc.isv/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..315fce4c309
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.isv/META-INF/MANIFEST.MF
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: C/C++ Plugin Developer Guide
+Bundle-SymbolicName: org.eclipse.cdt.doc.isv; singleton:=true
+Bundle-Version: 3.1.0
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.help
+Eclipse-AutoStart: true
diff --git a/doc/org.eclipse.cdt.doc.isv/build.properties b/doc/org.eclipse.cdt.doc.isv/build.properties
index 4f9739baeb0..38ba591fbfb 100644
--- a/doc/org.eclipse.cdt.doc.isv/build.properties
+++ b/doc/org.eclipse.cdt.doc.isv/build.properties
@@ -9,3 +9,4 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 custom = true
+bin.includes = META-INF/
diff --git a/doc/org.eclipse.cdt.doc.isv/plugin.xml b/doc/org.eclipse.cdt.doc.isv/plugin.xml
index c1898d50c07..8fd83704689 100644
--- a/doc/org.eclipse.cdt.doc.isv/plugin.xml
+++ b/doc/org.eclipse.cdt.doc.isv/plugin.xml
@@ -1,13 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.cdt.doc.isv"
-   name="C/C++ Plugin Developer Guide"
-   version="3.1.0">
-   <requires>
-      <import plugin="org.eclipse.help"/>
-   </requires>
-   <extension
+<plugin>
+    <extension
          point="org.eclipse.help.toc">
       <toc
             primary="true"
diff --git a/doc/org.eclipse.cdt.doc.user/META-INF/MANIFEST.MF b/doc/org.eclipse.cdt.doc.user/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..2d535789e6a
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/META-INF/MANIFEST.MF
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.cdt.doc.user; singleton:=true
+Bundle-Version: 3.1.0
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Eclipse-AutoStart: true
diff --git a/doc/org.eclipse.cdt.doc.user/build.properties b/doc/org.eclipse.cdt.doc.user/build.properties
index b63dcf85b5c..a26e04c5147 100644
--- a/doc/org.eclipse.cdt.doc.user/build.properties
+++ b/doc/org.eclipse.cdt.doc.user/build.properties
@@ -26,4 +26,5 @@ bin.includes = about.html,\
                topics_Concepts.xml,\
                topics_Getting_Started.xml,\
                topics_Reference.xml,\
-               topics_Tasks.xml
+               topics_Tasks.xml,\
+               META-INF/
diff --git a/doc/org.eclipse.cdt.doc.user/plugin.xml b/doc/org.eclipse.cdt.doc.user/plugin.xml
index 69aee99f827..6ade5817aa0 100644
--- a/doc/org.eclipse.cdt.doc.user/plugin.xml
+++ b/doc/org.eclipse.cdt.doc.user/plugin.xml
@@ -1,14 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.cdt.doc.user"
-   name="%pluginName"
-   version="3.1.0"
-   provider-name="%providerName">
-
-   <runtime>
-   </runtime>
+<plugin>
 
+   
 <!-- Configure the help contribution for this plugin -->
 <!-- This part should be in a documentation plugin -->
 <!-- ============================================================================= -->
diff --git a/launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF b/launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..b2d39aecc92
--- /dev/null
+++ b/launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF
@@ -0,0 +1,26 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.cdt.launch; singleton:=true
+Bundle-Version: 3.1.0
+Bundle-ClassPath: cdtlaunch.jar
+Bundle-Activator: org.eclipse.cdt.launch.internal.ui.LaunchUIPlugin
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Export-Package: org.eclipse.cdt.launch,
+ org.eclipse.cdt.launch.internal,
+ org.eclipse.cdt.launch.internal.ui,
+ org.eclipse.cdt.launch.ui
+Require-Bundle: org.eclipse.ui.ide,
+ org.eclipse.core.expressions,
+ org.eclipse.core.resources,
+ org.eclipse.debug.core,
+ org.eclipse.debug.ui,
+ org.eclipse.ui,
+ org.eclipse.cdt.core,
+ org.eclipse.cdt.ui,
+ org.eclipse.cdt.debug.core,
+ org.eclipse.cdt.debug.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.core.variables
+Eclipse-AutoStart: true
diff --git a/launch/org.eclipse.cdt.launch/build.properties b/launch/org.eclipse.cdt.launch/build.properties
index d09ce46fc1a..df6d49a0a76 100644
--- a/launch/org.eclipse.cdt.launch/build.properties
+++ b/launch/org.eclipse.cdt.launch/build.properties
@@ -13,7 +13,8 @@ bin.includes = plugin.xml,\
                plugin.properties,\
                icons/,\
                about.html,\
-               cdtlaunch.jar
+               cdtlaunch.jar,\
+               META-INF/
 javadoc.packages = org.eclipse.cdt.launch.ui.*,\
                    org.eclipse.cdt.launch.sourcelookup*,\
                    org.eclipse.cdt.launch.*
diff --git a/launch/org.eclipse.cdt.launch/plugin.xml b/launch/org.eclipse.cdt.launch/plugin.xml
index 303c8d2f9c0..9bedfa5922b 100644
--- a/launch/org.eclipse.cdt.launch/plugin.xml
+++ b/launch/org.eclipse.cdt.launch/plugin.xml
@@ -1,34 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.cdt.launch"
-   name="%pluginName"
-   version="3.1.0"
-   provider-name="%providerName"
-   class="org.eclipse.cdt.launch.internal.ui.LaunchUIPlugin">
+<plugin>
 
-   <runtime>
-      <library name="cdtlaunch.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.core.expressions"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.debug.ui"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.cdt.core"/>
-      <import plugin="org.eclipse.cdt.ui"/>
-      <import plugin="org.eclipse.cdt.debug.core"/>
-      <import plugin="org.eclipse.cdt.debug.ui"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.variables"/>
-   </requires>
-
-
-   <extension
+     <extension
          point="org.eclipse.debug.core.launchConfigurationTypes">
       <launchConfigurationType
             sourceLocatorId="org.eclipse.cdt.debug.core.sourceLocator"
diff --git a/releng/org.eclipse.cdt.sdk/META-INF/MANIFEST.MF b/releng/org.eclipse.cdt.sdk/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..1a0698f6db7
--- /dev/null
+++ b/releng/org.eclipse.cdt.sdk/META-INF/MANIFEST.MF
@@ -0,0 +1,7 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.cdt.sdk
+Bundle-Version: 3.1.0
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
diff --git a/releng/org.eclipse.cdt.sdk/build.properties b/releng/org.eclipse.cdt.sdk/build.properties
index 0875915d85b..a5d691326e2 100644
--- a/releng/org.eclipse.cdt.sdk/build.properties
+++ b/releng/org.eclipse.cdt.sdk/build.properties
@@ -17,4 +17,5 @@ bin.includes = plugin.xml,\
                notice.html,\
                plugin.properties,\
                welcome.xml,\
-               epl-v10.html
+               epl-v10.html,\
+               META-INF/
diff --git a/releng/org.eclipse.cdt.sdk/plugin.xml b/releng/org.eclipse.cdt.sdk/plugin.xml
index de2577f7f1a..9e43bacc685 100644
--- a/releng/org.eclipse.cdt.sdk/plugin.xml
+++ b/releng/org.eclipse.cdt.sdk/plugin.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.cdt.sdk"
-   name="%pluginName"
-   version="3.1.0"
-   provider-name="%providerName">
+<plugin>
 
 
 </plugin>
diff --git a/releng/org.eclipse.cdt.testing/META-INF/MANIFEST.MF b/releng/org.eclipse.cdt.testing/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..c0013bc745a
--- /dev/null
+++ b/releng/org.eclipse.cdt.testing/META-INF/MANIFEST.MF
@@ -0,0 +1,7 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.cdt.testing
+Bundle-Version: 3.1.0
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
diff --git a/releng/org.eclipse.cdt.testing/build.properties b/releng/org.eclipse.cdt.testing/build.properties
index 5dad19b2e02..a6bbba80f56 100644
--- a/releng/org.eclipse.cdt.testing/build.properties
+++ b/releng/org.eclipse.cdt.testing/build.properties
@@ -17,4 +17,5 @@ bin.includes = about.html,\
                plugin.xml,\
                test.xml,\
                epl-v10.html,\
-               notice.html
+               notice.html,\
+               META-INF/
diff --git a/releng/org.eclipse.cdt.testing/plugin.xml b/releng/org.eclipse.cdt.testing/plugin.xml
index 23857ac976d..8b8bbbf0e65 100644
--- a/releng/org.eclipse.cdt.testing/plugin.xml
+++ b/releng/org.eclipse.cdt.testing/plugin.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.cdt.testing"
-   name="%pluginName"
-   version="3.1.0"
-   provider-name="%providerName">
-
-   <runtime>
-   </runtime>
+<plugin>
 
+   
 </plugin>