Bug 559399 - [GTK] Remove unused functions, structures, constants

Change-Id: Iddd795f61c2d7d834719d70f72cab541a287c214
Signed-off-by: Nikita Nemkin <nikita@nemkin.ru>

21 files changed, 8 insertions, 1948 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.c b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.c
index e8b01dc460..e86daee16e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.c
@@ -92,16 +92,6 @@ JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1close_1path)
 }
 #endif
 
-#ifndef NO_cairo_1copy_1page
-JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1copy_1page)
-	(JNIEnv *env, jclass that, jlong arg0)
-{
-	Cairo_NATIVE_ENTER(env, that, cairo_1copy_1page_FUNC);
-	cairo_copy_page((cairo_t *)arg0);
-	Cairo_NATIVE_EXIT(env, that, cairo_1copy_1page_FUNC);
-}
-#endif
-
 #ifndef NO_cairo_1copy_1path
 JNIEXPORT jlong JNICALL Cairo_NATIVE(cairo_1copy_1path)
 	(JNIEnv *env, jclass that, jlong arg0)
@@ -279,18 +269,6 @@ fail:
 }
 #endif
 
-#ifndef NO_cairo_1get_1operator
-JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1get_1operator)
-	(JNIEnv *env, jclass that, jlong arg0)
-{
-	jint rc = 0;
-	Cairo_NATIVE_ENTER(env, that, cairo_1get_1operator_FUNC);
-	rc = (jint)cairo_get_operator((cairo_t *)arg0);
-	Cairo_NATIVE_EXIT(env, that, cairo_1get_1operator_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_cairo_1get_1source
 JNIEXPORT jlong JNICALL Cairo_NATIVE(cairo_1get_1source)
 	(JNIEnv *env, jclass that, jlong arg0)
@@ -443,26 +421,6 @@ JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1line_1to)
 }
 #endif
 
-#ifndef NO_cairo_1mask
-JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1mask)
-	(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
-{
-	Cairo_NATIVE_ENTER(env, that, cairo_1mask_FUNC);
-	cairo_mask((cairo_t *)arg0, (cairo_pattern_t *)arg1);
-	Cairo_NATIVE_EXIT(env, that, cairo_1mask_FUNC);
-}
-#endif
-
-#ifndef NO_cairo_1mask_1surface
-JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1mask_1surface)
-	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jdouble arg2, jdouble arg3)
-{
-	Cairo_NATIVE_ENTER(env, that, cairo_1mask_1surface_FUNC);
-	cairo_mask_surface((cairo_t *)arg0, (cairo_surface_t *)arg1, arg2, arg3);
-	Cairo_NATIVE_EXIT(env, that, cairo_1mask_1surface_FUNC);
-}
-#endif
-
 #ifndef NO_cairo_1matrix_1init
 JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1matrix_1init)
 	(JNIEnv *env, jclass that, jdoubleArray arg0, jdouble arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5, jdouble arg6)
@@ -491,34 +449,6 @@ fail:
 }
 #endif
 
-#ifndef NO_cairo_1matrix_1init_1rotate
-JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1matrix_1init_1rotate)
-	(JNIEnv *env, jclass that, jdoubleArray arg0, jdouble arg1)
-{
-	jdouble *lparg0=NULL;
-	Cairo_NATIVE_ENTER(env, that, cairo_1matrix_1init_1rotate_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetDoubleArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	cairo_matrix_init_rotate((cairo_matrix_t *)lparg0, arg1);
-fail:
-	if (arg0 && lparg0) (*env)->ReleaseDoubleArrayElements(env, arg0, lparg0, 0);
-	Cairo_NATIVE_EXIT(env, that, cairo_1matrix_1init_1rotate_FUNC);
-}
-#endif
-
-#ifndef NO_cairo_1matrix_1init_1scale
-JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1matrix_1init_1scale)
-	(JNIEnv *env, jclass that, jdoubleArray arg0, jdouble arg1, jdouble arg2)
-{
-	jdouble *lparg0=NULL;
-	Cairo_NATIVE_ENTER(env, that, cairo_1matrix_1init_1scale_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetDoubleArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	cairo_matrix_init_scale((cairo_matrix_t *)lparg0, arg1, arg2);
-fail:
-	if (arg0 && lparg0) (*env)->ReleaseDoubleArrayElements(env, arg0, lparg0, 0);
-	Cairo_NATIVE_EXIT(env, that, cairo_1matrix_1init_1scale_FUNC);
-}
-#endif
-
 #ifndef NO_cairo_1matrix_1invert
 JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1matrix_1invert)
 	(JNIEnv *env, jclass that, jdoubleArray arg0)
@@ -583,26 +513,6 @@ fail:
 }
 #endif
 
-#ifndef NO_cairo_1matrix_1transform_1distance
-JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1matrix_1transform_1distance)
-	(JNIEnv *env, jclass that, jdoubleArray arg0, jdoubleArray arg1, jdoubleArray arg2)
-{
-	jdouble *lparg0=NULL;
-	jdouble *lparg1=NULL;
-	jdouble *lparg2=NULL;
-	Cairo_NATIVE_ENTER(env, that, cairo_1matrix_1transform_1distance_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetDoubleArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	if (arg1) if ((lparg1 = (*env)->GetDoubleArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	if (arg2) if ((lparg2 = (*env)->GetDoubleArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	cairo_matrix_transform_distance((cairo_matrix_t *)lparg0, lparg1, lparg2);
-fail:
-	if (arg2 && lparg2) (*env)->ReleaseDoubleArrayElements(env, arg2, lparg2, 0);
-	if (arg1 && lparg1) (*env)->ReleaseDoubleArrayElements(env, arg1, lparg1, 0);
-	if (arg0 && lparg0) (*env)->ReleaseDoubleArrayElements(env, arg0, lparg0, 0);
-	Cairo_NATIVE_EXIT(env, that, cairo_1matrix_1transform_1distance_FUNC);
-}
-#endif
-
 #ifndef NO_cairo_1matrix_1transform_1point
 JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1matrix_1transform_1point)
 	(JNIEnv *env, jclass that, jdoubleArray arg0, jdoubleArray arg1, jdoubleArray arg2)
@@ -755,18 +665,6 @@ JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1pattern_1destroy)
 }
 #endif
 
-#ifndef NO_cairo_1pattern_1get_1extend
-JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1pattern_1get_1extend)
-	(JNIEnv *env, jclass that, jlong arg0)
-{
-	jint rc = 0;
-	Cairo_NATIVE_ENTER(env, that, cairo_1pattern_1get_1extend_FUNC);
-	rc = (jint)cairo_pattern_get_extend((cairo_pattern_t *)arg0);
-	Cairo_NATIVE_EXIT(env, that, cairo_1pattern_1get_1extend_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_cairo_1pattern_1set_1extend
 JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1pattern_1set_1extend)
 	(JNIEnv *env, jclass that, jlong arg0, jint arg1)
@@ -1090,16 +988,6 @@ JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1restore)
 }
 #endif
 
-#ifndef NO_cairo_1rotate
-JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1rotate)
-	(JNIEnv *env, jclass that, jlong arg0, jdouble arg1)
-{
-	Cairo_NATIVE_ENTER(env, that, cairo_1rotate_FUNC);
-	cairo_rotate((cairo_t *)arg0, arg1);
-	Cairo_NATIVE_EXIT(env, that, cairo_1rotate_FUNC);
-}
-#endif
-
 #ifndef NO_cairo_1save
 JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1save)
 	(JNIEnv *env, jclass that, jlong arg0)
@@ -1168,16 +1056,6 @@ JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1set_1fill_1rule)
 }
 #endif
 
-#ifndef NO_cairo_1set_1font_1face
-JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1set_1font_1face)
-	(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
-{
-	Cairo_NATIVE_ENTER(env, that, cairo_1set_1font_1face_FUNC);
-	cairo_set_font_face((cairo_t *)arg0, (cairo_font_face_t *)arg1);
-	Cairo_NATIVE_EXIT(env, that, cairo_1set_1font_1face_FUNC);
-}
-#endif
-
 #ifndef NO_cairo_1set_1font_1size
 JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1set_1font_1size)
 	(JNIEnv *env, jclass that, jlong arg0, jdouble arg1)
@@ -1322,18 +1200,6 @@ JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1stroke)
 }
 #endif
 
-#ifndef NO_cairo_1surface_1create_1similar
-JNIEXPORT jlong JNICALL Cairo_NATIVE(cairo_1surface_1create_1similar)
-	(JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3)
-{
-	jlong rc = 0;
-	Cairo_NATIVE_ENTER(env, that, cairo_1surface_1create_1similar_FUNC);
-	rc = (jlong)cairo_surface_create_similar((cairo_surface_t *)arg0, arg1, arg2, arg3);
-	Cairo_NATIVE_EXIT(env, that, cairo_1surface_1create_1similar_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_cairo_1surface_1destroy
 JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1surface_1destroy)
 	(JNIEnv *env, jclass that, jlong arg0)
@@ -1413,18 +1279,6 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1surface_1get_1type)
 }
 #endif
 
-#ifndef NO_cairo_1surface_1get_1user_1data
-JNIEXPORT jlong JNICALL Cairo_NATIVE(cairo_1surface_1get_1user_1data)
-	(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
-{
-	jlong rc = 0;
-	Cairo_NATIVE_ENTER(env, that, cairo_1surface_1get_1user_1data_FUNC);
-	rc = (jlong)cairo_surface_get_user_data((cairo_surface_t *)arg0, (cairo_user_data_key_t *)arg1);
-	Cairo_NATIVE_EXIT(env, that, cairo_1surface_1get_1user_1data_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_cairo_1surface_1mark_1dirty
 JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1surface_1mark_1dirty)
 	(JNIEnv *env, jclass that, jlong arg0)
@@ -1516,18 +1370,6 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1version)
 }
 #endif
 
