Bug 411672 - SWT's API description files are empty in CBI builds
diff --git a/bundles/binaries-parent/pom.xml b/bundles/binaries-parent/pom.xml
index 3062aa2..4e71050 100644
--- a/bundles/binaries-parent/pom.xml
+++ b/bundles/binaries-parent/pom.xml
@@ -46,25 +46,11 @@
         <executions>
           <execution>
             <id>normal</id>
-            <phase>compile</phase>
+            <phase>initialize</phase>
             <configuration>
               <target>
-                <property name="build.compiler" value="extJavac"/>
-                <delete dir="org" failonerror="false"/>
-                <delete dir="src" failonerror="false"/>
-                <ant antfile="build.xml" target="build.jars"/>
-                <copy toDir=".">
-                  <fileset dir="@dot/"/>
-                </copy>
-                <copy toDir="src/">
-                  <fileset dir="temp.folder/@dot.src" includes="**/*.java"/>
-                  <fileset dir="temp.folder/@dot.src" includes="**/*.properties"/>
-                  <fileset dir="temp.folder/@dot.src" includes="**/version.txt"/>
-                  <fileset dir="temp.folder/@dot.src/library/"/>
-                </copy>
-                <copy toDir="target/classes/org/">
-                  <fileset dir="@dot/org/"/>
-                </copy>
+		<property name="copy.src.dir" value="src"/>
+		<ant antfile="build.xml" target="copy.${ws}.src"/>
               </target>
             </configuration>
             <goals>
diff --git a/bundles/org.eclipse.swt.carbon.macosx/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.carbon.macosx/META-INF/MANIFEST.MF
index ec66d16..6aa6317 100644
--- a/bundles/org.eclipse.swt.carbon.macosx/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.swt.carbon.macosx/META-INF/MANIFEST.MF
@@ -7,6 +7,22 @@
 Bundle-ManifestVersion: 2
 Bundle-Localization: fragment
 Export-Package: 
+ org.eclipse.swt,
+ org.eclipse.swt.accessibility,
+ org.eclipse.swt.awt,
+ org.eclipse.swt.browser,
+ org.eclipse.swt.custom,
+ org.eclipse.swt.dnd,
+ org.eclipse.swt.events,
+ org.eclipse.swt.graphics,
+ org.eclipse.swt.layout,
+ org.eclipse.swt.opengl,
+ org.eclipse.swt.printing,
+ org.eclipse.swt.program,
+ org.eclipse.swt.widgets,
+ org.eclipse.swt.internal; x-friends:="org.eclipse.ui",
+ org.eclipse.swt.internal.image; x-internal:=true,
+ org.eclipse.swt.internal.theme; x-internal:=true,
  org.eclipse.swt.internal.carbon; x-internal:=true,
  org.eclipse.swt.internal.cocoa; x-internal:=true,
  org.eclipse.swt.internal.opengl.carbon; x-internal:=true
diff --git a/bundles/org.eclipse.swt.carbon.macosx/build.properties b/bundles/org.eclipse.swt.carbon.macosx/build.properties
index 9d5392d..8bb667b 100644
--- a/bundles/org.eclipse.swt.carbon.macosx/build.properties
+++ b/bundles/org.eclipse.swt.carbon.macosx/build.properties
@@ -9,6 +9,8 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 custom = true
-bin.includes = *.jnilib,org/**/,about_files/,about.html,fragment.properties, version.txt, external.xpt
+bin.includes = .,*.jnilib,about_files/,about.html,fragment.properties
+bin.excludes = library/
 source.. = src/
 src.includes = about.html,about_files/
+src.excludes = external.xpt
diff --git a/bundles/org.eclipse.swt.cocoa.macosx.x86_64/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.cocoa.macosx.x86_64/META-INF/MANIFEST.MF
index 9e6cb50..8ae7115 100644
--- a/bundles/org.eclipse.swt.cocoa.macosx.x86_64/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.swt.cocoa.macosx.x86_64/META-INF/MANIFEST.MF
@@ -7,6 +7,22 @@
 Bundle-ManifestVersion: 2
 Bundle-Localization: fragment
 Export-Package: 
+ org.eclipse.swt,
+ org.eclipse.swt.accessibility,
+ org.eclipse.swt.awt,
+ org.eclipse.swt.browser,
+ org.eclipse.swt.custom,
+ org.eclipse.swt.dnd,
+ org.eclipse.swt.events,
+ org.eclipse.swt.graphics,
+ org.eclipse.swt.layout,
+ org.eclipse.swt.opengl,
+ org.eclipse.swt.printing,
+ org.eclipse.swt.program,
+ org.eclipse.swt.widgets,
+ org.eclipse.swt.internal; x-friends:="org.eclipse.ui",
+ org.eclipse.swt.internal.image; x-internal:=true,
+ org.eclipse.swt.internal.theme; x-internal:=true,
  org.eclipse.swt.internal.cocoa; x-friends:="org.eclipse.ui"
 Eclipse-PlatformFilter: (& (osgi.ws=cocoa) (osgi.os=macosx) (osgi.arch=x86_64) )
 Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,
diff --git a/bundles/org.eclipse.swt.cocoa.macosx.x86_64/build.properties b/bundles/org.eclipse.swt.cocoa.macosx.x86_64/build.properties
index 46a6ed0..aae6ac6 100644
--- a/bundles/org.eclipse.swt.cocoa.macosx.x86_64/build.properties
+++ b/bundles/org.eclipse.swt.cocoa.macosx.x86_64/build.properties
@@ -10,6 +10,8 @@
 #     Krzysztof Daniel, Red Hat, Inc. - tycho enablement
 ###############################################################################
 custom = true
-bin.includes = *.jnilib,org/**/,about_files/,about.html,fragment.properties, version.txt, external.xpt
+bin.includes = .,*.jnilib,about_files/,about.html,fragment.properties
+bin.excludes = library/
 source.. = src/
 src.includes = about.html,about_files/
+src.excludes = external.xpt
diff --git a/bundles/org.eclipse.swt.cocoa.macosx/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.cocoa.macosx/META-INF/MANIFEST.MF
index e1e33e0..6fa884d 100644
--- a/bundles/org.eclipse.swt.cocoa.macosx/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.swt.cocoa.macosx/META-INF/MANIFEST.MF
@@ -7,6 +7,22 @@
 Bundle-ManifestVersion: 2
 Bundle-Localization: fragment
 Export-Package: 
+ org.eclipse.swt,
+ org.eclipse.swt.accessibility,
+ org.eclipse.swt.awt,
+ org.eclipse.swt.browser,
+ org.eclipse.swt.custom,
+ org.eclipse.swt.dnd,
+ org.eclipse.swt.events,
+ org.eclipse.swt.graphics,
+ org.eclipse.swt.layout,
+ org.eclipse.swt.opengl,
+ org.eclipse.swt.printing,
+ org.eclipse.swt.program,
+ org.eclipse.swt.widgets,
+ org.eclipse.swt.internal; x-friends:="org.eclipse.ui",
+ org.eclipse.swt.internal.image; x-internal:=true,
+ org.eclipse.swt.internal.theme; x-internal:=true,
  org.eclipse.swt.internal.cocoa; x-friends:="org.eclipse.ui"
 Eclipse-PlatformFilter: (& (osgi.ws=cocoa) (osgi.os=macosx) (|(osgi.arch=x86)(osgi.arch=ppc)) )
 Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,
