merge XPCOMGlue into XPCOM

17 files changed, 47 insertions, 1230 deletions

diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties
index a0c2ed291c..f9a37fbe30 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties
@@ -800,6 +800,11 @@ XPCOM_VtblCall__II_3Z_0=
 XPCOM_VtblCall__II_3Z_1=
 XPCOM_VtblCall__II_3Z_2=
 
+XPCOM_XPCOMGlueShutdown=
+
+XPCOM_XPCOMGlueStartup=
+XPCOM_XPCOMGlueStartup_0=cast=(const char *)
+
 XPCOM_memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I=
 XPCOM_memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I_0=cast=(void *)
 XPCOM_memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I_1=cast=(const void *)
@@ -852,13 +857,6 @@ XPCOM_strlen_PRUnichar=flags=no_gen
 XPCOM_strlen_PRUnichar_0=
 
 
-org_eclipse_swt_internal_mozilla_XPCOMGlue=flags=no_gen
-XPCOMGlue_XPCOMGlueShutdown=
-
-XPCOMGlue_XPCOMGlueStartup=
-XPCOMGlue_XPCOMGlueStartup_0=
-
-
 org_eclipse_swt_internal_mozilla_XPCOMInit=flags=no_gen
 XPCOMInit_GREVersionRange_sizeof=
 
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOMGlue.properties b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOMGlue.properties
deleted file mode 100644
index 71bc52a5ba..0000000000
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOMGlue.properties
+++ /dev/null
@@ -1,1007 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-org_eclipse_swt_internal_mozilla_GREVersionRange=flags=no_gen
-GREVersionRange_lower=
-GREVersionRange_lowerInclusive=
-GREVersionRange_upper=
-GREVersionRange_upperInclusive=
-
-org_eclipse_swt_internal_mozilla_XPCOM=flags=no_gen
-XPCOM_Call=
-XPCOM_Call_0=
-XPCOM_Call_1=
-XPCOM_Call_2=
-XPCOM_Call_3=
-XPCOM_Call_4=
-XPCOM_Call_5=
-XPCOM_Call_6=
-
-XPCOM_NS_GetComponentManager=
-XPCOM_NS_GetComponentManager_0=
-
-XPCOM_NS_GetServiceManager=
-XPCOM_NS_GetServiceManager_0=
-
-XPCOM_NS_InitXPCOM2=
-XPCOM_NS_InitXPCOM2_0=
-XPCOM_NS_InitXPCOM2_1=
-XPCOM_NS_InitXPCOM2_2=
-
-XPCOM_NS_NewLocalFile=
-XPCOM_NS_NewLocalFile_0=
-XPCOM_NS_NewLocalFile_1=
-XPCOM_NS_NewLocalFile_2=
-
-XPCOM_VtblCall__II=
-XPCOM_VtblCall__II_0=
-XPCOM_VtblCall__II_1=
-
-XPCOM_VtblCall__IIF=
-XPCOM_VtblCall__IIF_0=
-XPCOM_VtblCall__IIF_1=
-XPCOM_VtblCall__IIF_2=
-
-XPCOM_VtblCall__III=
-XPCOM_VtblCall__III_0=
-XPCOM_VtblCall__III_1=
-XPCOM_VtblCall__III_2=
-
-XPCOM_VtblCall__IIII=
-XPCOM_VtblCall__IIII_0=
-XPCOM_VtblCall__IIII_1=
-XPCOM_VtblCall__IIII_2=
-XPCOM_VtblCall__IIII_3=
-
-XPCOM_VtblCall__IIIII=
-XPCOM_VtblCall__IIIII_0=
-XPCOM_VtblCall__IIIII_1=
-XPCOM_VtblCall__IIIII_2=
-XPCOM_VtblCall__IIIII_3=
-XPCOM_VtblCall__IIIII_4=
-
-XPCOM_VtblCall__IIIIII=
-XPCOM_VtblCall__IIIIII_0=
-XPCOM_VtblCall__IIIIII_1=
-XPCOM_VtblCall__IIIIII_2=
-XPCOM_VtblCall__IIIIII_3=
-XPCOM_VtblCall__IIIIII_4=
-XPCOM_VtblCall__IIIIII_5=
-
-XPCOM_VtblCall__IIIIIII=
-XPCOM_VtblCall__IIIIIII_0=
-XPCOM_VtblCall__IIIIIII_1=
-XPCOM_VtblCall__IIIIIII_2=
-XPCOM_VtblCall__IIIIIII_3=
-XPCOM_VtblCall__IIIIIII_4=
-XPCOM_VtblCall__IIIIIII_5=
-XPCOM_VtblCall__IIIIIII_6=
-
-XPCOM_VtblCall__IIIIIIII=
-XPCOM_VtblCall__IIIIIIII_0=
-XPCOM_VtblCall__IIIIIIII_1=
-XPCOM_VtblCall__IIIIIIII_2=
-XPCOM_VtblCall__IIIIIIII_3=
-XPCOM_VtblCall__IIIIIIII_4=
-XPCOM_VtblCall__IIIIIIII_5=
-XPCOM_VtblCall__IIIIIIII_6=
-XPCOM_VtblCall__IIIIIIII_7=
-
-XPCOM_VtblCall__IIIIIIJII=
-XPCOM_VtblCall__IIIIIIJII_0=
-XPCOM_VtblCall__IIIIIIJII_1=
-XPCOM_VtblCall__IIIIIIJII_2=
-XPCOM_VtblCall__IIIIIIJII_3=
-XPCOM_VtblCall__IIIIIIJII_4=
-XPCOM_VtblCall__IIIIIIJII_5=
-XPCOM_VtblCall__IIIIIIJII_6=
-XPCOM_VtblCall__IIIIIIJII_7=
-XPCOM_VtblCall__IIIIIIJII_8=
-
-XPCOM_VtblCall__IIIIIIZ=
-XPCOM_VtblCall__IIIIIIZ_0=
-XPCOM_VtblCall__IIIIIIZ_1=
-XPCOM_VtblCall__IIIIIIZ_2=
-XPCOM_VtblCall__IIIIIIZ_3=
-XPCOM_VtblCall__IIIIIIZ_4=
-XPCOM_VtblCall__IIIIIIZ_5=
-XPCOM_VtblCall__IIIIIIZ_6=
-
-XPCOM_VtblCall__IIIIIZ=
-XPCOM_VtblCall__IIIIIZ_0=
-XPCOM_VtblCall__IIIIIZ_1=
-XPCOM_VtblCall__IIIIIZ_2=
-XPCOM_VtblCall__IIIIIZ_3=
-XPCOM_VtblCall__IIIIIZ_4=
-XPCOM_VtblCall__IIIIIZ_5=
-
-XPCOM_VtblCall__IIIIIZ_3CIIIIZ_3I_3I=
-XPCOM_VtblCall__IIIIIZ_3CIIIIZ_3I_3I_0=
-XPCOM_VtblCall__IIIIIZ_3CIIIIZ_3I_3I_1=
-XPCOM_VtblCall__IIIIIZ_3CIIIIZ_3I_3I_2=
-XPCOM_VtblCall__IIIIIZ_3CIIIIZ_3I_3I_3=
-XPCOM_VtblCall__IIIIIZ_3CIIIIZ_3I_3I_4=
-XPCOM_VtblCall__IIIIIZ_3CIIIIZ_3I_3I_5=
-XPCOM_VtblCall__IIIIIZ_3CIIIIZ_3I_3I_6=
-XPCOM_VtblCall__IIIIIZ_3CIIIIZ_3I_3I_7=
-XPCOM_VtblCall__IIIIIZ_3CIIIIZ_3I_3I_8=
-XPCOM_VtblCall__IIIIIZ_3CIIIIZ_3I_3I_9=
-XPCOM_VtblCall__IIIIIZ_3CIIIIZ_3I_3I_10=
-XPCOM_VtblCall__IIIIIZ_3CIIIIZ_3I_3I_11=
-XPCOM_VtblCall__IIIIIZ_3CIIIIZ_3I_3I_12=
-XPCOM_VtblCall__IIIIIZ_3CIIIIZ_3I_3I_13=
-
-XPCOM_VtblCall__IIIII_3C=
-XPCOM_VtblCall__IIIII_3C_0=
-XPCOM_VtblCall__IIIII_3C_1=
-XPCOM_VtblCall__IIIII_3C_2=
-XPCOM_VtblCall__IIIII_3C_3=
-XPCOM_VtblCall__IIIII_3C_4=
-XPCOM_VtblCall__IIIII_3C_5=
-
-XPCOM_VtblCall__IIIII_3I=
-XPCOM_VtblCall__IIIII_3I_0=
-XPCOM_VtblCall__IIIII_3I_1=
-XPCOM_VtblCall__IIIII_3I_2=
-XPCOM_VtblCall__IIIII_3I_3=
-XPCOM_VtblCall__IIIII_3I_4=
-XPCOM_VtblCall__IIIII_3I_5=
-
-XPCOM_VtblCall__IIIIJJJJ=
-XPCOM_VtblCall__IIIIJJJJ_0=
-XPCOM_VtblCall__IIIIJJJJ_1=
-XPCOM_VtblCall__IIIIJJJJ_2=
-XPCOM_VtblCall__IIIIJJJJ_3=
-XPCOM_VtblCall__IIIIJJJJ_4=
-XPCOM_VtblCall__IIIIJJJJ_5=
-XPCOM_VtblCall__IIIIJJJJ_6=
-XPCOM_VtblCall__IIIIJJJJ_7=
-
-XPCOM_VtblCall__IIIIJZ=
-XPCOM_VtblCall__IIIIJZ_0=
-XPCOM_VtblCall__IIIIJZ_1=
-XPCOM_VtblCall__IIIIJZ_2=
-XPCOM_VtblCall__IIIIJZ_3=
-XPCOM_VtblCall__IIIIJZ_4=
-XPCOM_VtblCall__IIIIJZ_5=
-
-XPCOM_VtblCall__IIIIZ=
-XPCOM_VtblCall__IIIIZ_0=
-XPCOM_VtblCall__IIIIZ_1=
-XPCOM_VtblCall__IIIIZ_2=
-XPCOM_VtblCall__IIIIZ_3=
-XPCOM_VtblCall__IIIIZ_4=
-
-XPCOM_VtblCall__IIII_3C=
-XPCOM_VtblCall__IIII_3C_0=
-XPCOM_VtblCall__IIII_3C_1=
-XPCOM_VtblCall__IIII_3C_2=
-XPCOM_VtblCall__IIII_3C_3=
-XPCOM_VtblCall__IIII_3C_4=
-
-XPCOM_VtblCall__IIII_3CIJI=
-XPCOM_VtblCall__IIII_3CIJI_0=
-XPCOM_VtblCall__IIII_3CIJI_1=
-XPCOM_VtblCall__IIII_3CIJI_2=
-XPCOM_VtblCall__IIII_3CIJI_3=
-XPCOM_VtblCall__IIII_3CIJI_4=
-XPCOM_VtblCall__IIII_3CIJI_5=
-XPCOM_VtblCall__IIII_3CIJI_6=
-XPCOM_VtblCall__IIII_3CIJI_7=
-
-XPCOM_VtblCall__IIII_3I=
-XPCOM_VtblCall__IIII_3I_0=
-XPCOM_VtblCall__IIII_3I_1=
-XPCOM_VtblCall__IIII_3I_2=
-XPCOM_VtblCall__IIII_3I_3=
-XPCOM_VtblCall__IIII_3I_4=
-
-XPCOM_VtblCall__IIII_3J=
-XPCOM_VtblCall__IIII_3J_0=
-XPCOM_VtblCall__IIII_3J_1=
-XPCOM_VtblCall__IIII_3J_2=
-XPCOM_VtblCall__IIII_3J_3=
-XPCOM_VtblCall__IIII_3J_4=
-
-XPCOM_VtblCall__IIIJJ=
-XPCOM_VtblCall__IIIJJ_0=
-XPCOM_VtblCall__IIIJJ_1=
-XPCOM_VtblCall__IIIJJ_2=
-XPCOM_VtblCall__IIIJJ_3=
-XPCOM_VtblCall__IIIJJ_4=
-
-XPCOM_VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2=
-XPCOM_VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_0=
-XPCOM_VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_1=
-XPCOM_VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_2=
-XPCOM_VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3=
-
-XPCOM_VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I=
-XPCOM_VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I_0=
-XPCOM_VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I_1=
-XPCOM_VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I_2=
-XPCOM_VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I_3=
-XPCOM_VtblCall__IIILorg_eclipse_swt_internal_mozilla_nsID_2_3I_4=
-
-XPCOM_VtblCall__IIIZ=
-XPCOM_VtblCall__IIIZ_0=
-XPCOM_VtblCall__IIIZ_1=
-XPCOM_VtblCall__IIIZ_2=
-XPCOM_VtblCall__IIIZ_3=
-
-XPCOM_VtblCall__IIIZZ=
-XPCOM_VtblCall__IIIZZ_0=
-XPCOM_VtblCall__IIIZZ_1=
-XPCOM_VtblCall__IIIZZ_2=
-XPCOM_VtblCall__IIIZZ_3=
-XPCOM_VtblCall__IIIZZ_4=
-
-XPCOM_VtblCall__IIIZZII=
-XPCOM_VtblCall__IIIZZII_0=
-XPCOM_VtblCall__IIIZZII_1=
-XPCOM_VtblCall__IIIZZII_2=
-XPCOM_VtblCall__IIIZZII_3=
-XPCOM_VtblCall__IIIZZII_4=
-XPCOM_VtblCall__IIIZZII_5=
-XPCOM_VtblCall__IIIZZII_6=
-
-XPCOM_VtblCall__IIIZZIIIIIIZZZZSI=
-XPCOM_VtblCall__IIIZZIIIIIIZZZZSI_0=
-XPCOM_VtblCall__IIIZZIIIIIIZZZZSI_1=
-XPCOM_VtblCall__IIIZZIIIIIIZZZZSI_2=
-XPCOM_VtblCall__IIIZZIIIIIIZZZZSI_3=
-XPCOM_VtblCall__IIIZZIIIIIIZZZZSI_4=
-XPCOM_VtblCall__IIIZZIIIIIIZZZZSI_5=
-XPCOM_VtblCall__IIIZZIIIIIIZZZZSI_6=
-XPCOM_VtblCall__IIIZZIIIIIIZZZZSI_7=
-XPCOM_VtblCall__IIIZZIIIIIIZZZZSI_8=
-XPCOM_VtblCall__IIIZZIIIIIIZZZZSI_9=
-XPCOM_VtblCall__IIIZZIIIIIIZZZZSI_10=
-XPCOM_VtblCall__IIIZZIIIIIIZZZZSI_11=
-XPCOM_VtblCall__IIIZZIIIIIIZZZZSI_12=
-XPCOM_VtblCall__IIIZZIIIIIIZZZZSI_13=
-XPCOM_VtblCall__IIIZZIIIIIIZZZZSI_14=
-XPCOM_VtblCall__IIIZZIIIIIIZZZZSI_15=
-XPCOM_VtblCall__IIIZZIIIIIIZZZZSI_16=
-
-XPCOM_VtblCall__IIIZ_3Z=
-XPCOM_VtblCall__IIIZ_3Z_0=
-XPCOM_VtblCall__IIIZ_3Z_1=
-XPCOM_VtblCall__IIIZ_3Z_2=
-XPCOM_VtblCall__IIIZ_3Z_3=
-XPCOM_VtblCall__IIIZ_3Z_4=
-
-XPCOM_VtblCall__III_3B=
-XPCOM_VtblCall__III_3B_0=
-XPCOM_VtblCall__III_3B_1=
-XPCOM_VtblCall__III_3B_2=
-XPCOM_VtblCall__III_3B_3=
-
-XPCOM_VtblCall__III_3BI_3I=
-XPCOM_VtblCall__III_3BI_3I_0=
-XPCOM_VtblCall__III_3BI_3I_1=
-XPCOM_VtblCall__III_3BI_3I_2=
-XPCOM_VtblCall__III_3BI_3I_3=
-XPCOM_VtblCall__III_3BI_3I_4=
-XPCOM_VtblCall__III_3BI_3I_5=
-
-XPCOM_VtblCall__III_3BZ=
-XPCOM_VtblCall__III_3BZ_0=
-XPCOM_VtblCall__III_3BZ_1=
-XPCOM_VtblCall__III_3BZ_2=
-XPCOM_VtblCall__III_3BZ_3=
-XPCOM_VtblCall__III_3BZ_4=
-
-XPCOM_VtblCall__III_3B_3B_3BI_3I=
-XPCOM_VtblCall__III_3B_3B_3BI_3I_0=
-XPCOM_VtblCall__III_3B_3B_3BI_3I_1=
-XPCOM_VtblCall__III_3B_3B_3BI_3I_2=
-XPCOM_VtblCall__III_3B_3B_3BI_3I_3=
-XPCOM_VtblCall__III_3B_3B_3BI_3I_4=
-XPCOM_VtblCall__III_3B_3B_3BI_3I_5=
-XPCOM_VtblCall__III_3B_3B_3BI_3I_6=
-XPCOM_VtblCall__III_3B_3B_3BI_3I_7=
-
-XPCOM_VtblCall__III_3B_3C=
-XPCOM_VtblCall__III_3B_3C_0=
-XPCOM_VtblCall__III_3B_3C_1=
-XPCOM_VtblCall__III_3B_3C_2=
-XPCOM_VtblCall__III_3B_3C_3=
-XPCOM_VtblCall__III_3B_3C_4=
-
-XPCOM_VtblCall__III_3B_3Z=
-XPCOM_VtblCall__III_3B_3Z_0=
-XPCOM_VtblCall__III_3B_3Z_1=
-XPCOM_VtblCall__III_3B_3Z_2=
-XPCOM_VtblCall__III_3B_3Z_3=
-XPCOM_VtblCall__III_3B_3Z_4=
-
-XPCOM_VtblCall__III_3C=
-XPCOM_VtblCall__III_3C_0=
-XPCOM_VtblCall__III_3C_1=
-XPCOM_VtblCall__III_3C_2=
-XPCOM_VtblCall__III_3C_3=
-
-XPCOM_VtblCall__III_3CI=
-XPCOM_VtblCall__III_3CI_0=
-XPCOM_VtblCall__III_3CI_1=
-XPCOM_VtblCall__III_3CI_2=
-XPCOM_VtblCall__III_3CI_3=
-XPCOM_VtblCall__III_3CI_4=
-
-XPCOM_VtblCall__III_3C_3C=
-XPCOM_VtblCall__III_3C_3C_0=
-XPCOM_VtblCall__III_3C_3C_1=
-XPCOM_VtblCall__III_3C_3C_2=
-XPCOM_VtblCall__III_3C_3C_3=
-XPCOM_VtblCall__III_3C_3C_4=
-
-XPCOM_VtblCall__III_3C_3CI_3C_3C_3C_3C_3Z_3I=
-XPCOM_VtblCall__III_3C_3CI_3C_3C_3C_3C_3Z_3I_0=
-XPCOM_VtblCall__III_3C_3CI_3C_3C_3C_3C_3Z_3I_1=
-XPCOM_VtblCall__III_3C_3CI_3C_3C_3C_3C_3Z_3I_2=
-XPCOM_VtblCall__III_3C_3CI_3C_3C_3C_3C_3Z_3I_3=
-XPCOM_VtblCall__III_3C_3CI_3C_3C_3C_3C_3Z_3I_4=
-XPCOM_VtblCall__III_3C_3CI_3C_3C_3C_3C_3Z_3I_5=
-XPCOM_VtblCall__III_3C_3CI_3C_3C_3C_3C_3Z_3I_6=
-XPCOM_VtblCall__III_3C_3CI_3C_3C_3C_3C_3Z_3I_7=
-XPCOM_VtblCall__III_3C_3CI_3C_3C_3C_3C_3Z_3I_8=
-XPCOM_VtblCall__III_3C_3CI_3C_3C_3C_3C_3Z_3I_9=
-XPCOM_VtblCall__III_3C_3CI_3C_3C_3C_3C_3Z_3I_10=
-XPCOM_VtblCall__III_3C_3CI_3C_3C_3C_3C_3Z_3I_11=
-
-XPCOM_VtblCall__III_3C_3CI_3I_3I_3Z=
-XPCOM_VtblCall__III_3C_3CI_3I_3I_3Z_0=
-XPCOM_VtblCall__III_3C_3CI_3I_3I_3Z_1=
-XPCOM_VtblCall__III_3C_3CI_3I_3I_3Z_2=
-XPCOM_VtblCall__III_3C_3CI_3I_3I_3Z_3=
-XPCOM_VtblCall__III_3C_3CI_3I_3I_3Z_4=
-XPCOM_VtblCall__III_3C_3CI_3I_3I_3Z_5=
-XPCOM_VtblCall__III_3C_3CI_3I_3I_3Z_6=
-XPCOM_VtblCall__III_3C_3CI_3I_3I_3Z_7=
-XPCOM_VtblCall__III_3C_3CI_3I_3I_3Z_8=
-
-XPCOM_VtblCall__III_3C_3C_3C_3Z=
-XPCOM_VtblCall__III_3C_3C_3C_3Z_0=
-XPCOM_VtblCall__III_3C_3C_3C_3Z_1=
-XPCOM_VtblCall__III_3C_3C_3C_3Z_2=
-XPCOM_VtblCall__III_3C_3C_3C_3Z_3=
-XPCOM_VtblCall__III_3C_3C_3C_3Z_4=
-XPCOM_VtblCall__III_3C_3C_3C_3Z_5=
-XPCOM_VtblCall__III_3C_3C_3C_3Z_6=
-
-XPCOM_VtblCall__III_3C_3C_3C_3Z_3Z=
-XPCOM_VtblCall__III_3C_3C_3C_3Z_3Z_0=
-XPCOM_VtblCall__III_3C_3C_3C_3Z_3Z_1=
-XPCOM_VtblCall__III_3C_3C_3C_3Z_3Z_2=
-XPCOM_VtblCall__III_3C_3C_3C_3Z_3Z_3=
-XPCOM_VtblCall__III_3C_3C_3C_3Z_3Z_4=
-XPCOM_VtblCall__III_3C_3C_3C_3Z_3Z_5=
-XPCOM_VtblCall__III_3C_3C_3C_3Z_3Z_6=
-XPCOM_VtblCall__III_3C_3C_3C_3Z_3Z_7=
-
-XPCOM_VtblCall__III_3C_3C_3I=
-XPCOM_VtblCall__III_3C_3C_3I_0=
-XPCOM_VtblCall__III_3C_3C_3I_1=
-XPCOM_VtblCall__III_3C_3C_3I_2=
-XPCOM_VtblCall__III_3C_3C_3I_3=
-XPCOM_VtblCall__III_3C_3C_3I_4=
-XPCOM_VtblCall__III_3C_3C_3I_5=
-
-XPCOM_VtblCall__III_3C_3C_3I_3C_3Z_3Z=
-XPCOM_VtblCall__III_3C_3C_3I_3C_3Z_3Z_0=
-XPCOM_VtblCall__III_3C_3C_3I_3C_3Z_3Z_1=
-XPCOM_VtblCall__III_3C_3C_3I_3C_3Z_3Z_2=
-XPCOM_VtblCall__III_3C_3C_3I_3C_3Z_3Z_3=
-XPCOM_VtblCall__III_3C_3C_3I_3C_3Z_3Z_4=
-XPCOM_VtblCall__III_3C_3C_3I_3C_3Z_3Z_5=
-XPCOM_VtblCall__III_3C_3C_3I_3C_3Z_3Z_6=
-XPCOM_VtblCall__III_3C_3C_3I_3C_3Z_3Z_7=
-XPCOM_VtblCall__III_3C_3C_3I_3C_3Z_3Z_8=
-
-XPCOM_VtblCall__III_3C_3C_3I_3I_3C_3Z_3Z=
-XPCOM_VtblCall__III_3C_3C_3I_3I_3C_3Z_3Z_0=
-XPCOM_VtblCall__III_3C_3C_3I_3I_3C_3Z_3Z_1=
-XPCOM_VtblCall__III_3C_3C_3I_3I_3C_3Z_3Z_2=
-XPCOM_VtblCall__III_3C_3C_3I_3I_3C_3Z_3Z_3=
-XPCOM_VtblCall__III_3C_3C_3I_3I_3C_3Z_3Z_4=
-XPCOM_VtblCall__III_3C_3C_3I_3I_3C_3Z_3Z_5=
-XPCOM_VtblCall__III_3C_3C_3I_3I_3C_3Z_3Z_6=
-XPCOM_VtblCall__III_3C_3C_3I_3I_3C_3Z_3Z_7=
-XPCOM_VtblCall__III_3C_3C_3I_3I_3C_3Z_3Z_8=
-XPCOM_VtblCall__III_3C_3C_3I_3I_3C_3Z_3Z_9=
-
-XPCOM_VtblCall__III_3C_3C_3Z=
-XPCOM_VtblCall__III_3C_3C_3Z_0=
-XPCOM_VtblCall__III_3C_3C_3Z_1=
-XPCOM_VtblCall__III_3C_3C_3Z_2=
-XPCOM_VtblCall__III_3C_3C_3Z_3=
-XPCOM_VtblCall__III_3C_3C_3Z_4=
-XPCOM_VtblCall__III_3C_3C_3Z_5=
-
-XPCOM_VtblCall__III_3I=
-XPCOM_VtblCall__III_3I_0=
-XPCOM_VtblCall__III_3I_1=
-XPCOM_VtblCall__III_3I_2=
-XPCOM_VtblCall__III_3I_3=
-
-XPCOM_VtblCall__III_3I_3I_3I_3I=
-XPCOM_VtblCall__III_3I_3I_3I_3I_0=
-XPCOM_VtblCall__III_3I_3I_3I_3I_1=
-XPCOM_VtblCall__III_3I_3I_3I_3I_2=
-XPCOM_VtblCall__III_3I_3I_3I_3I_3=
-XPCOM_VtblCall__III_3I_3I_3I_3I_4=
-XPCOM_VtblCall__III_3I_3I_3I_3I_5=
-XPCOM_VtblCall__III_3I_3I_3I_3I_6=
-
-XPCOM_VtblCall__III_3Z=
-XPCOM_VtblCall__III_3Z_0=
-XPCOM_VtblCall__III_3Z_1=
-XPCOM_VtblCall__III_3Z_2=
-XPCOM_VtblCall__III_3Z_3=
-
-XPCOM_VtblCall__IIJ=
-XPCOM_VtblCall__IIJ_0=
-XPCOM_VtblCall__IIJ_1=
-XPCOM_VtblCall__IIJ_2=
-
-XPCOM_VtblCall__IIJI=
-XPCOM_VtblCall__IIJI_0=
-XPCOM_VtblCall__IIJI_1=
-XPCOM_VtblCall__IIJI_2=
-XPCOM_VtblCall__IIJI_3=
-
-XPCOM_VtblCall__IIJJ=
-XPCOM_VtblCall__IIJJ_0=
-XPCOM_VtblCall__IIJJ_1=
-XPCOM_VtblCall__IIJJ_2=
-XPCOM_VtblCall__IIJJ_3=
-
-XPCOM_VtblCall__IIJJI=
-XPCOM_VtblCall__IIJJI_0=
-XPCOM_VtblCall__IIJJI_1=
-XPCOM_VtblCall__IIJJI_2=
-XPCOM_VtblCall__IIJJI_3=
-XPCOM_VtblCall__IIJJI_4=
-
-XPCOM_VtblCall__IIJJJJJ=
-XPCOM_VtblCall__IIJJJJJ_0=
-XPCOM_VtblCall__IIJJJJJ_1=
-XPCOM_VtblCall__IIJJJJJ_2=
-XPCOM_VtblCall__IIJJJJJ_3=
-XPCOM_VtblCall__IIJJJJJ_4=
-XPCOM_VtblCall__IIJJJJJ_5=
-XPCOM_VtblCall__IIJJJJJ_6=
-
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I_0=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I_1=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I_2=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2I_3=
-
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_0=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_1=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_2=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_3=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_4=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2ILorg_eclipse_swt_internal_mozilla_nsID_2_3I_5=
-
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I_0=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I_1=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I_2=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I_3=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3I_4=
-
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3Z=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3Z_0=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3Z_1=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3Z_2=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3Z_3=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2Lorg_eclipse_swt_internal_mozilla_nsID_2_3Z_4=
-
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_0=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_1=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_2=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_4=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_5=
-
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_0=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_1=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_2=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_3=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_4=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_5=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_6=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3B_3BI_3B_3B_7=
-
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I_0=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I_1=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I_2=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3I_3=
-
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3Z=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3Z_0=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3Z_1=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3Z_2=
-XPCOM_VtblCall__IILorg_eclipse_swt_internal_mozilla_nsID_2_3Z_3=
-
-XPCOM_VtblCall__IIZ=
-XPCOM_VtblCall__IIZ_0=
-XPCOM_VtblCall__IIZ_1=
-XPCOM_VtblCall__IIZ_2=
-
-XPCOM_VtblCall__IIZI=
-XPCOM_VtblCall__IIZI_0=
-XPCOM_VtblCall__IIZI_1=
-XPCOM_VtblCall__IIZI_2=
-XPCOM_VtblCall__IIZI_3=
-
-XPCOM_VtblCall__IIZ_3Z=
-XPCOM_VtblCall__IIZ_3Z_0=
-XPCOM_VtblCall__IIZ_3Z_1=
-XPCOM_VtblCall__IIZ_3Z_2=
-XPCOM_VtblCall__IIZ_3Z_3=
-
-XPCOM_VtblCall__II_3B=
-XPCOM_VtblCall__II_3B_0=
-XPCOM_VtblCall__II_3B_1=
-XPCOM_VtblCall__II_3B_2=
-
-XPCOM_VtblCall__II_3BI=
-XPCOM_VtblCall__II_3BI_0=
-XPCOM_VtblCall__II_3BI_1=
-XPCOM_VtblCall__II_3BI_2=
-XPCOM_VtblCall__II_3BI_3=
-
-XPCOM_VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I=
-XPCOM_VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_0=
-XPCOM_VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_1=
-XPCOM_VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_2=
-XPCOM_VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_3=
-XPCOM_VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_4=
-XPCOM_VtblCall__II_3BILorg_eclipse_swt_internal_mozilla_nsID_2_3I_5=
-
-XPCOM_VtblCall__II_3BI_3I=
-XPCOM_VtblCall__II_3BI_3I_0=
-XPCOM_VtblCall__II_3BI_3I_1=
-XPCOM_VtblCall__II_3BI_3I_2=
-XPCOM_VtblCall__II_3BI_3I_3=
-XPCOM_VtblCall__II_3BI_3I_4=
-
-XPCOM_VtblCall__II_3BJ=
-XPCOM_VtblCall__II_3BJ_0=
-XPCOM_VtblCall__II_3BJ_1=
-XPCOM_VtblCall__II_3BJ_2=
-XPCOM_VtblCall__II_3BJ_3=
-
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I=
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_0=
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_1=
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_2=
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_3=
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2I_4=
-
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I=
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I_0=
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I_1=
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I_2=
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I_3=
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3I_4=
-
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3Z=
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3Z_0=
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3Z_1=
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3Z_2=
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3Z_3=
-XPCOM_VtblCall__II_3BLorg_eclipse_swt_internal_mozilla_nsID_2_3Z_4=
-
-XPCOM_VtblCall__II_3BZI_3I_3Z=
-XPCOM_VtblCall__II_3BZI_3I_3Z_0=
-XPCOM_VtblCall__II_3BZI_3I_3Z_1=
-XPCOM_VtblCall__II_3BZI_3I_3Z_2=
-XPCOM_VtblCall__II_3BZI_3I_3Z_3=
-XPCOM_VtblCall__II_3BZI_3I_3Z_4=
-XPCOM_VtblCall__II_3BZI_3I_3Z_5=
-XPCOM_VtblCall__II_3BZI_3I_3Z_6=
-
-XPCOM_VtblCall__II_3BZ_3I_3Z=
-XPCOM_VtblCall__II_3BZ_3I_3Z_0=
-XPCOM_VtblCall__II_3BZ_3I_3Z_1=
-XPCOM_VtblCall__II_3BZ_3I_3Z_2=
-XPCOM_VtblCall__II_3BZ_3I_3Z_3=
-XPCOM_VtblCall__II_3BZ_3I_3Z_4=
-XPCOM_VtblCall__II_3BZ_3I_3Z_5=
-
-XPCOM_VtblCall__II_3B_3B=
-XPCOM_VtblCall__II_3B_3B_0=
-XPCOM_VtblCall__II_3B_3B_1=
-XPCOM_VtblCall__II_3B_3B_2=
-XPCOM_VtblCall__II_3B_3B_3=
-
-XPCOM_VtblCall__II_3B_3BZ=
-XPCOM_VtblCall__II_3B_3BZ_0=
-XPCOM_VtblCall__II_3B_3BZ_1=
-XPCOM_VtblCall__II_3B_3BZ_2=
-XPCOM_VtblCall__II_3B_3BZ_3=
-XPCOM_VtblCall__II_3B_3BZ_4=
-
-XPCOM_VtblCall__II_3B_3B_3BZZ_3I=
-XPCOM_VtblCall__II_3B_3B_3BZZ_3I_0=
-XPCOM_VtblCall__II_3B_3B_3BZZ_3I_1=
-XPCOM_VtblCall__II_3B_3B_3BZZ_3I_2=
-XPCOM_VtblCall__II_3B_3B_3BZZ_3I_3=
-XPCOM_VtblCall__II_3B_3B_3BZZ_3I_4=
-XPCOM_VtblCall__II_3B_3B_3BZZ_3I_5=
-XPCOM_VtblCall__II_3B_3B_3BZZ_3I_6=
-XPCOM_VtblCall__II_3B_3B_3BZZ_3I_7=
-
-XPCOM_VtblCall__II_3B_3B_3I=
-XPCOM_VtblCall__II_3B_3B_3I_0=
-XPCOM_VtblCall__II_3B_3B_3I_1=
-XPCOM_VtblCall__II_3B_3B_3I_2=
-XPCOM_VtblCall__II_3B_3B_3I_3=
-XPCOM_VtblCall__II_3B_3B_3I_4=
-
-XPCOM_VtblCall__II_3B_3I=
-XPCOM_VtblCall__II_3B_3I_0=
-XPCOM_VtblCall__II_3B_3I_1=
-XPCOM_VtblCall__II_3B_3I_2=
-XPCOM_VtblCall__II_3B_3I_3=
-
-XPCOM_VtblCall__II_3B_3I_3I=
-XPCOM_VtblCall__II_3B_3I_3I_0=
-XPCOM_VtblCall__II_3B_3I_3I_1=
-XPCOM_VtblCall__II_3B_3I_3I_2=
-XPCOM_VtblCall__II_3B_3I_3I_3=
-XPCOM_VtblCall__II_3B_3I_3I_4=
-
-XPCOM_VtblCall__II_3B_3I_3Z=
-XPCOM_VtblCall__II_3B_3I_3Z_0=
-XPCOM_VtblCall__II_3B_3I_3Z_1=
-XPCOM_VtblCall__II_3B_3I_3Z_2=
-XPCOM_VtblCall__II_3B_3I_3Z_3=
-XPCOM_VtblCall__II_3B_3I_3Z_4=
-
-XPCOM_VtblCall__II_3B_3J=
-XPCOM_VtblCall__II_3B_3J_0=
-XPCOM_VtblCall__II_3B_3J_1=
-XPCOM_VtblCall__II_3B_3J_2=
-XPCOM_VtblCall__II_3B_3J_3=
-
-XPCOM_VtblCall__II_3B_3Z=
-XPCOM_VtblCall__II_3B_3Z_0=
-XPCOM_VtblCall__II_3B_3Z_1=
-XPCOM_VtblCall__II_3B_3Z_2=
-XPCOM_VtblCall__II_3B_3Z_3=
-
-XPCOM_VtblCall__II_3B_3Z_3I=
-XPCOM_VtblCall__II_3B_3Z_3I_0=
-XPCOM_VtblCall__II_3B_3Z_3I_1=
-XPCOM_VtblCall__II_3B_3Z_3I_2=
-XPCOM_VtblCall__II_3B_3Z_3I_3=
-XPCOM_VtblCall__II_3B_3Z_3I_4=
-
-XPCOM_VtblCall__II_3C=
-XPCOM_VtblCall__II_3C_0=
-XPCOM_VtblCall__II_3C_1=
-XPCOM_VtblCall__II_3C_2=
-
-XPCOM_VtblCall__II_3CIIII=
-XPCOM_VtblCall__II_3CIIII_0=
-XPCOM_VtblCall__II_3CIIII_1=
-XPCOM_VtblCall__II_3CIIII_2=
-XPCOM_VtblCall__II_3CIIII_3=
-XPCOM_VtblCall__II_3CIIII_4=
-XPCOM_VtblCall__II_3CIIII_5=
-XPCOM_VtblCall__II_3CIIII_6=
-
-XPCOM_VtblCall__II_3CI_3I=
-XPCOM_VtblCall__II_3CI_3I_0=
-XPCOM_VtblCall__II_3CI_3I_1=
-XPCOM_VtblCall__II_3CI_3I_2=
-XPCOM_VtblCall__II_3CI_3I_3=
-XPCOM_VtblCall__II_3CI_3I_4=
-
-XPCOM_VtblCall__II_3CZ=
-XPCOM_VtblCall__II_3CZ_0=
-XPCOM_VtblCall__II_3CZ_1=
-XPCOM_VtblCall__II_3CZ_2=
-XPCOM_VtblCall__II_3CZ_3=
-
-XPCOM_VtblCall__II_3C_3C=
-XPCOM_VtblCall__II_3C_3C_0=
-XPCOM_VtblCall__II_3C_3C_1=
-XPCOM_VtblCall__II_3C_3C_2=
-XPCOM_VtblCall__II_3C_3C_3=
-
-XPCOM_VtblCall__II_3C_3C_3CZ=
-XPCOM_VtblCall__II_3C_3C_3CZ_0=
-XPCOM_VtblCall__II_3C_3C_3CZ_1=
-XPCOM_VtblCall__II_3C_3C_3CZ_2=
-XPCOM_VtblCall__II_3C_3C_3CZ_3=
-XPCOM_VtblCall__II_3C_3C_3CZ_4=
-XPCOM_VtblCall__II_3C_3C_3CZ_5=
-
-XPCOM_VtblCall__II_3C_3Z=
-XPCOM_VtblCall__II_3C_3Z_0=
-XPCOM_VtblCall__II_3C_3Z_1=
-XPCOM_VtblCall__II_3C_3Z_2=
-XPCOM_VtblCall__II_3C_3Z_3=
-
-XPCOM_VtblCall__II_3F=
-XPCOM_VtblCall__II_3F_0=
-XPCOM_VtblCall__II_3F_1=
-XPCOM_VtblCall__II_3F_2=
-
-XPCOM_VtblCall__II_3I=
-XPCOM_VtblCall__II_3I_0=
-XPCOM_VtblCall__II_3I_1=
-XPCOM_VtblCall__II_3I_2=
-
-XPCOM_VtblCall__II_3I_3I=
-XPCOM_VtblCall__II_3I_3I_0=
-XPCOM_VtblCall__II_3I_3I_1=
-XPCOM_VtblCall__II_3I_3I_2=
-XPCOM_VtblCall__II_3I_3I_3=
-
-XPCOM_VtblCall__II_3I_3I_3I=
-XPCOM_VtblCall__II_3I_3I_3I_0=
-XPCOM_VtblCall__II_3I_3I_3I_1=
-XPCOM_VtblCall__II_3I_3I_3I_2=
-XPCOM_VtblCall__II_3I_3I_3I_3=
-XPCOM_VtblCall__II_3I_3I_3I_4=
-
-XPCOM_VtblCall__II_3I_3I_3I_3I=
-XPCOM_VtblCall__II_3I_3I_3I_3I_0=
-XPCOM_VtblCall__II_3I_3I_3I_3I_1=
-XPCOM_VtblCall__II_3I_3I_3I_3I_2=
-XPCOM_VtblCall__II_3I_3I_3I_3I_3=
-XPCOM_VtblCall__II_3I_3I_3I_3I_4=
-XPCOM_VtblCall__II_3I_3I_3I_3I_5=
-
-XPCOM_VtblCall__II_3I_3J=
-XPCOM_VtblCall__II_3I_3J_0=
-XPCOM_VtblCall__II_3I_3J_1=
-XPCOM_VtblCall__II_3I_3J_2=
-XPCOM_VtblCall__II_3I_3J_3=
-
-XPCOM_VtblCall__II_3I_3J_3I=
-XPCOM_VtblCall__II_3I_3J_3I_0=
-XPCOM_VtblCall__II_3I_3J_3I_1=
-XPCOM_VtblCall__II_3I_3J_3I_2=
-XPCOM_VtblCall__II_3I_3J_3I_3=
-XPCOM_VtblCall__II_3I_3J_3I_4=
-
-XPCOM_VtblCall__II_3J=
-XPCOM_VtblCall__II_3J_0=
-XPCOM_VtblCall__II_3J_1=
-XPCOM_VtblCall__II_3J_2=
-
-XPCOM_VtblCall__II_3S=
-XPCOM_VtblCall__II_3S_0=
-XPCOM_VtblCall__II_3S_1=
-XPCOM_VtblCall__II_3S_2=
-
-XPCOM_VtblCall__II_3Z=
-XPCOM_VtblCall__II_3Z_0=
-XPCOM_VtblCall__II_3Z_1=
-XPCOM_VtblCall__II_3Z_2=
-
-XPCOM_memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I=
-XPCOM_memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I_0=
-XPCOM_memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I_1=
-XPCOM_memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I_2=
-
-XPCOM_memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2II=
-XPCOM_memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2II_0=
-XPCOM_memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2II_1=
-XPCOM_memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2II_2=
-
-XPCOM_nsEmbedCString_Length=
-XPCOM_nsEmbedCString_Length_0=
-
-XPCOM_nsEmbedCString_delete=
-XPCOM_nsEmbedCString_delete_0=
-
-XPCOM_nsEmbedCString_get=
-XPCOM_nsEmbedCString_get_0=
-
-XPCOM_nsEmbedCString_1new__=
-
-XPCOM_nsEmbedCString_1new___3BI=
-XPCOM_nsEmbedCString_1new___3BI_0=
-XPCOM_nsEmbedCString_1new___3BI_1=
-
-XPCOM_nsEmbedString_Length=
-XPCOM_nsEmbedString_Length_0=
-
-XPCOM_nsEmbedString_delete=
-XPCOM_nsEmbedString_delete_0=
-
-XPCOM_nsEmbedString_get=
-XPCOM_nsEmbedString_get_0=
-
-XPCOM_nsEmbedString_1new__=
-
-XPCOM_nsEmbedString_1new___3C=
-XPCOM_nsEmbedString_1new___3C_0=
-
-XPCOM_nsID_Equals=
-XPCOM_nsID_Equals_0=
-XPCOM_nsID_Equals_1=
-
-XPCOM_nsID_Parse=
-XPCOM_nsID_Parse_0=
-XPCOM_nsID_Parse_1=
-
-XPCOM_nsID_delete=
-XPCOM_nsID_delete_0=
-
-XPCOM_nsID_new=
-
-XPCOM_strlen_PRUnichar=
-XPCOM_strlen_PRUnichar_0=
-
-
-org_eclipse_swt_internal_mozilla_XPCOMGlue=flags=cpp
-XPCOMGlue_XPCOMGlueShutdown=
-
-XPCOMGlue_XPCOMGlueStartup=
-XPCOMGlue_XPCOMGlueStartup_0=cast=(const char *)
-
-
-org_eclipse_swt_internal_mozilla_XPCOMInit=flags=no_gen
-XPCOMInit_GREVersionRange_sizeof=
-
-XPCOMInit_GRE_GetGREPathWithProperties=
-XPCOMInit_GRE_GetGREPathWithProperties_0=
-XPCOMInit_GRE_GetGREPathWithProperties_1=
-XPCOMInit_GRE_GetGREPathWithProperties_2=
-XPCOMInit_GRE_GetGREPathWithProperties_3=
-XPCOMInit_GRE_GetGREPathWithProperties_4=
-XPCOMInit_GRE_GetGREPathWithProperties_5=
-
-
-org_eclipse_swt_internal_mozilla_XPCOMObject=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsEmbedString=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIAppShell=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIBaseWindow=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsICancelable=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsICategoryManager=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIComponentManager=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIComponentRegistrar=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIContextMenuListener=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsICookie=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsICookieManager=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsID=flags=no_gen
-nsID_m0=
-nsID_m1=
-nsID_m2=
-nsID_m3=
-
-org_eclipse_swt_internal_mozilla_nsIDOMEvent=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIDOMMouseEvent=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIDOMUIEvent=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIDOMWindow=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIDirectoryService=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIDirectoryServiceProvider=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIDocShell=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIDownload=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIDownload_11_18=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIEmbeddingSiteWindow=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIFactory=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIFile=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIFilePicker=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIHelperAppLauncher=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIHelperAppLauncherDialog=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIHelperAppLauncher_11_18=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIIOService=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIInputStream=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIInterfaceRequestor=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIJSContextStack=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsILocalFile=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIMemory=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIObserverService=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIPrefBranch=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIPrefLocalizedString=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIPrefService=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIProgressDialog=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIProgressDialog_11_18=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIPromptService=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIProperties=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIRequest=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIServiceManager=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsISimpleEnumerator=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsISupports=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsISupportsWeakReference=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsITooltipListener=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsITransfer=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIURI=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIURIContentListener=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIWeakReference=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIWebBrowser=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIWebBrowserChrome=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIWebBrowserChromeFocus=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIWebBrowserFocus=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIWebBrowserStream=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIWebNavigation=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIWebProgress=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIWebProgressListener=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIWebProgressListener2=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIWindowCreator=flags=no_gen
-
-org_eclipse_swt_internal_mozilla_nsIWindowWatcher=flags=no_gen
-
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.properties b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.properties
index c2557079b2..44d04d8074 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.properties
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.properties
@@ -37,7 +37,6 @@ org.eclipse.swt.internal.gtk.GTK,../org.eclipse.swt/Eclipse SWT PI/motif_gtk/lib
 org.eclipse.swt.internal.gtk.OS,../org.eclipse.swt/Eclipse SWT PI/gtk/library/,\
 org.eclipse.swt.internal.motif.OS,../org.eclipse.swt/Eclipse SWT PI/motif/library/,\
 org.eclipse.swt.internal.mozilla.XPCOM,../org.eclipse.swt/Eclipse SWT Mozilla/common/library/,\
