2006-10-25 Francis Kung <fkung@redhat.com>

	* include/gnu_java_nio_VMChannel.h,
	* include/java_net_VMNetworkInterface.h,
	* include/gnu_java_nio_EpollSelectorImpl.h,
	* include/gnu_java_awt_peer_gtk_CairoGraphics2D.h,
	* include/gnu_java_nio_FileChannelImpl.h,
	* include/gnu_java_nio_KqueueSelectorImpl.h,
	* include/gnu_java_nio_VMPipe.h,
	* include/gnu_java_net_VMPlainSocketImpl.h: Regenerated.

8 files changed, 135 insertions, 611 deletions

diff --git a/include/gnu_java_awt_peer_gtk_CairoGraphics2D.h b/include/gnu_java_awt_peer_gtk_CairoGraphics2D.h
index a782eeb97..f32b9381b 100644
--- a/include/gnu_java_awt_peer_gtk_CairoGraphics2D.h
+++ b/include/gnu_java_awt_peer_gtk_CairoGraphics2D.h
@@ -22,8 +22,8 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetRGBACo
 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_cairoSetFont (JNIEnv *env, jobject, jlong, jobject);
 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_cairoSetFont (JNIEnv *env, jobject, jlong, jobject);
 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_cairoArc (JNIEnv *env, jobject, jlong, jdouble, jdouble, jdouble, jdouble, jdouble);
diff --git a/include/gnu_java_net_VMPlainSocketImpl.h b/include/gnu_java_net_VMPlainSocketImpl.h
index b274ce0fb..ef3c3a467 100644
--- a/include/gnu_java_net_VMPlainSocketImpl.h
+++ b/include/gnu_java_net_VMPlainSocketImpl.h
@@ -1,152 +1,39 @@
 /* DO NOT EDIT THIS FILE - it is machine generated */
+
+#ifndef __gnu_java_net_VMPlainSocketImpl__
+#define __gnu_java_net_VMPlainSocketImpl__
+
 #include <jni.h>
-/* Header for class gnu_java_net_VMPlainSocketImpl */
 