diff --git a/bundles/org.eclipse.swt.cocoa.macosx/build.properties b/bundles/org.eclipse.swt.cocoa.macosx/build.properties
index 46a6ed0..aae6ac6 100644
--- a/bundles/org.eclipse.swt.cocoa.macosx/build.properties
+++ b/bundles/org.eclipse.swt.cocoa.macosx/build.properties
@@ -10,6 +10,8 @@
 #     Krzysztof Daniel, Red Hat, Inc. - tycho enablement
 ###############################################################################
 custom = true
-bin.includes = *.jnilib,org/**/,about_files/,about.html,fragment.properties, version.txt, external.xpt
+bin.includes = .,*.jnilib,about_files/,about.html,fragment.properties
+bin.excludes = library/
 source.. = src/
 src.includes = about.html,about_files/
+src.excludes = external.xpt
diff --git a/bundles/org.eclipse.swt.gtk.aix.ppc/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.gtk.aix.ppc/META-INF/MANIFEST.MF
index f4bbdc7..c5fb38b 100644
--- a/bundles/org.eclipse.swt.gtk.aix.ppc/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.swt.gtk.aix.ppc/META-INF/MANIFEST.MF
@@ -7,6 +7,22 @@
 Bundle-ManifestVersion: 2
 Bundle-Localization: fragment
 Export-Package: 
+ org.eclipse.swt,
+ org.eclipse.swt.accessibility,
+ org.eclipse.swt.awt,
+ org.eclipse.swt.browser,
+ org.eclipse.swt.custom,
+ org.eclipse.swt.dnd,
+ org.eclipse.swt.events,
+ org.eclipse.swt.graphics,
+ org.eclipse.swt.layout,
+ org.eclipse.swt.opengl,
+ org.eclipse.swt.printing,
+ org.eclipse.swt.program,
+ org.eclipse.swt.widgets,
+ org.eclipse.swt.internal; x-friends:="org.eclipse.ui",
+ org.eclipse.swt.internal.image; x-internal:=true,
+ org.eclipse.swt.internal.theme; x-internal:=true,
  org.eclipse.swt.internal.accessibility.gtk; x-internal:=true,
  org.eclipse.swt.internal.cairo; x-internal:=true,
  org.eclipse.swt.internal.cde; x-internal:=true,
diff --git a/bundles/org.eclipse.swt.gtk.aix.ppc/build.properties b/bundles/org.eclipse.swt.gtk.aix.ppc/build.properties
index d4d445a..168d5b4 100644
--- a/bundles/org.eclipse.swt.gtk.aix.ppc/build.properties
+++ b/bundles/org.eclipse.swt.gtk.aix.ppc/build.properties
@@ -9,6 +9,8 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 custom = true
-bin.includes = *.a,org/**/,about_files/,about.html,fragment.properties, version.txt, external.xpt
+bin.includes = .,*.a,about_files/,about.html,fragment.properties
+bin.excludes = library/
 source.. = src/
 src.includes = about.html,about_files/
+src.excludes = external.xpt
diff --git a/bundles/org.eclipse.swt.gtk.aix.ppc64/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.gtk.aix.ppc64/META-INF/MANIFEST.MF
index e3a6aed..c07475e 100644
--- a/bundles/org.eclipse.swt.gtk.aix.ppc64/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.swt.gtk.aix.ppc64/META-INF/MANIFEST.MF
@@ -7,6 +7,22 @@
 Bundle-ManifestVersion: 2
 Bundle-Localization: fragment
 Export-Package: 
+ org.eclipse.swt,
+ org.eclipse.swt.accessibility,
+ org.eclipse.swt.awt,
+ org.eclipse.swt.browser,
+ org.eclipse.swt.custom,
+ org.eclipse.swt.dnd,
+ org.eclipse.swt.events,
+ org.eclipse.swt.graphics,
+ org.eclipse.swt.layout,
+ org.eclipse.swt.opengl,
+ org.eclipse.swt.printing,
+ org.eclipse.swt.program,
+ org.eclipse.swt.widgets,
+ org.eclipse.swt.internal; x-friends:="org.eclipse.ui",
+ org.eclipse.swt.internal.image; x-internal:=true,
+ org.eclipse.swt.internal.theme; x-internal:=true,
  org.eclipse.swt.internal.accessibility.gtk; x-internal:=true,
  org.eclipse.swt.internal.cairo; x-internal:=true,
  org.eclipse.swt.internal.cde; x-internal:=true,
diff --git a/bundles/org.eclipse.swt.gtk.aix.ppc64/build.properties b/bundles/org.eclipse.swt.gtk.aix.ppc64/build.properties
index d4d445a..168d5b4 100644
--- a/bundles/org.eclipse.swt.gtk.aix.ppc64/build.properties
+++ b/bundles/org.eclipse.swt.gtk.aix.ppc64/build.properties
@@ -9,6 +9,8 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 custom = true
-bin.includes = *.a,org/**/,about_files/,about.html,fragment.properties, version.txt, external.xpt
+bin.includes = .,*.a,about_files/,about.html,fragment.properties
+bin.excludes = library/
 source.. = src/
 src.includes = about.html,about_files/
+src.excludes = external.xpt
diff --git a/bundles/org.eclipse.swt.gtk.hpux.ia64/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.gtk.hpux.ia64/META-INF/MANIFEST.MF
index 29a4d96..8db966c 100644
--- a/bundles/org.eclipse.swt.gtk.hpux.ia64/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.swt.gtk.hpux.ia64/META-INF/MANIFEST.MF
@@ -7,6 +7,22 @@
 Bundle-ManifestVersion: 2
 Bundle-Localization: fragment
 Export-Package: 
+ org.eclipse.swt,
+ org.eclipse.swt.accessibility,
+ org.eclipse.swt.awt,
+ org.eclipse.swt.browser,
+ org.eclipse.swt.custom,
+ org.eclipse.swt.dnd,
+ org.eclipse.swt.events,
+ org.eclipse.swt.graphics,
+ org.eclipse.swt.layout,
+ org.eclipse.swt.opengl,
+ org.eclipse.swt.printing,
+ org.eclipse.swt.program,
+ org.eclipse.swt.widgets,
+ org.eclipse.swt.internal; x-friends:="org.eclipse.ui",
+ org.eclipse.swt.internal.image; x-internal:=true,
+ org.eclipse.swt.internal.theme; x-internal:=true,
  org.eclipse.swt.internal.accessibility.gtk; x-internal:=true,
  org.eclipse.swt.internal.cairo; x-internal:=true,
  org.eclipse.swt.internal.cde; x-internal:=true,
diff --git a/bundles/org.eclipse.swt.gtk.hpux.ia64/build.properties b/bundles/org.eclipse.swt.gtk.hpux.ia64/build.properties
index 715fc66..0307eed 100644
--- a/bundles/org.eclipse.swt.gtk.hpux.ia64/build.properties
+++ b/bundles/org.eclipse.swt.gtk.hpux.ia64/build.properties
@@ -9,6 +9,8 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 custom = true
-bin.includes = *.so,org/**/,about_files/,about.html,fragment.properties, version.txt, external.xpt
+bin.includes = .,*.so,about_files/,about.html,fragment.properties
+bin.excludes = library/
 source.. = src/
 src.includes = about.html,about_files/
+src.excludes = external.xpt
diff --git a/bundles/org.eclipse.swt.gtk.hpux.ia64_32/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.gtk.hpux.ia64_32/META-INF/MANIFEST.MF
index e203f94..14a3f74 100644
--- a/bundles/org.eclipse.swt.gtk.hpux.ia64_32/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.swt.gtk.hpux.ia64_32/META-INF/MANIFEST.MF
@@ -7,6 +7,22 @@
 Bundle-ManifestVersion: 2
 Bundle-Localization: fragment
 Export-Package: 