-org.eclipse.swt.internal.mozilla.XPCOMGlue,../org.eclipse.swt/Eclipse SWT Mozilla/common/library/,\
 org.eclipse.swt.internal.mozilla.XPCOMInit,../org.eclipse.swt/Eclipse SWT Mozilla/common/library/,\
 org.eclipse.swt.internal.ole.win32.COM,../org.eclipse.swt/Eclipse SWT PI/win32/library/,\
 org.eclipse.swt.internal.photon.OS,../org.eclipse.swt/Eclipse SWT PI/photon/library/,\
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp
index a00d3335ef..9d95d733c7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp
@@ -1930,6 +1930,34 @@ fail:
 }
 #endif
 
+#ifndef NO_XPCOMGlueShutdown
+JNIEXPORT jint JNICALL XPCOM_NATIVE(XPCOMGlueShutdown)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, XPCOMGlueShutdown_FUNC);
+	rc = (jint)XPCOMGlueShutdown();
+	XPCOM_NATIVE_EXIT(env, that, XPCOMGlueShutdown_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_XPCOMGlueStartup
+JNIEXPORT jint JNICALL XPCOM_NATIVE(XPCOMGlueStartup)
+	(JNIEnv *env, jclass that, jbyteArray arg0)
+{
+	jbyte *lparg0=NULL;
+	jint rc = 0;
+	XPCOM_NATIVE_ENTER(env, that, XPCOMGlueStartup_FUNC);
+	if (arg0) if ((lparg0 = env->GetByteArrayElements(arg0, NULL)) == NULL) goto fail;
+	rc = (jint)XPCOMGlueStartup((const char *)lparg0);
+fail:
+	if (arg0 && lparg0) env->ReleaseByteArrayElements(arg0, lparg0, 0);
+	XPCOM_NATIVE_EXIT(env, that, XPCOMGlueStartup_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I
 JNIEXPORT void JNICALL XPCOM_NATIVE(memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I)
 	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.h b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.h
index a143415574..bdb930d84e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.h
@@ -13,11 +13,13 @@
 #define INC_xpcom_H
 
 #define NDEBUG
+#define XPCOM_GLUE 1
 
 #include "nsXPCOM.h"
 #include "nsEmbedString.h"
 #include "nsIInputStream.h"
 #include "nsISupportsUtils.h"
+#include "nsXPCOMGlue.h"
 
 #ifdef _WIN32
 #define STDMETHODCALLTYPE __stdcall
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.cpp b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.cpp
index f5db4e2af8..adbee1ba26 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.cpp
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.cpp
@@ -14,8 +14,8 @@
 
 #ifdef NATIVE_STATS
 
-int XPCOM_nativeFunctionCount = 123;
-int XPCOM_nativeFunctionCallCount[123];
+int XPCOM_nativeFunctionCount = 125;
+int XPCOM_nativeFunctionCallCount[125];
 char * XPCOM_nativeFunctionNames[] = {
 	"Call",
 	"NS_1GetComponentManager",
@@ -124,6 +124,8 @@ char * XPCOM_nativeFunctionNames[] = {
 	"VtblCall__II_3J",
 	"VtblCall__II_3S",
 	"VtblCall__II_3Z",
+	"XPCOMGlueShutdown",
+	"XPCOMGlueStartup",
 	"memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I",
 	"memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2II",
 	"nsEmbedCString_1Length",
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.h b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.h
index a615c7580f..aedfc2d897 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.h
@@ -128,6 +128,8 @@ typedef enum {
 	VtblCall__II_3J_FUNC,
 	VtblCall__II_3S_FUNC,
 	VtblCall__II_3Z_FUNC,
+	XPCOMGlueShutdown_FUNC,
+	XPCOMGlueStartup_FUNC,
 	memmove__ILorg_eclipse_swt_internal_mozilla_nsID_2I_FUNC,
 	memmove__Lorg_eclipse_swt_internal_mozilla_nsID_2II_FUNC,
 	nsEmbedCString_1Length_FUNC,
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcomglue.cpp b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcomglue.cpp
deleted file mode 100644
index b5cc6c2c85..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcomglue.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-#include "swt.h"
-#include "xpcomglue_structs.h"
-#include "xpcomglue_stats.h"
-
-extern "C" {
-
-#define XPCOMGlue_NATIVE(func) Java_org_eclipse_swt_internal_mozilla_XPCOMGlue_##func
-
-#ifndef NO_XPCOMGlueShutdown
-JNIEXPORT jint JNICALL XPCOMGlue_NATIVE(XPCOMGlueShutdown)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	XPCOMGlue_NATIVE_ENTER(env, that, XPCOMGlueShutdown_FUNC);
-	rc = (jint)XPCOMGlueShutdown();
-	XPCOMGlue_NATIVE_EXIT(env, that, XPCOMGlueShutdown_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_XPCOMGlueStartup
-JNIEXPORT jint JNICALL XPCOMGlue_NATIVE(XPCOMGlueStartup)
-	(JNIEnv *env, jclass that, jbyteArray arg0)
-{
-	jbyte *lparg0=NULL;
-	jint rc = 0;
-	XPCOMGlue_NATIVE_ENTER(env, that, XPCOMGlueStartup_FUNC);
-	if (arg0) if ((lparg0 = env->GetByteArrayElements(arg0, NULL)) == NULL) goto fail;
-	rc = (jint)XPCOMGlueStartup((const char *)lparg0);
-fail:
-	if (arg0 && lparg0) env->ReleaseByteArrayElements(arg0, lparg0, 0);
-	XPCOMGlue_NATIVE_EXIT(env, that, XPCOMGlueStartup_FUNC);
-	return rc;
-}
-#endif
-
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcomglue.h b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcomglue.h
deleted file mode 100755
index 795a73b714..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcomglue.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-#ifndef INC_xpcomglue_H
-#define INC_xpcomglue_H
-
-#define NDEBUG
-
-#define XPCOM_GLUE 1
-#include "nsXPCOMGlue.h"
-
-#ifdef _WIN32
-#define STDMETHODCALLTYPE __stdcall
-#else
-#define STDMETHODCALLTYPE
-#endif
-
-#endif /* INC_xpcomglue_H */
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcomglue_stats.cpp b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcomglue_stats.cpp
deleted file mode 100644
index 21bf1c54e3..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcomglue_stats.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-#include "swt.h"
-#include "xpcomglue_stats.h"
-
-#ifdef NATIVE_STATS
-
-int XPCOMGlue_nativeFunctionCount = 2;
-int XPCOMGlue_nativeFunctionCallCount[2];
-char * XPCOMGlue_nativeFunctionNames[] = {
-	"XPCOMGlueShutdown",
-	"XPCOMGlueStartup",
-};
-
-#define STATS_NATIVE(func) Java_org_eclipse_swt_tools_internal_NativeStats_##func
-
-JNIEXPORT jint JNICALL STATS_NATIVE(XPCOMGlue_1GetFunctionCount)
-	(JNIEnv *env, jclass that)
-{
-	return XPCOMGlue_nativeFunctionCount;
-}
-
-JNIEXPORT jstring JNICALL STATS_NATIVE(XPCOMGlue_1GetFunctionName)
-	(JNIEnv *env, jclass that, jint index)
-{
-	return env->NewStringUTF(XPCOMGlue_nativeFunctionNames[index]);
-}
-
-JNIEXPORT jint JNICALL STATS_NATIVE(XPCOMGlue_1GetFunctionCallCount)
-	(JNIEnv *env, jclass that, jint index)
-{
-	return XPCOMGlue_nativeFunctionCallCount[index];
-}
-
-#endif
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcomglue_stats.h b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcomglue_stats.h
deleted file mode 100644
index fbb60eff47..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcomglue_stats.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-#ifdef NATIVE_STATS
-extern int XPCOMGlue_nativeFunctionCount;
-extern int XPCOMGlue_nativeFunctionCallCount[];
-extern char* XPCOMGlue_nativeFunctionNames[];
-#define XPCOMGlue_NATIVE_ENTER(env, that, func) XPCOMGlue_nativeFunctionCallCount[func]++;
-#define XPCOMGlue_NATIVE_EXIT(env, that, func) 
-#else
-#define XPCOMGlue_NATIVE_ENTER(env, that, func) 
-#define XPCOMGlue_NATIVE_EXIT(env, that, func) 
-#endif
-
-typedef enum {
-	XPCOMGlueShutdown_FUNC,
-	XPCOMGlueStartup_FUNC,
-} XPCOMGlue_FUNCS;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcomglue_structs.c b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcomglue_structs.c
deleted file mode 100644
index 93bca22515..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcomglue_structs.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-#include "swt.h"
-#include "xpcomglue_structs.h"
-
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcomglue_structs.h b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcomglue_structs.h
deleted file mode 100644
index 199835684c..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcomglue_structs.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-#include "xpcomglue.h"
-
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java
index 02a417cc26..dae8988310 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java
@@ -221,7 +221,7 @@ public void create (Composite parent, int style) {
 				}
 			}
 			byte[] path = MozillaDelegate.wcsToMbcs (null, mozillaPath, true);
-			int rc = XPCOMGlue.XPCOMGlueStartup (path);
+			int rc = XPCOM.XPCOMGlueStartup (path);
 			if (rc != XPCOM.NS_OK) {
 				browser.dispose ();
 				error (rc);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java
index 51b806ac75..50a7147e4b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java
@@ -120,6 +120,8 @@ public static final native int /*long*/ nsEmbedString_new(char[] aString);
 public static final native void nsEmbedString_delete(int /*long*/ ptr);
 public static final native int nsEmbedString_Length(int /*long*/ ptr);
 public static final native int /*long*/ nsEmbedString_get(int /*long*/ ptr);
+public static final native int XPCOMGlueStartup(byte[] place);
+public static final native int XPCOMGlueShutdown();
 
 public static final native int /*long*/ Call(int /*long*/ ptr, int /*long*/ aInStream, int /*long*/ aClosure, byte[] aFromSegment, int aToOffset, int aCount, int[] aWriteCount);
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOMGlue.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOMGlue.java
deleted file mode 100644
index 60d5f26ab1..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOMGlue.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation.  All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * -  Binding to permit interfacing between Mozilla and SWT
- * -  Copyright (C) 2003, 2006 IBM Corp.  All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class XPCOMGlue extends XPCOM {
-public static final native int XPCOMGlueStartup(byte[] place);
-public static final native int XPCOMGlueShutdown();
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak
index d63df25cf3..3c3b5d1beb 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak
@@ -78,6 +78,7 @@ MOZILLACFLAGS = -O \
 	-I$(JAVA_HOME)/include/linux \
 	${SWT_PTR_CFLAGS}
 MOZILLALIBS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic
+MOZILLAEXCLUDES = -DNO_XPCOMGlueShutdown -DNO_XPCOMGlueStartup
 	
 SWT_OBJECTS = swt.o c.o c_stats.o callback.o
 CDE_OBJECTS = swt.o cde.o cde_structs.o cde_stats.o
@@ -87,7 +88,7 @@ CAIRO_OBJECTS = swt.o cairo.o cairo_structs.o cairo_stats.o
 ATK_OBJECTS = swt.o atk.o atk_structs.o atk_custom.o atk_stats.o
 GNOME_OBJECTS = swt.o gnome.o gnome_structs.o gnome_stats.o
 MOZILLA_OBJECTS = swt.o xpcom.o xpcom_custom.o xpcom_structs.o xpcom_stats.o
-XULRUNNER_OBJECTS = swt.o xpcomxul.o xpcomxul_custom.o xpcomxul_structs.o xpcomxul_stats.o xpcomxulglue.o xpcomxulglue_stats.o
+XULRUNNER_OBJECTS = swt.o xpcomxul.o xpcomxul_custom.o xpcomxul_structs.o xpcomxul_stats.o
 XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o
 GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
 
@@ -209,7 +210,7 @@ $(MOZILLA_LIB): $(MOZILLA_OBJECTS)
 	$(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALIBS) ${MOZILLA_LIBS}
 
 xpcom.o: xpcom.cpp
-	$(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom.cpp
+	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom.cpp
 
 xpcom_structs.o: xpcom_structs.cpp
 	$(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom_structs.cpp
@@ -240,12 +241,6 @@ xpcomxul_custom.o: xpcom_custom.cpp
 xpcomxul_stats.o: xpcom_stats.cpp
 	$(CXX) -o xpcomxul_stats.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom_stats.cpp
 
-xpcomxulglue.o: xpcomglue.cpp
-	$(CXX) -o xpcomxulglue.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcomglue.cpp
-
-xpcomxulglue_stats.o: xpcomglue_stats.cpp
-	$(CXX) -o xpcomxulglue_stats.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcomglue_stats.cpp
-
 #
 # XPCOMInit lib
 #