Delete unused JNI header files.

Some of these deleted files were included in corresponding
implementation, but their inclusion was a no-op.

Change-Id: I0a786ba279d1ed5a84c9bf50297dade25a48885d
diff --git a/ojluni/src/main/native/Adler32.c b/ojluni/src/main/native/Adler32.c
index d3f649a..f988afa 100755
--- a/ojluni/src/main/native/Adler32.c
+++ b/ojluni/src/main/native/Adler32.c
@@ -32,7 +32,6 @@
 #include "jni_util.h"
 #include <zlib.h>
 
-#include "java_util_zip_Adler32.h"
 
 
 #define NATIVE_METHOD(className, functionName, signature) \
diff --git a/ojluni/src/main/native/Console_md.c b/ojluni/src/main/native/Console_md.c
index c8faa16..e5ea35c 100644
--- a/ojluni/src/main/native/Console_md.c
+++ b/ojluni/src/main/native/Console_md.c
@@ -26,7 +26,6 @@
 #include "jni.h"
 #include "jni_util.h"
 #include "jvm.h"
-#include "java_io_Console.h"
 
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/ojluni/src/main/native/DatagramChannelImpl.c b/ojluni/src/main/native/DatagramChannelImpl.c
index 8ef5e45..473a98d 100644
--- a/ojluni/src/main/native/DatagramChannelImpl.c
+++ b/ojluni/src/main/native/DatagramChannelImpl.c
@@ -44,7 +44,6 @@
 #include "nio.h"
 #include "nio_util.h"
 
-#include "sun_nio_ch_DatagramChannelImpl.h"
 
 #include "JNIHelp.h"
 
diff --git a/ojluni/src/main/native/DatagramDispatcher.c b/ojluni/src/main/native/DatagramDispatcher.c
index 6b7cce3..11f789a 100644
--- a/ojluni/src/main/native/DatagramDispatcher.c
+++ b/ojluni/src/main/native/DatagramDispatcher.c
@@ -32,7 +32,6 @@
 #include "jlong.h"
 // Android removed.
 //
-// #include "sun_nio_ch_DatagramDispatcher.h"
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/uio.h>
diff --git a/ojluni/src/main/native/DatagramPacket.c b/ojluni/src/main/native/DatagramPacket.c
index 9a3c9c1..fac60ed 100755
--- a/ojluni/src/main/native/DatagramPacket.c
+++ b/ojluni/src/main/native/DatagramPacket.c
@@ -23,7 +23,6 @@
  * questions.
  */
 
-#include "java_net_DatagramPacket.h"
 #include "net_util.h"
 #include "JNIHelp.h"
 
diff --git a/ojluni/src/main/native/DefaultProxySelector.c b/ojluni/src/main/native/DefaultProxySelector.c
index 0184f10..ee00aac 100755
--- a/ojluni/src/main/native/DefaultProxySelector.c
+++ b/ojluni/src/main/native/DefaultProxySelector.c
@@ -28,7 +28,6 @@
 #include "jvm.h"
 #include "jvm_md.h"
 #include "jlong.h"
-#include "sun_net_spi_DefaultProxySelector.h"
 #include <dlfcn.h>
 #include <stdio.h>
 #if defined(__linux__) || defined(_ALLBSD_SOURCE)
diff --git a/ojluni/src/main/native/Double.c b/ojluni/src/main/native/Double.c
index ccc4c2e..942f8c8 100755
--- a/ojluni/src/main/native/Double.c
+++ b/ojluni/src/main/native/Double.c
@@ -28,7 +28,6 @@
 #include "jlong.h"
 #include "jvm.h"
 
-#include "java_lang_Double.h"
 #include "JNIHelp.h"
 
 #define NATIVE_METHOD(className, functionName, signature) \
diff --git a/ojluni/src/main/native/EPollArrayWrapper.c b/ojluni/src/main/native/EPollArrayWrapper.c
index fc8bbc0..f039bcf 100644
--- a/ojluni/src/main/native/EPollArrayWrapper.c
+++ b/ojluni/src/main/native/EPollArrayWrapper.c
@@ -28,7 +28,6 @@
 #include "jvm.h"
 #include "jlong.h"
 
-#include "sun_nio_ch_EPollArrayWrapper.h"
 
 #include <unistd.h>
 #include <sys/time.h>
diff --git a/ojluni/src/main/native/FileChannelImpl.c b/ojluni/src/main/native/FileChannelImpl.c
index cada009..ffd62df 100755
--- a/ojluni/src/main/native/FileChannelImpl.c
+++ b/ojluni/src/main/native/FileChannelImpl.c
@@ -32,7 +32,6 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include "sun_nio_ch_FileChannelImpl.h"
-#include "java_lang_Integer.h"
 #include "nio.h"
 #include "nio_util.h"
 #include <dlfcn.h>
diff --git a/ojluni/src/main/native/FileDescriptor_md.c b/ojluni/src/main/native/FileDescriptor_md.c
index 17c3bea..e365d85 100755
--- a/ojluni/src/main/native/FileDescriptor_md.c
+++ b/ojluni/src/main/native/FileDescriptor_md.c
@@ -29,7 +29,6 @@
 #include "jni_util.h"
 #include "jvm.h"
 
-#include "java_io_FileDescriptor.h"
 #include "JNIHelp.h"
 
 #define NATIVE_METHOD(className, functionName, signature) \
diff --git a/ojluni/src/main/native/FileInputStream.c b/ojluni/src/main/native/FileInputStream.c
index 8d75a43..9825728 100755
--- a/ojluni/src/main/native/FileInputStream.c
+++ b/ojluni/src/main/native/FileInputStream.c
@@ -36,7 +36,6 @@
 
 #include "jvm.h"
 
-#include "java_io_FileInputStream.h"
 
 #include <fcntl.h>
 #include <limits.h>
diff --git a/ojluni/src/main/native/FileKey.c b/ojluni/src/main/native/FileKey.c
index fff3e62..31552eb 100755
--- a/ojluni/src/main/native/FileKey.c
+++ b/ojluni/src/main/native/FileKey.c
@@ -28,7 +28,6 @@
 #include "jvm.h"
 #include "nio.h"
 #include "nio_util.h"
-#include "sun_nio_ch_FileKey.h"
 #include "JNIHelp.h"
 
 #define NATIVE_METHOD(className, functionName, signature) \
diff --git a/ojluni/src/main/native/FileOutputStream_md.c b/ojluni/src/main/native/FileOutputStream_md.c
index 9368821..c38f47f 100755
--- a/ojluni/src/main/native/FileOutputStream_md.c
+++ b/ojluni/src/main/native/FileOutputStream_md.c
@@ -29,7 +29,6 @@
 
 #include "io_util.h"
 #include "io_util_md.h"
-#include "java_io_FileOutputStream.h"
 
 #include <fcntl.h>
 #include "JNIHelp.h"
diff --git a/ojluni/src/main/native/FileSystem_md.c b/ojluni/src/main/native/FileSystem_md.c
index 0ba6d8d..33a3652 100755
--- a/ojluni/src/main/native/FileSystem_md.c
+++ b/ojluni/src/main/native/FileSystem_md.c
@@ -25,7 +25,6 @@
 
 #include "jni.h"
 #include "jni_util.h"
-#include "java_io_FileSystem.h"
 #include "JNIHelp.h"
 
 #define NATIVE_METHOD(className, functionName, signature) \
diff --git a/ojluni/src/main/native/Float.c b/ojluni/src/main/native/Float.c
index b8c3131..398914a 100755
--- a/ojluni/src/main/native/Float.c
+++ b/ojluni/src/main/native/Float.c
@@ -26,7 +26,6 @@
 #include "jni.h"
 #include "jvm.h"
 
-#include "java_lang_Float.h"
 #include "JNIHelp.h"
 
 #define NATIVE_METHOD(className, functionName, signature) \
diff --git a/ojluni/src/main/native/IOUtil.c b/ojluni/src/main/native/IOUtil.c
index 412a09e..ffbefce 100755
--- a/ojluni/src/main/native/IOUtil.c
+++ b/ojluni/src/main/native/IOUtil.c
@@ -31,7 +31,6 @@
 #include "jni_util.h"
 #include "jvm.h"
 #include "jlong.h"
-#include "sun_nio_ch_IOUtil.h"
 #include "java_lang_Integer.h"
 #include "nio.h"
 #include "nio_util.h"
diff --git a/ojluni/src/main/native/Inet4Address.c b/ojluni/src/main/native/Inet4Address.c
index 0c6ca22..cd41068 100755
--- a/ojluni/src/main/native/Inet4Address.c
+++ b/ojluni/src/main/native/Inet4Address.c
@@ -25,7 +25,6 @@
 
 #include <string.h>
 
-#include "java_net_Inet4Address.h"
 #include "net_util.h"
 #include "JNIHelp.h"
 
diff --git a/ojluni/src/main/native/Inet4AddressImpl.c b/ojluni/src/main/native/Inet4AddressImpl.c
index f3c8dcb..c424337 100755
--- a/ojluni/src/main/native/Inet4AddressImpl.c
+++ b/ojluni/src/main/native/Inet4AddressImpl.c
@@ -45,7 +45,6 @@
 #include "jni_util.h"
 #include "net_util.h"
 
-#include "java_net_Inet4AddressImpl.h"
 #include "JNIHelp.h"
 
 #define NATIVE_METHOD(className, functionName, signature) \
diff --git a/ojluni/src/main/native/Inet6Address.c b/ojluni/src/main/native/Inet6Address.c
index 5a0e2f5..274fd31 100755
--- a/ojluni/src/main/native/Inet6Address.c
+++ b/ojluni/src/main/native/Inet6Address.c
@@ -25,7 +25,6 @@
 
 #include <string.h>
 
-#include "java_net_Inet6Address.h"
 #include "net_util.h"
 #include "JNIHelp.h"
 
diff --git a/ojluni/src/main/native/Inet6AddressImpl.c b/ojluni/src/main/native/Inet6AddressImpl.c
index 6a38010..10f6548 100755
--- a/ojluni/src/main/native/Inet6AddressImpl.c
+++ b/ojluni/src/main/native/Inet6AddressImpl.c
@@ -44,8 +44,6 @@
 #include <netinet/icmp6.h>
 #endif
 
-#include "java_net_Inet4AddressImpl.h"
-#include "java_net_Inet6AddressImpl.h"
 #include "JNIHelp.h"
 
 #define NATIVE_METHOD(className, functionName, signature) \
diff --git a/ojluni/src/main/native/InetAddress.c b/ojluni/src/main/native/InetAddress.c
index 761cd31..7fb8890 100755
--- a/ojluni/src/main/native/InetAddress.c
+++ b/ojluni/src/main/native/InetAddress.c
@@ -25,7 +25,6 @@
 
 #include <string.h>
 
-#include "java_net_InetAddress.h"
 #include "net_util.h"
 #include "JNIHelp.h"
 
diff --git a/ojluni/src/main/native/MappedByteBuffer.c b/ojluni/src/main/native/MappedByteBuffer.c
index 70e833b..3dbb96e 100644
--- a/ojluni/src/main/native/MappedByteBuffer.c
+++ b/ojluni/src/main/native/MappedByteBuffer.c
@@ -27,7 +27,6 @@
 #include "jni_util.h"
 #include "jvm.h"
 #include "jlong.h"
