Fixed build for jar'd plugins

cleaned up .project files

36 files changed, 63 insertions, 85 deletions

diff --git a/build/org.eclipse.cdt.make.core/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.make.core/META-INF/MANIFEST.MF
index 93c3d3ccc8e..3f29dd3799b 100644
--- a/build/org.eclipse.cdt.make.core/META-INF/MANIFEST.MF
+++ b/build/org.eclipse.cdt.make.core/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.make.core; singleton:=true
 Bundle-Version: 3.1.0.qualifier
-Bundle-ClassPath: cdtmakecore.jar
 Bundle-Activator: org.eclipse.cdt.make.core.MakeCorePlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -24,4 +23,4 @@ Require-Bundle: org.eclipse.core.resources,
  org.eclipse.core.variables,
  org.eclipse.core.runtime,
  org.eclipse.cdt.core
-Eclipse-AutoStart: true
+Eclipse-LazyStart: true
diff --git a/build/org.eclipse.cdt.make.core/build.properties b/build/org.eclipse.cdt.make.core/build.properties
index e5f1e059950..05e7f7134cb 100644
--- a/build/org.eclipse.cdt.make.core/build.properties
+++ b/build/org.eclipse.cdt.make.core/build.properties
@@ -10,12 +10,12 @@
 ###############################################################################
 
 bin.includes = plugin.xml,\
-               *.jar,\
-               cdtmakecore.jar,\
-               *.html,\
+               about.html,\
                plugin.properties,\
                builtin/,\
+               .,\
                META-INF/
 src.includes = schema/,\
                .options
-source.cdtmakecore.jar = src/
+
+source.. = src/
diff --git a/build/org.eclipse.cdt.make.ui/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.make.ui/META-INF/MANIFEST.MF
index 8b5d131a493..9938b15a71d 100644
--- a/build/org.eclipse.cdt.make.ui/META-INF/MANIFEST.MF
+++ b/build/org.eclipse.cdt.make.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.make.ui; singleton:=true
 Bundle-Version: 3.1.0.qualifier
-Bundle-ClassPath: cdtmakeui.jar
 Bundle-Activator: org.eclipse.cdt.make.internal.ui.MakeUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -33,4 +32,4 @@ Require-Bundle: org.eclipse.ui.ide,
  org.eclipse.cdt.make.core,
  org.eclipse.core.runtime,
  org.eclipse.debug.ui
-Eclipse-AutoStart: true
+Eclipse-LazyStart: true
diff --git a/build/org.eclipse.cdt.make.ui/build.properties b/build/org.eclipse.cdt.make.ui/build.properties
index e004a1d2eb9..a96067365d7 100644
--- a/build/org.eclipse.cdt.make.ui/build.properties
+++ b/build/org.eclipse.cdt.make.ui/build.properties
@@ -9,10 +9,10 @@
 #     QNX Software Systems - Initial API and implementation
 ###############################################################################
 bin.includes = plugin.xml,\
-               *.jar,\
-               cdtmakeui.jar,\
                icons/,\
-               *.html,\
+               about.html,\
                plugin.properties,\
+               .,\
                META-INF/
-source.cdtmakeui.jar = src/
+source.. = src/
+src.includes = schema/
diff --git a/build/org.eclipse.cdt.managedbuilder.core/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.managedbuilder.core/META-INF/MANIFEST.MF
index 2c370370b84..babc1b3384f 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/META-INF/MANIFEST.MF
+++ b/build/org.eclipse.cdt.managedbuilder.core/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.managedbuilder.core; singleton:=true
 Bundle-Version: 3.1.0.qualifier
-Bundle-ClassPath: mngbuildcore.jar
 Bundle-Activator: org.eclipse.cdt.managedbuilder.core.ManagedBuilderCorePlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -25,4 +24,4 @@ Require-Bundle: org.eclipse.cdt.core,
  org.eclipse.cdt.make.core,
  org.eclipse.ui,
  org.eclipse.core.variables