-#ifndef NO_cairo_1xlib_1surface_1create
-JNIEXPORT jlong JNICALL Cairo_NATIVE(cairo_1xlib_1surface_1create)
-	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jint arg3, jint arg4)
-{
-	jlong rc = 0;
-	Cairo_NATIVE_ENTER(env, that, cairo_1xlib_1surface_1create_FUNC);
-	rc = (jlong)cairo_xlib_surface_create((Display *)arg0, (Drawable)arg1, (Visual *)arg2, arg3, arg4);
-	Cairo_NATIVE_EXIT(env, that, cairo_1xlib_1surface_1create_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_cairo_1xlib_1surface_1get_1height
 JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1xlib_1surface_1get_1height)
 	(JNIEnv *env, jclass that, jlong arg0)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.c
index cb3c3929dd..0da97d4f5b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.c
@@ -34,7 +34,6 @@ char * Cairo_nativeFunctionNames[] = {
 	"cairo_1arc_1negative",
 	"cairo_1clip",
 	"cairo_1close_1path",
-	"cairo_1copy_1page",
 	"cairo_1copy_1path",
 	"cairo_1copy_1path_1flat",
 	"cairo_1create",
@@ -50,7 +49,6 @@ char * Cairo_nativeFunctionNames[] = {
 	"cairo_1get_1fill_1rule",
 	"cairo_1get_1font_1face",
 	"cairo_1get_1matrix",
-	"cairo_1get_1operator",
 	"cairo_1get_1source",
 	"cairo_1get_1target",
 	"cairo_1get_1tolerance",
@@ -64,17 +62,12 @@ char * Cairo_nativeFunctionNames[] = {
 	"cairo_1in_1fill",
 	"cairo_1in_1stroke",
 	"cairo_1line_1to",
-	"cairo_1mask",
-	"cairo_1mask_1surface",
 	"cairo_1matrix_1init",
 	"cairo_1matrix_1init_1identity",
-	"cairo_1matrix_1init_1rotate",
-	"cairo_1matrix_1init_1scale",
 	"cairo_1matrix_1invert",
 	"cairo_1matrix_1multiply",
 	"cairo_1matrix_1rotate",
 	"cairo_1matrix_1scale",
-	"cairo_1matrix_1transform_1distance",
 	"cairo_1matrix_1transform_1point",
 	"cairo_1matrix_1translate",
 	"cairo_1move_1to",
@@ -88,7 +81,6 @@ char * Cairo_nativeFunctionNames[] = {
 	"cairo_1pattern_1create_1for_1surface",
 	"cairo_1pattern_1create_1linear",
 	"cairo_1pattern_1destroy",
-	"cairo_1pattern_1get_1extend",
 	"cairo_1pattern_1set_1extend",
 	"cairo_1pattern_1set_1filter",
 	"cairo_1pattern_1set_1matrix",
@@ -116,14 +108,12 @@ char * Cairo_nativeFunctionNames[] = {
 	"cairo_1region_1union_1rectangle",
 	"cairo_1reset_1clip",
 	"cairo_1restore",
-	"cairo_1rotate",
 	"cairo_1save",
 	"cairo_1scale",
 	"cairo_1select_1font_1face",
 	"cairo_1set_1antialias",
 	"cairo_1set_1dash",
 	"cairo_1set_1fill_1rule",
-	"cairo_1set_1font_1face",
 	"cairo_1set_1font_1size",
 	"cairo_1set_1line_1cap",
 	"cairo_1set_1line_1join",
@@ -138,14 +128,12 @@ char * Cairo_nativeFunctionNames[] = {
 	"cairo_1set_1tolerance",
 	"cairo_1show_1page",
 	"cairo_1stroke",
-	"cairo_1surface_1create_1similar",
 	"cairo_1surface_1destroy",
 	"cairo_1surface_1finish",
 	"cairo_1surface_1flush",
 	"cairo_1surface_1get_1content",
 	"cairo_1surface_1get_1device_1scale",
 	"cairo_1surface_1get_1type",
-	"cairo_1surface_1get_1user_1data",
 	"cairo_1surface_1mark_1dirty",
 	"cairo_1surface_1reference",
 	"cairo_1surface_1set_1device_1scale",
@@ -153,7 +141,6 @@ char * Cairo_nativeFunctionNames[] = {
 	"cairo_1translate",
 	"cairo_1user_1to_1device_1distance",
 	"cairo_1version",
-	"cairo_1xlib_1surface_1create",
 	"cairo_1xlib_1surface_1get_1height",
 	"cairo_1xlib_1surface_1get_1width",
 	"memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1data_1t_2JJ",
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.h
index 96ccf3bacd..f6a06da086 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.h
@@ -44,7 +44,6 @@ typedef enum {
 	cairo_1arc_1negative_FUNC,
 	cairo_1clip_FUNC,
 	cairo_1close_1path_FUNC,
-	cairo_1copy_1page_FUNC,
 	cairo_1copy_1path_FUNC,
 	cairo_1copy_1path_1flat_FUNC,
 	cairo_1create_FUNC,
@@ -60,7 +59,6 @@ typedef enum {
 	cairo_1get_1fill_1rule_FUNC,
 	cairo_1get_1font_1face_FUNC,
 	cairo_1get_1matrix_FUNC,
-	cairo_1get_1operator_FUNC,
 	cairo_1get_1source_FUNC,
 	cairo_1get_1target_FUNC,
 	cairo_1get_1tolerance_FUNC,
@@ -74,17 +72,12 @@ typedef enum {
 	cairo_1in_1fill_FUNC,
 	cairo_1in_1stroke_FUNC,
 	cairo_1line_1to_FUNC,
-	cairo_1mask_FUNC,
-	cairo_1mask_1surface_FUNC,
 	cairo_1matrix_1init_FUNC,
 	cairo_1matrix_1init_1identity_FUNC,
-	cairo_1matrix_1init_1rotate_FUNC,
-	cairo_1matrix_1init_1scale_FUNC,
 	cairo_1matrix_1invert_FUNC,
 	cairo_1matrix_1multiply_FUNC,
 	cairo_1matrix_1rotate_FUNC,
 	cairo_1matrix_1scale_FUNC,
-	cairo_1matrix_1transform_1distance_FUNC,
 	cairo_1matrix_1transform_1point_FUNC,
 	cairo_1matrix_1translate_FUNC,
 	cairo_1move_1to_FUNC,
@@ -98,7 +91,6 @@ typedef enum {
 	cairo_1pattern_1create_1for_1surface_FUNC,
 	cairo_1pattern_1create_1linear_FUNC,
 	cairo_1pattern_1destroy_FUNC,
-	cairo_1pattern_1get_1extend_FUNC,
 	cairo_1pattern_1set_1extend_FUNC,
 	cairo_1pattern_1set_1filter_FUNC,
 	cairo_1pattern_1set_1matrix_FUNC,
@@ -126,14 +118,12 @@ typedef enum {
 	cairo_1region_1union_1rectangle_FUNC,
 	cairo_1reset_1clip_FUNC,
 	cairo_1restore_FUNC,
-	cairo_1rotate_FUNC,
 	cairo_1save_FUNC,
 	cairo_1scale_FUNC,
 	cairo_1select_1font_1face_FUNC,
 	cairo_1set_1antialias_FUNC,
 	cairo_1set_1dash_FUNC,
 	cairo_1set_1fill_1rule_FUNC,
-	cairo_1set_1font_1face_FUNC,
 	cairo_1set_1font_1size_FUNC,
 	cairo_1set_1line_1cap_FUNC,
 	cairo_1set_1line_1join_FUNC,
@@ -148,14 +138,12 @@ typedef enum {
 	cairo_1set_1tolerance_FUNC,
 	cairo_1show_1page_FUNC,
 	cairo_1stroke_FUNC,
-	cairo_1surface_1create_1similar_FUNC,
 	cairo_1surface_1destroy_FUNC,
 	cairo_1surface_1finish_FUNC,
 	cairo_1surface_1flush_FUNC,
 	cairo_1surface_1get_1content_FUNC,
 	cairo_1surface_1get_1device_1scale_FUNC,
 	cairo_1surface_1get_1type_FUNC,
-	cairo_1surface_1get_1user_1data_FUNC,
 	cairo_1surface_1mark_1dirty_FUNC,
 	cairo_1surface_1reference_FUNC,
 	cairo_1surface_1set_1device_1scale_FUNC,
@@ -163,7 +151,6 @@ typedef enum {
 	cairo_1translate_FUNC,
 	cairo_1user_1to_1device_1distance_FUNC,
 	cairo_1version_FUNC,
-	cairo_1xlib_1surface_1create_FUNC,
 	cairo_1xlib_1surface_1get_1height_FUNC,
 	cairo_1xlib_1surface_1get_1width_FUNC,
 	memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1data_1t_2JJ_FUNC,
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/Cairo.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/Cairo.java
index aaa1fe06d1..19ee94d0de 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/Cairo.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/Cairo.java
@@ -56,28 +56,11 @@ public class Cairo extends Platform {
 	public static final int CAIRO_FONT_SLANT_OBLIQUE = 2;
 	public static final int CAIRO_FONT_WEIGHT_NORMAL = 0;
 	public static final int CAIRO_FONT_WEIGHT_BOLD = 1;
-	public static final int CAIRO_STATUS_SUCCESS = 0;
-	public static final int CAIRO_STATUS_NO_MEMORY = 1;
-	public static final int CAIRO_STATUS_INVALID_RESTORE = 2;
-	public static final int CAIRO_STATUS_INVALID_POP_GROUP = 3;
-	public static final int CAIRO_STATUS_NO_CURRENT_POINT = 4;
-	public static final int CAIRO_STATUS_INVALID_MATRIX = 5;
-	public static final int CAIRO_STATUS_NO_TARGET_SURFACE = 6;
-	public static final int CAIRO_STATUS_NULL_POINTER =7;
 	public static final int CAIRO_SURFACE_TYPE_IMAGE = 0;
 	public static final int CAIRO_SURFACE_TYPE_PDF = 1;
 	public static final int CAIRO_SURFACE_TYPE_PS = 2;
 	public static final int CAIRO_SURFACE_TYPE_XLIB = 3;
-	public static final int CAIRO_SURFACE_TYPE_XCB = 4;
-	public static final int CAIRO_SURFACE_TYPE_GLITZ = 5;
-	public static final int CAIRO_SURFACE_TYPE_QUARTZ = 6;
-	public static final int CAIRO_SURFACE_TYPE_WIN32 = 7;
-	public static final int CAIRO_SURFACE_TYPE_BEOS = 8;
-	public static final int CAIRO_SURFACE_TYPE_DIRECTFB = 9;
-	public static final int CAIRO_SURFACE_TYPE_SVG = 10;
-	public static final int CAIRO_REGION_OVERLAP_IN = 0;
 	public static final int CAIRO_REGION_OVERLAP_OUT = 1;
-	public static final int CAIRO_REGION_OVERLAP_PART = 2;
 	public static final int CAIRO_FILTER_FAST = 0;
 	public static final int CAIRO_FILTER_GOOD = 1;
 	public static final int CAIRO_FILTER_BEST = 2;
@@ -114,8 +97,6 @@ public static final native void cairo_clip(long cr);
 /** @param cr cast=(cairo_t *) */
 public static final native void cairo_close_path(long cr);
 /** @param cr cast=(cairo_t *) */
-public static final native void cairo_copy_page(long cr);
-/** @param cr cast=(cairo_t *) */
 public static final native long cairo_copy_path(long cr);
 /** @param cr cast=(cairo_t *) */
 public static final native long cairo_copy_path_flat(long cr);
@@ -148,8 +129,6 @@ public static final native long cairo_get_font_face(long cr);
  */
 public static final native void cairo_get_matrix(long cr, double[] matrix);
 /** @param cr cast=(cairo_t *) */
-public static final native int cairo_get_operator(long cr);
-/** @param cr cast=(cairo_t *) */
 public static final native long cairo_get_source(long cr);
 /** @param cr cast=(cairo_t *) */
 public static final native long cairo_get_target(long cr);
@@ -180,25 +159,11 @@ public static final native int cairo_in_fill(long cr, double x, double y);
 public static final native int cairo_in_stroke(long cr, double x, double y);
 /** @param cr cast=(cairo_t *) */
 public static final native void cairo_line_to(long cr, double x, double y);
-/**
- * @param cr cast=(cairo_t *)
- * @param pattern cast=(cairo_pattern_t *)
- */
-public static final native void cairo_mask(long cr, long pattern);
-/**
- * @param cr cast=(cairo_t *)
- * @param surface cast=(cairo_surface_t *)
- */
-public static final native void cairo_mask_surface(long cr, long surface, double surface_x, double surface_y);
 /** @param matrix cast=(cairo_matrix_t *) */
 public static final native void cairo_matrix_init(double[] matrix, double xx, double yx, double xy, double yy, double x0, double y0);
 /** @param matrix cast=(cairo_matrix_t *) */
 public static final native void cairo_matrix_init_identity(double[] matrix);
 /** @param matrix cast=(cairo_matrix_t *) */
-public static final native void cairo_matrix_init_rotate(double[] matrix, double radians);
-/** @param matrix cast=(cairo_matrix_t *) */
-public static final native void cairo_matrix_init_scale(double[] matrix, double sx, double sy);
-/** @param matrix cast=(cairo_matrix_t *) */
 public static final native int cairo_matrix_invert(double[] matrix);
 /**
  * @param result cast=(cairo_matrix_t *)
@@ -211,8 +176,6 @@ public static final native void cairo_matrix_rotate(double[] matrix, double radi
 /** @param matrix cast=(cairo_matrix_t *) */
 public static final native void cairo_matrix_scale(double[] matrix, double sx, double sy);
 /** @param matrix cast=(cairo_matrix_t *) */
-public static final native void cairo_matrix_transform_distance(double[] matrix, double[] dx, double[] dy);
-/** @param matrix cast=(cairo_matrix_t *) */
 public static final native void cairo_matrix_transform_point(double[] matrix, double[] x, double[] y);
 /** @param matrix cast=(cairo_matrix_t *) */
 public static final native void cairo_matrix_translate(double[] matrix, double tx, double ty);
@@ -234,8 +197,6 @@ public static final native long cairo_pattern_create_linear(double x0, double y0
 /** @param pattern cast=(cairo_pattern_t *) */
 public static final native void cairo_pattern_destroy(long pattern);
 /** @param pattern cast=(cairo_pattern_t *) */
-public static final native int cairo_pattern_get_extend(long pattern);
-/** @param pattern cast=(cairo_pattern_t *) */
 public static final native void cairo_pattern_set_extend(long pattern, int extend);
 /** @param pattern cast=(cairo_pattern_t *) */
 public static final native void cairo_pattern_set_filter(long pattern, int filter);
@@ -271,8 +232,6 @@ public static final native void cairo_reset_clip(long cr);
 /** @param cr cast=(cairo_t *) */
 public static final native void cairo_restore(long cr);
 /** @param cr cast=(cairo_t *) */
-public static final native void cairo_rotate(long cr, double angle);
-/** @param cr cast=(cairo_t *) */
 public static final native void cairo_save(long cr);
 /** @param cr cast=(cairo_t *) */
 public static final native void cairo_scale(long cr, double sx, double sy);
@@ -299,11 +258,6 @@ public static final native void cairo_set_antialias(long cr, int antialias);
 public static final native void cairo_set_dash(long cr, double[] dashes, int ndash, double offset);
 /** @param cr cast=(cairo_t *) */
 public static final native void cairo_set_fill_rule(long cr, int fill_rule);
-/**
- * @param cr cast=(cairo_t *)
- * @param font_face cast=(cairo_font_face_t *)
- */
-public static final native void cairo_set_font_face(long cr, long font_face);
 /** @param cr cast=(cairo_t *) */
 public static final native void cairo_set_font_size(long cr, double size);
 /** @param cr cast=(cairo_t *) */
@@ -341,8 +295,6 @@ public static final native void cairo_set_tolerance(long cr, double tolerance);
 public static final native void cairo_show_page(long cr);
 /** @param cr cast=(cairo_t *) */
 public static final native void cairo_stroke(long cr);
-/** @param other cast=(cairo_surface_t *) */
-public static final native long cairo_surface_create_similar(long other, int format, int width, int height);
 /** @param surface cast=(cairo_surface_t *) */
 public static final native void cairo_surface_destroy(long surface);
 /** @param surface cast=(cairo_surface_t *) */
@@ -357,11 +309,6 @@ public static final native int cairo_surface_get_type(long surface);
  * @param surface cast=(cairo_surface_t *)
  */
 public static final native int cairo_surface_get_content(long surface);
-/**
- * @param surface cast=(cairo_surface_t *)
- * @param key cast=(cairo_user_data_key_t *)
- */
-public static final native long cairo_surface_get_user_data(long surface, long key);
 /** @param surface cast=(cairo_surface_t *) */
 public static final native void cairo_surface_mark_dirty(long surface);
 /** @param surface cast=(cairo_surface_t *) */
@@ -376,13 +323,6 @@ public static final native void cairo_translate(long cr, double tx, double ty);
 /** @param cr cast=(cairo_t *) */
 public static final native void cairo_user_to_device_distance(long cr, double[] dx, double[] dy);
 public static final native int cairo_version();
-
-/**
- * @param dpy cast=(Display *)
- * @param drawable cast=(Drawable)
- * @param visual cast=(Visual *)
- */
-public static final native long cairo_xlib_surface_create(long dpy, long drawable, long visual, int width, int height);
 /**
  * @method flags=dynamic
  * @param surface cast=(cairo_surface_t *)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk.c
index 9a840931ff..59dd9142f0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk.c
@@ -156,18 +156,6 @@ JNIEXPORT jlong JNICALL ATK_NATIVE(ATK_1TYPE_1HYPERTEXT)
 }
 #endif
 
-#ifndef NO_ATK_1TYPE_1OBJECT_1FACTORY
-JNIEXPORT jlong JNICALL ATK_NATIVE(ATK_1TYPE_1OBJECT_1FACTORY)
-	(JNIEnv *env, jclass that)
-{
-	jlong rc = 0;
-	ATK_NATIVE_ENTER(env, that, ATK_1TYPE_1OBJECT_1FACTORY_FUNC);
-	rc = (jlong)ATK_TYPE_OBJECT_FACTORY;
-	ATK_NATIVE_EXIT(env, that, ATK_1TYPE_1OBJECT_1FACTORY_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_ATK_1TYPE_1SELECTION
 JNIEXPORT jlong JNICALL ATK_NATIVE(ATK_1TYPE_1SELECTION)
 	(JNIEnv *env, jclass that)
@@ -264,18 +252,6 @@ JNIEXPORT jint JNICALL ATK_NATIVE(AtkTextRectangle_1sizeof)
 }
 #endif
 
-#ifndef NO__1ATK_1OBJECT_1FACTORY_1CLASS
-JNIEXPORT jlong JNICALL ATK_NATIVE(_1ATK_1OBJECT_1FACTORY_1CLASS)
-	(JNIEnv *env, jclass that, jlong arg0)
-{
-	jlong rc = 0;
-	ATK_NATIVE_ENTER(env, that, _1ATK_1OBJECT_1FACTORY_1CLASS_FUNC);
-	rc = (jlong)ATK_OBJECT_FACTORY_CLASS(arg0);
-	ATK_NATIVE_EXIT(env, that, _1ATK_1OBJECT_1FACTORY_1CLASS_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_atk_1object_1add_1relationship
 JNIEXPORT jboolean JNICALL ATK_NATIVE(atk_1object_1add_1relationship)
 	(JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2)
@@ -394,16 +370,6 @@ JNIEXPORT jlong JNICALL ATK_NATIVE(call__JJJJJJ)
 }
 #endif
 
-#ifndef NO_memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2
-JNIEXPORT void JNICALL ATK_NATIVE(memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2)
-	(JNIEnv *env, jclass that, jlong arg0, jobject arg1)
-{
-	ATK_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2_FUNC);
-	if (arg1) getAtkActionIfaceFields(env, arg1, (AtkActionIface *)arg0);
-	ATK_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2_FUNC);
-}
-#endif
-
 #ifndef NO_memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2I
 JNIEXPORT void JNICALL ATK_NATIVE(memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2I)
 	(JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2)
@@ -417,76 +383,6 @@ fail:
 }
 #endif
 
-#ifndef NO_memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2
-JNIEXPORT void JNICALL ATK_NATIVE(memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2)
-	(JNIEnv *env, jclass that, jlong arg0, jobject arg1)
-{
-	ATK_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2_FUNC);
-	if (arg1) getAtkComponentIfaceFields(env, arg1, (AtkComponentIface *)arg0);
-	ATK_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2_FUNC);
-}
-#endif
-
-#ifndef NO_memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkEditableTextIface_2
-JNIEXPORT void JNICALL ATK_NATIVE(memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkEditableTextIface_2)
-	(JNIEnv *env, jclass that, jlong arg0, jobject arg1)
-{
-	ATK_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkEditableTextIface_2_FUNC);
-	if (arg1) getAtkEditableTextIfaceFields(env, arg1, (AtkEditableTextIface *)arg0);
-	ATK_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkEditableTextIface_2_FUNC);
-}
-#endif
-
-#ifndef NO_memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2
-JNIEXPORT void JNICALL ATK_NATIVE(memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2)
-	(JNIEnv *env, jclass that, jlong arg0, jobject arg1)
-{
-	ATK_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2_FUNC);
-	if (arg1) getAtkHypertextIfaceFields(env, arg1, (AtkHypertextIface *)arg0);
-	ATK_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2_FUNC);
-}
-#endif
-
-#ifndef NO_memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2
-JNIEXPORT void JNICALL ATK_NATIVE(memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2)
-	(JNIEnv *env, jclass that, jlong arg0, jobject arg1)
-{
-	ATK_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2_FUNC);
-	if (arg1) getAtkObjectClassFields(env, arg1, (AtkObjectClass *)arg0);
-	ATK_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2_FUNC);
-}
-#endif
-
-#ifndef NO_memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2
-JNIEXPORT void JNICALL ATK_NATIVE(memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2)
-	(JNIEnv *env, jclass that, jlong arg0, jobject arg1)
-{
-	ATK_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2_FUNC);
-	if (arg1) getAtkSelectionIfaceFields(env, arg1, (AtkSelectionIface *)arg0);
-	ATK_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2_FUNC);
-}
-#endif
-
-#ifndef NO_memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2
-JNIEXPORT void JNICALL ATK_NATIVE(memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2)
-	(JNIEnv *env, jclass that, jlong arg0, jobject arg1)
-{
-	ATK_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2_FUNC);
-	if (arg1) getAtkTableIfaceFields(env, arg1, (AtkTableIface *)arg0);
-	ATK_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2_FUNC);
-}
-#endif
-
-#ifndef NO_memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2
-JNIEXPORT void JNICALL ATK_NATIVE(memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2)
-	(JNIEnv *env, jclass that, jlong arg0, jobject arg1)
-{
-	ATK_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2_FUNC);
-	if (arg1) getAtkTextIfaceFields(env, arg1, (AtkTextIface *)arg0);
-	ATK_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2_FUNC);
-}
-#endif
-
 #ifndef NO_memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2I
 JNIEXPORT void JNICALL ATK_NATIVE(memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2I)
 	(JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2)
@@ -513,16 +409,6 @@ fail:
 }
 #endif
 
-#ifndef NO_memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2
-JNIEXPORT void JNICALL ATK_NATIVE(memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2)
-	(JNIEnv *env, jclass that, jlong arg0, jobject arg1)
-{
-	ATK_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2_FUNC);
-	if (arg1) getAtkValueIfaceFields(env, arg1, (AtkValueIface *)arg0);
-	ATK_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2_FUNC);
-}
-#endif
-
 #ifndef NO_memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2J
 JNIEXPORT void JNICALL ATK_NATIVE(memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2J)
 	(JNIEnv *env, jclass that, jobject arg0, jlong arg1)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_stats.c
index 836955255d..8b66939328 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_stats.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_stats.c
@@ -33,7 +33,6 @@ char * ATK_nativeFunctionNames[] = {
 	"ATK_1TYPE_1COMPONENT",
 	"ATK_1TYPE_1EDITABLE_1TEXT",
 	"ATK_1TYPE_1HYPERTEXT",
-	"ATK_1TYPE_1OBJECT_1FACTORY",
 	"ATK_1TYPE_1SELECTION",
 	"ATK_1TYPE_1TABLE",
 	"ATK_1TYPE_1TEXT",
@@ -42,7 +41,6 @@ char * ATK_nativeFunctionNames[] = {
 	"AtkAttribute_1sizeof",
 	"AtkTextRange_1sizeof",
 	"AtkTextRectangle_1sizeof",
-	"_1ATK_1OBJECT_1FACTORY_1CLASS",
 	"atk_1object_1add_1relationship",
 	"atk_1object_1notify_1state_1change",
 	"atk_1object_1remove_1relationship",
@@ -53,18 +51,9 @@ char * ATK_nativeFunctionNames[] = {
 	"call__JJJ",
 	"call__JJJJ",
 	"call__JJJJJJ",
-	"memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2",
 	"memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2I",
-	"memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2",
-	"memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkEditableTextIface_2",
-	"memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2",
-	"memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2",
-	"memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2",
-	"memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2",
-	"memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2",
 	"memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2I",
 	"memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextRectangle_2I",
-	"memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2",
 	"memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2J",
 	"memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2JI",
 	"memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2J",
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_stats.h
index 8b85cd0193..fbb4bb3621 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_stats.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_stats.h
@@ -43,7 +43,6 @@ typedef enum {
 	ATK_1TYPE_1COMPONENT_FUNC,
 	ATK_1TYPE_1EDITABLE_1TEXT_FUNC,
 	ATK_1TYPE_1HYPERTEXT_FUNC,
-	ATK_1TYPE_1OBJECT_1FACTORY_FUNC,
 	ATK_1TYPE_1SELECTION_FUNC,
 	ATK_1TYPE_1TABLE_FUNC,
 	ATK_1TYPE_1TEXT_FUNC,
@@ -52,7 +51,6 @@ typedef enum {
 	AtkAttribute_1sizeof_FUNC,
 	AtkTextRange_1sizeof_FUNC,
 	AtkTextRectangle_1sizeof_FUNC,
-	_1ATK_1OBJECT_1FACTORY_1CLASS_FUNC,
 	atk_1object_1add_1relationship_FUNC,
 	atk_1object_1notify_1state_1change_FUNC,
 	atk_1object_1remove_1relationship_FUNC,
@@ -63,18 +61,9 @@ typedef enum {
 	call__JJJ_FUNC,
 	call__JJJJ_FUNC,
 	call__JJJJJJ_FUNC,
-	memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2_FUNC,
 	memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2I_FUNC,
-	memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2_FUNC,
-	memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkEditableTextIface_2_FUNC,
-	memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkHypertextIface_2_FUNC,
-	memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkObjectClass_2_FUNC,
-	memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkSelectionIface_2_FUNC,
-	memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTableIface_2_FUNC,
-	memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextIface_2_FUNC,
 	memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextRange_2I_FUNC,
 	memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkTextRectangle_2I_FUNC,
-	memmove__JLorg_eclipse_swt_internal_accessibility_gtk_AtkValueIface_2_FUNC,
 	memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkActionIface_2J_FUNC,
 	memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkAttribute_2JI_FUNC,
 	memmove__Lorg_eclipse_swt_internal_accessibility_gtk_AtkComponentIface_2J_FUNC,
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
index 225cdc4abc..6d71be3447 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
@@ -1453,26 +1453,6 @@ JNIEXPORT jint JNICALL GDK_NATIVE(gdk_1monitor_1get_1scale_1factor)
 }
 #endif
 
-#ifndef NO_gdk_1monitor_1get_1width_1mm
-JNIEXPORT jint JNICALL GDK_NATIVE(gdk_1monitor_1get_1width_1mm)
-	(JNIEnv *env, jclass that, jlong arg0)
-{
-	jint rc = 0;
-	GDK_NATIVE_ENTER(env, that, gdk_1monitor_1get_1width_1mm_FUNC);
-/*
-	rc = (jint)gdk_monitor_get_width_mm(arg0);
-*/
-	{
-		GDK_LOAD_FUNCTION(fp, gdk_monitor_get_width_mm)
-		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(jlong))fp)(arg0);
-		}
-	}
-	GDK_NATIVE_EXIT(env, that, gdk_1monitor_1get_1width_1mm_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_gdk_1monitor_1get_1workarea
 JNIEXPORT void JNICALL GDK_NATIVE(gdk_1monitor_1get_1workarea)
 	(JNIEnv *env, jclass that, jlong arg0, jobject arg1)
@@ -1649,18 +1629,6 @@ JNIEXPORT jint JNICALL GDK_NATIVE(gdk_1pixbuf_1get_1bits_1per_1sample)
 }
 #endif
 
-#ifndef NO_gdk_1pixbuf_1get_1byte_1length
-JNIEXPORT jlong JNICALL GDK_NATIVE(gdk_1pixbuf_1get_1byte_1length)
-	(JNIEnv *env, jclass that, jlong arg0)
-{
-	jlong rc = 0;
-	GDK_NATIVE_ENTER(env, that, gdk_1pixbuf_1get_1byte_1length_FUNC);
-	rc = (jlong)gdk_pixbuf_get_byte_length((const GdkPixbuf *)arg0);
-	GDK_NATIVE_EXIT(env, that, gdk_1pixbuf_1get_1byte_1length_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_gdk_1pixbuf_1get_1from_1window
 JNIEXPORT jlong JNICALL GDK_NATIVE(gdk_1pixbuf_1get_1from_1window)
 	(JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3, jint arg4)
@@ -1946,22 +1914,6 @@ JNIEXPORT void JNICALL GDK_NATIVE(gdk_1rgba_1free)
 }
 #endif
 
-#ifndef NO_gdk_1rgba_1hash
-JNIEXPORT jint JNICALL GDK_NATIVE(gdk_1rgba_1hash)
-	(JNIEnv *env, jclass that, jobject arg0)
-{
-	GdkRGBA _arg0, *lparg0=NULL;
-	jint rc = 0;
-	GDK_NATIVE_ENTER(env, that, gdk_1rgba_1hash_FUNC);
-	if (arg0) if ((lparg0 = getGdkRGBAFields(env, arg0, &_arg0)) == NULL) goto fail;
-	rc = (jint)gdk_rgba_hash((GdkRGBA *)lparg0);
-fail:
-	if (arg0 && lparg0) setGdkRGBAFields(env, arg0, lparg0);
-	GDK_NATIVE_EXIT(env, that, gdk_1rgba_1hash_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_gdk_1rgba_1parse
 JNIEXPORT jlong JNICALL GDK_NATIVE(gdk_1rgba_1parse)
 	(JNIEnv *env, jclass that, jobject arg0, jbyteArray arg1)
@@ -3357,26 +3309,6 @@ JNIEXPORT jlong JNICALL GDK_NATIVE(gdk_1x11_1surface_1lookup_1for_1display)
 }
 #endif
 
-#ifndef NO_gdk_1x11_1visual_1get_1xvisual
-JNIEXPORT jlong JNICALL GDK_NATIVE(gdk_1x11_1visual_1get_1xvisual)
-	(JNIEnv *env, jclass that, jlong arg0)
-{
-	jlong rc = 0;
-	GDK_NATIVE_ENTER(env, that, gdk_1x11_1visual_1get_1xvisual_FUNC);
-/*
-	rc = (jlong)gdk_x11_visual_get_xvisual(arg0);
-*/
-	{
-		GDK_LOAD_FUNCTION(fp, gdk_x11_visual_get_xvisual)
-		if (fp) {
-			rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0);
-		}
-	}
-	GDK_NATIVE_EXIT(env, that, gdk_1x11_1visual_1get_1xvisual_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_gdk_1x11_1window_1get_1xid
 JNIEXPORT jlong JNICALL GDK_NATIVE(gdk_1x11_1window_1get_1xid)
 	(JNIEnv *env, jclass that, jlong arg0)
@@ -3813,18 +3745,6 @@ JNIEXPORT jint JNICALL GTK_NATIVE(GtkTreeIter_1sizeof)
 }
 #endif
 
-#ifndef NO__1GTK_1ACCESSIBLE
-JNIEXPORT jlong JNICALL GTK_NATIVE(_1GTK_1ACCESSIBLE)
-	(JNIEnv *env, jclass that, jlong arg0)
-{
-	jlong rc = 0;
-	GTK_NATIVE_ENTER(env, that, _1GTK_1ACCESSIBLE_FUNC);
-	rc = (jlong)GTK_ACCESSIBLE(arg0);
-	GTK_NATIVE_EXIT(env, that, _1GTK_1ACCESSIBLE_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_gtk_1accel_1group_1new
 JNIEXPORT jlong JNICALL GTK_NATIVE(gtk_1accel_1group_1new)
 	(JNIEnv *env, jclass that)
@@ -4200,16 +4120,6 @@ JNIEXPORT void JNICALL GTK_NATIVE(gtk_1box_1set_1spacing)
 }
 #endif
 
-#ifndef NO_gtk_1button_1clicked
-JNIEXPORT void JNICALL GTK_NATIVE(gtk_1button_1clicked)
-	(JNIEnv *env, jclass that, jlong arg0)
-{
-	GTK_NATIVE_ENTER(env, that, gtk_1button_1clicked_FUNC);
-	gtk_button_clicked((GtkButton *)arg0);
-	GTK_NATIVE_EXIT(env, that, gtk_1button_1clicked_FUNC);
-}
-#endif
-
 #ifndef NO_gtk_1button_1new
 JNIEXPORT jlong JNICALL GTK_NATIVE(gtk_1button_1new)
 	(JNIEnv *env, jclass that)
@@ -4921,25 +4831,6 @@ JNIEXPORT void JNICALL GTK_NATIVE(gtk_1container_1set_1border_1width)
 }
 #endif
 
-#ifndef NO_gtk_1css_1provider_1get_1named
-JNIEXPORT jlong JNICALL GTK_NATIVE(gtk_1css_1provider_1get_1named)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jbyteArray arg1)
-{
-	jbyte *lparg0=NULL;
-	jbyte *lparg1=NULL;
-	jlong rc = 0;
-	GTK_NATIVE_ENTER(env, that, gtk_1css_1provider_1get_1named_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jlong)gtk_css_provider_get_named((const gchar *)lparg0, (const gchar *)lparg1);
-fail:
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	GTK_NATIVE_EXIT(env, that, gtk_1css_1provider_1get_1named_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_gtk_1css_1provider_1load_1from_1data__J_3BJ
 JNIEXPORT void JNICALL GTK_NATIVE(gtk_1css_1provider_1load_1from_1data__J_3BJ)
 	(JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlong arg2)
@@ -5069,18 +4960,6 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(gtk_1drag_1check_1threshold)
 }
 #endif
 
-#ifndef NO_gtk_1drag_1dest_1find_1target
-JNIEXPORT jlong JNICALL GTK_NATIVE(gtk_1drag_1dest_1find_1target)
-	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2)
-{
-	jlong rc = 0;
-	GTK_NATIVE_ENTER(env, that, gtk_1drag_1dest_1find_1target_FUNC);
-	rc = (jlong)gtk_drag_dest_find_target((GtkWidget *)arg0, (GdkDragContext *)arg1, (GtkTargetList *)arg2);
-	GTK_NATIVE_EXIT(env, that, gtk_1drag_1dest_1find_1target_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_gtk_1drag_1dest_1set
 JNIEXPORT void JNICALL GTK_NATIVE(gtk_1drag_1dest_1set)
 	(JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2, jint arg3, jint arg4)
@@ -5708,31 +5587,15 @@ JNIEXPORT void JNICALL GTK_NATIVE(gtk_1file_1chooser_1add_1filter)
 }
 #endif
 
-#ifndef NO_gtk_1file_1chooser_1dialog_1new___3BJIJIJIJ
-JNIEXPORT jlong JNICALL GTK_NATIVE(gtk_1file_1chooser_1dialog_1new___3BJIJIJIJ)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jlong arg1, jint arg2, jlong arg3, jint arg4, jlong arg5, jint arg6, jlong arg7)
-{
-	jbyte *lparg0=NULL;
-	jlong rc = 0;
-	GTK_NATIVE_ENTER(env, that, gtk_1file_1chooser_1dialog_1new___3BJIJIJIJ_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jlong)gtk_file_chooser_dialog_new((const gchar *)lparg0, (GtkWindow *)arg1, arg2, (const gchar *)arg3, arg4, arg5, arg6, (const gchar *)NULL);
-fail:
-	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, JNI_ABORT);
-	GTK_NATIVE_EXIT(env, that, gtk_1file_1chooser_1dialog_1new___3BJIJIJIJ_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_gtk_1file_1chooser_1dialog_1new___3BJI_3BI_3BIJ
-JNIEXPORT jlong JNICALL GTK_NATIVE(gtk_1file_1chooser_1dialog_1new___3BJI_3BI_3BIJ)
+#ifndef NO_gtk_1file_1chooser_1dialog_1new
+JNIEXPORT jlong JNICALL GTK_NATIVE(gtk_1file_1chooser_1dialog_1new)
 	(JNIEnv *env, jclass that, jbyteArray arg0, jlong arg1, jint arg2, jbyteArray arg3, jint arg4, jbyteArray arg5, jint arg6, jlong arg7)
 {
 	jbyte *lparg0=NULL;
 	jbyte *lparg3=NULL;
 	jbyte *lparg5=NULL;
 	jlong rc = 0;
-	GTK_NATIVE_ENTER(env, that, gtk_1file_1chooser_1dialog_1new___3BJI_3BI_3BIJ_FUNC);
+	GTK_NATIVE_ENTER(env, that, gtk_1file_1chooser_1dialog_1new_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = (*env)->GetByteArrayElements(env, arg5, NULL)) == NULL) goto fail;
@@ -5741,7 +5604,7 @@ fail:
 	if (arg5 && lparg5) (*env)->ReleaseByteArrayElements(env, arg5, lparg5, 0);
 	if (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, JNI_ABORT);
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, JNI_ABORT);
-	GTK_NATIVE_EXIT(env, that, gtk_1file_1chooser_1dialog_1new___3BJI_3BI_3BIJ_FUNC);
+	GTK_NATIVE_EXIT(env, that, gtk_1file_1chooser_1dialog_1new_FUNC);
 	return rc;
 }
 #endif
@@ -6162,26 +6025,6 @@ JNIEXPORT jlong JNICALL GTK_NATIVE(gtk_1gesture_1drag_1new)
 }
 #endif
 
-#ifndef NO_gtk_1gesture_1get_1last_1event
-JNIEXPORT jlong JNICALL GTK_NATIVE(gtk_1gesture_1get_1last_1event)
-	(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
-{
-	jlong rc = 0;
-	GTK_NATIVE_ENTER(env, that, gtk_1gesture_1get_1last_1event_FUNC);
-/*
-	rc = (jlong)gtk_gesture_get_last_event(arg0, arg1);
-*/
-	{
-		GTK_LOAD_FUNCTION(fp, gtk_gesture_get_last_event)
-		if (fp) {
-			rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong, jlong))fp)(arg0, arg1);
-		}
-	}
-	GTK_NATIVE_EXIT(env, that, gtk_1gesture_1get_1last_1event_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_gtk_1gesture_1get_1last_1updated_1sequence
 JNIEXPORT jlong JNICALL GTK_NATIVE(gtk_1gesture_1get_1last_1updated_1sequence)
 	(JNIEnv *env, jclass that, jlong arg0)
@@ -6229,44 +6072,6 @@ fail:
 }
 #endif
 
-#ifndef NO_gtk_1gesture_1get_1sequences
-JNIEXPORT jlong JNICALL GTK_NATIVE(gtk_1gesture_1get_1sequences)
-	(JNIEnv *env, jclass that, jlong arg0)
-{
-	jlong rc = 0;
-	GTK_NATIVE_ENTER(env, that, gtk_1gesture_1get_1sequences_FUNC);
-/*
-	rc = (jlong)gtk_gesture_get_sequences(arg0);
-*/
-	{
-		GTK_LOAD_FUNCTION(fp, gtk_gesture_get_sequences)
-		if (fp) {
-			rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0);
-		}
-	}
-	GTK_NATIVE_EXIT(env, that, gtk_1gesture_1get_1sequences_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_gtk_1gesture_1group
-JNIEXPORT void JNICALL GTK_NATIVE(gtk_1gesture_1group)
-	(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
-{
-	GTK_NATIVE_ENTER(env, that, gtk_1gesture_1group_FUNC);
-/*
-	gtk_gesture_group(arg0, arg1);
-*/
-	{
-		GTK_LOAD_FUNCTION(fp, gtk_gesture_group)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(jlong, jlong))fp)(arg0, arg1);
-		}
-	}
-	GTK_NATIVE_EXIT(env, that, gtk_1gesture_1group_FUNC);
-}
-#endif
-
 #ifndef NO_gtk_1gesture_1is_1recognized
 JNIEXPORT jboolean JNICALL GTK_NATIVE(gtk_1gesture_1is_1recognized)
 	(JNIEnv *env, jclass that, jlong arg0)
@@ -6299,62 +6104,6 @@ JNIEXPORT jlong JNICALL GTK_NATIVE(gtk_1gesture_1multi_1press_1new)
 }
 #endif
 
-#ifndef NO_gtk_1gesture_1pan_1get_1orientation
-JNIEXPORT jlong JNICALL GTK_NATIVE(gtk_1gesture_1pan_1get_1orientation)
-	(JNIEnv *env, jclass that, jlong arg0)
-{
-	jlong rc = 0;
-	GTK_NATIVE_ENTER(env, that, gtk_1gesture_1pan_1get_1orientation_FUNC);
-/*
-	rc = (jlong)gtk_gesture_pan_get_orientation(arg0);
-*/
-	{
-		GTK_LOAD_FUNCTION(fp, gtk_gesture_pan_get_orientation)
-		if (fp) {
-			rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0);
-		}
-	}
-	GTK_NATIVE_EXIT(env, that, gtk_1gesture_1pan_1get_1orientation_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_gtk_1gesture_1pan_1new
-JNIEXPORT void JNICALL GTK_NATIVE(gtk_1gesture_1pan_1new)
-	(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
-{
-	GTK_NATIVE_ENTER(env, that, gtk_1gesture_1pan_1new_FUNC);
-/*
-	gtk_gesture_pan_new(arg0, arg1);
-*/
-	{
-		GTK_LOAD_FUNCTION(fp, gtk_gesture_pan_new)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(jlong, jlong))fp)(arg0, arg1);
-		}
-	}
-	GTK_NATIVE_EXIT(env, that, gtk_1gesture_1pan_1new_FUNC);
-}
-#endif
-
-#ifndef NO_gtk_1gesture_1pan_1set_1orientation
-JNIEXPORT void JNICALL GTK_NATIVE(gtk_1gesture_1pan_1set_1orientation)
-	(JNIEnv *env, jclass that, jlong arg0)
-{
-	GTK_NATIVE_ENTER(env, that, gtk_1gesture_1pan_1set_1orientation_FUNC);
-/*
-	gtk_gesture_pan_set_orientation(arg0);
-*/
-	{
-		GTK_LOAD_FUNCTION(fp, gtk_gesture_pan_set_orientation)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(jlong))fp)(arg0);
-		}
-	}
-	GTK_NATIVE_EXIT(env, that, gtk_1gesture_1pan_1set_1orientation_FUNC);
-}
-#endif
-
 #ifndef NO_gtk_1gesture_1rotate_1get_1angle_1delta
 JNIEXPORT jdouble JNICALL GTK_NATIVE(gtk_1gesture_1rotate_1get_1angle_1delta)
 	(JNIEnv *env, jclass that, jlong arg0)
@@ -6440,26 +6189,6 @@ fail:
 }
 #endif
 
-#ifndef NO_gtk_1gesture_1swipe_1new
-JNIEXPORT jlong JNICALL GTK_NATIVE(gtk_1gesture_1swipe_1new)
-	(JNIEnv *env, jclass that, jlong arg0)
-{
-	jlong rc = 0;
-	GTK_NATIVE_ENTER(env, that, gtk_1gesture_1swipe_1new_FUNC);
-/*
-	rc = (jlong)gtk_gesture_swipe_new(arg0);
-*/
-	{
-		GTK_LOAD_FUNCTION(fp, gtk_gesture_swipe_new)
-		if (fp) {
-			rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0);
-		}
-	}
-	GTK_NATIVE_EXIT(env, that, gtk_1gesture_1swipe_1new_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_gtk_1gesture_1zoom_1get_1scale_1delta
 JNIEXPORT jdouble JNICALL GTK_NATIVE(gtk_1gesture_1zoom_1get_1scale_1delta)
 	(JNIEnv *env, jclass that, jlong arg0)
@@ -7319,16 +7048,6 @@ fail:
 }
 #endif
 
-#ifndef NO_gtk_1main
-JNIEXPORT void JNICALL GTK_NATIVE(gtk_1main)
-	(JNIEnv *env, jclass that)
-{
-	GTK_NATIVE_ENTER(env, that, gtk_1main_FUNC);
-	gtk_main();
-	GTK_NATIVE_EXIT(env, that, gtk_1main_FUNC);
-}
-#endif
-
 #ifndef NO_gtk_1main_1do_1event
 JNIEXPORT void JNICALL GTK_NATIVE(gtk_1main_1do_1event)
 	(JNIEnv *env, jclass that, jlong arg0)
@@ -9103,16 +8822,6 @@ JNIEXPORT jlong JNICALL GTK_NATIVE(gtk_1spin_1button_1new)
 }
 #endif
 
-#ifndef NO_gtk_1spin_1button_1set_1digits
-JNIEXPORT void JNICALL GTK_NATIVE(gtk_1spin_1button_1set_1digits)
-	(JNIEnv *env, jclass that, jlong arg0, jint arg1)
-{
-	GTK_NATIVE_ENTER(env, that, gtk_1spin_1button_1set_1digits_FUNC);
-	gtk_spin_button_set_digits((GtkSpinButton*)arg0, arg1);
-	GTK_NATIVE_EXIT(env, that, gtk_1spin_1button_1set_1digits_FUNC);
-}
-#endif
-
 #ifndef NO_gtk_1spin_1button_1set_1increments
 JNIEXPORT void JNICALL GTK_NATIVE(gtk_1spin_1button_1set_1increments)
 	(JNIEnv *env, jclass that, jlong arg0, jdouble arg1, jdouble arg2)
@@ -9361,28 +9070,6 @@ fail:
 }
 #endif
 
-#ifndef NO_gtk_1style_1context_1get_1background_1color
-JNIEXPORT void JNICALL GTK_NATIVE(gtk_1style_1context_1get_1background_1color)
-	(JNIEnv *env, jclass that, jlong arg0, jint arg1, jobject arg2)
-{
-	GdkRGBA _arg2, *lparg2=NULL;
-	GTK_NATIVE_ENTER(env, that, gtk_1style_1context_1get_1background_1color_FUNC);
-	if (arg2) if ((lparg2 = getGdkRGBAFields(env, arg2, &_arg2)) == NULL) goto fail;
-/*
-	gtk_style_context_get_background_color(arg0, arg1, lparg2);
-*/
-	{
-		GTK_LOAD_FUNCTION(fp, gtk_style_context_get_background_color)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(jlong, jint, GdkRGBA *))fp)(arg0, arg1, lparg2);
-		}
-	}
-fail:
-	if (arg2 && lparg2) setGdkRGBAFields(env, arg2, lparg2);
-	GTK_NATIVE_EXIT(env, that, gtk_1style_1context_1get_1background_1color_FUNC);
-}
-#endif
-
 #ifndef NO_gtk_1style_1context_1get_1border__JILorg_eclipse_swt_internal_gtk_GtkBorder_2
 JNIEXPORT void JNICALL GTK_NATIVE(gtk_1style_1context_1get_1border__JILorg_eclipse_swt_internal_gtk_GtkBorder_2)
 	(JNIEnv *env, jclass that, jlong arg0, jint arg1, jobject arg2)