+ org.eclipse.swt,
+ org.eclipse.swt.accessibility,
+ org.eclipse.swt.awt,
+ org.eclipse.swt.browser,
+ org.eclipse.swt.custom,
+ org.eclipse.swt.dnd,
+ org.eclipse.swt.events,
+ org.eclipse.swt.graphics,
+ org.eclipse.swt.layout,
+ org.eclipse.swt.opengl,
+ org.eclipse.swt.printing,
+ org.eclipse.swt.program,
+ org.eclipse.swt.widgets,
+ org.eclipse.swt.internal; x-friends:="org.eclipse.ui",
+ org.eclipse.swt.internal.image; x-internal:=true,
+ org.eclipse.swt.internal.theme; x-internal:=true,
  org.eclipse.swt.internal.accessibility.gtk; x-internal:=true,
  org.eclipse.swt.internal.cairo; x-internal:=true,
  org.eclipse.swt.internal.cde; x-internal:=true,
diff --git a/bundles/org.eclipse.swt.gtk.hpux.ia64_32/build.properties b/bundles/org.eclipse.swt.gtk.hpux.ia64_32/build.properties
index 715fc66..0307eed 100644
--- a/bundles/org.eclipse.swt.gtk.hpux.ia64_32/build.properties
+++ b/bundles/org.eclipse.swt.gtk.hpux.ia64_32/build.properties
@@ -9,6 +9,8 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 custom = true
-bin.includes = *.so,org/**/,about_files/,about.html,fragment.properties, version.txt, external.xpt
+bin.includes = .,*.so,about_files/,about.html,fragment.properties
+bin.excludes = library/
 source.. = src/
 src.includes = about.html,about_files/
+src.excludes = external.xpt
diff --git a/bundles/org.eclipse.swt.gtk.linux.ia64/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.gtk.linux.ia64/META-INF/MANIFEST.MF
index 9994af7..bcfd66f 100644
--- a/bundles/org.eclipse.swt.gtk.linux.ia64/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.swt.gtk.linux.ia64/META-INF/MANIFEST.MF
@@ -7,6 +7,22 @@
 Bundle-ManifestVersion: 2
 Bundle-Localization: fragment
 Export-Package: 
+ org.eclipse.swt,
+ org.eclipse.swt.accessibility,
+ org.eclipse.swt.awt,
+ org.eclipse.swt.browser,
+ org.eclipse.swt.custom,
+ org.eclipse.swt.dnd,
+ org.eclipse.swt.events,
+ org.eclipse.swt.graphics,
+ org.eclipse.swt.layout,
+ org.eclipse.swt.opengl,
+ org.eclipse.swt.printing,
+ org.eclipse.swt.program,
+ org.eclipse.swt.widgets,
+ org.eclipse.swt.internal; x-friends:="org.eclipse.ui",
+ org.eclipse.swt.internal.image; x-internal:=true,
+ org.eclipse.swt.internal.theme; x-internal:=true,
  org.eclipse.swt.internal.accessibility.gtk; x-internal:=true,
  org.eclipse.swt.internal.cairo; x-internal:=true,
  org.eclipse.swt.internal.cde; x-internal:=true,
diff --git a/bundles/org.eclipse.swt.gtk.linux.ia64/build.properties b/bundles/org.eclipse.swt.gtk.linux.ia64/build.properties
index f031060..5423754 100644
--- a/bundles/org.eclipse.swt.gtk.linux.ia64/build.properties
+++ b/bundles/org.eclipse.swt.gtk.linux.ia64/build.properties
@@ -9,6 +9,8 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 custom = true
-bin.includes = *.so,org/**/,about_files/,about.html,fragment.properties, version.txt, external.xpt
+bin.includes = .,*.so,about_files/,about.html,fragment.properties
+bin.excludes = library/
 source.. = src/
 src.includes = about.html,about_files/
+src.excludes = external.xpt
diff --git a/bundles/org.eclipse.swt.gtk.linux.ppc/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.gtk.linux.ppc/META-INF/MANIFEST.MF
index 69bf826..77396ba 100644
--- a/bundles/org.eclipse.swt.gtk.linux.ppc/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.swt.gtk.linux.ppc/META-INF/MANIFEST.MF
@@ -7,6 +7,22 @@
 Bundle-ManifestVersion: 2
 Bundle-Localization: fragment
 Export-Package: 
+ org.eclipse.swt,
+ org.eclipse.swt.accessibility,
+ org.eclipse.swt.awt,
+ org.eclipse.swt.browser,
+ org.eclipse.swt.custom,
+ org.eclipse.swt.dnd,
+ org.eclipse.swt.events,
+ org.eclipse.swt.graphics,
+ org.eclipse.swt.layout,
+ org.eclipse.swt.opengl,
+ org.eclipse.swt.printing,
+ org.eclipse.swt.program,
+ org.eclipse.swt.widgets,
+ org.eclipse.swt.internal; x-friends:="org.eclipse.ui",
+ org.eclipse.swt.internal.image; x-internal:=true,
+ org.eclipse.swt.internal.theme; x-internal:=true,
  org.eclipse.swt.internal.accessibility.gtk; x-internal:=true,
  org.eclipse.swt.internal.cairo; x-internal:=true,
  org.eclipse.swt.internal.cde; x-internal:=true,
diff --git a/bundles/org.eclipse.swt.gtk.linux.ppc/build.properties b/bundles/org.eclipse.swt.gtk.linux.ppc/build.properties
index 18582a0..9f3267d 100644
--- a/bundles/org.eclipse.swt.gtk.linux.ppc/build.properties
+++ b/bundles/org.eclipse.swt.gtk.linux.ppc/build.properties
@@ -9,6 +9,8 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 custom = true
-bin.includes = *.so,org/**/,about_files/,about.html,fragment.properties, version.txt, external.xpt
+bin.includes = .,*.so,about_files/,about.html,fragment.properties
+bin.excludes = library/
 source.. = src/
 src.includes = about.html,about_files/
+src.excludes = external.xpt
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt.gtk.linux.ppc64/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.gtk.linux.ppc64/META-INF/MANIFEST.MF
index 87d44c5..35875e8 100644
--- a/bundles/org.eclipse.swt.gtk.linux.ppc64/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.swt.gtk.linux.ppc64/META-INF/MANIFEST.MF
@@ -7,6 +7,22 @@
 Bundle-ManifestVersion: 2
 Bundle-Localization: fragment
 Export-Package: 
+ org.eclipse.swt,
+ org.eclipse.swt.accessibility,
+ org.eclipse.swt.awt,
+ org.eclipse.swt.browser,
+ org.eclipse.swt.custom,
+ org.eclipse.swt.dnd,
+ org.eclipse.swt.events,
+ org.eclipse.swt.graphics,
+ org.eclipse.swt.layout,
+ org.eclipse.swt.opengl,
+ org.eclipse.swt.printing,
+ org.eclipse.swt.program,
+ org.eclipse.swt.widgets,
+ org.eclipse.swt.internal; x-friends:="org.eclipse.ui",
+ org.eclipse.swt.internal.image; x-internal:=true,
+ org.eclipse.swt.internal.theme; x-internal:=true,
  org.eclipse.swt.internal.accessibility.gtk; x-internal:=true,
  org.eclipse.swt.internal.cairo; x-internal:=true,
  org.eclipse.swt.internal.cde; x-internal:=true,