-#include "java_nio_MappedByteBuffer.h"
 #include <sys/mman.h>
 #include <stddef.h>
 #include <stdlib.h>
diff --git a/ojluni/src/main/native/NativeThread.c b/ojluni/src/main/native/NativeThread.c
index 9fba2b6..f27284f 100755
--- a/ojluni/src/main/native/NativeThread.c
+++ b/ojluni/src/main/native/NativeThread.c
@@ -29,7 +29,6 @@
 #include "jni_util.h"
 #include "jvm.h"
 #include "jlong.h"
-#include "sun_nio_ch_NativeThread.h"
 #include "nio_util.h"
 #include "JNIHelp.h"
 
diff --git a/ojluni/src/main/native/NetworkInterface.c b/ojluni/src/main/native/NetworkInterface.c
index b05d885..83ab1b8 100755
--- a/ojluni/src/main/native/NetworkInterface.c
+++ b/ojluni/src/main/native/NetworkInterface.c
@@ -98,7 +98,6 @@
  * NetworkInterface
  */
 
-#include "java_net_NetworkInterface.h"
 
 /************************************************************************
  * NetworkInterface
diff --git a/ojluni/src/main/native/ObjectInputStream.c b/ojluni/src/main/native/ObjectInputStream.c
index 1e288e9..8675ff1 100644
--- a/ojluni/src/main/native/ObjectInputStream.c
+++ b/ojluni/src/main/native/ObjectInputStream.c
@@ -28,9 +28,6 @@
 #include "jni_util.h"
 #include "jlong.h"
 
-#include "java_lang_Float.h"
-#include "java_lang_Double.h"
-#include "java_io_ObjectInputStream.h"
 
 
 /*
diff --git a/ojluni/src/main/native/ObjectOutputStream.c b/ojluni/src/main/native/ObjectOutputStream.c
index 2bbb222..67cf54f 100644
--- a/ojluni/src/main/native/ObjectOutputStream.c
+++ b/ojluni/src/main/native/ObjectOutputStream.c
@@ -28,9 +28,6 @@
 #include "jni_util.h"
 #include "jlong.h"
 
-#include "java_lang_Float.h"
-#include "java_lang_Double.h"
-#include "java_io_ObjectOutputStream.h"
 
 /*
  * Class:     java_io_ObjectOutputStream
diff --git a/ojluni/src/main/native/ObjectStreamClass.c b/ojluni/src/main/native/ObjectStreamClass.c
index 703618a..faf5ad6 100755
--- a/ojluni/src/main/native/ObjectStreamClass.c
+++ b/ojluni/src/main/native/ObjectStreamClass.c
@@ -26,7 +26,6 @@
 #include "jni.h"
 #include "jvm.h"
 
-#include "java_io_ObjectStreamClass.h"
 #include "JNIHelp.h"
 
 #define NATIVE_METHOD(className, functionName, signature) \
diff --git a/ojluni/src/main/native/Runtime.c b/ojluni/src/main/native/Runtime.c
index dcf3614..759e36f 100755
--- a/ojluni/src/main/native/Runtime.c
+++ b/ojluni/src/main/native/Runtime.c
@@ -39,7 +39,6 @@
 #include "jni_util.h"
 #include "jvm.h"
 
-#include "java_lang_Runtime.h"
 #include "JNIHelp.h"
 
 #define NATIVE_METHOD(className, functionName, signature) \
diff --git a/ojluni/src/main/native/Shutdown.c b/ojluni/src/main/native/Shutdown.c
index fecfe75..f765a83 100755
--- a/ojluni/src/main/native/Shutdown.c
+++ b/ojluni/src/main/native/Shutdown.c
@@ -27,7 +27,6 @@
 #include "jni_util.h"
 #include "jvm.h"
 
-#include "java_lang_Shutdown.h"
 #include "JNIHelp.h"
 
 #define NATIVE_METHOD(className, functionName, signature) \
diff --git a/ojluni/src/main/native/SocketChannelImpl.c b/ojluni/src/main/native/SocketChannelImpl.c
index c876cd1..8cd3b85 100644
--- a/ojluni/src/main/native/SocketChannelImpl.c
+++ b/ojluni/src/main/native/SocketChannelImpl.c
@@ -40,7 +40,6 @@
 #include "net_util.h"
 #include "jvm.h"
 #include "jlong.h"
-#include "sun_nio_ch_SocketChannelImpl.h"
 #include "nio_util.h"
 #include "nio.h"
 
diff --git a/ojluni/src/main/native/SocketInputStream.c b/ojluni/src/main/native/SocketInputStream.c
index 92e6822..5f3c24e 100755
--- a/ojluni/src/main/native/SocketInputStream.c
+++ b/ojluni/src/main/native/SocketInputStream.c
@@ -33,7 +33,6 @@
 #include "jni_util.h"
 #include "net_util.h"
 
-#include "java_net_SocketInputStream.h"
 #include "JNIHelp.h"
 
 #define NATIVE_METHOD(className, functionName, signature) \
diff --git a/ojluni/src/main/native/SocketOutputStream.c b/ojluni/src/main/native/SocketOutputStream.c
index 14a915f..70dbb6e 100755
--- a/ojluni/src/main/native/SocketOutputStream.c
+++ b/ojluni/src/main/native/SocketOutputStream.c
@@ -33,7 +33,6 @@
 #include "jvm.h"
 #include "net_util.h"
 
-#include "java_net_SocketOutputStream.h"
 #include "JNIHelp.h"
 
 #define NATIVE_METHOD(className, functionName, signature) \
diff --git a/ojluni/src/main/native/StrictMath.c b/ojluni/src/main/native/StrictMath.c
index 0e057ab..c1efc50 100755
--- a/ojluni/src/main/native/StrictMath.c
+++ b/ojluni/src/main/native/StrictMath.c
@@ -26,7 +26,6 @@
 #include "jni.h"
 #include "../../external/fdlibm/fdlibm.h"
 
-#include "java_lang_StrictMath.h"
 #include "JNIHelp.h"
 
 #define NATIVE_METHOD(className, functionName, signature) \
diff --git a/ojluni/src/main/native/String.c b/ojluni/src/main/native/String.c
index 0df9360..80dc90b 100755
--- a/ojluni/src/main/native/String.c
+++ b/ojluni/src/main/native/String.c
@@ -24,7 +24,6 @@
  */
 
 #include "jvm.h"
-#include "java_lang_String.h"
 #include "JNIHelp.h"
 
 #define NATIVE_METHOD(className, functionName, signature) \
diff --git a/ojluni/src/main/native/System.c b/ojluni/src/main/native/System.c
index f26d940..c546b02 100755
--- a/ojluni/src/main/native/System.c
+++ b/ojluni/src/main/native/System.c
@@ -29,7 +29,6 @@
 #include "jni_util.h"
 #include "jvm.h"
 
-#include "java_lang_System.h"
 
 #include "openssl/opensslv.h"
 #include "zlib.h"
diff --git a/ojluni/src/main/native/Thread.c b/ojluni/src/main/native/Thread.c
index 93b70a2..c099288 100755
--- a/ojluni/src/main/native/Thread.c
+++ b/ojluni/src/main/native/Thread.c
@@ -31,7 +31,6 @@
 #include "jni.h"
 #include "jvm.h"
 
-#include "java_lang_Thread.h"
 
 #define THD "Ljava/lang/Thread;"
 #define OBJ "Ljava/lang/Object;"
diff --git a/ojluni/src/main/native/Throwable.c b/ojluni/src/main/native/Throwable.c
index 3ba4c0b..b7868e8 100755
--- a/ojluni/src/main/native/Throwable.c
+++ b/ojluni/src/main/native/Throwable.c
@@ -35,7 +35,6 @@
 #include "jni.h"
 #include "jvm.h"
 
-#include "java_lang_Throwable.h"
 #include "JNIHelp.h"
 
 #define NATIVE_METHOD(className, functionName, signature) \