@@ -10292,24 +9979,6 @@ JNIEXPORT void JNICALL GTK_NATIVE(gtk_1toggle_1button_1set_1inconsistent)
 }
 #endif
 
-#ifndef NO_gtk_1toggle_1button_1set_1mode
-JNIEXPORT void JNICALL GTK_NATIVE(gtk_1toggle_1button_1set_1mode)
-	(JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
-{
-	GTK_NATIVE_ENTER(env, that, gtk_1toggle_1button_1set_1mode_FUNC);
-/*
-	gtk_toggle_button_set_mode((GtkToggleButton *)arg0, (gboolean)arg1);
-*/
-	{
-		GTK_LOAD_FUNCTION(fp, gtk_toggle_button_set_mode)
-		if (fp) {
-			((void (CALLING_CONVENTION*)(GtkToggleButton *, gboolean))fp)((GtkToggleButton *)arg0, (gboolean)arg1);
-		}
-	}
-	GTK_NATIVE_EXIT(env, that, gtk_1toggle_1button_1set_1mode_FUNC);
-}
-#endif
-
 #ifndef NO_gtk_1toggle_1tool_1button_1get_1active
 JNIEXPORT jboolean JNICALL GTK_NATIVE(gtk_1toggle_1tool_1button_1get_1active)
 	(JNIEnv *env, jclass that, jlong arg0)
@@ -10370,20 +10039,6 @@ JNIEXPORT void JNICALL GTK_NATIVE(gtk_1tool_1button_1set_1icon_1widget)
 }
 #endif
 
-#ifndef NO_gtk_1tool_1button_1set_1label
-JNIEXPORT void JNICALL GTK_NATIVE(gtk_1tool_1button_1set_1label)
-	(JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1)
-{
-	jbyte *lparg1=NULL;
-	GTK_NATIVE_ENTER(env, that, gtk_1tool_1button_1set_1label_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	gtk_tool_button_set_label((GtkToolButton *)arg0, (const gchar *)lparg1);
-fail:
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	GTK_NATIVE_EXIT(env, that, gtk_1tool_1button_1set_1label_FUNC);
-}
-#endif
-
 #ifndef NO_gtk_1tool_1button_1set_1label_1widget
 JNIEXPORT void JNICALL GTK_NATIVE(gtk_1tool_1button_1set_1label_1widget)
 	(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
@@ -10826,18 +10481,6 @@ JNIEXPORT jint JNICALL GTK_NATIVE(gtk_1tree_1selection_1count_1selected_1rows)
 }
 #endif
 
-#ifndef NO_gtk_1tree_1selection_1get_1select_1function
-JNIEXPORT jlong JNICALL GTK_NATIVE(gtk_1tree_1selection_1get_1select_1function)
-	(JNIEnv *env, jclass that, jlong arg0)
-{
-	jlong rc = 0;
-	GTK_NATIVE_ENTER(env, that, gtk_1tree_1selection_1get_1select_1function_FUNC);
-	rc = (jlong)gtk_tree_selection_get_select_function((GtkTreeSelection *)arg0);
-	GTK_NATIVE_EXIT(env, that, gtk_1tree_1selection_1get_1select_1function_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_gtk_1tree_1selection_1get_1selected_1rows
 JNIEXPORT jlong JNICALL GTK_NATIVE(gtk_1tree_1selection_1get_1selected_1rows)
 	(JNIEnv *env, jclass that, jlong arg0, jlongArray arg1)
@@ -10886,16 +10529,6 @@ JNIEXPORT void JNICALL GTK_NATIVE(gtk_1tree_1selection_1select_1iter)
 }
 #endif
 
-#ifndef NO_gtk_1tree_1selection_1select_1path
-JNIEXPORT void JNICALL GTK_NATIVE(gtk_1tree_1selection_1select_1path)
-	(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
-{
-	GTK_NATIVE_ENTER(env, that, gtk_1tree_1selection_1select_1path_FUNC);
-	gtk_tree_selection_select_path((GtkTreeSelection *)arg0, (GtkTreePath *)arg1);
-	GTK_NATIVE_EXIT(env, that, gtk_1tree_1selection_1select_1path_FUNC);
-}
-#endif
-
 #ifndef NO_gtk_1tree_1selection_1set_1mode
 JNIEXPORT void JNICALL GTK_NATIVE(gtk_1tree_1selection_1set_1mode)
 	(JNIEnv *env, jclass that, jlong arg0, jint arg1)
@@ -11729,16 +11362,6 @@ JNIEXPORT void JNICALL GTK_NATIVE(gtk_1tree_1view_1set_1search_1column)
 }
 #endif
 
-#ifndef NO_gtk_1tree_1view_1unset_1rows_1drag_1dest
-JNIEXPORT void JNICALL GTK_NATIVE(gtk_1tree_1view_1unset_1rows_1drag_1dest)
-	(JNIEnv *env, jclass that, jlong arg0)
-{
-	GTK_NATIVE_ENTER(env, that, gtk_1tree_1view_1unset_1rows_1drag_1dest_FUNC);
-	gtk_tree_view_unset_rows_drag_dest((GtkTreeView *)arg0);
-	GTK_NATIVE_EXIT(env, that, gtk_1tree_1view_1unset_1rows_1drag_1dest_FUNC);
-}
-#endif
-
 #ifndef NO_gtk_1viewport_1set_1shadow_1type
 JNIEXPORT void JNICALL GTK_NATIVE(gtk_1viewport_1set_1shadow_1type)
 	(JNIEnv *env, jclass that, jlong arg0, jint arg1)
@@ -12542,16 +12165,6 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(gtk_1widget_1is_1focus)
 }
 #endif
 
-#ifndef NO_gtk_1widget_1map
-JNIEXPORT void JNICALL GTK_NATIVE(gtk_1widget_1map)
-	(JNIEnv *env, jclass that, jlong arg0)
-{
-	GTK_NATIVE_ENTER(env, that, gtk_1widget_1map_FUNC);
-	gtk_widget_map((GtkWidget *)arg0);
-	GTK_NATIVE_EXIT(env, that, gtk_1widget_1map_FUNC);
-}
-#endif
-
 #ifndef NO_gtk_1widget_1measure
 JNIEXPORT void JNICALL GTK_NATIVE(gtk_1widget_1measure)
 	(JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jintArray arg3, jintArray arg4, jintArray arg5, jintArray arg6)
@@ -12904,20 +12517,6 @@ JNIEXPORT void JNICALL GTK_NATIVE(gtk_1widget_1set_1margin_1top)
 }
 #endif
 
-#ifndef NO_gtk_1widget_1set_1name
-JNIEXPORT void JNICALL GTK_NATIVE(gtk_1widget_1set_1name)
-	(JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1)
-{
-	jbyte *lparg1=NULL;
-	GTK_NATIVE_ENTER(env, that, gtk_1widget_1set_1name_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	gtk_widget_set_name((GtkWidget *)arg0, (const char *)lparg1);
-fail:
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	GTK_NATIVE_EXIT(env, that, gtk_1widget_1set_1name_FUNC);
-}
-#endif
-
 #ifndef NO_gtk_1widget_1set_1opacity
 JNIEXPORT void JNICALL GTK_NATIVE(gtk_1widget_1set_1opacity)
 	(JNIEnv *env, jclass that, jlong arg0, jdouble arg1)
@@ -13646,18 +13245,6 @@ JNIEXPORT jint JNICALL OS_NATIVE(Call__JJII)
 }
 #endif
 
-#ifndef NO_Call__JJIJ
-JNIEXPORT jlong JNICALL OS_NATIVE(Call__JJIJ)
-	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jlong arg3)
-{
-	jlong rc = 0;
-	OS_NATIVE_ENTER(env, that, Call__JJIJ_FUNC);
-	rc = (jlong)((jlong (*)())arg0)(arg1, arg2, arg3);
-	OS_NATIVE_EXIT(env, that, Call__JJIJ_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_Call__JJJ
 JNIEXPORT jint JNICALL OS_NATIVE(Call__JJJ)
 	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2)
@@ -13694,18 +13281,6 @@ fail:
 }
 #endif
 
-#ifndef NO_GInterfaceInfo_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GInterfaceInfo_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GInterfaceInfo_1sizeof_FUNC);
-	rc = (jint)GInterfaceInfo_sizeof();
-	OS_NATIVE_EXIT(env, that, GInterfaceInfo_1sizeof_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_GPollFD_1sizeof
 JNIEXPORT jint JNICALL OS_NATIVE(GPollFD_1sizeof)
 	(JNIEnv *env, jclass that)
@@ -13718,30 +13293,6 @@ JNIEXPORT jint JNICALL OS_NATIVE(GPollFD_1sizeof)
 }
 #endif
 
-#ifndef NO_GString_1len
-JNIEXPORT jint JNICALL OS_NATIVE(GString_1len)
-	(JNIEnv *env, jclass that, jlong arg0)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GString_1len_FUNC);
-	rc = (jint)((GString *)arg0)->len;
-	OS_NATIVE_EXIT(env, that, GString_1len_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_GString_1str
-JNIEXPORT jlong JNICALL OS_NATIVE(GString_1str)
-	(JNIEnv *env, jclass that, jlong arg0)
-{
-	jlong rc = 0;
-	OS_NATIVE_ENTER(env, that, GString_1str_FUNC);
-	rc = (jlong)((GString *)arg0)->str;
-	OS_NATIVE_EXIT(env, that, GString_1str_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_GTypeInfo_1sizeof
 JNIEXPORT jint JNICALL OS_NATIVE(GTypeInfo_1sizeof)
 	(JNIEnv *env, jclass that)
@@ -13754,30 +13305,6 @@ JNIEXPORT jint JNICALL OS_NATIVE(GTypeInfo_1sizeof)
 }
 #endif
 
-#ifndef NO_GTypeQuery_1sizeof
-JNIEXPORT jint JNICALL OS_NATIVE(GTypeQuery_1sizeof)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, GTypeQuery_1sizeof_FUNC);
-	rc = (jint)GTypeQuery_sizeof();
-	OS_NATIVE_EXIT(env, that, GTypeQuery_1sizeof_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_G_1OBJECT_1CLASS
-JNIEXPORT jlong JNICALL OS_NATIVE(G_1OBJECT_1CLASS)
-	(JNIEnv *env, jclass that, jlong arg0)
-{
-	jlong rc = 0;
-	OS_NATIVE_ENTER(env, that, G_1OBJECT_1CLASS_FUNC);
-	rc = (jlong)G_OBJECT_CLASS(arg0);
-	OS_NATIVE_EXIT(env, that, G_1OBJECT_1CLASS_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_G_1OBJECT_1CLASS_1CONSTRUCTOR
 JNIEXPORT jlong JNICALL OS_NATIVE(G_1OBJECT_1CLASS_1CONSTRUCTOR)
 	(JNIEnv *env, jclass that, jlong arg0)
@@ -13848,18 +13375,6 @@ JNIEXPORT jlong JNICALL OS_NATIVE(G_1TYPE_1BOOLEAN)
 }
 #endif
 
-#ifndef NO_G_1TYPE_1CHECK_1INSTANCE_1TYPE
-JNIEXPORT jboolean JNICALL OS_NATIVE(G_1TYPE_1CHECK_1INSTANCE_1TYPE)
-	(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
-{
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, G_1TYPE_1CHECK_1INSTANCE_1TYPE_FUNC);
-	rc = (jboolean)G_TYPE_CHECK_INSTANCE_TYPE(arg0, arg1);
-	OS_NATIVE_EXIT(env, that, G_1TYPE_1CHECK_1INSTANCE_1TYPE_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_G_1TYPE_1DOUBLE
 JNIEXPORT jlong JNICALL OS_NATIVE(G_1TYPE_1DOUBLE)
 	(JNIEnv *env, jclass that)
@@ -14088,42 +13603,6 @@ JNIEXPORT jint JNICALL OS_NATIVE(PangoRectangle_1sizeof)
 }
 #endif
 
-#ifndef NO_RTLD_1GLOBAL
-JNIEXPORT jint JNICALL OS_NATIVE(RTLD_1GLOBAL)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, RTLD_1GLOBAL_FUNC);
-	rc = (jint)RTLD_GLOBAL;
-	OS_NATIVE_EXIT(env, that, RTLD_1GLOBAL_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_RTLD_1LAZY
-JNIEXPORT jint JNICALL OS_NATIVE(RTLD_1LAZY)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, RTLD_1LAZY_FUNC);
-	rc = (jint)RTLD_LAZY;
-	OS_NATIVE_EXIT(env, that, RTLD_1LAZY_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_RTLD_1NOW
-JNIEXPORT jint JNICALL OS_NATIVE(RTLD_1NOW)
-	(JNIEnv *env, jclass that)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, RTLD_1NOW_FUNC);
-	rc = (jint)RTLD_NOW;
-	OS_NATIVE_EXIT(env, that, RTLD_1NOW_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_XAnyEvent_1sizeof
 JNIEXPORT jint JNICALL OS_NATIVE(XAnyEvent_1sizeof)
 	(JNIEnv *env, jclass that)
@@ -14336,22 +13815,6 @@ JNIEXPORT jlong JNICALL OS_NATIVE(X_1EVENT_1WINDOW)
 }
 #endif
 
-#ifndef NO_access
-JNIEXPORT jint JNICALL OS_NATIVE(access)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1)
-{
-	jbyte *lparg0=NULL;
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, access_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)access((const char*)lparg0, arg1);
-fail:
-	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, access_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_call__JJJJJ
 JNIEXPORT jlong JNICALL OS_NATIVE(call__JJJJJ)
 	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4)
@@ -14388,22 +13851,6 @@ JNIEXPORT jlong JNICALL OS_NATIVE(call__JJJJJJJJ)
 }
 #endif
 
-#ifndef NO_dlopen
-JNIEXPORT jlong JNICALL OS_NATIVE(dlopen)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1)
-{
-	jbyte *lparg0=NULL;
-	jlong rc = 0;
-	OS_NATIVE_ENTER(env, that, dlopen_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jlong)dlopen((const char *)lparg0, arg1);
-fail:
-	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
-	OS_NATIVE_EXIT(env, that, dlopen_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_g_1app_1info_1create_1from_1commandline
 JNIEXPORT jlong JNICALL OS_NATIVE(g_1app_1info_1create_1from_1commandline)
 	(JNIEnv *env, jclass that, jbyteArray arg0, jbyteArray arg1, jlong arg2, jlong arg3)
@@ -14511,18 +13958,6 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(g_1app_1info_1launch_1default_1for_1uri)
 }
 #endif
 
-#ifndef NO_g_1app_1info_1should_1show
-JNIEXPORT jboolean JNICALL OS_NATIVE(g_1app_1info_1should_1show)
-	(JNIEnv *env, jclass that, jlong arg0)
-{
-	jboolean rc = 0;
-	OS_NATIVE_ENTER(env, that, g_1app_1info_1should_1show_FUNC);
-	rc = (jboolean)g_app_info_should_show((GAppInfo *)arg0);
-	OS_NATIVE_EXIT(env, that, g_1app_1info_1should_1show_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_g_1app_1info_1supports_1uris
 JNIEXPORT jboolean JNICALL OS_NATIVE(g_1app_1info_1supports_1uris)
 	(JNIEnv *env, jclass that, jlong arg0)
@@ -14914,22 +14349,6 @@ fail:
 }
 #endif
 
-#ifndef NO_g_1dbus_1proxy_1call_1finish
-JNIEXPORT jlong JNICALL OS_NATIVE(g_1dbus_1proxy_1call_1finish)
-	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlongArray arg2)
-{
-	jlong *lparg2=NULL;
-	jlong rc = 0;
-	OS_NATIVE_ENTER(env, that, g_1dbus_1proxy_1call_1finish_FUNC);
-	if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jlong)g_dbus_proxy_call_finish((GDBusProxy *)arg0, (GAsyncResult *)arg1, (GError **)lparg2);
-fail:
-	if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0);
-	OS_NATIVE_EXIT(env, that, g_1dbus_1proxy_1call_1finish_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_g_1dbus_1proxy_1call_1sync
 JNIEXPORT jlong JNICALL OS_NATIVE(g_1dbus_1proxy_1call_1sync)
 	(JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jlongArray arg6)
@@ -15392,16 +14811,6 @@ JNIEXPORT void JNICALL OS_NATIVE(g_1list_1free)
 }
 #endif
 