diff --git a/bundles/org.eclipse.swt.gtk.linux.ppc64/build.properties b/bundles/org.eclipse.swt.gtk.linux.ppc64/build.properties
index 18582a0..c985721 100644
--- a/bundles/org.eclipse.swt.gtk.linux.ppc64/build.properties
+++ b/bundles/org.eclipse.swt.gtk.linux.ppc64/build.properties
@@ -9,6 +9,8 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 custom = true
-bin.includes = *.so,org/**/,about_files/,about.html,fragment.properties, version.txt, external.xpt
+bin.includes = .,*.so,about_files/,about.html,fragment.properties
+bin.excludes = library/
 source.. = src/
 src.includes = about.html,about_files/
+src.excludes = external.xpt
diff --git a/bundles/org.eclipse.swt.gtk.linux.s390/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.gtk.linux.s390/META-INF/MANIFEST.MF
index c93208c..72a662a 100644
--- a/bundles/org.eclipse.swt.gtk.linux.s390/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.swt.gtk.linux.s390/META-INF/MANIFEST.MF
@@ -7,6 +7,22 @@
 Bundle-ManifestVersion: 2
 Bundle-Localization: fragment
 Export-Package: 
+ org.eclipse.swt,
+ org.eclipse.swt.accessibility,
+ org.eclipse.swt.awt,
+ org.eclipse.swt.browser,
+ org.eclipse.swt.custom,
+ org.eclipse.swt.dnd,
+ org.eclipse.swt.events,
+ org.eclipse.swt.graphics,
+ org.eclipse.swt.layout,
+ org.eclipse.swt.opengl,
+ org.eclipse.swt.printing,
+ org.eclipse.swt.program,
+ org.eclipse.swt.widgets,
+ org.eclipse.swt.internal; x-friends:="org.eclipse.ui",
+ org.eclipse.swt.internal.image; x-internal:=true,
+ org.eclipse.swt.internal.theme; x-internal:=true,
  org.eclipse.swt.internal.accessibility.gtk; x-internal:=true,
  org.eclipse.swt.internal.cairo; x-internal:=true,
  org.eclipse.swt.internal.cde; x-internal:=true,
diff --git a/bundles/org.eclipse.swt.gtk.linux.s390/build.properties b/bundles/org.eclipse.swt.gtk.linux.s390/build.properties
index d52906b..b902ce1 100644
--- a/bundles/org.eclipse.swt.gtk.linux.s390/build.properties
+++ b/bundles/org.eclipse.swt.gtk.linux.s390/build.properties
@@ -9,6 +9,8 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 custom = true
-bin.includes = *.so,org/**/,about_files/,about.html,fragment.properties, version.txt, external.xpt
+bin.includes = .,*.so,about_files/,about.html,fragment.properties
+bin.excludes = library/
 source.. = src/
 src.includes = about.html,about_files/
+src.excludes = external.xpt
diff --git a/bundles/org.eclipse.swt.gtk.linux.s390x/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.gtk.linux.s390x/META-INF/MANIFEST.MF
index 79b7f7b..a36cdfe 100644
--- a/bundles/org.eclipse.swt.gtk.linux.s390x/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.swt.gtk.linux.s390x/META-INF/MANIFEST.MF
@@ -7,6 +7,22 @@
 Bundle-ManifestVersion: 2
 Bundle-Localization: fragment
 Export-Package: 
+ org.eclipse.swt,
+ org.eclipse.swt.accessibility,
+ org.eclipse.swt.awt,
+ org.eclipse.swt.browser,
+ org.eclipse.swt.custom,
+ org.eclipse.swt.dnd,
+ org.eclipse.swt.events,
+ org.eclipse.swt.graphics,
+ org.eclipse.swt.layout,
+ org.eclipse.swt.opengl,
+ org.eclipse.swt.printing,
+ org.eclipse.swt.program,
+ org.eclipse.swt.widgets,
+ org.eclipse.swt.internal; x-friends:="org.eclipse.ui",
+ org.eclipse.swt.internal.image; x-internal:=true,
+ org.eclipse.swt.internal.theme; x-internal:=true,
  org.eclipse.swt.internal.accessibility.gtk; x-internal:=true,
  org.eclipse.swt.internal.cairo; x-internal:=true,
  org.eclipse.swt.internal.cde; x-internal:=true,
diff --git a/bundles/org.eclipse.swt.gtk.linux.s390x/build.properties b/bundles/org.eclipse.swt.gtk.linux.s390x/build.properties
index f031060..5423754 100644
--- a/bundles/org.eclipse.swt.gtk.linux.s390x/build.properties
+++ b/bundles/org.eclipse.swt.gtk.linux.s390x/build.properties
@@ -9,6 +9,8 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 custom = true
-bin.includes = *.so,org/**/,about_files/,about.html,fragment.properties, version.txt, external.xpt
+bin.includes = .,*.so,about_files/,about.html,fragment.properties
+bin.excludes = library/
 source.. = src/
 src.includes = about.html,about_files/
+src.excludes = external.xpt
diff --git a/bundles/org.eclipse.swt.gtk.linux.x86/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.gtk.linux.x86/META-INF/MANIFEST.MF
index 929e861..eaba602 100644
--- a/bundles/org.eclipse.swt.gtk.linux.x86/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.swt.gtk.linux.x86/META-INF/MANIFEST.MF
@@ -7,6 +7,22 @@
 Bundle-ManifestVersion: 2
 Bundle-Localization: fragment
 Export-Package: 
+ org.eclipse.swt,
+ org.eclipse.swt.accessibility,
+ org.eclipse.swt.awt,
+ org.eclipse.swt.browser,
+ org.eclipse.swt.custom,
+ org.eclipse.swt.dnd,
+ org.eclipse.swt.events,
+ org.eclipse.swt.graphics,
+ org.eclipse.swt.layout,
+ org.eclipse.swt.opengl,
+ org.eclipse.swt.printing,
+ org.eclipse.swt.program,
+ org.eclipse.swt.widgets,
+ org.eclipse.swt.internal; x-friends:="org.eclipse.ui",
+ org.eclipse.swt.internal.image; x-internal:=true,
+ org.eclipse.swt.internal.theme; x-internal:=true,
  org.eclipse.swt.internal.accessibility.gtk; x-internal:=true,
  org.eclipse.swt.internal.cairo; x-internal:=true,
  org.eclipse.swt.internal.cde; x-internal:=true,
diff --git a/bundles/org.eclipse.swt.gtk.linux.x86/build.properties b/bundles/org.eclipse.swt.gtk.linux.x86/build.properties
index 49f19ba..46c85c6 100644
--- a/bundles/org.eclipse.swt.gtk.linux.x86/build.properties
+++ b/bundles/org.eclipse.swt.gtk.linux.x86/build.properties
@@ -10,6 +10,8 @@
 #     Krzysztof Daniel, Red Hat, Inc. - tycho enablement
 ###############################################################################
 custom = true
-bin.includes = *.so,org/**/,about_files/,about.html,fragment.properties, version.txt, external.xpt
+bin.includes = .,*.so,about_files/,about.html,fragment.properties
+bin.excludes = library/
 source.. = src/
 src.includes = about.html,about_files/
+src.excludes = external.xpt
diff --git a/bundles/org.eclipse.swt.gtk.linux.x86_64/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.gtk.linux.x86_64/META-INF/MANIFEST.MF
index 83d3204..ddb39ea 100644
--- a/bundles/org.eclipse.swt.gtk.linux.x86_64/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.swt.gtk.linux.x86_64/META-INF/MANIFEST.MF
@@ -7,6 +7,22 @@
 Bundle-ManifestVersion: 2
 Bundle-Localization: fragment
 Export-Package: 