-Eclipse-AutoStart: true
+Eclipse-LazyStart: true
diff --git a/build/org.eclipse.cdt.managedbuilder.core/build.properties b/build/org.eclipse.cdt.managedbuilder.core/build.properties
index 301ddc41c92..08254a36428 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/build.properties
+++ b/build/org.eclipse.cdt.managedbuilder.core/build.properties
@@ -11,7 +11,8 @@
 bin.includes = plugin.xml,\
                plugin.properties,\
                about.html,\
-               mngbuildcore.jar,\
+               .,\
                META-INF/
-source.mngbuildcore.jar = src/
 src.includes = schema/
+source.. = src/
+
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
index 5c2b11ca814..354202dc8cd 100644
--- a/build/org.eclipse.cdt.managedbuilder.gnu.ui/META-INF/MANIFEST.MF
+++ b/build/org.eclipse.cdt.managedbuilder.gnu.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.managedbuilder.gnu.ui; singleton:=true
 Bundle-Version: 3.1.0.qualifier
-Bundle-ClassPath: gnuui.jar
 Bundle-Activator: org.eclipse.cdt.managedbuilder.gnu.ui.GnuUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -12,4 +11,4 @@ Export-Package: org.eclipse.cdt.managedbuilder.gnu.cygwin,
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.cdt.managedbuilder.core,
  org.eclipse.cdt.core
-Eclipse-AutoStart: true
+Eclipse-LazyStart: true
diff --git a/build/org.eclipse.cdt.managedbuilder.gnu.ui/build.properties b/build/org.eclipse.cdt.managedbuilder.gnu.ui/build.properties
index 1411b1abc20..402a55626db 100644
--- a/build/org.eclipse.cdt.managedbuilder.gnu.ui/build.properties
+++ b/build/org.eclipse.cdt.managedbuilder.gnu.ui/build.properties
@@ -10,9 +10,8 @@
 ###############################################################################
 bin.includes = plugin.xml,\
                plugin.properties,\
-               gnuui.jar,\
                about.html,\
+               .,\
                META-INF/
-jars.compile.order = gnuui.jar
-source.gnuui.jar = src/
-output.gnuui.jar = bin/
+source.. = src/
+
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.managedbuilder.ui/META-INF/MANIFEST.MF
index a684f3c55c1..43034926383 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/META-INF/MANIFEST.MF
+++ b/build/org.eclipse.cdt.managedbuilder.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.managedbuilder.ui; singleton:=true
 Bundle-Version: 3.1.0.qualifier
-Bundle-ClassPath: mgdbuildui.jar
 Bundle-Activator: org.eclipse.cdt.managedbuilder.internal.ui.ManagedBuilderUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -19,4 +18,4 @@ Require-Bundle: org.eclipse.ui.ide,
  org.eclipse.cdt.managedbuilder.core,
  org.eclipse.core.runtime,
  org.eclipse.core.variables
-Eclipse-AutoStart: true
+Eclipse-LazyStart: true
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/build.properties b/build/org.eclipse.cdt.managedbuilder.ui/build.properties
index 9f8056f7697..40af619ca62 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/build.properties
+++ b/build/org.eclipse.cdt.managedbuilder.ui/build.properties
@@ -12,7 +12,8 @@ bin.includes = plugin.xml,\
                plugin.properties,\
                about.html,\
                icons/,\
-               mgdbuildui.jar,\
+               .,\
                META-INF/
-source.mgdbuildui.jar = src/
 src.includes = schema/
+source.. = src/
+
diff --git a/core/org.eclipse.cdt.core.aix/.project b/core/org.eclipse.cdt.core.aix/.project
index 8edd1404d74..b463663a422 100644
--- a/core/org.eclipse.cdt.core.aix/.project
+++ b/core/org.eclipse.cdt.core.aix/.project
@@ -3,7 +3,6 @@
 	<name>org.eclipse.cdt.core.aix</name>
 	<comment></comment>
 	<projects>
