224 files changed, 1234 insertions, 1314 deletions
diff --git a/bundles/org.eclipse.swt/.classpath_motif b/bundles/org.eclipse.swt/.classpath_motif
index 826bb421ee..70d3634e41 100755
--- a/bundles/org.eclipse.swt/.classpath_motif
+++ b/bundles/org.eclipse.swt/.classpath_motif
@@ -12,5 +12,7 @@
     <classpathentry kind="src" path="Eclipse SWT Drag and Drop/motif"/>
     <classpathentry kind="src" path="Eclipse SWT Drag and Drop/common"/>
     <classpathentry kind="src" path="Eclipse SWT Custom Widgets/common"/>
+    <classpathentry kind="src" path="Eclipse SWT PI/motif"/>
+    <classpathentry kind="src" path="Eclipse SWT PI/common_j2se"/>
     <classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/bundles/org.eclipse.swt/.classpath_motif_j2me b/bundles/org.eclipse.swt/.classpath_motif_j2me
index a5ff02332f..abf6b8b5cc 100644
--- a/bundles/org.eclipse.swt/.classpath_motif_j2me
+++ b/bundles/org.eclipse.swt/.classpath_motif_j2me
@@ -12,5 +12,7 @@
     <classpathentry kind="src" path="Eclipse SWT Drag and Drop/motif"/>
     <classpathentry kind="src" path="Eclipse SWT Drag and Drop/common"/>
     <classpathentry kind="src" path="Eclipse SWT Custom Widgets/common"/>
+    <classpathentry kind="src" path="Eclipse SWT PI/motif"/>
+    <classpathentry kind="src" path="Eclipse SWT PI/common_j2me"/>
     <classpathentry kind="output" path="bin"/>
 </classpath>
 \ No newline at end of file
diff --git a/bundles/org.eclipse.swt/.classpath_photon b/bundles/org.eclipse.swt/.classpath_photon
index e8ef1bb5ec..5afc80d379 100755
--- a/bundles/org.eclipse.swt/.classpath_photon
+++ b/bundles/org.eclipse.swt/.classpath_photon
@@ -12,5 +12,7 @@
     <classpathentry kind="src" path="Eclipse SWT Drag and Drop/photon"/>
     <classpathentry kind="src" path="Eclipse SWT Drag and Drop/common"/>
     <classpathentry kind="src" path="Eclipse SWT Custom Widgets/common"/>
+    <classpathentry kind="src" path="Eclipse SWT PI/photon"/>
+    <classpathentry kind="src" path="Eclipse SWT PI/common_j2se"/>
     <classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/bundles/org.eclipse.swt/.classpath_photon_j2me b/bundles/org.eclipse.swt/.classpath_photon_j2me
index d9ddb445ff..8a436c634f 100644
--- a/bundles/org.eclipse.swt/.classpath_photon_j2me
+++ b/bundles/org.eclipse.swt/.classpath_photon_j2me
@@ -12,5 +12,7 @@
     <classpathentry kind="src" path="Eclipse SWT Drag and Drop/photon"/>
     <classpathentry kind="src" path="Eclipse SWT Drag and Drop/common"/>
     <classpathentry kind="src" path="Eclipse SWT Custom Widgets/common"/>
+    <classpathentry kind="src" path="Eclipse SWT PI/photon"/>
+    <classpathentry kind="src" path="Eclipse SWT PI/common_j2me"/>
     <classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/bundles/org.eclipse.swt/.classpath_win32 b/bundles/org.eclipse.swt/.classpath_win32
index 3f08b91dd9..35ad7414ea 100755
--- a/bundles/org.eclipse.swt/.classpath_win32
+++ b/bundles/org.eclipse.swt/.classpath_win32
@@ -13,5 +13,7 @@
     <classpathentry kind="src" path="Eclipse SWT Drag and Drop/win32"/>
     <classpathentry kind="src" path="Eclipse SWT Drag and Drop/common"/>
     <classpathentry kind="src" path="Eclipse SWT Custom Widgets/common"/>
+    <classpathentry kind="src" path="Eclipse SWT PI/win32"/>
+    <classpathentry kind="src" path="Eclipse SWT PI/common_j2se"/>
     <classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/bundles/org.eclipse.swt/.classpath_win32_j2me b/bundles/org.eclipse.swt/.classpath_win32_j2me
index acae8c33e8..2b2dd638a6 100644
--- a/bundles/org.eclipse.swt/.classpath_win32_j2me
+++ b/bundles/org.eclipse.swt/.classpath_win32_j2me
@@ -13,5 +13,7 @@
     <classpathentry kind="src" path="Eclipse SWT Drag and Drop/win32"/>
     <classpathentry kind="src" path="Eclipse SWT Drag and Drop/common"/>
     <classpathentry kind="src" path="Eclipse SWT Custom Widgets/common"/>
+    <classpathentry kind="src" path="Eclipse SWT PI/win32"/>
+    <classpathentry kind="src" path="Eclipse SWT PI/common_j2me"/>
     <classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/common_j2me/org/eclipse/swt/internal/Library.java b/bundles/org.eclipse.swt/Eclipse SWT PI/common_j2me/org/eclipse/swt/internal/Library.java
new file mode 100644
index 0000000000..512bc98517
--- /dev/null
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/common_j2me/org/eclipse/swt/internal/Library.java
@@ -0,0 +1,63 @@
+package org.eclipse.swt.internal;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+public class Library {
+
+	/* SWT Version - Mmmm (M=major, mmm=minor) */
+	
+	/**
+	 * SWT Major version number (must be >= 0)
+	 */
+	static int MAJOR_VERSION = 2;
+	
+	/**
+	 * SWT Minor version number (must be in the range 0..999)
+	 */
+	static int MINOR_VERSION = 17;
+	
+	/**
+	 * SWT revision number (must be >= 0)
+	 */
+	static int REVISION = 0;
+
+/**
+ * Returns the SWT version as an integer in the standard format
+ * <em>Mmmm</em> where <em>M</em> is the major version number
+ * and <em>mmm</em> is the minor version number.
+ *
+ * @return the version of the currently running SWT
+ */
+public static int getVersion () {
+	return MAJOR_VERSION * 1000 + MINOR_VERSION;
+}
+
+/**
+ * Returns the SWT revision number as an integer. Revision changes
+ * occur as a result of non-API breaking bug fixes.
+ *
+ * @return the revision number of the currently running SWT
+ */
+public static int getRevision () {
+	return REVISION;
+}
+
+/**
+ * Loads the shared library that matches the version of the
+ * Java code which is currently running.  SWT shared libraries
+ * follow an encoding scheme where the major, minor and revision
+ * numbers are embedded in the library name and this along with
+ * <code>name</code> is used to load the library.  If this fails,
+ * <code>name</code> is used in another attempt to load the library,
+ * this time ignoring the SWT version encoding scheme.
+ *
+ * @param name the name of the library to load
+ */
+public static void loadLibrary (String name) {
+}
+
+}
+
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/common_j2se/org/eclipse/swt/internal/Library.java b/bundles/org.eclipse.swt/Eclipse SWT PI/common_j2se/org/eclipse/swt/internal/Library.java
new file mode 100644
index 0000000000..e8f7b098e3
--- /dev/null
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/common_j2se/org/eclipse/swt/internal/Library.java
@@ -0,0 +1,102 @@
+package org.eclipse.swt.internal;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+public class Library {
+
+	/* SWT Version - Mmmm (M=major, mmm=minor) */
+	
+	/**
+	 * SWT Major version number (must be >= 0)
+	 */
+	static int MAJOR_VERSION = 2;
+	
+	/**
+	 * SWT Minor version number (must be in the range 0..999)
+	 */
+	static int MINOR_VERSION = 17;
+	
+	/**
+	 * SWT revision number (must be >= 0)
+	 */
+	static int REVISION = 0;
+
+/**
+ * Returns the SWT version as an integer in the standard format
+ * <em>Mmmm</em> where <em>M</em> is the major version number
+ * and <em>mmm</em> is the minor version number.
+ *
+ * @return the version of the currently running SWT
+ */
+public static int getVersion () {
+	return MAJOR_VERSION * 1000 + MINOR_VERSION;
+}
+
+/**
+ * Returns the OS name.
+ *
+ * @return the os name of the currently running SWT
+ */
+static String getOS () {
+	String name = System.getProperty("os.name");
+	if (name == null) return "unknown";
+	name = name.toLowerCase ();
+	if (name.indexOf ("windows ce") == 0) return "win32-ce";
+	if (name.indexOf ("win") == 0) return "win32";
+	if (name.indexOf ("sun") == 0) return "solaris";
+	return name;
+}
+
+/**
+ * Returns the SWT revision number as an integer. Revision changes
+ * occur as a result of non-API breaking bug fixes.
+ *
+ * @return the revision number of the currently running SWT
+ */
+public static int getRevision () {
+	return REVISION;
+}
+	
+/**
+ * Loads the shared library that matches the version of the
+ * Java code which is currently running.  SWT shared libraries
+ * follow an encoding scheme where the major, minor and revision
+ * numbers are embedded in the library name and this along with
+ * <code>name</code> is used to load the library.  If this fails,
+ * <code>name</code> is used in another attempt to load the library,
+ * this time ignoring the SWT version encoding scheme.
+ *
+ * @param name the name of the library to load
+ */
+public static void loadLibrary (String name) {
+	/*
+     * Include OS name to support same window system
+     * on different operating systems.
+	 */
+	String newName = name + "-" + getOS () + "-" + MAJOR_VERSION;
+
+	/* Force 3 digits in minor version number */
+	if (MINOR_VERSION < 10) {
+		newName += "00";
+	} else {
+		if (MINOR_VERSION < 100) newName += "0";
+	}
+	newName += MINOR_VERSION;
+	
+	/* No "r" until first revision */
+	if (REVISION > 0) newName += "r" + REVISION;
+	try {
+		System.loadLibrary (newName);
+	} catch (UnsatisfiedLinkError e) {
+		try {
+			System.loadLibrary (name);
+		} catch (UnsatisfiedLinkError e2) {
+			throw e;
+		}
+	}
+}
+
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/library/build.csh b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/build.csh
index 6f715b88f9..6e30058d30 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/library/build.csh
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/build.csh
@@ -3,16 +3,6 @@
 # (c) Copyright IBM Corp., 2000, 2001
 # All Rights Reserved.
 
-#    This command script can be invoked with the "clean" argument.
-
-# The major and minor version numbers and the build numbers are returned by the
-# getSharedLibraryMajorVersionNumber and getSharedLibraryMinorVersionNumber
-# calls so java can query the swt shared library version number
-
-setenv MAJOR_VER  2
-setenv MINOR_VER  017
-setenv BUILD_NUM  0
-
 # Some UNIX/Linux compilers don't like <CR>'s in files (DOS format).
 set fixup_files = `grep -l "\
 " *.[ch]`
 if ( "$fixup_files" != "" ) then
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/library/cde.c b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/cde.c
index f0bb3fedb5..d48f2c743d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/library/cde.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/cde.c
@@ -7,7 +7,7 @@
  * SWT CDE natives implementation.
  */ 
 
-#include <jni.h>
+#include "swt.h"
 
 #include <stdio.h>
 #include <assert.h>
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/library/gnome.c b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/gnome.c
index 183191bba9..9fc4934cdf 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/library/gnome.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/gnome.c
@@ -10,7 +10,7 @@
 /* #define PRINT_FAILED_RCODES */
 #define NDEBUG 
 
-#include "globals.h"
+#include "swt.h"
 #include "structs.h"
 
 #include <stdio.h>
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/library/kde.cc b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/kde.cc
index 6c7e251193..b2c4125693 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/library/kde.cc
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/kde.cc
@@ -12,7 +12,7 @@
 
 #include <stdio.h>
 #include <signal.h>
-#include "jni.h"
+#include "swt.h"
 
 #include <kapp.h>
 #include <kservice.h>
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/library/make_aix.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/make_aix.mak
index 37c112abda..7e09266911 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/library/make_aix.mak
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/make_aix.mak
@@ -1,15 +1,11 @@
-# Makefile for creating SWT libraries on Linux
-
 # (c) Copyright IBM Corp., 2000, 2001
 # All Rights Reserved.
-
-# The following environment variables are assumed to be defined:
 #
-# MAJOR_VER  - the major version number 
-# MINOR_VER  - the minor version number 
-# BUILD_NUM  - the build number
+# Makefile for creating SWT libraries on AIX
 
-DLL_VERSION=$(MAJOR_VER)$(MINOR_VER)
+include make_common.mak
+
+SWT_VERSION=$(maj_ver)$(min_ver)
 
 CC=cc_r
 
@@ -25,12 +21,12 @@ CDE_HOME   = /usr/dt
 
 SWT_PREFIX   = swt
 OS_PREFIX    = aix
-SWT_DLL      = lib$(SWT_PREFIX)-$(OS_PREFIX)-$(DLL_VERSION).so
-SWT_OBJ      = callback.o globals.o library.o structs.o swt.o 
+SWT_DLL      = lib$(SWT_PREFIX)-$(OS_PREFIX)-$(SWT_VERSION).so
+SWT_OBJ      = callback.o structs.o swt.o 
 SWT_LIB      = -L$(MOTIF_HOME) -G -bnoentry -lc_r -lC_r -lm -bexpall -lXm -lMrm -lXt -lX11 -lXext
 
 CDE_PREFIX   = swt-cde
-CDE_DLL      = lib$(CDE_PREFIX)-$(OS_PREFIX)-$(DLL_VERSION).so
+CDE_DLL      = lib$(CDE_PREFIX)-$(OS_PREFIX)-$(SWT_VERSION).so
 CDE_OBJ      = cde.o
 CDE_LIB      = -L$(CDE_HOME)/lib -G -bnoentry -bexpall -lDtSvc
 
@@ -39,7 +35,7 @@ CDE_LIB      = -L$(CDE_HOME)/lib -G -bnoentry -bexpall -lDtSvc
 # library.
 #
 CFLAGS = -O -s \
-	-DSWT_LIBRARY_VERSION=$(MAJOR_VER)$(MINOR_VER) \
+	-DSWT_VERSION=$(SWT_VERSION) \
 	-DAIX -DMOTIF -DCDE -DNO_XPRINTING_EXTENSIONS \
 	-q mbcs -qlanglvl=extended -qarch=ppc -qtune=604 -qmaxmem=8192 \
 	-I$(IVE_HOME)/include \
@@ -58,9 +54,6 @@ make_cde: $(CDE_DLL)
 $(CDE_DLL): $(CDE_OBJ)
 	ld -o $@ $(CDE_OBJ) $(CDE_LIB)
 
-clean:
-	rm -f $(SWT_OBJ) $(SWT_DLL) $(CDE_OBJ) $(CDE_DLL)
-
-
-
 
+clean:
+	rm -f *.o *.so
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/library/make_linux.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/make_linux.mak
index 717089e03d..ceeaa41b76 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/library/make_linux.mak
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/make_linux.mak
@@ -1,15 +1,11 @@
-# Makefile for creating SWT libraries on Linux
-
 # (c) Copyright IBM Corp., 2000, 2001
 # All Rights Reserved.
-
-# The following environment variables are assumed to be defined:
 #
-# MAJOR_VER  - the major version number 
-# MINOR_VER  - the minor version number 
-# BUILD_NUM  - the build number
+# Makefile for creating SWT libraries on Linux
+
+include make_common.mak
 
-DLL_VERSION=$(MAJOR_VER)$(MINOR_VER)
+SWT_VERSION=$(maj_ver)$(min_ver)
 
 
 # Define the installation directories for various products.
@@ -25,19 +21,19 @@ QT_HOME    = /usr/lib/qt-2.3.0
 
 SWT_PREFIX   = swt
 OS_PREFIX    = linux
-SWT_DLL      = lib$(SWT_PREFIX)-$(OS_PREFIX)-$(DLL_VERSION).so
-SWT_OBJ      = callback.o globals.o library.o structs.o swt.o
+SWT_DLL      = lib$(SWT_PREFIX)-$(OS_PREFIX)-$(SWT_VERSION).so
+SWT_OBJ      = callback.o structs.o swt.o
 SWT_LIB      = -L$(MOTIF_HOME)/lib -lXm -L/usr/lib -L/usr/X11R6/lib \
 	           -rpath . -x -shared -lX11 -lm -lXext -lXt -lXp -ldl
 
 GNOME_PREFIX = swt-gnome
-GNOME_DLL    = lib$(GNOME_PREFIX)-$(OS_PREFIX)-$(DLL_VERSION).so
+GNOME_DLL    = lib$(GNOME_PREFIX)-$(OS_PREFIX)-$(SWT_VERSION).so
 GNOME_OBJ    = gnome.o 
 GNOME_LIB    = -x -shared \
 	           `gnome-config --libs gnome`
 
 KDE_PREFIX   = swt-kde
-KDE_DLL      = lib$(KDE_PREFIX)-$(OS_PREFIX)-$(DLL_VERSION).so
+KDE_DLL      = lib$(KDE_PREFIX)-$(OS_PREFIX)-$(SWT_VERSION).so
 KDE_OBJ      = kde.o
 KDE_LIB      = -L/usr/lib  -L$(QT_HOME)/lib \
 	           -shared -lksycoca -lkdecore -lqt
@@ -47,7 +43,7 @@ KDE_LIB      = -L/usr/lib  -L$(QT_HOME)/lib \
 # library. The KDE library uses its own (C++) flags.
 #
 CFLAGS = -O -s \
-	-DSWT_LIBRARY_VERSION=$(MAJOR_VER)$(MINOR_VER) \
+	-DSWT_VERSION=$(SWT_VERSION) \
 	-DLINUX -DMOTIF -DGNOME \
 	-fpic \
 	-I./ \
@@ -84,6 +80,5 @@ $(KDE_OBJ): kde.cc
 	     -I../ -I$(IVE_HOME)/include -fno-rtti -o kde.o kde.cc
 
 clean:
-	rm -f $(SWT_OBJ) $(SWT_DLL) $(GNOME_OBJ) $(GNOME_DLL)
-	rm -f $(KDE_OBJ) $(KDE_DLL)
+	rm -f *.so *.o
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/library/make_solaris.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/make_solaris.mak
index b8dce18029..83dddd8c58 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/library/make_solaris.mak
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/make_solaris.mak
@@ -1,15 +1,11 @@
-# Makefile for creating SWT libraries on Solaris
-
 # (c) Copyright IBM Corp., 2000, 2001
 # All Rights Reserved.
-
-# The following environment variables are assumed to be defined:
 #
-# MAJOR_VER  - the major version number 
-# MINOR_VER  - the minor version number 
-# BUILD_NUM  - the build number
+# Makefile for SWT libraries on Solaris
 
-DLL_VERSION=$(MAJOR_VER)$(MINOR_VER)
+include make_common.mak
+
+SWT_VERSION=$(maj_ver)$(min_ver)
 
 
 # Define the installation directories for various products.
@@ -25,13 +21,13 @@ CDE_HOME   = /usr/dt
 
 SWT_PREFIX   = swt
 OS_PREFIX    = solaris
-SWT_DLL      = lib$(SWT_PREFIX)-$(OS_PREFIX)-$(DLL_VERSION).so
-SWT_OBJ      = callback.o globals.o library.o structs.o swt.o 
+SWT_DLL      = lib$(SWT_PREFIX)-$(OS_PREFIX)-$(SWT_VERSION).so
+SWT_OBJ      = callback.o structs.o swt.o 
 SWT_LIB      = -L$(MOTIF_HOME)/lib -L/usr/lib  \
 	       -G -lXm -lXt -lX11 -lm
 
 CDE_PREFIX   = swt-cde
-CDE_DLL      = lib$(CDE_PREFIX)-$(OS_PREFIX)-$(DLL_VERSION).so
+CDE_DLL      = lib$(CDE_PREFIX)-$(OS_PREFIX)-$(SWT_VERSION).so
 CDE_OBJ      = cde.o
 CDE_LIB      = -G -L$(CDE_HOME)/lib -lDtSvc
 
@@ -46,7 +42,7 @@ CDE_LIB      = -G -L$(CDE_HOME)/lib -lDtSvc
 #
 CFLAGS = -O -s \
 	-xarch=generic \
-	-DSWT_LIBRARY_VERSION=$(MAJOR_VER)$(MINOR_VER) \
+	-DSWT_VERSION=$(SWT_VERSION) \
 	-DSOLARIS -DMOTIF -DCDE \
 	-KPIC \
 	-I./ \
@@ -70,4 +66,5 @@ $(CDE_DLL): $(CDE_OBJ)
 
 
 clean:
-	rm -f $(SWT_OBJ) $(SWT_DLL) $(CDE_OBJ) $(CDE_DLL)
+	rm -f *.so *.o
+
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/library/structs.c b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/structs.c
index 1891c13891..1b918b0e4b 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/library/structs.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/structs.c
@@ -7,9 +7,36 @@
  * JNI SWT object field getters and setters declarations for Motif structs.
  */
 
-#include <jni.h>
+#include "swt.h"
 #include "structs.h"
 
+/* Globals */
+VISUAL_FID_CACHE VisualFc;
+XANYEVENT_FID_CACHE XanyeventFc;
+XBUTTONEVENT_FID_CACHE XbuttoneventFc;
+XCHARSTRUCT_FID_CACHE XcharstructFc;
+XCOLOR_FID_CACHE XcolorFc;
+XCONFIGUREEVENT_FID_CACHE XconfigureeventFc;
+XCROSSINGEVENT_FID_CACHE XcrossingeventFc;
+XEXPOSEEVENT_FID_CACHE XexposeeventFc;
+XFOCUSCHANGEEVENT_FID_CACHE XfocuschangeeventFc;
+XFONTSTRUCT_FID_CACHE XfontstructFc;
+XGCVALUES_FID_CACHE XgcvaluesFc;
+XIMAGE_FID_CACHE XimageFc;
+XKEYEVENT_FID_CACHE XkeyeventFc;
+XMANYCALLBACKSTRUCT_FID_CACHE XmanycallbackstructFc;
+XMDRAGPROCCALLBACK_FID_CACHE XmdragproccallbackFc;
+XMDROPFINISHCALLBACK_FID_CACHE XmdropfinishcallbackFc;
+XMDROPPROCCALLBACK_FID_CACHE XmdropproccallbackFc;
+XMOTIONEVENT_FID_CACHE XmotioneventFc;
+XMTEXTBLOCKREC_FID_CACHE XmtextblockrecFc;
+XMTEXTVERIFYCALLBACKSTRUCT_FID_CACHE XmtextverifycallbackstructFc;
+XRECTANGLE_FID_CACHE XrectangleFc;
+XSETWINDOWATTRIBUTES_FID_CACHE XsetwindowattributesFc;
+XTWIDGETGEOMETRY_FID_CACHE XtwidgetgeometryFc;
+XWINDOWATTRIBUTES_FID_CACHE XwindowattributesFc;
+XWINDOWCHANGES_FID_CACHE XwindowchangesFc;
+
 /* ----------- fid and class caches  ----------- */
 /*
  * Used for Java objects passed into JNI that are
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/library/structs.h b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/structs.h
index 0d8abaf35f..aa61e39d84 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/library/structs.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/structs.h
@@ -22,34 +22,6 @@
 #include <Xm/XmAll.h>
 #include <Mrm/MrmPublic.h>
 
-/* All globals declared in globals.h */
-#define FID_CACHE_GLOBALS \
-	VISUAL_FID_CACHE VisualFc; \
-	XANYEVENT_FID_CACHE XanyeventFc; \
-	XBUTTONEVENT_FID_CACHE XbuttoneventFc; \
-	XCHARSTRUCT_FID_CACHE XcharstructFc; \
-	XCOLOR_FID_CACHE XcolorFc; \
-	XCONFIGUREEVENT_FID_CACHE XconfigureeventFc; \
-	XCROSSINGEVENT_FID_CACHE XcrossingeventFc; \
-	XEXPOSEEVENT_FID_CACHE XexposeeventFc; \
-	XFOCUSCHANGEEVENT_FID_CACHE XfocuschangeeventFc; \
-	XFONTSTRUCT_FID_CACHE XfontstructFc; \
-	XGCVALUES_FID_CACHE XgcvaluesFc; \
-	XIMAGE_FID_CACHE XimageFc; \
-	XKEYEVENT_FID_CACHE XkeyeventFc; \
-	XMANYCALLBACKSTRUCT_FID_CACHE XmanycallbackstructFc; \
-	XMDRAGPROCCALLBACK_FID_CACHE XmdragproccallbackFc; \
-	XMDROPFINISHCALLBACK_FID_CACHE XmdropfinishcallbackFc; \
-	XMDROPPROCCALLBACK_FID_CACHE XmdropproccallbackFc; \
-	XMOTIONEVENT_FID_CACHE XmotioneventFc; \
-	XMTEXTBLOCKREC_FID_CACHE XmtextblockrecFc; \
-	XMTEXTVERIFYCALLBACKSTRUCT_FID_CACHE XmtextverifycallbackstructFc; \
-	XRECTANGLE_FID_CACHE XrectangleFc; \
-	XSETWINDOWATTRIBUTES_FID_CACHE XsetwindowattributesFc; \
-	XTWIDGETGEOMETRY_FID_CACHE XtwidgetgeometryFc; \
-	XWINDOWATTRIBUTES_FID_CACHE XwindowattributesFc; \
-	XWINDOWCHANGES_FID_CACHE XwindowchangesFc; 
-
 /* ----------- fid and class caches  ----------- */
 /**
  * Used for Java objects passed into JNI that are
@@ -462,4 +434,30 @@ void setXwindowchangesFields(JNIEnv *env, jobject lpObject, XWindowChanges *lpXw
 void getXtwidgetgeometryFields(JNIEnv *env, jobject lpObject, XtWidgetGeometry *lpXtwidgetgeometry, PXTWIDGETGEOMETRY_FID_CACHE lpXtwidgetgeometryFc);
 void setXtwidgetgeometryFields(JNIEnv *env, jobject lpObject, XtWidgetGeometry *lpXtwidgetgeometry, PXTWIDGETGEOMETRY_FID_CACHE lpXtwidgetgeometryFc);
 
+extern VISUAL_FID_CACHE VisualFc;
+extern XANYEVENT_FID_CACHE XanyeventFc;
+extern XBUTTONEVENT_FID_CACHE XbuttoneventFc;
+extern XCHARSTRUCT_FID_CACHE XcharstructFc;
+extern XCOLOR_FID_CACHE XcolorFc;
+extern XCONFIGUREEVENT_FID_CACHE XconfigureeventFc;
+extern XCROSSINGEVENT_FID_CACHE XcrossingeventFc;
+extern XEXPOSEEVENT_FID_CACHE XexposeeventFc;
+extern XFOCUSCHANGEEVENT_FID_CACHE XfocuschangeeventFc;
+extern XFONTSTRUCT_FID_CACHE XfontstructFc;
+extern XGCVALUES_FID_CACHE XgcvaluesFc;
+extern XIMAGE_FID_CACHE XimageFc;
+extern XKEYEVENT_FID_CACHE XkeyeventFc;
+extern XMANYCALLBACKSTRUCT_FID_CACHE XmanycallbackstructFc;
+extern XMDRAGPROCCALLBACK_FID_CACHE XmdragproccallbackFc;
+extern XMDROPFINISHCALLBACK_FID_CACHE XmdropfinishcallbackFc;
+extern XMDROPPROCCALLBACK_FID_CACHE XmdropproccallbackFc;
+extern XMOTIONEVENT_FID_CACHE XmotioneventFc;
+extern XMTEXTBLOCKREC_FID_CACHE XmtextblockrecFc;
+extern XMTEXTVERIFYCALLBACKSTRUCT_FID_CACHE XmtextverifycallbackstructFc;
+extern XRECTANGLE_FID_CACHE XrectangleFc;
+extern XSETWINDOWATTRIBUTES_FID_CACHE XsetwindowattributesFc;
+extern XTWIDGETGEOMETRY_FID_CACHE XtwidgetgeometryFc;
+extern XWINDOWATTRIBUTES_FID_CACHE XwindowattributesFc;
+extern XWINDOWCHANGES_FID_CACHE XwindowchangesFc;
+
 #endif /* INC_structs_H */
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/library/swt.c b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/swt.c
index 52259ad31e..8970f20f4d 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/library/swt.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/swt.c
@@ -10,7 +10,7 @@
 /* #define PRINT_FAILED_RCODES */
 #define NDEBUG 
 
-#include "globals.h"
+#include "swt.h"
 #include "structs.h"
 
 #include <stdio.h>
@@ -25,7 +25,7 @@ JNIEXPORT int JNICALL Java_org_eclipse_swt_internal_motif_OS_getSharedLibraryMaj
 #ifdef DEBUG_CALL_PRINTS
     fprintf(stderr, "getSharedLibraryMajorVersionNumber\n");
 #endif
-    return SWT_LIBRARY_VERSION / 1000;
+    return SWT_VERSION / 1000;
 }
 
 JNIEXPORT int JNICALL Java_org_eclipse_swt_internal_motif_OS_getSharedLibraryMinorVersionNumber