+ org.eclipse.swt,
+ org.eclipse.swt.accessibility,
+ org.eclipse.swt.awt,
+ org.eclipse.swt.browser,
+ org.eclipse.swt.custom,
+ org.eclipse.swt.dnd,
+ org.eclipse.swt.events,
+ org.eclipse.swt.graphics,
+ org.eclipse.swt.layout,
+ org.eclipse.swt.opengl,
+ org.eclipse.swt.printing,
+ org.eclipse.swt.program,
+ org.eclipse.swt.widgets,
+ org.eclipse.swt.internal; x-friends:="org.eclipse.ui",
+ org.eclipse.swt.internal.image; x-internal:=true,
+ org.eclipse.swt.internal.theme; x-internal:=true,
  org.eclipse.swt.internal.accessibility.gtk; x-internal:=true,
  org.eclipse.swt.internal.cairo; x-internal:=true,
  org.eclipse.swt.internal.cde; x-internal:=true,
diff --git a/bundles/org.eclipse.swt.gtk.linux.x86_64/build.properties b/bundles/org.eclipse.swt.gtk.linux.x86_64/build.properties
index 01bf1dc..e19693e 100644
--- a/bundles/org.eclipse.swt.gtk.linux.x86_64/build.properties
+++ b/bundles/org.eclipse.swt.gtk.linux.x86_64/build.properties
@@ -10,6 +10,8 @@
 #     Krzysztof Daniel, Red Hat, Inc. - tycho enablement
 ###############################################################################
 custom = true
-bin.includes = *.so,org/**/,about_files/,about.html,fragment.properties, version.txt, external.xpt
+bin.includes = .,*.so,about_files/,about.html,fragment.properties
+bin.excludes = library/
 source.. = src/
 src.includes = about.html,about_files/
+src.excludes = external.xpt
diff --git a/bundles/org.eclipse.swt.gtk.solaris.sparc/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.gtk.solaris.sparc/META-INF/MANIFEST.MF
index 97c5f41..320763b 100644
--- a/bundles/org.eclipse.swt.gtk.solaris.sparc/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.swt.gtk.solaris.sparc/META-INF/MANIFEST.MF
@@ -7,6 +7,22 @@
 Bundle-ManifestVersion: 2
 Bundle-Localization: fragment
 Export-Package: 
+ org.eclipse.swt,
+ org.eclipse.swt.accessibility,
+ org.eclipse.swt.awt,
+ org.eclipse.swt.browser,
+ org.eclipse.swt.custom,
+ org.eclipse.swt.dnd,
+ org.eclipse.swt.events,
+ org.eclipse.swt.graphics,
+ org.eclipse.swt.layout,
+ org.eclipse.swt.opengl,
+ org.eclipse.swt.printing,
+ org.eclipse.swt.program,
+ org.eclipse.swt.widgets,
+ org.eclipse.swt.internal; x-friends:="org.eclipse.ui",
+ org.eclipse.swt.internal.image; x-internal:=true,
+ org.eclipse.swt.internal.theme; x-internal:=true,
  org.eclipse.swt.internal.accessibility.gtk; x-internal:=true,
  org.eclipse.swt.internal.cairo; x-internal:=true,
  org.eclipse.swt.internal.cde; x-internal:=true,
diff --git a/bundles/org.eclipse.swt.gtk.solaris.sparc/build.properties b/bundles/org.eclipse.swt.gtk.solaris.sparc/build.properties
index 18582a0..c985721 100644
--- a/bundles/org.eclipse.swt.gtk.solaris.sparc/build.properties
+++ b/bundles/org.eclipse.swt.gtk.solaris.sparc/build.properties
@@ -9,6 +9,8 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 custom = true
-bin.includes = *.so,org/**/,about_files/,about.html,fragment.properties, version.txt, external.xpt
+bin.includes = .,*.so,about_files/,about.html,fragment.properties
+bin.excludes = library/
 source.. = src/
 src.includes = about.html,about_files/
+src.excludes = external.xpt
diff --git a/bundles/org.eclipse.swt.gtk.solaris.x86/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.gtk.solaris.x86/META-INF/MANIFEST.MF
index 0f4a121..2680bd8 100644
--- a/bundles/org.eclipse.swt.gtk.solaris.x86/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.swt.gtk.solaris.x86/META-INF/MANIFEST.MF
@@ -7,6 +7,22 @@
 Bundle-ManifestVersion: 2
 Bundle-Localization: fragment
 Export-Package: 
+ org.eclipse.swt,
+ org.eclipse.swt.accessibility,
+ org.eclipse.swt.awt,
+ org.eclipse.swt.browser,
+ org.eclipse.swt.custom,
+ org.eclipse.swt.dnd,
+ org.eclipse.swt.events,
+ org.eclipse.swt.graphics,
+ org.eclipse.swt.layout,
+ org.eclipse.swt.opengl,
+ org.eclipse.swt.printing,
+ org.eclipse.swt.program,
+ org.eclipse.swt.widgets,
+ org.eclipse.swt.internal; x-friends:="org.eclipse.ui",
+ org.eclipse.swt.internal.image; x-internal:=true,
+ org.eclipse.swt.internal.theme; x-internal:=true,
  org.eclipse.swt.internal.accessibility.gtk; x-internal:=true,
  org.eclipse.swt.internal.cairo; x-internal:=true,
  org.eclipse.swt.internal.cde; x-internal:=true,
diff --git a/bundles/org.eclipse.swt.gtk.solaris.x86/build.properties b/bundles/org.eclipse.swt.gtk.solaris.x86/build.properties
index 27a1556..6ac2a79 100644
--- a/bundles/org.eclipse.swt.gtk.solaris.x86/build.properties
+++ b/bundles/org.eclipse.swt.gtk.solaris.x86/build.properties
@@ -9,6 +9,8 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 custom = true
-bin.includes = *.so,org/**/,about_files,about.html,fragment.properties, version.txt, external.xpt
+bin.includes = .,*.so,about_files/,about.html,fragment.properties
+bin.excludes = library/
 source.. = src/
 src.includes = about.html,about_files/
+src.excludes = external.xpt
diff --git a/bundles/org.eclipse.swt.motif.aix.ppc/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.motif.aix.ppc/META-INF/MANIFEST.MF
index f274540..7e47dc6 100644
--- a/bundles/org.eclipse.swt.motif.aix.ppc/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.swt.motif.aix.ppc/META-INF/MANIFEST.MF
@@ -7,6 +7,22 @@
 Bundle-ManifestVersion: 2
 Bundle-Localization: fragment
 Export-Package: 
+ org.eclipse.swt,
+ org.eclipse.swt.accessibility,
+ org.eclipse.swt.awt,
+ org.eclipse.swt.browser,
+ org.eclipse.swt.custom,
+ org.eclipse.swt.dnd,
+ org.eclipse.swt.events,
+ org.eclipse.swt.graphics,
+ org.eclipse.swt.layout,
+ org.eclipse.swt.opengl,
+ org.eclipse.swt.printing,
+ org.eclipse.swt.program,
+ org.eclipse.swt.widgets,
+ org.eclipse.swt.internal; x-friends:="org.eclipse.ui",
+ org.eclipse.swt.internal.image; x-internal:=true,
+ org.eclipse.swt.internal.theme; x-internal:=true,
  org.eclipse.swt.internal.cairo; x-internal:=true,
  org.eclipse.swt.internal.cde; x-internal:=true,
  org.eclipse.swt.internal.gnome; x-internal:=true,
