* native/jni/gtk-peer/cairographics2d.h (cp_gtk_get_cairo_t):

       Removed.
       * native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c
       Mark all unused parameters.
       (cp_gtk_get_cairo_t): Removed.
       (Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetMatrix):
       Don't mix declerations and statements.
       * native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c:
       Mark all unused parameters.
       (Java_gnu_java_awt_peer_gtk_CairoSurface_nativeDrawSurface):
       Get cairographics2d pointer directly.
       * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c
       (Java_gnu_java_awt_peer_gtk_GdkTextLayout_cairoDrawGdkTextLayout):
       Use jlong to pass pointer.
       * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c:
       Mark all unused parameters.
       * include/gnu_java_awt_peer_gtk_CairoGraphics2D.h: Regenerated.
       * include/gnu_java_awt_peer_gtk_CairoSurface.h: Regenerated.
       * include/gnu_java_awt_peer_gtk_ComponentGraphics.h: Regenerated.
       * include/gnu_java_awt_peer_gtk_GdkTextLayout.h: Regenerated.
       * include/gnu_java_awt_peer_gtk_GtkVolatileImage.h: Regenerated.
       * include/java_io_VMFile.h: Regenerated.

6 files changed, 84 insertions, 444 deletions

diff --git a/include/gnu_java_awt_peer_gtk_CairoGraphics2D.h b/include/gnu_java_awt_peer_gtk_CairoGraphics2D.h
index 1afb523ab..7a20949ed 100644
--- a/include/gnu_java_awt_peer_gtk_CairoGraphics2D.h
+++ b/include/gnu_java_awt_peer_gtk_CairoGraphics2D.h
@@ -1,229 +1,45 @@
 /* DO NOT EDIT THIS FILE - it is machine generated */
+
+#ifndef __gnu_java_awt_peer_gtk_CairoGraphics2D__
+#define __gnu_java_awt_peer_gtk_CairoGraphics2D__
+
 #include <jni.h>
-/* Header for class gnu_java_awt_peer_gtk_CairoGraphics2D */
 