-		<project>org.eclipse.cdt.core</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/core/org.eclipse.cdt.core.aix/build.properties b/core/org.eclipse.cdt.core.aix/build.properties
index 003cce1ab7a..078a0e987a1 100644
--- a/core/org.eclipse.cdt.core.aix/build.properties
+++ b/core/org.eclipse.cdt.core.aix/build.properties
@@ -10,9 +10,9 @@
 ###############################################################################
 source.cdtaix.jar = src/
 bin.includes = fragment.xml,\
-               *.jar,\
                cdtaix.jar,\
                fragment.properties,\
                about.html,\
-               META-INF/
+               META-INF/,\
+               os/
 src.includes = library/
diff --git a/core/org.eclipse.cdt.core.linux/.project b/core/org.eclipse.cdt.core.linux/.project
index 43f20bda72b..8e8b3560544 100644
--- a/core/org.eclipse.cdt.core.linux/.project
+++ b/core/org.eclipse.cdt.core.linux/.project
@@ -3,7 +3,6 @@
 	<name>org.eclipse.cdt.core.linux</name>
 	<comment></comment>
 	<projects>
-		<project>org.eclipse.cdt.core</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/core/org.eclipse.cdt.core.macosx/.project b/core/org.eclipse.cdt.core.macosx/.project
index 0cda5672e50..d56d04e05eb 100644
--- a/core/org.eclipse.cdt.core.macosx/.project
+++ b/core/org.eclipse.cdt.core.macosx/.project
@@ -3,7 +3,6 @@
 	<name>org.eclipse.cdt.core.macosx</name>
 	<comment></comment>
 	<projects>
-		<project>org.eclipse.cdt.core</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/core/org.eclipse.cdt.core.qnx/.project b/core/org.eclipse.cdt.core.qnx/.project
index 9aa2652590a..bfff1d26cb1 100644
--- a/core/org.eclipse.cdt.core.qnx/.project
+++ b/core/org.eclipse.cdt.core.qnx/.project
@@ -3,7 +3,6 @@
 	<name>org.eclipse.cdt.core.qnx</name>
 	<comment></comment>
 	<projects>
-		<project>org.eclipse.cdt.core</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/core/org.eclipse.cdt.core.solaris/.project b/core/org.eclipse.cdt.core.solaris/.project
index d02ba7f9f05..7cc7c8e5e6d 100644
--- a/core/org.eclipse.cdt.core.solaris/.project
+++ b/core/org.eclipse.cdt.core.solaris/.project
@@ -3,7 +3,6 @@
 	<name>org.eclipse.cdt.core.solaris</name>
 	<comment></comment>
 	<projects>
-		<project>org.eclipse.cdt.core</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/core/org.eclipse.cdt.core.tests/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.tests/META-INF/MANIFEST.MF
index c1df6cef610..135e710c55a 100644
--- a/core/org.eclipse.cdt.core.tests/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.core.tests/META-INF/MANIFEST.MF
@@ -28,4 +28,4 @@ Require-Bundle: org.eclipse.core.resources,
  org.eclipse.ui.ide,
  org.eclipse.jface,
  org.eclipse.ui
-Eclipse-AutoStart: true
+Eclipse-LazyStart: true
diff --git a/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF
index 9a4017c94e7..13b51bd0cb8 100644
--- a/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF
@@ -3,12 +3,10 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.core; singleton:=true
 Bundle-Version: 3.1.0.qualifier
-Bundle-ClassPath: cdtcore.jar
 Bundle-Activator: org.eclipse.cdt.core.CCorePlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: .,
- org.eclipse.cdt.core,
+Export-Package: org.eclipse.cdt.core,
  org.eclipse.cdt.core.browser,
  org.eclipse.cdt.core.browser.typehierarchy,
  org.eclipse.cdt.core.dom,
@@ -86,4 +84,4 @@ Require-Bundle: org.eclipse.core.resources,
  org.eclipse.core.runtime,
  org.eclipse.text,
  org.eclipse.core.variables