diff --git a/bundles/org.eclipse.swt.motif.aix.ppc/build.properties b/bundles/org.eclipse.swt.motif.aix.ppc/build.properties
index d4d445a..168d5b4 100644
--- a/bundles/org.eclipse.swt.motif.aix.ppc/build.properties
+++ b/bundles/org.eclipse.swt.motif.aix.ppc/build.properties
@@ -9,6 +9,8 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 custom = true
-bin.includes = *.a,org/**/,about_files/,about.html,fragment.properties, version.txt, external.xpt
+bin.includes = .,*.a,about_files/,about.html,fragment.properties
+bin.excludes = library/
 source.. = src/
 src.includes = about.html,about_files/
+src.excludes = external.xpt
diff --git a/bundles/org.eclipse.swt.motif.hpux.PA_RISC/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.motif.hpux.PA_RISC/META-INF/MANIFEST.MF
index 073f022..935dbea 100644
--- a/bundles/org.eclipse.swt.motif.hpux.PA_RISC/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.swt.motif.hpux.PA_RISC/META-INF/MANIFEST.MF
@@ -7,6 +7,22 @@
 Bundle-ManifestVersion: 2
 Bundle-Localization: fragment
 Export-Package: 
+ org.eclipse.swt,
+ org.eclipse.swt.accessibility,
+ org.eclipse.swt.awt,
+ org.eclipse.swt.browser,
+ org.eclipse.swt.custom,
+ org.eclipse.swt.dnd,
+ org.eclipse.swt.events,
+ org.eclipse.swt.graphics,
+ org.eclipse.swt.layout,
+ org.eclipse.swt.opengl,
+ org.eclipse.swt.printing,
+ org.eclipse.swt.program,
+ org.eclipse.swt.widgets,
+ org.eclipse.swt.internal; x-friends:="org.eclipse.ui",
+ org.eclipse.swt.internal.image; x-internal:=true,
+ org.eclipse.swt.internal.theme; x-internal:=true,
  org.eclipse.swt.internal.cairo; x-internal:=true,
  org.eclipse.swt.internal.cde; x-internal:=true,
  org.eclipse.swt.internal.gnome; x-internal:=true,
diff --git a/bundles/org.eclipse.swt.motif.hpux.PA_RISC/build.properties b/bundles/org.eclipse.swt.motif.hpux.PA_RISC/build.properties
index 7d9d03d..5f9a6ee 100644
--- a/bundles/org.eclipse.swt.motif.hpux.PA_RISC/build.properties
+++ b/bundles/org.eclipse.swt.motif.hpux.PA_RISC/build.properties
@@ -9,6 +9,8 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 custom = true
-bin.includes = *.sl,org/**/,about_files/,about.html,fragment.properties, version.txt, external.xpt
+bin.includes = .,*.sl,about_files/,about.html,fragment.properties
+bin.excludes = library/
 source.. = src/
 src.includes = about.html,about_files/
+src.excludes = external.xpt
diff --git a/bundles/org.eclipse.swt.motif.hpux.ia64_32/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.motif.hpux.ia64_32/META-INF/MANIFEST.MF
index 4740316..95b1f4c 100644
--- a/bundles/org.eclipse.swt.motif.hpux.ia64_32/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.swt.motif.hpux.ia64_32/META-INF/MANIFEST.MF
@@ -7,6 +7,22 @@
 Bundle-ManifestVersion: 2
 Bundle-Localization: fragment
 Export-Package: 
+ org.eclipse.swt,
+ org.eclipse.swt.accessibility,
+ org.eclipse.swt.awt,
+ org.eclipse.swt.browser,
+ org.eclipse.swt.custom,
+ org.eclipse.swt.dnd,
+ org.eclipse.swt.events,
+ org.eclipse.swt.graphics,
+ org.eclipse.swt.layout,
+ org.eclipse.swt.opengl,
+ org.eclipse.swt.printing,
+ org.eclipse.swt.program,
+ org.eclipse.swt.widgets,
+ org.eclipse.swt.internal; x-friends:="org.eclipse.ui",
+ org.eclipse.swt.internal.image; x-internal:=true,
+ org.eclipse.swt.internal.theme; x-internal:=true,
  org.eclipse.swt.internal.cairo; x-internal:=true,
  org.eclipse.swt.internal.cde; x-internal:=true,
  org.eclipse.swt.internal.gnome; x-internal:=true,
diff --git a/bundles/org.eclipse.swt.motif.hpux.ia64_32/build.properties b/bundles/org.eclipse.swt.motif.hpux.ia64_32/build.properties
index d52906b..b902ce1 100644
--- a/bundles/org.eclipse.swt.motif.hpux.ia64_32/build.properties
+++ b/bundles/org.eclipse.swt.motif.hpux.ia64_32/build.properties
@@ -9,6 +9,8 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 custom = true
-bin.includes = *.so,org/**/,about_files/,about.html,fragment.properties, version.txt, external.xpt
+bin.includes = .,*.so,about_files/,about.html,fragment.properties
+bin.excludes = library/
 source.. = src/
 src.includes = about.html,about_files/
+src.excludes = external.xpt
diff --git a/bundles/org.eclipse.swt.motif.linux.x86/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.motif.linux.x86/META-INF/MANIFEST.MF
index c97ade7..9adf1a7 100644
--- a/bundles/org.eclipse.swt.motif.linux.x86/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.swt.motif.linux.x86/META-INF/MANIFEST.MF
@@ -7,6 +7,22 @@
 Bundle-ManifestVersion: 2
 Bundle-Localization: fragment
 Export-Package: 
+ org.eclipse.swt,
+ org.eclipse.swt.accessibility,
+ org.eclipse.swt.awt,
+ org.eclipse.swt.browser,
+ org.eclipse.swt.custom,
+ org.eclipse.swt.dnd,
+ org.eclipse.swt.events,
+ org.eclipse.swt.graphics,
+ org.eclipse.swt.layout,
+ org.eclipse.swt.opengl,
+ org.eclipse.swt.printing,
+ org.eclipse.swt.program,
+ org.eclipse.swt.widgets,
+ org.eclipse.swt.internal; x-friends:="org.eclipse.ui",
+ org.eclipse.swt.internal.image; x-internal:=true,
+ org.eclipse.swt.internal.theme; x-internal:=true,
  org.eclipse.swt.internal.cairo; x-internal:=true,
  org.eclipse.swt.internal.cde; x-internal:=true,
  org.eclipse.swt.internal.gnome; x-internal:=true,
diff --git a/bundles/org.eclipse.swt.motif.linux.x86/build.properties b/bundles/org.eclipse.swt.motif.linux.x86/build.properties
index 18582a0..c985721 100644
--- a/bundles/org.eclipse.swt.motif.linux.x86/build.properties
+++ b/bundles/org.eclipse.swt.motif.linux.x86/build.properties
@@ -9,6 +9,8 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 custom = true
-bin.includes = *.so,org/**/,about_files/,about.html,fragment.properties, version.txt, external.xpt
+bin.includes = .,*.so,about_files/,about.html,fragment.properties
+bin.excludes = library/
 source.. = src/
 src.includes = about.html,about_files/
+src.excludes = external.xpt
diff --git a/bundles/org.eclipse.swt.motif.solaris.sparc/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.motif.solaris.sparc/META-INF/MANIFEST.MF
index af9e800..86df6f7 100644
--- a/bundles/org.eclipse.swt.motif.solaris.sparc/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.swt.motif.solaris.sparc/META-INF/MANIFEST.MF
@@ -7,6 +7,22 @@
 Bundle-ManifestVersion: 2
 Bundle-Localization: fragment
 Export-Package: 