-#ifndef _Included_gnu_java_net_VMPlainSocketImpl
-#define _Included_gnu_java_net_VMPlainSocketImpl
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
-/*
- * Class:     gnu_java_net_VMPlainSocketImpl
- * Method:    setOption
- * Signature: (III)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_setOption
-  (JNIEnv *, jclass, jint, jint, jint);
-
-/*
- * Class:     gnu_java_net_VMPlainSocketImpl
- * Method:    getOption
- * Signature: (II)I
- */
-JNIEXPORT jint JNICALL Java_gnu_java_net_VMPlainSocketImpl_getOption
-  (JNIEnv *, jclass, jint, jint);
-
-/*
- * Class:     gnu_java_net_VMPlainSocketImpl
- * Method:    bind
- * Signature: (I[BI)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_bind
-  (JNIEnv *, jclass, jint, jbyteArray, jint);
-
-/*
- * Class:     gnu_java_net_VMPlainSocketImpl
- * Method:    bind6
- * Signature: (I[BI)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_bind6
-  (JNIEnv *, jclass, jint, jbyteArray, jint);
-
-/*
- * Class:     gnu_java_net_VMPlainSocketImpl
- * Method:    listen
- * Signature: (II)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_listen
-  (JNIEnv *, jclass, jint, jint);
-
-/*
- * Class:     gnu_java_net_VMPlainSocketImpl
- * Method:    join
- * Signature: (I[B)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_join
-  (JNIEnv *, jclass, jint, jbyteArray);
-
-/*
- * Class:     gnu_java_net_VMPlainSocketImpl
- * Method:    join6
- * Signature: (I[B)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_join6
-  (JNIEnv *, jclass, jint, jbyteArray);
-
-/*
- * Class:     gnu_java_net_VMPlainSocketImpl
- * Method:    leave
- * Signature: (I[B)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_leave
-  (JNIEnv *, jclass, jint, jbyteArray);
-
-/*
- * Class:     gnu_java_net_VMPlainSocketImpl
- * Method:    leave6
- * Signature: (I[B)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_leave6
-  (JNIEnv *, jclass, jint, jbyteArray);
-
-/*
- * Class:     gnu_java_net_VMPlainSocketImpl
- * Method:    joinGroup
- * Signature: (I[BLjava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_joinGroup
-  (JNIEnv *, jclass, jint, jbyteArray, jstring);
-
-/*
- * Class:     gnu_java_net_VMPlainSocketImpl
- * Method:    joinGroup6
- * Signature: (I[BLjava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_joinGroup6
-  (JNIEnv *, jclass, jint, jbyteArray, jstring);
 
-/*
- * Class:     gnu_java_net_VMPlainSocketImpl
- * Method:    leaveGroup
- * Signature: (I[BLjava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_leaveGroup
-  (JNIEnv *, jclass, jint, jbyteArray, jstring);
-
-/*
- * Class:     gnu_java_net_VMPlainSocketImpl
- * Method:    leaveGroup6
- * Signature: (I[BLjava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_leaveGroup6
-  (JNIEnv *, jclass, jint, jbyteArray, jstring);
-
-/*
- * Class:     gnu_java_net_VMPlainSocketImpl
- * Method:    shutdownInput
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_shutdownInput
-  (JNIEnv *, jclass, jint);
-
-/*
- * Class:     gnu_java_net_VMPlainSocketImpl
- * Method:    shutdownOutput
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_shutdownOutput
-  (JNIEnv *, jclass, jint);
-
-/*
- * Class:     gnu_java_net_VMPlainSocketImpl
- * Method:    sendUrgentData
- * Signature: (II)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_sendUrgentData
-  (JNIEnv *, jclass, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_setOption (JNIEnv *env, jclass, jint, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_setMulticastInterface (JNIEnv *env, jclass, jint, jint, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_setMulticastInterface6 (JNIEnv *env, jclass, jint, jint, jstring);
+JNIEXPORT jint JNICALL Java_gnu_java_net_VMPlainSocketImpl_getOption (JNIEnv *env, jclass, jint, jint);
+JNIEXPORT jobject JNICALL Java_gnu_java_net_VMPlainSocketImpl_getMulticastInterface (JNIEnv *env, jclass, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_bind (JNIEnv *env, jclass, jint, jbyteArray, jint);
+JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_bind6 (JNIEnv *env, jclass, jint, jbyteArray, jint);
+JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_listen (JNIEnv *env, jclass, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_join (JNIEnv *env, jclass, jint, jbyteArray);
+JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_join6 (JNIEnv *env, jclass, jint, jbyteArray);
+JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_leave (JNIEnv *env, jclass, jint, jbyteArray);
+JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_leave6 (JNIEnv *env, jclass, jint, jbyteArray);
+JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_joinGroup (JNIEnv *env, jclass, jint, jbyteArray, jstring);
+JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_joinGroup6 (JNIEnv *env, jclass, jint, jbyteArray, jstring);
+JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_leaveGroup (JNIEnv *env, jclass, jint, jbyteArray, jstring);
+JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_leaveGroup6 (JNIEnv *env, jclass, jint, jbyteArray, jstring);
+JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_shutdownInput (JNIEnv *env, jclass, jint);
+JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_shutdownOutput (JNIEnv *env, jclass, jint);
+JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_sendUrgentData (JNIEnv *env, jclass, jint, jint);
+#undef gnu_java_net_VMPlainSocketImpl_CP_IP_TTL
+#define gnu_java_net_VMPlainSocketImpl_CP_IP_TTL 7777L
 
 #ifdef __cplusplus
 }
 #endif
-#endif
-/* Header for class gnu_java_net_VMPlainSocketImpl_State */
 
-#ifndef _Included_gnu_java_net_VMPlainSocketImpl_State
-#define _Included_gnu_java_net_VMPlainSocketImpl_State
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif
+#endif /* __gnu_java_net_VMPlainSocketImpl__ */
diff --git a/include/gnu_java_nio_EpollSelectorImpl.h b/include/gnu_java_nio_EpollSelectorImpl.h
index 188cdf9d5..0e43d1ce9 100644
--- a/include/gnu_java_nio_EpollSelectorImpl.h
+++ b/include/gnu_java_nio_EpollSelectorImpl.h
@@ -1,12 +1,24 @@
 /* DO NOT EDIT THIS FILE - it is machine generated */
+
+#ifndef __gnu_java_nio_EpollSelectorImpl__
+#define __gnu_java_nio_EpollSelectorImpl__
+
 #include <jni.h>
-/* Header for class gnu_java_nio_EpollSelectorImpl */
 