-Eclipse-AutoStart: true
+Eclipse-LazyStart: true
diff --git a/core/org.eclipse.cdt.core/build.properties b/core/org.eclipse.cdt.core/build.properties
index 0b308de5d3a..494ed20fe2d 100644
--- a/core/org.eclipse.cdt.core/build.properties
+++ b/core/org.eclipse.cdt.core/build.properties
@@ -11,10 +11,9 @@
 bin.includes = plugin.xml,\
                plugin.properties,\
                about.html,\
-               cdtcore.jar,\
                template/,\
+               .,\
                META-INF/
-jars.compile.order = cdtcore.jar
 src.includes = schema/,\
                doc/,\
                .options
@@ -25,12 +24,11 @@ javadoc.packages = org.eclipse.cdt.core.*,\
                    org.eclipse.cdt.utils.*,\
                    org.eclipse.cdt.utils.elf.*,\
                    org.eclipse.cdt.utils.spawner.*
-source.cdtcore.jar = index/,\
-                     model/,\
-                     src/,\
-                     utils/,\
-                     search/,\
-                     dependency/,\
-                     browser/,\
-                     parser/
-output.cdtcore.jar = bin/
+source.. = src/,\
+           browser/,\
+           dependency/,\
+           index/,\
+           model/,\
+           parser/,\
+           search/,\
+           utils/
diff --git a/core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF
index 4192f26704a..074055d7549 100644
--- a/core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF
@@ -35,4 +35,4 @@ Require-Bundle: org.eclipse.jface.text,
  org.eclipse.ui.console,
  org.eclipse.core.expressions,
  org.eclipse.cdt.make.core
-Eclipse-AutoStart: true
+Eclipse-LazyStart: true
diff --git a/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF
index d411a33b94c..f1aefbf953d 100644
--- a/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF
@@ -3,12 +3,10 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.ui; singleton:=true
 Bundle-Version: 3.1.0.qualifier
-Bundle-ClassPath: cdtui.jar
 Bundle-Activator: org.eclipse.cdt.ui.CUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: .,
- org.eclipse.cdt.internal.corext,
+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,
@@ -76,4 +74,4 @@ Require-Bundle: org.eclipse.ui.ide,
  org.eclipse.core.filebuffers,
  org.eclipse.core.runtime,
  org.eclipse.help
-Eclipse-AutoStart: true
+Eclipse-LazyStart: true
diff --git a/core/org.eclipse.cdt.ui/build.properties b/core/org.eclipse.cdt.ui/build.properties
index 215c4a6c004..c83f78fcb4f 100644
--- a/core/org.eclipse.cdt.ui/build.properties
+++ b/core/org.eclipse.cdt.ui/build.properties
@@ -14,15 +14,15 @@ bin.includes = about.html,\
                icons/,\
                plugin.properties,\
                templates/,\
-               cdtui.jar,\
+               .,\
                META-INF/
-source.cdtui.jar = src/,\
-                   utils.ui/,\
-                   browser/,\
-                   refactor/
 src.includes = about.html,\
                schema/
 javadoc.packages = org.eclipse.cdt.ui.*,\
                    org.eclipse.cdt.ui.wizards.*,\
                    org.eclipse.cdt.ui.wizards.conversion.*
-output.cdtui.jar = bin/
+
+source.. = src/,\
+           browser/,\
+           utils.ui/,\
+           refactor/
diff --git a/debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF b/debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF
index 9d45c520b3e..41b3f4bf213 100644
--- a/debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF
+++ b/debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.debug.core; singleton:=true
 Bundle-Version: 3.1.0.qualifier
-Bundle-ClassPath: cdtdebugcore.jar
 Bundle-Activator: org.eclipse.cdt.debug.core.CDebugCorePlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/debug/org.eclipse.cdt.debug.core/build.properties b/debug/org.eclipse.cdt.debug.core/build.properties