+ org.eclipse.swt,
+ org.eclipse.swt.accessibility,
+ org.eclipse.swt.awt,
+ org.eclipse.swt.browser,
+ org.eclipse.swt.custom,
+ org.eclipse.swt.dnd,
+ org.eclipse.swt.events,
+ org.eclipse.swt.graphics,
+ org.eclipse.swt.layout,
+ org.eclipse.swt.opengl,
+ org.eclipse.swt.printing,
+ org.eclipse.swt.program,
+ org.eclipse.swt.widgets,
+ org.eclipse.swt.internal; x-friends:="org.eclipse.ui",
+ org.eclipse.swt.internal.image; x-internal:=true,
+ org.eclipse.swt.internal.theme; x-internal:=true,
  org.eclipse.swt.internal.cairo; x-internal:=true,
  org.eclipse.swt.internal.cde; x-internal:=true,
  org.eclipse.swt.internal.gnome; x-internal:=true,
diff --git a/bundles/org.eclipse.swt.motif.solaris.sparc/build.properties b/bundles/org.eclipse.swt.motif.solaris.sparc/build.properties
index 18582a0..c985721 100644
--- a/bundles/org.eclipse.swt.motif.solaris.sparc/build.properties
+++ b/bundles/org.eclipse.swt.motif.solaris.sparc/build.properties
@@ -9,6 +9,8 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 custom = true
-bin.includes = *.so,org/**/,about_files/,about.html,fragment.properties, version.txt, external.xpt
+bin.includes = .,*.so,about_files/,about.html,fragment.properties
+bin.excludes = library/
 source.. = src/
 src.includes = about.html,about_files/
+src.excludes = external.xpt
diff --git a/bundles/org.eclipse.swt.photon.qnx.x86/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.photon.qnx.x86/META-INF/MANIFEST.MF
index c67c7d9..1d939cb 100644
--- a/bundles/org.eclipse.swt.photon.qnx.x86/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.swt.photon.qnx.x86/META-INF/MANIFEST.MF
@@ -7,6 +7,22 @@
 Bundle-ManifestVersion: 2
 Bundle-Localization: fragment
 Export-Package: 
+ org.eclipse.swt,
+ org.eclipse.swt.accessibility,
+ org.eclipse.swt.awt,
+ org.eclipse.swt.browser,
+ org.eclipse.swt.custom,
+ org.eclipse.swt.dnd,
+ org.eclipse.swt.events,
+ org.eclipse.swt.graphics,
+ org.eclipse.swt.layout,
+ org.eclipse.swt.opengl,
+ org.eclipse.swt.printing,
+ org.eclipse.swt.program,
+ org.eclipse.swt.widgets,
+ org.eclipse.swt.internal; x-friends:="org.eclipse.ui",
+ org.eclipse.swt.internal.image; x-internal:=true,
+ org.eclipse.swt.internal.theme; x-internal:=true,
  org.eclipse.swt.internal.photon; x-internal:=true
 Eclipse-PlatformFilter: (& (osgi.ws=photon) (osgi.os=qnx) (osgi.arch=x86))
 Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,
diff --git a/bundles/org.eclipse.swt.photon.qnx.x86/build.properties b/bundles/org.eclipse.swt.photon.qnx.x86/build.properties
index 6b161b8..c985721 100644
--- a/bundles/org.eclipse.swt.photon.qnx.x86/build.properties
+++ b/bundles/org.eclipse.swt.photon.qnx.x86/build.properties
@@ -9,6 +9,8 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 custom = true
-bin.includes = *.so,org/**/,about_files/,about.html,fragment.properties, version.txt
+bin.includes = .,*.so,about_files/,about.html,fragment.properties
+bin.excludes = library/
 source.. = src/
 src.includes = about.html,about_files/
+src.excludes = external.xpt
diff --git a/bundles/org.eclipse.swt.win32.wce_ppc.arm/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.win32.wce_ppc.arm/META-INF/MANIFEST.MF
index 9ea110b..7f889d1 100644
--- a/bundles/org.eclipse.swt.win32.wce_ppc.arm/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.swt.win32.wce_ppc.arm/META-INF/MANIFEST.MF
@@ -7,6 +7,22 @@
 Bundle-ManifestVersion: 2
 Bundle-Localization: fragment
 Export-Package: 
+ org.eclipse.swt,
+ org.eclipse.swt.accessibility,
+ org.eclipse.swt.awt,
+ org.eclipse.swt.browser,
+ org.eclipse.swt.custom,
+ org.eclipse.swt.dnd,
+ org.eclipse.swt.events,
+ org.eclipse.swt.graphics,
+ org.eclipse.swt.layout,
+ org.eclipse.swt.opengl,
+ org.eclipse.swt.printing,
+ org.eclipse.swt.program,
+ org.eclipse.swt.widgets,
+ org.eclipse.swt.internal; x-friends:="org.eclipse.ui",
+ org.eclipse.swt.internal.image; x-internal:=true,
+ org.eclipse.swt.internal.theme; x-internal:=true,
  org.eclipse.swt.internal.win32; x-internal:=true
 Eclipse-PlatformFilter: (& (osgi.ws=win32) (osgi.os=wce_ppc) (osgi.arch=arm))
 Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,
diff --git a/bundles/org.eclipse.swt.win32.win32.ia64/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.win32.win32.ia64/META-INF/MANIFEST.MF
index 4d8a5d1..7f28a1d 100644
--- a/bundles/org.eclipse.swt.win32.win32.ia64/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.swt.win32.win32.ia64/META-INF/MANIFEST.MF
@@ -7,6 +7,22 @@
 Bundle-ManifestVersion: 2
 Bundle-Localization: fragment
 Export-Package: 
+ org.eclipse.swt,
+ org.eclipse.swt.accessibility,
+ org.eclipse.swt.awt,
+ org.eclipse.swt.browser,
+ org.eclipse.swt.custom,
+ org.eclipse.swt.dnd,
+ org.eclipse.swt.events,
+ org.eclipse.swt.graphics,
+ org.eclipse.swt.layout,
+ org.eclipse.swt.opengl,
+ org.eclipse.swt.printing,
+ org.eclipse.swt.program,
+ org.eclipse.swt.widgets,
+ org.eclipse.swt.internal; x-friends:="org.eclipse.ui",
+ org.eclipse.swt.internal.image; x-internal:=true,
+ org.eclipse.swt.internal.theme; x-internal:=true,
  org.eclipse.swt.ole.win32,
  org.eclipse.swt.internal.gdip; x-internal:=true,
  org.eclipse.swt.internal.ole.win32; x-internal:=true,
diff --git a/bundles/org.eclipse.swt.win32.win32.ia64/build.properties b/bundles/org.eclipse.swt.win32.win32.ia64/build.properties
index 6833ec2..213d3f2 100644
--- a/bundles/org.eclipse.swt.win32.win32.ia64/build.properties
+++ b/bundles/org.eclipse.swt.win32.win32.ia64/build.properties
@@ -9,6 +9,8 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 custom = true
-bin.includes = *.dll,org/**/,about_files/,about.html,fragment.properties, version.txt, external.xpt
+bin.includes = .,*.dll,about_files/,about.html,fragment.properties
+bin.excludes = library/
 source.. = src/
 src.includes = about.html,about_files/