diff --git a/ojluni/src/main/native/java_io_Console.h b/ojluni/src/main/native/java_io_Console.h
deleted file mode 100644
index 902825d..0000000
--- a/ojluni/src/main/native/java_io_Console.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class java_io_Console */
-
-#ifndef _Included_java_io_Console
-#define _Included_java_io_Console
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     java_io_Console
- * Method:    encoding
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_java_io_Console_encoding
-  (JNIEnv *, jclass);
-
-/*
- * Class:     java_io_Console
- * Method:    echo
- * Signature: (Z)Z
- */
-JNIEXPORT jboolean JNICALL Java_java_io_Console_echo
-  (JNIEnv *, jclass, jboolean);
-
-/*
- * Class:     java_io_Console
- * Method:    istty
- * Signature: ()Z
- */
-JNIEXPORT jboolean JNICALL Java_java_io_Console_istty
-  (JNIEnv *, jclass);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/ojluni/src/main/native/java_io_FileDescriptor.h b/ojluni/src/main/native/java_io_FileDescriptor.h
deleted file mode 100755
index 1a776e3..0000000
--- a/ojluni/src/main/native/java_io_FileDescriptor.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class java_io_FileDescriptor */
-
-#ifndef _Included_java_io_FileDescriptor
-#define _Included_java_io_FileDescriptor
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     java_io_FileDescriptor
- * Method:    sync
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_java_io_FileDescriptor_sync
-  (JNIEnv *, jobject);
-
-/*
- * Class:     java_io_FileDescriptor
- * Method:    initIDs
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_java_io_FileDescriptor_initIDs
-  (JNIEnv *, jclass);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/ojluni/src/main/native/java_io_FileInputStream.h b/ojluni/src/main/native/java_io_FileInputStream.h
deleted file mode 100755
index 4d05f92..0000000
--- a/ojluni/src/main/native/java_io_FileInputStream.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class java_io_FileInputStream */
-
-#ifndef _Included_java_io_FileInputStream
-#define _Included_java_io_FileInputStream
-#ifdef __cplusplus
-extern "C" {
-#endif
-#undef java_io_FileInputStream_MAX_SKIP_BUFFER_SIZE
-#define java_io_FileInputStream_MAX_SKIP_BUFFER_SIZE 2048L
-/*
- * Class:     java_io_FileInputStream
- * Method:    open
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_java_io_FileInputStream_open
-  (JNIEnv *, jobject, jstring);
-
-/*
- * Class:     java_io_FileInputStream
- * Method:    read0
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_java_io_FileInputStream_read0
-  (JNIEnv *, jobject);
-
-/*
- * Class:     java_io_FileInputStream
- * Method:    readBytes
- * Signature: ([BII)I
- */
-JNIEXPORT jint JNICALL Java_java_io_FileInputStream_readBytes
-  (JNIEnv *, jobject, jbyteArray, jint, jint);
-
-/*
- * Class:     java_io_FileInputStream
- * Method:    skip
- * Signature: (J)J
- */
-JNIEXPORT jlong JNICALL Java_java_io_FileInputStream_skip0
-  (JNIEnv *, jobject, jlong);
-
-/*
- * Class:     java_io_FileInputStream
- * Method:    available
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_java_io_FileInputStream_available
-  (JNIEnv *, jobject);
-
-/*
- * Class:     java_io_FileInputStream
- * Method:    initIDs
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_java_io_FileInputStream_initIDs
-  (JNIEnv *, jclass);
-
-/*
- * Class:     java_io_FileInputStream
- * Method:    close0
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_java_io_FileInputStream_close0
-  (JNIEnv *, jobject);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/ojluni/src/main/native/java_io_FileOutputStream.h b/ojluni/src/main/native/java_io_FileOutputStream.h
deleted file mode 100755
index 9741a28..0000000
--- a/ojluni/src/main/native/java_io_FileOutputStream.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class java_io_FileOutputStream */
-
-#ifndef _Included_java_io_FileOutputStream
-#define _Included_java_io_FileOutputStream
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     java_io_FileOutputStream
- * Method:    open
- * Signature: (Ljava/lang/String;Z)V
- */
-JNIEXPORT void JNICALL Java_java_io_FileOutputStream_open
-  (JNIEnv *, jobject, jstring, jboolean);
-
-/*
- * Class:     java_io_FileOutputStream
- * Method:    write
- * Signature: (IZ)V
- */
-JNIEXPORT void JNICALL Java_java_io_FileOutputStream_write
-  (JNIEnv *, jobject, jint, jboolean);
-
-/*
- * Class:     java_io_FileOutputStream
- * Method:    writeBytes
- * Signature: ([BIIZ)V
- */
-JNIEXPORT void JNICALL Java_java_io_FileOutputStream_writeBytes
-  (JNIEnv *, jobject, jbyteArray, jint, jint, jboolean);
-
-/*
- * Class:     java_io_FileOutputStream
- * Method:    close0
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_java_io_FileOutputStream_close0
-  (JNIEnv *, jobject);
-
-/*
- * Class:     java_io_FileOutputStream
- * Method:    initIDs
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_java_io_FileOutputStream_initIDs
-  (JNIEnv *, jclass);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/ojluni/src/main/native/java_io_ObjectInputStream.h b/ojluni/src/main/native/java_io_ObjectInputStream.h
deleted file mode 100644
index d02048c..0000000
--- a/ojluni/src/main/native/java_io_ObjectInputStream.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class java_io_ObjectInputStream */
-
-#ifndef _Included_java_io_ObjectInputStream
-#define _Included_java_io_ObjectInputStream
-#ifdef __cplusplus
-extern "C" {
-#endif
-#undef java_io_ObjectInputStream_MAX_SKIP_BUFFER_SIZE
-#define java_io_ObjectInputStream_MAX_SKIP_BUFFER_SIZE 2048L
-#undef java_io_ObjectInputStream_NULL_HANDLE
-#define java_io_ObjectInputStream_NULL_HANDLE -1L
-/*
- * Class:     java_io_ObjectInputStream
- * Method:    bytesToFloats
- * Signature: ([BI[FII)V
- */
-JNIEXPORT void JNICALL Java_java_io_ObjectInputStream_bytesToFloats
-  (JNIEnv *, jclass, jbyteArray, jint, jfloatArray, jint, jint);
-
-/*
- * Class:     java_io_ObjectInputStream
- * Method:    bytesToDoubles
- * Signature: ([BI[DII)V
- */
-JNIEXPORT void JNICALL Java_java_io_ObjectInputStream_bytesToDoubles
-  (JNIEnv *, jclass, jbyteArray, jint, jdoubleArray, jint, jint);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/ojluni/src/main/native/java_io_ObjectOutputStream.h b/ojluni/src/main/native/java_io_ObjectOutputStream.h
deleted file mode 100644
index 72bc727..0000000
--- a/ojluni/src/main/native/java_io_ObjectOutputStream.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class java_io_ObjectOutputStream */
-
-#ifndef _Included_java_io_ObjectOutputStream
-#define _Included_java_io_ObjectOutputStream
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     java_io_ObjectOutputStream
- * Method:    floatsToBytes
- * Signature: ([FI[BII)V
- */
-JNIEXPORT void JNICALL Java_java_io_ObjectOutputStream_floatsToBytes
-  (JNIEnv *, jclass, jfloatArray, jint, jbyteArray, jint, jint);
-
-/*
- * Class:     java_io_ObjectOutputStream
- * Method:    doublesToBytes
- * Signature: ([DI[BII)V
- */
-JNIEXPORT void JNICALL Java_java_io_ObjectOutputStream_doublesToBytes
-  (JNIEnv *, jclass, jdoubleArray, jint, jbyteArray, jint, jint);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/ojluni/src/main/native/java_io_ObjectStreamClass.h b/ojluni/src/main/native/java_io_ObjectStreamClass.h
deleted file mode 100755
index 4e757c3..0000000
--- a/ojluni/src/main/native/java_io_ObjectStreamClass.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class java_io_ObjectStreamClass */
-
-#ifndef _Included_java_io_ObjectStreamClass
-#define _Included_java_io_ObjectStreamClass
-#ifdef __cplusplus
-extern "C" {
-#endif
-#undef java_io_ObjectStreamClass_serialVersionUID
-#define java_io_ObjectStreamClass_serialVersionUID -6120832682080437368LL
-/*
- * Class:     java_io_ObjectStreamClass
- * Method:    initNative
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_java_io_ObjectStreamClass_initNative
-  (JNIEnv *, jclass);
-
-/*
- * Class:     java_io_ObjectStreamClass
- * Method:    hasStaticInitializer
- * Signature: (Ljava/lang/Class;)Z
- */
-JNIEXPORT jboolean JNICALL Java_java_io_ObjectStreamClass_hasStaticInitializer
-  (JNIEnv *, jclass, jclass);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/ojluni/src/main/native/java_lang_Double.h b/ojluni/src/main/native/java_lang_Double.h
deleted file mode 100755
index 37ae67f..0000000
--- a/ojluni/src/main/native/java_lang_Double.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class java_lang_Double */
-
-#ifndef _Included_java_lang_Double
-#define _Included_java_lang_Double
-#ifdef __cplusplus
-extern "C" {
-#endif
-#undef java_lang_Double_serialVersionUID
-#define java_lang_Double_serialVersionUID -8742448824652078965LL
-#undef java_lang_Double_POSITIVE_INFINITY
-#define java_lang_Double_POSITIVE_INFINITY InfD
-#undef java_lang_Double_NEGATIVE_INFINITY
-#define java_lang_Double_NEGATIVE_INFINITY -InfD
-#undef java_lang_Double_NaN
-#define java_lang_Double_NaN NaN
-#undef java_lang_Double_MAX_VALUE
-#define java_lang_Double_MAX_VALUE 1.7976931348623157E308
-#undef java_lang_Double_MIN_NORMAL
-#define java_lang_Double_MIN_NORMAL 2.2250738585072014E-308
-#undef java_lang_Double_MIN_VALUE
-#define java_lang_Double_MIN_VALUE 4.9E-324
-#undef java_lang_Double_MAX_EXPONENT
-#define java_lang_Double_MAX_EXPONENT 1023L
-#undef java_lang_Double_MIN_EXPONENT
-#define java_lang_Double_MIN_EXPONENT -1022L
-#undef java_lang_Double_SIZE
-#define java_lang_Double_SIZE 64L
-#undef java_lang_Double_serialVersionUID
-#define java_lang_Double_serialVersionUID -9172774392245257468LL
-/*
- * Class:     java_lang_Double
- * Method:    doubleToRawLongBits
- * Signature: (D)J
- */
-JNIEXPORT jlong JNICALL Java_java_lang_Double_doubleToRawLongBits
-  (JNIEnv *, jclass, jdouble);
-
-/*
- * Class:     java_lang_Double
- * Method:    longBitsToDouble
- * Signature: (J)D
- */
-JNIEXPORT jdouble JNICALL Java_java_lang_Double_longBitsToDouble
-  (JNIEnv *, jclass, jlong);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/ojluni/src/main/native/java_lang_Float.h b/ojluni/src/main/native/java_lang_Float.h
deleted file mode 100755
index 5e77a7d..0000000
--- a/ojluni/src/main/native/java_lang_Float.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class java_lang_Float */
-
-#ifndef _Included_java_lang_Float
-#define _Included_java_lang_Float
-#ifdef __cplusplus
-extern "C" {
-#endif
-#undef java_lang_Float_serialVersionUID
-#define java_lang_Float_serialVersionUID -8742448824652078965LL
-#undef java_lang_Float_POSITIVE_INFINITY
-#define java_lang_Float_POSITIVE_INFINITY Inff
-#undef java_lang_Float_NEGATIVE_INFINITY
-#define java_lang_Float_NEGATIVE_INFINITY -Inff
-#undef java_lang_Float_NaN
-#define java_lang_Float_NaN NaNf
-#undef java_lang_Float_MAX_VALUE
-#define java_lang_Float_MAX_VALUE 3.4028235E38f
-#undef java_lang_Float_MIN_NORMAL
-#define java_lang_Float_MIN_NORMAL 1.17549435E-38f
-#undef java_lang_Float_MIN_VALUE
-#define java_lang_Float_MIN_VALUE 1.4E-45f
-#undef java_lang_Float_MAX_EXPONENT
-#define java_lang_Float_MAX_EXPONENT 127L
-#undef java_lang_Float_MIN_EXPONENT
-#define java_lang_Float_MIN_EXPONENT -126L
-#undef java_lang_Float_SIZE
-#define java_lang_Float_SIZE 32L
-#undef java_lang_Float_serialVersionUID
-#define java_lang_Float_serialVersionUID -2671257302660747028LL
-/*
- * Class:     java_lang_Float
- * Method:    floatToRawIntBits
- * Signature: (F)I
- */
-JNIEXPORT jint JNICALL Java_java_lang_Float_floatToRawIntBits
-  (JNIEnv *, jclass, jfloat);
-
-/*
- * Class:     java_lang_Float
- * Method:    intBitsToFloat
- * Signature: (I)F
- */
-JNIEXPORT jfloat JNICALL Java_java_lang_Float_intBitsToFloat
-  (JNIEnv *, jclass, jint);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/ojluni/src/main/native/java_lang_Runtime.h b/ojluni/src/main/native/java_lang_Runtime.h
deleted file mode 100755
index 2ba3dac..0000000
--- a/ojluni/src/main/native/java_lang_Runtime.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class java_lang_Runtime */
-
-#ifndef _Included_java_lang_Runtime
-#define _Included_java_lang_Runtime
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     java_lang_Runtime
- * Method:    availableProcessors
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_java_lang_Runtime_availableProcessors
-  (JNIEnv *, jobject);
-
-/*
- * Class:     java_lang_Runtime
- * Method:    freeMemory
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_java_lang_Runtime_freeMemory
-  (JNIEnv *, jobject);
-
-/*
- * Class:     java_lang_Runtime
- * Method:    totalMemory
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_java_lang_Runtime_totalMemory
-  (JNIEnv *, jobject);
-
-/*
- * Class:     java_lang_Runtime
- * Method:    maxMemory
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_java_lang_Runtime_maxMemory
-  (JNIEnv *, jobject);
-
-/*
- * Class:     java_lang_Runtime
- * Method:    gc
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_java_lang_Runtime_gc
-  (JNIEnv *, jobject);
-
-/*
- * Class:     java_lang_Runtime
- * Method:    runFinalization0
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_java_lang_Runtime_runFinalization0
-  (JNIEnv *, jclass);
-
-/*
- * Class:     java_lang_Runtime
- * Method:    traceInstructions
- * Signature: (Z)V
- */
-JNIEXPORT void JNICALL Java_java_lang_Runtime_traceInstructions
-  (JNIEnv *, jobject, jboolean);
-
-/*
- * Class:     java_lang_Runtime
- * Method:    traceMethodCalls
- * Signature: (Z)V
- */
-JNIEXPORT void JNICALL Java_java_lang_Runtime_traceMethodCalls
-  (JNIEnv *, jobject, jboolean);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/ojluni/src/main/native/java_lang_Shutdown.h b/ojluni/src/main/native/java_lang_Shutdown.h
deleted file mode 100755
index 33a3592..0000000
--- a/ojluni/src/main/native/java_lang_Shutdown.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class java_lang_Shutdown */
-
-#ifndef _Included_java_lang_Shutdown
-#define _Included_java_lang_Shutdown
-#ifdef __cplusplus
-extern "C" {
-#endif
-#undef java_lang_Shutdown_RUNNING
-#define java_lang_Shutdown_RUNNING 0L
-#undef java_lang_Shutdown_HOOKS
-#define java_lang_Shutdown_HOOKS 1L
-#undef java_lang_Shutdown_FINALIZERS
-#define java_lang_Shutdown_FINALIZERS 2L
-#undef java_lang_Shutdown_MAX_SYSTEM_HOOKS
-#define java_lang_Shutdown_MAX_SYSTEM_HOOKS 10L
-/*
- * Class:     java_lang_Shutdown
- * Method:    halt0
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_java_lang_Shutdown_halt0
-  (JNIEnv *, jclass, jint);
-
-/*
- * Class:     java_lang_Shutdown
- * Method:    runAllFinalizers
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_java_lang_Shutdown_runAllFinalizers
-  (JNIEnv *, jclass);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/ojluni/src/main/native/java_lang_StrictMath.h b/ojluni/src/main/native/java_lang_StrictMath.h
deleted file mode 100755
index 0756f83..0000000
--- a/ojluni/src/main/native/java_lang_StrictMath.h
+++ /dev/null
@@ -1,177 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class java_lang_StrictMath */
-
-#ifndef _Included_java_lang_StrictMath
-#define _Included_java_lang_StrictMath
-#ifdef __cplusplus
-extern "C" {
-#endif
-#undef java_lang_StrictMath_E
-#define java_lang_StrictMath_E 2.718281828459045
-#undef java_lang_StrictMath_PI
-#define java_lang_StrictMath_PI 3.141592653589793
-/*
- * Class:     java_lang_StrictMath
- * Method:    sin
- * Signature: (D)D
- */
-JNIEXPORT jdouble JNICALL Java_java_lang_StrictMath_sin
-  (JNIEnv *, jclass, jdouble);
-
-/*
- * Class:     java_lang_StrictMath
- * Method:    cos
- * Signature: (D)D
- */
-JNIEXPORT jdouble JNICALL Java_java_lang_StrictMath_cos
-  (JNIEnv *, jclass, jdouble);
-
-/*
- * Class:     java_lang_StrictMath
- * Method:    tan
- * Signature: (D)D
- */
-JNIEXPORT jdouble JNICALL Java_java_lang_StrictMath_tan
-  (JNIEnv *, jclass, jdouble);
-
-/*
- * Class:     java_lang_StrictMath
- * Method:    asin
- * Signature: (D)D
- */
-JNIEXPORT jdouble JNICALL Java_java_lang_StrictMath_asin
-  (JNIEnv *, jclass, jdouble);
-
-/*
- * Class:     java_lang_StrictMath
- * Method:    acos
- * Signature: (D)D
- */
-JNIEXPORT jdouble JNICALL Java_java_lang_StrictMath_acos
-  (JNIEnv *, jclass, jdouble);
-
-/*
- * Class:     java_lang_StrictMath
- * Method:    atan
- * Signature: (D)D
- */
-JNIEXPORT jdouble JNICALL Java_java_lang_StrictMath_atan
-  (JNIEnv *, jclass, jdouble);
-
-/*
- * Class:     java_lang_StrictMath
- * Method:    exp
- * Signature: (D)D
- */
-JNIEXPORT jdouble JNICALL Java_java_lang_StrictMath_exp
-  (JNIEnv *, jclass, jdouble);
-
-/*
- * Class:     java_lang_StrictMath
- * Method:    log
- * Signature: (D)D
- */
-JNIEXPORT jdouble JNICALL Java_java_lang_StrictMath_log
-  (JNIEnv *, jclass, jdouble);
-
-/*
- * Class:     java_lang_StrictMath
- * Method:    log10
- * Signature: (D)D
- */
-JNIEXPORT jdouble JNICALL Java_java_lang_StrictMath_log10
-  (JNIEnv *, jclass, jdouble);
-
-/*
- * Class:     java_lang_StrictMath
- * Method:    sqrt
- * Signature: (D)D
- */
-JNIEXPORT jdouble JNICALL Java_java_lang_StrictMath_sqrt
-  (JNIEnv *, jclass, jdouble);
-
-/*
- * Class:     java_lang_StrictMath
- * Method:    cbrt
- * Signature: (D)D
- */
-JNIEXPORT jdouble JNICALL Java_java_lang_StrictMath_cbrt
-  (JNIEnv *, jclass, jdouble);
-
-/*
- * Class:     java_lang_StrictMath
- * Method:    IEEEremainder
- * Signature: (DD)D
- */
-JNIEXPORT jdouble JNICALL Java_java_lang_StrictMath_IEEEremainder
-  (JNIEnv *, jclass, jdouble, jdouble);
-
-/*
- * Class:     java_lang_StrictMath
- * Method:    atan2
- * Signature: (DD)D
- */
-JNIEXPORT jdouble JNICALL Java_java_lang_StrictMath_atan2
-  (JNIEnv *, jclass, jdouble, jdouble);
-
-/*
- * Class:     java_lang_StrictMath
- * Method:    pow
- * Signature: (DD)D
- */
-JNIEXPORT jdouble JNICALL Java_java_lang_StrictMath_pow
-  (JNIEnv *, jclass, jdouble, jdouble);
-
-/*
- * Class:     java_lang_StrictMath
- * Method:    sinh
- * Signature: (D)D
- */
-JNIEXPORT jdouble JNICALL Java_java_lang_StrictMath_sinh
-  (JNIEnv *, jclass, jdouble);
-
-/*
- * Class:     java_lang_StrictMath
- * Method:    cosh
- * Signature: (D)D
- */
-JNIEXPORT jdouble JNICALL Java_java_lang_StrictMath_cosh
-  (JNIEnv *, jclass, jdouble);
-
-/*
- * Class:     java_lang_StrictMath
- * Method:    tanh
- * Signature: (D)D
- */
-JNIEXPORT jdouble JNICALL Java_java_lang_StrictMath_tanh
-  (JNIEnv *, jclass, jdouble);
-
-/*
- * Class:     java_lang_StrictMath
- * Method:    hypot
- * Signature: (DD)D
- */
-JNIEXPORT jdouble JNICALL Java_java_lang_StrictMath_hypot
-  (JNIEnv *, jclass, jdouble, jdouble);
-
-/*
- * Class:     java_lang_StrictMath
- * Method:    expm1
- * Signature: (D)D
- */
-JNIEXPORT jdouble JNICALL Java_java_lang_StrictMath_expm1
-  (JNIEnv *, jclass, jdouble);
-
-/*
- * Class:     java_lang_StrictMath
- * Method:    log1p
- * Signature: (D)D
- */
-JNIEXPORT jdouble JNICALL Java_java_lang_StrictMath_log1p
-  (JNIEnv *, jclass, jdouble);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/ojluni/src/main/native/java_lang_String.h b/ojluni/src/main/native/java_lang_String.h
deleted file mode 100755
index d398a14..0000000
--- a/ojluni/src/main/native/java_lang_String.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class java_lang_String */
-
-#ifndef _Included_java_lang_String
-#define _Included_java_lang_String
-#ifdef __cplusplus
-extern "C" {
-#endif
-#undef java_lang_String_serialVersionUID
-#define java_lang_String_serialVersionUID -6849794470754667710LL
-/*
- * Class:     java_lang_String
- * Method:    intern
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_java_lang_String_intern
-  (JNIEnv *, jobject);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/ojluni/src/main/native/java_lang_System.h b/ojluni/src/main/native/java_lang_System.h
deleted file mode 100755
index 9e2e7c3..0000000
--- a/ojluni/src/main/native/java_lang_System.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class java_lang_System */
-
-#ifndef _Included_java_lang_System
-#define _Included_java_lang_System
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     java_lang_System
- * Method:    registerNatives
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_java_lang_System_registerNatives
-  (JNIEnv *, jclass);
-
-/*
- * Class:     java_lang_System
- * Method:    setIn0
- * Signature: (Ljava/io/InputStream;)V
- */
-JNIEXPORT void JNICALL Java_java_lang_System_setIn0
-  (JNIEnv *, jclass, jobject);
-
-/*
- * Class:     java_lang_System
- * Method:    setOut0
- * Signature: (Ljava/io/PrintStream;)V
- */
-JNIEXPORT void JNICALL Java_java_lang_System_setOut0
-  (JNIEnv *, jclass, jobject);
-
-/*
- * Class:     java_lang_System
- * Method:    setErr0
- * Signature: (Ljava/io/PrintStream;)V
- */
-JNIEXPORT void JNICALL Java_java_lang_System_setErr0
-  (JNIEnv *, jclass, jobject);
-
-/*
- * Class:     java_lang_System
- * Method:    currentTimeMillis
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_java_lang_System_currentTimeMillis
-  (JNIEnv *, jclass);
-
-/*
- * Class:     java_lang_System
- * Method:    nanoTime
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_java_lang_System_nanoTime
-  (JNIEnv *, jclass);
-
-/*
- * Class:     java_lang_System
- * Method:    arraycopy
- * Signature: (Ljava/lang/Object;ILjava/lang/Object;II)V
- */
-JNIEXPORT void JNICALL Java_java_lang_System_arraycopy
-  (JNIEnv *, jclass, jobject, jint, jobject, jint, jint);
-
-/*
- * Class:     java_lang_System
- * Method:    identityHashCode
- * Signature: (Ljava/lang/Object;)I
- */
-JNIEXPORT jint JNICALL Java_java_lang_System_identityHashCode
-  (JNIEnv *, jclass, jobject);
-
-/*
- * Class:     java_lang_System
- * Method:    initProperties
- * Signature: (Ljava/util/Properties;)Ljava/util/Properties;
- */
-JNIEXPORT jobject JNICALL Java_java_lang_System_initProperties
-  (JNIEnv *, jclass, jobject);
-
-/*
- * Class:     java_lang_System
- * Method:    mapLibraryName
- * Signature: (Ljava/lang/String;)Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_java_lang_System_mapLibraryName
-  (JNIEnv *, jclass, jstring);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/ojluni/src/main/native/java_lang_Thread.h b/ojluni/src/main/native/java_lang_Thread.h
deleted file mode 100755
index e2778f6..0000000
--- a/ojluni/src/main/native/java_lang_Thread.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class java_lang_Thread */
-
-#ifndef _Included_java_lang_Thread
-#define _Included_java_lang_Thread
-#ifdef __cplusplus
-extern "C" {
-#endif
-#undef java_lang_Thread_MIN_PRIORITY
-#define java_lang_Thread_MIN_PRIORITY 1L
-#undef java_lang_Thread_NORM_PRIORITY
-#define java_lang_Thread_NORM_PRIORITY 5L
-#undef java_lang_Thread_MAX_PRIORITY
-#define java_lang_Thread_MAX_PRIORITY 10L
-/*
- * Class:     java_lang_Thread
- * Method:    registerNatives
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_java_lang_Thread_registerNatives
-  (JNIEnv *, jclass);
-
-/*
- * Class:     java_lang_Thread
- * Method:    currentThread
- * Signature: ()Ljava/lang/Thread;
- */
-JNIEXPORT jobject JNICALL Java_java_lang_Thread_currentThread
-  (JNIEnv *, jclass);
-
-/*
- * Class:     java_lang_Thread
- * Method:    yield
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_java_lang_Thread_yield
-  (JNIEnv *, jclass);
-
-/*
- * Class:     java_lang_Thread
- * Method:    sleep
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_java_lang_Thread_sleep
-  (JNIEnv *, jclass, jlong);
-
-/*
- * Class:     java_lang_Thread
- * Method:    start0
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_java_lang_Thread_start0
-  (JNIEnv *, jobject);
-
-/*
- * Class:     java_lang_Thread
- * Method:    isInterrupted
- * Signature: (Z)Z
- */
-JNIEXPORT jboolean JNICALL Java_java_lang_Thread_isInterrupted
-  (JNIEnv *, jobject, jboolean);
-
-/*
- * Class:     java_lang_Thread
- * Method:    isAlive
- * Signature: ()Z
- */
-JNIEXPORT jboolean JNICALL Java_java_lang_Thread_isAlive
-  (JNIEnv *, jobject);
-
-/*
- * Class:     java_lang_Thread
- * Method:    countStackFrames
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_java_lang_Thread_countStackFrames
-  (JNIEnv *, jobject);
-
-/*
- * Class:     java_lang_Thread
- * Method:    holdsLock
- * Signature: (Ljava/lang/Object;)Z
- */
-JNIEXPORT jboolean JNICALL Java_java_lang_Thread_holdsLock
-  (JNIEnv *, jclass, jobject);
-
-/*
- * Class:     java_lang_Thread
- * Method:    dumpThreads
- * Signature: ([Ljava/lang/Thread;)[[Ljava/lang/StackTraceElement;
- */
-JNIEXPORT jobjectArray JNICALL Java_java_lang_Thread_dumpThreads
-  (JNIEnv *, jclass, jobjectArray);
-
-/*
- * Class:     java_lang_Thread
- * Method:    getThreads
- * Signature: ()[Ljava/lang/Thread;
- */
-JNIEXPORT jobjectArray JNICALL Java_java_lang_Thread_getThreads
-  (JNIEnv *, jclass);
-
-/*
- * Class:     java_lang_Thread
- * Method:    setPriority0
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_java_lang_Thread_setPriority0
-  (JNIEnv *, jobject, jint);
-
-/*
- * Class:     java_lang_Thread
- * Method:    stop0
- * Signature: (Ljava/lang/Object;)V
- */
-JNIEXPORT void JNICALL Java_java_lang_Thread_stop0
-  (JNIEnv *, jobject, jobject);
-
-/*
- * Class:     java_lang_Thread
- * Method:    suspend0
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_java_lang_Thread_suspend0
-  (JNIEnv *, jobject);
-
-/*
- * Class:     java_lang_Thread
- * Method:    resume0
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_java_lang_Thread_resume0
-  (JNIEnv *, jobject);
-
-/*
- * Class:     java_lang_Thread
- * Method:    interrupt0
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_java_lang_Thread_interrupt0
-  (JNIEnv *, jobject);
-
-/*
- * Class:     java_lang_Thread
- * Method:    setNativeName
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_java_lang_Thread_setNativeName
-  (JNIEnv *, jobject, jstring);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/ojluni/src/main/native/java_lang_Throwable.h b/ojluni/src/main/native/java_lang_Throwable.h
deleted file mode 100755
index fd93e9f..0000000
--- a/ojluni/src/main/native/java_lang_Throwable.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class java_lang_Throwable */
-
-#ifndef _Included_java_lang_Throwable
-#define _Included_java_lang_Throwable
-#ifdef __cplusplus
-extern "C" {
-#endif
-#undef java_lang_Throwable_serialVersionUID
-#define java_lang_Throwable_serialVersionUID -3042686055658047285LL
-/*
- * Class:     java_lang_Throwable
- * Method:    fillInStackTrace
- * Signature: (I)Ljava/lang/Throwable;
- */
-JNIEXPORT jthrowable JNICALL Java_java_lang_Throwable_fillInStackTrace
-  (JNIEnv *, jobject, jint);
-
-/*
- * Class:     java_lang_Throwable
- * Method:    getStackTraceDepth
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_java_lang_Throwable_getStackTraceDepth
-  (JNIEnv *, jobject);
-
-/*
- * Class:     java_lang_Throwable
- * Method:    getStackTraceElement
- * Signature: (I)Ljava/lang/StackTraceElement;
- */
-JNIEXPORT jobject JNICALL Java_java_lang_Throwable_getStackTraceElement
-  (JNIEnv *, jobject, jint);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/ojluni/src/main/native/java_net_DatagramPacket.h b/ojluni/src/main/native/java_net_DatagramPacket.h
deleted file mode 100755
index be6ad98..0000000
--- a/ojluni/src/main/native/java_net_DatagramPacket.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class java_net_DatagramPacket */
-
-#ifndef _Included_java_net_DatagramPacket
-#define _Included_java_net_DatagramPacket
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     java_net_DatagramPacket
- * Method:    init
- * Signature: ()V
- */
-JNIEXPORT void JNICALL DatagramPacket_init
-  (JNIEnv *, jclass);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/ojluni/src/main/native/java_net_Inet4Address.h b/ojluni/src/main/native/java_net_Inet4Address.h
deleted file mode 100755
index 7cae915..0000000
--- a/ojluni/src/main/native/java_net_Inet4Address.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class java_net_Inet4Address */
-
-#ifndef _Included_java_net_Inet4Address
-#define _Included_java_net_Inet4Address
-#ifdef __cplusplus
-extern "C" {
-#endif
-#undef java_net_Inet4Address_IPv4
-#define java_net_Inet4Address_IPv4 1L
-#undef java_net_Inet4Address_IPv6
-#define java_net_Inet4Address_IPv6 2L
-#undef java_net_Inet4Address_serialVersionUID
-#define java_net_Inet4Address_serialVersionUID 3286316764910316507LL
-#undef java_net_Inet4Address_maxCacheTime
-#define java_net_Inet4Address_maxCacheTime 5000LL
-#undef java_net_Inet4Address_INADDRSZ
-#define java_net_Inet4Address_INADDRSZ 4L
-#undef java_net_Inet4Address_serialVersionUID
-#define java_net_Inet4Address_serialVersionUID 3286316764910316507LL
-#undef java_net_Inet4Address_loopback
-#define java_net_Inet4Address_loopback 2130706433L
-/*
- * Class:     java_net_Inet4Address
- * Method:    init
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Inet4Address_init
-  (JNIEnv *, jclass);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/ojluni/src/main/native/java_net_Inet4AddressImpl.h b/ojluni/src/main/native/java_net_Inet4AddressImpl.h
deleted file mode 100755
index 7f93d30..0000000
--- a/ojluni/src/main/native/java_net_Inet4AddressImpl.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class java_net_Inet4AddressImpl */
-
-#ifndef _Included_java_net_Inet4AddressImpl
-#define _Included_java_net_Inet4AddressImpl
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     java_net_Inet4AddressImpl
- * Method:    getLocalHostName
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Inet4AddressImpl_getLocalHostName
-  (JNIEnv *, jobject);
-
-/*
- * Class:     java_net_Inet4AddressImpl
- * Method:    lookupAllHostAddr
- * Signature: (Ljava/lang/String;)[Ljava/net/InetAddress;
- */
-JNIEXPORT jobjectArray JNICALL Inet4AddressImpl_lookupAllHostAddr
-  (JNIEnv *, jobject, jstring);
-
-/*
- * Class:     java_net_Inet4AddressImpl
- * Method:    getHostByAddr
- * Signature: ([B)Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Inet4AddressImpl_getHostByAddr
-  (JNIEnv *, jobject, jbyteArray);
-
-/*
- * Class:     java_net_Inet4AddressImpl
- * Method:    isReachable0
- * Signature: ([BI[BI)Z
- */
-JNIEXPORT jboolean JNICALL Inet4AddressImpl_isReachable0
-  (JNIEnv *, jobject, jbyteArray, jint, jbyteArray, jint);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/ojluni/src/main/native/java_net_Inet6Address.h b/ojluni/src/main/native/java_net_Inet6Address.h
deleted file mode 100755
index fa318c2..0000000
--- a/ojluni/src/main/native/java_net_Inet6Address.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class java_net_Inet6Address */
-
-#ifndef _Included_java_net_Inet6Address
-#define _Included_java_net_Inet6Address
-#ifdef __cplusplus
-extern "C" {
-#endif
-#undef java_net_Inet6Address_IPv4
-#define java_net_Inet6Address_IPv4 1L
-#undef java_net_Inet6Address_IPv6
-#define java_net_Inet6Address_IPv6 2L
-#undef java_net_Inet6Address_serialVersionUID
-#define java_net_Inet6Address_serialVersionUID 3286316764910316507LL
-#undef java_net_Inet6Address_maxCacheTime
-#define java_net_Inet6Address_maxCacheTime 5000LL
-#undef java_net_Inet6Address_INADDRSZ
-#define java_net_Inet6Address_INADDRSZ 16L
-#undef java_net_Inet6Address_serialVersionUID
-#define java_net_Inet6Address_serialVersionUID 6880410070516793377LL
-#undef java_net_Inet6Address_INT16SZ
-#define java_net_Inet6Address_INT16SZ 2L
-/*
- * Class:     java_net_Inet6Address
- * Method:    init
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Inet6Address_init
-  (JNIEnv *, jclass);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/ojluni/src/main/native/java_net_Inet6AddressImpl.h b/ojluni/src/main/native/java_net_Inet6AddressImpl.h
deleted file mode 100755
index da21ed4..0000000
--- a/ojluni/src/main/native/java_net_Inet6AddressImpl.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class java_net_Inet6AddressImpl */
-
-#ifndef _Included_java_net_Inet6AddressImpl
-#define _Included_java_net_Inet6AddressImpl
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     java_net_Inet6AddressImpl
- * Method:    getLocalHostName
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Inet6AddressImpl_getLocalHostName
-  (JNIEnv *, jobject);
-
-/*
- * Class:     java_net_Inet6AddressImpl
- * Method:    lookupAllHostAddr
- * Signature: (Ljava/lang/String;)[Ljava/net/InetAddress;
- */
-JNIEXPORT jobjectArray JNICALL Inet6AddressImpl_lookupAllHostAddr
-  (JNIEnv *, jobject, jstring);
-
-/*
- * Class:     java_net_Inet6AddressImpl
- * Method:    getHostByAddr
- * Signature: ([B)Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Inet6AddressImpl_getHostByAddr
-  (JNIEnv *, jobject, jbyteArray);
-
-/*
- * Class:     java_net_Inet6AddressImpl
- * Method:    isReachable0
- * Signature: ([BII[BII)Z
- */
-JNIEXPORT jboolean JNICALL Inet6AddressImpl_isReachable0
-  (JNIEnv *, jobject, jbyteArray, jint, jint, jbyteArray, jint, jint);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/ojluni/src/main/native/java_net_InetAddress.h b/ojluni/src/main/native/java_net_InetAddress.h
deleted file mode 100755
index 47f8a17..0000000
--- a/ojluni/src/main/native/java_net_InetAddress.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class java_net_InetAddress */
-
-#ifndef _Included_java_net_InetAddress
-#define _Included_java_net_InetAddress
-#ifdef __cplusplus
-extern "C" {
-#endif
-#undef java_net_InetAddress_IPv4
-#define java_net_InetAddress_IPv4 1L
-#undef java_net_InetAddress_IPv6
-#define java_net_InetAddress_IPv6 2L
-#undef java_net_InetAddress_serialVersionUID
-#define java_net_InetAddress_serialVersionUID 3286316764910316507LL
-#undef java_net_InetAddress_maxCacheTime
-#define java_net_InetAddress_maxCacheTime 5000LL
-/*
- * Class:     java_net_InetAddress
- * Method:    init
- * Signature: ()V
- */
-JNIEXPORT void JNICALL InetAddress_init
-  (JNIEnv *, jclass);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/ojluni/src/main/native/java_net_InetAddressImplFactory.h b/ojluni/src/main/native/java_net_InetAddressImplFactory.h
deleted file mode 100755
index 4c96086..0000000
--- a/ojluni/src/main/native/java_net_InetAddressImplFactory.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class java_net_InetAddressImplFactory */
-
-#ifndef _Included_java_net_InetAddressImplFactory
-#define _Included_java_net_InetAddressImplFactory
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     java_net_InetAddressImplFactory
- * Method:    isIPv6Supported
- * Signature: ()Z
- */
-JNIEXPORT jboolean JNICALL Java_java_net_InetAddressImplFactory_isIPv6Supported
-  (JNIEnv *, jclass);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/ojluni/src/main/native/java_net_SocketInputStream.h b/ojluni/src/main/native/java_net_SocketInputStream.h
deleted file mode 100755
index 47ce360..0000000
--- a/ojluni/src/main/native/java_net_SocketInputStream.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class java_net_SocketInputStream */
-
-#ifndef _Included_java_net_SocketInputStream
-#define _Included_java_net_SocketInputStream
-#ifdef __cplusplus
-extern "C" {
-#endif
-#undef java_net_SocketInputStream_MAX_SKIP_BUFFER_SIZE
-#define java_net_SocketInputStream_MAX_SKIP_BUFFER_SIZE 2048L
-/*
- * Class:     java_net_SocketInputStream
- * Method:    socketRead0
- * Signature: (Ljava/io/FileDescriptor;[BIII)I
- */
-JNIEXPORT jint JNICALL Java_java_net_SocketInputStream_socketRead0
-  (JNIEnv *, jobject, jobject, jbyteArray, jint, jint, jint);
-
-/*
- * Class:     java_net_SocketInputStream
- * Method:    init
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_java_net_SocketInputStream_init
-  (JNIEnv *, jclass);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/ojluni/src/main/native/java_net_SocketOutputStream.h b/ojluni/src/main/native/java_net_SocketOutputStream.h
deleted file mode 100755
index 2fa8d94..0000000
--- a/ojluni/src/main/native/java_net_SocketOutputStream.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class java_net_SocketOutputStream */
-
-#ifndef _Included_java_net_SocketOutputStream
-#define _Included_java_net_SocketOutputStream
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     java_net_SocketOutputStream
- * Method:    socketWrite0
- * Signature: (Ljava/io/FileDescriptor;[BII)V
- */
-JNIEXPORT void JNICALL Java_java_net_SocketOutputStream_socketWrite0
-  (JNIEnv *, jobject, jobject, jbyteArray, jint, jint);
-
-/*
- * Class:     java_net_SocketOutputStream
- * Method:    init
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_java_net_SocketOutputStream_init
-  (JNIEnv *, jclass);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/ojluni/src/main/native/java_nio_MappedByteBuffer.h b/ojluni/src/main/native/java_nio_MappedByteBuffer.h
deleted file mode 100644
index f1b0070..0000000
--- a/ojluni/src/main/native/java_nio_MappedByteBuffer.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class java_nio_MappedByteBuffer */
-
-#ifndef _Included_java_nio_MappedByteBuffer
-#define _Included_java_nio_MappedByteBuffer
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     java_nio_MappedByteBuffer
- * Method:    isLoaded0
- * Signature: (JJI)Z
- */
-JNIEXPORT jboolean JNICALL Java_java_nio_MappedByteBuffer_isLoaded0
-  (JNIEnv *, jobject, jlong, jlong, jint);
-
-/*
- * Class:     java_nio_MappedByteBuffer
- * Method:    load0
- * Signature: (JJ)V
- */
-JNIEXPORT void JNICALL Java_java_nio_MappedByteBuffer_load0
-  (JNIEnv *, jobject, jlong, jlong);
-
-/*
- * Class:     java_nio_MappedByteBuffer
- * Method:    force0
- * Signature: (Ljava/io/FileDescriptor;JJ)V
- */
-JNIEXPORT void JNICALL Java_java_nio_MappedByteBuffer_force0
-  (JNIEnv *, jobject, jobject, jlong, jlong);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/ojluni/src/main/native/java_props.h b/ojluni/src/main/native/java_props.h
deleted file mode 100755
index de1947168..0000000
--- a/ojluni/src/main/native/java_props.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-#ifndef _JAVA_PROPS_H
-#define _JAVA_PROPS_H
-
-#include <jni_util.h>
-
-/* The preferred native type for storing text on the current OS */
-#ifdef WIN32
-#include <tchar.h>
-typedef WCHAR nchar;
-#else
-typedef char nchar;
-#endif
-
-typedef struct {
-    char *os_name;
-    char *os_version;
-    char *os_arch;
-
-    nchar *tmp_dir;
-    nchar *font_dir;
-    nchar *user_dir;
-
-    char *file_separator;
-    char *path_separator;
-    char *line_separator;
-
-    nchar *user_name;
-    nchar *user_home;
-
-    char *language;
-    char *format_language;
-    char *display_language;
-    char *script;
-    char *format_script;
-    char *display_script;
-    char *country;
-    char *format_country;
-    char *display_country;
-    char *variant;
-    char *format_variant;
-    char *display_variant;
-    char *encoding;
-    char *sun_jnu_encoding;
-    char *timezone;
-
-    char *printerJob;
-    char *graphics_env;
-    char *awt_toolkit;
-
-    char *unicode_encoding;     /* The default endianness of unicode
-                                    i.e. UnicodeBig or UnicodeLittle   */
-
-    const char *cpu_isalist;    /* list of supported instruction sets */
-
-    char *cpu_endian;           /* endianness of platform */
-
-    char *data_model;           /* 32 or 64 bit data model */
-
-    char *patch_level;          /* patches/service packs installed */
-
-    char *desktop;              /* Desktop name. */
-
-#ifdef MACOSX
-    // These are for proxy-related information.
-    // Note that if these platform-specific extensions get out of hand we should make a new
-    // structure for them and #include it here.
-    int httpProxyEnabled;
-    char *httpHost;
-    char *httpPort;
-
-    int httpsProxyEnabled;
-    char *httpsHost;
-    char *httpsPort;
-
-    int ftpProxyEnabled;
-    char *ftpHost;
-    char *ftpPort;
-
-    int socksProxyEnabled;
-    char *socksHost;
-    char *socksPort;
-
-    int gopherProxyEnabled;
-    char *gopherHost;
-    char *gopherPort;
-
-    char *exceptionList;
-#endif
-
-} java_props_t;
-
-java_props_t *GetJavaProperties(JNIEnv *env);
-jstring GetStringPlatform(JNIEnv *env, nchar* str);
-
-#endif /* _JAVA_PROPS_H */
diff --git a/ojluni/src/main/native/java_props_md.c b/ojluni/src/main/native/java_props_md.c
index 3a2d6e0..a9fe5ba 100755
--- a/ojluni/src/main/native/java_props_md.c
+++ b/ojluni/src/main/native/java_props_md.c
@@ -43,7 +43,6 @@
 #include <errno.h>
 
 #ifdef MACOSX
-#include "java_props_macosx.h"
 #endif
 
 #if defined(_ALLBSD_SOURCE)
@@ -54,7 +53,6 @@
 #endif
 
 #include "locale_str.h"
-#include "java_props.h"
 
 #if !defined(_ALLBSD_SOURCE)
 #ifdef __linux__
diff --git a/ojluni/src/main/native/java_util_zip_Adler32.h b/ojluni/src/main/native/java_util_zip_Adler32.h
deleted file mode 100644
index e0d8fe6..0000000
--- a/ojluni/src/main/native/java_util_zip_Adler32.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class java_util_zip_Adler32 */
-
-#ifndef _Included_java_util_zip_Adler32
-#define _Included_java_util_zip_Adler32
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     java_util_zip_Adler32
- * Method:    update
- * Signature: (II)I
- */
-JNIEXPORT jint JNICALL Java_java_util_zip_Adler32_update
-  (JNIEnv *, jclass, jint, jint);
-
-/*
- * Class:     java_util_zip_Adler32
- * Method:    updateBytes
- * Signature: (I[BII)I
- */
-JNIEXPORT jint JNICALL Java_java_util_zip_Adler32_updateBytes
-  (JNIEnv *, jclass, jint, jbyteArray, jint, jint);
-
-/*
- * Class:     java_util_zip_Adler32
- * Method:    updateByteBuffer
- * Signature: (IJII)I
- */
-JNIEXPORT jint JNICALL Java_java_util_zip_Adler32_updateByteBuffer
-  (JNIEnv *, jclass, jint, jlong, jint, jint);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/ojluni/src/main/native/java_util_zip_CRC32.c b/ojluni/src/main/native/java_util_zip_CRC32.c
index 83b7287..f576e75 100644
--- a/ojluni/src/main/native/java_util_zip_CRC32.c
+++ b/ojluni/src/main/native/java_util_zip_CRC32.c
@@ -32,7 +32,6 @@
 #include "jni_util.h"
 #include <zlib.h>
 
-#include "java_util_zip_CRC32.h"
 
 #define NATIVE_METHOD(className, functionName, signature) \
 { #functionName, signature, (void*)(className ## _ ## functionName) }
diff --git a/ojluni/src/main/native/java_util_zip_CRC32.h b/ojluni/src/main/native/java_util_zip_CRC32.h
deleted file mode 100755
index 73ea19f..0000000
--- a/ojluni/src/main/native/java_util_zip_CRC32.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class java_util_zip_CRC32 */
-
-#ifndef _Included_java_util_zip_CRC32
-#define _Included_java_util_zip_CRC32
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     java_util_zip_CRC32
- * Method:    update
- * Signature: (II)I
- */
-JNIEXPORT jint JNICALL Java_java_util_zip_CRC32_update
-  (JNIEnv *, jclass, jint, jint);
-
-/*
- * Class:     java_util_zip_CRC32
- * Method:    updateBytes
- * Signature: (I[BII)I
- */
-JNIEXPORT jint JNICALL Java_java_util_zip_CRC32_updateBytes
-  (JNIEnv *, jclass, jint, jbyteArray, jint, jint);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/ojluni/src/main/native/java_util_zip_Deflater.c b/ojluni/src/main/native/java_util_zip_Deflater.c
index 59cce4c..c075de6 100644
--- a/ojluni/src/main/native/java_util_zip_Deflater.c
+++ b/ojluni/src/main/native/java_util_zip_Deflater.c
@@ -35,7 +35,6 @@
 #include "jni_util.h"
 #include <zlib.h>
 
-#include "java_util_zip_Deflater.h"
 
 #define NATIVE_METHOD(className, functionName, signature) \
 { #functionName, signature, (void*)(className ## _ ## functionName) }
diff --git a/ojluni/src/main/native/java_util_zip_Deflater.h b/ojluni/src/main/native/java_util_zip_Deflater.h
deleted file mode 100755
index a07f810..0000000
--- a/ojluni/src/main/native/java_util_zip_Deflater.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class java_util_zip_Deflater */
-
-#ifndef _Included_java_util_zip_Deflater
-#define _Included_java_util_zip_Deflater
-#ifdef __cplusplus
-extern "C" {
-#endif
-#undef java_util_zip_Deflater_DEFLATED
-#define java_util_zip_Deflater_DEFLATED 8L
-#undef java_util_zip_Deflater_NO_COMPRESSION
-#define java_util_zip_Deflater_NO_COMPRESSION 0L
-#undef java_util_zip_Deflater_BEST_SPEED
-#define java_util_zip_Deflater_BEST_SPEED 1L
-#undef java_util_zip_Deflater_BEST_COMPRESSION
-#define java_util_zip_Deflater_BEST_COMPRESSION 9L
-#undef java_util_zip_Deflater_DEFAULT_COMPRESSION
-#define java_util_zip_Deflater_DEFAULT_COMPRESSION -1L
-#undef java_util_zip_Deflater_FILTERED
-#define java_util_zip_Deflater_FILTERED 1L
-#undef java_util_zip_Deflater_HUFFMAN_ONLY
-#define java_util_zip_Deflater_HUFFMAN_ONLY 2L
-#undef java_util_zip_Deflater_DEFAULT_STRATEGY
-#define java_util_zip_Deflater_DEFAULT_STRATEGY 0L
-#undef java_util_zip_Deflater_NO_FLUSH
-#define java_util_zip_Deflater_NO_FLUSH 0L
-#undef java_util_zip_Deflater_SYNC_FLUSH
-#define java_util_zip_Deflater_SYNC_FLUSH 2L
-#undef java_util_zip_Deflater_FULL_FLUSH
-#define java_util_zip_Deflater_FULL_FLUSH 3L
-/*
- * Class:     java_util_zip_Deflater
- * Method:    initIDs
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_java_util_zip_Deflater_initIDs
-  (JNIEnv *, jclass);
-
-/*
- * Class:     java_util_zip_Deflater
- * Method:    init
- * Signature: (IIZ)J
- */
-JNIEXPORT jlong JNICALL Java_java_util_zip_Deflater_init
-  (JNIEnv *, jclass, jint, jint, jboolean);
-
-/*
- * Class:     java_util_zip_Deflater
- * Method:    setDictionary
- * Signature: (J[BII)V
- */
-JNIEXPORT void JNICALL Java_java_util_zip_Deflater_setDictionary
-  (JNIEnv *, jclass, jlong, jbyteArray, jint, jint);
-
-/*
- * Class:     java_util_zip_Deflater
- * Method:    deflateBytes
- * Signature: (J[BIII)I
- */
-JNIEXPORT jint JNICALL Java_java_util_zip_Deflater_deflateBytes
-  (JNIEnv *, jobject, jlong, jbyteArray, jint, jint, jint);
-
-/*
- * Class:     java_util_zip_Deflater
- * Method:    getAdler
- * Signature: (J)I
- */
-JNIEXPORT jint JNICALL Java_java_util_zip_Deflater_getAdler
-  (JNIEnv *, jclass, jlong);
-
-/*
- * Class:     java_util_zip_Deflater
- * Method:    reset
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_java_util_zip_Deflater_reset
-  (JNIEnv *, jclass, jlong);
-
-/*
- * Class:     java_util_zip_Deflater
- * Method:    end
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_java_util_zip_Deflater_end
-  (JNIEnv *, jclass, jlong);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/ojluni/src/main/native/java_util_zip_Inflater.c b/ojluni/src/main/native/java_util_zip_Inflater.c
index 0cb6112..005ac21 100644
--- a/ojluni/src/main/native/java_util_zip_Inflater.c
+++ b/ojluni/src/main/native/java_util_zip_Inflater.c
@@ -37,7 +37,6 @@
 #include "jvm.h"
 #include "jni_util.h"
 #include <zlib.h>
-#include "java_util_zip_Inflater.h"
 
 #define NATIVE_METHOD(className, functionName, signature) \
 { #functionName, signature, (void*)(className ## _ ## functionName) }
diff --git a/ojluni/src/main/native/java_util_zip_Inflater.h b/ojluni/src/main/native/java_util_zip_Inflater.h
deleted file mode 100644
index dde7311..0000000
--- a/ojluni/src/main/native/java_util_zip_Inflater.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class java_util_zip_Inflater */
-
-#ifndef _Included_java_util_zip_Inflater
-#define _Included_java_util_zip_Inflater
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     java_util_zip_Inflater
- * Method:    initIDs
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Inflater_initIDs
-  (JNIEnv *, jclass);
-
-/*
- * Class:     java_util_zip_Inflater
- * Method:    init
- * Signature: (Z)J
- */
-JNIEXPORT jlong JNICALL Inflater_init
-  (JNIEnv *, jclass, jboolean);
-
-/*
- * Class:     java_util_zip_Inflater
- * Method:    setDictionary
- * Signature: (J[BII)V
- */
-JNIEXPORT void JNICALL Inflater_setDictionary
-  (JNIEnv *, jclass, jlong, jbyteArray, jint, jint);
-
-/*
- * Class:     java_util_zip_Inflater
- * Method:    inflateBytes
- * Signature: (J[BII)I
- */
-JNIEXPORT jint JNICALL Inflater_inflateBytes
-  (JNIEnv *, jobject, jlong, jbyteArray, jint, jint);
-
-/*
- * Class:     java_util_zip_Inflater
- * Method:    getAdler
- * Signature: (J)I
- */
-JNIEXPORT jint JNICALL Inflater_getAdler
-  (JNIEnv *, jclass, jlong);
-
-/*
- * Class:     java_util_zip_Inflater
- * Method:    reset
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Inflater_reset
-  (JNIEnv *, jclass, jlong);
-
-/*
- * Class:     java_util_zip_Inflater
- * Method:    end
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Inflater_end
-  (JNIEnv *, jclass, jlong);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/ojluni/src/main/native/sun_net_spi_DefaultProxySelector.h b/ojluni/src/main/native/sun_net_spi_DefaultProxySelector.h
deleted file mode 100755
index eb1d0b9..0000000
--- a/ojluni/src/main/native/sun_net_spi_DefaultProxySelector.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class sun_net_spi_DefaultProxySelector */
-
-#ifndef _Included_sun_net_spi_DefaultProxySelector
-#define _Included_sun_net_spi_DefaultProxySelector
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     sun_net_spi_DefaultProxySelector
- * Method:    init
- * Signature: ()Z
- */
-JNIEXPORT jboolean JNICALL Java_sun_net_spi_DefaultProxySelector_init
-  (JNIEnv *, jclass);
-
-/*
- * Class:     sun_net_spi_DefaultProxySelector
- * Method:    getSystemProxy
- * Signature: (Ljava/lang/String;Ljava/lang/String;)Ljava/net/Proxy;
- */
-JNIEXPORT jobject JNICALL Java_sun_net_spi_DefaultProxySelector_getSystemProxy
-  (JNIEnv *, jobject, jstring, jstring);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/ojluni/src/main/native/sun_nio_ch_DatagramChannelImpl.h b/ojluni/src/main/native/sun_nio_ch_DatagramChannelImpl.h
deleted file mode 100644
index 43f022b..0000000
--- a/ojluni/src/main/native/sun_nio_ch_DatagramChannelImpl.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class sun_nio_ch_DatagramChannelImpl */
-
-#ifndef _Included_sun_nio_ch_DatagramChannelImpl
-#define _Included_sun_nio_ch_DatagramChannelImpl
-#ifdef __cplusplus
-extern "C" {
-#endif
-#undef sun_nio_ch_DatagramChannelImpl_ST_UNINITIALIZED
-#define sun_nio_ch_DatagramChannelImpl_ST_UNINITIALIZED -1L
-#undef sun_nio_ch_DatagramChannelImpl_ST_UNCONNECTED
-#define sun_nio_ch_DatagramChannelImpl_ST_UNCONNECTED 0L
-#undef sun_nio_ch_DatagramChannelImpl_ST_CONNECTED
-#define sun_nio_ch_DatagramChannelImpl_ST_CONNECTED 1L
-#undef sun_nio_ch_DatagramChannelImpl_ST_KILLED
-#define sun_nio_ch_DatagramChannelImpl_ST_KILLED 2L
-/*
- * Class:     sun_nio_ch_DatagramChannelImpl
- * Method:    initIDs
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_sun_nio_ch_DatagramChannelImpl_initIDs
-  (JNIEnv *, jclass);
-
-/*
- * Class:     sun_nio_ch_DatagramChannelImpl
- * Method:    disconnect0
- * Signature: (Ljava/io/FileDescriptor;Z)V
- */
-JNIEXPORT void JNICALL Java_sun_nio_ch_DatagramChannelImpl_disconnect0
-  (JNIEnv *, jclass, jobject, jboolean);
-
-/*
- * Class:     sun_nio_ch_DatagramChannelImpl
- * Method:    receive0
- * Signature: (Ljava/io/FileDescriptor;JIZ)I
- */
-JNIEXPORT jint JNICALL Java_sun_nio_ch_DatagramChannelImpl_receive0
-  (JNIEnv *, jobject, jobject, jlong, jint, jboolean);
-
-/*
- * Class:     sun_nio_ch_DatagramChannelImpl
- * Method:    send0
- * Signature: (ZLjava/io/FileDescriptor;JILjava/net/InetAddress;I)I
- */
-JNIEXPORT jint JNICALL Java_sun_nio_ch_DatagramChannelImpl_send0
-  (JNIEnv *, jobject, jboolean, jobject, jlong, jint, jobject, jint);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/ojluni/src/main/native/sun_nio_ch_EPollArrayWrapper.h b/ojluni/src/main/native/sun_nio_ch_EPollArrayWrapper.h
deleted file mode 100644
index 098a965..0000000
--- a/ojluni/src/main/native/sun_nio_ch_EPollArrayWrapper.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class sun_nio_ch_EPollArrayWrapper */
-
-#ifndef _Included_sun_nio_ch_EPollArrayWrapper
-#define _Included_sun_nio_ch_EPollArrayWrapper
-#ifdef __cplusplus
-extern "C" {
-#endif
-#undef sun_nio_ch_EPollArrayWrapper_EPOLLIN
-#define sun_nio_ch_EPollArrayWrapper_EPOLLIN 1L
-#undef sun_nio_ch_EPollArrayWrapper_EPOLL_CTL_ADD
-#define sun_nio_ch_EPollArrayWrapper_EPOLL_CTL_ADD 1L
-#undef sun_nio_ch_EPollArrayWrapper_EPOLL_CTL_DEL
-#define sun_nio_ch_EPollArrayWrapper_EPOLL_CTL_DEL 2L
-#undef sun_nio_ch_EPollArrayWrapper_EPOLL_CTL_MOD
-#define sun_nio_ch_EPollArrayWrapper_EPOLL_CTL_MOD 3L
-#undef sun_nio_ch_EPollArrayWrapper_EVENT_OFFSET
-#define sun_nio_ch_EPollArrayWrapper_EVENT_OFFSET 0L
-#undef sun_nio_ch_EPollArrayWrapper_KILLED
-#define sun_nio_ch_EPollArrayWrapper_KILLED -1L
-#undef sun_nio_ch_EPollArrayWrapper_INITIAL_PENDING_UPDATE_SIZE
-#define sun_nio_ch_EPollArrayWrapper_INITIAL_PENDING_UPDATE_SIZE 64L
-/*
- * Class:     sun_nio_ch_EPollArrayWrapper
- * Method:    epollCreate
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_sun_nio_ch_EPollArrayWrapper_epollCreate
-  (JNIEnv *, jobject);
-
-/*
- * Class:     sun_nio_ch_EPollArrayWrapper
- * Method:    epollCtl
- * Signature: (IIII)V
- */
-JNIEXPORT void JNICALL Java_sun_nio_ch_EPollArrayWrapper_epollCtl
-  (JNIEnv *, jobject, jint, jint, jint, jint);
-
-/*
- * Class:     sun_nio_ch_EPollArrayWrapper
- * Method:    epollWait
- * Signature: (JIJI)I
- */
-JNIEXPORT jint JNICALL Java_sun_nio_ch_EPollArrayWrapper_epollWait
-  (JNIEnv *, jobject, jlong, jint, jlong, jint);
-
-/*
- * Class:     sun_nio_ch_EPollArrayWrapper
- * Method:    sizeofEPollEvent
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_sun_nio_ch_EPollArrayWrapper_sizeofEPollEvent
-  (JNIEnv *, jclass);
-
-/*
- * Class:     sun_nio_ch_EPollArrayWrapper
- * Method:    offsetofData
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_sun_nio_ch_EPollArrayWrapper_offsetofData
-  (JNIEnv *, jclass);
-
-/*
- * Class:     sun_nio_ch_EPollArrayWrapper
- * Method:    interrupt
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_sun_nio_ch_EPollArrayWrapper_interrupt
-  (JNIEnv *, jclass, jint);
-
-/*
- * Class:     sun_nio_ch_EPollArrayWrapper
- * Method:    init
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_sun_nio_ch_EPollArrayWrapper_init
-  (JNIEnv *, jclass);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/ojluni/src/main/native/sun_nio_ch_FileKey.h b/ojluni/src/main/native/sun_nio_ch_FileKey.h
deleted file mode 100755
index 58f0659..0000000
--- a/ojluni/src/main/native/sun_nio_ch_FileKey.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class sun_nio_ch_FileKey */
-
-#ifndef _Included_sun_nio_ch_FileKey
-#define _Included_sun_nio_ch_FileKey
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     sun_nio_ch_FileKey
- * Method:    init
- * Signature: (Ljava/io/FileDescriptor;)V
- */
-JNIEXPORT void JNICALL Java_sun_nio_ch_FileKey_init
-  (JNIEnv *, jobject, jobject);
-
-/*
- * Class:     sun_nio_ch_FileKey
- * Method:    initIDs
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_sun_nio_ch_FileKey_initIDs
-  (JNIEnv *, jclass);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/ojluni/src/main/native/sun_nio_ch_IOUtil.h b/ojluni/src/main/native/sun_nio_ch_IOUtil.h
deleted file mode 100755
index 9eb2c99..0000000
--- a/ojluni/src/main/native/sun_nio_ch_IOUtil.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class sun_nio_ch_IOUtil */
-
-#ifndef _Included_sun_nio_ch_IOUtil
-#define _Included_sun_nio_ch_IOUtil
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     sun_nio_ch_IOUtil
- * Method:    randomBytes
- * Signature: ([B)Z
- */
-JNIEXPORT jboolean JNICALL Java_sun_nio_ch_IOUtil_randomBytes
-  (JNIEnv *, jclass, jbyteArray);
-
-/*
- * Class:     sun_nio_ch_IOUtil
- * Method:    makePipe
- * Signature: (Z)J
- */
-JNIEXPORT jlong JNICALL Java_sun_nio_ch_IOUtil_makePipe
-  (JNIEnv *, jclass, jboolean);
-
-/*
- * Class:     sun_nio_ch_IOUtil
- * Method:    drain
- * Signature: (I)Z
- */
-JNIEXPORT jboolean JNICALL Java_sun_nio_ch_IOUtil_drain
-  (JNIEnv *, jclass, jint);
-
-/*
- * Class:     sun_nio_ch_IOUtil
- * Method:    configureBlocking
- * Signature: (Ljava/io/FileDescriptor;Z)V
- */
-JNIEXPORT void JNICALL Java_sun_nio_ch_IOUtil_configureBlocking
-  (JNIEnv *, jclass, jobject, jboolean);
-
-/*
- * Class:     sun_nio_ch_IOUtil
- * Method:    fdVal
- * Signature: (Ljava/io/FileDescriptor;)I
- */
-JNIEXPORT jint JNICALL Java_sun_nio_ch_IOUtil_fdVal
-  (JNIEnv *, jclass, jobject);
-
-/*
- * Class:     sun_nio_ch_IOUtil
- * Method:    setfdVal
- * Signature: (Ljava/io/FileDescriptor;I)V
- */
-JNIEXPORT void JNICALL Java_sun_nio_ch_IOUtil_setfdVal
-  (JNIEnv *, jclass, jobject, jint);
-
-/*
- * Class:     sun_nio_ch_IOUtil
- * Method:    iovMax
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_sun_nio_ch_IOUtil_iovMax
-  (JNIEnv *, jclass);
-
-/*
- * Class:     sun_nio_ch_IOUtil
- * Method:    fdLimit
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_sun_nio_ch_IOUtil_fdLimit
-  (JNIEnv *, jclass);
-
-/*
- * Class:     sun_nio_ch_IOUtil
- * Method:    initIDs
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_sun_nio_ch_IOUtil_initIDs
-  (JNIEnv *, jclass);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/ojluni/src/main/native/sun_nio_ch_NativeThread.h b/ojluni/src/main/native/sun_nio_ch_NativeThread.h
deleted file mode 100755
index 00d16c0..0000000
--- a/ojluni/src/main/native/sun_nio_ch_NativeThread.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class sun_nio_ch_NativeThread */
-
-#ifndef _Included_sun_nio_ch_NativeThread
-#define _Included_sun_nio_ch_NativeThread
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     sun_nio_ch_NativeThread
- * Method:    current
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_sun_nio_ch_NativeThread_current
-  (JNIEnv *, jclass);
-
-/*
- * Class:     sun_nio_ch_NativeThread
- * Method:    signal
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_sun_nio_ch_NativeThread_signal
-  (JNIEnv *, jclass, jlong);
-
-/*
- * Class:     sun_nio_ch_NativeThread
- * Method:    init
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_sun_nio_ch_NativeThread_init
-  (JNIEnv *, jclass);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/ojluni/src/main/native/sun_nio_ch_SocketChannelImpl.h b/ojluni/src/main/native/sun_nio_ch_SocketChannelImpl.h
deleted file mode 100644
index 59e52e2..0000000
--- a/ojluni/src/main/native/sun_nio_ch_SocketChannelImpl.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class sun_nio_ch_SocketChannelImpl */
-
-#ifndef _Included_sun_nio_ch_SocketChannelImpl
-#define _Included_sun_nio_ch_SocketChannelImpl
-#ifdef __cplusplus
-extern "C" {
-#endif
-#undef sun_nio_ch_SocketChannelImpl_ST_UNINITIALIZED
-#define sun_nio_ch_SocketChannelImpl_ST_UNINITIALIZED -1L
-#undef sun_nio_ch_SocketChannelImpl_ST_UNCONNECTED
-#define sun_nio_ch_SocketChannelImpl_ST_UNCONNECTED 0L
-#undef sun_nio_ch_SocketChannelImpl_ST_PENDING
-#define sun_nio_ch_SocketChannelImpl_ST_PENDING 1L
-#undef sun_nio_ch_SocketChannelImpl_ST_CONNECTED
-#define sun_nio_ch_SocketChannelImpl_ST_CONNECTED 2L
-#undef sun_nio_ch_SocketChannelImpl_ST_KILLPENDING
-#define sun_nio_ch_SocketChannelImpl_ST_KILLPENDING 3L
-#undef sun_nio_ch_SocketChannelImpl_ST_KILLED
-#define sun_nio_ch_SocketChannelImpl_ST_KILLED 4L
-/*
- * Class:     sun_nio_ch_SocketChannelImpl
- * Method:    checkConnect
- * Signature: (Ljava/io/FileDescriptor;ZZ)I
- */
-JNIEXPORT jint JNICALL Java_sun_nio_ch_SocketChannelImpl_checkConnect
-  (JNIEnv *, jclass, jobject, jboolean, jboolean);
-
-/*
- * Class:     sun_nio_ch_SocketChannelImpl
- * Method:    sendOutOfBandData
- * Signature: (Ljava/io/FileDescriptor;B)I
- */
-JNIEXPORT jint JNICALL Java_sun_nio_ch_SocketChannelImpl_sendOutOfBandData
-  (JNIEnv *, jclass, jobject, jbyte);
-
-#ifdef __cplusplus
-}
-#endif
-#endif