-#ifndef NO_g_1list_1free_11
-JNIEXPORT void JNICALL OS_NATIVE(g_1list_1free_11)
-	(JNIEnv *env, jclass that, jlong arg0)
-{
-	OS_NATIVE_ENTER(env, that, g_1list_1free_11_FUNC);
-	g_list_free_1((GList *)arg0);
-	OS_NATIVE_EXIT(env, that, g_1list_1free_11_FUNC);
-}
-#endif
-
 #ifndef NO_g_1list_1last
 JNIEXPORT jlong JNICALL OS_NATIVE(g_1list_1last)
 	(JNIEnv *env, jclass that, jlong arg0)
@@ -15438,18 +14847,6 @@ JNIEXPORT jlong JNICALL OS_NATIVE(g_1list_1next)
 }
 #endif
 
-#ifndef NO_g_1list_1nth
-JNIEXPORT jlong JNICALL OS_NATIVE(g_1list_1nth)
-	(JNIEnv *env, jclass that, jlong arg0, jint arg1)
-{
-	jlong rc = 0;
-	OS_NATIVE_ENTER(env, that, g_1list_1nth_FUNC);
-	rc = (jlong)g_list_nth((GList *)arg0, (guint)arg1);
-	OS_NATIVE_EXIT(env, that, g_1list_1nth_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_g_1list_1nth_1data
 JNIEXPORT jlong JNICALL OS_NATIVE(g_1list_1nth_1data)
 	(JNIEnv *env, jclass that, jlong arg0, jint arg1)
@@ -15462,18 +14859,6 @@ JNIEXPORT jlong JNICALL OS_NATIVE(g_1list_1nth_1data)
 }
 #endif
 
-#ifndef NO_g_1list_1prepend
-JNIEXPORT jlong JNICALL OS_NATIVE(g_1list_1prepend)
-	(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
-{
-	jlong rc = 0;
-	OS_NATIVE_ENTER(env, that, g_1list_1prepend_FUNC);
-	rc = (jlong)g_list_prepend((GList *)arg0, (gpointer)arg1);
-	OS_NATIVE_EXIT(env, that, g_1list_1prepend_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_g_1list_1previous
 JNIEXPORT jlong JNICALL OS_NATIVE(g_1list_1previous)
 	(JNIEnv *env, jclass that, jlong arg0)
@@ -15486,38 +14871,6 @@ JNIEXPORT jlong JNICALL OS_NATIVE(g_1list_1previous)
 }
 #endif
 
-#ifndef NO_g_1list_1remove_1link
-JNIEXPORT jlong JNICALL OS_NATIVE(g_1list_1remove_1link)
-	(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
-{
-	jlong rc = 0;
-	OS_NATIVE_ENTER(env, that, g_1list_1remove_1link_FUNC);
-	rc = (jlong)g_list_remove_link((GList *)arg0, (GList *)arg1);
-	OS_NATIVE_EXIT(env, that, g_1list_1remove_1link_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_g_1list_1set_1next
-JNIEXPORT void JNICALL OS_NATIVE(g_1list_1set_1next)
-	(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
-{
-	OS_NATIVE_ENTER(env, that, g_1list_1set_1next_FUNC);
-	g_list_set_next((GList *)arg0, (GList *)arg1);
-	OS_NATIVE_EXIT(env, that, g_1list_1set_1next_FUNC);
-}
-#endif
-
-#ifndef NO_g_1list_1set_1previous
-JNIEXPORT void JNICALL OS_NATIVE(g_1list_1set_1previous)
-	(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
-{
-	OS_NATIVE_ENTER(env, that, g_1list_1set_1previous_FUNC);
-	g_list_set_previous((GList *)arg0, (GList *)arg1);
-	OS_NATIVE_EXIT(env, that, g_1list_1set_1previous_FUNC);
-}
-#endif
-
 #ifndef NO_g_1log_1default_1handler
 JNIEXPORT void JNICALL OS_NATIVE(g_1log_1default_1handler)
 	(JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2, jlong arg3)
@@ -15682,22 +15035,6 @@ JNIEXPORT jlong JNICALL OS_NATIVE(g_1malloc)
 }
 #endif
 
-#ifndef NO_g_1object_1class_1find_1property
-JNIEXPORT jlong JNICALL OS_NATIVE(g_1object_1class_1find_1property)
-	(JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1)
-{
-	jbyte *lparg1=NULL;
-	jlong rc = 0;
-	OS_NATIVE_ENTER(env, that, g_1object_1class_1find_1property_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jlong)g_object_class_find_property((GObjectClass *)arg0, (const gchar *)lparg1);
-fail:
-	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
-	OS_NATIVE_EXIT(env, that, g_1object_1class_1find_1property_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_g_1object_1get__J_3B_3IJ
 JNIEXPORT void JNICALL OS_NATIVE(g_1object_1get__J_3B_3IJ)
 	(JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jintArray arg2, jlong arg3)
@@ -16093,18 +15430,6 @@ JNIEXPORT void JNICALL OS_NATIVE(g_1signal_1handler_1disconnect)
 }
 #endif
 
-#ifndef NO_g_1signal_1handler_1find
-JNIEXPORT jint JNICALL OS_NATIVE(g_1signal_1handler_1find)
-	(JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3, jlong arg4, jlong arg5, jlong arg6)
-{
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, g_1signal_1handler_1find_FUNC);
-	rc = (jint)g_signal_handler_find((gpointer)arg0, arg1, arg2, (GQuark)arg3, (GClosure *)arg4, (gpointer)arg5, (gpointer)arg6);
-	OS_NATIVE_EXIT(env, that, g_1signal_1handler_1find_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_g_1signal_1handlers_1block_1matched
 JNIEXPORT jint JNICALL OS_NATIVE(g_1signal_1handlers_1block_1matched)
 	(JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3, jlong arg4, jlong arg5, jlong arg6)
@@ -16285,30 +15610,6 @@ JNIEXPORT void JNICALL OS_NATIVE(g_1strfreev)
 }
 #endif
 
-#ifndef NO_g_1string_1free
-JNIEXPORT jlong JNICALL OS_NATIVE(g_1string_1free)
-	(JNIEnv *env, jclass that, jlong arg0, jint arg1)
-{
-	jlong rc = 0;
-	OS_NATIVE_ENTER(env, that, g_1string_1free_FUNC);
-	rc = (jlong)g_string_free((GString *)arg0, arg1);
-	OS_NATIVE_EXIT(env, that, g_1string_1free_FUNC);
-	return rc;
-}
-#endif
-
-#ifndef NO_g_1string_1new_1len
-JNIEXPORT jlong JNICALL OS_NATIVE(g_1string_1new_1len)
-	(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
-{
-	jlong rc = 0;
-	OS_NATIVE_ENTER(env, that, g_1string_1new_1len_FUNC);
-	rc = (jlong)g_string_new_len((const gchar *)arg0, arg1);
-	OS_NATIVE_EXIT(env, that, g_1string_1new_1len_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_g_1strtod
 JNIEXPORT jdouble JNICALL OS_NATIVE(g_1strtod)
 	(JNIEnv *env, jclass that, jlong arg0, jlongArray arg1)
@@ -16347,16 +15648,6 @@ JNIEXPORT jint JNICALL OS_NATIVE(g_1timeout_1add)
 }
 #endif
 
-#ifndef NO_g_1type_1add_1interface_1static
-JNIEXPORT void JNICALL OS_NATIVE(g_1type_1add_1interface_1static)
-	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2)
-{
-	OS_NATIVE_ENTER(env, that, g_1type_1add_1interface_1static_FUNC);
-	g_type_add_interface_static((GType)arg0, (GType)arg1, (const GInterfaceInfo *)arg2);
-	OS_NATIVE_EXIT(env, that, g_1type_1add_1interface_1static_FUNC);
-}
-#endif
-
 #ifndef NO_g_1type_1class_1peek
 JNIEXPORT jlong JNICALL OS_NATIVE(g_1type_1class_1peek)
 	(JNIEnv *env, jclass that, jlong arg0)
@@ -16439,16 +15730,6 @@ JNIEXPORT jlong JNICALL OS_NATIVE(g_1type_1parent)
 }
 #endif
 
-#ifndef NO_g_1type_1query
-JNIEXPORT void JNICALL OS_NATIVE(g_1type_1query)
-	(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
-{
-	OS_NATIVE_ENTER(env, that, g_1type_1query_FUNC);
-	g_type_query((GType)arg0, (GTypeQuery *)arg1);
-	OS_NATIVE_EXIT(env, that, g_1type_1query_FUNC);
-}
-#endif
-
 #ifndef NO_g_1type_1register_1static
 JNIEXPORT jlong JNICALL OS_NATIVE(g_1type_1register_1static)
 	(JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlong arg2, jint arg3)
@@ -16877,18 +16158,6 @@ fail:
 }
 #endif
 
-#ifndef NO_g_1variant_1get_1type
-JNIEXPORT jlong JNICALL OS_NATIVE(g_1variant_1get_1type)
-	(JNIEnv *env, jclass that, jlong arg0)
-{
-	jlong rc = 0;
-	OS_NATIVE_ENTER(env, that, g_1variant_1get_1type_FUNC);
-	rc = (jlong)g_variant_get_type((GVariant *)arg0);
-	OS_NATIVE_EXIT(env, that, g_1variant_1get_1type_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_g_1variant_1get_1type_1string
 JNIEXPORT jlong JNICALL OS_NATIVE(g_1variant_1get_1type_1string)
 	(JNIEnv *env, jclass that, jlong arg0)
@@ -17189,29 +16458,6 @@ JNIEXPORT jlong JNICALL OS_NATIVE(localeconv_1decimal_1point)
 }
 #endif
 
-#ifndef NO_memmove__JLorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I)
-	(JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2)
-{
-	GInterfaceInfo _arg1, *lparg1=NULL;
-	OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I_FUNC);
-	if (arg1) if ((lparg1 = getGInterfaceInfoFields(env, arg1, &_arg1)) == NULL) goto fail;
-	memmove((void *)arg0, (const void *)lparg1, (size_t)arg2);
-fail:
-	OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I_FUNC);
-}
-#endif
-
-#ifndef NO_memmove__JLorg_eclipse_swt_internal_gtk_GObjectClass_2
-JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_GObjectClass_2)
-	(JNIEnv *env, jclass that, jlong arg0, jobject arg1)
-{
-	OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GObjectClass_2_FUNC);
-	if (arg1) getGObjectClassFields(env, arg1, (GObjectClass *)arg0);
-	OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_gtk_GObjectClass_2_FUNC);
-}
-#endif
-
 #ifndef NO_memmove__JLorg_eclipse_swt_internal_gtk_GTypeInfo_2I
 JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_gtk_GTypeInfo_2I)
 	(JNIEnv *env, jclass that, jlong arg0, jobject arg1, jint arg2)
@@ -17323,30 +16569,6 @@ fail:
 }
 #endif
 
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2J
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2J)
-	(JNIEnv *env, jclass that, jobject arg0, jlong arg1)
-{
-	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2J_FUNC);
-	if (arg0) setGObjectClassFields(env, arg0, (GObjectClass *)arg1);
-	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2J_FUNC);
-}
-#endif
-
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2JJ
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2JJ)
-	(JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2)
-{
-	GTypeQuery _arg0, *lparg0=NULL;
-	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2JJ_FUNC);
-	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
-	memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
-fail:
-	if (arg0 && lparg0) setGTypeQueryFields(env, arg0, lparg0);
-	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2JJ_FUNC);
-}
-#endif
-
 #ifndef NO_memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2JJ
 JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2JJ)
 	(JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2)
@@ -18243,18 +17465,6 @@ fail:
 }
 #endif
 
-#ifndef NO_pango_1font_1get_1metrics
-JNIEXPORT jlong JNICALL OS_NATIVE(pango_1font_1get_1metrics)
-	(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
-{
-	jlong rc = 0;
-	OS_NATIVE_ENTER(env, that, pango_1font_1get_1metrics_FUNC);
-	rc = (jlong)pango_font_get_metrics((PangoFont *)arg0, (PangoLanguage *)arg1);
-	OS_NATIVE_EXIT(env, that, pango_1font_1get_1metrics_FUNC);
-	return rc;
-}
-#endif
-
 #ifndef NO_pango_1font_1map_1create_1context
 JNIEXPORT jlong JNICALL OS_NATIVE(pango_1font_1map_1create_1context)
 	(JNIEnv *env, jclass that, jlong arg0)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h
index 7d2cd84f73..611c5a1ed8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h
@@ -41,12 +41,6 @@
 #else
 #include <windows.h>
 //#define NO_realpath // TODO [win32] use GetFullPathName instead; 
-#define NO_RTLD_1GLOBAL
-#define NO_RTLD_1LAZY
-#define NO_RTLD_1NOW
-#define NO_dlclose
-#define NO_dlopen
-#define NO_dlsym
 
 #define NO_gtk_1enumerate_1printers
 #define NO_gtk_1printer_1get_1name
@@ -124,7 +118,6 @@
 #define NO_GDK_1IS_1X11_1DISPLAY
 
 /* X Structures */
-#define NO_XAnyEvent
 #define NO_XExposeEvent
 #define NO_XEvent
 #define NO_XFocusChangeEvent
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.c
index 9b0d2da25e..530cbe53ab 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.c
@@ -28,39 +28,6 @@ JNIEXPORT void JNICALL OS_NATIVE(cachejvmptr)
 	if (cached_jvm == NULL) (*env)->GetJavaVM(env, &cached_jvm);
 }
 
-#ifndef NO__1call_1get_1size
-JNIEXPORT void JNICALL OS_NATIVE(_1call_1get_1size)
-	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7)
-{
-   /*
-   * Bug in Solaris. For some reason, the assembler generated for this function (when not putting the parameters in the stack)  crashes. 
-   * It seems that this  is caused by a bug in the Sun Studio Compiler when the optimization level is greater or equal to two.
-   * The fix is rewrite the function passing all parameters on the stack. Alternatively, the problem could be fixed by lowering the optimization level,
-   * but this solution would significantly increase the size of the library. 
-   */
-	const GdkRectangle rect;
-	gint x, y, width, height;
-	const GdkRectangle *lprect = NULL;
-	gint* lpx = NULL;
-	gint* lpy = NULL;
-	gint* lpwidth = NULL;
-	gint* lpheight = NULL;
-	OS_NATIVE_ENTER(env, that, _1call_1get_1size_FUNC);
-	if (arg3) lprect = &rect;
-	if (arg4) lpx = &x;
-	if (arg5) lpy = &y;
-	if (arg6) lpwidth = &width;
-	if (arg7) lpheight = &height;
-	((void (*)(GtkCellRenderer *, GtkWidget *, const GdkRectangle *, gint *, gint *, gint *, gint *))arg0)((GtkCellRenderer *)arg1, (GtkWidget *)arg2, lprect, lpx, lpy, lpwidth, lpheight);
-	if (arg3) *((GdkRectangle *)arg3) = rect;
-	if (arg4) *((gint *)arg4) = x;
-	if (arg5) *((gint *)arg5) = y;
-	if (arg6) *((gint *)arg6) = width;
-	if (arg7) *((gint *)arg7) = height;
-	OS_NATIVE_EXIT(env, that, _1call_1get_1size_FUNC);
-}
-#endif
-
 #ifndef NO_GDK_1WINDOWING_1X11
 JNIEXPORT jboolean JNICALL OS_NATIVE(GDK_1WINDOWING_1X11)
 	(JNIEnv *env, jclass that)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c