@@ -34,7 +34,7 @@ JNIEXPORT int JNICALL Java_org_eclipse_swt_internal_motif_OS_getSharedLibraryMin
 #ifdef DEBUG_CALL_PRINTS
     fprintf(stderr, "getSharedLibraryMinorVersionNumber\n");
 #endif
-    return SWT_LIBRARY_VERSION % 1000;
+    return SWT_VERSION % 1000;
 }
 
 
@@ -7629,11 +7629,6 @@ JNIEXPORT jboolean JNICALL Java_org_eclipse_swt_internal_motif_OS_XtToolkitThrea
   (JNIEnv *env, jclass that)
 {
    DECL_GLOB(pGlob)
-   /*
-   * WARNING: When running under VA/Java, XtToolkitThreadInitialize
-   * is not called because this hangs VA/Java and SWT.
-   */
-   if (pGlob->vajava) return;
 #ifdef DEBUG_CALL_PRINTS
 	fprintf(stderr, "XtToolkitThreadInitialize\n");
 #endif
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/CDE.java b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/CDE.java
index bae2681133..bae2681133 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/CDE.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/CDE.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/GNOME.java b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/GNOME.java
index aff863b710..aff863b710 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/GNOME.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/GNOME.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/KDE.java b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/KDE.java
index eeb4c65232..eeb4c65232 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/KDE.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/KDE.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/OS.java
index 6217a46405..e9815c95c9 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/OS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/OS.java
@@ -11,7 +11,7 @@ public class OS {
 
 	/* Load the SWT library. */
 	static {
-		Callback.loadLibrary ();
+		Library.loadLibrary ("swt");
 	}
 
 	/* OS and locale Constants*/
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/Visual.java b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/Visual.java
index def3fb5860..def3fb5860 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/Visual.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/Visual.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/XAnyEvent.java b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XAnyEvent.java
index 4e2936a376..4e2936a376 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/XAnyEvent.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XAnyEvent.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/XButtonEvent.java b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XButtonEvent.java
index 2f8234ce5d..2f8234ce5d 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/XButtonEvent.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XButtonEvent.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/XCharStruct.java b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XCharStruct.java
index a9c92b492b..a9c92b492b 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/XCharStruct.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XCharStruct.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/XColor.java b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XColor.java
index bd9c4a306d..bd9c4a306d 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/XColor.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XColor.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/XConfigureEvent.java b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XConfigureEvent.java
index c8d58b705f..c8d58b705f 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/XConfigureEvent.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XConfigureEvent.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/XCrossingEvent.java b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XCrossingEvent.java
index ad59913ffc..ad59913ffc 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/XCrossingEvent.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XCrossingEvent.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/XEvent.java b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XEvent.java
index 1b20cb2be8..1b20cb2be8 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/XEvent.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XEvent.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/XExposeEvent.java b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XExposeEvent.java
index 25fc25485d..25fc25485d 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/XExposeEvent.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XExposeEvent.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/XFocusChangeEvent.java b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XFocusChangeEvent.java
index c46dcfafd9..c46dcfafd9 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/XFocusChangeEvent.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XFocusChangeEvent.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/XFontStruct.java b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XFontStruct.java
index e03dad6fec..e03dad6fec 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/XFontStruct.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XFontStruct.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/XGCValues.java b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XGCValues.java
index df6eb2db1e..df6eb2db1e 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/XGCValues.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XGCValues.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/XImage.java b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XImage.java
index 56f8e4f268..56f8e4f268 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/XImage.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XImage.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/XInputEvent.java b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XInputEvent.java
index 553d7a6bd7..553d7a6bd7 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/XInputEvent.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XInputEvent.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/XKeyEvent.java b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XKeyEvent.java
index 3323552e5f..3323552e5f 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/XKeyEvent.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XKeyEvent.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/XMotionEvent.java b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XMotionEvent.java
index d25e8a2a26..d25e8a2a26 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/XMotionEvent.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XMotionEvent.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/XRectangle.java b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XRectangle.java
index 5badc8584c..5badc8584c 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/XRectangle.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XRectangle.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/XSetWindowAttributes.java b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XSetWindowAttributes.java
index faae3320f6..faae3320f6 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/XSetWindowAttributes.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XSetWindowAttributes.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/XWindowAttributes.java b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XWindowAttributes.java
index 26fae4cbc5..26fae4cbc5 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/XWindowAttributes.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XWindowAttributes.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/XWindowChanges.java b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XWindowChanges.java
index 329f8a8c53..329f8a8c53 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/XWindowChanges.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XWindowChanges.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/XWindowEvent.java b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XWindowEvent.java
index 2084e1ab85..2084e1ab85 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/XWindowEvent.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XWindowEvent.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/XmAnyCallbackStruct.java b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XmAnyCallbackStruct.java
index 351cb19066..351cb19066 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/XmAnyCallbackStruct.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XmAnyCallbackStruct.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/XmDragProcCallback.java b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XmDragProcCallback.java
index f4a0c6f254..f4a0c6f254 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/XmDragProcCallback.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XmDragProcCallback.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/XmDropFinishCallback.java b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XmDropFinishCallback.java
index d5a9660286..d5a9660286 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/XmDropFinishCallback.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XmDropFinishCallback.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/XmDropProcCallback.java b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XmDropProcCallback.java
index 5b7a9d1b51..5b7a9d1b51 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/XmDropProcCallback.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XmDropProcCallback.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/XmTextBlockRec.java b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XmTextBlockRec.java
index 4094f36e81..4094f36e81 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/XmTextBlockRec.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XmTextBlockRec.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/XmTextVerifyCallbackStruct.java b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XmTextVerifyCallbackStruct.java
index 4d14db1da1..4d14db1da1 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/XmTextVerifyCallbackStruct.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XmTextVerifyCallbackStruct.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/XtWidgetGeometry.java b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XtWidgetGeometry.java
index 785d28bb72..785d28bb72 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/XtWidgetGeometry.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/XtWidgetGeometry.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/library/build.sh b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/build.sh
index 94c918f60c..ba823ee205 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/photon/library/build.sh
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/build.sh
@@ -5,4 +5,4 @@
 
 export IVE_HOME=~/ive/bin
 
-make -f makefile.mak $1 $2
-\ No newline at end of file
+make -f make_photon.mak $1 $2 $3 $4
+\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/make_photon.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/make_photon.mak
new file mode 100644
index 0000000000..ba4403a75c
--- /dev/null
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/make_photon.mak
@@ -0,0 +1,30 @@
+# (c) Copyright IBM Corp., 2000, 2001
+# All Rights Reserved.
+#
+# Makefile for SWT libraries on Photon
+
+include make_common.mak
+
+#assumes IVE_HOME is set in the environment
+
+SWT_PREFIX=swt
+OS_PREFIX=qnx
+SWT_VERSION=$(maj_ver)$(min_ver)
+SWT_LIB=lib$(SWT_PREFIX)-$(OS_PREFIX)-$(SWT_VERSION).so
+
+DEBUG =  
+CFLAGS = -c -shared -DSWT_VERSION=$(SWT_VERSION) -w8 $(DEBUG) -DPHOTON -I$(IVE_HOME)/include
+LFLAGS = -shared -lph -lphrender
+
+SWT_OBJS = swt.o structs.o callback.o
+
+all: $(SWT_LIB)
+
+.c.o:
+	cc $(CFLAGS) $*.c
+
+$(SWT_LIB): $(SWT_OBJS)
+	cc -o $(SWT_LIB)  $(LFLAGS) $(SWT_OBJS)
+
+clean:
+	rm -f *.so *.o
+\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/library/structs.c b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/structs.c
index f3cc1ea76c..c6770e7ab7 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/photon/library/structs.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/structs.c
@@ -7,10 +7,38 @@
  * JNI SWT object field getters and setters declarations for Motif structs.
  */
 
-#include <jni.h>
-#include "globals.h"
+#include "swt.h"
 #include "structs.h"
 
+/* Globals */
+PhPoint_t_FID_CACHE PhPoint_tFc;
+PhRect_t_FID_CACHE PhRect_tFc;
+PhTile_t_FID_CACHE PhTile_tFc;
+PtCallbackInfo_t_FID_CACHE PtCallbackInfo_tFc;
+PhWindowEvent_t_FID_CACHE PhWindowEvent_tFc;
+PhEvent_t_FID_CACHE PhEvent_tFc;
+FontQueryInfo_FID_CACHE FontQueryInfoFc;
+PhDim_t_FID_CACHE PhDim_tFc;
+PhImage_t_FID_CACHE PhImage_tFc;
+PhPointerEvent_t_FID_CACHE PhPointerEvent_tFc;
+PhKeyEvent_t_FID_CACHE PhKeyEvent_tFc;
+PtScrollbarCallback_t_FID_CACHE PtScrollbarCallback_tFc;
+PhCursorInfo_t_FID_CACHE PhCursorInfo_tFc;
+FontDetails_FID_CACHE FontDetailsFc;
+PhArea_t_FID_CACHE PhArea_tFc;
+PtFileSelectionInfo_t_FID_CACHE PtFileSelectionInfo_tFc;
+PgAlpha_t_FID_CACHE PgAlpha_tFc;
+PtTextCallback_t_FID_CACHE PtTextCallback_tFc;
+PtTreeItem_t_FID_CACHE PtTreeItem_tFc;
+PgMap_t_FID_CACHE PgMap_tFc;
+PtColorSelectInfo_t_FID_CACHE PtColorSelectInfo_tFc;
+PhRegion_t_FID_CACHE PhRegion_tFc;
+PtContainerCallback_t_FID_CACHE PtContainerCallback_tFc;
+PhCursorDef_t_FID_CACHE PhCursorDef_tFc;
+PgDisplaySettings_t_FID_CACHE PgDisplaySettings_tFc;
+PgVideoModeInfo_t_FID_CACHE PgVideoModeInfo_tFc;
+PhClipHeader_FID_CACHE PhClipHeaderFc;
+
 void cachePhPoint_tFids(JNIEnv *env, jobject lpObject, PPhPoint_t_FID_CACHE lpCache)
 {
 	if (lpCache->cached) return;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/library/structs.h b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/structs.h
index 0ed83a42a4..7753c21935 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/photon/library/structs.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/structs.h
@@ -14,36 +14,6 @@
 #include <Pt.h>
 #include <photon/PhRender.h>
 
-/* All globals to be declared in globals.h */
-#define FID_CACHE_GLOBALS \
-	PhPoint_t_FID_CACHE PhPoint_tFc; \
-	PhRect_t_FID_CACHE PhRect_tFc; \
-	PhTile_t_FID_CACHE PhTile_tFc; \
-	PtCallbackInfo_t_FID_CACHE PtCallbackInfo_tFc; \
-	PhWindowEvent_t_FID_CACHE PhWindowEvent_tFc; \
-	PhEvent_t_FID_CACHE PhEvent_tFc; \
-	FontQueryInfo_FID_CACHE FontQueryInfoFc; \
-	PhDim_t_FID_CACHE PhDim_tFc; \
-	PhImage_t_FID_CACHE PhImage_tFc; \
-	PhPointerEvent_t_FID_CACHE PhPointerEvent_tFc; \
-	PhKeyEvent_t_FID_CACHE PhKeyEvent_tFc; \
-	PtScrollbarCallback_t_FID_CACHE PtScrollbarCallback_tFc; \
-	PhCursorInfo_t_FID_CACHE PhCursorInfo_tFc; \
-	FontDetails_FID_CACHE FontDetailsFc; \
-	PhArea_t_FID_CACHE PhArea_tFc; \
-	PtFileSelectionInfo_t_FID_CACHE PtFileSelectionInfo_tFc; \
-	PgAlpha_t_FID_CACHE PgAlpha_tFc; \
-	PtTextCallback_t_FID_CACHE PtTextCallback_tFc; \
-	PtTreeItem_t_FID_CACHE PtTreeItem_tFc; \
-	PgMap_t_FID_CACHE PgMap_tFc; \
-	PtColorSelectInfo_t_FID_CACHE PtColorSelectInfo_tFc; \
-	PhRegion_t_FID_CACHE PhRegion_tFc; \
-	PtContainerCallback_t_FID_CACHE PtContainerCallback_tFc; \
-	PhCursorDef_t_FID_CACHE PhCursorDef_tFc; \
-	PgDisplaySettings_t_FID_CACHE PgDisplaySettings_tFc; \
-	PgVideoModeInfo_t_FID_CACHE PgVideoModeInfo_tFc; \
-	PhClipHeader_FID_CACHE PhClipHeaderFc;
-
 /* PhPoint_t struct */
 typedef struct PhPoint_t_FID_CACHE {
 	int cached;
@@ -364,5 +334,32 @@ void cachePhClipHeaderFids(JNIEnv *env, jobject lpObject, PPhClipHeader_FID_CACH
 void getPhClipHeaderFields(JNIEnv *env, jobject lpObject, PhClipHeader *lpStruct, PPhClipHeader_FID_CACHE lpCache);
 void setPhClipHeaderFields(JNIEnv *env, jobject lpObject, PhClipHeader *lpStruct, PPhClipHeader_FID_CACHE lpCache);
 
+extern PhPoint_t_FID_CACHE PhPoint_tFc;
+extern PhRect_t_FID_CACHE PhRect_tFc;
+extern PhTile_t_FID_CACHE PhTile_tFc;
+extern PtCallbackInfo_t_FID_CACHE PtCallbackInfo_tFc;
+extern PhWindowEvent_t_FID_CACHE PhWindowEvent_tFc;
+extern PhEvent_t_FID_CACHE PhEvent_tFc;
+extern FontQueryInfo_FID_CACHE FontQueryInfoFc;
+extern PhDim_t_FID_CACHE PhDim_tFc;
+extern PhImage_t_FID_CACHE PhImage_tFc;
+extern PhPointerEvent_t_FID_CACHE PhPointerEvent_tFc;
+extern PhKeyEvent_t_FID_CACHE PhKeyEvent_tFc;
+extern PtScrollbarCallback_t_FID_CACHE PtScrollbarCallback_tFc;
+extern PhCursorInfo_t_FID_CACHE PhCursorInfo_tFc;
+extern FontDetails_FID_CACHE FontDetailsFc;
+extern PhArea_t_FID_CACHE PhArea_tFc;
+extern PtFileSelectionInfo_t_FID_CACHE PtFileSelectionInfo_tFc;
+extern PgAlpha_t_FID_CACHE PgAlpha_tFc;
+extern PtTextCallback_t_FID_CACHE PtTextCallback_tFc;
+extern PtTreeItem_t_FID_CACHE PtTreeItem_tFc;
+extern PgMap_t_FID_CACHE PgMap_tFc;
+extern PtColorSelectInfo_t_FID_CACHE PtColorSelectInfo_tFc;
+extern PhRegion_t_FID_CACHE PhRegion_tFc;
+extern PtContainerCallback_t_FID_CACHE PtContainerCallback_tFc;
+extern PhCursorDef_t_FID_CACHE PhCursorDef_tFc;
+extern PgDisplaySettings_t_FID_CACHE PgDisplaySettings_tFc;
+extern PgVideoModeInfo_t_FID_CACHE PgVideoModeInfo_tFc;
+extern PhClipHeader_FID_CACHE PhClipHeaderFc;
 
 #endif // INC_structs_H
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/library/swt.c b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/swt.c
index 37d81baff0..1d2d5a3f46 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/photon/library/swt.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/swt.c
@@ -10,7 +10,7 @@
 // #define PRINT_FAILED_RCODES
 #define NDEBUG 
 
-#include "globals.h"
+#include "swt.h"
 #include "structs.h"
 
 #include <stdio.h>
@@ -25,7 +25,7 @@ JNIEXPORT int JNICALL Java_org_eclipse_swt_internal_photon_OS_getSharedLibraryMa
 #ifdef DEBUG_CALL_PRINTS
     fprintf(stderr, "getSharedLibraryMajorVersionNumber\n");
 #endif
-    return SWT_LIBRARY_VERSION / 1000;
+    return SWT_VERSION / 1000;
 }
 
 JNIEXPORT int JNICALL Java_org_eclipse_swt_internal_photon_OS_getSharedLibraryMinorVersionNumber
@@ -34,7 +34,7 @@ JNIEXPORT int JNICALL Java_org_eclipse_swt_internal_photon_OS_getSharedLibraryMi
 #ifdef DEBUG_CALL_PRINTS
     fprintf(stderr, "getSharedLibraryMinorVersionNumber\n");
 #endif
-    return SWT_LIBRARY_VERSION % 1000;
+    return SWT_VERSION % 1000;
 }
 
 /*
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/FontDetails.java b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/FontDetails.java
index 04879a4ab9..04879a4ab9 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/FontDetails.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/FontDetails.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/FontQueryInfo.java b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/FontQueryInfo.java
index 90cf14d8d8..90cf14d8d8 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/FontQueryInfo.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/FontQueryInfo.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/OS.java
index 7e4550d33c..87a03222fd 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/OS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/OS.java
@@ -11,7 +11,7 @@ public class OS {
 
 	/* Load the SWT library. */
 	static {
-		Callback.loadLibrary ();
+		Library.loadLibrary ("swt");
 	}
 
 /**** BEGIN MANUALLY ADDED/FIXED ***/
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/PgAlpha_t.java b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PgAlpha_t.java
index 7485fdfd4c..7485fdfd4c 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/PgAlpha_t.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PgAlpha_t.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/PgDisplaySettings_t.java b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PgDisplaySettings_t.java
index 89c384775e..89c384775e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/PgDisplaySettings_t.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PgDisplaySettings_t.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/PgMap_t.java b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PgMap_t.java
index d25f90f9bf..d25f90f9bf 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/PgMap_t.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PgMap_t.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/PgVideoModeInfo_t.java b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PgVideoModeInfo_t.java
index 61494500ac..61494500ac 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/PgVideoModeInfo_t.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PgVideoModeInfo_t.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/PhArea_t.java b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PhArea_t.java
index 0a09362a26..0a09362a26 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/PhArea_t.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PhArea_t.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/PhClipHeader.java b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PhClipHeader.java
index b7379fc9ca..b7379fc9ca 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/PhClipHeader.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PhClipHeader.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/PhCursorDef_t.java b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PhCursorDef_t.java
index 1bfe5c26cd..1bfe5c26cd 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/PhCursorDef_t.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PhCursorDef_t.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/PhCursorInfo_t.java b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PhCursorInfo_t.java
index ad22c1e0ee..ad22c1e0ee 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/PhCursorInfo_t.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PhCursorInfo_t.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/PhDim_t.java b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PhDim_t.java
index 66021b3848..66021b3848 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/PhDim_t.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PhDim_t.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/PhEvent_t.java b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PhEvent_t.java
index 4b0461f844..4b0461f844 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/PhEvent_t.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PhEvent_t.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/PhImage_t.java b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PhImage_t.java
index 539c1dee07..539c1dee07 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/PhImage_t.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PhImage_t.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/PhKeyEvent_t.java b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PhKeyEvent_t.java
index 4aa5622ceb..4aa5622ceb 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/PhKeyEvent_t.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PhKeyEvent_t.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/PhPoint_t.java b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PhPoint_t.java
index 5bcca4457f..5bcca4457f 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/PhPoint_t.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PhPoint_t.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/PhPointerEvent_t.java b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PhPointerEvent_t.java
index 07c8cd3491..07c8cd3491 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/PhPointerEvent_t.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PhPointerEvent_t.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/PhRect_t.java b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PhRect_t.java
index 0fe5db44e7..0fe5db44e7 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/PhRect_t.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PhRect_t.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/PhRegion_t.java b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PhRegion_t.java
index b7012858f1..b7012858f1 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/PhRegion_t.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PhRegion_t.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/PhTile_t.java b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PhTile_t.java
index 92f270ca42..92f270ca42 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/PhTile_t.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PhTile_t.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/PhWindowEvent_t.java b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PhWindowEvent_t.java
index 4084fa5911..4084fa5911 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/PhWindowEvent_t.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PhWindowEvent_t.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/PtCallbackInfo_t.java b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PtCallbackInfo_t.java
index 04b970a3fd..04b970a3fd 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/PtCallbackInfo_t.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PtCallbackInfo_t.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/PtColorSelectInfo_t.java b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PtColorSelectInfo_t.java
index bab9c5b694..bab9c5b694 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/PtColorSelectInfo_t.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PtColorSelectInfo_t.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/PtContainerCallback_t.java b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PtContainerCallback_t.java
index a6d14e8f5e..a6d14e8f5e 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/PtContainerCallback_t.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PtContainerCallback_t.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/PtFileSelectionInfo_t.java b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PtFileSelectionInfo_t.java
index 852218383d..852218383d 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/PtFileSelectionInfo_t.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PtFileSelectionInfo_t.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/PtScrollbarCallback_t.java b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PtScrollbarCallback_t.java
index 3185fabfb1..3185fabfb1 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/PtScrollbarCallback_t.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PtScrollbarCallback_t.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/PtTextCallback_t.java b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PtTextCallback_t.java
index 77def5959a..77def5959a 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/PtTextCallback_t.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PtTextCallback_t.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/PtTreeItem_t.java b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PtTreeItem_t.java
index d411b93bd9..d411b93bd9 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/photon/PtTreeItem_t.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PtTreeItem_t.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/library/build-ce.bat b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build-ce.bat
index 6b275f3ece..a65d75d306 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/library/build-ce.bat
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build-ce.bat
@@ -17,7 +17,7 @@ rem ********
 rem call k:\dev\products\msvc60\vc98\bin\vcvars32.bat
 
 rem ****** 
-rem MS-SDK - TEMPORARY UNTIL TRENT INSTALLS NEW SDK
+rem MS-SDK
 rem ******
 rem set Mssdk=j:\teamswt\swt-builddir\mssdk
 rem call %mssdk%\setenv.bat
@@ -25,4 +25,4 @@ rem call %mssdk%\setenv.bat
 call j:\j9\tools\config\ppcarm.bat
 
 :MAKE
-nmake makefile-ce.mak
+nmake -f make_wince.mak %1 %2 %3 %4
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/library/build.bat b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build.bat
index eec5fa5854..9b07fba0d7 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/library/build.bat
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/build.bat
@@ -17,10 +17,10 @@ rem ********
 call k:\dev\products\msvc60\vc98\bin\vcvars32.bat
 
 rem ****** 
-rem MS-SDK - TEMPORARY UNTIL TRENT INSTALLS NEW SDK
+rem MS-SDK
 rem ******
 set Mssdk=j:\teamswt\swt-builddir\mssdk
 call %mssdk%\setenv.bat
 
 :MAKE
-nmake makefile.mak
+nmake -f make_win32.mak %1 %2 %3 %4
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/make_win32.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/make_win32.mak
new file mode 100644
index 0000000000..2a158d4e29
--- /dev/null
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/make_win32.mak
@@ -0,0 +1,50 @@
+# (c) Copyright IBM Corp., 2000, 2001
+# All Rights Reserved.
+#
+# Makefile for SWT libraries on Windows
+
+# assumes JAVA_HOME is set in the environment from which nmake is run
+
+APPVER=5.0
+!include <make_common.mak>
+!include <win32.mak>
+
+pgm_ver_str="SWT $(maj_ver).$(min_ver) for Windows"
+timestamp_str=__DATE__\" \"__TIME__\" (EST)\"
+copyright = "Copyright (C) IBM Corporation 1999, 2000.  All rights reserved."
+
+SWT_PREFIX=swt
+OS_PREFIX=win32
+SWT_VERSION = $(maj_ver)$(min_ver)
+SWT_LIB     = $(SWT_PREFIX)-$(OS_PREFIX)-$(SWT_VERSION).dll
+
+LINK_LIBS = ole32.lib comctl32.lib user32.lib gdi32.lib comdlg32.lib kernel32.lib shell32.lib oleaut32.lib advapi32.lib imm32.lib winspool.lib
+
+# note: thoroughly test all examples after changing any optimization flags
+CFLAGS =  -c -W3 -G6 -GD -O1 -DSWT_VERSION=$(SWT_VERSION) -DSWT_BUILD_NUM=$(bld_num) -nologo -D_X86_=1 -D_WIN32 -D_WIN95 -D_WIN32_WINDOWS=0x0400 -D_MT -MT -DWIN32 -D_WIN32_DCOM /I$(JAVA_HOME)\include /I.
+RCFLAGS = -DSWT_FILE_VERSION=\"$(maj_ver).$(min_ver)\" -DSWT_COMMA_VERSION=$(comma_ver)
+LFLAGS = /INCREMENTAL:NO /PDB:NONE /RELEASE /NOLOGO -entry:_DllMainCRTStartup@12 -dll /BASE:0x10000000 /comment:$(pgm_ver_str) /comment:$(copyright) /DLL
+
+SWT_OBJS = swt.obj structs.obj callback.obj swtole.obj 
+
+all: $(SWT_LIB)
+
+.c.obj:
+	cl $(CFLAGS) $*.c
+
+$(SWT_LIB): $(SWT_OBJS) swt.res
+	echo $(LFLAGS) >templrf
+	echo $(LINK_LIBS) >>templrf
+	echo -machine:IX86 >>templrf
+	echo -subsystem:windows >>templrf
+	echo -out:$(SWT_LIB) >>templrf
+	echo $(SWT_OBJS) >>templrf
+	echo swt.res >>templrf
+	link @templrf
+	del templrf
+	
+swt.res:
+	rc $(RCFLAGS) -DSWT_ORG_FILENAME=\"$(SWT_LIB)\" -r -fo swt.res swt.rc
+	
+clean:
+    del *.obj *.res *.dll *.lib *.exp
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/make_wince.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/make_wince.mak
new file mode 100644
index 0000000000..6ba6b62136
--- /dev/null
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/make_wince.mak
@@ -0,0 +1,41 @@
+# (c) Copyright IBM Corp., 2000, 2001
+# All Rights Reserved.
+#
+# Makefile for SWT libraries on Windows CE
+
+# assumes JAVA_HOME is set in the environment from which nmake is run
+
+!include <make_common.mak>
+
+CPU=ARM
+
+SWT_PREFIX  = swt
+OS_PREFIX   = win32-ce
+SWT_VERSION = $(maj_ver)$(min_ver)
+SWT_LIB     = $(SWT_PREFIX)-$(OS_PREFIX)-$(SWT_VERSION).dll
+
+LINK_LIBS =  aygshell.lib corelibc.lib coredll.lib commdlg.lib commctrl.lib ceshell.lib
+
+CFLAGS = /nologo /c /W3 -DSWT_VERSION=$(SWT_VERSION) -DSWT_BUILD_NUM=$(bld_num) -DJ9WINCE -D_WIN32_WCE=300 -D"MS Pocket PC" /DUNDER_CE=300 /D"UNICODE" /D"_MBCS" /Zm200 -DARM -D_ARM_ -DFIXUP_UNALIGNED /I. /I$(JAVA_HOME)\include $*.c
+RCFLAGS = -DSWT_FILE_VERSION=\"$(maj_ver).$(min_ver)\" -DSWT_COMMA_VERSION=$(comma_ver)
+LFLAGS = $(dlllflags) /dll /entry:"_DllMainCRTStartup" /NODEFAULTLIB:libc.lib /nodefaultlib:oldnames.lib
+
+SWT_OBJS = swt.obj structs.obj callback.obj # swtole.obj 
+
+all: $(SWT_LIB)
+
+.c.obj:
+	clarm $(CFLAGS) $*.c
+	
+$(SWT_LIB): $(SWT_OBJS) swt.res
+	link $(LFLAGS) $(LINK_LIBS) \
+	-machine:$(CPU) \
+	-subsystem:windowsce,3.00 \
+	-out:$(SWT_LIB) \
+	$(SWT_OBJS) swt.res
+	
+swt.res:
+	rc $(RCFLAGS) -DSWT_ORG_FILENAME=\"$(SWT_LIB)\" -r -fo swt.res swt.rc
+
+clean:
+    del *.obj *.res *.dll *.lib *.exp
+\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/library/structs.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/structs.c
index 1fef23ca70..e40d7f002a 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/library/structs.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/structs.c
@@ -7,9 +7,91 @@
  * JNI SWT object field getters and setters declarations for Windows structs
  */
 
-#include <jni.h>
+#include "swt.h"
 #include "structs.h"
 
+/* Win32 globals */
+ACCEL_FID_CACHE ACCELFc;
+BITMAP_FID_CACHE BITMAPFc;
+CHOOSECOLOR_FID_CACHE CHOOSECOLORFc;
+COMPOSITIONFORM_FID_CACHE COMPOSITIONFORMFc;
+CREATESTRUCT_FID_CACHE CREATESTRUCTFc;
+DIBSECTION_FID_CACHE DIBSECTIONFc;
+DLLVERSIONINFO_FID_CACHE DLLVERSIONINFOFc;
+DRAWITEMSTRUCT_FID_CACHE DRAWITEMSTRUCTFc;
+FILETIME_FID_CACHE FILETIMEFc;
+HDITEM_FID_CACHE HDITEMFc;
+ICONINFO_FID_CACHE ICONINFOFc;
+INITCOMMONCONTROLSEX_FID_CACHE INITCOMMONCONTROLSEXFc;
+LOGBRUSH_FID_CACHE LOGBRUSHFc;
+LOGFONT_FID_CACHE LOGFONTFc;
+LOGPEN_FID_CACHE LOGPENFc;
+LVCOLUMN_FID_CACHE LVCOLUMNFc;
+LVHITTESTINFO_FID_CACHE LVHITTESTINFOFc;
+LVITEM_FID_CACHE LVITEMFc;
+MEASUREITEMSTRUCT_FID_CACHE MEASUREITEMSTRUCTFc;
+MENUITEMINFO_FID_CACHE MENUITEMINFOFc;
+MSG_FID_CACHE MSGFc;
+NMHDR_FID_CACHE NMHDRFc;
+NMHEADER_FID_CACHE NMHEADERFc;
+NMLISTVIEW_FID_CACHE NMLISTVIEWFc;
+NMTOOLBAR_FID_CACHE NMTOOLBARFc;
+OPENFILENAME_FID_CACHE OPENFILENAMEFc;
+OSVERSIONINFO_FID_CACHE OSVERSIONINFOFc;
+PAINTSTRUCT_FID_CACHE PAINTSTRUCTFc;
+POINT_FID_CACHE POINTFc;
+REBARBANDINFO_FID_CACHE REBARBANDINFOFc;
+RECT_FID_CACHE RECTFc;
+SCROLLINFO_FID_CACHE SCROLLINFOFc;
+SHELLEXECUTEINFO_FID_CACHE SHELLEXECUTEINFOFc;
+SIZE_FID_CACHE SIZEFc;
+TBBUTTON_FID_CACHE TBBUTTONFc;
+TBBUTTONINFO_FID_CACHE TBBUTTONINFOFc;
+TCITEM_FID_CACHE TCITEMFc;
+TEXTMETRIC_FID_CACHE TEXTMETRICFc;
+TVHITTESTINFO_FID_CACHE TVHITTESTINFOFc;
+TVINSERTSTRUCT_FID_CACHE TVINSERTSTRUCTFc;
+TVITEM_FID_CACHE TVITEMFc;
+WINDOWPOS_FID_CACHE WINDOWPOSFc;
+WNDCLASS_FID_CACHE WNDCLASSFc;
+#ifndef _WIN32_WCE
+	BROWSEINFO_FID_CACHE BROWSEINFOFc;
+	CHOOSEFONT_FID_CACHE CHOOSEFONTFc;
+	DOCINFO_FID_CACHE DOCINFOFc;
+	GCP_RESULTS_FID_CACHE GCP_RESULTSFc;
+	GRADIENT_RECT_FID_CACHE GRADIENT_RECTFc;
+	HELPINFO_FID_CACHE HELPINFOFc;
+	MENUINFO_FID_CACHE MENUINFOFc;
+	NMTTDISPINFO_FID_CACHE NMTTDISPINFOFc;
+	PRINTDLG_FID_CACHE PRINTDLGFc;
+	TOOLINFO_FID_CACHE TOOLINFOFc;
+	TRACKMOUSEEVENT_FID_CACHE TRACKMOUSEEVENTFc;
+	TRIVERTEX_FID_CACHE TRIVERTEXFc;
+	WINDOWPLACEMENT_FID_CACHE WINDOWPLACEMENTFc;
+	DROPFILES_FID_CACHE DROPFILESFc;
+	OLECMD_FID_CACHE OLECMDFc;
+	OLECMDTEXT_FID_CACHE OLECMDTEXTFc;
+#endif
+
+/* OLE globals */
+CAUUID_FID_CACHE CAUUIDFc;
+CONTROLINFO_FID_CACHE CONTROLINFOFc;
+COSERVERINFO_FID_CACHE COSERVERINFOFc;
+DISPPARAMS_FID_CACHE DISPPARAMSFc;
+DVTARGETDEVICE_FID_CACHE DVTARGETDEVICEFc;
+EXCEPINFO_FID_CACHE EXCEPINFOFc;
+FORMATETC_FID_CACHE FORMATETCFc;
+FUNCDESC1_FID_CACHE FUNCDESC1Fc;
+FUNCDESC2_FID_CACHE FUNCDESC2Fc;
+GUID_FID_CACHE GUIDFc;
+LICINFO_FID_CACHE LICINFOFc;
+OLEINPLACEFRAMEINFO_FID_CACHE OLEINPLACEFRAMEINFOFc;
+STATSTG_FID_CACHE STATSTGFc;
+STGMEDIUM_FID_CACHE STGMEDIUMFc;
+TYPEATTR_FID_CACHE TYPEATTRFc;
+VARDESC1_FID_CACHE VARDESC1Fc;
+VARDESC2_FID_CACHE VARDESC2Fc;
+
 void cacheACCELFids(JNIEnv *env, jobject lpObject, PACCEL_FID_CACHE lpCache)
 {
 	if (lpCache->cached) return;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/library/structs.h b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/structs.h
index 9500b71a22..a1f9c64258 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/library/structs.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/structs.h
@@ -35,99 +35,6 @@
 #include <aygshell.h>
 #endif // _WIN_32_WCE
 
-#ifdef _WIN32_WCE
-#define NOT_IN_WCE_FID_CACHE_GLOBALS
-#else
-#define NOT_IN_WCE_FID_CACHE_GLOBALS \
-	BROWSEINFO_FID_CACHE BROWSEINFOFc; \
-	CHOOSEFONT_FID_CACHE CHOOSEFONTFc; \
-	DOCINFO_FID_CACHE DOCINFOFc; \
-	GCP_RESULTS_FID_CACHE GCP_RESULTSFc; \
-	GRADIENT_RECT_FID_CACHE GRADIENT_RECTFc; \
-	HELPINFO_FID_CACHE HELPINFOFc; \
-	MENUINFO_FID_CACHE MENUINFOFc; \
-	NMTTDISPINFO_FID_CACHE NMTTDISPINFOFc; \
-	PRINTDLG_FID_CACHE PRINTDLGFc; \
-	TOOLINFO_FID_CACHE TOOLINFOFc; \
-	TRACKMOUSEEVENT_FID_CACHE TRACKMOUSEEVENTFc; \
-	TRIVERTEX_FID_CACHE TRIVERTEXFc; \
-	WINDOWPLACEMENT_FID_CACHE WINDOWPLACEMENTFc; \
-	DROPFILES_FID_CACHE DROPFILESFc; \
-	OLECMD_FID_CACHE OLECMDFc; \
-	OLECMDTEXT_FID_CACHE OLECMDTEXTFc;
-#endif
-
-#define WIN32_FID_CACHE_GLOBALS \
-	ACCEL_FID_CACHE ACCELFc; \
-	BITMAP_FID_CACHE BITMAPFc; \
-	CHOOSECOLOR_FID_CACHE CHOOSECOLORFc; \
-	COMPOSITIONFORM_FID_CACHE COMPOSITIONFORMFc; \
-	CREATESTRUCT_FID_CACHE CREATESTRUCTFc; \
-	DIBSECTION_FID_CACHE DIBSECTIONFc; \
-	DLLVERSIONINFO_FID_CACHE DLLVERSIONINFOFc; \
-	DRAWITEMSTRUCT_FID_CACHE DRAWITEMSTRUCTFc; \
-	FILETIME_FID_CACHE FILETIMEFc; \
-	HDITEM_FID_CACHE HDITEMFc; \
-	ICONINFO_FID_CACHE ICONINFOFc; \
-	INITCOMMONCONTROLSEX_FID_CACHE INITCOMMONCONTROLSEXFc; \
-	LOGBRUSH_FID_CACHE LOGBRUSHFc; \
-	LOGFONT_FID_CACHE LOGFONTFc; \
-	LOGPEN_FID_CACHE LOGPENFc; \
-	LVCOLUMN_FID_CACHE LVCOLUMNFc; \
-	LVHITTESTINFO_FID_CACHE LVHITTESTINFOFc; \
-	LVITEM_FID_CACHE LVITEMFc; \
-	MEASUREITEMSTRUCT_FID_CACHE MEASUREITEMSTRUCTFc; \
-	MENUITEMINFO_FID_CACHE MENUITEMINFOFc; \
-	MSG_FID_CACHE MSGFc; \
-	NMHDR_FID_CACHE NMHDRFc; \
-	NMHEADER_FID_CACHE NMHEADERFc; \
-	NMLISTVIEW_FID_CACHE NMLISTVIEWFc; \
-	NMTOOLBAR_FID_CACHE NMTOOLBARFc; \
-	OPENFILENAME_FID_CACHE OPENFILENAMEFc; \
-	OSVERSIONINFO_FID_CACHE OSVERSIONINFOFc; \
-	PAINTSTRUCT_FID_CACHE PAINTSTRUCTFc; \
-	POINT_FID_CACHE POINTFc; \
-	REBARBANDINFO_FID_CACHE REBARBANDINFOFc; \
-	RECT_FID_CACHE RECTFc; \
-	SCROLLINFO_FID_CACHE SCROLLINFOFc; \
-	SHELLEXECUTEINFO_FID_CACHE SHELLEXECUTEINFOFc; \
-	SIZE_FID_CACHE SIZEFc; \
-	TBBUTTON_FID_CACHE TBBUTTONFc; \
-	TBBUTTONINFO_FID_CACHE TBBUTTONINFOFc; \
-	TCITEM_FID_CACHE TCITEMFc; \
-	TEXTMETRIC_FID_CACHE TEXTMETRICFc; \
-	TVHITTESTINFO_FID_CACHE TVHITTESTINFOFc; \
-	TVINSERTSTRUCT_FID_CACHE TVINSERTSTRUCTFc; \
-	TVITEM_FID_CACHE TVITEMFc; \
-	WINDOWPOS_FID_CACHE WINDOWPOSFc; \
-	WNDCLASS_FID_CACHE WNDCLASSFc;
-
-
-#define OLE_FID_CACHE_GLOBALS \
-	CAUUID_FID_CACHE CAUUIDFc; \
-	CONTROLINFO_FID_CACHE CONTROLINFOFc; \
-	COSERVERINFO_FID_CACHE COSERVERINFOFc; \
-	DISPPARAMS_FID_CACHE DISPPARAMSFc; \
-	DVTARGETDEVICE_FID_CACHE DVTARGETDEVICEFc; \
-	EXCEPINFO_FID_CACHE EXCEPINFOFc; \
-	FORMATETC_FID_CACHE FORMATETCFc; \
-	FUNCDESC1_FID_CACHE FUNCDESC1Fc; \
-	FUNCDESC2_FID_CACHE FUNCDESC2Fc; \
-	GUID_FID_CACHE GUIDFc; \
-	LICINFO_FID_CACHE LICINFOFc; \
-	OLEINPLACEFRAMEINFO_FID_CACHE OLEINPLACEFRAMEINFOFc; \
-	STATSTG_FID_CACHE STATSTGFc; \
-	STGMEDIUM_FID_CACHE STGMEDIUMFc; \
-	TYPEATTR_FID_CACHE TYPEATTRFc; \
-	VARDESC1_FID_CACHE VARDESC1Fc; \
-	VARDESC2_FID_CACHE VARDESC2Fc;
-	
-#define FID_CACHE_GLOBALS \
-	WIN32_FID_CACHE_GLOBALS \
-	NOT_IN_WCE_FID_CACHE_GLOBALS \
-	OLE_FID_CACHE_GLOBALS
-
-
 /** Structs */
 
 /* ACCEL struct */
@@ -1137,4 +1044,86 @@ void setVARDESC2Fields(JNIEnv *env, jobject lpObject, VARDESC *lpStruct, PVARDES
 
 /**************************** END OLE ****************************/
 
+/* Win32 globals */
+extern ACCEL_FID_CACHE ACCELFc;
+extern BITMAP_FID_CACHE BITMAPFc;
+extern CHOOSECOLOR_FID_CACHE CHOOSECOLORFc;
+extern COMPOSITIONFORM_FID_CACHE COMPOSITIONFORMFc;
+extern CREATESTRUCT_FID_CACHE CREATESTRUCTFc;
+extern DIBSECTION_FID_CACHE DIBSECTIONFc;
+extern DLLVERSIONINFO_FID_CACHE DLLVERSIONINFOFc;
+extern DRAWITEMSTRUCT_FID_CACHE DRAWITEMSTRUCTFc;
+extern FILETIME_FID_CACHE FILETIMEFc;
+extern HDITEM_FID_CACHE HDITEMFc;
+extern ICONINFO_FID_CACHE ICONINFOFc;
+extern INITCOMMONCONTROLSEX_FID_CACHE INITCOMMONCONTROLSEXFc;
+extern LOGBRUSH_FID_CACHE LOGBRUSHFc;
+extern LOGFONT_FID_CACHE LOGFONTFc;
+extern LOGPEN_FID_CACHE LOGPENFc;
+extern LVCOLUMN_FID_CACHE LVCOLUMNFc;
+extern LVHITTESTINFO_FID_CACHE LVHITTESTINFOFc;
+extern LVITEM_FID_CACHE LVITEMFc;
+extern MEASUREITEMSTRUCT_FID_CACHE MEASUREITEMSTRUCTFc;
+extern MENUITEMINFO_FID_CACHE MENUITEMINFOFc;
+extern MSG_FID_CACHE MSGFc;
+extern NMHDR_FID_CACHE NMHDRFc;
+extern NMHEADER_FID_CACHE NMHEADERFc;
+extern NMLISTVIEW_FID_CACHE NMLISTVIEWFc;
+extern NMTOOLBAR_FID_CACHE NMTOOLBARFc;
+extern OPENFILENAME_FID_CACHE OPENFILENAMEFc;
+extern OSVERSIONINFO_FID_CACHE OSVERSIONINFOFc;
+extern PAINTSTRUCT_FID_CACHE PAINTSTRUCTFc;
+extern POINT_FID_CACHE POINTFc;
+extern REBARBANDINFO_FID_CACHE REBARBANDINFOFc;
+extern RECT_FID_CACHE RECTFc;
+extern SCROLLINFO_FID_CACHE SCROLLINFOFc;
+extern SHELLEXECUTEINFO_FID_CACHE SHELLEXECUTEINFOFc;
+extern SIZE_FID_CACHE SIZEFc;
+extern TBBUTTON_FID_CACHE TBBUTTONFc;
+extern TBBUTTONINFO_FID_CACHE TBBUTTONINFOFc;
+extern TCITEM_FID_CACHE TCITEMFc;
+extern TEXTMETRIC_FID_CACHE TEXTMETRICFc;
+extern TVHITTESTINFO_FID_CACHE TVHITTESTINFOFc;
+extern TVINSERTSTRUCT_FID_CACHE TVINSERTSTRUCTFc;
+extern TVITEM_FID_CACHE TVITEMFc;
+extern WINDOWPOS_FID_CACHE WINDOWPOSFc;
+extern WNDCLASS_FID_CACHE WNDCLASSFc;
+#ifndef _WIN32_WCE
+extern 	BROWSEINFO_FID_CACHE BROWSEINFOFc;
+extern 	CHOOSEFONT_FID_CACHE CHOOSEFONTFc;
+extern 	DOCINFO_FID_CACHE DOCINFOFc;
+extern 	GCP_RESULTS_FID_CACHE GCP_RESULTSFc;
+extern 	GRADIENT_RECT_FID_CACHE GRADIENT_RECTFc;
+extern 	HELPINFO_FID_CACHE HELPINFOFc;
+extern 	MENUINFO_FID_CACHE MENUINFOFc;
+extern 	NMTTDISPINFO_FID_CACHE NMTTDISPINFOFc;
+extern 	PRINTDLG_FID_CACHE PRINTDLGFc;
+extern 	TOOLINFO_FID_CACHE TOOLINFOFc;
+extern 	TRACKMOUSEEVENT_FID_CACHE TRACKMOUSEEVENTFc;
+extern 	TRIVERTEX_FID_CACHE TRIVERTEXFc;
+extern 	WINDOWPLACEMENT_FID_CACHE WINDOWPLACEMENTFc;
+extern 	DROPFILES_FID_CACHE DROPFILESFc;
+extern 	OLECMD_FID_CACHE OLECMDFc;
+extern 	OLECMDTEXT_FID_CACHE OLECMDTEXTFc;
+#endif
+
+/* OLE globals */
+extern CAUUID_FID_CACHE CAUUIDFc;
+extern CONTROLINFO_FID_CACHE CONTROLINFOFc;
+extern COSERVERINFO_FID_CACHE COSERVERINFOFc;
+extern DISPPARAMS_FID_CACHE DISPPARAMSFc;
+extern DVTARGETDEVICE_FID_CACHE DVTARGETDEVICEFc;
+extern EXCEPINFO_FID_CACHE EXCEPINFOFc;
+extern FORMATETC_FID_CACHE FORMATETCFc;
+extern FUNCDESC1_FID_CACHE FUNCDESC1Fc;
+extern FUNCDESC2_FID_CACHE FUNCDESC2Fc;
+extern GUID_FID_CACHE GUIDFc;
+extern LICINFO_FID_CACHE LICINFOFc;
+extern OLEINPLACEFRAMEINFO_FID_CACHE OLEINPLACEFRAMEINFOFc;
+extern STATSTG_FID_CACHE STATSTGFc;
+extern STGMEDIUM_FID_CACHE STGMEDIUMFc;
+extern TYPEATTR_FID_CACHE TYPEATTRFc;
+extern VARDESC1_FID_CACHE VARDESC1Fc;
+extern VARDESC2_FID_CACHE VARDESC2Fc;
+
 #endif // INC_structs_H
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/library/swt.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/swt.c
index 3f2f79eefa..aff4e3e060 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/library/swt.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/swt.c
@@ -7,7 +7,7 @@
  * SWT OS natives implementation.
  */ 
 
-#include "globals.h"
+#include "swt.h"
 #include "structs.h"
 
 /* Export the dll version info call */
@@ -16,9 +16,9 @@ __declspec(dllexport) HRESULT DllGetVersion(DLLVERSIONINFO *dvi);
 
 HRESULT DllGetVersion(DLLVERSIONINFO *dvi)
 {
-     dvi->dwMajorVersion = SWT_LIBRARY_VERSION / 1000;
-     dvi->dwMinorVersion = SWT_LIBRARY_VERSION % 1000;
-     dvi->dwBuildNumber = SWT_LIBRARY_BUILD_NUM;
+     dvi->dwMajorVersion = SWT_VERSION / 1000;
+     dvi->dwMinorVersion = SWT_VERSION % 1000;
+     dvi->dwBuildNumber = SWT_BUILD_NUM;
      dvi->dwPlatformID = DLLVER_PLATFORM_WINDOWS;
      return 1;
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/swt.rc b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/swt.rc
new file mode 100644
index 0000000000..895386b5b0
--- /dev/null
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/swt.rc
@@ -0,0 +1,39 @@
+/*
+ * (c) Copyright IBM Corp., 2000, 2001
+ * All Rights Reserved.
+ */
+ 
+#include "windows.h"
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION SWT_COMMA_VERSION
+ PRODUCTVERSION 0,0,0,0
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40000L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", "IBM Corporation\0"
+            VALUE "FileDescription", "Standard Widget Toolkit\0"
+            VALUE "FileVersion", SWT_FILE_VERSION
+            VALUE "InternalName", "SWT\0"
+            VALUE "LegalCopyright", "� Copyright IBM Corp. 2000, 2001. All Rights Reserved.\0"
+            VALUE "OriginalFilename", SWT_ORG_FILENAME
+            VALUE "ProductName", "\0"
+            VALUE "ProductVersion", "0,0,0,0\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/library/swtole.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/swtole.c
index 4139bdcbca..32081cc98a 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/library/swtole.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/swtole.c
@@ -3,7 +3,7 @@
  * All Rights Reserved.
  */
 
-#include "globals.h"
+#include "swt.h"
 #include "structs.h"
 
 #define cacheGuidFids cacheGUIDFids
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/CAUUID.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/CAUUID.java
index 7e471056c8..7e471056c8 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/CAUUID.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/CAUUID.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/COM.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COM.java
index c6a2e06213..c6a2e06213 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/COM.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COM.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/CONTROLINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/CONTROLINFO.java
index b7581ed5d6..b7581ed5d6 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/CONTROLINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/CONTROLINFO.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/COSERVERINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COSERVERINFO.java
index 72a3e944bc..72a3e944bc 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/COSERVERINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/COSERVERINFO.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/DISPPARAMS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/DISPPARAMS.java
index 95ee285d78..95ee285d78 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/DISPPARAMS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/DISPPARAMS.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/DVTARGETDEVICE.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/DVTARGETDEVICE.java
index f95abbfcac..f95abbfcac 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/DVTARGETDEVICE.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/DVTARGETDEVICE.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/EXCEPINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/EXCEPINFO.java
index 2f4ceda693..2f4ceda693 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/EXCEPINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/EXCEPINFO.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/FORMATETC.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/FORMATETC.java
index 5dc80509d4..5dc80509d4 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/FORMATETC.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/FORMATETC.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/FUNCDESC1.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/FUNCDESC1.java
index ed25a01c40..ed25a01c40 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/FUNCDESC1.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/FUNCDESC1.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/FUNCDESC2.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/FUNCDESC2.java
index 501465932e..501465932e 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/FUNCDESC2.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/FUNCDESC2.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/GUID.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/GUID.java
index c11d9bd26f..c11d9bd26f 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/GUID.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/GUID.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/IClassFactory2.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IClassFactory2.java
index 8ddc0b578b..8ddc0b578b 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/IClassFactory2.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IClassFactory2.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/IConnectionPoint.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IConnectionPoint.java
index 5098b0e9b1..5098b0e9b1 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/IConnectionPoint.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IConnectionPoint.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/IConnectionPointContainer.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IConnectionPointContainer.java
index 8eb4d505b1..8eb4d505b1 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/IConnectionPointContainer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IConnectionPointContainer.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/IDataObject.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDataObject.java
index f362cc0100..f362cc0100 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/IDataObject.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDataObject.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/IDispatch.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDispatch.java
index e9dc3fa832..e9dc3fa832 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/IDispatch.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IDispatch.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/IEnum.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnum.java
index 20bfa0d2e7..20bfa0d2e7 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/IEnum.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnum.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/IEnumFORMATETC.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumFORMATETC.java
index 86ef9e7204..86ef9e7204 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/IEnumFORMATETC.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumFORMATETC.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/IEnumSTATSTG.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumSTATSTG.java
index 73f69c2667..73f69c2667 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/IEnumSTATSTG.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IEnumSTATSTG.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/IFont.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IFont.java
index 1f113189f7..1f113189f7 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/IFont.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IFont.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/IMoniker.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IMoniker.java
index 50a7c9460d..50a7c9460d 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/IMoniker.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IMoniker.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/IOleCommandTarget.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleCommandTarget.java
index 0d86e7f55b..0d86e7f55b 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/IOleCommandTarget.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleCommandTarget.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/IOleControl.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleControl.java
index 51f6c3df93..51f6c3df93 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/IOleControl.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleControl.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/IOleInPlaceActiveObject.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleInPlaceActiveObject.java
index da57f127f1..da57f127f1 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/IOleInPlaceActiveObject.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleInPlaceActiveObject.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/IOleInPlaceObject.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleInPlaceObject.java
index d0c6cc4c61..d0c6cc4c61 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/IOleInPlaceObject.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleInPlaceObject.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/IOleLink.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleLink.java
index a676e8090e..a676e8090e 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/IOleLink.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleLink.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/IOleObject.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleObject.java
index 114232a932..114232a932 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/IOleObject.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleObject.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/IOleWindow.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleWindow.java
index acb1f61664..acb1f61664 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/IOleWindow.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IOleWindow.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/IPersist.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersist.java
index 44f30de396..44f30de396 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/IPersist.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersist.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/IPersistStorage.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistStorage.java
index e11d8f971c..e11d8f971c 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/IPersistStorage.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IPersistStorage.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/IProvideClassInfo.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IProvideClassInfo.java
index e6ae63f38b..e6ae63f38b 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/IProvideClassInfo.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IProvideClassInfo.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/IProvideClassInfo2.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IProvideClassInfo2.java
index bcba483008..bcba483008 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/IProvideClassInfo2.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IProvideClassInfo2.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/ISpecifyPropertyPages.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ISpecifyPropertyPages.java
index 4c73a077c2..4c73a077c2 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/ISpecifyPropertyPages.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ISpecifyPropertyPages.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/IStorage.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IStorage.java
index ad840e36e3..ad840e36e3 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/IStorage.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IStorage.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/IStream.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IStream.java
index 658d0d0bdc..658d0d0bdc 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/IStream.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IStream.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/ITypeInfo.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ITypeInfo.java
index c67a5069ef..c67a5069ef 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/ITypeInfo.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/ITypeInfo.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/IUnknown.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IUnknown.java
index 9e168f70ae..9e168f70ae 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/IUnknown.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IUnknown.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/IViewObject2.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IViewObject2.java
index 7124f871e2..7124f871e2 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/IViewObject2.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/IViewObject2.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/LICINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/LICINFO.java
index f4b54163b3..f4b54163b3 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/LICINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/LICINFO.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/OLECMD.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/OLECMD.java
index 9ded930322..9ded930322 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/OLECMD.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/OLECMD.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/OLECMDTEXT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/OLECMDTEXT.java
index ee5594b3e4..ee5594b3e4 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/OLECMDTEXT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/OLECMDTEXT.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/OLEINPLACEFRAMEINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/OLEINPLACEFRAMEINFO.java
index 7459b53de1..7459b53de1 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/OLEINPLACEFRAMEINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/OLEINPLACEFRAMEINFO.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/STATSTG.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/STATSTG.java
index abb2e3ea23..abb2e3ea23 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/STATSTG.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/STATSTG.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/STGMEDIUM.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/STGMEDIUM.java
index edf791bf8a..edf791bf8a 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/STGMEDIUM.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/STGMEDIUM.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/TYPEATTR.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/TYPEATTR.java
index f127ba3939..f127ba3939 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/TYPEATTR.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/TYPEATTR.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/VARDESC1.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/VARDESC1.java
index 1f5d9cf023..1f5d9cf023 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/VARDESC1.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/VARDESC1.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/VARDESC2.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/VARDESC2.java
index a422c5f454..a422c5f454 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/VARDESC2.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/VARDESC2.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/package.html b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/package.html
new file mode 100644
index 0000000000..1c2f7fe7d9
--- /dev/null
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/ole/win32/package.html
@@ -0,0 +1,20 @@
+ <html>
+<head>
+   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+   <meta name="Author" content="IBM">
+   <title>Package-level Javadoc</title>
+</head>
+<body>
+SWT internal Win32 OLE implementation classes.
+<h2>
+Package Specification</h2>
+This package contains the internal classes which implement the Microsoft 
+Win32 platform interface to the Object Linking and Embedding mechanism
+that the win32 variant of SWT is capable of using.
+<p>
+Referencing any of the classes in this package directly guarantees
+that the code is platform specific. Applications should not need to
+reference the classes in this package directly.
+</p>
+</body>
+</html>
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/ACCEL.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/ACCEL.java
index bb2358c182..bb2358c182 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/ACCEL.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/ACCEL.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/BITMAP.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BITMAP.java
index bd7fddbae7..bd7fddbae7 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/BITMAP.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BITMAP.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/BROWSEINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BROWSEINFO.java
index 62bff55770..62bff55770 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/BROWSEINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/BROWSEINFO.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/CHOOSECOLOR.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CHOOSECOLOR.java
index 3e55e87f0a..3e55e87f0a 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/CHOOSECOLOR.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CHOOSECOLOR.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/CHOOSEFONT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CHOOSEFONT.java
index ef117a13ce..ef117a13ce 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/CHOOSEFONT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CHOOSEFONT.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/COMPOSITIONFORM.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/COMPOSITIONFORM.java
index 47c61ba3d7..47c61ba3d7 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/COMPOSITIONFORM.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/COMPOSITIONFORM.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/CREATESTRUCT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CREATESTRUCT.java
index 20ce99ee28..20ce99ee28 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/CREATESTRUCT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/CREATESTRUCT.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/DIBSECTION.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DIBSECTION.java
index a4f81b07e4..a4f81b07e4 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/DIBSECTION.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DIBSECTION.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/DLLVERSIONINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DLLVERSIONINFO.java
index cf7feb6443..cf7feb6443 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/DLLVERSIONINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DLLVERSIONINFO.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/DOCINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DOCINFO.java
index 2bf47fc62c..2bf47fc62c 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/DOCINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DOCINFO.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/DRAWITEMSTRUCT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DRAWITEMSTRUCT.java
index f521b51c65..f521b51c65 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/DRAWITEMSTRUCT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DRAWITEMSTRUCT.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/DROPFILES.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DROPFILES.java
index fa2e29651c..fa2e29651c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/DROPFILES.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/DROPFILES.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/FILETIME.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/FILETIME.java
index 638964e661..638964e661 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/FILETIME.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/FILETIME.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/GCP_RESULTS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/GCP_RESULTS.java
index 84fc901602..84fc901602 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/GCP_RESULTS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/GCP_RESULTS.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/GRADIENT_RECT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/GRADIENT_RECT.java
index 7fe9d7307b..7fe9d7307b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/GRADIENT_RECT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/GRADIENT_RECT.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/HDITEM.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HDITEM.java
index 9f77689c42..9f77689c42 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/HDITEM.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HDITEM.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/HELPINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HELPINFO.java
index b26f03b462..b26f03b462 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/HELPINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/HELPINFO.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/ICONINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/ICONINFO.java
index 705afc412e..705afc412e 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/ICONINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/ICONINFO.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/INITCOMMONCONTROLSEX.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/INITCOMMONCONTROLSEX.java
index 353bf4845b..353bf4845b 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/INITCOMMONCONTROLSEX.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/INITCOMMONCONTROLSEX.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/LOGBRUSH.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LOGBRUSH.java
index 2ed2297c01..2ed2297c01 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/LOGBRUSH.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LOGBRUSH.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/LOGFONT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LOGFONT.java
index 99716291d6..99716291d6 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/LOGFONT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LOGFONT.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/LOGPEN.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LOGPEN.java
index 022df9c14d..022df9c14d 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/LOGPEN.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LOGPEN.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/LRESULT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LRESULT.java
index f475dee40c..f475dee40c 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/LRESULT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LRESULT.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/LVCOLUMN.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LVCOLUMN.java
index fc3d5bc9e3..fc3d5bc9e3 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/LVCOLUMN.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LVCOLUMN.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/LVHITTESTINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LVHITTESTINFO.java
index c01a08011e..c01a08011e 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/LVHITTESTINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LVHITTESTINFO.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/LVITEM.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LVITEM.java
index f7b4277364..f7b4277364 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/LVITEM.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/LVITEM.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/MEASUREITEMSTRUCT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MEASUREITEMSTRUCT.java
index b4a7ea9572..b4a7ea9572 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/MEASUREITEMSTRUCT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MEASUREITEMSTRUCT.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/MENUINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MENUINFO.java
index c28ee6f543..c28ee6f543 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/MENUINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MENUINFO.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/MENUITEMINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MENUITEMINFO.java
index 176e567585..176e567585 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/MENUITEMINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MENUITEMINFO.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/MSG.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MSG.java
index e4e1f3db43..e4e1f3db43 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/MSG.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/MSG.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/NMHDR.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMHDR.java
index 2302fdea6d..2302fdea6d 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/NMHDR.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMHDR.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/NMHEADER.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMHEADER.java
index 944a76ecd7..944a76ecd7 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/NMHEADER.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMHEADER.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/NMLISTVIEW.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMLISTVIEW.java
index 52d2cda846..52d2cda846 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/NMLISTVIEW.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMLISTVIEW.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/NMTOOLBAR.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTOOLBAR.java
index 8723a2fd3d..8723a2fd3d 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/NMTOOLBAR.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTOOLBAR.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/NMTTDISPINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTTDISPINFO.java
index 155eb49bf9..155eb49bf9 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/NMTTDISPINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTTDISPINFO.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/OPENFILENAME.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OPENFILENAME.java
index 74fbcad8b0..74fbcad8b0 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/OPENFILENAME.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OPENFILENAME.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java
index 9b1bee1db2..a90c39b301 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/OS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java
@@ -34,7 +34,7 @@ public class OS {
 	static {
 		
 		/* Load the SWT library */
-		Callback.loadLibrary ();
+		Library.loadLibrary ("swt");
 
 		/*
 		* Try the UNICODE version of GetVersionEx first
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/OSVERSIONINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OSVERSIONINFO.java
index 80a6821834..80a6821834 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/OSVERSIONINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OSVERSIONINFO.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/PAINTSTRUCT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/PAINTSTRUCT.java
index 1113357dc3..1113357dc3 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/PAINTSTRUCT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/PAINTSTRUCT.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/POINT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/POINT.java
index 10e63cb6f0..10e63cb6f0 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/POINT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/POINT.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/PRINTDLG.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/PRINTDLG.java
index 2810a59709..2810a59709 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/PRINTDLG.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/PRINTDLG.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/REBARBANDINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/REBARBANDINFO.java
index 77309f2515..77309f2515 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/REBARBANDINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/REBARBANDINFO.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/RECT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/RECT.java
index 66ad34282c..66ad34282c 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/RECT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/RECT.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/SCROLLINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SCROLLINFO.java
index bc4872a85a..bc4872a85a 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/SCROLLINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SCROLLINFO.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/SHELLEXECUTEINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SHELLEXECUTEINFO.java
index bfd63aa6e2..bfd63aa6e2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/SHELLEXECUTEINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SHELLEXECUTEINFO.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/SIZE.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SIZE.java
index f76a162e49..f76a162e49 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/SIZE.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/SIZE.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/TBBUTTON.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TBBUTTON.java
index 8f2b88db63..8f2b88db63 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/TBBUTTON.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TBBUTTON.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/TBBUTTONINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TBBUTTONINFO.java
index 4cb8d1b329..4cb8d1b329 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/TBBUTTONINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TBBUTTONINFO.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/TCHAR.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TCHAR.java
index 6d1193929b..6d1193929b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/TCHAR.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TCHAR.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/TCITEM.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TCITEM.java
index e8eba369bb..e8eba369bb 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/TCITEM.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TCITEM.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/TEXTMETRIC.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TEXTMETRIC.java
index 8b348232b0..8b348232b0 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/TEXTMETRIC.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TEXTMETRIC.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/TOOLINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TOOLINFO.java
index 19b7e2c7c5..19b7e2c7c5 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/TOOLINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TOOLINFO.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/TRACKMOUSEEVENT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TRACKMOUSEEVENT.java
index 47c09dba4f..47c09dba4f 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/TRACKMOUSEEVENT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TRACKMOUSEEVENT.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/TRIVERTEX.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TRIVERTEX.java
index 40301af947..40301af947 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/TRIVERTEX.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TRIVERTEX.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/TVHITTESTINFO.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVHITTESTINFO.java
index c987ce7fd3..c987ce7fd3 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/TVHITTESTINFO.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVHITTESTINFO.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/TVINSERTSTRUCT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVINSERTSTRUCT.java
index 8e104640de..8e104640de 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/TVINSERTSTRUCT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVINSERTSTRUCT.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/TVITEM.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVITEM.java
index 32090afd86..32090afd86 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/TVITEM.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/TVITEM.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/WINDOWPLACEMENT.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/WINDOWPLACEMENT.java
index 964fefc305..964fefc305 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/WINDOWPLACEMENT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/WINDOWPLACEMENT.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/WINDOWPOS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/WINDOWPOS.java
index 35c8b78d69..35c8b78d69 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/WINDOWPOS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/WINDOWPOS.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/WNDCLASS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/WNDCLASS.java
index d78bcc2a32..d78bcc2a32 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/WNDCLASS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/WNDCLASS.java
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/package.html b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/package.html
index 049087bd3e..049087bd3e 100755..100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/win32/package.html
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/package.html
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Program/motif/org/eclipse/swt/program/Program.java b/bundles/org.eclipse.swt/Eclipse SWT Program/motif/org/eclipse/swt/program/Program.java
index aad0dcbf21..6fcb10b39e 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT Program/motif/org/eclipse/swt/program/Program.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Program/motif/org/eclipse/swt/program/Program.java
@@ -527,8 +527,8 @@ static boolean kde_init () {
 	/* TEMPORARY CODE */
 	if (true) return false;
 	try {
-		Callback.loadLibrary("swt-kde");
-	} catch (SWTError e) {
+		Library.loadLibrary("swt-kde");
+	} catch (Throwable e) {
 		return false;
 	}
 
@@ -864,8 +864,8 @@ public String toString () {
 }
 static boolean gnome_init () {
 	try {
-		Callback.loadLibrary("swt-gnome");
-	} catch (SWTError e) {
+		Library.loadLibrary("swt-gnome");
+	} catch (Throwable e) {
 		return false;
 	}
 	return true;
@@ -1034,8 +1034,8 @@ ImageData cde_getImageData() {
  */
 static boolean cde_init( Display display ) {
 	try {
-		Callback.loadLibrary("swt-cde");
-	} catch (SWTError e) {
+		Library.loadLibrary("swt-cde");
+	} catch (Throwable e) {
 		return false;
 	}
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/library/callback.c b/bundles/org.eclipse.swt/Eclipse SWT/common/library/callback.c
index e2cc13a6e7..255e75adbb 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/library/callback.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/library/callback.c
@@ -3,332 +3,338 @@
  * All Rights Reserved.
  */
 
-/**
- * Callback implementation.
- */
-#include "globals.h"
-#include "callback.h"
-
-/* --------------- callback functions --------------- */
-
-/* Function name from index and number of arguments */
-#define FN(index, args) fn##index##_##args
-
-/**
- * Functions templates
- *
- * NOTE: If the maximum number of arguments changes (MAX_ARGS), the number
- *       of function templates has to change accordinglly.
- */
-
-/* Function template with no arguments */
-#define FN_0(index) RETURN_TYPE FN(index, 0)() { return RETURN_CAST callback(index); }
-
-/* Function template with 1 argument */
-#define FN_1(index) RETURN_TYPE FN(index, 1)(int p1) { return RETURN_CAST callback(index, p1); }
-
-/* Function template with 2 arguments */
-#define FN_2(index) RETURN_TYPE FN(index, 2)(int p1, int p2) { return RETURN_CAST callback(index, p1, p2); }
-
-/* Function template with 3 arguments */
-#define FN_3(index) RETURN_TYPE FN(index, 3)(int p1, int p2, int p3) { return RETURN_CAST callback(index, p1, p2, p3); }
-
-/* Function template with 4 arguments */
-#define FN_4(index) RETURN_TYPE FN(index, 4)(int p1, int p2, int p3, int p4) { return RETURN_CAST callback(index, p1, p2, p3, p4); }
-
-/* Function template with 5 arguments */
-#define FN_5(index) RETURN_TYPE FN(index, 5)(int p1, int p2, int p3, int p4, int p5) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5); }
-
-/* Function template with 6 arguments */
-#define FN_6(index) RETURN_TYPE FN(index, 6)(int p1, int p2, int p3, int p4, int p5, int p6) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5, p6); }
-
-/* Function template with 7 arguments */
-#define FN_7(index) RETURN_TYPE FN(index, 7)(int p1, int p2, int p3, int p4, int p5, int p6, int p7) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5, p6, p7); }
-
-/* Function template with 8 arguments */
-#define FN_8(index) RETURN_TYPE FN(index, 8)(int p1, int p2, int p3, int p4, int p5, int p6, int p7, int p8) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5, p6, p7, p8); }
-
-/* Function template with 9 arguments */
-#define FN_9(index) RETURN_TYPE FN(index, 9)(int p1, int p2, int p3, int p4, int p5, int p6, int p7, int p8, int p9) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5, p6, p7, p8, p9); }
-
-/* Function template with 10 arguments */
-#define FN_10(index) RETURN_TYPE FN(index, 10) (int p1, int p2, int p3, int p4, int p5, int p6, int p7, int p8, int p9, int p10) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10); }
-
-/* Function template with 11 arguments */
-#define FN_11(index) RETURN_TYPE FN(index, 11) (int p1, int p2, int p3, int p4, int p5, int p6, int p7, int p8, int p9, int p10, int p11) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11); }
-
-/* Function template with 12 arguments */
-#define FN_12(index) RETURN_TYPE FN(index, 12) (int p1, int p2, int p3, int p4, int p5, int p6, int p7, int p8, int p9, int p10, int p11, int p12) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12); }
-
-/**
- * Define all functions with the specified number of arguments.
- *
- * NOTE: If the maximum number of callbacks changes (MAX_CALLBACKS),
- *       this macro has to be updated. 
- */
-#define FN_BLOCK(args) FN_##args##(0) FN_##args##(1) FN_##args##(2) FN_##args##(3) FN_##args##(4) FN_##args##(5) FN_##args##(6) FN_##args##(7) FN_##args##(8) FN_##args##(9) FN_##args##(10) FN_##args##(11) FN_##args##(12) FN_##args##(13) FN_##args##(14) FN_##args##(15) FN_##args##(16) FN_##args##(17) FN_##args##(18) FN_##args##(19) FN_##args##(20) FN_##args##(21) FN_##args##(22) FN_##args##(23) FN_##args##(24) FN_##args##(25) FN_##args##(26) FN_##args##(27) FN_##args##(28) FN_##args##(29) FN_##args##(30) FN_##args##(31) FN_##args##(32) FN_##args##(33) FN_##args##(34) FN_##args##(35) FN_##args##(36) FN_##args##(37) FN_##args##(38) FN_##args##(39) FN_##args##(40) FN_##args##(41) FN_##args##(42) FN_##args##(43) FN_##args##(44) FN_##args##(45) FN_##args##(46) FN_##args##(47) FN_##args##(48) FN_##args##(49) FN_##args##(50) FN_##args##(51) FN_##args##(52) FN_##args##(53) FN_##args##(54) FN_##args##(55) FN_##args##(56) FN_##args##(57) FN_##args##(58) FN_##args##(59) FN_##args##(60) FN_##args##(61) FN_##args##(62) FN_##args##(63) FN_##args##(64) FN_##args##(65) FN_##args##(66) FN_##args##(67) FN_##args##(68) FN_##args##(69) FN_##args##(70) FN_##args##(71) FN_##args##(72) FN_##args##(73) FN_##args##(74) FN_##args##(75) FN_##args##(76) FN_##args##(77) FN_##args##(78) FN_##args##(79) FN_##args##(80) FN_##args##(81) FN_##args##(82) FN_##args##(83) FN_##args##(84) FN_##args##(85) FN_##args##(86) FN_##args##(87) FN_##args##(88) FN_##args##(89) FN_##args##(90) FN_##args##(91) FN_##args##(92) FN_##args##(93) FN_##args##(94) FN_##args##(95) FN_##args##(96) FN_##args##(97) FN_##args##(98) FN_##args##(99) FN_##args##(100) FN_##args##(101) FN_##args##(102) FN_##args##(103) FN_##args##(104) FN_##args##(105) FN_##args##(106) FN_##args##(107) FN_##args##(108) FN_##args##(109) FN_##args##(110) FN_##args##(111) FN_##args##(112) FN_##args##(113) FN_##args##(114) FN_##args##(115) FN_##args##(116) FN_##args##(117) FN_##args##(118) FN_##args##(119) FN_##args##(120) FN_##args##(121) FN_##args##(122) FN_##args##(123) FN_##args##(124) FN_##args##(125) FN_##args##(126) FN_##args##(127) 
-
-/**
- * Define all callback functions.
- *
- * NOTE: If the maximum number of arguments changes (MAX_ARGS), the following
- *       has to change accordinglly.
- */
-FN_BLOCK(0)
-FN_BLOCK(1)
-FN_BLOCK(2)
-FN_BLOCK(3)
-FN_BLOCK(4)
-FN_BLOCK(5)
-FN_BLOCK(6)
-FN_BLOCK(7)
-FN_BLOCK(8)
-FN_BLOCK(9)
-FN_BLOCK(10)
-FN_BLOCK(11)
-FN_BLOCK(12)
-
-/**
- * Initialize the function pointers for the callback routines.
- *
- * NOTE: If MAX_ARGS or MAX_CALLBACKS changes, the following has to be updated.
- */
-#define FN_A_BLOCK(args) {(int *)FN(0, args),(int *)FN(1, args),(int *)FN(2, args),(int *)FN(3, args),(int *)FN(4, args),(int *)FN(5, args),(int *)FN(6, args),(int *)FN(7, args),(int *)FN(8, args),(int *)FN(9, args),(int *)FN(10, args),(int *)FN(11, args),(int *)FN(12, args),(int *)FN(13, args),(int *)FN(14, args),(int *)FN(15, args),(int *)FN(16, args),(int *)FN(17, args),(int *)FN(18, args),(int *)FN(19, args),(int *)FN(20, args),(int *)FN(21, args),(int *)FN(22, args),(int *)FN(23, args),(int *)FN(24, args),(int *)FN(25, args),(int *)FN(26, args),(int *)FN(27, args),(int *)FN(28, args),(int *)FN(29, args),(int *)FN(30, args),(int *)FN(31, args),(int *)FN(32, args),(int *)FN(33, args),(int *)FN(34, args),(int *)FN(35, args),(int *)FN(36, args),(int *)FN(37, args),(int *)FN(38, args),(int *)FN(39, args),(int *)FN(40, args),(int *)FN(41, args),(int *)FN(42, args),(int *)FN(43, args),(int *)FN(44, args),(int *)FN(45, args),(int *)FN(46, args),(int *)FN(47, args),(int *)FN(48, args),(int *)FN(49, args),(int *)FN(50, args),(int *)FN(51, args),(int *)FN(52, args),(int *)FN(53, args),(int *)FN(54, args),(int *)FN(55, args),(int *)FN(56, args),(int *)FN(57, args),(int *)FN(58, args),(int *)FN(59, args),(int *)FN(60, args),(int *)FN(61, args),(int *)FN(62, args),(int *)FN(63, args),(int *)FN(64, args),(int *)FN(65, args),(int *)FN(66, args),(int *)FN(67, args),(int *)FN(68, args),(int *)FN(69, args),(int *)FN(70, args),(int *)FN(71, args),(int *)FN(72, args),(int *)FN(73, args),(int *)FN(74, args),(int *)FN(75, args),(int *)FN(76, args),(int *)FN(77, args),(int *)FN(78, args),(int *)FN(79, args),(int *)FN(80, args),(int *)FN(81, args),(int *)FN(82, args),(int *)FN(83, args),(int *)FN(84, args),(int *)FN(85, args),(int *)FN(86, args),(int *)FN(87, args),(int *)FN(88, args),(int *)FN(89, args),(int *)FN(90, args),(int *)FN(91, args),(int *)FN(92, args),(int *)FN(93, args),(int *)FN(94, args),(int *)FN(95, args),(int *)FN(96, args),(int *)FN(97, args),(int *)FN(98, args),(int *)FN(99, args),(int *)FN(100, args),(int *)FN(101, args),(int *)FN(102, args),(int *)FN(103, args),(int *)FN(104, args),(int *)FN(105, args),(int *)FN(106, args),(int *)FN(107, args),(int *)FN(108, args),(int *)FN(109, args),(int *)FN(110, args),(int *)FN(111, args),(int *)FN(112, args),(int *)FN(113, args),(int *)FN(114, args),(int *)FN(115, args),(int *)FN(116, args),(int *)FN(117, args),(int *)FN(118, args),(int *)FN(119, args),(int *)FN(120, args),(int *)FN(121, args),(int *)FN(122, args),(int *)FN(123, args),(int *)FN(124, args),(int *)FN(125, args),(int *)FN(126, args),(int *)FN(127, args)},
-
-int * fnx_array[MAX_ARGS+1][MAX_CALLBACKS] = { 
-	FN_A_BLOCK(0)    
-	FN_A_BLOCK(1)    
-	FN_A_BLOCK(2)    
-	FN_A_BLOCK(3)    
-	FN_A_BLOCK(4)    
-	FN_A_BLOCK(5)    
-	FN_A_BLOCK(6)    
-	FN_A_BLOCK(7)    
-	FN_A_BLOCK(8)    
-	FN_A_BLOCK(9)    
-	FN_A_BLOCK(10)    
-	FN_A_BLOCK(11)    
-	FN_A_BLOCK(12)    
-};
-
-
-/* --------------- callback class calls --------------- */
-
-/*
- * Class:     org_eclipse_swt_internal_Callback
- * Method:    bind
- * Signature: (Lorg/eclipse/swt/internal/Callback;)I
- */
-JNIEXPORT jint JNICALL Java_org_eclipse_swt_internal_Callback_bind
-  (JNIEnv *env, jclass that, jobject lpCallback)
-/*
-** The methodID is computed once during the bind and will be valid
-** unless the Callback class is reloaded. 
-*/
-{
-	DECL_GLOB(pGlob)
-	int i;
-	jclass javaClass;
-   	jobject javaObject, javaMethod, javaSignature;
-   	jboolean isStatic, isArrayBased;
-	jint argCount;
-	jmethodID mid;
-	const char *methodString, *sigString;
-
-    javaClass = that;
-    if (!PGLOB(callbackCached)) {
-        PGLOB(objectID) = (*env)->GetFieldID(env,javaClass,"object","Ljava/lang/Object;");
-        PGLOB(addressID) = (*env)->GetFieldID(env,javaClass,"address","I");
-        PGLOB(methodID) = (*env)->GetFieldID(env,javaClass,"method","Ljava/lang/String;");
-        PGLOB(signatureID) = (*env)->GetFieldID(env,javaClass,"signature","Ljava/lang/String;");
-        PGLOB(isStaticID) = (*env)->GetFieldID(env,javaClass,"isStatic","Z");
-        PGLOB(argCountID) = (*env)->GetFieldID(env,javaClass,"argCount","I");
-        PGLOB(isArrayBasedID) = (*env)->GetFieldID(env,javaClass,"isArrayBased","Z");
-        PGLOB(callbackCached) = 1;
-    }
-    javaObject = (*env)->GetObjectField(env,lpCallback,PGLOB(objectID));
-    javaMethod = (*env)->GetObjectField(env,lpCallback,PGLOB(methodID));
-    javaSignature = (*env)->GetObjectField(env,lpCallback,PGLOB(signatureID));
-    isStatic = (*env)->GetBooleanField(env,lpCallback,PGLOB(isStaticID));
-    argCount = (*env)->GetIntField(env,lpCallback,PGLOB(argCountID));
-    isArrayBased = (*env)->GetBooleanField(env,lpCallback,PGLOB(isArrayBasedID));
-    methodString = (const char *) (*env)->GetStringUTFChars(env, javaMethod, NULL);
-    sigString = (const char *) (*env)->GetStringUTFChars(env, javaSignature, NULL);
-    if (isStatic) {
-        mid = (*env)->GetStaticMethodID(env, javaObject, methodString, sigString);
-    } else {
-        javaClass = (*env)->GetObjectClass(env,javaObject);	    
-        /* note that this call is reusing javaClass */
-        mid = (*env)->GetMethodID(env, javaClass, methodString, sigString);
-    }
-    (*env)->ReleaseStringUTFChars(env, javaMethod, methodString);
-    (*env)->ReleaseStringUTFChars(env, javaSignature, sigString);
-    if (PGLOB(initialized)==0) {
-        memset((void *)&PGLOB(dllCallbackInfo), 0, sizeof(PGLOB(dllCallbackInfo)));
-        PGLOB(initialized) = 1;
-    }
-    for (i=0; i<MAX_CALLBACKS; i++) {
-        if (!PGLOB(dllCallbackInfo)[i].callin) {
-            PGLOB(dllCallbackInfo)[i].callin = (*env)->NewGlobalRef(env,lpCallback);
-            PGLOB(dllCallbackInfo)[i].env = env;
-            PGLOB(dllCallbackInfo)[i].methodID = mid;
-
-            return (jint) fnx_array[argCount][i];
-        }
-    }
-    fprintf(stderr, "bind fail, no free callback slot ******* \n");
-    return 0; /* this means there was no free callback slot */
-}
-
-/*
- * Class:     org_eclipse_swt_internal_Callback
- * Method:    unbind
- * Signature: (Lorg/eclipse/swt/internal/Callback;)V
- */
-JNIEXPORT void JNICALL Java_org_eclipse_swt_internal_Callback_unbind
-  (JNIEnv *env, jclass that, jobject lpCallback)
-{
-	DECL_GLOB(pGlob)
-	int i, address, argCount;
-	if (!PGLOB(callbackCached)) return;
-
-    address = (*env)->GetIntField(env,lpCallback,PGLOB(addressID));
-    argCount = (*env)->GetIntField(env,lpCallback,PGLOB(argCountID));
-    
-    for (i=0; i<MAX_CALLBACKS; i++) {        
-        if ((int)fnx_array[argCount][i] == address) {
-            (*env)->DeleteGlobalRef(env, PGLOB(dllCallbackInfo)[i].callin);
-            PGLOB(dllCallbackInfo)[i].callin = 0;        
-            PGLOB(dllCallbackInfo)[i].env = 0;
-            PGLOB(dllCallbackInfo)[i].methodID = 0;
-        }
-    }
-}
-
-/* 
- * Indicates wheter callbacks should be fired.
- *
- * WARNING - This var has to be a global. Do not multidata enable it.
- */  
-static int CallbacksEnabled = 1;
-
-/*
- * Class:     org_eclipse_swt_internal_Callback
- * Method:    setEnabled
- * Signature: (Z)V
- */
-JNIEXPORT void JNICALL Java_org_eclipse_swt_internal_Callback_setEnabled
-  (JNIEnv *env, jclass that, jboolean enable)
-{
-	CallbacksEnabled = enable;
-}
-
-/*
- * Class:     org_eclipse_swt_internal_Callback
- * Method:    getEnabled
- * Signature: ()Z
- */
-JNIEXPORT jboolean JNICALL Java_org_eclipse_swt_internal_Callback_getEnabled
-  (JNIEnv *env, jclass that, jboolean enable)
-{
-	return (jboolean)CallbacksEnabled;
-}
-
-int callback(int index, ...)
-{
+/**
+ * Callback implementation.
+ */
+#include "swt.h"
+#include "callback.h"
+
+/* --------------- callback globals ----------------- */
+
+SWT_CALLBACKINFO dllCallbackInfo[MAX_CALLBACKS];
+jfieldID objectID;
+jfieldID addressID;
+jfieldID methodID;
+jfieldID signatureID;
+jfieldID isStaticID;
+jfieldID argCountID;
+jfieldID isArrayBasedID;
+int callbackCached;
+int initialized;
+int counter;
+int CallbacksEnabled = 1;
+
+/* --------------- callback functions --------------- */
+
+/* Function name from index and number of arguments */
+#define FN(index, args) fn##index##_##args
+
+/**
+ * Functions templates
+ *
+ * NOTE: If the maximum number of arguments changes (MAX_ARGS), the number
+ *       of function templates has to change accordinglly.
+ */
+
+/* Function template with no arguments */
+#define FN_0(index) RETURN_TYPE FN(index, 0)() { return RETURN_CAST callback(index); }
+
+/* Function template with 1 argument */
+#define FN_1(index) RETURN_TYPE FN(index, 1)(int p1) { return RETURN_CAST callback(index, p1); }
+
+/* Function template with 2 arguments */
+#define FN_2(index) RETURN_TYPE FN(index, 2)(int p1, int p2) { return RETURN_CAST callback(index, p1, p2); }
+
+/* Function template with 3 arguments */
+#define FN_3(index) RETURN_TYPE FN(index, 3)(int p1, int p2, int p3) { return RETURN_CAST callback(index, p1, p2, p3); }
+
+/* Function template with 4 arguments */
+#define FN_4(index) RETURN_TYPE FN(index, 4)(int p1, int p2, int p3, int p4) { return RETURN_CAST callback(index, p1, p2, p3, p4); }
+
+/* Function template with 5 arguments */
+#define FN_5(index) RETURN_TYPE FN(index, 5)(int p1, int p2, int p3, int p4, int p5) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5); }
+
+/* Function template with 6 arguments */
+#define FN_6(index) RETURN_TYPE FN(index, 6)(int p1, int p2, int p3, int p4, int p5, int p6) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5, p6); }
+
+/* Function template with 7 arguments */
+#define FN_7(index) RETURN_TYPE FN(index, 7)(int p1, int p2, int p3, int p4, int p5, int p6, int p7) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5, p6, p7); }
+
+/* Function template with 8 arguments */
+#define FN_8(index) RETURN_TYPE FN(index, 8)(int p1, int p2, int p3, int p4, int p5, int p6, int p7, int p8) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5, p6, p7, p8); }
+
+/* Function template with 9 arguments */
+#define FN_9(index) RETURN_TYPE FN(index, 9)(int p1, int p2, int p3, int p4, int p5, int p6, int p7, int p8, int p9) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5, p6, p7, p8, p9); }
+
+/* Function template with 10 arguments */
+#define FN_10(index) RETURN_TYPE FN(index, 10) (int p1, int p2, int p3, int p4, int p5, int p6, int p7, int p8, int p9, int p10) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10); }
+
+/* Function template with 11 arguments */
+#define FN_11(index) RETURN_TYPE FN(index, 11) (int p1, int p2, int p3, int p4, int p5, int p6, int p7, int p8, int p9, int p10, int p11) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11); }
+
+/* Function template with 12 arguments */
+#define FN_12(index) RETURN_TYPE FN(index, 12) (int p1, int p2, int p3, int p4, int p5, int p6, int p7, int p8, int p9, int p10, int p11, int p12) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12); }
+
+/**
+ * Define all functions with the specified number of arguments.
+ *
+ * NOTE: If the maximum number of callbacks changes (MAX_CALLBACKS),
+ *       this macro has to be updated. 
+ */
+#define FN_BLOCK(args) FN_##args##(0) FN_##args##(1) FN_##args##(2) FN_##args##(3) FN_##args##(4) FN_##args##(5) FN_##args##(6) FN_##args##(7) FN_##args##(8) FN_##args##(9) FN_##args##(10) FN_##args##(11) FN_##args##(12) FN_##args##(13) FN_##args##(14) FN_##args##(15) FN_##args##(16) FN_##args##(17) FN_##args##(18) FN_##args##(19) FN_##args##(20) FN_##args##(21) FN_##args##(22) FN_##args##(23) FN_##args##(24) FN_##args##(25) FN_##args##(26) FN_##args##(27) FN_##args##(28) FN_##args##(29) FN_##args##(30) FN_##args##(31) FN_##args##(32) FN_##args##(33) FN_##args##(34) FN_##args##(35) FN_##args##(36) FN_##args##(37) FN_##args##(38) FN_##args##(39) FN_##args##(40) FN_##args##(41) FN_##args##(42) FN_##args##(43) FN_##args##(44) FN_##args##(45) FN_##args##(46) FN_##args##(47) FN_##args##(48) FN_##args##(49) FN_##args##(50) FN_##args##(51) FN_##args##(52) FN_##args##(53) FN_##args##(54) FN_##args##(55) FN_##args##(56) FN_##args##(57) FN_##args##(58) FN_##args##(59) FN_##args##(60) FN_##args##(61) FN_##args##(62) FN_##args##(63) FN_##args##(64) FN_##args##(65) FN_##args##(66) FN_##args##(67) FN_##args##(68) FN_##args##(69) FN_##args##(70) FN_##args##(71) FN_##args##(72) FN_##args##(73) FN_##args##(74) FN_##args##(75) FN_##args##(76) FN_##args##(77) FN_##args##(78) FN_##args##(79) FN_##args##(80) FN_##args##(81) FN_##args##(82) FN_##args##(83) FN_##args##(84) FN_##args##(85) FN_##args##(86) FN_##args##(87) FN_##args##(88) FN_##args##(89) FN_##args##(90) FN_##args##(91) FN_##args##(92) FN_##args##(93) FN_##args##(94) FN_##args##(95) FN_##args##(96) FN_##args##(97) FN_##args##(98) FN_##args##(99) FN_##args##(100) FN_##args##(101) FN_##args##(102) FN_##args##(103) FN_##args##(104) FN_##args##(105) FN_##args##(106) FN_##args##(107) FN_##args##(108) FN_##args##(109) FN_##args##(110) FN_##args##(111) FN_##args##(112) FN_##args##(113) FN_##args##(114) FN_##args##(115) FN_##args##(116) FN_##args##(117) FN_##args##(118) FN_##args##(119) FN_##args##(120) FN_##args##(121) FN_##args##(122) FN_##args##(123) FN_##args##(124) FN_##args##(125) FN_##args##(126) FN_##args##(127) 
+
+/**
+ * Define all callback functions.
+ *
+ * NOTE: If the maximum number of arguments changes (MAX_ARGS), the following
+ *       has to change accordinglly.
+ */
+FN_BLOCK(0)
+FN_BLOCK(1)
+FN_BLOCK(2)
+FN_BLOCK(3)
+FN_BLOCK(4)
+FN_BLOCK(5)
+FN_BLOCK(6)
+FN_BLOCK(7)
+FN_BLOCK(8)
+FN_BLOCK(9)
+FN_BLOCK(10)
+FN_BLOCK(11)
+FN_BLOCK(12)
+
+/**
+ * Initialize the function pointers for the callback routines.
+ *
+ * NOTE: If MAX_ARGS or MAX_CALLBACKS changes, the following has to be updated.
+ */
+#define FN_A_BLOCK(args) {(int *)FN(0, args),(int *)FN(1, args),(int *)FN(2, args),(int *)FN(3, args),(int *)FN(4, args),(int *)FN(5, args),(int *)FN(6, args),(int *)FN(7, args),(int *)FN(8, args),(int *)FN(9, args),(int *)FN(10, args),(int *)FN(11, args),(int *)FN(12, args),(int *)FN(13, args),(int *)FN(14, args),(int *)FN(15, args),(int *)FN(16, args),(int *)FN(17, args),(int *)FN(18, args),(int *)FN(19, args),(int *)FN(20, args),(int *)FN(21, args),(int *)FN(22, args),(int *)FN(23, args),(int *)FN(24, args),(int *)FN(25, args),(int *)FN(26, args),(int *)FN(27, args),(int *)FN(28, args),(int *)FN(29, args),(int *)FN(30, args),(int *)FN(31, args),(int *)FN(32, args),(int *)FN(33, args),(int *)FN(34, args),(int *)FN(35, args),(int *)FN(36, args),(int *)FN(37, args),(int *)FN(38, args),(int *)FN(39, args),(int *)FN(40, args),(int *)FN(41, args),(int *)FN(42, args),(int *)FN(43, args),(int *)FN(44, args),(int *)FN(45, args),(int *)FN(46, args),(int *)FN(47, args),(int *)FN(48, args),(int *)FN(49, args),(int *)FN(50, args),(int *)FN(51, args),(int *)FN(52, args),(int *)FN(53, args),(int *)FN(54, args),(int *)FN(55, args),(int *)FN(56, args),(int *)FN(57, args),(int *)FN(58, args),(int *)FN(59, args),(int *)FN(60, args),(int *)FN(61, args),(int *)FN(62, args),(int *)FN(63, args),(int *)FN(64, args),(int *)FN(65, args),(int *)FN(66, args),(int *)FN(67, args),(int *)FN(68, args),(int *)FN(69, args),(int *)FN(70, args),(int *)FN(71, args),(int *)FN(72, args),(int *)FN(73, args),(int *)FN(74, args),(int *)FN(75, args),(int *)FN(76, args),(int *)FN(77, args),(int *)FN(78, args),(int *)FN(79, args),(int *)FN(80, args),(int *)FN(81, args),(int *)FN(82, args),(int *)FN(83, args),(int *)FN(84, args),(int *)FN(85, args),(int *)FN(86, args),(int *)FN(87, args),(int *)FN(88, args),(int *)FN(89, args),(int *)FN(90, args),(int *)FN(91, args),(int *)FN(92, args),(int *)FN(93, args),(int *)FN(94, args),(int *)FN(95, args),(int *)FN(96, args),(int *)FN(97, args),(int *)FN(98, args),(int *)FN(99, args),(int *)FN(100, args),(int *)FN(101, args),(int *)FN(102, args),(int *)FN(103, args),(int *)FN(104, args),(int *)FN(105, args),(int *)FN(106, args),(int *)FN(107, args),(int *)FN(108, args),(int *)FN(109, args),(int *)FN(110, args),(int *)FN(111, args),(int *)FN(112, args),(int *)FN(113, args),(int *)FN(114, args),(int *)FN(115, args),(int *)FN(116, args),(int *)FN(117, args),(int *)FN(118, args),(int *)FN(119, args),(int *)FN(120, args),(int *)FN(121, args),(int *)FN(122, args),(int *)FN(123, args),(int *)FN(124, args),(int *)FN(125, args),(int *)FN(126, args),(int *)FN(127, args)},
+
+int * fnx_array[MAX_ARGS+1][MAX_CALLBACKS] = { 
+	FN_A_BLOCK(0)    
+	FN_A_BLOCK(1)    
+	FN_A_BLOCK(2)    
+	FN_A_BLOCK(3)    
+	FN_A_BLOCK(4)    
+	FN_A_BLOCK(5)    
+	FN_A_BLOCK(6)    
+	FN_A_BLOCK(7)    
+	FN_A_BLOCK(8)    
+	FN_A_BLOCK(9)    
+	FN_A_BLOCK(10)    
+	FN_A_BLOCK(11)    
+	FN_A_BLOCK(12)    
+};
+
+
+/* --------------- callback class calls --------------- */
+
+/*
+ * Class:     org_eclipse_swt_internal_Callback
+ * Method:    bind
+ * Signature: (Lorg/eclipse/swt/internal/Callback;)I
+ */
+JNIEXPORT jint JNICALL Java_org_eclipse_swt_internal_Callback_bind
+  (JNIEnv *env, jclass that, jobject lpCallback)
+/*
+** The methodID is computed once during the bind and will be valid
+** unless the Callback class is reloaded. 
+*/
+{
+	DECL_GLOB(pGlob)
+	int i;
+	jclass javaClass;
+   	jobject javaObject, javaMethod, javaSignature;
+   	jboolean isStatic, isArrayBased;
+	jint argCount;
+	jmethodID mid;
+	const char *methodString, *sigString;
+
+    javaClass = that;
+    if (!PGLOB(callbackCached)) {
+        PGLOB(objectID) = (*env)->GetFieldID(env,javaClass,"object","Ljava/lang/Object;");
+        PGLOB(addressID) = (*env)->GetFieldID(env,javaClass,"address","I");
+        PGLOB(methodID) = (*env)->GetFieldID(env,javaClass,"method","Ljava/lang/String;");
+        PGLOB(signatureID) = (*env)->GetFieldID(env,javaClass,"signature","Ljava/lang/String;");
+        PGLOB(isStaticID) = (*env)->GetFieldID(env,javaClass,"isStatic","Z");
+        PGLOB(argCountID) = (*env)->GetFieldID(env,javaClass,"argCount","I");
+        PGLOB(isArrayBasedID) = (*env)->GetFieldID(env,javaClass,"isArrayBased","Z");
+        PGLOB(callbackCached) = 1;
+    }
+    javaObject = (*env)->GetObjectField(env,lpCallback,PGLOB(objectID));
+    javaMethod = (*env)->GetObjectField(env,lpCallback,PGLOB(methodID));
+    javaSignature = (*env)->GetObjectField(env,lpCallback,PGLOB(signatureID));
+    isStatic = (*env)->GetBooleanField(env,lpCallback,PGLOB(isStaticID));
+    argCount = (*env)->GetIntField(env,lpCallback,PGLOB(argCountID));
+    isArrayBased = (*env)->GetBooleanField(env,lpCallback,PGLOB(isArrayBasedID));
+    methodString = (const char *) (*env)->GetStringUTFChars(env, javaMethod, NULL);
+    sigString = (const char *) (*env)->GetStringUTFChars(env, javaSignature, NULL);
+    if (isStatic) {
+        mid = (*env)->GetStaticMethodID(env, javaObject, methodString, sigString);
+    } else {
+        javaClass = (*env)->GetObjectClass(env,javaObject);	    
+        /* note that this call is reusing javaClass */
+        mid = (*env)->GetMethodID(env, javaClass, methodString, sigString);
+    }
+    (*env)->ReleaseStringUTFChars(env, javaMethod, methodString);
+    (*env)->ReleaseStringUTFChars(env, javaSignature, sigString);
+    if (PGLOB(initialized)==0) {
+        memset((void *)&PGLOB(dllCallbackInfo), 0, sizeof(PGLOB(dllCallbackInfo)));
+        PGLOB(initialized) = 1;
+    }
+    for (i=0; i<MAX_CALLBACKS; i++) {
+        if (!PGLOB(dllCallbackInfo)[i].callin) {
+            PGLOB(dllCallbackInfo)[i].callin = (*env)->NewGlobalRef(env,lpCallback);
+            PGLOB(dllCallbackInfo)[i].env = env;
+            PGLOB(dllCallbackInfo)[i].methodID = mid;
+
+            return (jint) fnx_array[argCount][i];
+        }
+    }
+    fprintf(stderr, "bind fail, no free callback slot ******* \n");
+    return 0; /* this means there was no free callback slot */
+}
+
+/*
+ * Class:     org_eclipse_swt_internal_Callback
+ * Method:    unbind
+ * Signature: (Lorg/eclipse/swt/internal/Callback;)V
+ */
+JNIEXPORT void JNICALL Java_org_eclipse_swt_internal_Callback_unbind
+  (JNIEnv *env, jclass that, jobject lpCallback)
+{
+	DECL_GLOB(pGlob)
+	int i, address, argCount;
+	if (!PGLOB(callbackCached)) return;
+
+    address = (*env)->GetIntField(env,lpCallback,PGLOB(addressID));
+    argCount = (*env)->GetIntField(env,lpCallback,PGLOB(argCountID));
+    
+    for (i=0; i<MAX_CALLBACKS; i++) {        
+        if ((int)fnx_array[argCount][i] == address) {
+            (*env)->DeleteGlobalRef(env, PGLOB(dllCallbackInfo)[i].callin);
+            PGLOB(dllCallbackInfo)[i].callin = 0;        
+            PGLOB(dllCallbackInfo)[i].env = 0;
+            PGLOB(dllCallbackInfo)[i].methodID = 0;
+        }
+    }
+}
+
+/*
+ * Class:     org_eclipse_swt_internal_Callback
+ * Method:    setEnabled
+ * Signature: (Z)V
+ */
+JNIEXPORT void JNICALL Java_org_eclipse_swt_internal_Callback_setEnabled
+  (JNIEnv *env, jclass that, jboolean enable)
+{
+	CallbacksEnabled = enable;
+}
+
+/*
+ * Class:     org_eclipse_swt_internal_Callback
+ * Method:    getEnabled
+ * Signature: ()Z
+ */
+JNIEXPORT jboolean JNICALL Java_org_eclipse_swt_internal_Callback_getEnabled
+  (JNIEnv *env, jclass that, jboolean enable)
+{
+	return (jboolean)CallbacksEnabled;
+}
+
+int callback(int index, ...)
+{
 	if (!CallbacksEnabled)  {
 		return 0;
 	} else {
-	
-		DECL_GLOB(pGlob)
-		jobject callback = PGLOB(dllCallbackInfo)[index].callin;
-		JNIEnv *env = PGLOB(dllCallbackInfo)[index].env;
-		jmethodID mid = PGLOB(dllCallbackInfo)[index].methodID;
-		jobject javaObject;
-		jboolean isStatic, isArrayBased;
-
-		int result = 0;
-		va_list vl;
-
-#ifdef DEBUG_CALL_PRINTS
-		fprintf(stderr, "* callback starting %d\n", PGLOB(counter)++);
-#endif
-
-		/* An exception has already occurred. Allow the stack to unwind so that
-		the exception will be thrown in Java */
-		if ((*env)->ExceptionOccurred(env)) {
-
-#ifdef DEBUG_CALL_PRINTS
-			fprintf(stderr, "************ java exception occurred\n");
-#endif
-
-			return 0;
-		}
-
-		javaObject = (*env)->GetObjectField(env,callback,PGLOB(objectID));
-		isStatic = ((*env)->GetBooleanField(env,callback,PGLOB(isStaticID))) != 0;
-		isArrayBased = ((*env)->GetBooleanField(env,callback,PGLOB(isArrayBasedID))) != 0;
-
-		va_start(vl, index);
-		if (isArrayBased) {
-			int i;
-			jint argCount = (*env)->GetIntField(env,callback,PGLOB(argCountID));
-			jintArray javaArray = (*env)->NewIntArray(env,argCount);
-			jint *elements = (*env)->GetIntArrayElements(env,javaArray,NULL);
-			for (i=0; i<argCount; i++) {
-				elements[i] = va_arg(vl, jint); 
-			}
-			(*env)->ReleaseIntArrayElements(env, javaArray, elements, 0);
-			if (isStatic) {
-				result = (*env)->CallStaticIntMethod(env, javaObject, mid, javaArray);
-			} else {
-				result = (*env)->CallIntMethod(env, javaObject, mid, javaArray);
-			}
-			(*env)->DeleteLocalRef(env, javaArray);
-		} else {
-			if (isStatic) {
-				result = (*env)->CallStaticIntMethodV(env, javaObject, mid, vl);
-			} else {
-				result = (*env)->CallIntMethodV(env, javaObject, mid, vl);
-			}
-		}
-		va_end(vl);
-		/* This call may be called many times before we return to Java.
-		 We have to explicitly delete local references to avoid GP's
-		 in the JDK and IBM Hursley VM.
-		*/
-		(*env)->DeleteLocalRef(env,javaObject);
-
-#ifdef DEBUG_CALL_PRINTS
-		fprintf(stderr, "* callback exiting %d\n", --PGLOB(counter));
-#endif
+	
+		DECL_GLOB(pGlob)
+		jobject callback = PGLOB(dllCallbackInfo)[index].callin;
+		JNIEnv *env = PGLOB(dllCallbackInfo)[index].env;
+		jmethodID mid = PGLOB(dllCallbackInfo)[index].methodID;
+		jobject javaObject;
+		jboolean isStatic, isArrayBased;
+
+		int result = 0;
+		va_list vl;
+
+#ifdef DEBUG_CALL_PRINTS
+		fprintf(stderr, "* callback starting %d\n", PGLOB(counter)++);
+#endif
+
+		/* An exception has already occurred. Allow the stack to unwind so that
+		the exception will be thrown in Java */
+		if ((*env)->ExceptionOccurred(env)) {
+
+#ifdef DEBUG_CALL_PRINTS
+			fprintf(stderr, "************ java exception occurred\n");
+#endif
+
+			return 0;
+		}
+
+		javaObject = (*env)->GetObjectField(env,callback,PGLOB(objectID));
+		isStatic = ((*env)->GetBooleanField(env,callback,PGLOB(isStaticID))) != 0;
+		isArrayBased = ((*env)->GetBooleanField(env,callback,PGLOB(isArrayBasedID))) != 0;
+
+		va_start(vl, index);
+		if (isArrayBased) {
+			int i;
+			jint argCount = (*env)->GetIntField(env,callback,PGLOB(argCountID));
+			jintArray javaArray = (*env)->NewIntArray(env,argCount);
+			jint *elements = (*env)->GetIntArrayElements(env,javaArray,NULL);
+			for (i=0; i<argCount; i++) {
+				elements[i] = va_arg(vl, jint); 
+			}
+			(*env)->ReleaseIntArrayElements(env, javaArray, elements, 0);
+			if (isStatic) {
+				result = (*env)->CallStaticIntMethod(env, javaObject, mid, javaArray);
+			} else {
+				result = (*env)->CallIntMethod(env, javaObject, mid, javaArray);
+			}
+			(*env)->DeleteLocalRef(env, javaArray);
+		} else {
+			if (isStatic) {
+				result = (*env)->CallStaticIntMethodV(env, javaObject, mid, vl);
+			} else {
+				result = (*env)->CallIntMethodV(env, javaObject, mid, vl);
+			}
+		}
+		va_end(vl);
+		/* This call may be called many times before we return to Java.
+		 We have to explicitly delete local references to avoid GP's
+		 in the JDK and IBM Hursley VM.
+		*/
+		(*env)->DeleteLocalRef(env,javaObject);
+
+#ifdef DEBUG_CALL_PRINTS
+		fprintf(stderr, "* callback exiting %d\n", --PGLOB(counter));
+#endif
 		return result;
-	}
-}
-
-/*
- * Class:     org_eclipse_swt_internal_Callback
- * Method:    reset
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_org_eclipse_swt_internal_Callback_reset
-  (JNIEnv *env, jclass that)
-{
-	DECL_GLOB(pGlob)
-    memset((void *)&PGLOB(dllCallbackInfo), 0, sizeof(PGLOB(dllCallbackInfo)));
-}
-
-/*
- * Class:     org_eclipse_swt_internal_Callback
- * Method:    getPlatform
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_org_eclipse_swt_internal_Callback_getPlatform
-  (JNIEnv *env, jclass that)
-{
-  return (*env)->NewStringUTF(env, PLATFORM);
-}
-
-/* ------------- callback class calls end --------------- */
-
-
+	}
+}
+
+/*
+ * Class:     org_eclipse_swt_internal_Callback
+ * Method:    reset
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_org_eclipse_swt_internal_Callback_reset
+  (JNIEnv *env, jclass that)
+{
+	DECL_GLOB(pGlob)
+    memset((void *)&PGLOB(dllCallbackInfo), 0, sizeof(PGLOB(dllCallbackInfo)));
+}
+
+/*
+ * Class:     org_eclipse_swt_internal_Callback
+ * Method:    getPlatform
+ * Signature: ()Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_org_eclipse_swt_internal_Callback_getPlatform
+  (JNIEnv *env, jclass that)
+{
+  return (*env)->NewStringUTF(env, PLATFORM);
+}
+
+/* ------------- callback class calls end --------------- */
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/library/callback.h b/bundles/org.eclipse.swt/Eclipse SWT/common/library/callback.h
index 6c03643932..58e539c0b5 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/library/callback.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/library/callback.h
@@ -12,6 +12,7 @@
 int callback(int index, ...);
 
 #ifdef WIN32
+#include "windows.h"
 #define PLATFORM "win32"
 #define RETURN_TYPE LRESULT CALLBACK
 #define RETURN_CAST (LRESULT)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/library/globals.c b/bundles/org.eclipse.swt/Eclipse SWT/common/library/globals.c
deleted file mode 100755
index 35ca46366e..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/library/globals.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * (c) Copyright IBM Corp., 2000, 2001
- * All Rights Reserved.
- */
-
-/**
- * globals.c
- *
- * This file contains the global struct allocation routines for the
- * SWT library.
- *
- */
-
-#include <malloc.h>
-#include <memory.h>
-#include <jni.h>
-#include "globals.h"
-#include "library.h"
-
-static void CreateLibGlobals(JNIEnv * env);
-static void DestroyLibGlobals(JNIEnv * env);
-static GLOBAL_TABLE * JNICALL GetGlobals(void);
-
-/* Place holder for all globals */
-GLOBALS globals = {0};
-GLOBAL_TABLE globals_table = {{
-	0, 0, 0, 0, 0, 0, 0, 0, /* 8 */
-	0, 0, 0, 0, 0, 0, 0, 0, /* 16 */
-	0, 0, 0, 0, 0, 0, 0, 0, /* 24 */
-	0, 0, 0, 0, 0, 0, 0, 0, /* 32 */
-	0, 0, 0, 0, 0, 0, 0, 0, /* 40 */
-	0, 0, 0, 0, 0, 0, 0, 0, /* 48 */
-	0, 0, 0, 0, 0, 0, 0, 0, /* 56 */
-	0, 0, 0, 0, 0, 0, 0, &globals, /* 64 */
-}};
-GetGlobalsFunc getGlobals = &GetGlobals;
-unsigned int vm_library = 0;
-
-/*
- * Hook the library load.
- */
-JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved)
-{
-	JNIEnv * env;
-
-	(*vm)->GetEnv(vm, (void **)&env, JNI_VERSION_1_2);
-	vm_library = OpenLibrary("jvm");
-	DEBUG_PRINTF(("VM Shared library -> %d\n", vm_library));
-
-	if (vm_library != 0) {
-		unsigned int func = LibraryLookupName(vm_library, "MdCurrentJNIGlobals");
-		if (func == 0) func = LibraryLookupName(vm_library, "_MdCurrentJNIGlobals@0");
-
-		DEBUG_PRINTF(("Function address -> %x\n", func));
-		if (func != 0) getGlobals = (GetGlobalsFunc)func;
-	}
-	CreateLibGlobals(env);
-	return JNI_VERSION_1_2;
-}
-
-/*
- * Hook the library unload.
- */
-JNIEXPORT void JNICALL JNI_OnUnload(JavaVM *vm, void *reserved)
-{
-	JNIEnv * env;
-
-	(*vm)->GetEnv(vm, (void **)&env, JNI_VERSION_1_2);
-	DestroyLibGlobals(env);
-	CloseLibrary(vm_library);
-}
-
-/*
- * Allocate and initialize a SWT GLOBALS struct.
- */
-static void CreateLibGlobals(JNIEnv * env)
-{
-	GLOBALS * globs = GET_GLOBALS();
-	if (globs != NULL && globs == &globals) return;
-	
-	globs = (GLOBALS *)malloc(sizeof(GLOBALS));
-	if (!globs)
-	{
-		jclass hExcClass = (*env)->FindClass(env, "java/lang/OutOfMemoryError");
-		(*env)->ThrowNew(env, hExcClass, "Unable to allocate globals in onLoad");
-		return;
-	}
-	memset(globs, 0, sizeof(GLOBALS));
-
-	/* Start of initialization code. */
-	globs->multidata = 1;
-	globs->vajava = vm_library != 0 && 
-		(LibraryLookupName(vm_library, "_MdCurrentJavaVM@0") != 0 ||
-		LibraryLookupName(vm_library, "MdCurrentJavaVM") != 0);
-	/* End of initialization code. */
-
-	SET_GLOBALS(globs);
-}
-
-/* 
- * Free a SWT GLOBALS struct.
- */
-static void DestroyLibGlobals(JNIEnv * env)
-{
-	GLOBALS * globs = GET_GLOBALS();
-	if (globs && (globs != &globals)) 
-	{
-		/* Start of cleanup code. */
-		/* End of cleanup code. */
-
-		free(globs);
-
-		SET_GLOBALS(NULL);
-	}
-}
-
-/* Note that the function below do not make
- * the vm reentrant but allow the multidata code
- * to work in non reentrant VMs.
- */
-/* Answer the table of globals associated with the current. */
-static GLOBAL_TABLE * JNICALL GetGlobals(void)
-{
-	return &globals_table;
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/library/globals.h b/bundles/org.eclipse.swt/Eclipse SWT/common/library/globals.h
deleted file mode 100755
index 93ca98d3be..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/library/globals.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * (c) Copyright IBM Corp., 2000, 2001
- * All Rights Reserved.
- */
-
-/**
- * globals.h
- *
- * This file contains the global struct declaration for the
- * SWT library.
- *
- */
-
-#ifndef INC_globals_H
-#define INC_globals_H
-
-#include "jni.h"
-#include "structs.h"
-#include "callback.h"
-
-/* For debugging */
-#define DEBUG_PRINTF(x)
-/*#define DEBUG_PRINTF(x) printf x; */
-
-/* define this to print out debug statements */
-/* #define DEBUG_CALL_PRINTS */
-
-#ifdef DEBUG_CALL_PRINTS
-#define DEBUG_CALL(func) fprintf(stderr, func);
-#else
-#define DEBUG_CALL(func)
-#endif
-
-/* Define the current lib ID. */
-/* A unique constant is required for each lib.*/
-#define ID_LIB_SWT              63
-#define ID_CURR_LIB ID_LIB_SWT
-
-typedef struct
-{
-	int multidata;
-	int vajava;
-
-	/* Shared globals */
-	SWT_CALLBACKINFO dllCallbackInfo[MAX_CALLBACKS];
-	jfieldID objectID;
-	jfieldID addressID;
-	jfieldID methodID;
-	jfieldID signatureID;
-	jfieldID isStaticID;
-	jfieldID argCountID;
-	jfieldID isArrayBasedID;
-	int callbackCached;
-	int initialized;
-	int counter;
-
-	FID_CACHE_GLOBALS
-} 
-GLOBALS;
-
-/* 
- * The GLOB_VAR_TABLE contains the global vars for an entire VM.  Each library has
- * a unique predefined slot within it.
- */
-typedef struct
-{
-	void * table[64];		/* The size is ignored. There is a page of memory to play with. */
-}
-GLOBAL_TABLE;
-typedef GLOBAL_TABLE * (JNICALL *GetGlobalsFunc)();
-extern GetGlobalsFunc getGlobals;
-/* 
- * Any function which uses the global variables in a lib can use 
- * GET_GLOBALS to get the global data.
- */
-#define GET_GLOBALS() ((*getGlobals)()->table[ID_CURR_LIB])
-#define SET_GLOBALS(pMem) (*getGlobals)()->table[ID_CURR_LIB] = (void *)pMem
-#define DECL_GLOB(pSym) GLOBALS * pSym = GET_GLOBALS();
-
-#define PGLOB(x) pGlob->x
-
-#endif /* ifndef INC_globals_H */
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/library/library.h b/bundles/org.eclipse.swt/Eclipse SWT/common/library/library.h
deleted file mode 100755
index 1147e3ddfe..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/library/library.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * (c) Copyright IBM Corp., 2000, 2001
- * All Rights Reserved.
- */
-
-/**
- * library.h
- *
- * This file contains helpers to open, close and lookup
- * symbol addresses in shared librares. 
- *
- */
-
-#ifndef INC_library_H
-#define INC_library_H
-
-unsigned int OpenLibrary(char *name);
-
-unsigned int LibraryLookupName(unsigned int handle, char *name);
-
-void CloseLibrary(unsigned int handle);
-
-#endif /* INC_library_H */
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/library/make_common.mak b/bundles/org.eclipse.swt/Eclipse SWT/common/library/make_common.mak
new file mode 100644
index 0000000000..21fec2d95b
--- /dev/null
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/library/make_common.mak
@@ -0,0 +1,4 @@
+maj_ver=2
+min_ver=017
+bld_num=0
+comma_ver=2,0,1,7
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/library/swt.h b/bundles/org.eclipse.swt/Eclipse SWT/common/library/swt.h
new file mode 100644
index 0000000000..f2457ceba4
--- /dev/null
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/library/swt.h
@@ -0,0 +1,35 @@
+/*
+ * (c) Copyright IBM Corp., 2000, 2001
+ * All Rights Reserved.
+ */
+
+/**
+ * swt.h
+ *
+ * This file contains the global macro declarations for the
+ * SWT library.
+ *
+ */
+
+#ifndef INC_swt_H
+#define INC_swt_H
+
+#include "jni.h"
+
+/* For debugging */
+#define DEBUG_PRINTF(x)
+/*#define DEBUG_PRINTF(x) printf x; */
+
+/* define this to print out debug statements */
+/* #define DEBUG_CALL_PRINTS */
+
+#ifdef DEBUG_CALL_PRINTS
+#define DEBUG_CALL(func) fprintf(stderr, func);
+#else
+#define DEBUG_CALL(func)
+#endif
+
+#define DECL_GLOB(pSym)
+#define PGLOB(x) x
+
+#endif /* ifndef INC_swt_H */
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/SWT.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/SWT.java
index 4733f4ca7f..47b17da1ab 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/SWT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/SWT.java
@@ -1807,7 +1807,7 @@ public static String getPlatform () {
  * @return the SWT version number
  */
 public static int getVersion () {
-	return Callback.getVersion ();
+	return Library.getVersion ();
 }
 
 /**
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/Callback.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/Callback.java
index 3cb1da3aec..1728b09ad8 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/Callback.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/Callback.java
@@ -25,27 +25,10 @@ public class Callback {
 	String method, signature;
 	int argCount, address;
 	boolean isStatic, isArrayBased;
-	
-	/* SWT Version - Mmmm (M=major, mmm=minor) */
-	
-	/**
-	 * SWT Major version number (must be >= 0)
-	 */
-	public static int MAJOR_VERSION = 2;
-	
-	/**
-	 * SWT Minor version number (must be in the range 0..999)
-	 */
-	public static int MINOR_VERSION = 17;
-	
-	/**
-	 * SWT revision number (must be >= 0)
-	 */
-	public static int REVISION = 0;
 
 	/* Load the SWT library */
 	static {
-		loadLibrary ("swt");
+		Library.loadLibrary ("swt");
 	}
 
 /**
@@ -140,17 +123,6 @@ public int getAddress () {
 }
 
 /**
- * Returns the SWT version as an integer in the standard format
- * <em>Mmmm</em> where <em>M</em> is the major version number
- * and <em>mmm</em> is the minor version number.
- *
- * @return the version of the currently running SWT
- */
-public static int getVersion () {
-	return MAJOR_VERSION * 1000 + MINOR_VERSION;
-}
-
-/**
  * Returns the SWT platform name.
  *
  * @return the platform name of the currently running SWT
@@ -158,31 +130,6 @@ public static int getVersion () {
 public static native String getPlatform ();
 
 /**
- * Returns the OS name.
- *
- * @return the os name of the currently running SWT
- */
-static String getOS () {
-	String name = System.getProperty("os.name");
-	if (name == null) return "unknown";
-	name = name.toLowerCase ();
-	if (name.indexOf ("windows ce") == 0) return "win32-ce";
-	if (name.indexOf ("win") == 0) return "win32";
-	if (name.indexOf ("sun") == 0) return "solaris";
-	return name;
-}
-
-/**
- * Returns the SWT revision number as an integer. Revision changes
- * occur as a result of non-API breaking bug fixes.
- *
- * @return the revision number of the currently running SWT
- */
-public static int getRevision () {
-	return REVISION;
-}
-
-/**
  * Indicates whether or not callbacks which are triggered at the
  * native level should cause the messages described by the matching
  * <code>Callback</code> objects to be invoked. This method is used
@@ -222,53 +169,6 @@ static final void ignoreCallbacks (boolean ignore) {
 	setEnabled (!ignore);
 } 
 
-/*
- * Loads the SWT shared library that matches the version
- * of the Java code which is currently running. 
- */
-public static void loadLibrary () {
-	loadLibrary ("swt");
-}
-
-/**
- * Loads the shared library that matches the version of the
- * Java code which is currently running.  SWT shared libraries
- * follow an encoding scheme where the major, minor and revision
- * numbers are embedded in the library name and this along with
- * <code>name</code> is used to load the library.  If this fails,
- * <code>name</code> is used in another attempt to load the library,
- * this time ignoring the SWT version encoding scheme.
- *
- * @param name the name of the library to load
- */
-public static void loadLibrary (String name) {
-	/*
-     * Include OS name to support same window system
-     * on different operating systems.
-	 */
-	String newName = name + "-" + getOS () + "-" + MAJOR_VERSION;
-
-	/* Force 3 digits in minor version number */
-	if (MINOR_VERSION < 10) {
-		newName += "00";
-	} else {
-		if (MINOR_VERSION < 100) newName += "0";
-	}
-	newName += MINOR_VERSION;
-	
-	/* No "r" until first revision */
-	if (REVISION > 0) newName += "r" + REVISION;
-	try {
-		Compatibility.loadLibrary (newName);
-	} catch (SWTError e) {
-		try {
-			Compatibility.loadLibrary (name);
-		} catch (SWTError e2) {
-			throw e;
-		}
-	}
-}
-
 /**
  * Immediately wipes out all native level state associated
  * with <em>all</em> callbacks.
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common_j2me/org/eclipse/swt/internal/Compatibility.java b/bundles/org.eclipse.swt/Eclipse SWT/common_j2me/org/eclipse/swt/internal/Compatibility.java
index 607459ce31..4175e5c195 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/common_j2me/org/eclipse/swt/internal/Compatibility.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common_j2me/org/eclipse/swt/internal/Compatibility.java
@@ -175,22 +175,6 @@ public static int pow2(int n) {
 }
 
 /**
- * Loads a library if the underlying platform supports this.
- * If not, it is assumed that the library in question was 
- * properly made available in some other fashion.
- *
- * @param name the name of the library to load
- * 
- * @exception SecurityException
- *   if the library was not allowed to be loaded
- * @exception SWTError <ul>
- *    <li>ERROR_FAILED_LOAD_LIBRARY - if the library could not be loaded</li>
- * </ul>
- */
-public static void loadLibrary(String name) {
-}
-
-/**
  * Open a file if such things are supported.
  * 
  * @param filename the name of the file to open
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common_j2se/org/eclipse/swt/internal/Compatibility.java b/bundles/org.eclipse.swt/Eclipse SWT/common_j2se/org/eclipse/swt/internal/Compatibility.java
index 2ecdc3ae4d..090aa4a8cc 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/common_j2se/org/eclipse/swt/internal/Compatibility.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common_j2se/org/eclipse/swt/internal/Compatibility.java
@@ -129,27 +129,6 @@ public static int pow2(int n) {
 }
 
 /**
- * Loads a library if the underlying platform supports this.
- * If not, it is assumed that the library in question was 
- * properly made available in some other fashion.
- *
- * @param name the name of the library to load
- *
- * @exception SecurityException
- *   if the library was not allowed to be loaded
- * @exception SWTError <ul>
- *    <li>ERROR_FAILED_LOAD_LIBRARY - if the library could not be loaded</li>
- * </ul>
- */
-public static void loadLibrary(String name) {
-	try {
-		System.loadLibrary (name);
-	} catch (UnsatisfiedLinkError e) {
-		SWT.error(SWT.ERROR_FAILED_LOAD_LIBRARY,e);
-	}
-}
-
-/**
  * Open a file if such things are supported.
  * 
  * @param filename the name of the file to open
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/library/library.c b/bundles/org.eclipse.swt/Eclipse SWT/motif/library/library.c
deleted file mode 100755
index 4bb5e249b7..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/library/library.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * (c) Copyright IBM Corp., 2000, 2001
- * All Rights Reserved.
- */
-
-/**
- * library.c
- *
- * This file contains the implementation of the
- * shared libraries functions.
- *
- */
-
-#include <dlfcn.h>
-#include <stdio.h>
-
-unsigned int OpenLibrary(char *name)
-{
-	void * handle = dlopen (name, RTLD_LAZY | RTLD_GLOBAL);
-	if (handle == NULL) {
-		char buf[512];
-		sprintf(buf, "lib%s.so", name);
-		handle = dlopen (buf, 1);
-	}
-	return (unsigned int)handle;
-}
-
-unsigned int LibraryLookupName(unsigned int handle, char *name)
-{
-	if (handle == 0) return 0;
-	return (unsigned int)dlsym ((void *)handle, name);
-}
-
-void CloseLibrary(unsigned int handle)
-{
-	if (handle != 0) dlclose ((void *)handle);
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/library/library.c b/bundles/org.eclipse.swt/Eclipse SWT/photon/library/library.c
deleted file mode 100755
index 49ea3d05f4..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT/photon/library/library.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * (c) Copyright IBM Corp., 2000, 2001
- * All Rights Reserved.
- */
-
-/**
- * library.c
- *
- * This file contains the implementation of the
- * shared libraries functions.
- *
- */
-
-#include <dlfcn.h>
-#include <stdio.h>
-
-unsigned int OpenLibrary(char *name)
-{
-	void * handle = dlopen (name, RTLD_LAZY | RTLD_GLOBAL);
-	if (handle == NULL) {
-		char buf[512];
-		sprintf(buf, "lib%s.so", name);
-		handle = dlopen (buf, 1);
-	}
-	return (unsigned int)handle;
-}
-
-unsigned int LibraryLookupName(unsigned int handle, char *name)
-{
-	if (handle == 0) return 0;
-	return (unsigned int)dlsym ((void *)handle, name);
-}
-
-void CloseLibrary(unsigned int handle)
-{
-	if (handle != 0) dlclose ((void *)handle);
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/library/makefile.mak b/bundles/org.eclipse.swt/Eclipse SWT/photon/library/makefile.mak
deleted file mode 100755
index eb5e1d33bb..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT/photon/library/makefile.mak
+++ /dev/null
@@ -1,32 +0,0 @@
-# Makefile for module 'swt'
-
-# (c) Copyright IBM Corp., 2000, 2001
-# All Rights Reserved.
-
-maj_ver=2
-min_ver=017
-revision=0
-
-#assumes IVE_HOME is set in the environment
-
-DLLPREFIX=swt
-OS_PREFIX=qnx
-DLLNAME=lib$(DLLPREFIX)-$(OS_PREFIX)-$(maj_ver)$(min_ver).so
-#DLLNAME=lib$(DLLPREFIX)$(maj_ver)$(min_ver)r$(revision).so
-
-DEBUG =  
-CFLAGS = -c -shared -DSWT_LIBRARY_VERSION=$(maj_ver)$(min_ver) -w8 $(DEBUG) -DPHOTON -I$(IVE_HOME)/include
-LFLAGS = -shared -lph -lphrender
-
-SWTOBJS = swt.o structs.o callback.o globals.o library.o
-
-all: $(DLLNAME)
-
-.c.o:
-	cc $(CFLAGS) $*.c
-
-$(DLLNAME): $(SWTOBJS)
-	cc -o $(DLLNAME)  $(LFLAGS) $(SWTOBJS)
-
-clean:
-	rm -f  $(DLLNAME) *.o
-\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/library/library.c b/bundles/org.eclipse.swt/Eclipse SWT/win32/library/library.c
deleted file mode 100755
index 4afbf5e7d4..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/library/library.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * (c) Copyright IBM Corp., 2000, 2001
- * All Rights Reserved.
- */
-
-/**
- * library.c
- *
- * This file contains the implementation of the
- * shared libraries functions.
- *
- */
-
-#include <windows.h>
-
-unsigned int OpenLibrary(char *name)
-{
-#ifndef _WIN32_WCE
-	UINT prevMode = SetErrorMode(SEM_NOOPENFILEERRORBOX | SEM_FAILCRITICALERRORS);
-#endif
-	HINSTANCE handle = LoadLibrary ((LPCTSTR)name);
-#ifndef _WIN32_WCE
-	SetErrorMode(prevMode);
-#endif
-	return (unsigned int)handle;
-}
-
-unsigned int LibraryLookupName(unsigned int handle, char *name)
-{
-	if (handle == 0) return 0;
-	return (unsigned int)GetProcAddress ((HINSTANCE)handle, (LPCTSTR)name);
-}
-
-void CloseLibrary(unsigned int handle)
-{
-	if (handle != 0) FreeLibrary ((HINSTANCE)handle);
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/library/makefile-ce.mak b/bundles/org.eclipse.swt/Eclipse SWT/win32/library/makefile-ce.mak
deleted file mode 100644
index 907b4fdb55..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/library/makefile-ce.mak
+++ /dev/null
@@ -1,46 +0,0 @@
-# Makefile for module 'bcutil'
-# (c) Copyright IBM Corp. 1998, 2001 All Rights Reserved
-# Timestamp: 1.5, 10/2/01
-#
-# Autogenerated Code
-
-CPU=ARM
-
-maj_ver=2
-min_ver=017
-bld_num=0
-
-DLLPREFIX=swt
-OSPREFIX=win32-ce
-DLLNAME=$(DLLPREFIX)-$(OSPREFIX)-$(maj_ver)$(min_ver).dll
-
-LIBPATH=# declaration
-LIBNAME=$(DLLPREFIX)-$(OSPREFIX)-$(maj_ver)$(min_ver).lib
-
-SWTDEFS=-DSWT_LIBRARY_VERSION=$(maj_ver)$(min_ver) -DSWT_LIBRARY_BUILD_NUM=$(bld_num)
-.c.obj:
-	clarm /nologo /c /W3 $(SWTDEFS) -DJ9WINCE -D _WIN32_WCE=300 -D "MS Pocket PC" /D UNDER_CE=300 /D "UNICODE" /D "_MBCS" /Zm200 -DARM -D_ARM_ -DFIXUP_UNALIGNED /I. /I$(JAVA_HOME)\include $*.c
-
-.rc.res:
-	rc $<
-
-BUILDFILES1 = swt.obj structs.obj callback.obj globals.obj library.obj
-
-VIRTFILES1 = # swt.res
-
-all: \
-	 $(LIBNAME) $(DLLNAME)
-
-BUILDLIB: $(LIBPATH)$(LIBNAME)
-
-$(LIBPATH)$(LIBNAME):\
-	$(BUILDFILES1) $(VIRTFILES1)
-	lib -subsystem:windowsce,3.00 -out:$(LIBPATH)$(LIBNAME).lib /NODEFAULTLIB:libc.lib /nodefaultlib:oldnames.lib -machine:$(CPU) \
-	$(BUILDFILES1) $(VIRTFILES1) 
-
-$(DLLNAME): $(LIBPATH)$(LIBNAME) \
-	$(BUILDFILES1) $(VIRTFILES1)
-	link $(dlllflags) -machine:$(CPU) \
-	-subsystem:windowsce,3.00 -out:$(DLLNAME) -map:$(LIBNAME).map \
-	$(BUILDFILES1) $(VIRTFILES1) \
-	/dll  /entry:"_DllMainCRTStartup" /NODEFAULTLIB:libc.lib /nodefaultlib:oldnames.lib aygshell.lib corelibc.lib coredll.lib commdlg.lib commctrl.lib ceshell.lib
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/library/makefile.mak b/bundles/org.eclipse.swt/Eclipse SWT/win32/library/makefile.mak
deleted file mode 100755
index c5a2ebbee9..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/library/makefile.mak
+++ /dev/null
@@ -1,70 +0,0 @@
-# Makefile for module 'swt'
-
-# (c) Copyright IBM Corp., 2000, 2001
-# All Rights Reserved.
-#
-# Autogenerated Code
-
-# The major and minor version numbers and the build numbers are
-# returned by the DllGetVersion call so the os can query the swt
-# version number
-
-APPVER=5.0
-!include <win32.mak>
-
-maj_ver=2
-min_ver=017
-bld_num=0
-
-pgm_ver_str="SWT $(maj_ver).$(min_ver) for Windows"
-timestamp_str=__DATE__\" \"__TIME__\" (EST)\"
-copyright = "Copyright (C) IBM Corporation 1999, 2000.  All rights reserved."
-
-# assumes JAVA_HOME is set in the environment from which nmake is run
-
-DLLPREFIX=swt
-OSPREFIX=win32
-DLLNAME=$(DLLPREFIX)-$(OSPREFIX)-$(maj_ver)$(min_ver).dll
-
-LIBNAME=swt# declaration
-
-LINK_LIBS = ole32.lib comctl32.lib user32.lib gdi32.lib comdlg32.lib kernel32.lib shell32.lib oleaut32.lib advapi32.lib imm32.lib winspool.lib
-
-# note: thoroughly test all examples after changing any optimization flags
-cflags =  -c -W3 -G6 -GD -O1 -DSWT_LIBRARY_VERSION=$(maj_ver)$(min_ver) -DSWT_LIBRARY_BUILD_NUM=$(bld_num) -nologo -D_X86_=1 -D_WIN32 -D_WIN95 -D_WIN32_WINDOWS=0x0400 -D_MT -MT -DWIN32 -D_WIN32_DCOM /I$(JAVA_HOME)\include /I.
-# no optimizations
-#cflags = -c -W3 -G6 -GD -Odi -DSWT_LIBRARY_VERSION=$(maj_ver)$(min_ver) -DSWT_LIBRARY_BUILD_NUM=$(bld_num) -nologo -D_X86_=1 -D_WIN32 -D_WIN95 -D_WIN32_WINDOWS=0x0400 -D_MT -MT -DWIN32 /I..\include /I$(JAVA_HOME)\include /I$(JAVA_HOME)\include\win32
-
-linkflags = /INCREMENTAL:NO /PDB:NONE /RELEASE /NOLOGO -entry:_DllMainCRTStartup@12 -dll /BASE:0x10000000 /comment:$(pgm_ver_str) /comment:$(copyright) /DLL
-
-SWTOBJS = swt.obj swtole.obj structs.obj callback.obj globals.obj library.obj
-
-all: $(SWTOBJS) \
-	 $(DLLPREFIX)
-
-$(DLLPREFIX): $(SWTOBJS)
-
-$(DLLPREFIX): swt.res $(DLLPREFIX).obj
-	echo $(LINK_LIBS) >templrf
-	echo $(linkflags) >>templrf
-	echo swt.res >>templrf
-	echo -machine:IX86 >>templrf
-	echo -subsystem:windows >>templrf
-	echo -out:$(DLLNAME) >>templrf
-	echo $(SWTOBJS) >>templrf
-	link @templrf
-	del templrf
-
-clean:
-    del *.obj
-    del *.res
-    del *.dll
-    del *.exp
-
-.c.obj:
-	cl $(cflags) $*.c
-
-.rc.res:
-   rc -r -fo swt.res swt.rc
-   
-
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/library/swt.rc b/bundles/org.eclipse.swt/Eclipse SWT/win32/library/swt.rc
deleted file mode 100755
index 97cd8d6db5..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/library/swt.rc
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * (c) Copyright IBM Corp., 2000, 2001
- * All Rights Reserved.
- */
-
-//Microsoft Developer Studio generated resource script.
-//
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#define APSTUDIO_HIDDEN_SYMBOLS
-#include "windows.h"
-#undef APSTUDIO_HIDDEN_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,0,1,7
- PRODUCTVERSION 0,0,0,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40000L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "CompanyName", "IBM Corporation\0"
-            VALUE "FileDescription", "Standard Widget Toolkit\0"
-            VALUE "FileVersion", "win32 2.017\0"
-            VALUE "InternalName", "SWT\0"
-            VALUE "LegalCopyright", "� Copyright IBM Corp. 2000, 2001. All Rights Reserved.\0"
-            VALUE "OriginalFilename", "swt-win32-2017.dll\0"
-            VALUE "ProductName", "\0"
-            VALUE "ProductVersion", "0, 0, 0, 0\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#define APSTUDIO_HIDDEN_SYMBOLS\r\n"
-    "#include ""windows.h""\r\n"
-    "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
diff --git a/bundles/org.eclipse.swt/build.properties b/bundles/org.eclipse.swt/build.properties
deleted file mode 100644
index 47e2a07b61..0000000000
--- a/bundles/org.eclipse.swt/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-source.{ws/win32}/swt.jar=Eclipse SWT/win32/,Eclipse SWT/common/,Eclipse SWT/common_j2se/,Eclipse SWT AWT/win32/,Eclipse SWT Custom Widgets/common/,Eclipse SWT Drag and Drop/win32/,Eclipse SWT Drag and Drop/common/,Eclipse SWT OLE Win32/win32/,Eclipse SWT Printing/win32/,Eclipse SWT Printing/common/,Eclipse SWT Program/win32/,Eclipse SWT Program/common/
-source.{ws/motif}/swt.jar=Eclipse SWT/motif/,Eclipse SWT/common/,Eclipse SWT/common_j2se/,Eclipse SWT Custom Widgets/common/,Eclipse SWT Drag and Drop/motif/,Eclipse SWT Drag and Drop/common/,Eclipse SWT Printing/motif/,Eclipse SWT Printing/common/,Eclipse SWT Program/motif/,Eclipse SWT Program/common/,Eclipse SWT/emulated/
-source.{ws/photon}/swt.jar=Eclipse SWT/photon/,Eclipse SWT/common/,Eclipse SWT/common_j2se/,Eclipse SWT Custom Widgets/common/,Eclipse SWT Drag and Drop/photon/,Eclipse SWT Drag and Drop/common/,Eclipse SWT Printing/photon/,Eclipse SWT Printing/common/,Eclipse SWT Program/photon/,Eclipse SWT Program/common/
-source.swt.jar=Eclipse SWT/win32/,Eclipse SWT/common/,Eclipse SWT/common_j2se/,Eclipse SWT AWT/win32/,Eclipse SWT Custom Widgets/common/,Eclipse SWT Drag and Drop/win32/,Eclipse SWT Drag and Drop/common/,Eclipse SWT OLE Win32/win32/,Eclipse SWT Printing/win32/,Eclipse SWT Printing/common/,Eclipse SWT Program/win32/,Eclipse SWT Program/common/
-bin.includes=plugin.xml,plugin.properties,ws/,*.jar
diff --git a/bundles/org.eclipse.swt/custom.xml b/bundles/org.eclipse.swt/custom.xml
new file mode 100644
index 0000000000..3a0627db82
--- /dev/null
+++ b/bundles/org.eclipse.swt/custom.xml
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="org.eclipse.swt" default="plugin.zip" basedir=".">
+  <target name="initTemplate" unless="template">
+    <initTemplate/>
+  </target>
+  <target name="init" depends="initTemplate">
+    <property name="plugin" value="org.eclipse.swt"/>
+    <property name="version" value="2.0.0"/>
+    <property name="stamp" value=""/>
+  </target>
+
+  <target name="src.zip" depends="init">
+    <property name="base" value="${basedir}/src.zip.pdetemp"/>
+    <delete dir="${base}"/>
+    <mkdir dir="${base}"/>
+    <antcall target="src">
+      <param name ="destroot" value="${base}/plugins/${plugin}_${version}"/>
+    </antcall>
+	<exec dir="${base}" executable="zip">
+	   <arg line="-r ${basedir}/${plugin}_${version}.src.zip ."/>
+	</exec>
+    <delete dir="${base}"/>
+  </target>
+
+  <target name="plugin.zip" depends="bin.zip"/>
+  <target name="bin.zip" depends="init">
+    <property name="base" value="${basedir}/bin.zip.pdetemp"/>
+    <delete dir="${base}"/>
+    <mkdir dir="${base}"/>
+    <antcall target="jar">
+      <param name ="destroot" value="${base}/plugins/${plugin}_${version}"/>
+    </antcall>
+    <antcall target="bin">
+      <param name ="destroot" value="${base}/plugins/${plugin}_${version}"/>
+    </antcall>
+	<exec dir="${base}" executable="zip">
+	  <arg line="-r ${basedir}/${plugin}_${version}.zip . -x *.bin.log "/>
+	</exec>
+    <delete dir="${base}"/>
+  </target>
+
+  <target name="log.zip" depends="init">
+    <property name="base" value="${basedir}/log.zip.pdetemp"/>
+    <delete dir="${base}"/>
+    <mkdir dir="${base}"/>
+    <antcall target="log">
+      <param name ="destroot" value="${base}/plugins/${plugin}_${version}"/>
+    </antcall>
+	<exec dir="${base}" executable="zip">
+	   <arg line="-r ${basedir}/${plugin}_${version}.log.zip ."/>
+	</exec>
+    <delete dir="${base}"/>
+  </target>
+
+  <target name="ws/motif/swt.jar" depends="init">
+    <ant antfile="${template}" target="jar">
+      <property name="mapping" value="Eclipse SWT/motif/,Eclipse SWT/common/,Eclipse SWT/common_j2se/,Eclipse SWT Custom Widgets/common/,Eclipse SWT Drag and Drop/motif/,Eclipse SWT Drag and Drop/common/,Eclipse SWT Printing/motif/,Eclipse SWT Printing/common/,Eclipse SWT Program/motif/,Eclipse SWT Program/common/,Eclipse SWT/emulated/,Eclipse SWT PI/motif/,Eclipse SWT PI/common_j2se/"/>
+      <property name="includes" value="Eclipse SWT/motif/,Eclipse SWT/common/,Eclipse SWT/common_j2se/,Eclipse SWT Custom Widgets/common/,Eclipse SWT Drag and Drop/motif/,Eclipse SWT Drag and Drop/common/,Eclipse SWT Printing/motif/,Eclipse SWT Printing/common/,Eclipse SWT Program/motif/,Eclipse SWT Program/common/,Eclipse SWT/emulated/,Eclipse SWT PI/motif/,Eclipse SWT PI/common_j2se/"/>
+      <property name="excludes" value=""/>
+      <property name="dest" value="${basedir}/ws/motif/swt.jar"/>
+      <property name="compilePath" value=""/>
+    </ant>
+  </target>
+
+  <target name="ws/photon/swt.jar" depends="init">
+    <ant antfile="${template}" target="jar">
+      <property name="mapping" value="Eclipse SWT/photon/,Eclipse SWT/common/,Eclipse SWT/common_j2se/,Eclipse SWT Custom Widgets/common/,Eclipse SWT Drag and Drop/photon/,Eclipse SWT Drag and Drop/common/,Eclipse SWT Printing/photon/,Eclipse SWT Printing/common/,Eclipse SWT Program/photon/,Eclipse SWT Program/common/,Eclipse SWT/emulated/,Eclipse SWT PI/photon/,Eclipse SWT PI/common_j2se/"/>
+      <property name="includes" value="Eclipse SWT/photon/,Eclipse SWT/common/,Eclipse SWT/common_j2se/,Eclipse SWT Custom Widgets/common/,Eclipse SWT Drag and Drop/photon/,Eclipse SWT Drag and Drop/common/,Eclipse SWT Printing/photon/,Eclipse SWT Printing/common/,Eclipse SWT Program/photon/,Eclipse SWT Program/common/,Eclipse SWT/emulated/,Eclipse SWT PI/photon/,Eclipse SWT PI/common_j2se/"/>
+      <property name="excludes" value=""/>
+      <property name="dest" value="${basedir}/ws/photon/swt.jar"/>
+      <property name="compilePath" value=""/>
+    </ant>
+  </target>
+
+  <target name="ws/win32/swt.jar" depends="init">
+    <ant antfile="${template}" target="jar">
+      <property name="mapping" value="Eclipse SWT/win32/,Eclipse SWT/common/,Eclipse SWT/common_j2se/,Eclipse SWT AWT/win32/,Eclipse SWT Custom Widgets/common/,Eclipse SWT Drag and Drop/win32/,Eclipse SWT Drag and Drop/common/,Eclipse SWT OLE Win32/win32/,Eclipse SWT Printing/win32/,Eclipse SWT Printing/common/,Eclipse SWT Program/win32/,Eclipse SWT Program/common/,Eclipse SWT PI/win32/,Eclipse SWT PI/common_j2se/"/>
+      <property name="includes" value="Eclipse SWT/win32/,Eclipse SWT/common/,Eclipse SWT/common_j2se/,Eclipse SWT AWT/win32/,Eclipse SWT Custom Widgets/common/,Eclipse SWT Drag and Drop/win32/,Eclipse SWT Drag and Drop/common/,Eclipse SWT OLE Win32/win32/,Eclipse SWT Printing/win32/,Eclipse SWT Printing/common/,Eclipse SWT Program/win32/,Eclipse SWT Program/common/,Eclipse SWT PI/win32/,Eclipse SWT PI/common_j2se/"/>
+      <property name="excludes" value=""/>
+      <property name="dest" value="${basedir}/ws/win32/swt.jar"/>
+      <property name="compilePath" value=""/>
+    </ant>
+  </target>
+
+  <target name="swt.jar" depends="init">
+    <ant antfile="${template}" target="jar">
+      <property name="mapping" value="Eclipse SWT/win32/,Eclipse SWT/common/,Eclipse SWT/common_j2se/,Eclipse SWT AWT/win32/,Eclipse SWT Custom Widgets/common/,Eclipse SWT Drag and Drop/win32/,Eclipse SWT Drag and Drop/common/,Eclipse SWT OLE Win32/win32/,Eclipse SWT Printing/win32/,Eclipse SWT Printing/common/,Eclipse SWT Program/win32/,Eclipse SWT Program/common/,Eclipse SWT PI/win32/,Eclipse SWT PI/common_j2se/"/>
+      <property name="includes" value="Eclipse SWT/win32/,Eclipse SWT/common/,Eclipse SWT/common_j2se/,Eclipse SWT AWT/win32/,Eclipse SWT Custom Widgets/common/,Eclipse SWT Drag and Drop/win32/,Eclipse SWT Drag and Drop/common/,Eclipse SWT OLE Win32/win32/,Eclipse SWT Printing/win32/,Eclipse SWT Printing/common/,Eclipse SWT Program/win32/,Eclipse SWT Program/common/,Eclipse SWT PI/win32/,Eclipse SWT PI/common_j2se/"/>
+      <property name="excludes" value=""/>
+      <property name="dest" value="${basedir}/swt.jar"/>
+      <property name="compilePath" value=""/>
+    </ant>
+  </target>
+
+  <target name="jar" depends="init,ws/motif/swt.jar,ws/photon/swt.jar,ws/win32/swt.jar,swt.jar">
+  </target>
+
+  <target name="ws/motif/swtsrc.zip" depends="init">
+    <property name="destroot" value="${basedir}"/>
+    <ant antfile="${template}" target="src">
+      <property name="mapping" value="Eclipse SWT/motif/,Eclipse SWT/common/,Eclipse SWT/common_j2se/,Eclipse SWT Custom Widgets/common/,Eclipse SWT Drag and Drop/motif/,Eclipse SWT Drag and Drop/common/,Eclipse SWT Printing/motif/,Eclipse SWT Printing/common/,Eclipse SWT Program/motif/,Eclipse SWT Program/common/,Eclipse SWT/emulated/,Eclipse SWT PI/motif/,Eclipse SWT PI/common_j2se/"/>
+      <property name="includes" value="Eclipse SWT/motif/**/*.java,Eclipse SWT/common/**/*.java,Eclipse SWT/common_j2se/**/*.java,Eclipse SWT Custom Widgets/common/**/*.java,Eclipse SWT Drag and Drop/motif/**/*.java,Eclipse SWT Drag and Drop/common/**/*.java,Eclipse SWT Printing/motif/**/*.java,Eclipse SWT Printing/common/**/*.java,Eclipse SWT Program/motif/**/*.java,Eclipse SWT Program/common/**/*.java,Eclipse SWT/emulated/**/*.java,Eclipse SWT PI/motif/**/*.java,Eclipse SWT PI/common_j2se/**/*.java"/>
+      <property name="excludes" value=""/>
+      <property name="dest" value="${destroot}/ws/motif/swtsrc.zip"/>
+    </ant>
+  </target>
+
+  <target name="ws/photon/swtsrc.zip" depends="init">
+    <property name="destroot" value="${basedir}"/>
+    <ant antfile="${template}" target="src">
+      <property name="mapping" value="Eclipse SWT/photon/,Eclipse SWT/common/,Eclipse SWT/common_j2se/,Eclipse SWT Custom Widgets/common/,Eclipse SWT Drag and Drop/photon/,Eclipse SWT Drag and Drop/common/,Eclipse SWT Printing/photon/,Eclipse SWT Printing/common/,Eclipse SWT Program/photon/,Eclipse SWT Program/common/,Eclipse SWT/emulated,Eclipse SWT PI/photon/,Eclipse SWT PI/common_j2se/"/>
+      <property name="includes" value="Eclipse SWT/photon/**/*.java,Eclipse SWT/common/**/*.java,Eclipse SWT/common_j2se/**/*.java,Eclipse SWT Custom Widgets/common/**/*.java,Eclipse SWT Drag and Drop/photon/**/*.java,Eclipse SWT Drag and Drop/common/**/*.java,Eclipse SWT Printing/photon/**/*.java,Eclipse SWT Printing/common/**/*.java,Eclipse SWT Program/photon/**/*.java,Eclipse SWT Program/common/**/*.java,Eclipse SWT/emulated/**/*.java,Eclipse SWT PI/photon/**/*.java,Eclipse SWT PI/common_j2se/**/*.java"/>
+      <property name="excludes" value=""/>
+      <property name="dest" value="${destroot}/ws/photon/swtsrc.zip"/>
+    </ant>
+  </target>
+
+  <target name="ws/win32/swtsrc.zip" depends="init">
+    <property name="destroot" value="${basedir}"/>
+    <ant antfile="${template}" target="src">
+      <property name="mapping" value="Eclipse SWT/win32/,Eclipse SWT/common/,Eclipse SWT/common_j2se/,Eclipse SWT AWT/win32/,Eclipse SWT Custom Widgets/common/,Eclipse SWT Drag and Drop/win32/,Eclipse SWT Drag and Drop/common/,Eclipse SWT OLE Win32/win32/,Eclipse SWT Printing/win32/,Eclipse SWT Printing/common/,Eclipse SWT Program/win32/,Eclipse SWT Program/common/,Eclipse SWT PI/win32/,Eclipse SWT PI/common_j2se/"/>
+      <property name="includes" value="Eclipse SWT/win32/**/*.java,Eclipse SWT/common/**/*.java,Eclipse SWT/common_j2se/**/*.java,Eclipse SWT AWT/win32/**/*.java,Eclipse SWT Custom Widgets/common/**/*.java,Eclipse SWT Drag and Drop/win32/**/*.java,Eclipse SWT Drag and Drop/common/**/*.java,Eclipse SWT OLE Win32/win32/**/*.java,Eclipse SWT Printing/win32/**/*.java,Eclipse SWT Printing/common/**/*.java,Eclipse SWT Program/win32/**/*.java,Eclipse SWT Program/common/**/*.java,Eclipse SWT PI/win32/**/*.java,Eclipse SWT PI/common_j2sse/**/*.java"/>
+      <property name="excludes" value=""/>
+      <property name="dest" value="${destroot}/ws/win32/swtsrc.zip"/>
+    </ant>
+  </target>
+
+  <target name="swtsrc.zip" depends="init">
+    <property name="destroot" value="${basedir}"/>
+    <ant antfile="${template}" target="src">
+      <property name="mapping" value="Eclipse SWT/win32/,Eclipse SWT/common/,Eclipse SWT/common_j2se/,Eclipse SWT AWT/win32/,Eclipse SWT Custom Widgets/common/,Eclipse SWT Drag and Drop/win32/,Eclipse SWT Drag and Drop/common/,Eclipse SWT OLE Win32/win32/,Eclipse SWT Printing/win32/,Eclipse SWT Printing/common/,Eclipse SWT Program/win32/,Eclipse SWT Program/common/,Eclipse SWT PI/win32/,Eclipse SWT PI/common_j2se/"/>
+      <property name="includes" value="Eclipse SWT/win32/**/*.java,Eclipse SWT/common/**/*.java,Eclipse SWT/common_j2se/**/*.java,Eclipse SWT AWT/win32/**/*.java,Eclipse SWT Custom Widgets/common/**/*.java,Eclipse SWT Drag and Drop/win32/**/*.java,Eclipse SWT Drag and Drop/common/**/*.java,Eclipse SWT OLE Win32/win32/**/*.java,Eclipse SWT Printing/win32/**/*.java,Eclipse SWT Printing/common/**/*.java,Eclipse SWT Program/win32/**/*.java,Eclipse SWT Program/common/**/*.java,Eclipse SWT PI/win32/**/*.java,Eclipse SWT PI/common_j2se/**/*.java"/>
+      <property name="excludes" value=""/>
+      <property name="dest" value="${destroot}/swtsrc.zip"/>
+    </ant>
+  </target>
+
+  <target name="src" depends="init,ws/motif/swtsrc.zip,ws/photon/swtsrc.zip,ws/win32/swtsrc.zip,swtsrc.zip">
+  </target>
+
+  <target name="bin" depends="init">
+    <property name="destroot" value="${basedir}"/>
+    <ant antfile="${template}" target="bin">
+      <property name="includes" value="plugin.xml,plugin.properties,ws/,*.jar"/>
+      <property name="excludes" value="Eclipse SWT Printing/common/,Eclipse SWT Custom Widgets/common/,Eclipse SWT Drag and Drop/motif/,Eclipse SWT Drag and Drop/photon/,Eclipse SWT PI/photon/,Eclipse SWT/photon/,Eclipse SWT/motif/,Eclipse SWT PI/win32/,Eclipse SWT AWT/win32/,Eclipse SWT Drag and Drop/win32/,Eclipse SWT Program/common/,Eclipse SWT Program/motif/,Eclipse SWT Printing/motif/,Eclipse SWT Drag and Drop/common/,Eclipse SWT/common_j2se/,Eclipse SWT/common/,Eclipse SWT Printing/photon/,Eclipse SWT OLE Win32/win32/,Eclipse SWT/win32/,Eclipse SWT Program/win32/,Eclipse SWT Program/photon/,Eclipse SWT PI/motif/,Eclipse SWT Printing/win32/,Eclipse SWT/emulated/"/>
+      <property name="dest" value="${destroot}"/>
+    </ant>
+  </target>
+
+  <target name="log" depends="init">
+    <property name="destroot" value="${basedir}"/>
+    <ant antfile="${template}" target="log">
+      <property name="dest" value="${destroot}"/>
+    </ant>
+  </target>
+
+  <target name="clean" depends="init">
+    <ant antfile="${template}" target="clean">
+      <property name="jar" value="ws/motif/swt.jar,ws/photon/swt.jar,ws/win32/swt.jar,swt.jar"/>
+      <property name="srczips" value="ws/motif/swtsrc.zip,ws/photon/swtsrc.zip,ws/win32/swtsrc.zip,swtsrc.zip"/>
+    </ant>
+    <delete>
+      <fileset dir="." includes="**/*.pdetemp"/>
+    </delete>
+    <delete file="${plugin}_${version}.zip"/>
+    <delete file="${plugin}_${version}.src.zip"/>
+    <delete file="${plugin}_${version}.doc.zip"/>
+    <delete file="${plugin}_${version}.log.zip"/>
+  </target>
+</project>
diff --git a/bundles/org.eclipse.swt/ws/win32/swt-win32-2017.dll b/bundles/org.eclipse.swt/ws/win32/swt-win32-2017.dll
index 569ca972f3..dbe6d41737 100644
--- a/bundles/org.eclipse.swt/ws/win32/swt-win32-2017.dll
+++ b/bundles/org.eclipse.swt/ws/win32/swt-win32-2017.dll
diff --git a/bundles/org.eclipse.swt/ws/win32/swt-win32-ce-2017.dll b/bundles/org.eclipse.swt/ws/win32/swt-win32-ce-2017.dll
index 253ad198e3..d6e30b85fb 100644
--- a/bundles/org.eclipse.swt/ws/win32/swt-win32-ce-2017.dll
+++ b/bundles/org.eclipse.swt/ws/win32/swt-win32-ce-2017.dll