index 87daf0fcb5e..7fbf88b94c4 100644
--- a/debug/org.eclipse.cdt.debug.core/build.properties
+++ b/debug/org.eclipse.cdt.debug.core/build.properties
@@ -12,14 +12,13 @@
 bin.includes = plugin.xml,\
                plugin.properties,\
                about.html,\
-               cdtdebugcore.jar,\
+               .,\
                META-INF/
-source.cdtdebugcore.jar = src/,\
-                          cdi/
 javadoc.packages = 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.*
 src.includes = schema/
-jars.compile.order = 
-output.cdtdebugcore.jar = bin/
+source.. = src/,\
+           cdi/
+
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
index 7185d5ddd5c..f349eb70705 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/META-INF/MANIFEST.MF
+++ b/debug/org.eclipse.cdt.debug.mi.core/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.debug.mi.core; singleton:=true
 Bundle-Version: 3.1.0.qualifier
-Bundle-ClassPath: cdtmicore.jar
 Bundle-Activator: org.eclipse.cdt.debug.mi.core.MIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/debug/org.eclipse.cdt.debug.mi.core/build.properties b/debug/org.eclipse.cdt.debug.mi.core/build.properties
index 7f0f028ed94..f768a7a7968 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/build.properties
+++ b/debug/org.eclipse.cdt.debug.mi.core/build.properties
@@ -12,15 +12,14 @@
 bin.includes = plugin.xml,\
                plugin.properties,\
                about.html,\
-               cdtmicore.jar,\
+               .,\
                META-INF/
 src.includes = .options
-source.cdtmicore.jar = src/,\
-                       cdi/,\
-                       mi/
 javadoc.packages = org.eclipse.cdt.debug.mi.core.*,\
                    org.eclipse.cdt.debug.mi.core.cdi.*,\
                    org.eclipse.cdt.debug.mi.core.command.*,\
                    org.eclipse.cdt.debug.mi.core.event.*,\
                    org.eclipse.cdt.debug.mi.core.output.*
-output.cdtmicore.jar = bin/
+source.. = cdi/,\
+           mi/,\
+           src/
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
index a1a310f63db..624f05501c6 100644
--- a/debug/org.eclipse.cdt.debug.mi.ui/META-INF/MANIFEST.MF
+++ b/debug/org.eclipse.cdt.debug.mi.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.debug.mi.ui; singleton:=true
 Bundle-Version: 3.1.0.qualifier
-Bundle-ClassPath: cdtmiui.jar
 Bundle-Activator: org.eclipse.cdt.debug.mi.internal.ui.MIUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/debug/org.eclipse.cdt.debug.mi.ui/build.properties b/debug/org.eclipse.cdt.debug.mi.ui/build.properties
index a72bbdf666d..45a3e07552b 100644
--- a/debug/org.eclipse.cdt.debug.mi.ui/build.properties
+++ b/debug/org.eclipse.cdt.debug.mi.ui/build.properties
@@ -13,6 +13,6 @@ bin.includes = plugin.xml,\
                plugin.properties,\
                about.html,\
                icons/,\
-               cdtmiui.jar,\
+               .,\
                META-INF/
-source.cdtmiui.jar = src/
+source.. = src/
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
index 02007cfd549..a57f666f32b 100644
--- a/debug/org.eclipse.cdt.debug.ui.tests/META-INF/MANIFEST.MF
+++ b/debug/org.eclipse.cdt.debug.ui.tests/META-INF/MANIFEST.MF
@@ -17,5 +17,5 @@ Require-Bundle: org.eclipse.ui.ide,
  org.eclipse.cdt.core,
  org.eclipse.ui,
  org.eclipse.core.runtime.compatibility
-Eclipse-AutoStart: true
+Eclipse-LazyStart: true
 Plugin-Class: org.eclipse.cdt.debug.testplugin.CTestPlugin