index d9e90454c7..455ec3153d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c
@@ -120,7 +120,6 @@ char * GDK_nativeFunctionNames[] = {
 	"gdk_1keyval_1to_1unicode",
 	"gdk_1monitor_1get_1geometry",
 	"gdk_1monitor_1get_1scale_1factor",
-	"gdk_1monitor_1get_1width_1mm",
 	"gdk_1monitor_1get_1workarea",
 	"gdk_1pango_1context_1get",
 	"gdk_1pango_1layout_1get_1clip_1region",
@@ -134,7 +133,6 @@ char * GDK_nativeFunctionNames[] = {
 	"gdk_1pixbuf_1copy_1area",
 	"gdk_1pixbuf_1format_1get_1name",
 	"gdk_1pixbuf_1get_1bits_1per_1sample",
-	"gdk_1pixbuf_1get_1byte_1length",
 	"gdk_1pixbuf_1get_1from_1window",
 	"gdk_1pixbuf_1get_1has_1alpha",
 	"gdk_1pixbuf_1get_1height",
@@ -155,7 +153,6 @@ char * GDK_nativeFunctionNames[] = {
 	"gdk_1pixbuf_1scale_1simple",
 	"gdk_1property_1get",
 	"gdk_1rgba_1free",
-	"gdk_1rgba_1hash",
 	"gdk_1rgba_1parse",
 	"gdk_1rgba_1to_1string",
 	"gdk_1screen_1get_1default",
@@ -259,7 +256,6 @@ char * GDK_nativeFunctionNames[] = {
 	"gdk_1x11_1screen_1lookup_1visual",
 	"gdk_1x11_1surface_1get_1xid",
 	"gdk_1x11_1surface_1lookup_1for_1display",
-	"gdk_1x11_1visual_1get_1xvisual",
 	"gdk_1x11_1window_1get_1xid",
 	"gdk_1x11_1window_1lookup_1for_1display",
 };
@@ -325,7 +321,6 @@ char * GTK_nativeFunctionNames[] = {
 	"GtkTargetEntry_1sizeof",
 	"GtkTextIter_1sizeof",
 	"GtkTreeIter_1sizeof",
-	"_1GTK_1ACCESSIBLE",
 	"gtk_1accel_1group_1new",
 	"gtk_1accel_1label_1new",
 	"gtk_1accel_1label_1set_1accel",
@@ -355,7 +350,6 @@ char * GTK_nativeFunctionNames[] = {
 	"gtk_1box_1set_1child_1packing__JJZZII",
 	"gtk_1box_1set_1homogeneous",
 	"gtk_1box_1set_1spacing",
-	"gtk_1button_1clicked",
 	"gtk_1button_1new",
 	"gtk_1button_1set_1image",
 	"gtk_1calendar_1clear_1marks",
@@ -415,7 +409,6 @@ char * GTK_nativeFunctionNames[] = {
 	"gtk_1container_1propagate_1draw",
 	"gtk_1container_1remove",
 	"gtk_1container_1set_1border_1width",
-	"gtk_1css_1provider_1get_1named",
 	"gtk_1css_1provider_1load_1from_1data__J_3BJ",
 	"gtk_1css_1provider_1load_1from_1data__J_3BJ_3J",
 	"gtk_1css_1provider_1new",
@@ -425,7 +418,6 @@ char * GTK_nativeFunctionNames[] = {
 	"gtk_1drag_1begin_1with_1coordinates__JJIIJII",
 	"gtk_1drag_1begin_1with_1coordinates__JJJIII",
 	"gtk_1drag_1check_1threshold",
-	"gtk_1drag_1dest_1find_1target",
 	"gtk_1drag_1dest_1set",
 	"gtk_1drag_1dest_1unset",
 	"gtk_1drag_1finish",
@@ -478,8 +470,7 @@ char * GTK_nativeFunctionNames[] = {
 	"gtk_1expander_1set_1expanded",
 	"gtk_1expander_1set_1label_1widget",
 	"gtk_1file_1chooser_1add_1filter",
-	"gtk_1file_1chooser_1dialog_1new___3BJIJIJIJ",
-	"gtk_1file_1chooser_1dialog_1new___3BJI_3BI_3BIJ",
+	"gtk_1file_1chooser_1dialog_1new",
 	"gtk_1file_1chooser_1get_1filename",
 	"gtk_1file_1chooser_1get_1filenames",
 	"gtk_1file_1chooser_1get_1filter",
@@ -510,21 +501,14 @@ char * GTK_nativeFunctionNames[] = {
 	"gtk_1gesture_1drag_1get_1offset",
 	"gtk_1gesture_1drag_1get_1start_1point",
 	"gtk_1gesture_1drag_1new",
-	"gtk_1gesture_1get_1last_1event",
 	"gtk_1gesture_1get_1last_1updated_1sequence",
 	"gtk_1gesture_1get_1point",
-	"gtk_1gesture_1get_1sequences",
-	"gtk_1gesture_1group",
 	"gtk_1gesture_1is_1recognized",
 	"gtk_1gesture_1multi_1press_1new",
-	"gtk_1gesture_1pan_1get_1orientation",
-	"gtk_1gesture_1pan_1new",
-	"gtk_1gesture_1pan_1set_1orientation",
 	"gtk_1gesture_1rotate_1get_1angle_1delta",
 	"gtk_1gesture_1rotate_1new",
 	"gtk_1gesture_1single_1set_1button",
 	"gtk_1gesture_1swipe_1get_1velocity",
-	"gtk_1gesture_1swipe_1new",
 	"gtk_1gesture_1zoom_1get_1scale_1delta",
 	"gtk_1gesture_1zoom_1new",
 	"gtk_1get_1current_1event",
@@ -587,7 +571,6 @@ char * GTK_nativeFunctionNames[] = {
 	"gtk_1list_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkRGBA_2I",
 	"gtk_1list_1store_1set__JJIZI",
 	"gtk_1list_1store_1set__JJI_3BI",
-	"gtk_1main",
 	"gtk_1main_1do_1event",
 	"gtk_1menu_1bar_1new",
 	"gtk_1menu_1item_1get_1submenu",
@@ -735,7 +718,6 @@ char * GTK_nativeFunctionNames[] = {
 	"gtk_1spin_1button_1get_1adjustment",
 	"gtk_1spin_1button_1get_1digits",
 	"gtk_1spin_1button_1new",
-	"gtk_1spin_1button_1set_1digits",
 	"gtk_1spin_1button_1set_1increments",
 	"gtk_1spin_1button_1set_1numeric",
 	"gtk_1spin_1button_1set_1range",
@@ -755,7 +737,6 @@ char * GTK_nativeFunctionNames[] = {
 	"gtk_1style_1context_1add_1provider_1for_1screen",
 	"gtk_1style_1context_1get__JI_3B_3JJ",
 	"gtk_1style_1context_1get__J_3B_3JJ",
-	"gtk_1style_1context_1get_1background_1color",
 	"gtk_1style_1context_1get_1border__JILorg_eclipse_swt_internal_gtk_GtkBorder_2",
 	"gtk_1style_1context_1get_1border__JLorg_eclipse_swt_internal_gtk_GtkBorder_2",
 	"gtk_1style_1context_1get_1color__JILorg_eclipse_swt_internal_gtk_GdkRGBA_2",
@@ -815,13 +796,11 @@ char * GTK_nativeFunctionNames[] = {
 	"gtk_1toggle_1button_1new",
 	"gtk_1toggle_1button_1set_1active",
 	"gtk_1toggle_1button_1set_1inconsistent",
-	"gtk_1toggle_1button_1set_1mode",
 	"gtk_1toggle_1tool_1button_1get_1active",
 	"gtk_1toggle_1tool_1button_1new",
 	"gtk_1toggle_1tool_1button_1set_1active",
 	"gtk_1tool_1button_1new",
 	"gtk_1tool_1button_1set_1icon_1widget",
-	"gtk_1tool_1button_1set_1label",
 	"gtk_1tool_1button_1set_1label_1widget",
 	"gtk_1tool_1button_1set_1use_1underline",
 	"gtk_1tool_1item_1get_1proxy_1menu_1item",
@@ -859,12 +838,10 @@ char * GTK_nativeFunctionNames[] = {
 	"gtk_1tree_1path_1prev",
 	"gtk_1tree_1path_1up",
 	"gtk_1tree_1selection_1count_1selected_1rows",
-	"gtk_1tree_1selection_1get_1select_1function",
 	"gtk_1tree_1selection_1get_1selected_1rows",
 	"gtk_1tree_1selection_1path_1is_1selected",
 	"gtk_1tree_1selection_1select_1all",
 	"gtk_1tree_1selection_1select_1iter",
-	"gtk_1tree_1selection_1select_1path",
 	"gtk_1tree_1selection_1set_1mode",
 	"gtk_1tree_1selection_1set_1select_1function",
 	"gtk_1tree_1selection_1unselect_1all",
@@ -936,7 +913,6 @@ char * GTK_nativeFunctionNames[] = {
 	"gtk_1tree_1view_1set_1headers_1visible",
 	"gtk_1tree_1view_1set_1model",
 	"gtk_1tree_1view_1set_1search_1column",
-	"gtk_1tree_1view_1unset_1rows_1drag_1dest",
 	"gtk_1viewport_1set_1shadow_1type",
 	"gtk_1widget_1add_1accelerator",
 	"gtk_1widget_1add_1controller",
@@ -991,7 +967,6 @@ char * GTK_nativeFunctionNames[] = {
 	"gtk_1widget_1hide",
 	"gtk_1widget_1input_1shape_1combine_1region",
 	"gtk_1widget_1is_1focus",
-	"gtk_1widget_1map",
 	"gtk_1widget_1measure",
 	"gtk_1widget_1mnemonic_1activate",
 	"gtk_1widget_1override_1font",
@@ -1017,7 +992,6 @@ char * GTK_nativeFunctionNames[] = {
 	"gtk_1widget_1set_1margin_1end",
 	"gtk_1widget_1set_1margin_1start",
 	"gtk_1widget_1set_1margin_1top",
-	"gtk_1widget_1set_1name",
 	"gtk_1widget_1set_1opacity",
 	"gtk_1widget_1set_1parent_1surface",
 	"gtk_1widget_1set_1parent_1window",
@@ -1136,25 +1110,18 @@ JNIEXPORT jint JNICALL STATS_NATIVE(Graphene_1GetFunctionCallCount)
 
 char * OS_nativeFunctionNames[] = {
 	"Call__JJII",
-	"Call__JJIJ",
 	"Call__JJJ",
 	"FcConfigAppFontAddFile",
 	"GDK_1WINDOWING_1WAYLAND",
 	"GDK_1WINDOWING_1X11",
-	"GInterfaceInfo_1sizeof",
 	"GPollFD_1sizeof",
-	"GString_1len",
-	"GString_1str",
 	"GTypeInfo_1sizeof",
-	"GTypeQuery_1sizeof",
-	"G_1OBJECT_1CLASS",
 	"G_1OBJECT_1CLASS_1CONSTRUCTOR",
 	"G_1OBJECT_1CLASS_1SET_1CONSTRUCTOR",
 	"G_1OBJECT_1GET_1CLASS",
 	"G_1OBJECT_1TYPE",
 	"G_1OBJECT_1TYPE_1NAME",
 	"G_1TYPE_1BOOLEAN",
-	"G_1TYPE_1CHECK_1INSTANCE_1TYPE",
 	"G_1TYPE_1DOUBLE",
 	"G_1TYPE_1FLOAT",
 	"G_1TYPE_1INT",
@@ -1174,9 +1141,6 @@ char * OS_nativeFunctionNames[] = {
 	"PangoLayoutRun_1sizeof",
 	"PangoLogAttr_1sizeof",
 	"PangoRectangle_1sizeof",
-	"RTLD_1GLOBAL",
-	"RTLD_1LAZY",
-	"RTLD_1NOW",
 	"XAnyEvent_1sizeof",
 	"XCheckIfEvent",
 	"XDefaultRootWindow",
@@ -1193,12 +1157,10 @@ char * OS_nativeFunctionNames[] = {
 	"XSynchronize",
 	"X_1EVENT_1TYPE",
 	"X_1EVENT_1WINDOW",
-	"access",
 	"cachejvmptr",
 	"call__JJJJJ",
 	"call__JJJJJJJ",
 	"call__JJJJJJJJ",
-	"dlopen",
 	"g_1app_1info_1create_1from_1commandline",
 	"g_1app_1info_1get_1all",
 	"g_1app_1info_1get_1default_1for_1type",
@@ -1207,7 +1169,6 @@ char * OS_nativeFunctionNames[] = {
 	"g_1app_1info_1get_1name",
 	"g_1app_1info_1launch",
 	"g_1app_1info_1launch_1default_1for_1uri",
-	"g_1app_1info_1should_1show",
 	"g_1app_1info_1supports_1uris",
 	"g_1bus_1own_1name",
 	"g_1bytes_1new",
@@ -1234,7 +1195,6 @@ char * OS_nativeFunctionNames[] = {
 	"g_1dbus_1node_1info_1lookup_1interface",
 	"g_1dbus_1node_1info_1new_1for_1xml",
 	"g_1dbus_1proxy_1call",
-	"g_1dbus_1proxy_1call_1finish",
 	"g_1dbus_1proxy_1call_1sync",
 	"g_1dbus_1proxy_1get_1name_1owner",
 	"g_1dbus_1proxy_1new_1for_1bus_1sync",
@@ -1267,17 +1227,11 @@ char * OS_nativeFunctionNames[] = {
 	"g_1list_1append",
 	"g_1list_1data",
 	"g_1list_1free",
-	"g_1list_1free_11",
 	"g_1list_1last",
 	"g_1list_1length",
 	"g_1list_1next",
-	"g_1list_1nth",
 	"g_1list_1nth_1data",
-	"g_1list_1prepend",
 	"g_1list_1previous",
-	"g_1list_1remove_1link",
-	"g_1list_1set_1next",
-	"g_1list_1set_1previous",
 	"g_1log_1default_1handler",
 	"g_1log_1remove_1handler",
 	"g_1log_1set_1handler",
@@ -1291,7 +1245,6 @@ char * OS_nativeFunctionNames[] = {
 	"g_1main_1context_1release",
 	"g_1main_1context_1wakeup",
 	"g_1malloc",
-	"g_1object_1class_1find_1property",
 	"g_1object_1get__J_3B_3IJ",
 	"g_1object_1get__J_3B_3JJ",
 	"g_1object_1get__J_3B_3ZJ",
@@ -1320,7 +1273,6 @@ char * OS_nativeFunctionNames[] = {
 	"g_1signal_1emit_1by_1name__J_3BLorg_eclipse_swt_internal_gtk_GdkRectangle_2",
 	"g_1signal_1emit_1by_1name__J_3B_3B",
 	"g_1signal_1handler_1disconnect",
-	"g_1signal_1handler_1find",
 	"g_1signal_1handlers_1block_1matched",
 	"g_1signal_1handlers_1unblock_1matched",
 	"g_1signal_1lookup",
@@ -1336,12 +1288,9 @@ char * OS_nativeFunctionNames[] = {
 	"g_1strconcat__JJJJ",
 	"g_1strdup",
 	"g_1strfreev",
-	"g_1string_1free",
-	"g_1string_1new_1len",
 	"g_1strtod",
 	"g_1time_1val_1add",
 	"g_1timeout_1add",
-	"g_1type_1add_1interface_1static",
 	"g_1type_1class_1peek",
 	"g_1type_1class_1peek_1parent",
 	"g_1type_1class_1ref",
@@ -1349,7 +1298,6 @@ char * OS_nativeFunctionNames[] = {
 	"g_1type_1interface_1peek_1parent",
 	"g_1type_1is_1a",
 	"g_1type_1parent",
-	"g_1type_1query",
 	"g_1type_1register_1static",
 	"g_1unsetenv",
 	"g_1utf16_1offset_1to_1pointer",
@@ -1383,7 +1331,6 @@ char * OS_nativeFunctionNames[] = {
 	"g_1variant_1get_1double",
 	"g_1variant_1get_1int32",
 	"g_1variant_1get_1string",
-	"g_1variant_1get_1type",
 	"g_1variant_1get_1type_1string",
 	"g_1variant_1get_1uint64",
 	"g_1variant_1is_1of_1type",
@@ -1408,8 +1355,6 @@ char * OS_nativeFunctionNames[] = {
 	"imContextLast",
 	"imContextNewProc_1CALLBACK",
 	"localeconv_1decimal_1point",
-	"memmove__JLorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I",
-	"memmove__JLorg_eclipse_swt_internal_gtk_GObjectClass_2",
 	"memmove__JLorg_eclipse_swt_internal_gtk_GTypeInfo_2I",
 	"memmove__JLorg_eclipse_swt_internal_gtk_GdkEventButton_2J",
 	"memmove__JLorg_eclipse_swt_internal_gtk_GdkEventKey_2J",
@@ -1419,8 +1364,6 @@ char * OS_nativeFunctionNames[] = {
 	"memmove__JLorg_eclipse_swt_internal_gtk_GtkWidgetClass_2",
 	"memmove__JLorg_eclipse_swt_internal_gtk_PangoAttribute_2J",
 	"memmove__JLorg_eclipse_swt_internal_gtk_XExposeEvent_2J",
-	"memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2J",
-	"memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2JJ",
 	"memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2JJ",
 	"memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2JJ",
 	"memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2JJ",
@@ -1496,7 +1439,6 @@ char * OS_nativeFunctionNames[] = {
 	"pango_1font_1face_1describe",
 	"pango_1font_1family_1get_1name",
 	"pango_1font_1family_1list_1faces",
-	"pango_1font_1get_1metrics",
 	"pango_1font_1map_1create_1context",
 	"pango_1font_1metrics_1get_1approximate_1char_1width",
 	"pango_1font_1metrics_1get_1ascent",
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h
index e0a93e09de..5c11fb4d5b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h
@@ -130,7 +130,6 @@ typedef enum {
 	gdk_1keyval_1to_1unicode_FUNC,
 	gdk_1monitor_1get_1geometry_FUNC,
 	gdk_1monitor_1get_1scale_1factor_FUNC,
-	gdk_1monitor_1get_1width_1mm_FUNC,
 	gdk_1monitor_1get_1workarea_FUNC,
 	gdk_1pango_1context_1get_FUNC,
 	gdk_1pango_1layout_1get_1clip_1region_FUNC,
@@ -144,7 +143,6 @@ typedef enum {
 	gdk_1pixbuf_1copy_1area_FUNC,
 	gdk_1pixbuf_1format_1get_1name_FUNC,
 	gdk_1pixbuf_1get_1bits_1per_1sample_FUNC,
-	gdk_1pixbuf_1get_1byte_1length_FUNC,
 	gdk_1pixbuf_1get_1from_1window_FUNC,
 	gdk_1pixbuf_1get_1has_1alpha_FUNC,
 	gdk_1pixbuf_1get_1height_FUNC,
@@ -165,7 +163,6 @@ typedef enum {
 	gdk_1pixbuf_1scale_1simple_FUNC,
 	gdk_1property_1get_FUNC,
 	gdk_1rgba_1free_FUNC,
-	gdk_1rgba_1hash_FUNC,
 	gdk_1rgba_1parse_FUNC,
 	gdk_1rgba_1to_1string_FUNC,
 	gdk_1screen_1get_1default_FUNC,
@@ -269,7 +266,6 @@ typedef enum {
 	gdk_1x11_1screen_1lookup_1visual_FUNC,
 	gdk_1x11_1surface_1get_1xid_FUNC,
 	gdk_1x11_1surface_1lookup_1for_1display_FUNC,
-	gdk_1x11_1visual_1get_1xvisual_FUNC,
 	gdk_1x11_1window_1get_1xid_FUNC,
 	gdk_1x11_1window_1lookup_1for_1display_FUNC,
 } GDK_FUNCS;
@@ -323,7 +319,6 @@ typedef enum {
 	GtkTargetEntry_1sizeof_FUNC,
 	GtkTextIter_1sizeof_FUNC,
 	GtkTreeIter_1sizeof_FUNC,
-	_1GTK_1ACCESSIBLE_FUNC,
 	gtk_1accel_1group_1new_FUNC,
 	gtk_1accel_1label_1new_FUNC,
 	gtk_1accel_1label_1set_1accel_FUNC,
@@ -353,7 +348,6 @@ typedef enum {
 	gtk_1box_1set_1child_1packing__JJZZII_FUNC,
 	gtk_1box_1set_1homogeneous_FUNC,
 	gtk_1box_1set_1spacing_FUNC,
-	gtk_1button_1clicked_FUNC,
 	gtk_1button_1new_FUNC,
 	gtk_1button_1set_1image_FUNC,
 	gtk_1calendar_1clear_1marks_FUNC,
@@ -413,7 +407,6 @@ typedef enum {
 	gtk_1container_1propagate_1draw_FUNC,
 	gtk_1container_1remove_FUNC,
 	gtk_1container_1set_1border_1width_FUNC,
-	gtk_1css_1provider_1get_1named_FUNC,
 	gtk_1css_1provider_1load_1from_1data__J_3BJ_FUNC,
 	gtk_1css_1provider_1load_1from_1data__J_3BJ_3J_FUNC,
 	gtk_1css_1provider_1new_FUNC,
@@ -423,7 +416,6 @@ typedef enum {
 	gtk_1drag_1begin_1with_1coordinates__JJIIJII_FUNC,
 	gtk_1drag_1begin_1with_1coordinates__JJJIII_FUNC,
 	gtk_1drag_1check_1threshold_FUNC,
-	gtk_1drag_1dest_1find_1target_FUNC,
 	gtk_1drag_1dest_1set_FUNC,
 	gtk_1drag_1dest_1unset_FUNC,
 	gtk_1drag_1finish_FUNC,
@@ -476,8 +468,7 @@ typedef enum {
 	gtk_1expander_1set_1expanded_FUNC,
 	gtk_1expander_1set_1label_1widget_FUNC,
 	gtk_1file_1chooser_1add_1filter_FUNC,
-	gtk_1file_1chooser_1dialog_1new___3BJIJIJIJ_FUNC,
-	gtk_1file_1chooser_1dialog_1new___3BJI_3BI_3BIJ_FUNC,
+	gtk_1file_1chooser_1dialog_1new_FUNC,
 	gtk_1file_1chooser_1get_1filename_FUNC,
 	gtk_1file_1chooser_1get_1filenames_FUNC,
 	gtk_1file_1chooser_1get_1filter_FUNC,
@@ -508,21 +499,14 @@ typedef enum {
 	gtk_1gesture_1drag_1get_1offset_FUNC,
 	gtk_1gesture_1drag_1get_1start_1point_FUNC,
 	gtk_1gesture_1drag_1new_FUNC,
-	gtk_1gesture_1get_1last_1event_FUNC,
 	gtk_1gesture_1get_1last_1updated_1sequence_FUNC,
 	gtk_1gesture_1get_1point_FUNC,
-	gtk_1gesture_1get_1sequences_FUNC,
-	gtk_1gesture_1group_FUNC,
 	gtk_1gesture_1is_1recognized_FUNC,
 	gtk_1gesture_1multi_1press_1new_FUNC,
-	gtk_1gesture_1pan_1get_1orientation_FUNC,
-	gtk_1gesture_1pan_1new_FUNC,
-	gtk_1gesture_1pan_1set_1orientation_FUNC,
 	gtk_1gesture_1rotate_1get_1angle_1delta_FUNC,
 	gtk_1gesture_1rotate_1new_FUNC,
 	gtk_1gesture_1single_1set_1button_FUNC,
 	gtk_1gesture_1swipe_1get_1velocity_FUNC,
-	gtk_1gesture_1swipe_1new_FUNC,
 	gtk_1gesture_1zoom_1get_1scale_1delta_FUNC,
 	gtk_1gesture_1zoom_1new_FUNC,
 	gtk_1get_1current_1event_FUNC,
@@ -585,7 +569,6 @@ typedef enum {
 	gtk_1list_1store_1set__JJILorg_eclipse_swt_internal_gtk_GdkRGBA_2I_FUNC,
 	gtk_1list_1store_1set__JJIZI_FUNC,
 	gtk_1list_1store_1set__JJI_3BI_FUNC,
-	gtk_1main_FUNC,
 	gtk_1main_1do_1event_FUNC,
 	gtk_1menu_1bar_1new_FUNC,
 	gtk_1menu_1item_1get_1submenu_FUNC,
@@ -733,7 +716,6 @@ typedef enum {
 	gtk_1spin_1button_1get_1adjustment_FUNC,
 	gtk_1spin_1button_1get_1digits_FUNC,
 	gtk_1spin_1button_1new_FUNC,
-	gtk_1spin_1button_1set_1digits_FUNC,
 	gtk_1spin_1button_1set_1increments_FUNC,
 	gtk_1spin_1button_1set_1numeric_FUNC,
 	gtk_1spin_1button_1set_1range_FUNC,
@@ -753,7 +735,6 @@ typedef enum {
 	gtk_1style_1context_1add_1provider_1for_1screen_FUNC,
 	gtk_1style_1context_1get__JI_3B_3JJ_FUNC,
 	gtk_1style_1context_1get__J_3B_3JJ_FUNC,
-	gtk_1style_1context_1get_1background_1color_FUNC,
 	gtk_1style_1context_1get_1border__JILorg_eclipse_swt_internal_gtk_GtkBorder_2_FUNC,
 	gtk_1style_1context_1get_1border__JLorg_eclipse_swt_internal_gtk_GtkBorder_2_FUNC,
 	gtk_1style_1context_1get_1color__JILorg_eclipse_swt_internal_gtk_GdkRGBA_2_FUNC,
@@ -813,13 +794,11 @@ typedef enum {
 	gtk_1toggle_1button_1new_FUNC,
 	gtk_1toggle_1button_1set_1active_FUNC,
 	gtk_1toggle_1button_1set_1inconsistent_FUNC,
-	gtk_1toggle_1button_1set_1mode_FUNC,
 	gtk_1toggle_1tool_1button_1get_1active_FUNC,
 	gtk_1toggle_1tool_1button_1new_FUNC,
 	gtk_1toggle_1tool_1button_1set_1active_FUNC,
 	gtk_1tool_1button_1new_FUNC,
 	gtk_1tool_1button_1set_1icon_1widget_FUNC,
-	gtk_1tool_1button_1set_1label_FUNC,
 	gtk_1tool_1button_1set_1label_1widget_FUNC,
 	gtk_1tool_1button_1set_1use_1underline_FUNC,
 	gtk_1tool_1item_1get_1proxy_1menu_1item_FUNC,
@@ -857,12 +836,10 @@ typedef enum {
 	gtk_1tree_1path_1prev_FUNC,
 	gtk_1tree_1path_1up_FUNC,
 	gtk_1tree_1selection_1count_1selected_1rows_FUNC,
-	gtk_1tree_1selection_1get_1select_1function_FUNC,
 	gtk_1tree_1selection_1get_1selected_1rows_FUNC,
 	gtk_1tree_1selection_1path_1is_1selected_FUNC,
 	gtk_1tree_1selection_1select_1all_FUNC,
 	gtk_1tree_1selection_1select_1iter_FUNC,
-	gtk_1tree_1selection_1select_1path_FUNC,
 	gtk_1tree_1selection_1set_1mode_FUNC,
 	gtk_1tree_1selection_1set_1select_1function_FUNC,
 	gtk_1tree_1selection_1unselect_1all_FUNC,
@@ -934,7 +911,6 @@ typedef enum {
 	gtk_1tree_1view_1set_1headers_1visible_FUNC,
 	gtk_1tree_1view_1set_1model_FUNC,
 	gtk_1tree_1view_1set_1search_1column_FUNC,
-	gtk_1tree_1view_1unset_1rows_1drag_1dest_FUNC,
 	gtk_1viewport_1set_1shadow_1type_FUNC,
 	gtk_1widget_1add_1accelerator_FUNC,
 	gtk_1widget_1add_1controller_FUNC,
@@ -989,7 +965,6 @@ typedef enum {
 	gtk_1widget_1hide_FUNC,
 	gtk_1widget_1input_1shape_1combine_1region_FUNC,
 	gtk_1widget_1is_1focus_FUNC,
-	gtk_1widget_1map_FUNC,
 	gtk_1widget_1measure_FUNC,
 	gtk_1widget_1mnemonic_1activate_FUNC,
 	gtk_1widget_1override_1font_FUNC,
@@ -1015,7 +990,6 @@ typedef enum {
 	gtk_1widget_1set_1margin_1end_FUNC,
 	gtk_1widget_1set_1margin_1start_FUNC,
 	gtk_1widget_1set_1margin_1top_FUNC,
-	gtk_1widget_1set_1name_FUNC,
 	gtk_1widget_1set_1opacity_FUNC,
 	gtk_1widget_1set_1parent_1surface_FUNC,
 	gtk_1widget_1set_1parent_1window_FUNC,
@@ -1110,25 +1084,18 @@ extern char* OS_nativeFunctionNames[];
 
 typedef enum {
 	Call__JJII_FUNC,
-	Call__JJIJ_FUNC,
 	Call__JJJ_FUNC,
 	FcConfigAppFontAddFile_FUNC,
 	GDK_1WINDOWING_1WAYLAND_FUNC,
 	GDK_1WINDOWING_1X11_FUNC,
-	GInterfaceInfo_1sizeof_FUNC,
 	GPollFD_1sizeof_FUNC,
-	GString_1len_FUNC,
-	GString_1str_FUNC,
 	GTypeInfo_1sizeof_FUNC,
-	GTypeQuery_1sizeof_FUNC,
-	G_1OBJECT_1CLASS_FUNC,
 	G_1OBJECT_1CLASS_1CONSTRUCTOR_FUNC,
 	G_1OBJECT_1CLASS_1SET_1CONSTRUCTOR_FUNC,
 	G_1OBJECT_1GET_1CLASS_FUNC,
 	G_1OBJECT_1TYPE_FUNC,
 	G_1OBJECT_1TYPE_1NAME_FUNC,
 	G_1TYPE_1BOOLEAN_FUNC,
-	G_1TYPE_1CHECK_1INSTANCE_1TYPE_FUNC,
 	G_1TYPE_1DOUBLE_FUNC,
 	G_1TYPE_1FLOAT_FUNC,
 	G_1TYPE_1INT_FUNC,
@@ -1148,9 +1115,6 @@ typedef enum {
 	PangoLayoutRun_1sizeof_FUNC,
 	PangoLogAttr_1sizeof_FUNC,
 	PangoRectangle_1sizeof_FUNC,
-	RTLD_1GLOBAL_FUNC,
-	RTLD_1LAZY_FUNC,
-	RTLD_1NOW_FUNC,
 	XAnyEvent_1sizeof_FUNC,
 	XCheckIfEvent_FUNC,
 	XDefaultRootWindow_FUNC,
@@ -1167,12 +1131,10 @@ typedef enum {
 	XSynchronize_FUNC,
 	X_1EVENT_1TYPE_FUNC,
 	X_1EVENT_1WINDOW_FUNC,
-	access_FUNC,
 	cachejvmptr_FUNC,
 	call__JJJJJ_FUNC,
 	call__JJJJJJJ_FUNC,
 	call__JJJJJJJJ_FUNC,
-	dlopen_FUNC,
 	g_1app_1info_1create_1from_1commandline_FUNC,
 	g_1app_1info_1get_1all_FUNC,
 	g_1app_1info_1get_1default_1for_1type_FUNC,
@@ -1181,7 +1143,6 @@ typedef enum {
 	g_1app_1info_1get_1name_FUNC,
 	g_1app_1info_1launch_FUNC,
 	g_1app_1info_1launch_1default_1for_1uri_FUNC,
-	g_1app_1info_1should_1show_FUNC,
 	g_1app_1info_1supports_1uris_FUNC,
 	g_1bus_1own_1name_FUNC,
 	g_1bytes_1new_FUNC,
@@ -1208,7 +1169,6 @@ typedef enum {
 	g_1dbus_1node_1info_1lookup_1interface_FUNC,
 	g_1dbus_1node_1info_1new_1for_1xml_FUNC,
 	g_1dbus_1proxy_1call_FUNC,
-	g_1dbus_1proxy_1call_1finish_FUNC,
 	g_1dbus_1proxy_1call_1sync_FUNC,
 	g_1dbus_1proxy_1get_1name_1owner_FUNC,
 	g_1dbus_1proxy_1new_1for_1bus_1sync_FUNC,
@@ -1241,17 +1201,11 @@ typedef enum {
 	g_1list_1append_FUNC,
 	g_1list_1data_FUNC,
 	g_1list_1free_FUNC,
-	g_1list_1free_11_FUNC,
 	g_1list_1last_FUNC,
 	g_1list_1length_FUNC,
 	g_1list_1next_FUNC,
-	g_1list_1nth_FUNC,
 	g_1list_1nth_1data_FUNC,
-	g_1list_1prepend_FUNC,
 	g_1list_1previous_FUNC,
-	g_1list_1remove_1link_FUNC,
-	g_1list_1set_1next_FUNC,
-	g_1list_1set_1previous_FUNC,
 	g_1log_1default_1handler_FUNC,
 	g_1log_1remove_1handler_FUNC,
 	g_1log_1set_1handler_FUNC,
@@ -1265,7 +1219,6 @@ typedef enum {
 	g_1main_1context_1release_FUNC,
 	g_1main_1context_1wakeup_FUNC,
 	g_1malloc_FUNC,
-	g_1object_1class_1find_1property_FUNC,
 	g_1object_1get__J_3B_3IJ_FUNC,
 	g_1object_1get__J_3B_3JJ_FUNC,
 	g_1object_1get__J_3B_3ZJ_FUNC,
@@ -1294,7 +1247,6 @@ typedef enum {
 	g_1signal_1emit_1by_1name__J_3BLorg_eclipse_swt_internal_gtk_GdkRectangle_2_FUNC,
 	g_1signal_1emit_1by_1name__J_3B_3B_FUNC,
 	g_1signal_1handler_1disconnect_FUNC,
-	g_1signal_1handler_1find_FUNC,
 	g_1signal_1handlers_1block_1matched_FUNC,
 	g_1signal_1handlers_1unblock_1matched_FUNC,
 	g_1signal_1lookup_FUNC,
@@ -1310,12 +1262,9 @@ typedef enum {
 	g_1strconcat__JJJJ_FUNC,
 	g_1strdup_FUNC,
 	g_1strfreev_FUNC,
-	g_1string_1free_FUNC,
-	g_1string_1new_1len_FUNC,
 	g_1strtod_FUNC,
 	g_1time_1val_1add_FUNC,
 	g_1timeout_1add_FUNC,
-	g_1type_1add_1interface_1static_FUNC,
 	g_1type_1class_1peek_FUNC,
 	g_1type_1class_1peek_1parent_FUNC,
 	g_1type_1class_1ref_FUNC,
@@ -1323,7 +1272,6 @@ typedef enum {
 	g_1type_1interface_1peek_1parent_FUNC,
 	g_1type_1is_1a_FUNC,
 	g_1type_1parent_FUNC,
-	g_1type_1query_FUNC,
 	g_1type_1register_1static_FUNC,
 	g_1unsetenv_FUNC,
 	g_1utf16_1offset_1to_1pointer_FUNC,
@@ -1357,7 +1305,6 @@ typedef enum {
 	g_1variant_1get_1double_FUNC,
 	g_1variant_1get_1int32_FUNC,
 	g_1variant_1get_1string_FUNC,
-	g_1variant_1get_1type_FUNC,
 	g_1variant_1get_1type_1string_FUNC,
 	g_1variant_1get_1uint64_FUNC,
 	g_1variant_1is_1of_1type_FUNC,
@@ -1382,8 +1329,6 @@ typedef enum {
 	imContextLast_FUNC,
 	imContextNewProc_1CALLBACK_FUNC,
 	localeconv_1decimal_1point_FUNC,
-	memmove__JLorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I_FUNC,
-	memmove__JLorg_eclipse_swt_internal_gtk_GObjectClass_2_FUNC,
 	memmove__JLorg_eclipse_swt_internal_gtk_GTypeInfo_2I_FUNC,
 	memmove__JLorg_eclipse_swt_internal_gtk_GdkEventButton_2J_FUNC,
 	memmove__JLorg_eclipse_swt_internal_gtk_GdkEventKey_2J_FUNC,
@@ -1393,8 +1338,6 @@ typedef enum {
 	memmove__JLorg_eclipse_swt_internal_gtk_GtkWidgetClass_2_FUNC,
 	memmove__JLorg_eclipse_swt_internal_gtk_PangoAttribute_2J_FUNC,
 	memmove__JLorg_eclipse_swt_internal_gtk_XExposeEvent_2J_FUNC,
-	memmove__Lorg_eclipse_swt_internal_gtk_GObjectClass_2J_FUNC,
-	memmove__Lorg_eclipse_swt_internal_gtk_GTypeQuery_2JJ_FUNC,
 	memmove__Lorg_eclipse_swt_internal_gtk_GdkEventButton_2JJ_FUNC,
 	memmove__Lorg_eclipse_swt_internal_gtk_GdkEventCrossing_2JJ_FUNC,
 	memmove__Lorg_eclipse_swt_internal_gtk_GdkEventFocus_2JJ_FUNC,
@@ -1470,7 +1413,6 @@ typedef enum {
 	pango_1font_1face_1describe_FUNC,
 	pango_1font_1family_1get_1name_FUNC,
 	pango_1font_1family_1list_1faces_FUNC,
-	pango_1font_1get_1metrics_FUNC,
 	pango_1font_1map_1create_1context_FUNC,
 	pango_1font_1metrics_1get_1approximate_1char_1width_FUNC,
 	pango_1font_1metrics_1get_1ascent_FUNC,
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.c
index 0ded92b233..8f903b16e4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.c
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2019 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2020 IBM Corporation and others. All rights reserved.
  * The contents of this file are made available under the terms
  * of the GNU Lesser General Public License (LGPL) Version 2.1 that
  * accompanies this distribution (lgpl-v21.txt).  The LGPL is also
@@ -19,43 +19,6 @@
 #include "swt.h"
 #include "os_structs.h"
 
-#ifndef NO_GInterfaceInfo
-typedef struct GInterfaceInfo_FID_CACHE {
-	int cached;
-	jclass clazz;
-	jfieldID interface_init, interface_finalize, interface_data;
-} GInterfaceInfo_FID_CACHE;
-
-GInterfaceInfo_FID_CACHE GInterfaceInfoFc;
-
-void cacheGInterfaceInfoFields(JNIEnv *env, jobject lpObject)
-{
-	if (GInterfaceInfoFc.cached) return;
-	GInterfaceInfoFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	GInterfaceInfoFc.interface_init = (*env)->GetFieldID(env, GInterfaceInfoFc.clazz, "interface_init", "J");
-	GInterfaceInfoFc.interface_finalize = (*env)->GetFieldID(env, GInterfaceInfoFc.clazz, "interface_finalize", "J");
-	GInterfaceInfoFc.interface_data = (*env)->GetFieldID(env, GInterfaceInfoFc.clazz, "interface_data", "J");
-	GInterfaceInfoFc.cached = 1;
-}
-
-GInterfaceInfo *getGInterfaceInfoFields(JNIEnv *env, jobject lpObject, GInterfaceInfo *lpStruct)
-{
-	if (!GInterfaceInfoFc.cached) cacheGInterfaceInfoFields(env, lpObject);
-	lpStruct->interface_init = (GInterfaceInitFunc)(*env)->GetLongField(env, lpObject, GInterfaceInfoFc.interface_init);
-	lpStruct->interface_finalize = (GInterfaceFinalizeFunc)(*env)->GetLongField(env, lpObject, GInterfaceInfoFc.interface_finalize);
-	lpStruct->interface_data = (gpointer)(*env)->GetLongField(env, lpObject, GInterfaceInfoFc.interface_data);
-	return lpStruct;
-}
-
-void setGInterfaceInfoFields(JNIEnv *env, jobject lpObject, GInterfaceInfo *lpStruct)
-{
-	if (!GInterfaceInfoFc.cached) cacheGInterfaceInfoFields(env, lpObject);
-	(*env)->SetLongField(env, lpObject, GInterfaceInfoFc.interface_init, (jlong)lpStruct->interface_init);
-	(*env)->SetLongField(env, lpObject, GInterfaceInfoFc.interface_finalize, (jlong)lpStruct->interface_finalize);
-	(*env)->SetLongField(env, lpObject, GInterfaceInfoFc.interface_data, (jlong)lpStruct->interface_data);
-}
-#endif
-
 #ifndef NO_GObjectClass
 typedef struct GObjectClass_FID_CACHE {
 	int cached;
@@ -163,46 +126,6 @@ void setGTypeInfoFields(JNIEnv *env, jobject lpObject, GTypeInfo *lpStruct)
 }
 #endif
 
-#ifndef NO_GTypeQuery
-typedef struct GTypeQuery_FID_CACHE {
-	int cached;
-	jclass clazz;
-	jfieldID type, type_name, class_size, instance_size;
-} GTypeQuery_FID_CACHE;
-
-GTypeQuery_FID_CACHE GTypeQueryFc;
-
-void cacheGTypeQueryFields(JNIEnv *env, jobject lpObject)
-{
-	if (GTypeQueryFc.cached) return;
-	GTypeQueryFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	GTypeQueryFc.type = (*env)->GetFieldID(env, GTypeQueryFc.clazz, "type", "I");
-	GTypeQueryFc.type_name = (*env)->GetFieldID(env, GTypeQueryFc.clazz, "type_name", "J");
-	GTypeQueryFc.class_size = (*env)->GetFieldID(env, GTypeQueryFc.clazz, "class_size", "I");
-	GTypeQueryFc.instance_size = (*env)->GetFieldID(env, GTypeQueryFc.clazz, "instance_size", "I");
-	GTypeQueryFc.cached = 1;
-}
-
-GTypeQuery *getGTypeQueryFields(JNIEnv *env, jobject lpObject, GTypeQuery *lpStruct)
-{
-	if (!GTypeQueryFc.cached) cacheGTypeQueryFields(env, lpObject);
-	lpStruct->type = (GType)(*env)->GetIntField(env, lpObject, GTypeQueryFc.type);
-	lpStruct->type_name = (const gchar *)(*env)->GetLongField(env, lpObject, GTypeQueryFc.type_name);
-	lpStruct->class_size = (guint)(*env)->GetIntField(env, lpObject, GTypeQueryFc.class_size);
-	lpStruct->instance_size = (guint)(*env)->GetIntField(env, lpObject, GTypeQueryFc.instance_size);
-	return lpStruct;
-}
-
-void setGTypeQueryFields(JNIEnv *env, jobject lpObject, GTypeQuery *lpStruct)
-{
-	if (!GTypeQueryFc.cached) cacheGTypeQueryFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, GTypeQueryFc.type, (jint)lpStruct->type);
-	(*env)->SetLongField(env, lpObject, GTypeQueryFc.type_name, (jlong)lpStruct->type_name);
-	(*env)->SetIntField(env, lpObject, GTypeQueryFc.class_size, (jint)lpStruct->class_size);
-	(*env)->SetIntField(env, lpObject, GTypeQueryFc.instance_size, (jint)lpStruct->instance_size);
-}
-#endif
-
 #ifndef NO_GdkEvent
 typedef struct GdkEvent_FID_CACHE {
 	int cached;
@@ -234,43 +157,6 @@ void setGdkEventFields(JNIEnv *env, jobject lpObject, GdkEvent *lpStruct)
 }
 #endif
 
-#ifndef NO_GdkEventAny
-typedef struct GdkEventAny_FID_CACHE {
-	int cached;
-	jclass clazz;
-	jfieldID window, send_event;
-} GdkEventAny_FID_CACHE;
-
-GdkEventAny_FID_CACHE GdkEventAnyFc;
-
-void cacheGdkEventAnyFields(JNIEnv *env, jobject lpObject)
-{
-	if (GdkEventAnyFc.cached) return;
-	cacheGdkEventFields(env, lpObject);
-	GdkEventAnyFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	GdkEventAnyFc.window = (*env)->GetFieldID(env, GdkEventAnyFc.clazz, "window", "J");
-	GdkEventAnyFc.send_event = (*env)->GetFieldID(env, GdkEventAnyFc.clazz, "send_event", "B");
-	GdkEventAnyFc.cached = 1;
-}
-
-GdkEventAny *getGdkEventAnyFields(JNIEnv *env, jobject lpObject, GdkEventAny *lpStruct)
-{
-	if (!GdkEventAnyFc.cached) cacheGdkEventAnyFields(env, lpObject);
-	getGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
-	lpStruct->window = (GdkWindow *)(*env)->GetLongField(env, lpObject, GdkEventAnyFc.window);
-	lpStruct->send_event = (gint8)(*env)->GetByteField(env, lpObject, GdkEventAnyFc.send_event);
-	return lpStruct;
-}
-
-void setGdkEventAnyFields(JNIEnv *env, jobject lpObject, GdkEventAny *lpStruct)
-{
-	if (!GdkEventAnyFc.cached) cacheGdkEventAnyFields(env, lpObject);
-	setGdkEventFields(env, lpObject, (GdkEvent *)lpStruct);
-	(*env)->SetLongField(env, lpObject, GdkEventAnyFc.window, (jlong)lpStruct->window);
-	(*env)->SetByteField(env, lpObject, GdkEventAnyFc.send_event, (jbyte)lpStruct->send_event);
-}
-#endif
-
 #ifndef NO_GdkEventButton
 typedef struct GdkEventButton_FID_CACHE {
 	int cached;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.h
index 7d66133db7..f5d3383167 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.h
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2019 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2000, 2020 IBM Corporation and others. All rights reserved.
  * The contents of this file are made available under the terms
  * of the GNU Lesser General Public License (LGPL) Version 2.1 that
  * accompanies this distribution (lgpl-v21.txt).  The LGPL is also
@@ -18,18 +18,6 @@
 
 #include "os.h"
 
-#ifndef NO_GInterfaceInfo
-void cacheGInterfaceInfoFields(JNIEnv *env, jobject lpObject);
-GInterfaceInfo *getGInterfaceInfoFields(JNIEnv *env, jobject lpObject, GInterfaceInfo *lpStruct);
-void setGInterfaceInfoFields(JNIEnv *env, jobject lpObject, GInterfaceInfo *lpStruct);
-#define GInterfaceInfo_sizeof() sizeof(GInterfaceInfo)
-#else
-#define cacheGInterfaceInfoFields(a,b)
-#define getGInterfaceInfoFields(a,b,c) NULL
-#define setGInterfaceInfoFields(a,b,c)
-#define GInterfaceInfo_sizeof() 0
-#endif
-
 #ifndef NO_GObjectClass
 void cacheGObjectClassFields(JNIEnv *env, jobject lpObject);
 GObjectClass *getGObjectClassFields(JNIEnv *env, jobject lpObject, GObjectClass *lpStruct);
@@ -54,18 +42,6 @@ void setGTypeInfoFields(JNIEnv *env, jobject lpObject, GTypeInfo *lpStruct);
 #define GTypeInfo_sizeof() 0
 #endif
 
-#ifndef NO_GTypeQuery
-void cacheGTypeQueryFields(JNIEnv *env, jobject lpObject);
-GTypeQuery *getGTypeQueryFields(JNIEnv *env, jobject lpObject, GTypeQuery *lpStruct);
-void setGTypeQueryFields(JNIEnv *env, jobject lpObject, GTypeQuery *lpStruct);
-#define GTypeQuery_sizeof() sizeof(GTypeQuery)
-#else
-#define cacheGTypeQueryFields(a,b)
-#define getGTypeQueryFields(a,b,c) NULL
-#define setGTypeQueryFields(a,b,c)
-#define GTypeQuery_sizeof() 0
-#endif
-
 #ifndef NO_GdkEvent
 void cacheGdkEventFields(JNIEnv *env, jobject lpObject);
 GdkEvent *getGdkEventFields(JNIEnv *env, jobject lpObject, GdkEvent *lpStruct);
@@ -78,18 +54,6 @@ void setGdkEventFields(JNIEnv *env, jobject lpObject, GdkEvent *lpStruct);
 #define GdkEvent_sizeof() 0
 #endif
 
-#ifndef NO_GdkEventAny
-void cacheGdkEventAnyFields(JNIEnv *env, jobject lpObject);
-GdkEventAny *getGdkEventAnyFields(JNIEnv *env, jobject lpObject, GdkEventAny *lpStruct);
-void setGdkEventAnyFields(JNIEnv *env, jobject lpObject, GdkEventAny *lpStruct);
-#define GdkEventAny_sizeof() sizeof(GdkEventAny)
-#else
-#define cacheGdkEventAnyFields(a,b)
-#define getGdkEventAnyFields(a,b,c) NULL
-#define setGdkEventAnyFields(a,b,c)
-#define GdkEventAny_sizeof() 0
-#endif
-
 #ifndef NO_GdkEventButton
 void cacheGdkEventButtonFields(JNIEnv *env, jobject lpObject);
 GdkEventButton *getGdkEventButtonFields(JNIEnv *env, jobject lpObject, GdkEventButton *lpStruct);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/ATK.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/ATK.java
index 1df725da3f..e9ea39f900 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/ATK.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/ATK.java
@@ -161,7 +161,6 @@ public class ATK extends OS {
 
 	/** Signals */
 	public static final byte[] selection_changed = OS.ascii ("selection_changed");
-	public static final byte[] active_descendant_changed = OS.ascii ("active_descendant_changed");
 	public static final byte[] text_changed_insert = OS.ascii ("text_changed::insert");
 	public static final byte[] text_changed_delete = OS.ascii ("text_changed::delete");
 	public static final byte[] text_caret_moved = OS.ascii ("text_caret_moved");
@@ -169,7 +168,6 @@ public class ATK extends OS {
 	public static final byte[] load_complete = OS.ascii ("load-complete");
 	public static final byte[] load_stopped = OS.ascii ("load-stopped");
 	public static final byte[] reload = OS.ascii ("reload");
-	public static final byte[] state_change = OS.ascii ("state-change");
 	public static final byte[] bounds_changed = OS.ascii ("bounds-changed");
 	public static final byte[] link_activated = OS.ascii ("link-activated");
 	public static final byte[] link_selected = OS.ascii ("link-selected");
@@ -220,11 +218,8 @@ public static final native long ATK_TYPE_TABLE ();
 public static final native long ATK_TYPE_TEXT ();
 /** @method flags=const */
 public static final native long ATK_TYPE_VALUE ();
-/** @method flags=const */
-public static final native long ATK_TYPE_OBJECT_FACTORY ();
 public static final native long ATK_ACTION_GET_IFACE(long obj);
 public static final native long ATK_COMPONENT_GET_IFACE(long atkHandle);
-public static final native long _ATK_OBJECT_FACTORY_CLASS (long klass);
 public static final native long ATK_SELECTION_GET_IFACE(long obj);
 public static final native long ATK_EDITABLE_TEXT_GET_IFACE(long handle);
 public static final native long ATK_HYPERTEXT_GET_IFACE(long handle);
@@ -265,15 +260,6 @@ public static final native void memmove (AtkSelectionIface dest, long src);
 public static final native void memmove (AtkTableIface dest, long src);
 public static final native void memmove (AtkTextIface dest, long src);
 public static final native void memmove (AtkValueIface dest, long src);
-public static final native void memmove (long dest, AtkActionIface src);
-public static final native void memmove (long dest, AtkComponentIface src);
-public static final native void memmove (long dest, AtkEditableTextIface src);
-public static final native void memmove (long dest, AtkHypertextIface src);
-public static final native void memmove (long dest, AtkObjectClass src);
-public static final native void memmove (long dest, AtkSelectionIface src);
-public static final native void memmove (long dest, AtkTableIface src);
-public static final native void memmove (long dest, AtkTextIface src);
-public static final native void memmove (long dest, AtkValueIface src);
 /**
  * @param dest cast=(void *)
  * @param src cast=(const void *),flags=no_out
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GDK.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GDK.java
index daac1b2672..0559eb8520 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GDK.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GDK.java
@@ -52,9 +52,7 @@ public class GDK extends OS {
 	public static final int GDK_CROSSING_GRAB = 1;
 	public static final int GDK_CROSSING_UNGRAB = 2;
 	public static final int GDK_Break = 0xff6b;
-	public static final int GDK_Cancel = 0xff69;
 	public static final int GDK_Caps_Lock = 0xffE5;
-	public static final int GDK_Clear = 0xff0B;
 	public static final int GDK_Control_L = 0xffe3;
 	public static final int GDK_Control_R = 0xffe4;
 	public static final int GDK_CURRENT_TIME = 0x0;
@@ -108,20 +106,10 @@ public class GDK extends OS {
 	public static final int GDK_FUNC_CLOSE = 32;
 	public static final int GDK_GRAB_SUCCESS = 0x0;
 	public static final int GDK_GRAVITY_NORTH_WEST = 1;
-	public static final int GDK_GRAVITY_NORTH = 2;
-	public static final int GDK_GRAVITY_NORTH_EAST = 3;
-	public static final int GDK_GRAVITY_WEST = 4;
-	public static final int GDK_GRAVITY_CENTER = 5;
-	public static final int GDK_GRAVITY_EAST = 6;
-	public static final int GDK_GRAVITY_SOUTH_WEST = 7;
-	public static final int GDK_GRAVITY_SOUTH = 8;
-	public static final int GDK_GRAVITY_SOUTH_EAST = 9;
-	public static final int GDK_GRAVITY_STATIC = 10;
 	public static final int GDK_HAND2 = 0x3c;
 	public static final int GDK_Help = 0xFF6A;
 	public static final int GDK_HINT_MIN_SIZE = 1 << 1;
 	public static final int GDK_Home = 0xff50;
-	public static final int GDK_INCLUDE_INFERIORS = 0x1;
 	public static final int GDK_INPUT_ONLY = 1;
 	public static final int GDK_INTERP_BILINEAR = 0x2;
 	public static final int GDK_Insert = 0xff63;
@@ -188,10 +176,8 @@ public class GDK extends OS {
 	public static final int GDK_MOTION_NOTIFY = 0x3;
 	public static final int GDK_NO_EXPOSE = 30;
 	public static final int GDK_NONE = 0;
-	public static final int GDK_NOTIFY_INFERIOR = 2;
 	public static final int GDK_Num_Lock = 0xFF7F;
 	public static final int GDK_OWNERSHIP_NONE = 0;
-	public static final int GDK_PIXBUF_ALPHA_BILEVEL = 0x0;
 	public static final int GDK_POINTER_MOTION_HINT_MASK = 0x8;
 	public static final int GDK_POINTER_MOTION_MASK = 0x4;
 	public static final int GDK_PROPERTY_NOTIFY = 16;
@@ -228,14 +214,11 @@ public class GDK extends OS {
 	public static final int GDK_SELECTION_REQUEST = 18;
 	public static final int GDK_SHIFT_MASK = 0x1;
 	public static final int GDK_SIZING = 0x78;
-	public static final int GDK_STIPPLED = 0x2;
 	public static final int GDK_SURFACE_STATE_ICONIFIED = 1 << 1;
 	public static final int GDK_SURFACE_STATE_MAXIMIZED = 1 << 2;
 	public static final int GDK_SURFACE_STATE_FULLSCREEN = 1 << 4;
-	public static final int GDK_TILED = 0x1;
 	public static final int GDK_Shift_L = 0xffe1;
 	public static final int GDK_Shift_R = 0xffe2;
-	public static final int GDK_SCROLL = 31;
 	public static final int GDK_Scroll_Lock = 0xff14;
 	public static final int GDK_TOP_LEFT_CORNER = 0x86;
 	public static final int GDK_TOP_RIGHT_CORNER = 0x88;
@@ -243,7 +226,6 @@ public class GDK extends OS {
 	public static final int GDK_Tab = 0xff09;
 	public static final int GDK_Up = 0xff52;
 	public static final int GDK_WATCH = 0x96;
-	public static final int GDK_XOR = 0x2;
 	public static final int GDK_XTERM = 0x98;
 	public static final int GDK_X_CURSOR = 0x0;
 	public static final int GDK_WINDOW_CHILD = 2;
@@ -317,11 +299,6 @@ public class GDK extends OS {
 	/* [GTK3/GTK4, GTK3 uses GdkScreen but GTK4 uses GdkX11Screen -- method signature otherwise identical] */
 	public static final native long gdk_x11_screen_get_window_manager_name(long screen);
 	/**
-	 * @method flags=dynamic
-	 */
-	/* [GTK3/GTK4, GTK3 uses GdkVisual but GTK4 uses GdkX11Visual -- method signature otherwise identical] */
-	public static final native long gdk_x11_visual_get_xvisual(long visual);
-	/**
 	* @param gdkwindow cast=(GdkWindow *)
 	*/
 	/* [GTK3 only, if-def'd in os.h] */
@@ -759,8 +736,6 @@ public class GDK extends OS {
 	/** @param pixbuf cast=(const GdkPixbuf *) */
 	public static final native int gdk_pixbuf_get_width(long pixbuf);
 	/** @param pixbuf cast=(const GdkPixbuf *) */
-	public static final native long gdk_pixbuf_get_byte_length(long pixbuf);
-	/** @param pixbuf cast=(const GdkPixbuf *) */
 	public static final native int gdk_pixbuf_get_n_channels(long pixbuf);
 	/** @param pixbuf cast=(const GdkPixbuf *) */
 	public static final native int gdk_pixbuf_get_bits_per_sample(long pixbuf);
@@ -872,10 +847,6 @@ public class GDK extends OS {
 	public static final native void gdk_rgba_free(long rgba);
 	/**
 	 * @param rgba cast=(GdkRGBA *)
-	 */
-	public static final native int gdk_rgba_hash(GdkRGBA rgba);
-	/**
-	 * @param rgba cast=(GdkRGBA *)
 	 * @param property cast=(const gchar *)
 	 */
 	public static final native long gdk_rgba_parse(GdkRGBA rgba, byte[] property);
@@ -946,10 +917,6 @@ public class GDK extends OS {
 	/**
 	 * @method flags=dynamic
 	 */
-	public static final native int gdk_monitor_get_width_mm(long monitor);
-	/**
-	 * @method flags=dynamic
-	 */
 	public static final native long gdk_display_get_primary_monitor(long display);
 	/**
 	 * @param display cast=(GdkDisplay *)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GInterfaceInfo.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GInterfaceInfo.java
deleted file mode 100644
index da2aba88b7..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GInterfaceInfo.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others. All rights reserved.
- * The contents of this file are made available under the terms
- * of the GNU Lesser General Public License (LGPL) Version 2.1 that
- * accompanies this distribution (lgpl-v21.txt).  The LGPL is also
- * available at http://www.gnu.org/licenses/lgpl.html.  If the version
- * of the LGPL at http://www.gnu.org is different to the version of
- * the LGPL accompanying this distribution and there is any conflict
- * between the two license versions, the terms of the LGPL accompanying
- * this distribution shall govern.
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.gtk;
-
-
-public class GInterfaceInfo {
-	/** @field cast=(GInterfaceInitFunc) */
-	public long interface_init;
-	/** @field cast=(GInterfaceFinalizeFunc) */
-	public long interface_finalize;
-	/** @field cast=(gpointer) */
-	public long interface_data;
-	public static final int sizeof = OS.GInterfaceInfo_sizeof();
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTK.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTK.java
index 71f74a5961..ef79f63c3f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTK.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTK.java
@@ -36,9 +36,6 @@ public class GTK extends OS {
 	public static final int GTK_CELL_RENDERER_MODE_ACTIVATABLE = 1;
 	public static final int GTK_CELL_RENDERER_SELECTED = 1 << 0;
 	public static final int GTK_CELL_RENDERER_FOCUSED = 1 << 4;
-	public static final int GTK_CLIST_SHOW_TITLES = 0x4;
-	public static final int GTK_CORNER_TOP_LEFT = 0x0;
-	public static final int GTK_CORNER_TOP_RIGHT = 0x2;
 	public static final int GTK_DIALOG_DESTROY_WITH_PARENT = 1 << 1;
 	public static final int GTK_DIALOG_MODAL = 1 << 0;
 	public static final int GTK_DIR_TAB_FORWARD = 0;
@@ -48,8 +45,6 @@ public class GTK extends OS {
 	public static final int GTK_FILE_CHOOSER_ACTION_OPEN = 0;
 	public static final int GTK_FILE_CHOOSER_ACTION_SAVE = 1;
 	public static final int GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER = 2;
-	public static final int GTK_FRAME_LABEL_PAD = 1;
-	public static final int GTK_FRAME_LABEL_SIDE_PAD = 2;
 	public static final int GTK_ICON_SIZE_MENU = 1;
 	public static final int GTK_ICON_SIZE_SMALL_TOOLBAR = 2;
 	public static final int GTK_ICON_SIZE_DIALOG = 6;
@@ -57,13 +52,11 @@ public class GTK extends OS {
 	public static final int GTK_JUSTIFY_CENTER = 0x2;
 	public static final int GTK_JUSTIFY_LEFT = 0x0;
 	public static final int GTK_JUSTIFY_RIGHT = 0x1;
-	public static final int GTK_MAPPED = 1 << 7;
 	public static final int GTK_MESSAGE_INFO = 0;
 	public static final int GTK_MESSAGE_WARNING = 1;
 	public static final int GTK_MESSAGE_QUESTION = 2;
 	public static final int GTK_MESSAGE_ERROR = 3;
 	public static final int GTK_MOVEMENT_VISUAL_POSITIONS = 1;
-	public static final int GTK_NO_WINDOW = 1 << 5;
 	public static final int GTK_ORIENTATION_HORIZONTAL = 0x0;
 	public static final int GTK_ORIENTATION_VERTICAL = 0x1;
 	public static final int GTK_PACK_END = 1;
@@ -79,11 +72,6 @@ public class GTK extends OS {
 	public static final int GTK_PRINT_CAPABILITY_PAGE_SET     = 1 << 0;
 	public static final int GTK_PRINT_CAPABILITY_COPIES       = 1 << 1;
 	public static final int GTK_PRINT_CAPABILITY_COLLATE      = 1 << 2;
-	public static final int GTK_PRINT_CAPABILITY_REVERSE      = 1 << 3;
-	public static final int GTK_PRINT_CAPABILITY_SCALE        = 1 << 4;
-	public static final int GTK_PRINT_CAPABILITY_GENERATE_PDF = 1 << 5;
-	public static final int GTK_PRINT_CAPABILITY_GENERATE_PS  = 1 << 6;
-	public static final int GTK_PRINT_CAPABILITY_PREVIEW      = 1 << 7;
 	public static final int GTK_PRINT_PAGES_ALL = 0;
 	public static final int GTK_PRINT_PAGES_CURRENT = 1;
 	public static final int GTK_PRINT_PAGES_RANGES = 2;
@@ -92,27 +80,14 @@ public class GTK extends OS {
 	public static final int GTK_PRINT_DUPLEX_HORIZONTAL = 1;
 	public static final int GTK_PRINT_DUPLEX_VERTICAL = 2;
 	public static final int GTK_EVENT_CONTROLLER_SCROLL_NONE = 0;
-	public static final int GTK_EVENT_CONTROLLER_SCROLL_VERTICAL = 1;
-	public static final int GTK_EVENT_CONTROLLER_SCROLL_HORIZONTAL = 2;
-	public static final int GTK_EVENT_CONTROLLER_SCROLL_DISCRETE = 3;
-	public static final int GTK_EVENT_CONTROLLER_SCROLL_KINETIC = 4;
-	public static final int GTK_EVENT_CONTROLLER_SCROLL_BOTH_AXES = 5;
-	public static final int GTK_PHASE_NONE = 0;
 	public static final int GTK_PHASE_CAPTURE = 1;
 	public static final int GTK_PHASE_BUBBLE = 2;
 	public static final int GTK_PHASE_TARGET = 3;
-	public static final int GTK_PROGRESS_CONTINUOUS = 0x0;
-	public static final int GTK_PROGRESS_DISCRETE = 0x1;
 	public static final int GTK_PROGRESS_LEFT_TO_RIGHT = 0x0;
 	public static final int GTK_PROGRESS_BOTTOM_TO_TOP = 0x2;
-	public static final int GTK_RECEIVES_DEFAULT = 1 << 20;
-	public static final int GTK_RELIEF_NONE = 0x2;
-	public static final int GTK_RELIEF_NORMAL = 0;
-	public static final int GTK_RESPONSE_APPLY = 0xfffffff6;
 	public static final int GTK_RESPONSE_CANCEL = 0xfffffffa;
 	public static final int GTK_RESPONSE_OK = 0xfffffffb;
 	public static final int GTK_RESPONSE_ACCEPT = -3;
-	public static final int GTK_RESPONSE_DELETE_EVENT = -4;
 	public static final int GTK_SCROLL_NONE = 0;
 	public static final int GTK_SCROLL_JUMP = 1;
 	public static final int GTK_SCROLL_STEP_BACKWARD = 2;
@@ -131,17 +106,11 @@ public class GTK extends OS {
 	public static final int GTK_SCROLL_END = 15;
 	public static final int GTK_SELECTION_BROWSE = 0x2;
 	public static final int GTK_SELECTION_MULTIPLE = 0x3;
-	public static final int GTK_SENSITIVE = 0x200;
 	public static final int GTK_SHADOW_ETCHED_IN = 0x3;
 	public static final int GTK_SHADOW_ETCHED_OUT = 0x4;
 	public static final int GTK_SHADOW_IN = 0x1;
 	public static final int GTK_SHADOW_NONE = 0x0;
 	public static final int GTK_SHADOW_OUT = 0x2;
-	public static final int GTK_STATE_ACTIVE = 0x1;
-	public static final int GTK_STATE_INSENSITIVE = 0x4;
-	public static final int GTK_STATE_NORMAL = 0x0;
-	public static final int GTK_STATE_PRELIGHT = 0x2;
-	public static final int GTK_STATE_SELECTED = 0x3;
 	public static final int GTK_STATE_FLAG_NORMAL = 0;
 	public static final int GTK_STATE_FLAG_ACTIVE = 1 << 0;
 	public static final int GTK_STATE_FLAG_PRELIGHT = 1 << 1;
@@ -152,12 +121,8 @@ public class GTK extends OS {
 	public static final int GTK_STATE_FLAG_BACKDROP  = 1 << 6;
 	public static final int GTK_STATE_FLAG_LINK = 1 << 9;
 	public static final int GTK_TEXT_DIR_LTR = 1;
-	public static final int GTK_TEXT_DIR_NONE = 0 ;
 	public static final int GTK_TEXT_DIR_RTL = 2;
 	public static final int GTK_TEXT_WINDOW_TEXT = 2;
-	public static final int GTK_TOOLBAR_CHILD_BUTTON = 0x1;
-	public static final int GTK_TOOLBAR_CHILD_RADIOBUTTON = 0x3;
-	public static final int GTK_TOOLBAR_CHILD_TOGGLEBUTTON = 0x2;
 	public static final int GTK_TOOLBAR_ICONS = 0;
 	public static final int GTK_TOOLBAR_TEXT = 1;
 	public static final int GTK_TOOLBAR_BOTH = 2;
@@ -184,13 +149,8 @@ public class GTK extends OS {
 	public static final int GTK_WRAP_NONE = 0;
 	public static final int GTK_WRAP_WORD = 2;
 	public static final int GTK_WRAP_WORD_CHAR = 3;
-	public static final int GTK_EXPANDER_COLAPSED = 0;
-	public static final int GTK_EXPANDER_SEMI_COLLAPSED = 1;
-	public static final int GTK_EXPANDER_SEMI_EXPANDED = 2;
-	public static final int GTK_EXPANDER_EXPANDED = 3;
 
 	/** Classes */
-	public static final byte[] GTK_STYLE_CLASS_TOOLTIP = OS.ascii("tooltip");
 	public static final byte[] GTK_STYLE_CLASS_VIEW = OS.ascii("view");
 	public static final byte[] GTK_STYLE_CLASS_CELL = OS.ascii("cell");
 	public static final byte[] GTK_STYLE_CLASS_PANE_SEPARATOR = OS.ascii("pane-separator");
@@ -205,11 +165,9 @@ public class GTK extends OS {
 	public static final byte[] gtk_entry_select_on_focus = OS.ascii("gtk-entry-select-on-focus");
 	public static final byte[] gtk_style_property_font = OS.ascii("font");
 	public static final byte[] gtk_menu_bar_accel = OS.ascii("gtk-menu-bar-accel");
-	public static final byte[] gtk_menu_images = OS.ascii("gtk-menu-images");
 	public static final byte[] gtk_theme_name = OS.ascii("gtk-theme-name");
 	public static final byte[] gtk_im_module = OS.ascii("gtk-im-module");
 
-
 	/** Misc **/
 	public static final byte[] GTK_PRINT_SETTINGS_OUTPUT_URI = OS.ascii("output-uri");
 
@@ -250,8 +208,6 @@ public class GTK extends OS {
 	public static final native int GtkCellRendererToggleClass_sizeof();
 	public static final native int GtkTreeIter_sizeof();
 
-
-
 	/**
 	 * Macros.
 	 *
@@ -262,7 +218,6 @@ public class GTK extends OS {
 	public static final native long GTK_WIDGET_GET_CLASS(long widget);
 	/** @method flags=const */
 	public static final native long GTK_TYPE_TEXT_VIEW_ACCESSIBLE ();
-	public static final native long _GTK_ACCESSIBLE (long handle);
 	public static final native boolean GTK_IS_ACCEL_LABEL(long obj);
 	public static final native boolean GTK_IS_BUTTON(long obj);
 	public static final native boolean GTK_IS_LABEL(long obj);
@@ -327,9 +282,6 @@ public class GTK extends OS {
 	 */
 	public static final native long gtk_widget_class_get_css_name(long widget_class);
 
-	/** @param button cast=(GtkButton *) */
-	public static final native void gtk_button_clicked(long button);
-
 	public static final native long gtk_button_new();
 
 	/**
@@ -778,13 +730,6 @@ public class GTK extends OS {
 	public static final native boolean gtk_drag_check_threshold(long widget, int start_x, int start_y, int current_x, int current_y);
 	/**
 	 * @param widget cast=(GtkWidget *)
-	 * @param context cast=(GdkDragContext *)
-	 * @param target_list cast=(GtkTargetList *)
-	 */
-	/* [GTK3/GTK4: both have identical signatures but accept differing parameters at the native level] */
-	public static final native long gtk_drag_dest_find_target(long widget, long context, long target_list);
-	/**
-	 * @param widget cast=(GtkWidget *)
 	 * @param flags cast=(GtkDestDefaults)
 	 * @param targets cast=(const GtkTargetEntry *)
 	 * @param n_targets cast=(gint)
@@ -986,13 +931,6 @@ public class GTK extends OS {
 	 * @param terminator cast=(const gchar *),flags=sentinel
 	 */
 	public static final native long gtk_file_chooser_dialog_new(byte[] title, long parent, int action, byte[] first_button_text, int first_button_id, byte[] second_button_text, int second_button_id, long terminator);
-	/**
-	 * @param title cast=(const gchar *),flags=no_out
-	 * @param parent cast=(GtkWindow *)
-	 * @param first_button_text cast=(const gchar *),flags=no_out
-	 * @param terminator cast=(const gchar *),flags=sentinel
-	 */
-	public static final native long gtk_file_chooser_dialog_new(byte[] title, long parent, int action, long first_button_text, int first_button_id, long second_button_text, int second_button_id, long terminator);
 	/** @param chooser cast=(GtkFileChooser *) */
 	public static final native long gtk_file_chooser_get_filename(long chooser);
 	/**  @param chooser cast=(GtkFileChooser *) */
@@ -1116,10 +1054,6 @@ public class GTK extends OS {
 	/**
 	 * @method flags=dynamic
 	 */
-	public static final native long gtk_gesture_get_last_event(long gesture, long sequence);
-	/**
-	 * @method flags=dynamic
-	 */
 	public static final native long gtk_gesture_get_last_updated_sequence(long gesture);
 	/**
 	 * @method flags=dynamic
@@ -1128,26 +1062,6 @@ public class GTK extends OS {
 	/**
 	 * @method flags=dynamic
 	 */
-	public static final native long gtk_gesture_get_sequences(long gesture);
-	/**
-	 * @method flags=dynamic
-	 */
-	public static final native void gtk_gesture_group(long group_gesture, long gesture);
-	/**
-	 * @method flags=dynamic
-	 */
-	public static final native void gtk_gesture_pan_set_orientation(long orientation);
-	/**
-	 * @method flags=dynamic
-	 */
-	public static final native long gtk_gesture_pan_get_orientation(long gesture);
-	/**
-	 * @method flags=dynamic
-	 */
-	public static final native void gtk_gesture_pan_new(long widget, long orientation);
-	/**
-	 * @method flags=dynamic
-	 */
 	public static final native void gtk_gesture_single_set_button(long gesture, int button);
 	/**
 	 * @method flags=dynamic
@@ -1156,10 +1070,6 @@ public class GTK extends OS {
 	/**
 	 * @method flags=dynamic
 	 */
-	public static final native long gtk_gesture_swipe_new(long widget);
-	/**
-	 * @method flags=dynamic
-	 */
 	public static final native void gtk_gesture_drag_get_offset(long gesture, double[] x, double[] y);
 	/**
 	 * @method flags=dynamic
@@ -1578,11 +1488,6 @@ public class GTK extends OS {
 	 */
 	public static final native long gtk_css_provider_to_string(long provider);
 	/**
-	 *  @param name cast=(const gchar *)
-	 *  @param variant cast=(const gchar *)
-	 */
-	public static final native long gtk_css_provider_get_named(byte[] name, byte[] variant);
-	/**
 	 * @param screen cast=(GdkScreen *)
 	 * @param provider cast=(GtkStyleProvider *)
 	 * @param priority cast=(guint)
@@ -1637,7 +1542,6 @@ public class GTK extends OS {
 	public static final native int gtk_get_major_version();
 	public static final native int gtk_get_minor_version();
 	public static final native int gtk_get_micro_version();
-	public static final native void gtk_main();
 	/** @param event cast=(GdkEvent *) */
 	public static final native void gtk_main_do_event(long event);
 	public static final native long gtk_menu_bar_new();
@@ -2230,8 +2134,6 @@ public class GTK extends OS {
 	/** @param spin_button cast=(GtkSpinButton*) */
 	public static final native int gtk_spin_button_get_digits(long spin_button);
 	/** @param spin_button cast=(GtkSpinButton*) */
-	public static final native void gtk_spin_button_set_digits(long spin_button, int digits);
-	/** @param spin_button cast=(GtkSpinButton*) */
 	public static final native void gtk_spin_button_set_increments(long spin_button, double step, double page);
 	/** @param spin_button cast=(GtkSpinButton*) */
 	public static final native void gtk_spin_button_set_range(long spin_button, double max, double min);
@@ -2288,9 +2190,6 @@ public class GTK extends OS {
 	 * @param class_name cast=(const gchar *)
 	 */
 	public static final native void gtk_style_context_remove_class(long context, byte[] class_name);
-	/** @method flags=dynamic */
-	/* [GTK3; 3.16 deprecated, replaced] */
-	public static final native void gtk_style_context_get_background_color(long context, int state, GdkRGBA color);
 	/**
 	 * @method flags=dynamic
 	 * @param context cast=(GtkStyleContext *)
@@ -2619,13 +2518,6 @@ public class GTK extends OS {
 	 */
 	/* [GTK3 only] */
 	public static final native void gtk_toggle_button_set_inconsistent(long toggle_button, boolean setting);
-	/**
-	 * @method flags=dynamic
-	 * @param toggle_button cast=(GtkToggleButton *)
-	 * @param draw_indicator cast=(gboolean)
-	 */
-	/* [GTK3 only] */
-	public static final native void gtk_toggle_button_set_mode(long toggle_button, boolean draw_indicator);
 	/** @param button cast=(GtkToggleToolButton *) */
 	public static final native boolean gtk_toggle_tool_button_get_active(long button);
 	public static final native long gtk_toggle_tool_button_new();
@@ -2646,11 +2538,6 @@ public class GTK extends OS {
 	public static final native void gtk_tool_button_set_icon_widget(long button, long widget);
 	/**
 	 * @param button cast=(GtkToolButton *)
-	 * @param label cast=(const gchar *)
-	 */
-	public static final native void gtk_tool_button_set_label(long button,  byte[] label);
-	/**
-	 * @param button cast=(GtkToolButton *)
 	 * @param widget cast=(GtkWidget *)
 	 */
 	public static final native void gtk_tool_button_set_label_widget(long button,  long widget);
@@ -2807,10 +2694,6 @@ public class GTK extends OS {
 	public static final native void gtk_tree_selection_select_iter(long selection, long iter);
 	/**
 	 * @param selection cast=(GtkTreeSelection *)
-	 */
-	public static final native long gtk_tree_selection_get_select_function(long selection);
-	/**
-	 * @param selection cast=(GtkTreeSelection *)
 	 * @param func cast=(GtkTreeSelectionFunc)
 	 * @param data cast=(gpointer)
 	 * @param destroy cast=(GDestroyNotify)
@@ -2818,11 +2701,6 @@ public class GTK extends OS {
 	public static final native void gtk_tree_selection_set_select_function(long selection, long func, long data, long destroy);
 	/**
 	 * @param selection cast=(GtkTreeSelection *)
-	 * @param path cast=(GtkTreePath *)
-	 */
-	public static final native void gtk_tree_selection_select_path(long selection, long path);
-	/**
-	 * @param selection cast=(GtkTreeSelection *)
 	 * @param mode cast=(GtkSelectionMode)
 	 */
 	public static final native void gtk_tree_selection_set_mode(long selection, int mode);
@@ -3150,8 +3028,6 @@ public class GTK extends OS {
 	 * @param column cast=(gint)
 	 */
 	public static final native void gtk_tree_view_set_search_column(long tree_view, int column);
-	/** @param tree_view cast=(GtkTreeView *) */
-	public static final native void gtk_tree_view_unset_rows_drag_dest(long tree_view);
 	/**
 	 * @param tree_view cast=(GtkTreeView *)
 	 * @param bx cast=(gint)
@@ -3321,8 +3197,6 @@ public class GTK extends OS {
 	public static final native void gtk_widget_input_shape_combine_region(long widget, long region);
 	/** @param widget cast=(GtkWidget *) */
 	public static final native boolean gtk_widget_is_focus(long widget);
-	/** @param widget cast=(GtkWidget *) */
-	public static final native void gtk_widget_map(long widget);
 	/**
 	 * @param widget cast=(GtkWidget *)
 	 * @param orientation cast=(GtkOrientation)
@@ -3411,11 +3285,6 @@ public class GTK extends OS {
 	 */
 	public static final native void gtk_widget_set_focus_on_click(long widget, boolean val);
 	/**
-	 * @param widget cast=(GtkWidget *)
-	 * @param name cast=(const char *)
-	 */
-	public static final native void gtk_widget_set_name(long widget, byte[] name);
-	/**
 	 * @method flags=dynamic
 	 * @param widget cast=(GtkWidget *)
 	 */
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTypeQuery.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTypeQuery.java
deleted file mode 100644
index 18e9b9a654..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTypeQuery.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others. All rights reserved.
- * The contents of this file are made available under the terms
- * of the GNU Lesser General Public License (LGPL) Version 2.1 that
- * accompanies this distribution (lgpl-v21.txt).  The LGPL is also
- * available at http://www.gnu.org/licenses/lgpl.html.  If the version
- * of the LGPL at http://www.gnu.org is different to the version of
- * the LGPL accompanying this distribution and there is any conflict
- * between the two license versions, the terms of the LGPL accompanying
- * this distribution shall govern.
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.gtk;
-
-
-public class GTypeQuery {
-	/** @field cast=(GType) */
-	public int type;
-	/** @field cast=(const gchar *) */
-	public long type_name;
-	/** @field cast=(guint) */
-	public int class_size;
-	/** @field cast=(guint) */
-	public int instance_size;
-	public static final int sizeof = OS.GTypeQuery_sizeof();
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventAny.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventAny.java
deleted file mode 100644
index dbe4bc12ec..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventAny.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others. All rights reserved.
- * The contents of this file are made available under the terms
- * of the GNU Lesser General Public License (LGPL) Version 2.1 that
- * accompanies this distribution (lgpl-v21.txt).  The LGPL is also
- * available at http://www.gnu.org/licenses/lgpl.html.  If the version
- * of the LGPL at http://www.gnu.org is different to the version of
- * the LGPL accompanying this distribution and there is any conflict
- * between the two license versions, the terms of the LGPL accompanying
- * this distribution shall govern.
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.swt.internal.gtk;
-
-
-public class GdkEventAny extends GdkEvent {
-	/** @field cast=(GdkWindow *) */
-	public long window;
-	/** @field cast=(gint8) */
-	public byte send_event;
-	public static final int sizeof = GDK.GdkEventAny_sizeof();
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
index 5611bbc433..a44b6e0fb7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
@@ -141,16 +141,13 @@ public class OS extends C {
 	/** Constants */
 	public static final int G_FILE_TEST_IS_DIR = 1 << 2;
 	public static final int G_FILE_TEST_IS_EXECUTABLE = 1 << 3;
-	public static final int G_SIGNAL_MATCH_FUNC = 1 << 3;
 	public static final int G_SIGNAL_MATCH_DATA = 1 << 4;
 	public static final int G_SIGNAL_MATCH_ID = 1 << 0;
 	public static final int G_LOG_FLAG_FATAL = 0x2;
 	public static final int G_LOG_FLAG_RECURSION = 0x1;
 	public static final int G_LOG_LEVEL_MASK = 0xfffffffc;
 	public static final int G_APP_INFO_CREATE_NONE = 0;
-	public static final int G_APP_INFO_CREATE_NEEDS_TERMINAL = (1 << 0);
 	public static final int G_APP_INFO_CREATE_SUPPORTS_URIS  = (1 << 1);
-	public static final int None = 0;
 	public static final int PANGO_ALIGN_LEFT = 0;
 	public static final int PANGO_ALIGN_CENTER = 1;
 	public static final int PANGO_ALIGN_RIGHT = 2;
@@ -183,27 +180,13 @@ public class OS extends C {
 	public static final int PANGO_VARIANT_SMALL_CAPS = 1;
 	public static final int PANGO_WEIGHT_BOLD = 0x2bc;
 	public static final int PANGO_WEIGHT_NORMAL = 0x190;
-	public static final int PANGO_WRAP_WORD = 0;
 	public static final int PANGO_WRAP_WORD_CHAR = 2;
-	public static final int RTLD_GLOBAL = OS.IsWin32 ? 0 : OS.RTLD_GLOBAL();
-	public static final int RTLD_LAZY = OS.IsWin32 ? 0 : OS.RTLD_LAZY();
-	public static final int RTLD_MEMBER = 0x00040000;
-	public static final int RTLD_NOW = OS.IsWin32 ? 0 : OS.RTLD_NOW();
-
 
 	/**
 	 * GDBus Session types.
 	 * @category gdbus */
-	public static final int G_BUS_TYPE_STARTER = -1; //An alias for the message bus that activated the process, if any.
-	/** @category gdbus */
-	public static final int G_BUS_TYPE_NONE = 0;    // Not a message bus.
-	/** @category gdbus */
-	public static final int G_BUS_TYPE_SYSTEM  = 1; // The system-wide message bus.
-	/** @category gdbus */
 	public static final int G_BUS_TYPE_SESSION = 2; //The login session message bus.
 	/** @category gdbus */
-	public static final int G_BUS_NAME_OWNER_FLAGS_NONE = 0; //No flags set.
-	/** @category gdbus */
 	public static final int G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT = (1<<0); //Allow another message bus connection to claim the name.
 	/**
 	 * If another message bus connection owns the name and have
@@ -212,12 +195,9 @@ public class OS extends C {
 	public static final int G_BUS_NAME_OWNER_FLAGS_REPLACE = (1<<1);
 
 	// Proxy flags found here: https://developer.gnome.org/gio/stable/GDBusProxy.html#GDBusProxyFlags
-	public static final int G_DBUS_PROXY_FLAGS_NONE = 0;
 	public static final int G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES = 1;
 	public static final int G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS = 2;
 	public static final int G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START = 3;
-	public static final int G_DBUS_PROXY_FLAGS_GET_INVALIDATED_PROPERTIES = 4;
-	public static final int G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START_AT_CONSTRUCTION = 5;
 
 	public static final int G_DBUS_CALL_FLAGS_NONE = 0;
 	public static final int G_DBUS_CALL_FLAGS_NO_AUTO_START = (1<<0);
@@ -289,7 +269,6 @@ public class OS extends C {
 	public static final byte[] button_press_event = ascii("button-press-event");
 	public static final byte[] button_release_event = ascii("button-release-event");
 	public static final byte[] changed = ascii("changed");
-	public static final byte[] change_current_page = ascii("change-current-page");
 	public static final byte[] change_value = ascii("change-value");
 	public static final byte[] clicked = ascii("clicked");
 	public static final byte[] close_request = ascii("close-request");
@@ -298,12 +277,10 @@ public class OS extends C {
 	public static final byte[] copy_clipboard = ascii("copy-clipboard");
 	public static final byte[] cut_clipboard = ascii("cut-clipboard");
 	public static final byte[] create_menu_proxy = ascii("create-menu-proxy");
-	public static final byte[] destroy = ascii("destroy");
 	public static final byte[] delete_event = ascii("delete-event");
 	public static final byte[] delete_from_cursor = ascii("delete-from-cursor");
 	public static final byte[] day_selected = ascii("day-selected");
 	public static final byte[] day_selected_double_click = ascii("day-selected-double-click");
-	public static final byte[] decelerate= ascii("decelerate");
 	public static final byte[] delete_range = ascii("delete-range");
 	public static final byte[] delete_text = ascii("delete-text");
 	public static final byte[] direction_changed = ascii("direction-changed");
@@ -323,7 +300,6 @@ public class OS extends C {
 	public static final byte[] event = ascii("event");
 	public static final byte[] event_after = ascii("event-after");
 	public static final byte[] expand_collapse_cursor_row = ascii("expand-collapse-cursor-row");
-	public static final byte[] expose_event = ascii("expose-event");
 	public static final byte[] focus = ascii("focus");
 	public static final byte[] focus_in_event = ascii("focus-in-event");
 	public static final byte[] focus_in = ascii("focus-in");
@@ -332,8 +308,6 @@ public class OS extends C {
 	public static final byte[] grab_focus = ascii("grab-focus");
 	public static final byte[] hide = ascii("hide");
 	public static final byte[] icon_release = ascii("icon-release");
-	public static final byte[] im_update = ascii("im-update");
-	public static final byte[] input = ascii("input");
 	public static final byte[] insert_text = ascii("insert-text");
 	public static final byte[] key_press_event = ascii("key-press-event");
 	public static final byte[] key_release_event = ascii("key-release-event");
@@ -342,7 +316,6 @@ public class OS extends C {
 	public static final byte[] keys_changed = ascii("keys-changed");
 	public static final byte[] leave_notify_event = ascii("leave-notify-event");
 	public static final byte[] leave = ascii("leave");
-	public static final byte[] link_color = ascii("link-color");
 	public static final byte[] map = ascii("map");
 	public static final byte[] map_event = ascii("map-event");
 	public static final byte[] mnemonic_activate = ascii("mnemonic-activate");
@@ -371,33 +344,26 @@ public class OS extends C {
 	public static final byte[] scroll_child = ascii("scroll-child");
 	public static final byte[] scroll_event = ascii("scroll-event");
 	public static final byte[] scroll = ascii("scroll");
-	public static final byte[] scroll_begin = ascii("scroll-begin");
-	public static final byte[] scroll_end = ascii("scroll-end");
 	public static final byte[] select = ascii("select");
 	public static final byte[] selection_done = ascii("selection-done");
 	public static final byte[] show = ascii("show");
 	public static final byte[] show_help = ascii("show-help");
 	public static final byte[] size_allocate = ascii("size-allocate");
-	public static final byte[] size_request = ascii("size-request");
 	public static final byte[] start_interactive_search = ascii("start-interactive-search");
 	public static final byte[] style_updated = ascii("style-updated");
-	public static final byte[] swipe = ascii("swipe");
 	public static final byte[] switch_page = ascii("switch-page");
 	public static final byte[] test_collapse_row = ascii("test-collapse-row");
 	public static final byte[] test_expand_row = ascii("test-expand-row");
 	public static final byte[] toggled = ascii("toggled");
 	public static final byte[] unmap = ascii("unmap");
 	public static final byte[] unmap_event = ascii("unmap-event");
-	public static final byte[] unrealize = ascii("unrealize");
 	public static final byte[] value_changed = ascii("value-changed");
 	public static final byte[] window_state_event = ascii("window-state-event");
 	public static final byte[] notify_state = ascii("notify::state");
 
 	/** Properties */
 	public static final byte[] active = ascii("active");
-	public static final byte[] background_gdk = ascii("background-gdk");
 	public static final byte[] background_rgba = ascii("background-rgba");
-	public static final byte[] button_relief = ascii("button-relief");
 	public static final byte[] cell_background_rgba = ascii("cell-background-rgba");
 	public static final byte[] default_border = ascii("default-border");
 	public static final byte[] expander_size = ascii("expander-size");
@@ -405,7 +371,6 @@ public class OS extends C {
 	public static final byte[] focus_line_width = ascii("focus-line-width");
 	public static final byte[] focus_padding = ascii("focus-padding");
 	public static final byte[] font_desc = ascii("font-desc");
-	public static final byte[] foreground_gdk = ascii("foreground-gdk");
 	public static final byte[] foreground_rgba = ascii("foreground-rgba");
 	public static final byte[] grid_line_width = ascii("grid-line-width");
 	public static final byte[] inner_border = ascii("inner-border");
@@ -563,11 +528,6 @@ public class OS extends C {
 
 	/** CUSTOM_CODE END */
 
-
-
-
-
-
 	/**
 	 * Gtk has a minimum glib version. (But it's not a 1:1 link, one can have a newer version of glib and older gtk).
 	 *
@@ -715,10 +675,8 @@ public static boolean isX11 () {
 }
 
 /** 64 bit */
-public static final native int GInterfaceInfo_sizeof ();
 public static final native int GPollFD_sizeof ();
 public static final native int GTypeInfo_sizeof ();
-public static final native int GTypeQuery_sizeof ();
 public static final native int PangoAttribute_sizeof();
 public static final native int PangoAttrColor_sizeof();
 public static final native int PangoAttrInt_sizeof();
@@ -753,31 +711,18 @@ public static final native int X_EVENT_TYPE(long xevent);
 public static final native long X_EVENT_WINDOW(long xevent);
 
 /** X11 Native methods and constants */
-public static final int Above = 0;
-public static final int Below = 1;
-public static final int ButtonRelease = 5;
 public static final int CurrentTime = 0;
-public static final int CWSibling = 0x20;
-public static final int CWStackMode = 0x40;
-public static final int EnterNotify = 7;
 public static final int Expose = 12;
-public static final int FocusChangeMask = 1 << 21;
 public static final int FocusIn = 9;
 public static final int FocusOut = 10;
 public static final int GraphicsExpose = 13;
-public static final int NoExpose = 14;
 public static final int ExposureMask = 1 << 15;
-public static final long NoEventMask = 0;
 public static final int NotifyNormal = 0;
-public static final int NotifyGrab = 1;
-public static final int NotifyHint = 1;
-public static final int NotifyUngrab = 2;
 public static final int NotifyWhileGrabbed = 3;
 public static final int NotifyAncestor = 0;
 public static final int NotifyVirtual = 1;
 public static final int NotifyNonlinear = 3;
 public static final int NotifyNonlinearVirtual = 4;
-public static final int NotifyPointer = 5;
 public static final int RevertToParent = 2;
 public static final native int Call(long proc, long arg1, long arg2);
 public static final native long call(long function, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6);
@@ -845,29 +790,11 @@ public static final native void memmove(XExposeEvent dest, long src, long size);
  */
 public static final native void memmove(XFocusChangeEvent dest, long src, long size);
 
-/** @method flags=const */
-public static final native int RTLD_GLOBAL();
-/** @method flags=const */
-public static final native int RTLD_NOW();
-/** @method flags=const */
-public static final native int RTLD_LAZY();
-
 
 /** Natives */
 public static final native int Call (long func, long arg0, int arg1, int arg2);
-public static final native long Call (long func, long arg0, int arg1, long arg2);
-public static final native long G_OBJECT_CLASS(long klass);
 public static final native long G_OBJECT_GET_CLASS(long object);
 public static final native long G_OBJECT_TYPE_NAME(long object);
-/*
- * Note: G_TYPE_CHECK_INSTANCE_TYPE is not a good way to check for instance type,
- * The C-Macro doesn't seem to work reliably in the context of being invoked from Java
- * via JNI on a dynamically loaded library.
- * But webkit1 development has halted and it's not worth the effort to change this.
- * I.e, kept for legacy reason but don't use this. Instead, to identify type, use user_data. (see Webkit proc3 as example).
- */
-
-public static final native boolean G_TYPE_CHECK_INSTANCE_TYPE(long instance, long type);
 /** @method flags=const */
 public static final native long G_TYPE_BOOLEAN();
 /** @method flags=const */
@@ -891,8 +818,6 @@ public static final native long PANGO_TYPE_FONT_FAMILY();
 public static final native long PANGO_TYPE_FONT_FACE();
 /** @method flags=const */
 public static final native long PANGO_TYPE_LAYOUT();
-/** @param filename cast=(const char *) */
-public static final native long dlopen(byte[] filename, int flag);
 /**
  * @param commandline cast=(gchar *)
  * @param applName cast=(gchar *)
@@ -934,10 +859,6 @@ public static final native boolean g_app_info_launch_default_for_uri(long uri, l
 /**
  * @param appInfo cast=(GAppInfo *)
  */
-public static final native boolean g_app_info_should_show(long appInfo);
-/**
- * @param appInfo cast=(GAppInfo *)
- */
 public static final native boolean g_app_info_supports_uris(long appInfo);
 /**
  * @param error cast=(GError *)
@@ -1085,7 +1006,6 @@ public static final native long g_filename_from_utf8(long opsysstring, long len,
  */
 public static final native long g_filename_from_uri(long uri, long [] hostname, long [] error);
 /** @param mem cast=(gpointer) */
-// NOTE: Lock is not used, see Bug 546743 and Bug 547093
 public static final native void g_free(long mem);
 /**
  * @param variable cast=(const gchar *),flags=no_out
@@ -1113,47 +1033,20 @@ public static final native long g_list_append(long list, long data);
 public static final native long g_list_data(long list);
 /** @param list cast=(GList *) */
 public static final native void g_list_free(long list);
-/** @param list cast=(GList *) */
-public static final native void g_list_free_1(long list);
 /**
  * @param list cast=(GList *)
  */
 public static final native long g_list_last(long list);
 /** @param list cast=(GList *) */
 public static final native int g_list_length(long list);
-/**
- * @param list cast=(GList *)
- * @param llist cast=(GList *)
- */
-public static final native void g_list_set_next(long list, long llist);
 public static final native long g_list_next(long list);
 /**
  * @param list cast=(GList *)
  * @param n cast=(guint)
  */
-public static final native long g_list_nth(long list, int n);
-/**
- * @param list cast=(GList *)
- * @param n cast=(guint)
- */
 public static final native long g_list_nth_data(long list, int n);
-/**
- * @param list cast=(GList *)
- * @param data cast=(gpointer)
- */
-public static final native long g_list_prepend(long list, long data);
-/**
- * @param list cast=(GList *)
- * @param llist cast=(GList *)
- */
-public static final native void g_list_set_previous(long list, long llist);
 public static final native long g_list_previous(long list);
 /**
- * @param list cast=(GList *)
- * @param link cast=(GList *)
- */
-public static final native long g_list_remove_link(long list, long link);
-/**
  * @param log_domain cast=(gchar *)
  * @param log_levels cast=(GLogLevelFlags)
  * @param message cast=(gchar *)
@@ -1175,11 +1068,6 @@ public static final native int g_log_set_handler(byte[] log_domain, int log_leve
 /** @param size cast=(gulong) */
 public static final native long g_malloc(long size);
 /**
- * @param oclass cast=(GObjectClass *)
- * @param property_name cast=(const gchar *)
- */
-public static final native long g_object_class_find_property(long oclass, byte[] property_name);
-/**
  * @param object cast=(GObject *)
  * @param first_property_name cast=(const gchar *),flags=no_out
  * @param terminator cast=(const gchar *),flags=sentinel
@@ -1261,7 +1149,6 @@ public static final native void g_object_set(long object, byte[] first_property_
  */
 public static final native void g_object_set_qdata(long object, int quark, long data);
 /** @param object cast=(gpointer) */
-// NOTE: Lock is not used, see Bug 546743 and Bug 547093
 public static final native void g_object_unref(long object);
 
 /**
@@ -1333,14 +1220,6 @@ public static final native void g_signal_emit_by_name(long instance, byte[] deta
 public static final native void g_signal_handler_disconnect(long instance, int handler_id);
 /**
  * @param instance cast=(gpointer)
- * @param detail cast=(GQuark)
- * @param closure cast=(GClosure *)
- * @param func cast=(gpointer)
- * @param data cast=(gpointer)
- */
-public static final native int g_signal_handler_find(long instance, int mask, int signal_id, int detail, long closure, long func, long data);
-/**
- * @param instance cast=(gpointer)
  * @param mask cast=(GSignalMatchType)
  * @param signal_id cast=(guint)
  * @param detail cast=(GQuark)
@@ -1384,29 +1263,6 @@ public static final native int g_slist_length(long list);
 /** @param string_array cast=(gchar **) */
 public static final native void g_strfreev(long string_array);
 /**
- * @method flags=getter
- * @param string cast=(GString *)
- */
-public static final native int GString_len(long string);
-/**
- * @method flags=getter
- * @param string cast=(GString *)
- */
-public static final native long GString_str(long string);
-
-/**
- * @param init cast=(const gchar *)
- */
-/* 				   GString * g_string_new_len (const gchar *init, gssize len); */
-public static final native long g_string_new_len(long init, long gssize);
-
-/**
- * @param GString cast=(GString *)
- */
-/* 					 gchar * g_string_free (GString *string, gboolean free_segment);*/
-public static final native long g_string_free(long GString, int gboolen_free_segment);
-
-/**
  * @param str cast=(const gchar *)
  * @param endptr cast=(gchar **)
  */
@@ -1426,12 +1282,6 @@ public static final native long g_strconcat(long str, long str2, long str3, long
 public static final native long g_strconcat(long str, long str2, long terminator);
 /** @param str cast=(char *) */
 public static final native long g_strdup (long str);
-/**
- * @param instance_type cast=(GType)
- * @param interface_type cast=(GType)
- * @param info cast=(const GInterfaceInfo *)
- */
-public static final native void g_type_add_interface_static(long instance_type, long interface_type, long info);
 /** @param g_class cast=(GType) */
 public static final native long g_type_class_peek(long g_class);
 /** @param g_class cast=(gpointer) */
@@ -1450,11 +1300,6 @@ public static final native boolean g_type_is_a(long type, long is_a_type);
 /** @param type cast=(GType) */
 public static final native long g_type_parent(long type);
 /**
- * @param type cast=(GType)
- * @param query cast=(GTypeQuery *)
- */
-public static final native void g_type_query(long type, long query);
-/**
  * @param parent_type cast=(GType)
  * @param type_name cast=(const gchar *)
  * @param info cast=(const GTypeInfo *)
@@ -1468,7 +1313,6 @@ public static final native long g_type_register_static(long parent_type, byte[]
  * @param items_written cast=(glong *),flags=critical
  * @param error cast=(GError **),flags=critical
  */
-// NOTE: Lock is not used, see Bug 546743 and Bug 547093
 public static final native long g_utf16_to_utf8(char[] str, long len, long [] items_read, long [] items_written, long [] error);
 /**
  * @param str cast=(const gchar *)
@@ -1528,7 +1372,6 @@ public static final native int glib_major_version();
 public static final native int glib_minor_version();
 /** @method flags=const */
 public static final native int glib_micro_version();
-
 /**
  * @param interval cast=(guint32)
  * @param function cast=(GSourceFunc)
@@ -1544,17 +1387,6 @@ public static final native boolean FcConfigAppFontAddFile(long config, byte[] fi
  * @param src cast=(const void *),flags=no_out
  * @param size cast=(size_t)
  */
-public static final native void memmove(long dest, GInterfaceInfo src, int size);
-/**
- * @param dest cast=(void *),flags=no_in
- * @param src cast=(const void *),flags=no_out
- */
-public static final native void memmove(long dest, GObjectClass src);
-/**
- * @param dest cast=(void *)
- * @param src cast=(const void *),flags=no_out
- * @param size cast=(size_t)
- */
 public static final native void memmove(long dest, GTypeInfo src, int size);
 /**
  * @param dest cast=(void *)
@@ -1588,17 +1420,6 @@ public static final native void memmove(long dest, GtkWidgetClass src);
  * @param size cast=(size_t)
  */
 public static final native void memmove(long dest, PangoAttribute src, long size);
-/**
- * @param dest cast=(void *),flags=no_in
- * @param src cast=(const void *)
- */
-public static final native void memmove(GObjectClass  dest, long src);
-/**
- * @param dest cast=(void *),flags=no_in
- * @param src cast=(const void *)
- * @param size cast=(size_t)
- */
-public static final native void memmove(GTypeQuery dest, long src, long size);
 /** @param dest flags=no_in */
 public static final native void memmove(GtkWidgetClass dest, long src);
 /**
@@ -1856,11 +1677,6 @@ public static final native long pango_font_family_get_name(long family);
  */
 public static final native void pango_font_family_list_faces(long family, long [] faces, int[] n_faces);
 /**
- * @param font cast=(PangoFont *)
- * @param language cast=(PangoLanguage *)
- */
-public static final native long pango_font_get_metrics(long font, long language);
-/**
  * @param fontMap cast=(PangoFontMap *)
  */
 public static final native long pango_font_map_create_context(long fontMap);
@@ -2008,10 +1824,6 @@ public static final native void pango_tab_array_set_tab(long tab_array, int tab_
  */
 public static final native long ubuntu_menu_proxy_get();
 /**
- * @param path cast=(const char*)
- */
-public static final native int access(byte [] path, int amode);
-/**
  * @param s1 cast=(const char*)
  * @param s2 cast=(const char*)
  */
@@ -2095,7 +1907,6 @@ public static final native long g_dbus_proxy_new_for_bus_sync(int bus_type, int
  * @param error cast=(GError **)
  * @category gdbus
  */
-// NOTE: Lock is not used, see Bug 546743 and Bug 547093
 public static final native long g_dbus_proxy_call_sync (long proxy, byte[] method_name, long parameters, int flags, int timeout_msec, long cancellable, long [] error);
 
 /**
@@ -2107,7 +1918,6 @@ public static final native long g_dbus_proxy_call_sync (long proxy, byte[] metho
  * @param error cast=(GError **)
  * @category gdbus
  */
-// NOTE: Lock is not used, see Bug 546743 and Bug 547093
 public static final native void g_dbus_proxy_call (long proxy, byte[] method_name, long parameters, int flags, int timeout_msec, long cancellable, long callback, long [] error);
 
 /**
@@ -2117,14 +1927,6 @@ public static final native void g_dbus_proxy_call (long proxy, byte[] method_nam
 public static final native long g_dbus_proxy_get_name_owner(long proxy);
 
 /**
- * @param proxy cast=(GDBusProxy *)
- * @param res cast=(GAsyncResult *)
- * @param error cast=(GError **)
- * @category gdbus
- */
-public static final native long g_dbus_proxy_call_finish(long proxy, long res, long [] error);
-
-/**
  * @param xml_data cast=(const gchar *)
  * @param error cast=(GError **)
  * @category gdbus
@@ -2319,7 +2121,6 @@ public static final native void g_variant_builder_unref(long builder);
  * @param arg0 cast=(const gchar *),flags=no_out
  * @category gdbus
  */
-// NOTE: Lock is not used, see Bug 546743 and Bug 547093
 public static final native long g_variant_new (byte[] format_string, byte[] arg0);
 
 /**
@@ -2328,7 +2129,6 @@ public static final native long g_variant_new (byte[] format_string, byte[] arg0
  * @param arg1 cast=(const gchar *),flags=no_out
  * @category gdbus
  */
-// NOTE: Lock is not used, see Bug 546743 and Bug 547093
 public static final native long g_variant_new (byte[] format_string, boolean arg0, byte[] arg1);
 
 /**
@@ -2337,7 +2137,6 @@ public static final native long g_variant_new (byte[] format_string, boolean arg
  * @param arg1 cast=(const gchar *),flags=no_out
  * @category gdbus
  */
-// NOTE: Lock is not used, see Bug 546743 and Bug 547093
 public static final native long g_variant_new (byte[] format_string, byte[] arg0, byte[] arg1);
 
 /**
@@ -2397,13 +2196,6 @@ public static final native long g_variant_get_string(long gvariant, long[] lengt
 
 /**
  * @param gvariant cast=(GVariant *)
- * @return const GVariantType *
- * @category gdbus
- */
-public static final native long g_variant_get_type(long gvariant);
-
-/**
- * @param gvariant cast=(GVariant *)
  * @category gdbus
  */
 public static final native long g_variant_get_type_string(long gvariant);