+src.excludes = external.xpt
diff --git a/bundles/org.eclipse.swt.win32.win32.x86/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.win32.win32.x86/META-INF/MANIFEST.MF
index 5097f3f..e090a11 100644
--- a/bundles/org.eclipse.swt.win32.win32.x86/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.swt.win32.win32.x86/META-INF/MANIFEST.MF
@@ -7,6 +7,22 @@
 Bundle-ManifestVersion: 2
 Bundle-Localization: fragment
 Export-Package: 
+ org.eclipse.swt,
+ org.eclipse.swt.accessibility,
+ org.eclipse.swt.awt,
+ org.eclipse.swt.browser,
+ org.eclipse.swt.custom,
+ org.eclipse.swt.dnd,
+ org.eclipse.swt.events,
+ org.eclipse.swt.graphics,
+ org.eclipse.swt.layout,
+ org.eclipse.swt.opengl,
+ org.eclipse.swt.printing,
+ org.eclipse.swt.program,
+ org.eclipse.swt.widgets,
+ org.eclipse.swt.internal; x-friends:="org.eclipse.ui",
+ org.eclipse.swt.internal.image; x-internal:=true,
+ org.eclipse.swt.internal.theme; x-internal:=true,
  org.eclipse.swt.ole.win32,
  org.eclipse.swt.internal.gdip; x-internal:=true,
  org.eclipse.swt.internal.ole.win32; x-internal:=true,
diff --git a/bundles/org.eclipse.swt.win32.win32.x86/build.properties b/bundles/org.eclipse.swt.win32.win32.x86/build.properties
index 9c8603d..1c161fd 100644
--- a/bundles/org.eclipse.swt.win32.win32.x86/build.properties
+++ b/bundles/org.eclipse.swt.win32.win32.x86/build.properties
@@ -10,6 +10,8 @@
 #     Krzysztof Daniel, Red Hat, Inc. - tycho enablement
 ###############################################################################
 custom = true
-bin.includes = *.dll,org/**/,about_files/,about.html,fragment.properties, version.txt, external.xpt
+bin.includes = .,*.dll,about_files/,about.html,fragment.properties
+bin.excludes = library/
 source.. = src/
 src.includes = about.html,about_files/
+src.excludes = external.xpt
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt.win32.win32.x86_64/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.win32.win32.x86_64/META-INF/MANIFEST.MF
index f262347..039d9da 100644
--- a/bundles/org.eclipse.swt.win32.win32.x86_64/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.swt.win32.win32.x86_64/META-INF/MANIFEST.MF
@@ -7,6 +7,22 @@
 Bundle-ManifestVersion: 2
 Bundle-Localization: fragment
 Export-Package: 
+ org.eclipse.swt,
+ org.eclipse.swt.accessibility,
+ org.eclipse.swt.awt,
+ org.eclipse.swt.browser,
+ org.eclipse.swt.custom,
+ org.eclipse.swt.dnd,
+ org.eclipse.swt.events,
+ org.eclipse.swt.graphics,
+ org.eclipse.swt.layout,
+ org.eclipse.swt.opengl,
+ org.eclipse.swt.printing,
+ org.eclipse.swt.program,
+ org.eclipse.swt.widgets,
+ org.eclipse.swt.internal; x-friends:="org.eclipse.ui",
+ org.eclipse.swt.internal.image; x-internal:=true,
+ org.eclipse.swt.internal.theme; x-internal:=true,
  org.eclipse.swt.ole.win32,
  org.eclipse.swt.internal.gdip; x-internal:=true,
  org.eclipse.swt.internal.ole.win32; x-internal:=true,
diff --git a/bundles/org.eclipse.swt.win32.win32.x86_64/build.properties b/bundles/org.eclipse.swt.win32.win32.x86_64/build.properties
index 9c8603d..1a3888c 100644
--- a/bundles/org.eclipse.swt.win32.win32.x86_64/build.properties
+++ b/bundles/org.eclipse.swt.win32.win32.x86_64/build.properties
@@ -10,6 +10,8 @@
 #     Krzysztof Daniel, Red Hat, Inc. - tycho enablement
 ###############################################################################
 custom = true
-bin.includes = *.dll,org/**/,about_files/,about.html,fragment.properties, version.txt, external.xpt
+bin.includes = .,*.dll,about_files/,about.html,fragment.properties
+bin.excludes = library/
 source.. = src/
 src.includes = about.html,about_files/
+src.excludes = external.xpt
diff --git a/bundles/org.eclipse.swt.wpf.win32.x86/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.wpf.win32.x86/META-INF/MANIFEST.MF
index 67a143b..1957235 100644
--- a/bundles/org.eclipse.swt.wpf.win32.x86/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.swt.wpf.win32.x86/META-INF/MANIFEST.MF
@@ -7,6 +7,22 @@
 Bundle-ManifestVersion: 2
 Bundle-Localization: fragment
 Export-Package: 
+ org.eclipse.swt,
+ org.eclipse.swt.accessibility,
+ org.eclipse.swt.awt,
+ org.eclipse.swt.browser,
+ org.eclipse.swt.custom,
+ org.eclipse.swt.dnd,
+ org.eclipse.swt.events,
+ org.eclipse.swt.graphics,
+ org.eclipse.swt.layout,
+ org.eclipse.swt.opengl,
+ org.eclipse.swt.printing,
+ org.eclipse.swt.program,
+ org.eclipse.swt.widgets,
+ org.eclipse.swt.internal; x-friends:="org.eclipse.ui",
+ org.eclipse.swt.internal.image; x-internal:=true,
+ org.eclipse.swt.internal.theme; x-internal:=true,
  org.eclipse.swt.internal.wpf; x-internal:=true
 Eclipse-PlatformFilter: (& (osgi.ws=wpf) (osgi.os=win32) (osgi.arch=x86))
 Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,
diff --git a/bundles/org.eclipse.swt.wpf.win32.x86/build.properties b/bundles/org.eclipse.swt.wpf.win32.x86/build.properties
index 6833ec2..213d3f2 100644
--- a/bundles/org.eclipse.swt.wpf.win32.x86/build.properties
+++ b/bundles/org.eclipse.swt.wpf.win32.x86/build.properties
@@ -9,6 +9,8 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 custom = true
-bin.includes = *.dll,org/**/,about_files/,about.html,fragment.properties, version.txt, external.xpt
+bin.includes = .,*.dll,about_files/,about.html,fragment.properties
+bin.excludes = library/
 source.. = src/
 src.includes = about.html,about_files/
+src.excludes = external.xpt
diff --git a/pom.xml b/pom.xml
index 558bb67..e772ad3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,34 +75,6 @@
               </includes>
               <followSymlinks>false</followSymlinks>
             </fileset>
-            <fileset>
-              <directory>@dot</directory>
-              <includes>
-                <include>**/*</include>
-              </includes>
-              <followSymlinks>false</followSymlinks>
-            </fileset>
-            <fileset>
-              <directory>org</directory>
-              <includes>
-                <include>**/*</include>
-              </includes>
-              <followSymlinks>false</followSymlinks>
-            </fileset>
-            <fileset>
-              <directory>.</directory>
-              <includes>
-                <include>.apibuild.xml</include>
-                <include>external.xpt</include>
-                <include>src.zip</include>
-                <include>swt-debug.jar</include>
-                <include>swt.jar</include>
-                <include>version.txt</include>
-                <include>@dot</include>
-                <include>org</include>
-              </includes>
-              <followSymlinks>false</followSymlinks>
-            </fileset>
           </filesets>
         </configuration>
       </plugin>