-#ifndef _Included_gnu_java_nio_EpollSelectorImpl
-#define _Included_gnu_java_nio_EpollSelectorImpl
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
+
+JNIEXPORT jboolean JNICALL Java_gnu_java_nio_EpollSelectorImpl_epoll_1supported (JNIEnv *env, jclass);
+JNIEXPORT jint JNICALL Java_gnu_java_nio_EpollSelectorImpl_sizeof_1struct (JNIEnv *env, jclass);
+JNIEXPORT jint JNICALL Java_gnu_java_nio_EpollSelectorImpl_epoll_1create (JNIEnv *env, jclass, jint);
+JNIEXPORT void JNICALL Java_gnu_java_nio_EpollSelectorImpl_epoll_1add (JNIEnv *env, jclass, jint, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_nio_EpollSelectorImpl_epoll_1modify (JNIEnv *env, jclass, jint, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_nio_EpollSelectorImpl_epoll_1delete (JNIEnv *env, jclass, jint, jint);
+JNIEXPORT jint JNICALL Java_gnu_java_nio_EpollSelectorImpl_epoll_1wait (JNIEnv *env, jclass, jint, jobject, jint, jint);
+JNIEXPORT jint JNICALL Java_gnu_java_nio_EpollSelectorImpl_selected_1fd (JNIEnv *env, jclass, jobject);
+JNIEXPORT jint JNICALL Java_gnu_java_nio_EpollSelectorImpl_selected_1ops (JNIEnv *env, jclass, jobject);
 #undef gnu_java_nio_EpollSelectorImpl_DEFAULT_EPOLL_SIZE
 #define gnu_java_nio_EpollSelectorImpl_DEFAULT_EPOLL_SIZE 128L
 #undef gnu_java_nio_EpollSelectorImpl_OP_ACCEPT
@@ -17,79 +29,9 @@ extern "C" {
 #define gnu_java_nio_EpollSelectorImpl_OP_READ 1L
 #undef gnu_java_nio_EpollSelectorImpl_OP_WRITE
 #define gnu_java_nio_EpollSelectorImpl_OP_WRITE 4L
-/*
- * Class:     gnu_java_nio_EpollSelectorImpl
- * Method:    epoll_supported
- * Signature: ()Z
- */
-JNIEXPORT jboolean JNICALL Java_gnu_java_nio_EpollSelectorImpl_epoll_1supported
-  (JNIEnv *, jclass);
-
-/*
- * Class:     gnu_java_nio_EpollSelectorImpl
- * Method:    sizeof_struct
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_gnu_java_nio_EpollSelectorImpl_sizeof_1struct
-  (JNIEnv *, jclass);
-
-/*
- * Class:     gnu_java_nio_EpollSelectorImpl
- * Method:    epoll_create
- * Signature: (I)I
- */
-JNIEXPORT jint JNICALL Java_gnu_java_nio_EpollSelectorImpl_epoll_1create
-  (JNIEnv *, jclass, jint);
-
-/*
- * Class:     gnu_java_nio_EpollSelectorImpl
- * Method:    epoll_add
- * Signature: (III)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_nio_EpollSelectorImpl_epoll_1add
-  (JNIEnv *, jclass, jint, jint, jint);
-
-/*
- * Class:     gnu_java_nio_EpollSelectorImpl
- * Method:    epoll_modify
- * Signature: (III)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_nio_EpollSelectorImpl_epoll_1modify
-  (JNIEnv *, jclass, jint, jint, jint);
-
-/*
- * Class:     gnu_java_nio_EpollSelectorImpl
- * Method:    epoll_delete
- * Signature: (II)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_nio_EpollSelectorImpl_epoll_1delete
-  (JNIEnv *, jclass, jint, jint);
-
-/*
- * Class:     gnu_java_nio_EpollSelectorImpl
- * Method:    epoll_wait
- * Signature: (ILjava/nio/ByteBuffer;II)I
- */
-JNIEXPORT jint JNICALL Java_gnu_java_nio_EpollSelectorImpl_epoll_1wait
-  (JNIEnv *, jclass, jint, jobject, jint, jint);
-
-/*
- * Class:     gnu_java_nio_EpollSelectorImpl
- * Method:    selected_fd
- * Signature: (Ljava/nio/ByteBuffer;)I
- */
-JNIEXPORT jint JNICALL Java_gnu_java_nio_EpollSelectorImpl_selected_1fd
-  (JNIEnv *, jclass, jobject);
-
-/*
- * Class:     gnu_java_nio_EpollSelectorImpl
- * Method:    selected_ops
- * Signature: (Ljava/nio/ByteBuffer;)I
- */
-JNIEXPORT jint JNICALL Java_gnu_java_nio_EpollSelectorImpl_selected_1ops
-  (JNIEnv *, jclass, jobject);
 
 #ifdef __cplusplus
 }
 #endif
-#endif
+
+#endif /* __gnu_java_nio_EpollSelectorImpl__ */
diff --git a/include/gnu_java_nio_FileChannelImpl.h b/include/gnu_java_nio_FileChannelImpl.h
index ebf466ccc..43000114c 100644
--- a/include/gnu_java_nio_FileChannelImpl.h
+++ b/include/gnu_java_nio_FileChannelImpl.h
@@ -1,12 +1,15 @@
 /* DO NOT EDIT THIS FILE - it is machine generated */
+
+#ifndef __gnu_java_nio_FileChannelImpl__
+#define __gnu_java_nio_FileChannelImpl__
+
 #include <jni.h>
-/* Header for class gnu_java_nio_FileChannelImpl */
 
-#ifndef _Included_gnu_java_nio_FileChannelImpl
-#define _Included_gnu_java_nio_FileChannelImpl
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
+
 #undef gnu_java_nio_FileChannelImpl_READ
 #define gnu_java_nio_FileChannelImpl_READ 1L
 #undef gnu_java_nio_FileChannelImpl_WRITE
@@ -19,7 +22,9 @@ extern "C" {
 #define gnu_java_nio_FileChannelImpl_SYNC 16L
 #undef gnu_java_nio_FileChannelImpl_DSYNC
 #define gnu_java_nio_FileChannelImpl_DSYNC 32L
+
 #ifdef __cplusplus
 }
 #endif
-#endif
+
+#endif /* __gnu_java_nio_FileChannelImpl__ */
diff --git a/include/gnu_java_nio_KqueueSelectorImpl.h b/include/gnu_java_nio_KqueueSelectorImpl.h
index f9716f38c..acfdeaae7 100644
--- a/include/gnu_java_nio_KqueueSelectorImpl.h
+++ b/include/gnu_java_nio_KqueueSelectorImpl.h
@@ -1,12 +1,24 @@
 /* DO NOT EDIT THIS FILE - it is machine generated */
+
+#ifndef __gnu_java_nio_KqueueSelectorImpl__
+#define __gnu_java_nio_KqueueSelectorImpl__
+
 #include <jni.h>
-/* Header for class gnu_java_nio_KqueueSelectorImpl */
 
-#ifndef _Included_gnu_java_nio_KqueueSelectorImpl
-#define _Included_gnu_java_nio_KqueueSelectorImpl
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
+
+JNIEXPORT jboolean JNICALL Java_gnu_java_nio_KqueueSelectorImpl_kqueue_1supported (JNIEnv *env, jclass);
+JNIEXPORT jint JNICALL Java_gnu_java_nio_KqueueSelectorImpl_sizeof_1struct_1kevent (JNIEnv *env, jclass);
+JNIEXPORT jint JNICALL Java_gnu_java_nio_KqueueSelectorImpl_implOpen (JNIEnv *env, jclass);
+JNIEXPORT void JNICALL Java_gnu_java_nio_KqueueSelectorImpl_implClose (JNIEnv *env, jclass, jint);
+JNIEXPORT void JNICALL Java_gnu_java_nio_KqueueSelectorImpl_kevent_1set (JNIEnv *env, jclass, jobject, jint, jint, jint, jint, jint);
+JNIEXPORT jint JNICALL Java_gnu_java_nio_KqueueSelectorImpl_kevent (JNIEnv *env, jclass, jint, jobject, jint, jint, jlong);
+JNIEXPORT jint JNICALL Java_gnu_java_nio_KqueueSelectorImpl_fetch_1key (JNIEnv *env, jclass, jobject);
+JNIEXPORT jint JNICALL Java_gnu_java_nio_KqueueSelectorImpl_ready_1ops (JNIEnv *env, jclass, jobject, jint);
+JNIEXPORT jboolean JNICALL Java_gnu_java_nio_KqueueSelectorImpl_check_1eof (JNIEnv *env, jclass, jobject);
 #undef gnu_java_nio_KqueueSelectorImpl_MAX_DOUBLING_CAPACITY
 #define gnu_java_nio_KqueueSelectorImpl_MAX_DOUBLING_CAPACITY 16384L
 #undef gnu_java_nio_KqueueSelectorImpl_CAP_INCREMENT
@@ -19,79 +31,9 @@ extern "C" {
 #define gnu_java_nio_KqueueSelectorImpl_OP_READ 1L
 #undef gnu_java_nio_KqueueSelectorImpl_OP_WRITE
 #define gnu_java_nio_KqueueSelectorImpl_OP_WRITE 4L
-/*
- * Class:     gnu_java_nio_KqueueSelectorImpl
- * Method:    kqueue_supported
- * Signature: ()Z
- */
-JNIEXPORT jboolean JNICALL Java_gnu_java_nio_KqueueSelectorImpl_kqueue_1supported
-  (JNIEnv *, jclass);
-
-/*
- * Class:     gnu_java_nio_KqueueSelectorImpl
- * Method:    sizeof_struct_kevent
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_gnu_java_nio_KqueueSelectorImpl_sizeof_1struct_1kevent
-  (JNIEnv *, jclass);
-
-/*
- * Class:     gnu_java_nio_KqueueSelectorImpl
- * Method:    implOpen
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_gnu_java_nio_KqueueSelectorImpl_implOpen
-  (JNIEnv *, jclass);
-
-/*
- * Class:     gnu_java_nio_KqueueSelectorImpl
- * Method:    implClose
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_nio_KqueueSelectorImpl_implClose
-  (JNIEnv *, jclass, jint);
-
-/*
- * Class:     gnu_java_nio_KqueueSelectorImpl
- * Method:    kevent_set
- * Signature: (Ljava/nio/ByteBuffer;IIIII)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_nio_KqueueSelectorImpl_kevent_1set
-  (JNIEnv *, jclass, jobject, jint, jint, jint, jint, jint);
-
-/*
- * Class:     gnu_java_nio_KqueueSelectorImpl
- * Method:    kevent
- * Signature: (ILjava/nio/ByteBuffer;IIJ)I
- */
-JNIEXPORT jint JNICALL Java_gnu_java_nio_KqueueSelectorImpl_kevent
-  (JNIEnv *, jclass, jint, jobject, jint, jint, jlong);
-
-/*
- * Class:     gnu_java_nio_KqueueSelectorImpl
- * Method:    fetch_key
- * Signature: (Ljava/nio/ByteBuffer;)I
- */
-JNIEXPORT jint JNICALL Java_gnu_java_nio_KqueueSelectorImpl_fetch_1key
-  (JNIEnv *, jclass, jobject);
-
-/*
- * Class:     gnu_java_nio_KqueueSelectorImpl
- * Method:    ready_ops
- * Signature: (Ljava/nio/ByteBuffer;I)I
- */
-JNIEXPORT jint JNICALL Java_gnu_java_nio_KqueueSelectorImpl_ready_1ops
-  (JNIEnv *, jclass, jobject, jint);
-
-/*
- * Class:     gnu_java_nio_KqueueSelectorImpl
- * Method:    check_eof
- * Signature: (Ljava/nio/ByteBuffer;)Z
- */
-JNIEXPORT jboolean JNICALL Java_gnu_java_nio_KqueueSelectorImpl_check_1eof
-  (JNIEnv *, jclass, jobject);
 
 #ifdef __cplusplus
 }
 #endif
-#endif
+
+#endif /* __gnu_java_nio_KqueueSelectorImpl__ */
diff --git a/include/gnu_java_nio_VMChannel.h b/include/gnu_java_nio_VMChannel.h
index 969e3298a..dd023816c 100644
--- a/include/gnu_java_nio_VMChannel.h
+++ b/include/gnu_java_nio_VMChannel.h
@@ -1,291 +1,50 @@
 /* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class gnu_java_nio_VMChannel */
-
-#ifndef _Included_gnu_java_nio_VMChannel
-#define _Included_gnu_java_nio_VMChannel
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     gnu_java_nio_VMChannel
- * Method:    stdin_fd
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_gnu_java_nio_VMChannel_stdin_1fd
-  (JNIEnv *, jclass);
-
-/*
- * Class:     gnu_java_nio_VMChannel
- * Method:    stdout_fd
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_gnu_java_nio_VMChannel_stdout_1fd
-  (JNIEnv *, jclass);
-
-/*
- * Class:     gnu_java_nio_VMChannel
- * Method:    stderr_fd
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_gnu_java_nio_VMChannel_stderr_1fd
-  (JNIEnv *, jclass);
-
-/*
- * Class:     gnu_java_nio_VMChannel
- * Method:    setBlocking
- * Signature: (IZ)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_nio_VMChannel_setBlocking
-  (JNIEnv *, jclass, jint, jboolean);
-
-/*
- * Class:     gnu_java_nio_VMChannel
- * Method:    available
- * Signature: (I)I
- */
-JNIEXPORT jint JNICALL Java_gnu_java_nio_VMChannel_available
-  (JNIEnv *, jclass, jint);
-
-/*
- * Class:     gnu_java_nio_VMChannel
- * Method:    read
- * Signature: (ILjava/nio/ByteBuffer;)I
- */
-JNIEXPORT jint JNICALL Java_gnu_java_nio_VMChannel_read__ILjava_nio_ByteBuffer_2
-  (JNIEnv *, jclass, jint, jobject);
-
-/*
- * Class:     gnu_java_nio_VMChannel
- * Method:    read
- * Signature: (I)I
- */
-JNIEXPORT jint JNICALL Java_gnu_java_nio_VMChannel_read__I
-  (JNIEnv *, jclass, jint);
-
-/*
- * Class:     gnu_java_nio_VMChannel
- * Method:    readScattering
- * Signature: (I[Ljava/nio/ByteBuffer;II)J
- */
-JNIEXPORT jlong JNICALL Java_gnu_java_nio_VMChannel_readScattering
-  (JNIEnv *, jclass, jint, jobjectArray, jint, jint);
-
-/*
- * Class:     gnu_java_nio_VMChannel
- * Method:    receive
- * Signature: (ILjava/nio/ByteBuffer;Ljava/nio/ByteBuffer;)I
- */
-JNIEXPORT jint JNICALL Java_gnu_java_nio_VMChannel_receive
-  (JNIEnv *, jclass, jint, jobject, jobject);
-
-/*
- * Class:     gnu_java_nio_VMChannel
- * Method:    write
- * Signature: (ILjava/nio/ByteBuffer;)I
- */
-JNIEXPORT jint JNICALL Java_gnu_java_nio_VMChannel_write__ILjava_nio_ByteBuffer_2
-  (JNIEnv *, jobject, jint, jobject);
-
-/*
- * Class:     gnu_java_nio_VMChannel
- * Method:    writeGathering
- * Signature: (I[Ljava/nio/ByteBuffer;II)J
- */
-JNIEXPORT jlong JNICALL Java_gnu_java_nio_VMChannel_writeGathering
-  (JNIEnv *, jobject, jint, jobjectArray, jint, jint);
-
-/*
- * Class:     gnu_java_nio_VMChannel
- * Method:    send
- * Signature: (ILjava/nio/ByteBuffer;[BI)I
- */
-JNIEXPORT jint JNICALL Java_gnu_java_nio_VMChannel_send
-  (JNIEnv *, jclass, jint, jobject, jbyteArray, jint);
-
-/*
- * Class:     gnu_java_nio_VMChannel
- * Method:    send6
- * Signature: (ILjava/nio/ByteBuffer;[BI)I
- */
-JNIEXPORT jint JNICALL Java_gnu_java_nio_VMChannel_send6
-  (JNIEnv *, jclass, jint, jobject, jbyteArray, jint);
-
-/*
- * Class:     gnu_java_nio_VMChannel
- * Method:    write
- * Signature: (II)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_nio_VMChannel_write__II
-  (JNIEnv *, jclass, jint, jint);
-
-/*
- * Class:     gnu_java_nio_VMChannel
- * Method:    initIDs
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_gnu_java_nio_VMChannel_initIDs
-  (JNIEnv *, jclass);
-
-/*
- * Class:     gnu_java_nio_VMChannel
- * Method:    socket
- * Signature: (Z)I
- */
-JNIEXPORT jint JNICALL Java_gnu_java_nio_VMChannel_socket
-  (JNIEnv *, jclass, jboolean);
-
-/*
- * Class:     gnu_java_nio_VMChannel
- * Method:    connect
- * Signature: (I[BII)Z
- */
-JNIEXPORT jboolean JNICALL Java_gnu_java_nio_VMChannel_connect
-  (JNIEnv *, jclass, jint, jbyteArray, jint, jint);
-
-/*
- * Class:     gnu_java_nio_VMChannel
- * Method:    connect6
- * Signature: (I[BII)Z
- */
-JNIEXPORT jboolean JNICALL Java_gnu_java_nio_VMChannel_connect6
-  (JNIEnv *, jclass, jint, jbyteArray, jint, jint);
-
-/*
- * Class:     gnu_java_nio_VMChannel
- * Method:    disconnect
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_nio_VMChannel_disconnect
-  (JNIEnv *, jclass, jint);
-
-/*
- * Class:     gnu_java_nio_VMChannel
- * Method:    getsockname
- * Signature: (ILjava/nio/ByteBuffer;)I
- */
-JNIEXPORT jint JNICALL Java_gnu_java_nio_VMChannel_getsockname
-  (JNIEnv *, jclass, jint, jobject);
 
-/*
- * Class:     gnu_java_nio_VMChannel
- * Method:    getpeername
- * Signature: (ILjava/nio/ByteBuffer;)I
- */
-JNIEXPORT jint JNICALL Java_gnu_java_nio_VMChannel_getpeername
-  (JNIEnv *, jclass, jint, jobject);
+#ifndef __gnu_java_nio_VMChannel__
+#define __gnu_java_nio_VMChannel__
 
-/*
- * Class:     gnu_java_nio_VMChannel
- * Method:    accept
- * Signature: (I)I
- */
-JNIEXPORT jint JNICALL Java_gnu_java_nio_VMChannel_accept
-  (JNIEnv *, jclass, jint);
-
-/*
- * Class:     gnu_java_nio_VMChannel
- * Method:    open
- * Signature: (Ljava/lang/String;I)I
- */
-JNIEXPORT jint JNICALL Java_gnu_java_nio_VMChannel_open
-  (JNIEnv *, jclass, jstring, jint);
-
-/*
- * Class:     gnu_java_nio_VMChannel
- * Method:    position
- * Signature: (I)J
- */
-JNIEXPORT jlong JNICALL Java_gnu_java_nio_VMChannel_position
-  (JNIEnv *, jclass, jint);
-
-/*
- * Class:     gnu_java_nio_VMChannel
- * Method:    seek
- * Signature: (IJ)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_nio_VMChannel_seek
-  (JNIEnv *, jclass, jint, jlong);
-
-/*
- * Class:     gnu_java_nio_VMChannel
- * Method:    truncate
- * Signature: (IJ)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_nio_VMChannel_truncate
-  (JNIEnv *, jclass, jint, jlong);
-
-/*
- * Class:     gnu_java_nio_VMChannel
- * Method:    lock
- * Signature: (IJJZZ)Z
- */
-JNIEXPORT jboolean JNICALL Java_gnu_java_nio_VMChannel_lock
-  (JNIEnv *, jclass, jint, jlong, jlong, jboolean, jboolean);
-
-/*
- * Class:     gnu_java_nio_VMChannel
- * Method:    unlock
- * Signature: (IJJ)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_nio_VMChannel_unlock
-  (JNIEnv *, jclass, jint, jlong, jlong);
-
-/*
- * Class:     gnu_java_nio_VMChannel
- * Method:    size
- * Signature: (I)J
- */
-JNIEXPORT jlong JNICALL Java_gnu_java_nio_VMChannel_size
-  (JNIEnv *, jclass, jint);
-
-/*
- * Class:     gnu_java_nio_VMChannel
- * Method:    map
- * Signature: (ICJI)Ljava/nio/MappedByteBuffer;
- */
-JNIEXPORT jobject JNICALL Java_gnu_java_nio_VMChannel_map
-  (JNIEnv *, jclass, jint, jchar, jlong, jint);
-
-/*
- * Class:     gnu_java_nio_VMChannel
- * Method:    flush
- * Signature: (IZ)Z
- */
-JNIEXPORT jboolean JNICALL Java_gnu_java_nio_VMChannel_flush
-  (JNIEnv *, jclass, jint, jboolean);
-
-/*
- * Class:     gnu_java_nio_VMChannel
- * Method:    close
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_nio_VMChannel_close
-  (JNIEnv *, jclass, jint);
+#include <jni.h>
 
 #ifdef __cplusplus
-}
-#endif
-#endif
-/* Header for class gnu_java_nio_VMChannel_State */
+extern "C"
+{
+#endif
+
+JNIEXPORT jint JNICALL Java_gnu_java_nio_VMChannel_stdin_1fd (JNIEnv *env, jclass);
+JNIEXPORT jint JNICALL Java_gnu_java_nio_VMChannel_stdout_1fd (JNIEnv *env, jclass);
+JNIEXPORT jint JNICALL Java_gnu_java_nio_VMChannel_stderr_1fd (JNIEnv *env, jclass);
+JNIEXPORT void JNICALL Java_gnu_java_nio_VMChannel_setBlocking (JNIEnv *env, jclass, jint, jboolean);
+JNIEXPORT jint JNICALL Java_gnu_java_nio_VMChannel_available (JNIEnv *env, jclass, jint);
+JNIEXPORT jint JNICALL Java_gnu_java_nio_VMChannel_read__ILjava_nio_ByteBuffer_2 (JNIEnv *env, jclass, jint, jobject);
+JNIEXPORT jint JNICALL Java_gnu_java_nio_VMChannel_read__I (JNIEnv *env, jclass, jint);
+JNIEXPORT jlong JNICALL Java_gnu_java_nio_VMChannel_readScattering (JNIEnv *env, jclass, jint, jobjectArray, jint, jint);
+JNIEXPORT jint JNICALL Java_gnu_java_nio_VMChannel_receive (JNIEnv *env, jclass, jint, jobject, jobject);
+JNIEXPORT jint JNICALL Java_gnu_java_nio_VMChannel_write__ILjava_nio_ByteBuffer_2 (JNIEnv *env, jobject, jint, jobject);
+JNIEXPORT jlong JNICALL Java_gnu_java_nio_VMChannel_writeGathering (JNIEnv *env, jobject, jint, jobjectArray, jint, jint);
+JNIEXPORT jint JNICALL Java_gnu_java_nio_VMChannel_send (JNIEnv *env, jclass, jint, jobject, jbyteArray, jint);
+JNIEXPORT jint JNICALL Java_gnu_java_nio_VMChannel_send6 (JNIEnv *env, jclass, jint, jobject, jbyteArray, jint);
+JNIEXPORT void JNICALL Java_gnu_java_nio_VMChannel_write__II (JNIEnv *env, jclass, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_nio_VMChannel_initIDs (JNIEnv *env, jclass);
+JNIEXPORT jint JNICALL Java_gnu_java_nio_VMChannel_socket (JNIEnv *env, jclass, jboolean);
+JNIEXPORT jboolean JNICALL Java_gnu_java_nio_VMChannel_connect (JNIEnv *env, jclass, jint, jbyteArray, jint, jint);
+JNIEXPORT jboolean JNICALL Java_gnu_java_nio_VMChannel_connect6 (JNIEnv *env, jclass, jint, jbyteArray, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_nio_VMChannel_disconnect (JNIEnv *env, jclass, jint);
+JNIEXPORT jint JNICALL Java_gnu_java_nio_VMChannel_getsockname (JNIEnv *env, jclass, jint, jobject);
+JNIEXPORT jint JNICALL Java_gnu_java_nio_VMChannel_getpeername (JNIEnv *env, jclass, jint, jobject);
+JNIEXPORT jint JNICALL Java_gnu_java_nio_VMChannel_accept (JNIEnv *env, jclass, jint);
+JNIEXPORT jint JNICALL Java_gnu_java_nio_VMChannel_open (JNIEnv *env, jclass, jstring, jint);
+JNIEXPORT jlong JNICALL Java_gnu_java_nio_VMChannel_position (JNIEnv *env, jclass, jint);
+JNIEXPORT void JNICALL Java_gnu_java_nio_VMChannel_seek (JNIEnv *env, jclass, jint, jlong);
+JNIEXPORT void JNICALL Java_gnu_java_nio_VMChannel_truncate (JNIEnv *env, jclass, jint, jlong);
+JNIEXPORT jboolean JNICALL Java_gnu_java_nio_VMChannel_lock (JNIEnv *env, jclass, jint, jlong, jlong, jboolean, jboolean);
+JNIEXPORT void JNICALL Java_gnu_java_nio_VMChannel_unlock (JNIEnv *env, jclass, jint, jlong, jlong);
+JNIEXPORT jlong JNICALL Java_gnu_java_nio_VMChannel_size (JNIEnv *env, jclass, jint);
+JNIEXPORT jobject JNICALL Java_gnu_java_nio_VMChannel_map (JNIEnv *env, jclass, jint, jchar, jlong, jint);
+JNIEXPORT jboolean JNICALL Java_gnu_java_nio_VMChannel_flush (JNIEnv *env, jclass, jint, jboolean);
+JNIEXPORT void JNICALL Java_gnu_java_nio_VMChannel_close (JNIEnv *env, jclass, jint);
 
-#ifndef _Included_gnu_java_nio_VMChannel_State
-#define _Included_gnu_java_nio_VMChannel_State
-#ifdef __cplusplus
-extern "C" {
-#endif
 #ifdef __cplusplus
 }
 #endif
-#endif
-/* Header for class gnu_java_nio_VMChannel_Kind */
 
-#ifndef _Included_gnu_java_nio_VMChannel_Kind
-#define _Included_gnu_java_nio_VMChannel_Kind
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif
+#endif /* __gnu_java_nio_VMChannel__ */
diff --git a/include/gnu_java_nio_VMPipe.h b/include/gnu_java_nio_VMPipe.h
index 06d8001b7..2088e55dc 100644
--- a/include/gnu_java_nio_VMPipe.h
+++ b/include/gnu_java_nio_VMPipe.h
@@ -1,21 +1,19 @@
 /* DO NOT EDIT THIS FILE - it is machine generated */
+
+#ifndef __gnu_java_nio_VMPipe__
+#define __gnu_java_nio_VMPipe__
+
 #include <jni.h>
-/* Header for class gnu_java_nio_VMPipe */
 
-#ifndef _Included_gnu_java_nio_VMPipe
-#define _Included_gnu_java_nio_VMPipe
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
-/*
- * Class:     gnu_java_nio_VMPipe
- * Method:    pipe0
- * Signature: ()[I
- */
-JNIEXPORT jintArray JNICALL Java_gnu_java_nio_VMPipe_pipe0
-  (JNIEnv *, jclass);
+
+JNIEXPORT jintArray JNICALL Java_gnu_java_nio_VMPipe_pipe0 (JNIEnv *env, jclass);
 
 #ifdef __cplusplus
 }
 #endif
-#endif
+
+#endif /* __gnu_java_nio_VMPipe__ */
diff --git a/include/java_net_VMNetworkInterface.h b/include/java_net_VMNetworkInterface.h
index 4d5192d28..b53bda565 100644
--- a/include/java_net_VMNetworkInterface.h
+++ b/include/java_net_VMNetworkInterface.h
@@ -1,29 +1,20 @@
 /* DO NOT EDIT THIS FILE - it is machine generated */
+
+#ifndef __java_net_VMNetworkInterface__
+#define __java_net_VMNetworkInterface__
+
 #include <jni.h>
-/* Header for class java_net_VMNetworkInterface */
 
-#ifndef _Included_java_net_VMNetworkInterface
-#define _Included_java_net_VMNetworkInterface
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
-/*
- * Class:     java_net_VMNetworkInterface
- * Method:    initIds
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_java_net_VMNetworkInterface_initIds
-  (JNIEnv *, jclass);
 
-/*
- * Class:     java_net_VMNetworkInterface
- * Method:    getVMInterfaces
- * Signature: ()[Ljava/net/VMNetworkInterface;
- */
-JNIEXPORT jobjectArray JNICALL Java_java_net_VMNetworkInterface_getVMInterfaces
-  (JNIEnv *, jclass);
+JNIEXPORT void JNICALL Java_java_net_VMNetworkInterface_initIds (JNIEnv *env, jclass);
+JNIEXPORT jobjectArray JNICALL Java_java_net_VMNetworkInterface_getVMInterfaces (JNIEnv *env, jclass);
 
 #ifdef __cplusplus
 }
 #endif
-#endif
+
+#endif /* __java_net_VMNetworkInterface__ */