-#ifndef _Included_gnu_java_awt_peer_gtk_CairoGraphics2D
-#define _Included_gnu_java_awt_peer_gtk_CairoGraphics2D
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
- * Method:    init
- * Signature: (J)J
- */
-JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_init
-  (JNIEnv *, jobject, jlong);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
- * Method:    disposeNative
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_disposeNative
-  (JNIEnv *, jobject, jlong);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
- * Method:    drawPixels
- * Signature: (J[IIII[D)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_drawPixels
-  (JNIEnv *, jobject, jlong, jintArray, jint, jint, jint, jdoubleArray);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
- * Method:    setGradient
- * Signature: (JDDDDIIIIIIIIZ)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_setGradient
-  (JNIEnv *, jobject, jlong, jdouble, jdouble, jdouble, jdouble, jint, jint, jint, jint, jint, jint, jint, jint, jboolean);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
- * Method:    setTexturePixels
- * Signature: (J[IIII)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_setTexturePixels
-  (JNIEnv *, jobject, jlong, jintArray, jint, jint, jint);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
- * Method:    cairoSetMatrix
- * Signature: (J[D)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetMatrix
-  (JNIEnv *, jobject, jlong, jdoubleArray);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
- * Method:    cairoSetOperator
- * Signature: (JI)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetOperator
-  (JNIEnv *, jobject, jlong, jint);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
- * Method:    cairoSetRGBAColor
- * Signature: (JDDDD)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetRGBAColor
-  (JNIEnv *, jobject, jlong, jdouble, jdouble, jdouble, jdouble);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
- * Method:    cairoSetFillRule
- * Signature: (JI)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetFillRule
-  (JNIEnv *, jobject, jlong, jint);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
- * Method:    cairoSetLine
- * Signature: (JDIID)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetLine
-  (JNIEnv *, jobject, jlong, jdouble, jint, jint, jdouble);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
- * Method:    cairoSetDash
- * Signature: (J[DID)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetDash
-  (JNIEnv *, jobject, jlong, jdoubleArray, jint, jdouble);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
- * Method:    cairoDrawGlyphVector
- * Signature: (JLgnu/java/awt/peer/gtk/GdkFontPeer;FFI[I[F)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoDrawGlyphVector
-  (JNIEnv *, jobject, jlong, jobject, jfloat, jfloat, jint, jintArray, jfloatArray);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
- * Method:    cairoRelCurveTo
- * Signature: (JDDDDDD)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRelCurveTo
-  (JNIEnv *, jobject, jlong, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
- * Method:    cairoRectangle
- * Signature: (JDDDD)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRectangle
-  (JNIEnv *, jobject, jlong, jdouble, jdouble, jdouble, jdouble);
 
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
- * Method:    cairoNewPath
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoNewPath
-  (JNIEnv *, jobject, jlong);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
- * Method:    cairoClosePath
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoClosePath
-  (JNIEnv *, jobject, jlong);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
- * Method:    cairoMoveTo
- * Signature: (JDD)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoMoveTo
-  (JNIEnv *, jobject, jlong, jdouble, jdouble);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
- * Method:    cairoRelMoveTo
- * Signature: (JDD)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRelMoveTo
-  (JNIEnv *, jobject, jlong, jdouble, jdouble);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
- * Method:    cairoLineTo
- * Signature: (JDD)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoLineTo
-  (JNIEnv *, jobject, jlong, jdouble, jdouble);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
- * Method:    cairoRelLineTo
- * Signature: (JDD)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRelLineTo
-  (JNIEnv *, jobject, jlong, jdouble, jdouble);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
- * Method:    cairoCurveTo
- * Signature: (JDDDDDD)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoCurveTo
-  (JNIEnv *, jobject, jlong, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
- * Method:    cairoStroke
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoStroke
-  (JNIEnv *, jobject, jlong);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
- * Method:    cairoFill
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoFill
-  (JNIEnv *, jobject, jlong);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
- * Method:    cairoClip
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoClip
-  (JNIEnv *, jobject, jlong);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
- * Method:    cairoPreserveClip
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoPreserveClip
-  (JNIEnv *, jobject, jlong);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
- * Method:    cairoResetClip
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoResetClip
-  (JNIEnv *, jobject, jlong);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoGraphics2D
- * Method:    cairoSurfaceSetFilter
- * Signature: (JI)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSurfaceSetFilter
-  (JNIEnv *, jobject, jlong, jint);
+JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_init (JNIEnv *env, jobject, jlong);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_disposeNative (JNIEnv *env, jobject, jlong);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_drawPixels (JNIEnv *env, jobject, jlong, jintArray, jint, jint, jint, jdoubleArray);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_setGradient (JNIEnv *env, jobject, jlong, jdouble, jdouble, jdouble, jdouble, jint, jint, jint, jint, jint, jint, jint, jint, jboolean);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_setTexturePixels (JNIEnv *env, jobject, jlong, jintArray, jint, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetMatrix (JNIEnv *env, jobject, jlong, jdoubleArray);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetOperator (JNIEnv *env, jobject, jlong, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetRGBAColor (JNIEnv *env, jobject, jlong, jdouble, jdouble, jdouble, jdouble);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetFillRule (JNIEnv *env, jobject, jlong, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetLine (JNIEnv *env, jobject, jlong, jdouble, jint, jint, jdouble);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetDash (JNIEnv *env, jobject, jlong, jdoubleArray, jint, jdouble);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoDrawGlyphVector (JNIEnv *env, jobject, jlong, jobject, jfloat, jfloat, jint, jintArray, jfloatArray);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRelCurveTo (JNIEnv *env, jobject, jlong, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRectangle (JNIEnv *env, jobject, jlong, jdouble, jdouble, jdouble, jdouble);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoNewPath (JNIEnv *env, jobject, jlong);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoClosePath (JNIEnv *env, jobject, jlong);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoMoveTo (JNIEnv *env, jobject, jlong, jdouble, jdouble);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRelMoveTo (JNIEnv *env, jobject, jlong, jdouble, jdouble);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoLineTo (JNIEnv *env, jobject, jlong, jdouble, jdouble);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRelLineTo (JNIEnv *env, jobject, jlong, jdouble, jdouble);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoCurveTo (JNIEnv *env, jobject, jlong, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoStroke (JNIEnv *env, jobject, jlong);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoFill (JNIEnv *env, jobject, jlong);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoClip (JNIEnv *env, jobject, jlong);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoPreserveClip (JNIEnv *env, jobject, jlong);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoResetClip (JNIEnv *env, jobject, jlong);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSurfaceSetFilter (JNIEnv *env, jobject, jlong, jint);
 
 #ifdef __cplusplus
 }
 #endif
-#endif
+
+#endif /* __gnu_java_awt_peer_gtk_CairoGraphics2D__ */
diff --git a/include/gnu_java_awt_peer_gtk_CairoSurface.h b/include/gnu_java_awt_peer_gtk_CairoSurface.h
index 35fba3f89..8899349e1 100644
--- a/include/gnu_java_awt_peer_gtk_CairoSurface.h
+++ b/include/gnu_java_awt_peer_gtk_CairoSurface.h
@@ -1,107 +1,28 @@
 /* DO NOT EDIT THIS FILE - it is machine generated */
+
+#ifndef __gnu_java_awt_peer_gtk_CairoSurface__
+#define __gnu_java_awt_peer_gtk_CairoSurface__
+
 #include <jni.h>
-/* Header for class gnu_java_awt_peer_gtk_CairoSurface */
 
-#ifndef _Included_gnu_java_awt_peer_gtk_CairoSurface
-#define _Included_gnu_java_awt_peer_gtk_CairoSurface
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
-#undef gnu_java_awt_peer_gtk_CairoSurface_TYPE_BYTE
-#define gnu_java_awt_peer_gtk_CairoSurface_TYPE_BYTE 0L
-#undef gnu_java_awt_peer_gtk_CairoSurface_TYPE_USHORT
-#define gnu_java_awt_peer_gtk_CairoSurface_TYPE_USHORT 1L
-#undef gnu_java_awt_peer_gtk_CairoSurface_TYPE_SHORT
-#define gnu_java_awt_peer_gtk_CairoSurface_TYPE_SHORT 2L
-#undef gnu_java_awt_peer_gtk_CairoSurface_TYPE_INT
-#define gnu_java_awt_peer_gtk_CairoSurface_TYPE_INT 3L
-#undef gnu_java_awt_peer_gtk_CairoSurface_TYPE_FLOAT
-#define gnu_java_awt_peer_gtk_CairoSurface_TYPE_FLOAT 4L
-#undef gnu_java_awt_peer_gtk_CairoSurface_TYPE_DOUBLE
-#define gnu_java_awt_peer_gtk_CairoSurface_TYPE_DOUBLE 5L
-#undef gnu_java_awt_peer_gtk_CairoSurface_TYPE_UNDEFINED
-#define gnu_java_awt_peer_gtk_CairoSurface_TYPE_UNDEFINED 32L
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoSurface
- * Method:    create
- * Signature: (III)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_create
-  (JNIEnv *, jobject, jint, jint, jint);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoSurface
- * Method:    destroy
- * Signature: (JJ)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_destroy
-  (JNIEnv *, jobject, jlong, jlong);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoSurface
- * Method:    nativeGetElem
- * Signature: (JI)I
- */
-JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeGetElem
-  (JNIEnv *, jobject, jlong, jint);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoSurface
- * Method:    nativeSetElem
- * Signature: (JII)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeSetElem
-  (JNIEnv *, jobject, jlong, jint, jint);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoSurface
- * Method:    nativeDrawSurface
- * Signature: (JJ[D)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeDrawSurface
-  (JNIEnv *, jobject, jlong, jlong, jdoubleArray);
 
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoSurface
- * Method:    nativeGetPixels
- * Signature: (JI)[I
- */
-JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeGetPixels
-  (JNIEnv *, jobject, jlong, jint);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoSurface
- * Method:    nativeSetPixels
- * Signature: (J[I)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeSetPixels
-  (JNIEnv *, jobject, jlong, jintArray);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoSurface
- * Method:    getFlippedBuffer
- * Signature: (JI)J
- */
-JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_getFlippedBuffer
-  (JNIEnv *, jobject, jlong, jint);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoSurface
- * Method:    nativeNewCairoContext
- * Signature: (J)J
- */
-JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeNewCairoContext
-  (JNIEnv *, jobject, jlong);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_CairoSurface
- * Method:    copyAreaNative2
- * Signature: (JIIIIIII)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_copyAreaNative2
-  (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jint, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_create (JNIEnv *env, jobject, jint, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_destroy (JNIEnv *env, jobject, jlong, jlong);
+JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeGetElem (JNIEnv *env, jobject, jlong, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeSetElem (JNIEnv *env, jobject, jlong, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeDrawSurface (JNIEnv *env, jobject, jlong, jlong, jdoubleArray);
+JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeGetPixels (JNIEnv *env, jobject, jlong, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeSetPixels (JNIEnv *env, jobject, jlong, jintArray);
+JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_getFlippedBuffer (JNIEnv *env, jobject, jlong, jint);
+JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeNewCairoContext (JNIEnv *env, jobject, jlong);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_copyAreaNative2 (JNIEnv *env, jobject, jlong, jint, jint, jint, jint, jint, jint, jint);
 
 #ifdef __cplusplus
 }
 #endif
-#endif
+
+#endif /* __gnu_java_awt_peer_gtk_CairoSurface__ */
diff --git a/include/gnu_java_awt_peer_gtk_ComponentGraphics.h b/include/gnu_java_awt_peer_gtk_ComponentGraphics.h
index f88ad592b..4fd597eff 100644
--- a/include/gnu_java_awt_peer_gtk_ComponentGraphics.h
+++ b/include/gnu_java_awt_peer_gtk_ComponentGraphics.h
@@ -1,77 +1,26 @@
 /* DO NOT EDIT THIS FILE - it is machine generated */
+
+#ifndef __gnu_java_awt_peer_gtk_ComponentGraphics__
+#define __gnu_java_awt_peer_gtk_ComponentGraphics__
+
 #include <jni.h>
-/* Header for class gnu_java_awt_peer_gtk_ComponentGraphics */
 
-#ifndef _Included_gnu_java_awt_peer_gtk_ComponentGraphics
-#define _Included_gnu_java_awt_peer_gtk_ComponentGraphics
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
-/*
- * Class:     gnu_java_awt_peer_gtk_ComponentGraphics
- * Method:    initState
- * Signature: (Lgnu/java/awt/peer/gtk/GtkComponentPeer;)J
- */
-JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_initState
-  (JNIEnv *, jobject, jobject);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_ComponentGraphics
- * Method:    disposeSurface
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_disposeSurface
-  (JNIEnv *, jobject, jlong);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_ComponentGraphics
- * Method:    initFromVolatile
- * Signature: (JII)J
- */
-JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_initFromVolatile
-  (JNIEnv *, jobject, jlong, jint, jint);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_ComponentGraphics
- * Method:    start_gdk_drawing
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_start_1gdk_1drawing
-  (JNIEnv *, jobject);
 
-/*
- * Class:     gnu_java_awt_peer_gtk_ComponentGraphics
- * Method:    end_gdk_drawing
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_end_1gdk_1drawing
-  (JNIEnv *, jobject);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_ComponentGraphics
- * Method:    hasXRender
- * Signature: ()Z
- */
-JNIEXPORT jboolean JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_hasXRender
-  (JNIEnv *, jclass);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_ComponentGraphics
- * Method:    copyAreaNative
- * Signature: (Lgnu/java/awt/peer/gtk/GtkComponentPeer;IIIIII)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_copyAreaNative
-  (JNIEnv *, jobject, jobject, jint, jint, jint, jint, jint, jint);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_ComponentGraphics
- * Method:    drawVolatile
- * Signature: (Lgnu/java/awt/peer/gtk/GtkComponentPeer;JIIII)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_drawVolatile
-  (JNIEnv *, jobject, jobject, jlong, jint, jint, jint, jint);
+JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_initState (JNIEnv *env, jobject, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_disposeSurface (JNIEnv *env, jobject, jlong);
+JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_initFromVolatile (JNIEnv *env, jobject, jlong, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_start_1gdk_1drawing (JNIEnv *env, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_end_1gdk_1drawing (JNIEnv *env, jobject);
+JNIEXPORT jboolean JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_hasXRender (JNIEnv *env, jclass);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_copyAreaNative (JNIEnv *env, jobject, jobject, jint, jint, jint, jint, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_drawVolatile (JNIEnv *env, jobject, jobject, jlong, jint, jint, jint, jint);
 
 #ifdef __cplusplus
 }
 #endif
-#endif
+
+#endif /* __gnu_java_awt_peer_gtk_ComponentGraphics__ */
diff --git a/include/gnu_java_awt_peer_gtk_GdkTextLayout.h b/include/gnu_java_awt_peer_gtk_GdkTextLayout.h
index 680c4165f..fae4d775b 100644
--- a/include/gnu_java_awt_peer_gtk_GdkTextLayout.h
+++ b/include/gnu_java_awt_peer_gtk_GdkTextLayout.h
@@ -16,7 +16,7 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkTextLayout_getExtents (JNIE
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkTextLayout_indexToPos (JNIEnv *env, jobject, jint, jdoubleArray);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkTextLayout_initState (JNIEnv *env, jobject);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkTextLayout_dispose (JNIEnv *env, jobject);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkTextLayout_cairoDrawGdkTextLayout (JNIEnv *env, jobject, jobject, jfloat, jfloat);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkTextLayout_cairoDrawGdkTextLayout (JNIEnv *env, jobject, jlong, jfloat, jfloat);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkTextLayout_initStaticState (JNIEnv *env, jclass);
 JNIEXPORT jobject JNICALL Java_gnu_java_awt_peer_gtk_GdkTextLayout_getOutline (JNIEnv *env, jobject, jobject);
 
diff --git a/include/gnu_java_awt_peer_gtk_GtkVolatileImage.h b/include/gnu_java_awt_peer_gtk_GtkVolatileImage.h
index 2714535d4..43b55e828 100644
--- a/include/gnu_java_awt_peer_gtk_GtkVolatileImage.h
+++ b/include/gnu_java_awt_peer_gtk_GtkVolatileImage.h
@@ -1,69 +1,23 @@
 /* DO NOT EDIT THIS FILE - it is machine generated */
+
+#ifndef __gnu_java_awt_peer_gtk_GtkVolatileImage__
+#define __gnu_java_awt_peer_gtk_GtkVolatileImage__
+
 #include <jni.h>
-/* Header for class gnu_java_awt_peer_gtk_GtkVolatileImage */
 
-#ifndef _Included_gnu_java_awt_peer_gtk_GtkVolatileImage
-#define _Included_gnu_java_awt_peer_gtk_GtkVolatileImage
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
-#undef gnu_java_awt_peer_gtk_GtkVolatileImage_SCALE_DEFAULT
-#define gnu_java_awt_peer_gtk_GtkVolatileImage_SCALE_DEFAULT 1L
-#undef gnu_java_awt_peer_gtk_GtkVolatileImage_SCALE_FAST
-#define gnu_java_awt_peer_gtk_GtkVolatileImage_SCALE_FAST 2L
-#undef gnu_java_awt_peer_gtk_GtkVolatileImage_SCALE_SMOOTH
-#define gnu_java_awt_peer_gtk_GtkVolatileImage_SCALE_SMOOTH 4L
-#undef gnu_java_awt_peer_gtk_GtkVolatileImage_SCALE_REPLICATE
-#define gnu_java_awt_peer_gtk_GtkVolatileImage_SCALE_REPLICATE 8L
-#undef gnu_java_awt_peer_gtk_GtkVolatileImage_SCALE_AREA_AVERAGING
-#define gnu_java_awt_peer_gtk_GtkVolatileImage_SCALE_AREA_AVERAGING 16L
-#undef gnu_java_awt_peer_gtk_GtkVolatileImage_IMAGE_OK
-#define gnu_java_awt_peer_gtk_GtkVolatileImage_IMAGE_OK 0L
-#undef gnu_java_awt_peer_gtk_GtkVolatileImage_IMAGE_RESTORED
-#define gnu_java_awt_peer_gtk_GtkVolatileImage_IMAGE_RESTORED 1L
-#undef gnu_java_awt_peer_gtk_GtkVolatileImage_IMAGE_INCOMPATIBLE
-#define gnu_java_awt_peer_gtk_GtkVolatileImage_IMAGE_INCOMPATIBLE 2L
-/*
- * Class:     gnu_java_awt_peer_gtk_GtkVolatileImage
- * Method:    init
- * Signature: (Lgnu/java/awt/peer/gtk/GtkComponentPeer;II)J
- */
-JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_init
-  (JNIEnv *, jobject, jobject, jint, jint);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_GtkVolatileImage
- * Method:    destroy
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_destroy
-  (JNIEnv *, jobject, jlong);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_GtkVolatileImage
- * Method:    nativeGetPixels
- * Signature: (J)[I
- */
-JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeGetPixels
-  (JNIEnv *, jobject, jlong);
 
-/*
- * Class:     gnu_java_awt_peer_gtk_GtkVolatileImage
- * Method:    nativeCopyArea
- * Signature: (JIIIIII)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeCopyArea
-  (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jint, jint);
-
-/*
- * Class:     gnu_java_awt_peer_gtk_GtkVolatileImage
- * Method:    nativeDrawVolatile
- * Signature: (JJIIII)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeDrawVolatile
-  (JNIEnv *, jobject, jlong, jlong, jint, jint, jint, jint);
+JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_init (JNIEnv *env, jobject, jobject, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_destroy (JNIEnv *env, jobject, jlong);
+JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeGetPixels (JNIEnv *env, jobject, jlong);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeCopyArea (JNIEnv *env, jobject, jlong, jint, jint, jint, jint, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeDrawVolatile (JNIEnv *env, jobject, jlong, jlong, jint, jint, jint, jint);
 
 #ifdef __cplusplus
 }
 #endif
-#endif
+
+#endif /* __gnu_java_awt_peer_gtk_GtkVolatileImage__ */
diff --git a/include/java_io_VMFile.h b/include/java_io_VMFile.h
index a390a1992..fa1079f12 100644
--- a/include/java_io_VMFile.h
+++ b/include/java_io_VMFile.h
@@ -24,7 +24,7 @@ JNIEXPORT jboolean JNICALL Java_java_io_VMFile_isFile (JNIEnv *env, jclass, jstr
 JNIEXPORT jboolean JNICALL Java_java_io_VMFile_canWrite (JNIEnv *env, jclass, jstring);
 JNIEXPORT jboolean JNICALL Java_java_io_VMFile_canRead (JNIEnv *env, jclass, jstring);
 JNIEXPORT jboolean JNICALL Java_java_io_VMFile_isDirectory (JNIEnv *env, jclass, jstring);
-JNIEXPORT jstring JNICALL Java_java_io_VMFile_toCanonicalForm (JNIEnv *env,jclass, jstring);
+JNIEXPORT jstring JNICALL Java_java_io_VMFile_toCanonicalForm (JNIEnv *env, jclass, jstring);
 #undef java_io_VMFile_IS_CASE_SENSITIVE
 #define java_io_VMFile_IS_CASE_SENSITIVE 1L
 #undef java_io_VMFile_IS_DOS_8_3