diff --git a/debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF b/debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF
index b192ca01fcb..4c1de3ad37d 100644
--- a/debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF
+++ b/debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.debug.ui; singleton:=true
 Bundle-Version: 3.1.0.qualifier
-Bundle-ClassPath: cdtdebugui.jar
 Bundle-Activator: org.eclipse.cdt.debug.ui.CDebugUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/debug/org.eclipse.cdt.debug.ui/build.properties b/debug/org.eclipse.cdt.debug.ui/build.properties
index 1802e80faff..3f74e700286 100644
--- a/debug/org.eclipse.cdt.debug.ui/build.properties
+++ b/debug/org.eclipse.cdt.debug.ui/build.properties
@@ -13,8 +13,8 @@ bin.includes = plugin.xml,\
                plugin.properties,\
                about.html,\
                icons/,\
-               cdtdebugui.jar,\
+               .,\
                META-INF/
 javadoc.packages = org.eclipse.cdt.debug.ui.*,\
                    org.eclipse.cdt.debug.ui.sourcelookup.*
-source.cdtdebugui.jar = src/
+source.. = src/
diff --git a/doc/org.eclipse.cdt.doc.isv/META-INF/MANIFEST.MF b/doc/org.eclipse.cdt.doc.isv/META-INF/MANIFEST.MF
index 7f2c564d871..8ab2a4dca5d 100644
--- a/doc/org.eclipse.cdt.doc.isv/META-INF/MANIFEST.MF
+++ b/doc/org.eclipse.cdt.doc.isv/META-INF/MANIFEST.MF
@@ -5,4 +5,4 @@ Bundle-SymbolicName: org.eclipse.cdt.doc.isv; singleton:=true
 Bundle-Version: 3.1.0.qualifier
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.help
-Eclipse-AutoStart: true
+Eclipse-LazyStart: 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
index b70a06a1cda..30f737042a0 100644
--- a/doc/org.eclipse.cdt.doc.user/META-INF/MANIFEST.MF
+++ b/doc/org.eclipse.cdt.doc.user/META-INF/MANIFEST.MF
@@ -5,4 +5,4 @@ Bundle-SymbolicName: org.eclipse.cdt.doc.user; singleton:=true
 Bundle-Version: 3.1.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Eclipse-AutoStart: true
+Eclipse-LazyStart: true
diff --git a/launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF b/launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF
index 4dc5fb493d7..34309051115 100644
--- a/launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF
+++ b/launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.launch; singleton:=true
 Bundle-Version: 3.1.0.qualifier
-Bundle-ClassPath: cdtlaunch.jar
 Bundle-Activator: org.eclipse.cdt.launch.internal.ui.LaunchUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/launch/org.eclipse.cdt.launch/build.properties b/launch/org.eclipse.cdt.launch/build.properties
index df6d49a0a76..829edbe2238 100644
--- a/launch/org.eclipse.cdt.launch/build.properties
+++ b/launch/org.eclipse.cdt.launch/build.properties
@@ -13,9 +13,9 @@ bin.includes = plugin.xml,\
                plugin.properties,\
                icons/,\
                about.html,\
-               cdtlaunch.jar,\
+               .,\
                META-INF/
 javadoc.packages = org.eclipse.cdt.launch.ui.*,\
                    org.eclipse.cdt.launch.sourcelookup*,\
                    org.eclipse.cdt.launch.*
-source.cdtlaunch.jar = src/
+source.. = src/
diff --git a/releng/org.eclipse.cdt/META-INF/MANIFEST.MF b/releng/org.eclipse.cdt/META-INF/MANIFEST.MF
index dd4a152c6dc..4ec33754594 100644
--- a/releng/org.eclipse.cdt/META-INF/MANIFEST.MF
+++ b/releng/org.eclipse.cdt/META-INF/MANIFEST.MF
@@ -7,4 +7,4 @@ Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui.intro,
  org.eclipse.ui.cheatsheets
-Eclipse-AutoStart: true
+Eclipse-LazyStart: true